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

Fixes pre-re item table loading (#7232)

Browse Source 
* Follow up to 17751aa and 33fb756.
* Reverts 33fb756.
* Moves Gradable index check to renewal mode.
This commit is contained in:
Aleos 2022-09-03 10:33:31 -04:00 committed by GitHub
parent 6542df071f
commit 0f3d5f8dbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/map/itemdb.cpp
View File

@ -3111,8 +3111,6 @@ static bool itemdb_read_sqldb_sub(std::vector<std::string> str) {
rootNode["EquipLevelMax"] << str[index];
if (!str[++index].empty())
rootNode["Refineable"] << (std::stoi(str[index]) ? "true" : "false");
if (!str[++index].empty())
rootNode["Gradable"] << (std::stoi(str[index]) ? "true" : "false");
if (!str[++index].empty())
rootNode["View"] << str[index];
if (!str[++index].empty())
@ -3220,6 +3218,8 @@ static bool itemdb_read_sqldb_sub(std::vector<std::string> str) {
jobs["Summoner"] << (std::stoi(str[index]) ? "true" : "false");
if (!str[++index].empty())
jobs["Spirit_Handler"] << (std::stoi(str[index]) ? "true" : "false");
if (!str[++index].empty())
rootNode["Gradable"] << (std::stoi(str[index]) ? "true" : "false");
#endif
if( !jobs.has_children() ){
@ -3274,12 +3274,12 @@ static int itemdb_read_sqldb(void) {
"`class_all`,`class_normal`,`class_upper`,`class_baby`,`gender`,"
"`location_head_top`,`location_head_mid`,`location_head_low`,`location_armor`,`location_right_hand`,`location_left_hand`,`location_garment`,`location_shoes`,`location_right_accessory`,`location_left_accessory`,"
"`location_costume_head_top`,`location_costume_head_mid`,`location_costume_head_low`,`location_costume_garment`,`location_ammo`,`location_shadow_armor`,`location_shadow_weapon`,`location_shadow_shield`,`location_shadow_shoes`,`location_shadow_right_accessory`,`location_shadow_left_accessory`,"
"`weapon_level`,`armor_level`,`equip_level_min`,`equip_level_max`,`refineable`,`gradable`,`view`,`alias_name`,"
"`weapon_level`,`armor_level`,`equip_level_min`,`equip_level_max`,`refineable`,`view`,`alias_name`,"
"`flag_buyingstore`,`flag_deadbranch`,`flag_container`,`flag_uniqueid`,`flag_bindonequip`,`flag_dropannounce`,`flag_noconsume`,`flag_dropeffect`,"
"`delay_duration`,`delay_status`,`stack_amount`,`stack_inventory`,`stack_cart`,`stack_storage`,`stack_guildstorage`,`nouse_override`,`nouse_sitting`,"
"`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_tradepartner`,`trade_nosell`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`,`equip_script`,`unequip_script`"
#ifdef RENEWAL
",`magic_attack`,`class_third`,`class_third_upper`,`class_third_baby`,`class_fourth`,`job_kagerouoboro`,`job_rebellion`,`job_summoner`,`job_spirit_handler`"
",`magic_attack`,`class_third`,`class_third_upper`,`class_third_baby`,`class_fourth`,`job_kagerouoboro`,`job_rebellion`,`job_summoner`,`job_spirit_handler`,`gradable`"
#endif
" FROM `%s`", item_db_name[fi]) ) {
Sql_ShowDebug(mmysql_handle);