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

Removed duplicates RaceGroups mob_db (#5757)

Browse Source 
Removed duplicates RaceGroups mob_db

Fixed change the header output

Thanks to @aleos89 !
This commit is contained in:
idk-whoami 2021-02-27 20:37:09 +07:00 committed by GitHub
parent fe9ec46dc9
commit 7677d06d17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
db/re/mob_db.yml
View File

@ -1071,7 +1071,6 @@ Body:
Race: Demihuman Race: Demihuman
RaceGroups: RaceGroups:
Orc: true Orc: true
RaceGroups:
Clocktower: true Clocktower: true
Element: Earth Element: Earth
ElementLevel: 1 ElementLevel: 1
@ -8816,7 +8815,6 @@ Body:
Race: Demihuman Race: Demihuman
RaceGroups: RaceGroups:
Orc: true Orc: true
RaceGroups:
Clocktower: true Clocktower: true
Element: Earth Element: Earth
ElementLevel: 1 ElementLevel: 1
@ -9985,7 +9983,6 @@ Body:
Race: Demihuman Race: Demihuman
RaceGroups: RaceGroups:
Orc: true Orc: true
RaceGroups:
Clocktower: true Clocktower: true
Element: Fire Element: Fire
ElementLevel: 2 ElementLevel: 2
@ -25990,7 +25987,6 @@ Body:
Race: Demihuman Race: Demihuman
RaceGroups: RaceGroups:
Biolab: true Biolab: true
RaceGroups:
Bio5_Swordman_Thief: true Bio5_Swordman_Thief: true
Element: Fire Element: Fire
ElementLevel: 4 ElementLevel: 4
@ -26028,7 +26024,6 @@ Body:
Race: Demihuman Race: Demihuman
RaceGroups: RaceGroups:
Biolab: true Biolab: true
RaceGroups:
Bio5_Swordman_Thief: true Bio5_Swordman_Thief: true
Element: Poison Element: Poison
ElementLevel: 4 ElementLevel: 4
@ -26067,7 +26062,6 @@ Body:
Race: Demihuman Race: Demihuman
RaceGroups: RaceGroups:
Biolab: true Biolab: true
RaceGroups:
Bio5_Acolyte_Merchant: true Bio5_Acolyte_Merchant: true
Element: Earth Element: Earth
ElementLevel: 4 ElementLevel: 4
@ -26106,7 +26100,6 @@ Body:
Race: Demihuman Race: Demihuman
RaceGroups: RaceGroups:
Biolab: true Biolab: true
RaceGroups:
Bio5_Acolyte_Merchant: true Bio5_Acolyte_Merchant: true
Element: Holy Element: Holy
ElementLevel: 4 ElementLevel: 4
@ -26145,7 +26138,6 @@ Body:
Race: Demihuman Race: Demihuman
RaceGroups: RaceGroups:
Biolab: true Biolab: true
RaceGroups:
Bio5_Mage_Archer: true Bio5_Mage_Archer: true
Element: Wind Element: Wind
ElementLevel: 4 ElementLevel: 4
@ -26184,7 +26176,6 @@ Body:
Race: Demihuman Race: Demihuman
RaceGroups: RaceGroups:
Biolab: true Biolab: true
RaceGroups:
Bio5_Mage_Archer: true Bio5_Mage_Archer: true
Element: Ghost Element: Ghost
ElementLevel: 3 ElementLevel: 3
@ -48238,7 +48229,6 @@ Body:
Race: Demihuman Race: Demihuman
RaceGroups: RaceGroups:
Biolab: true Biolab: true
RaceGroups:
Bio5_Swordman_Thief: true Bio5_Swordman_Thief: true
Element: Holy Element: Holy
ElementLevel: 4 ElementLevel: 4
@ -48277,7 +48267,6 @@ Body:
Race: Demihuman Race: Demihuman
RaceGroups: RaceGroups:
Biolab: true Biolab: true
RaceGroups:
Bio5_Acolyte_Merchant: true Bio5_Acolyte_Merchant: true
Element: Fire Element: Fire
ElementLevel: 4 ElementLevel: 4
@ -48316,7 +48305,6 @@ Body:
Race: Demihuman Race: Demihuman
RaceGroups: RaceGroups:
Biolab: true Biolab: true
RaceGroups:
Bio5_Mage_Archer: true Bio5_Mage_Archer: true
Element: Ghost Element: Ghost
ElementLevel: 4 ElementLevel: 4
@ -48356,7 +48344,6 @@ Body:
Race: Demon Race: Demon
RaceGroups: RaceGroups:
Biolab: true Biolab: true
RaceGroups:
Bio5_Acolyte_Merchant: true Bio5_Acolyte_Merchant: true
Element: Water Element: Water
ElementLevel: 4 ElementLevel: 4
@ -48395,7 +48382,6 @@ Body:
Race: Demon Race: Demon
RaceGroups: RaceGroups:
Biolab: true Biolab: true
RaceGroups:
Bio5_Swordman_Thief: true Bio5_Swordman_Thief: true
Element: Poison Element: Poison
ElementLevel: 4 ElementLevel: 4
@ -48434,7 +48420,6 @@ Body:
Race: Demihuman Race: Demihuman
RaceGroups: RaceGroups:
Biolab: true Biolab: true
RaceGroups:
Bio5_Mage_Archer: true Bio5_Mage_Archer: true
Element: Wind Element: Wind
ElementLevel: 4 ElementLevel: 4
@ -48473,7 +48458,6 @@ Body:
Race: Demihuman Race: Demihuman
RaceGroups: RaceGroups:
Biolab: true Biolab: true
RaceGroups:
Bio5_Mage_Archer: true Bio5_Mage_Archer: true
Element: Wind Element: Wind
ElementLevel: 4 ElementLevel: 4

12
src/tool/csv2yaml.cpp
View File

@ -3115,17 +3115,17 @@ static bool mob_readdb_sub(char *fields[], int columns, int current) {
if (!header) { if (!header) {
body << YAML::Key << "RaceGroups"; body << YAML::Key << "RaceGroups";
body << YAML::BeginMap; body << YAML::BeginMap;
header = true;
} }
body << YAML::Key << name2Upper(constant_lookup(race2.first, "RC2_") + 4) << YAML::Value << "true"; body << YAML::Key << name2Upper(constant_lookup(race2.first, "RC2_") + 4) << YAML::Value << "true";
if (!header) { }
}
}
if (header)
body << YAML::EndMap; body << YAML::EndMap;
header = true;
}
}
}
}
if (fields[24]) { if (fields[24]) {
int ele = strtol(fields[24], nullptr, 10); int ele = strtol(fields[24], nullptr, 10);