diff --git a/db/re/mob_db.yml b/db/re/mob_db.yml index 9cd0d40522..f293ee95e8 100644 --- a/db/re/mob_db.yml +++ b/db/re/mob_db.yml @@ -92931,6 +92931,72 @@ Body: # AegisName: SEASON_MOB_105 # - Id: 21508 # AegisName: SEASON_MOB_106 +# - Id: 21513 +# AegisName: EP19_NPC_IWIN +# - Id: 21514 +# AegisName: EP19_NPC_IWIN_SN +# - Id: 21515 +# AegisName: EP19_NPC_IWIN_SY +# - Id: 21516 +# AegisName: EP19_NPC_IWIN_SB +# - Id: 21517 +# AegisName: EP19_NPC_IWIN_SG +# - Id: 21518 +# AegisName: EP19_NPC_IWIN_SR +# - Id: 21519 +# AegisName: EP19_NPC_LEHAR +# - Id: 21520 +# AegisName: EP19_LIMACINA +# - Id: 21521 +# AegisName: EP19_UNFROST_FLOWER +# - Id: 21522 +# AegisName: EP19_CALMARING +# - Id: 21523 +# AegisName: EP19_ICE_STRAW +# - Id: 21524 +# AegisName: EP19_SHINING_SEAWEED +# - Id: 21525 +# AegisName: EP19_ICE_GANGU +# - Id: 21526 +# AegisName: EP19_RGAN_A +# - Id: 21527 +# AegisName: EP19_RGAN_B +# - Id: 21528 +# AegisName: EP19_RGAN_C +# - Id: 21529 +# AegisName: EP19_RGAN_D +# - Id: 21530 +# AegisName: EP19_RGAN_E +# - Id: 21531 +# AegisName: EP19_MD_AQUILA +# - Id: 21532 +# AegisName: EP19_MD_JUNCEA +# - Id: 21533 +# AegisName: EP19_MD_JUNCEA_S +# - Id: 21534 +# AegisName: EP19_MD_RGAN_E +# - Id: 21535 +# AegisName: EP19_MD_RGAN_D +# - Id: 21536 +# AegisName: EP19_MD_HEARTHUNTER_AT +# - Id: 21537 +# AegisName: EP19_LIMACINA_BOSS +# - Id: 21538 +# AegisName: EP19_WASTED_RGAN_A +# - Id: 21539 +# AegisName: EP19_WASTED_RGAN_C +# - Id: 21540 +# AegisName: EP19_CAVE_CALMARING +# - Id: 21541 +# AegisName: EP19_CAVE_FLOWER +# - Id: 21542 +# AegisName: EP19_HALLUCIGENIA +# - Id: 21543 +# AegisName: EP19_HALLUCIGENIA_BABY +# - Id: 21544 +# AegisName: EP19_ONE_EYE_DOLLOCARIS +# - Id: 21545 +# AegisName: EP19_DOLLOCARIS # - Id: 21546 # AegisName: MD_COMMON # - Id: 21547 @@ -93003,6 +93069,34 @@ Body: # AegisName: G_BIJOU # - Id: 21587 # AegisName: NPC_EDDGA +# - Id: 21588 +# AegisName: EP19_MD_AQUILA_B +# - Id: 21589 +# AegisName: G_EP19_LIMACINA +# - Id: 21590 +# AegisName: EP19_MD_RGAN_ES +# - Id: 21591 +# AegisName: E_CRYSTAL_C +# - Id: 21592 +# AegisName: E_CRYSTAL_B +# - Id: 21593 +# AegisName: E_CRYSTAL_A +# - Id: 21594 +# AegisName: E_CRYSTAL_S +# - Id: 21595 +# AegisName: E_CRYSTAL_SS +# - Id: 21596 +# AegisName: TIGER_MAFIA +# - Id: 21597 +# AegisName: RED_RAIN +# - Id: 21598 +# AegisName: CHEWY_TTEOK +# - Id: 21599 +# AegisName: EP19_HEARTHUNTER_AT +# - Id: 21600 +# AegisName: EP19_RE_RGAN_E +# - Id: 21601 +# AegisName: EP19_ET_RGAN_D # - Id: 22328 # AegisName: DESERT_WOLF_RAC # - Id: 22329 diff --git a/src/map/npc.hpp b/src/map/npc.hpp index a5704c4b5a..6e55fdeeb7 100644 --- a/src/map/npc.hpp +++ b/src/map/npc.hpp @@ -1365,8 +1365,32 @@ enum e_job_types JT_ROZ_MQ_SAHARIO, JT_ROZ_MQ_SUPIGEL, JT_ROZ_MQ_DEADSOLDIER, - - JT_1_RAGFES_01 = 10476, + JT_4_EP19_ZORYARA, + JT_4_EP19_MORYARA, + JT_4_EP19_LUNCH, + JT_4_EP19_LAZY, + JT_4_EP19_JUNCEA, + JT_4_EP19_JUNCEA_M, + JT_4_EP19_JUNCEA_D, + JT_4_EP19_FRIEDERIKE, + JT_4_EP19_SUITCASE, + JT_4_EP19_HEALROCK, + JT_4_EP19_IWIN, + JT_4_EP19_IWIN_DIVER, + JT_4_EP19_TAMARIN, + JT_4_EP19_LEON, + JT_4_EP19_AURELIE, + JT_4_EP19_LASGAND, + JT_4_EP19_VOGLINDE, + JT_4_EP19_VELLGUNDE, + JT_4_EP19_LEHAR, + JT_4_EP19_RGAN_R1, + JT_4_EP19_RGAN_R2, + JT_4_EP19_RGAN_R3, + JT_4_EP19_RGAN_SR1, + JT_4_EP19_RGAN_SR2, + JT_4_EP19_RGAN_SR3, + JT_1_RAGFES_01, JT_1_RAGFES_01_M, JT_4_RAGFES_02, JT_4_RAGFES_02_M, diff --git a/src/map/script_constants.hpp b/src/map/script_constants.hpp index ab42d4551c..5891f7b9a7 100644 --- a/src/map/script_constants.hpp +++ b/src/map/script_constants.hpp @@ -3611,6 +3611,7 @@ export_constant(EFST_AID_PERIOD_DEADPENALTY); export_constant(EFST_AID_PERIOD_ADDSTOREITEMCOUNT); export_constant(EFST_ALL_GLASTHEIM_RECALL); + export_constant(EFST_REUSE_LIMIT_PEPO_MD); export_constant(EFST_ALL_THANATOS_RECALL); export_constant(EFST_MAGICSTONE_OF_GRACE_SET); export_constant(EFST_HISS); @@ -3980,6 +3981,7 @@ export_constant(EFST_RUSH_QUAKE1); export_constant(EFST_RUSH_QUAKE2); export_constant(EFST_SBUNSHIN); + export_constant(EFST_MTP_W_POTION_100); /// @APIHOOK_END /// Do not modify code above this, since it will be automatically generated by the API again export_constant(EFST_MAX); @@ -6711,6 +6713,31 @@ export_constant_npc(JT_ROZ_MQ_SAHARIO); export_constant_npc(JT_ROZ_MQ_SUPIGEL); export_constant_npc(JT_ROZ_MQ_DEADSOLDIER); + export_constant_npc(JT_4_EP19_ZORYARA); + export_constant_npc(JT_4_EP19_MORYARA); + export_constant_npc(JT_4_EP19_LUNCH); + export_constant_npc(JT_4_EP19_LAZY); + export_constant_npc(JT_4_EP19_JUNCEA); + export_constant_npc(JT_4_EP19_JUNCEA_M); + export_constant_npc(JT_4_EP19_JUNCEA_D); + export_constant_npc(JT_4_EP19_FRIEDERIKE); + export_constant_npc(JT_4_EP19_SUITCASE); + export_constant_npc(JT_4_EP19_HEALROCK); + export_constant_npc(JT_4_EP19_IWIN); + export_constant_npc(JT_4_EP19_IWIN_DIVER); + export_constant_npc(JT_4_EP19_TAMARIN); + export_constant_npc(JT_4_EP19_LEON); + export_constant_npc(JT_4_EP19_AURELIE); + export_constant_npc(JT_4_EP19_LASGAND); + export_constant_npc(JT_4_EP19_VOGLINDE); + export_constant_npc(JT_4_EP19_VELLGUNDE); + export_constant_npc(JT_4_EP19_LEHAR); + export_constant_npc(JT_4_EP19_RGAN_R1); + export_constant_npc(JT_4_EP19_RGAN_R2); + export_constant_npc(JT_4_EP19_RGAN_R3); + export_constant_npc(JT_4_EP19_RGAN_SR1); + export_constant_npc(JT_4_EP19_RGAN_SR2); + export_constant_npc(JT_4_EP19_RGAN_SR3); export_constant_npc(JT_1_RAGFES_01); export_constant_npc(JT_1_RAGFES_01_M); export_constant_npc(JT_4_RAGFES_02); diff --git a/src/map/status.hpp b/src/map/status.hpp index 18ad9413a5..887b8bb4b5 100644 --- a/src/map/status.hpp +++ b/src/map/status.hpp @@ -2113,8 +2113,8 @@ enum efst_types : short{ EFST_AID_PERIOD_DEADPENALTY, EFST_AID_PERIOD_ADDSTOREITEMCOUNT, EFST_ALL_GLASTHEIM_RECALL, - - EFST_ALL_THANATOS_RECALL = 945, + EFST_REUSE_LIMIT_PEPO_MD, + EFST_ALL_THANATOS_RECALL, EFST_MAGICSTONE_OF_GRACE_SET = 948, @@ -2525,6 +2525,8 @@ enum efst_types : short{ EFST_RUSH_QUAKE2, EFST_SBUNSHIN = 1415, + + EFST_MTP_W_POTION_100 = 1418, /// @APIHOOK_END /// Do not modify code above this, since it will be automatically generated by the API again EFST_MAX,