From 6e0a5bfa83e39575a242fd7fcf2184e046fb1c04 Mon Sep 17 00:00:00 2001 From: Aleos Date: Wed, 13 Sep 2023 08:50:30 -0400 Subject: [PATCH] Adds missing mob SQL column for Illusion Turtle (#7926) * Fixes #7925. * Follow up to 0f18869. Thanks to @SpineOfSteel and @Atemo! Co-authored-by: Atemo --- sql-files/mob_db.sql | 1 + sql-files/mob_db2.sql | 1 + sql-files/mob_db2_re.sql | 1 + sql-files/mob_db_re.sql | 1 + sql-files/upgrades/upgrade_20230913.sql | 12 ++++++++++++ src/map/mob.cpp | 2 +- 6 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 sql-files/upgrades/upgrade_20230913.sql diff --git a/sql-files/mob_db.sql b/sql-files/mob_db.sql index 5963765048..a77bdf3850 100644 --- a/sql-files/mob_db.sql +++ b/sql-files/mob_db.sql @@ -60,6 +60,7 @@ CREATE TABLE `mob_db` ( `racegroup_ep172alpha` tinyint(1) unsigned DEFAULT NULL, `racegroup_ep172beta` tinyint(1) unsigned DEFAULT NULL, `racegroup_ep172bath` tinyint(1) unsigned DEFAULT NULL, + `racegroup_illusion_turtle` tinyint(1) unsigned DEFAULT NULL, `element` varchar(24) DEFAULT NULL, `element_level` tinyint(4) unsigned DEFAULT NULL, `walk_speed` smallint(6) unsigned DEFAULT NULL, diff --git a/sql-files/mob_db2.sql b/sql-files/mob_db2.sql index 2d5f9663a8..885b922b31 100644 --- a/sql-files/mob_db2.sql +++ b/sql-files/mob_db2.sql @@ -60,6 +60,7 @@ CREATE TABLE `mob_db2` ( `racegroup_ep172alpha` tinyint(1) unsigned DEFAULT NULL, `racegroup_ep172beta` tinyint(1) unsigned DEFAULT NULL, `racegroup_ep172bath` tinyint(1) unsigned DEFAULT NULL, + `racegroup_illusion_turtle` tinyint(1) unsigned DEFAULT NULL, `element` varchar(24) DEFAULT NULL, `element_level` tinyint(4) unsigned DEFAULT NULL, `walk_speed` smallint(6) unsigned DEFAULT NULL, diff --git a/sql-files/mob_db2_re.sql b/sql-files/mob_db2_re.sql index a21b34a457..726488bdce 100644 --- a/sql-files/mob_db2_re.sql +++ b/sql-files/mob_db2_re.sql @@ -62,6 +62,7 @@ CREATE TABLE `mob_db2_re` ( `racegroup_ep172alpha` tinyint(1) unsigned DEFAULT NULL, `racegroup_ep172beta` tinyint(1) unsigned DEFAULT NULL, `racegroup_ep172bath` tinyint(1) unsigned DEFAULT NULL, + `racegroup_illusion_turtle` tinyint(1) unsigned DEFAULT NULL, `element` varchar(24) DEFAULT NULL, `element_level` tinyint(4) unsigned DEFAULT NULL, `walk_speed` smallint(6) unsigned DEFAULT NULL, diff --git a/sql-files/mob_db_re.sql b/sql-files/mob_db_re.sql index f73af3b63f..e2c648abf0 100644 --- a/sql-files/mob_db_re.sql +++ b/sql-files/mob_db_re.sql @@ -62,6 +62,7 @@ CREATE TABLE `mob_db_re` ( `racegroup_ep172alpha` tinyint(1) unsigned DEFAULT NULL, `racegroup_ep172beta` tinyint(1) unsigned DEFAULT NULL, `racegroup_ep172bath` tinyint(1) unsigned DEFAULT NULL, + `racegroup_illusion_turtle` tinyint(1) unsigned DEFAULT NULL, `element` varchar(24) DEFAULT NULL, `element_level` tinyint(4) unsigned DEFAULT NULL, `walk_speed` smallint(6) unsigned DEFAULT NULL, diff --git a/sql-files/upgrades/upgrade_20230913.sql b/sql-files/upgrades/upgrade_20230913.sql new file mode 100644 index 0000000000..49e71dce1e --- /dev/null +++ b/sql-files/upgrades/upgrade_20230913.sql @@ -0,0 +1,12 @@ +ALTER TABLE `mob_db` + ADD COLUMN `racegroup_illusion_turtle` tinyint(1) unsigned DEFAULT NULL, +; +ALTER TABLE `mob_db2` + ADD COLUMN `racegroup_illusion_turtle` tinyint(1) unsigned DEFAULT NULL, +; +ALTER TABLE `mob_db_re` + ADD COLUMN `racegroup_illusion_turtle` tinyint(1) unsigned DEFAULT NULL, +; +ALTER TABLE `mob_db2_re` + ADD COLUMN `racegroup_illusion_turtle` tinyint(1) unsigned DEFAULT NULL, +; diff --git a/src/map/mob.cpp b/src/map/mob.cpp index 09c976913f..5ef87e5b7d 100644 --- a/src/map/mob.cpp +++ b/src/map/mob.cpp @@ -5277,7 +5277,7 @@ static int mob_read_sqldb(void) for( uint8 fi = 0; fi < ARRAYLENGTH(mob_db_name); ++fi ) { // retrieve all rows from the mob database if( SQL_ERROR == Sql_Query(mmysql_handle, "SELECT `id`,`name_aegis`,`name_english`,`name_japanese`,`level`,`hp`,`sp`,`base_exp`,`job_exp`,`mvp_exp`,`attack`,`attack2`,`defense`,`magic_defense`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`attack_range`,`skill_range`,`chase_range`,`size`,`race`," - "`racegroup_goblin`,`racegroup_kobold`,`racegroup_orc`,`racegroup_golem`,`racegroup_guardian`,`racegroup_ninja`,`racegroup_gvg`,`racegroup_battlefield`,`racegroup_treasure`,`racegroup_biolab`,`racegroup_manuk`,`racegroup_splendide`,`racegroup_scaraba`,`racegroup_ogh_atk_def`,`racegroup_ogh_hidden`,`racegroup_bio5_swordman_thief`,`racegroup_bio5_acolyte_merchant`,`racegroup_bio5_mage_archer`,`racegroup_bio5_mvp`,`racegroup_clocktower`,`racegroup_thanatos`,`racegroup_faceworm`,`racegroup_hearthunter`,`racegroup_rockridge`,`racegroup_werner_lab`,`racegroup_temple_demon`,`racegroup_illusion_vampire`,`racegroup_malangdo`,`racegroup_ep172alpha`,`racegroup_ep172beta`,`racegroup_ep172bath`," + "`racegroup_goblin`,`racegroup_kobold`,`racegroup_orc`,`racegroup_golem`,`racegroup_guardian`,`racegroup_ninja`,`racegroup_gvg`,`racegroup_battlefield`,`racegroup_treasure`,`racegroup_biolab`,`racegroup_manuk`,`racegroup_splendide`,`racegroup_scaraba`,`racegroup_ogh_atk_def`,`racegroup_ogh_hidden`,`racegroup_bio5_swordman_thief`,`racegroup_bio5_acolyte_merchant`,`racegroup_bio5_mage_archer`,`racegroup_bio5_mvp`,`racegroup_clocktower`,`racegroup_thanatos`,`racegroup_faceworm`,`racegroup_hearthunter`,`racegroup_rockridge`,`racegroup_werner_lab`,`racegroup_temple_demon`,`racegroup_illusion_vampire`,`racegroup_malangdo`,`racegroup_ep172alpha`,`racegroup_ep172beta`,`racegroup_ep172bath`,`racegroup_illusion_turtle`," "`element`,`element_level`,`walk_speed`,`attack_delay`,`attack_motion`,`damage_motion`,`damage_taken`,`ai`,`class`," "`mode_canmove`,`mode_looter`,`mode_aggressive`,`mode_assist`,`mode_castsensoridle`,`mode_norandomwalk`,`mode_nocast`,`mode_canattack`,`mode_castsensorchase`,`mode_changechase`,`mode_angry`,`mode_changetargetmelee`,`mode_changetargetchase`,`mode_targetweak`,`mode_randomtarget`,`mode_ignoremelee`,`mode_ignoremagic`,`mode_ignoreranged`,`mode_mvp`,`mode_ignoremisc`,`mode_knockbackimmune`,`mode_teleportblock`,`mode_fixeditemdrop`,`mode_detector`,`mode_statusimmune`,`mode_skillimmune`," "`mvpdrop1_item`,`mvpdrop1_rate`,`mvpdrop1_option`,`mvpdrop1_index`,`mvpdrop2_item`,`mvpdrop2_rate`,`mvpdrop2_option`,`mvpdrop2_index`,`mvpdrop3_item`,`mvpdrop3_rate`,`mvpdrop3_option`,`mvpdrop3_index`,"