Corrects Star Emperor stances (#4753)

* Fixes #4744.
* Adds missing stance skill requirements.
* Adds Stance values to csv2yaml for skill_db conversions.
Thanks to @iubantot and @attackjom!
This commit is contained in:
Aleos 2020-04-08 13:27:12 -04:00 committed by GitHub
parent 06c159c405
commit 00943a2c5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 0 deletions

View File

@ -29274,6 +29274,7 @@ Body:
Time: 60000 Time: 60000
Requires: Requires:
SpCost: 40 SpCost: 40
State: Moonstance
- Id: 2575 - Id: 2575
Name: SJ_LUNARSTANCE Name: SJ_LUNARSTANCE
Description: Lunar Stance Description: Lunar Stance
@ -29317,6 +29318,7 @@ Body:
Amount: 55 Amount: 55
- Level: 7 - Level: 7
Amount: 60 Amount: 60
State: Moonstance
- Id: 2577 - Id: 2577
Name: SJ_LIGHTOFSTAR Name: SJ_LIGHTOFSTAR
Description: Light of Star Description: Light of Star
@ -29340,6 +29342,7 @@ Body:
Time: 60000 Time: 60000
Requires: Requires:
SpCost: 40 SpCost: 40
State: Starstance
- Id: 2578 - Id: 2578
Name: SJ_STARSTANCE Name: SJ_STARSTANCE
Description: Star Stance Description: Star Stance
@ -29384,6 +29387,7 @@ Body:
Amount: 45 Amount: 45
- Level: 7 - Level: 7
Amount: 50 Amount: 50
State: Moonstance
- Id: 2580 - Id: 2580
Name: SJ_FLASHKICK Name: SJ_FLASHKICK
Description: Flash Kick Description: Flash Kick
@ -29426,6 +29430,7 @@ Body:
Amount: 20 Amount: 20
- Level: 7 - Level: 7
Amount: 15 Amount: 15
State: Starstance
- Id: 2581 - Id: 2581
Name: SJ_STAREMPEROR Name: SJ_STAREMPEROR
Description: Star Emperor Advent Description: Star Emperor Advent
@ -29455,6 +29460,7 @@ Body:
Amount: 85 Amount: 85
- Level: 5 - Level: 5
Amount: 90 Amount: 90
State: Universestance
- Id: 2582 - Id: 2582
Name: SJ_NOVAEXPLOSING Name: SJ_NOVAEXPLOSING
Description: Nova Explosion Description: Nova Explosion
@ -29486,6 +29492,7 @@ Body:
Amount: 75 Amount: 75
- Level: 5 - Level: 5
Amount: 80 Amount: 80
State: Universestance
- Id: 2583 - Id: 2583
Name: SJ_UNIVERSESTANCE Name: SJ_UNIVERSESTANCE
Description: Universe Stance Description: Universe Stance
@ -29542,6 +29549,7 @@ Body:
Amount: 65 Amount: 65
- Level: 7 - Level: 7
Amount: 70 Amount: 70
State: Starstance
- Id: 2585 - Id: 2585
Name: SJ_GRAVITYCONTROL Name: SJ_GRAVITYCONTROL
Description: Gravity Control Description: Gravity Control
@ -29559,6 +29567,7 @@ Body:
Cooldown: 20000 Cooldown: 20000
Requires: Requires:
SpCost: 80 SpCost: 80
State: Universestance
- Id: 2586 - Id: 2586
Name: SJ_BOOKOFDIMENSION Name: SJ_BOOKOFDIMENSION
Description: Book of Dimension Description: Book of Dimension
@ -29584,6 +29593,7 @@ Body:
Time: 30000 Time: 30000
Requires: Requires:
SpCost: 40 SpCost: 40
State: Universestance
- Id: 2587 - Id: 2587
Name: SJ_BOOKOFCREATINGSTAR Name: SJ_BOOKOFCREATINGSTAR
Description: Book of Creating Star Description: Book of Creating Star
@ -29622,6 +29632,7 @@ Body:
Amount: 65 Amount: 65
- Level: 5 - Level: 5
Amount: 70 Amount: 70
State: Universestance
Unit: Unit:
Id: Creatingstar Id: Creatingstar
Layout: 2 Layout: 2
@ -29671,6 +29682,7 @@ Body:
Time: 60000 Time: 60000
Requires: Requires:
SpCost: 40 SpCost: 40
State: Sunstance
- Id: 2591 - Id: 2591
Name: SJ_SUNSTANCE Name: SJ_SUNSTANCE
Description: Sun Stance Description: Sun Stance
@ -29713,6 +29725,7 @@ Body:
Amount: 49 Amount: 49
- Level: 7 - Level: 7
Amount: 52 Amount: 52
State: Sunstance
- Id: 2593 - Id: 2593
Name: SJ_PROMINENCEKICK Name: SJ_PROMINENCEKICK
Description: Prominence Kick Description: Prominence Kick
@ -29732,6 +29745,7 @@ Body:
IgnoreStatus: true IgnoreStatus: true
Requires: Requires:
SpCost: 20 SpCost: 20
State: Sunstance
- Id: 2594 - Id: 2594
Name: SJ_FALLINGSTAR_ATK Name: SJ_FALLINGSTAR_ATK
Description: Falling Star Attack Description: Falling Star Attack
@ -29749,6 +29763,7 @@ Body:
CastCancel: true CastCancel: true
Requires: Requires:
SpCost: 1 SpCost: 1
State: Starstance
- Id: 2595 - Id: 2595
Name: SJ_FALLINGSTAR_ATK2 Name: SJ_FALLINGSTAR_ATK2
Description: Falling Star Attack 2 Description: Falling Star Attack 2
@ -29767,6 +29782,7 @@ Body:
CastCancel: true CastCancel: true
Requires: Requires:
SpCost: 1 SpCost: 1
State: Starstance
- Id: 2596 - Id: 2596
Name: SP_SOULGOLEM Name: SP_SOULGOLEM
Description: Golem's Soul Description: Golem's Soul

View File

@ -693,6 +693,10 @@ Mado - Requires OPTION_MADOGEAR.
ElementalSpirit - Requires an Elemental Spirit to be summoned. ElementalSpirit - Requires an Elemental Spirit to be summoned.
ElementalSpirit2 - Requires an Elemental Spirit to be summoned and will be removed after. ElementalSpirit2 - Requires an Elemental Spirit to be summoned and will be removed after.
Peco - Requires OPTION_RIDING. Peco - Requires OPTION_RIDING.
Sunstance - Requires Sun/Universe Stance status be active.
Moonstance - Requires Moon/Universe Stance status be active.
Starstance - Requires Star/Universe Stance status be active.
Universestance - Requires Universe Stance status be active.
------------------ ------------------

View File

@ -7554,6 +7554,10 @@
export_constant(ST_ELEMENTALSPIRIT); export_constant(ST_ELEMENTALSPIRIT);
export_constant(ST_ELEMENTALSPIRIT2); export_constant(ST_ELEMENTALSPIRIT2);
export_constant(ST_PECO); export_constant(ST_PECO);
export_constant(ST_SUNSTANCE);
export_constant(ST_MOONSTANCE);
export_constant(ST_STARSTANCE);
export_constant(ST_UNIVERSESTANCE);
/* skill unit flags */ /* skill unit flags */
export_constant(UF_NOENEMY); export_constant(UF_NOENEMY);

View File

@ -1270,6 +1270,10 @@ static bool skill_parse_row_requiredb(char* split[], int columns, int current)
else if (strcmpi(split[10], "elementalspirit") == 0) entry.state = ST_ELEMENTALSPIRIT; else if (strcmpi(split[10], "elementalspirit") == 0) entry.state = ST_ELEMENTALSPIRIT;
else if (strcmpi(split[10], "elementalspirit2") == 0) entry.state = ST_ELEMENTALSPIRIT2; else if (strcmpi(split[10], "elementalspirit2") == 0) entry.state = ST_ELEMENTALSPIRIT2;
else if (strcmpi(split[10], "peco") == 0) entry.state = ST_PECO; else if (strcmpi(split[10], "peco") == 0) entry.state = ST_PECO;
else if (strcmpi(split[10], "sunstance") == 0) entry.state = ST_SUNSTANCE;
else if (strcmpi(split[10], "moonstance") == 0) entry.state = ST_MOONSTANCE;
else if (strcmpi(split[10], "starstance") == 0) entry.state = ST_STARSTANCE;
else if (strcmpi(split[10], "universestance") == 0) entry.state = ST_UNIVERSESTANCE;
else entry.state = ST_NONE; // Unknown or no state else entry.state = ST_NONE; // Unknown or no state
trim(split[11]); trim(split[11]);