From 47d68286b5646d316610efdadfbdf61cc5130b38 Mon Sep 17 00:00:00 2001 From: Lemongrass3110 Date: Thu, 28 Jan 2021 01:09:23 +0100 Subject: [PATCH] Added some new constants and placeholders --- db/re/mob_db.txt | 55 +++++++++++++++++++++++++++++++++ sql-files/mob_db_re.sql | 59 ++++++++++++++++++++++++++++++++++-- src/map/npc.hpp | 26 +++++++++++++++- src/map/script.hpp | 1 + src/map/script_constants.hpp | 45 ++++++++++++++++++++++++--- src/map/status.hpp | 19 +++++++++--- 6 files changed, 193 insertions(+), 12 deletions(-) diff --git a/db/re/mob_db.txt b/db/re/mob_db.txt index 8d8d23b32d..389cd69216 100644 --- a/db/re/mob_db.txt +++ b/db/re/mob_db.txt @@ -4418,6 +4418,61 @@ //21288,JP_E_MONSTER_399 //21289,JP_E_MONSTER_400 //21290,KIEL_D_01_2 +//21291,CAPOO_COLLABO_TW + +//21325,MD_T_MASTERING +//21326,MD_T_VAGABOND_WOLF +//21327,MD_T_VOCAL +//21328,MD_T_GOLDEN_BUG +//21329,MD_T_MISTRESS +//21330,MD_T_MAYA +//21331,MD_T_PHREEONI +//21332,MD_T_DRAKE +//21333,MD_T_MOONLIGHT +//21334,MD_T_BACSOJIN +//21335,MD_T_GOBLIN_LEADER +//21336,MD_T_KOBOLD_LEADER +//21337,MD_T_TURTLE_GENERAL +//21338,MD_T_SAMURAI +//21339,MD_T_TOAD +//21340,MD_T_OSIRIS +//21341,MD_T_PHARAOH +//21342,MD_T_AMON_RA +//21343,MD_T_DARK_SNAKE_LORD +//21344,MD_T_ARCHANGELING +//21345,MD_T_DEVILING +//21346,MD_T_ANGELING +//21347,MD_T_GHOSTRING +//21348,MD_T_B_YGNIZEM +//21349,MD_T_DOPPELGANGER +//21350,MD_T_ATROCE +//21351,MD_T_ORK_HERO +//21352,MD_T_ORC_LORD +//21353,MD_T_BAPHOMET +//21354,MD_T_DARK_LORD +//21355,MD_T_FALLINGBISHOP +//21356,MD_T_IFRIT +//21357,MD_T_RANDGRIS +//21358,MD_T_BEELZEBUB +//21359,MD_T_BEELZEBUB_ + +//21362,SEASON_MOB_001 +//21363,SEASON_MOB_002 +//21364,SEASON_MOB_003 +//21365,SEASON_MOB_004 +//21366,SEASON_MOB_005 +//21367,SEASON_MOB_006 +//21368,SEASON_MOB_007 +//21369,SEASON_MOB_008 +//21370,SEASON_MOB_009 +//21371,SEASON_MOB_010 +//21372,SEASON_MOB_011 +//21373,SEASON_MOB_012 +//21374,SEASON_MOB_013 +//21375,SEASON_MOB_014 +//21376,SEASON_MOB_015 + +//21382,E_CHEAP_RAT //31999,HUNTING_GID_DEFAULT //32000,MONSTER_2ND_END diff --git a/sql-files/mob_db_re.sql b/sql-files/mob_db_re.sql index 788ed162b2..a1d94475fb 100644 --- a/sql-files/mob_db_re.sql +++ b/sql-files/mob_db_re.sql @@ -2674,7 +2674,7 @@ REPLACE INTO `mob_db_re` VALUES (3446,'P_SKELETON','P Skeleton','Enchanted Skele REPLACE INTO `mob_db_re` VALUES (3447,'P_SOLDIER_SKELETON','P Soldier Skeleton','Enchanted Soldier Skele',115,20000,0,0,0,1,200,100,20,20,120,60,30,60,90,30,10,12,1,1,69,0x3885,250,1440,576,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4634,1); REPLACE INTO `mob_db_re` VALUES (3448,'P_AMDARAIS','P Amdarais','Renovated Amdarais',99,10000000,0,0,0,2,800,800,30,30,150,50,100,50,70,50,10,12,2,1,29,0x3885,200,1152,1536,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4635,1); REPLACE INTO `mob_db_re` VALUES (3449,'G_P_AMDARAIS','P Amdarais','Enhanced Amdarais',98,66666,0,0,0,2,700,700,30,30,100,50,100,50,70,50,10,12,2,1,29,0x3885,200,1152,1536,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0); -REPLACE INTO `mob_db_re` VALUES (3450,'BIJOU','Bijou','Bijou',115,10000000,0,66666,66666,3,1444,1444,20,200,150,40,50,150,150,50,10,12,2,1,89,0x6203885,150,2000,1536,480,0,0,0,0,0,0,0,6941,10000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4636,1); +REPLACE INTO `mob_db_re` VALUES (3450,'BIJOU','Bijou','Bijou',115,10000000,0,66666,66666,3,1444,1444,20,200,150,40,50,150,150,50,10,12,2,1,89,0x6283885,200,2000,1536,480,2000,617,5000,616,2000,12531,3000,0,0,0,0,6941,5000,983,5000,748,1000,1814,500,20288,10,0,0,0,0,4636,1); REPLACE INTO `mob_db_re` VALUES (3451,'IMMOTAL_CORPS','Immotal Corps','Immotal Corps',158,198410,1,9575,7859,1,1408,890,150,83,165,75,95,75,150,50,10,12,1,6,89,0x2003885,150,1500,600,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4637,1); REPLACE INTO `mob_db_re` VALUES (3452,'ZOMBIE_GUARD','Zombie Guard','Zombie Guard',145,124000,1,6887,4809,1,897,347,200,35,138,75,200,43,120,20,10,12,1,1,89,0x3885,400,768,2784,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4641,1); #3453,LOST_LAMB @@ -3477,7 +3477,7 @@ REPLACE INTO `mob_db_re` VALUES (3790,'SWEETS_DROPS','Sweets Drops','Sweets Drop #20266,G_ILL_TEDDY_BEAR_G #20267,G_ILL_TEDDY_BEAR_W #20268,G_ILL_TEDDY_BEAR_B -#20269,GUILD_SKILL_FLAG +REPLACE INTO `mob_db_re` VALUES (20269,'GUILD_SKILL_FLAG','Guild Skill Flag','Guild Skill Flag',90,30,0,0,0,1,0,0,0,0,1,17,1,80,126,20,10,12,2,0,20,0x120,300,1288,288,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0); #20270,ILL_TRI_JOINT #20271,ILL_STALACTIC_GOLEM #20272,ILL_MEGALITH @@ -4485,6 +4485,61 @@ REPLACE INTO `mob_db_re` VALUES (3790,'SWEETS_DROPS','Sweets Drops','Sweets Drop #21288,JP_E_MONSTER_399 #21289,JP_E_MONSTER_400 #21290,KIEL_D_01_2 +#21291,CAPOO_COLLABO_TW + +#21325,MD_T_MASTERING +#21326,MD_T_VAGABOND_WOLF +#21327,MD_T_VOCAL +#21328,MD_T_GOLDEN_BUG +#21329,MD_T_MISTRESS +#21330,MD_T_MAYA +#21331,MD_T_PHREEONI +#21332,MD_T_DRAKE +#21333,MD_T_MOONLIGHT +#21334,MD_T_BACSOJIN +#21335,MD_T_GOBLIN_LEADER +#21336,MD_T_KOBOLD_LEADER +#21337,MD_T_TURTLE_GENERAL +#21338,MD_T_SAMURAI +#21339,MD_T_TOAD +#21340,MD_T_OSIRIS +#21341,MD_T_PHARAOH +#21342,MD_T_AMON_RA +#21343,MD_T_DARK_SNAKE_LORD +#21344,MD_T_ARCHANGELING +#21345,MD_T_DEVILING +#21346,MD_T_ANGELING +#21347,MD_T_GHOSTRING +#21348,MD_T_B_YGNIZEM +#21349,MD_T_DOPPELGANGER +#21350,MD_T_ATROCE +#21351,MD_T_ORK_HERO +#21352,MD_T_ORC_LORD +#21353,MD_T_BAPHOMET +#21354,MD_T_DARK_LORD +#21355,MD_T_FALLINGBISHOP +#21356,MD_T_IFRIT +#21357,MD_T_RANDGRIS +#21358,MD_T_BEELZEBUB +#21359,MD_T_BEELZEBUB_ + +#21362,SEASON_MOB_001 +#21363,SEASON_MOB_002 +#21364,SEASON_MOB_003 +#21365,SEASON_MOB_004 +#21366,SEASON_MOB_005 +#21367,SEASON_MOB_006 +#21368,SEASON_MOB_007 +#21369,SEASON_MOB_008 +#21370,SEASON_MOB_009 +#21371,SEASON_MOB_010 +#21372,SEASON_MOB_011 +#21373,SEASON_MOB_012 +#21374,SEASON_MOB_013 +#21375,SEASON_MOB_014 +#21376,SEASON_MOB_015 + +#21382,E_CHEAP_RAT #31999,HUNTING_GID_DEFAULT #32000,MONSTER_2ND_END diff --git a/src/map/npc.hpp b/src/map/npc.hpp index a6f31b983d..44cfa89b95 100644 --- a/src/map/npc.hpp +++ b/src/map/npc.hpp @@ -1204,7 +1204,31 @@ enum e_job_types JT_4_4JOB_PHANTOMBOOK3, JT_4_VENDING_MACHINE2, - JT_4_4JOB_MAURA = 10416, + JT_4_STAR_BOX_SCORE = 10403, + JT_4_STAR_BOX_POW1, + JT_4_STAR_BOX_POW2, + JT_4_STAR_BOX_STA1, + JT_4_STAR_BOX_STA2, + JT_4_STAR_BOX_SPL1, + JT_4_STAR_BOX_SPL2, + JT_4_STAR_BOX_CON1, + JT_4_STAR_BOX_CON2, + JT_4_STAR_BOX_WIS1, + JT_4_STAR_BOX_WIS2, + JT_4_STAR_BOX_CRT1, + JT_4_STAR_BOX_CRT2, + JT_4_4JOB_MAURA, + JT_4_STAR_BOX_N, + JT_4_STAR_BOX_H, + JT_4_STAR_BOX_HP1, + JT_4_STAR_BOX_HP2, + JT_4_STAR_BOX_ATK1, + JT_4_STAR_BOX_ATK2, + JT_4_STAR_BOX_BARRIER1, + JT_4_STAR_BOX_BARRIER2, + JT_4_STAR_BOX_TRAP1, + JT_4_STAR_BOX_TRAP2, + JT_4_STAR_BOX_MASTER, JT_NEW_NPC_3RD_END = 19999, NPC_RANGE3_END, // Official: JT_NEW_NPC_3RD_END=19999 diff --git a/src/map/script.hpp b/src/map/script.hpp index 804d003329..eecc4edd61 100644 --- a/src/map/script.hpp +++ b/src/map/script.hpp @@ -1991,6 +1991,7 @@ enum e_hat_effects : int16{ HAT_EF_160LV_STAR_E_MBLUE, HAT_EF_99LV_SOUL_R_GRAY, HAT_EF_160LV_SOUL_R_GRAY, + HAT_EF_GEARWHEEL, HAT_EF_MAX }; diff --git a/src/map/script_constants.hpp b/src/map/script_constants.hpp index 195e4a0814..f3b7796058 100644 --- a/src/map/script_constants.hpp +++ b/src/map/script_constants.hpp @@ -3487,7 +3487,6 @@ export_constant(EFST_ABYSS_006); export_constant(EFST_ABYSS_007); export_constant(EFST_ABYSS_008); - export_constant(EFST_KAUTE); export_constant(EFST_REUSE_LIMIT_THM); export_constant(EFST_REUSE_LIMIT_TLI); export_constant(EFST_REUSE_LIMIT_TKC); @@ -3532,6 +3531,7 @@ export_constant(EFST_FLOWER_LEAF4); export_constant(EFST_MISTY_FROST); export_constant(EFST_MAGIC_POISON); + export_constant(EFST_KAUTE); export_constant(EFST_JPNONLY_TACTICS); export_constant(EFST_MADOGEAR); export_constant(EFST_DEADLY_DEFEASANCE); @@ -3565,10 +3565,10 @@ export_constant(EFST_CLIMAX_EARTH); export_constant(EFST_CLIMAX_BLOOM); export_constant(EFST_CLIMAX_CRYIMP); - export_constant(EFST_MD_Me_Potion); - export_constant(EFST_MD_Ma_Potion); - export_constant(EFST_MD_Ta_Potion); - export_constant(EFST_MD_Ra_Potion); + export_constant(EFST_MD_ME_POTION); + export_constant(EFST_MD_MA_POTION); + export_constant(EFST_MD_TA_POTION); + export_constant(EFST_MD_RA_POTION); export_constant(EFST_HOLY_OIL); export_constant(EFST_CRYSTAL_IMPACT); export_constant(EFST_SHADOW_EXCEED); @@ -3691,6 +3691,16 @@ export_constant(EFST_SPORE_EXPLOSION_DEBUFF); export_constant(EFST_DEFSCROLL); export_constant(EFST_MASSIVE_F_BLASTER); + export_constant(EFST_NOEQUIPWEAPON2); + export_constant(EFST_NOEQUIPARMOR2); + export_constant(EFST_NOEQUIPSHIELD2); + export_constant(EFST_NOEQUIPSHOES2); + export_constant(EFST_NOEQUIPPENDANT2); + export_constant(EFST_NOEQUIPEARING2); + export_constant(EFST_NOEQUIPFULL2); + export_constant(EFST_CURSE_R_CUBE); + export_constant(EFST_CURSE_B_CUBE); + export_constant(EFST_KILLING_AURA); /// @APIHOOK_END /// Do not modify code above this, since it will be automatically generated by the API again export_constant(EFST_MAX); @@ -6290,7 +6300,31 @@ export_constant_npc(JT_4_4JOB_PHANTOMBOOK2); export_constant_npc(JT_4_4JOB_PHANTOMBOOK3); export_constant_npc(JT_4_VENDING_MACHINE2); + export_constant_npc(JT_4_STAR_BOX_SCORE); + export_constant_npc(JT_4_STAR_BOX_POW1); + export_constant_npc(JT_4_STAR_BOX_POW2); + export_constant_npc(JT_4_STAR_BOX_STA1); + export_constant_npc(JT_4_STAR_BOX_STA2); + export_constant_npc(JT_4_STAR_BOX_SPL1); + export_constant_npc(JT_4_STAR_BOX_SPL2); + export_constant_npc(JT_4_STAR_BOX_CON1); + export_constant_npc(JT_4_STAR_BOX_CON2); + export_constant_npc(JT_4_STAR_BOX_WIS1); + export_constant_npc(JT_4_STAR_BOX_WIS2); + export_constant_npc(JT_4_STAR_BOX_CRT1); + export_constant_npc(JT_4_STAR_BOX_CRT2); export_constant_npc(JT_4_4JOB_MAURA); + export_constant_npc(JT_4_STAR_BOX_N); + export_constant_npc(JT_4_STAR_BOX_H); + export_constant_npc(JT_4_STAR_BOX_HP1); + export_constant_npc(JT_4_STAR_BOX_HP2); + export_constant_npc(JT_4_STAR_BOX_ATK1); + export_constant_npc(JT_4_STAR_BOX_ATK2); + export_constant_npc(JT_4_STAR_BOX_BARRIER1); + export_constant_npc(JT_4_STAR_BOX_BARRIER2); + export_constant_npc(JT_4_STAR_BOX_TRAP1); + export_constant_npc(JT_4_STAR_BOX_TRAP2); + export_constant_npc(JT_4_STAR_BOX_MASTER); export_constant_npc(JT_NEW_NPC_3RD_END); #undef export_constant_npc @@ -7543,6 +7577,7 @@ export_constant(HAT_EF_160LV_STAR_E_MBLUE); export_constant(HAT_EF_99LV_SOUL_R_GRAY); export_constant(HAT_EF_160LV_SOUL_R_GRAY); + export_constant(HAT_EF_GEARWHEEL); /* pet catch */ export_constant(PET_CATCH_UNIVERSAL); diff --git a/src/map/status.hpp b/src/map/status.hpp index fc563c224e..a6fc31307d 100644 --- a/src/map/status.hpp +++ b/src/map/status.hpp @@ -2084,10 +2084,10 @@ enum efst_types : short{ EFST_CLIMAX_EARTH = 1182, EFST_CLIMAX_BLOOM, EFST_CLIMAX_CRYIMP, - EFST_MD_Me_Potion, - EFST_MD_Ma_Potion, - EFST_MD_Ta_Potion, - EFST_MD_Ra_Potion, + EFST_MD_ME_POTION, + EFST_MD_MA_POTION, + EFST_MD_TA_POTION, + EFST_MD_RA_POTION, EFST_HOLY_OIL = 1190, EFST_CRYSTAL_IMPACT, @@ -2221,6 +2221,17 @@ enum efst_types : short{ EFST_DEFSCROLL = 1321, EFST_MASSIVE_F_BLASTER = 1326, + + EFST_NOEQUIPWEAPON2 = 1330, + EFST_NOEQUIPARMOR2, + EFST_NOEQUIPSHIELD2, + EFST_NOEQUIPSHOES2, + EFST_NOEQUIPPENDANT2, + EFST_NOEQUIPEARING2, + EFST_NOEQUIPFULL2, + EFST_CURSE_R_CUBE, + EFST_CURSE_B_CUBE, + EFST_KILLING_AURA, /// @APIHOOK_END /// Do not modify code above this, since it will be automatically generated by the API again EFST_MAX,