From 550d2b8007beafe15561dab624e32c12631b0c70 Mon Sep 17 00:00:00 2001 From: Emistry Haoyan Date: Tue, 13 Aug 2019 23:17:12 +0800 Subject: Update NPC Identity - npc id constant --- db/constants.conf | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/map/npc.h | 2 +- 2 files changed, 61 insertions(+), 1 deletion(-) diff --git a/db/constants.conf b/db/constants.conf index 1d6d295c0..3d1f9202d 100644 --- a/db/constants.conf +++ b/db/constants.conf @@ -3577,11 +3577,38 @@ constants_db: { 4_M_POPFESTA: 10251 4_BONFIRE: 10252 4_PCCOUNT: 10253 + 4_LAVAGOLEM: 10254 + 4_F_IA: 10255 + 4_LOCKE: 10256 + 4_LIL_LIF: 10257 + 4_LIL_LIF2: 10258 + 4_F_DRAGONHAT: 10259 + 4_M_DRAGONHAT: 10260 + JP_NPC02: 10261 + JP_NPC03: 10262 + JP_NPC04: 10263 + JP_NPC05: 10264 + JP_NPC06: 10265 + JP_NPC07: 10266 + JP_NPC08: 10267 + JP_NPC09: 10268 + JP_NPC10: 10269 + 4_FIRERING: 10270 4_SCATLETON: 10271 + 4_JP_AB_NPC_001: 10272 + 4_JP_AB_NPC_002: 10273 + 4_JP_AB_NPC_003: 10274 + 4_JP_AB_NPC_004: 10275 + 4_JP_AB_NPC_005: 10276 + 4_JP_AB_NPC_006: 10277 + 4_JP_AB_NPC_007: 10278 + 4_JP_AB_NPC_008: 10279 4_JJAK: 10280 4_M_SNOWMAN_B: 10281 4_M_SNOWMAN_R: 10282 4_M_SNOWMAN_G: 10283 + WARPEFFECTNPC: 10284 + 4_HEN: 10285 4_F_DANGDANG: 10286 4_M_DANGDANG: 10287 4_F_DANGDANG1: 10288 @@ -3606,6 +3633,39 @@ constants_db: { 4_ED_OSCAR: 10307 4_ED_ORB: 10308 4_ED_FENCE: 10309 + 4_M_ANDREA: 10310 + 4_M_ANDREA_D: 10311 + 4_F_ANES: 10312 + 4_F_ANES_D: 10313 + 4_M_SILVANO: 10314 + 4_M_SILVANO_D: 10315 + 4_F_CECILIA: 10316 + 4_F_CECILIA_D: 10317 + 4_M_MD_SEYREN: 10318 + 4_M_MD_EREMES: 10319 + 4_M_MD_HARWORD: 10320 + 4_F_MD_MAGALETA: 10321 + 4_F_MD_SHECIL: 10322 + 4_F_MD_KATRINN: 10323 + 4_M_MD_SEYREN_H: 10324 + 4_M_MD_EREMES_H: 10325 + 4_M_MD_HARWORD_H: 10326 + 4_F_MD_MAGALETA_H: 10327 + 4_F_MD_SHECIL_H: 10328 + 4_F_MD_KATRINN_H: 10329 + 4_M_MD_SEYREN_D: 10330 + 4_M_MD_EREMES_D: 10331 + 4_M_MD_HARWORD_D: 10332 + 4_F_MD_MAGALETA_D: 10333 + 4_F_MD_SHECIL_D: 10334 + 4_F_MD_KATRINN_D: 10335 + 4_F_MD_YGNIZEM: 10336 + 4_F_ERENE: 10337 + 4_M_EINCPTMINER: 10338 + 4_F_EINRESERCHER: 10339 + 4_F_REINDEER: 10340 + 4_PIGOCTO: 10341 + 4_JP_16TH: 10343 comment__: "Mercenary IDs" MER_LIF: 6001 diff --git a/src/map/npc.h b/src/map/npc.h index 2819cbd87..dab6f7c9b 100644 --- a/src/map/npc.h +++ b/src/map/npc.h @@ -149,7 +149,7 @@ enum actor_classes { #define MAX_NPC_CLASS 1000 // New NPC range #define MAX_NPC_CLASS2_START 10001 -#define MAX_NPC_CLASS2_END 10310 +#define MAX_NPC_CLASS2_END 10344 //Script NPC events. enum npce_event { -- cgit v1.2.3-60-g2f50