From 152b4bd6a349c5c499a9603624ff50f0137f090b Mon Sep 17 00:00:00 2001 From: rAthenaAPI Date: Tue, 9 Jun 2020 06:00:30 +0200 Subject: [PATCH] Mob and NPC Identity Update --- db/re/mob_db.txt | 144 ++++++++++++++++++++++++++++++++++- src/map/npc.hpp | 12 +++ src/map/script_constants.hpp | 11 +++ 3 files changed, 165 insertions(+), 2 deletions(-) diff --git a/db/re/mob_db.txt b/db/re/mob_db.txt index 8bd5ff4c9f..19d1946394 100644 --- a/db/re/mob_db.txt +++ b/db/re/mob_db.txt @@ -3978,6 +3978,10 @@ //20845,SMILE_GIVER //20846,MD_HIDDEN_GROUND01 //20847,MD_HIDDEN_GROUND02 +//20848,SUMMON_WOODENWARRIOR +//20849,SUMMON_WOODEN_FAIRY +//20850,SUMMON_CREEPER +//20851,SUMMON_HELLTREE //20856,MD_N_ARENA_1 //20857,MD_N_ARENA_2 @@ -3998,7 +4002,8 @@ //20872,MD_GEFFEN_FENRIR_N //20873,WAR_NUT //20874,MOLE_TW - +//20875,4JOB_LETICIA +//20876,4JOB_ACIDUS //20877,G_ILL_SROPHO //20878,G_ILL_OBEAUNE //20879,G_ILL_DEVIACE @@ -4008,7 +4013,21 @@ //20883,G_ILL_SWORD_FISH //20884,G_ILL_STROUF //20885,G_ILL_PHEN - +//20886,MD_Airboat_Tree +//20887,MD_Airboat_Poring +//20888,MD_Airboat_Worm +//20889,MD_Airboat_LEECH +//20890,MD_Airboat_Mos +//20891,MD_Airboat_Boss +//20892,MD_SAKRAY +//20893,MD_TIARA +//20894,MD_UNDEAD_KNIGHT +//20895,MD_UNDEAD_SOLDIER +//20896,MD_UNDEAD_ARCHER +//20897,MD_UNDEAD_WIZARD +//20898,MD_UNDEAD_MAGICIAN +//20899,MD_UNDEAD_NOBLE +//20900,MD_UNDEAD_SERVANT //20901,DISASTER_OMEN //20902,DISASTER_WIND //20903,CONQUER_INCARNATION @@ -4028,6 +4047,127 @@ //20917,G_SINS_MODERATION //20918,G_SINS_WISDOM //20919,CARAT_TWEVENT +//20920,CHIMERA_LAVA +//20921,CHIMERA_FULGOR +//20922,CHIMERA_NAPEO +//20923,CHIMERA_GALENSIS +//20924,CHIMERA_AMITERA +//20925,CHIMERA_LITUS +//20926,CHIMERA_FILLIA +//20927,CHIMERA_VANILAQUS +//20928,CHIMERA_THEONE +//20929,GIANT_CAPUT +//20930,DOLORIAN +//20931,PLAGARION +//20932,DEADRE +//20933,VENEDI +//20934,R001_BESTIA +//20935,GAN_CEANN +//20936,DISGUISER +//20937,BRUTAL_MURDERER +//20938,GHOST_CUBE +//20939,LUDE_GAL +//20940,BLUEMOON_LOLI_RURI +//20941,GROTE +//20942,PIERROTZOIST +//20943,DEATH_WITCH + +//20994,MD_BETELGEUSE +//20995,MD_G_DEADSOUL +//20996,MD_NAGHT_SIEGER +//20997,MD_G_ENTWEIHEN_M +//20998,MD_T_JAKK +//20999,MD_T_STONE_SHOOTER +//21000,MD_T_GRIZZLY +//21001,MD_T_STALACTIC_GOLEM +//21002,MD_T_CHIMERA +//21003,MD_T_KARAKASA +//21004,MD_T_RIDEWORD +//21005,MD_T_PARASITE +//21006,MD_T_WRAITH +//21007,MD_T_PETIT_ +//21008,MD_T_WIND_GHOST +//21009,MD_T_CLOCK +//21010,MD_T_RAYDRIC_ARCHER +//21011,MD_T_INCREASE_SOIL +//21012,MD_T_PENOMENA +//21013,MD_T_PETIT +//21014,MD_T_ALARM +//21015,MD_T_ZOMBIE_PRISONER +//21016,MD_T_MARIONETTE +//21017,MD_T_PERMETER +//21018,MD_T_SKEL_PRISONER +//21019,MD_T_OWL_DUKE +//21020,MD_T_DEVIRUCHI +//21021,MD_T_BLOOD_BUTTERFLY +//21022,MD_T_STAPO +//21023,MD_T_EVIL_CLOUD_HERMIT +//21024,MD_T_THE_PAPER +//21025,MD_T_TENGU +//21026,MD_T_ALICE +//21027,MD_T_ANACONDAQ +//21028,MD_T_GARGOYLE +//21029,MD_T_CARAT +//21030,MD_T_STING +//21031,MD_T_GRYPHON +//21032,MD_T_GIBBET +//21033,MD_T_NIGHTMARE_TERROR +//21034,MD_T_ANOLIAN +//21035,MD_T_BLOODY_MURDERER +//21036,MD_T_ALIOT +//21037,MD_T_VENATU +//21038,MD_T_DEATHWORD +//21039,MD_T_PLASMA_B +//21040,MD_T_DIMIK +//21041,MD_T_MINI_DEMON +//21042,MD_T_LEIB_OLMAI +//21043,MD_T_WANDER_MAN +//21044,MD_T_RETRIBUTION +//21045,MD_T_FLAME_SKULL +//21046,MD_T_KNIGHT_OF_ABYSS +//21047,MD_T_BANSHEE +//21048,G_CHIMERA_LAVA +//21049,G_CHIMERA_FULGOR +//21050,G_CHIMERA_NAPEO +//21051,G_CHIMERA_GALENSIS +//21052,G_DISGUISER +//21053,G_BLUEMOON_LOLI_RURI +//21054,G_GROTE +//21055,G_PIERROTZOIST +//21056,G_GIANT_CAPUT +//21057,G_DOLORIAN +//21058,G_PLAGARION +//21059,G_DEADRE +//21060,G_VENEDI +//21061,MD_Airboat_Boss2 +//21062,MD_Airboat_Boss3 +//21063,MD_Airboat_Boss4 +//21064,S_DUMMY_100_SMALL +//21065,S_DUMMY_100_MEDIUM +//21066,S_DUMMY_100_LARGE +//21067,S_DUMMY_100_NOTHING +//21068,S_DUMMY_100_DRAGON +//21069,S_DUMMY_100_ANIMAL +//21070,S_DUMMY_100_HUMAN +//21071,S_DUMMY_100_INSECT +//21072,S_DUMMY_100_FISH +//21073,S_DUMMY_100_DEMON +//21074,S_DUMMY_100_PLANT +//21075,S_DUMMY_100_ANGEL +//21076,S_DUMMY_100_UNDEAD +//21077,S_DUMMY_100_NOTHING2 +//21078,S_DUMMY_100_WATER +//21079,S_DUMMY_100_GROUND +//21080,S_DUMMY_100_FIRE +//21081,S_DUMMY_100_WIND +//21082,S_DUMMY_100_POISON +//21083,S_DUMMY_100_SAINT +//21084,S_DUMMY_100_DARKNESS +//21085,S_DUMMY_100_TELEKINESIS +//21086,S_DUMMY_100_UNDEAD2 +//21087,S_DUMMY_100_HUMANP +//21088,S_DUMMY_100_DORAMP +//21089,WANDERING_DUCK //31999,HUNTING_GID_DEFAULT //32000,MONSTER_2ND_END diff --git a/src/map/npc.hpp b/src/map/npc.hpp index e573a4f22c..740b221a39 100644 --- a/src/map/npc.hpp +++ b/src/map/npc.hpp @@ -1176,6 +1176,18 @@ enum e_job_types JT_4_JP_AB_NPC_009, JT_4_JP_AB_NPC_010, + JT_4_4JOB_SILLA = 10364, + JT_4_4JOB_MAGGI, + JT_4_4JOB_ROBIN, + JT_4_4JOB_ROBIN_DRUNK, + JT_4_4JOB_LETICIA, + JT_4_4JOB_SERANG, + JT_4_4JOB_EINHAR, + JT_4_4JOB_SEALSTONE, + JT_4_4JOB_PHANTOMBOOK1, + JT_4_4JOB_PHANTOMBOOK2, + JT_4_4JOB_PHANTOMBOOK3, + JT_NEW_NPC_3RD_END = 19999, NPC_RANGE3_END, // Official: JT_NEW_NPC_3RD_END=19999 diff --git a/src/map/script_constants.hpp b/src/map/script_constants.hpp index d25102976f..e8f496d757 100644 --- a/src/map/script_constants.hpp +++ b/src/map/script_constants.hpp @@ -6106,6 +6106,17 @@ export_constant_npc(JT_4_EP17_MERMAID); export_constant_npc(JT_4_JP_AB_NPC_009); export_constant_npc(JT_4_JP_AB_NPC_010); + export_constant_npc(JT_4_4JOB_SILLA); + export_constant_npc(JT_4_4JOB_MAGGI); + export_constant_npc(JT_4_4JOB_ROBIN); + export_constant_npc(JT_4_4JOB_ROBIN_DRUNK); + export_constant_npc(JT_4_4JOB_LETICIA); + export_constant_npc(JT_4_4JOB_SERANG); + export_constant_npc(JT_4_4JOB_EINHAR); + export_constant_npc(JT_4_4JOB_SEALSTONE); + export_constant_npc(JT_4_4JOB_PHANTOMBOOK1); + export_constant_npc(JT_4_4JOB_PHANTOMBOOK2); + export_constant_npc(JT_4_4JOB_PHANTOMBOOK3); export_constant_npc(JT_NEW_NPC_3RD_END); #undef export_constant_npc