From f233792f53aa5009e7dab9bf95f774cfd0abc7d7 Mon Sep 17 00:00:00 2001 From: rAthenaAPI Date: Wed, 5 Dec 2018 05:01:02 +0100 Subject: [PATCH] Mob and NPC Identity Update --- db/re/mob_db.txt | 10 ++++++++++ src/map/npc.hpp | 22 ++++++++++++++++++++-- src/map/script_constants.hpp | 19 +++++++++++++++++++ 3 files changed, 49 insertions(+), 2 deletions(-) diff --git a/db/re/mob_db.txt b/db/re/mob_db.txt index 9ea1606d97..1d6604af60 100644 --- a/db/re/mob_db.txt +++ b/db/re/mob_db.txt @@ -3664,3 +3664,13 @@ //20533,G_ILL_BAPHOMET_J //20534,G_REGINLEIF //20535,G_INGRID +//20536,MD_ED_B_YGNIZEM +//20537,MD_ED_YGNIZEM +//20538,MD_ED_EREND +//20539,MD_ED_ARMAIA +//20540,MD_ED_EREMES +//20541,MD_ED_LGTHIGHGUARD +//20542,MD_ED_LGTGUARD +//20543,MD_ED_M_SCIENCE + +//20562,HIDDEN_MOB8 diff --git a/src/map/npc.hpp b/src/map/npc.hpp index 79b4c7114c..fdc9d62a08 100644 --- a/src/map/npc.hpp +++ b/src/map/npc.hpp @@ -1117,8 +1117,26 @@ enum e_job_types JT_4_M_SILVANO_D, JT_4_F_CECILIA, JT_4_F_CECILIA_D, - - JT_4_F_ERENE = 10337, + JT_4_M_MD_SEYREN, + JT_4_M_MD_EREMES, + JT_4_M_MD_HARWORD, + JT_4_F_MD_MAGALETA, + JT_4_F_MD_SHECIL, + JT_4_F_MD_KATRINN, + JT_4_M_MD_SEYREN_H, + JT_4_M_MD_EREMES_H, + JT_4_M_MD_HARWORD_H, + JT_4_F_MD_MAGALETA_H, + JT_4_F_MD_SHECIL_H, + JT_4_F_MD_KATRINN_H, + JT_4_M_MD_SEYREN_D, + JT_4_M_MD_EREMES_D, + JT_4_M_MD_HARWORD_D, + JT_4_F_MD_MAGALETA_D, + JT_4_F_MD_SHECIL_D, + JT_4_F_MD_KATRINN_D, + JT_4_F_MD_YGNIZEM, + JT_4_F_ERENE, NPC_RANGE3_END, // Official: JT_NEW_NPC_3RD_END=19999 // Unofficial diff --git a/src/map/script_constants.hpp b/src/map/script_constants.hpp index 01c8cc8d2c..45d2e57538 100644 --- a/src/map/script_constants.hpp +++ b/src/map/script_constants.hpp @@ -6078,6 +6078,25 @@ export_constant_npc(JT_4_M_SILVANO_D); export_constant_npc(JT_4_F_CECILIA); export_constant_npc(JT_4_F_CECILIA_D); + export_constant_npc(JT_4_M_MD_SEYREN); + export_constant_npc(JT_4_M_MD_EREMES); + export_constant_npc(JT_4_M_MD_HARWORD); + export_constant_npc(JT_4_F_MD_MAGALETA); + export_constant_npc(JT_4_F_MD_SHECIL); + export_constant_npc(JT_4_F_MD_KATRINN); + export_constant_npc(JT_4_M_MD_SEYREN_H); + export_constant_npc(JT_4_M_MD_EREMES_H); + export_constant_npc(JT_4_M_MD_HARWORD_H); + export_constant_npc(JT_4_F_MD_MAGALETA_H); + export_constant_npc(JT_4_F_MD_SHECIL_H); + export_constant_npc(JT_4_F_MD_KATRINN_H); + export_constant_npc(JT_4_M_MD_SEYREN_D); + export_constant_npc(JT_4_M_MD_EREMES_D); + export_constant_npc(JT_4_M_MD_HARWORD_D); + export_constant_npc(JT_4_F_MD_MAGALETA_D); + export_constant_npc(JT_4_F_MD_SHECIL_D); + export_constant_npc(JT_4_F_MD_KATRINN_D); + export_constant_npc(JT_4_F_MD_YGNIZEM); export_constant_npc(JT_4_F_ERENE); #undef export_constant_npc