summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db/constants.conf34
-rw-r--r--src/map/npc.h2
2 files changed, 35 insertions, 1 deletions
diff --git a/db/constants.conf b/db/constants.conf
index c3b1fdb57..998688aa4 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -3554,6 +3554,40 @@ constants_db: {
4_M_AC_RUMIN: 10246
4_M_HIGH_WIZARD: 10247
4_SYSTEM_BOX: 10248
+ 4_STEELBOX: 10249
+ 4_WOODBOX: 10250
+ 4_M_POPFESTA: 10251
+ 4_BONFIRE: 10252
+ 4_PCCOUNT: 10253
+ 4_SCATLETON: 10271
+ 4_JJAK: 10280
+ 4_M_SNOWMAN_B: 10281
+ 4_M_SNOWMAN_R: 10282
+ 4_M_SNOWMAN_G: 10283
+ 4_F_DANGDANG: 10286
+ 4_M_DANGDANG: 10287
+ 4_F_DANGDANG1: 10288
+ 4_LEAFCAT: 10289
+ 4_NASARIAN: 10290
+ 4_NASARIAN_EM: 10291
+ 4_TEDDY_BEAR_W: 10292
+ 4_TEDDY_BEAR_B: 10293
+ 4_TEDDY_BEAR_B_L: 10294
+ 4_M_SOULREAPER: 10295
+ 4_F_SE_SUN: 10296
+ 4_M_SE_MOON: 10297
+ 4_M_SE_STAR: 10298
+ 4_EP17_KAYA: 10299
+ 4_EP17_AS: 10300
+ 4_EP17_ELYUMINA: 10301
+ 4_EP17_MORNING: 10302
+ 4_EP17_MIGUEL: 10303
+ 4_EP17_NIHIL_K: 10304
+ 4_EP17_MIGUEL_D: 10305
+ 4_ED_SCHMIDT: 10306
+ 4_ED_OSCAR: 10307
+ 4_ED_ORB: 10308
+ 4_ED_FENCE: 10309
comment__: "Mercenary IDs"
MER_LIF: 6001
diff --git a/src/map/npc.h b/src/map/npc.h
index eff4ed4ec..ed5f4138d 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -144,7 +144,7 @@ enum actor_classes {
#define MAX_NPC_CLASS 1000
// New NPC range
#define MAX_NPC_CLASS2_START 10001
-#define MAX_NPC_CLASS2_END 10248
+#define MAX_NPC_CLASS2_END 10310
//Script NPC events.
enum npce_event {