Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes SpiritSphereCost negative values

Browse Source 
* SphiritSphereCost has potential -1 value to remove all available spirit spheres.
Thanks to @teededung!
This commit is contained in:
Aleos
2020-02-10 10:57:16 -05:00
parent b3e85ebe8d
commit a74978b258
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
db/pre-re/skill_db.yml
View File

@@ -27958,6 +27958,7 @@ Body:
Ammo: Ammo:
Bullet: true Bullet: true
AmmoAmount: 1 AmmoAmount: 1
SpiritSphereCost: -1
Equipment: Equipment:
Silver_Bullet: true Silver_Bullet: true
- Id: 2564 - Id: 2564
@@ -28130,6 +28131,7 @@ Body:
Time: 80000 Time: 80000
Requires: Requires:
SpCost: 30 SpCost: 30
SpiritSphereCost: -1
- Id: 2569 - Id: 2569
Name: RL_AM_BLAST Name: RL_AM_BLAST
Description: Anti-Material Blast Description: Anti-Material Blast
@@ -28256,6 +28258,7 @@ Body:
Amount: 55 Amount: 55
Weapon: Weapon:
Rifle: true Rifle: true
SpiritSphereCost: -1
- Id: 2572 - Id: 2572
Name: RL_R_TRIP_PLUSATK Name: RL_R_TRIP_PLUSATK
Description: Round Trip Plus Attack Description: Round Trip Plus Attack

3
db/re/skill_db.yml
View File

@@ -29287,6 +29287,7 @@ Body:
Ammo: Ammo:
Bullet: true Bullet: true
AmmoAmount: 1 AmmoAmount: 1
SpiritSphereCost: -1
Equipment: Equipment:
Silver_Bullet: true Silver_Bullet: true
Sanctified_Bullet: true Sanctified_Bullet: true
@@ -29468,6 +29469,7 @@ Body:
FixedCastTime: -1 FixedCastTime: -1
Requires: Requires:
SpCost: 30 SpCost: 30
SpiritSphereCost: -1
- Id: 2569 - Id: 2569
Name: RL_AM_BLAST Name: RL_AM_BLAST
Description: Anti-Material Blast Description: Anti-Material Blast
@@ -29599,6 +29601,7 @@ Body:
Amount: 55 Amount: 55
Weapon: Weapon:
Rifle: true Rifle: true
SpiritSphereCost: -1
- Id: 2572 - Id: 2572
Name: RL_R_TRIP_PLUSATK Name: RL_R_TRIP_PLUSATK
Description: Round Trip Plus Attack Description: Round Trip Plus Attack

4
src/tool/csv2yaml.cpp
View File

@@ -2203,14 +2203,14 @@ static bool skill_parse_row_skilldb(char* split[], int columns, int current) {
} }
if (!isMultiLevel(it_req->second.spiritball)) { if (!isMultiLevel(it_req->second.spiritball)) {
if (it_req->second.spiritball[0] > 0) if (it_req->second.spiritball[0] != 0)
body << YAML::Key << "SpiritSphereCost" << YAML::Value << it_req->second.spiritball[0]; body << YAML::Key << "SpiritSphereCost" << YAML::Value << it_req->second.spiritball[0];
} else { } else {
body << YAML::Key << "SpiritSphereCost"; body << YAML::Key << "SpiritSphereCost";
body << YAML::BeginSeq; body << YAML::BeginSeq;
for (size_t i = 0; i < ARRAYLENGTH(it_req->second.spiritball); i++) { for (size_t i = 0; i < ARRAYLENGTH(it_req->second.spiritball); i++) {
if (it_req->second.spiritball[i] > 0) { if (it_req->second.spiritball[i] != 0) {
body << YAML::BeginMap; body << YAML::BeginMap;
body << YAML::Key << "Level" << YAML::Value << i + 1; body << YAML::Key << "Level" << YAML::Value << i + 1;
body << YAML::Key << "Amount" << YAML::Value << it_req->second.spiritball[i]; body << YAML::Key << "Amount" << YAML::Value << it_req->second.spiritball[i];