Browse Source

Added some new NPC constants and mob placeholders

Lemongrass3110 8 years ago
parent
commit
575583d0a6
5 changed files with 111 additions and 1 deletions
  1. 29 0
      db/const.txt
  2. 53 0
      db/re/mob_db.txt
  3. 1 1
      src/map/npc.h
  4. 9 0
      src/map/script_constants.h
  5. 19 0
      src/map/status.h

+ 29 - 0
db/const.txt

@@ -2247,9 +2247,38 @@ THANATOS_KEEP	10009
 4_F_REBELLION2	10201
 4_F_REBELLION3	10202
 4_M_ILYA	10203
+
 4_ELDER	10205
 4_LUNATIC	10206
 4_F_NOVICE2	10207
+4_WICKEDNYMPH	10208
+4_F_PREMI	10209
+4_M_COSTELL	10210
+4_M_YATTWARP	10211
+4_M_EVOKASCUDI	10212
+4_M_JOHNNYJAMES	10213
+4_M_ALBERTFORD	10214
+4_M_SEANMCCURDY	10215
+4_M_KARAMPUCCI	10216
+4_M_CACTUSMAN1	10217
+4_M_CACTUSMAN2	10218
+4_M_CACTUSMAN3	10219
+4_M_CACTUSLADY	10220
+4_M_GAST	10221
+4_M_CACTUSCHILD	10222
+4_KING	10223
+4_F_BOMI	10224
+4_M_CACTUSCHIEF	10225
+4_F_CACTUSCHILD2	10226
+4_F_CACTUSLADY2	10227
+4_F_CACTUSLADY3	10228
+4_M_CACTUS	10229
+4_M_COWRAIDERS1	10230
+4_M_COWRAIDERS2	10231
+4_M_COWRAIDERS3	10232
+4_F_JP14THEVT	10233
+4_M_POORSCHOLAR	10234
+4_M_PEPPERROTI	10235
 
 SWORDCLAN	1
 ARCWANDCLAN	2

+ 53 - 0
db/re/mob_db.txt

@@ -2890,3 +2890,56 @@
 //3733,JP_ABYSS_BOSS_2
 //3734,ORC_X2016
 //3735,PORING_X2016
+//3736,COWRAIDERS1
+//3737,COWRAIDERS2
+//3738,COWRAIDERS3
+//3739,COYOTE
+//3740,GASTER
+//3741,MECHASPIDER
+//3742,PURPLESTONE
+//3743,SEAANEMONE
+//3744,G_COWRAIDERS1
+//3745,G_COWRAIDERS2
+//3746,G_COWRAIDERS3
+//3747,E_COWRAIDERS1
+//3748,E_COWRAIDERS2
+//3749,E_COWRAIDERS3
+//3750,ILL_DRAINLIAR
+//3751,ILL_ZOMBIE_C
+//3752,ILL_ZOMBIE
+//3753,ILL_GHOUL
+//3754,ILL_NIGHTMARE
+//3755,ILL_BLACK_MUSHROOM
+//3756,ILL_BOMI
+//3757,ILL_DRACULA
+//3758,ILL_MOONLIGHT
+//3759,ILL_NINE_TAIL
+//3760,ILL_MUNAK
+//3761,ILL_BON_GUN
+//3762,ILL_SOHEE
+//3763,ILL_ARCHER_SKELETON
+//3764,ILL_HIGHWIZARD
+//3765,ILL_FURY_HERO
+//3766,JP_E_MONSTER_53
+//3767,JP_E_MONSTER_54
+//3768,JP_E_MONSTER_55
+//3769,JP_E_MONSTER_56
+//3770,JP_E_MONSTER_57
+//3771,JP_E_MONSTER_58
+//3772,JP_E_MONSTER_59
+//3773,JP_E_MONSTER_60
+//3774,JP_E_MONSTER_61
+//3775,JP_E_MONSTER_62
+//3776,JP_E_MONSTER_63
+//3777,JP_E_MONSTER_64
+//3778,JP_E_MONSTER_65
+//3779,JP_E_MONSTER_66
+//3780,JP_E_MONSTER_67
+//3781,JP_E_MONSTER_68
+//3782,JP_E_MONSTER_69
+//3783,JP_E_MONSTER_70
+//3784,JP_E_MONSTER_71
+//3785,JP_E_MONSTER_72
+//3786,E_TURPECO
+//3787,RR_ARCLOUSE
+//3788,RR_CRAMP

+ 1 - 1
src/map/npc.h

@@ -108,7 +108,7 @@ enum actor_classes
 #define MAX_NPC_CLASS 1000
 // New NPC range
 #define MAX_NPC_CLASS2_START 10000
-#define MAX_NPC_CLASS2_END 10208
+#define MAX_NPC_CLASS2_END 10236
 
 //Checks if a given id is a valid npc id. [Skotlex]
 //Since new npcs are added all the time, the max valid value is the one before the first mob (Scorpion = 1001)

+ 9 - 0
src/map/script_constants.h

@@ -2475,9 +2475,18 @@
 	export_constant(SI_EP16_2_BUFF_AC);
 	export_constant(SI_GS_MAGICAL_BULLET);
 	export_constant(SI_FALLEN_ANGEL);
+	export_constant(SI_BLAZE_BEAD);
+	export_constant(SI_FROZEN_BEAD);
+	export_constant(SI_BREEZE_BEAD);
+	export_constant(SI_AID_PERIOD_RECEIVEITEM_2ND);
+	export_constant(SI_AID_PERIOD_PLUSEXP_2ND);
+	export_constant(SI_AID_PERIOD_PLUSJOBEXP_2ND);
+	export_constant(SI_PRONTERA_JP);
 	export_constant(SI_GLOOM_CARD);
 	export_constant(SI_PHARAOH_CARD);
 	export_constant(SI_KIEL_CARD);
+	export_constant(SI_S_MANAPOTION);
+	export_constant(SI_M_DEFSCROLL);
 
 	/* elements */
 	export_constant(ELE_NEUTRAL);

+ 19 - 0
src/map/status.h

@@ -1677,6 +1677,7 @@ enum si_type {
 	SI_CHERRY_BLOSSOM_CAKE = 892,
 	SI_SU_STOOP = 893,
 	SI_CATNIPPOWDER = 894,
+
 	SI_SV_ROOTTWIST = 896,
 	SI_ATTACK_PROPERTY_NOTHING = 897,
 	SI_ATTACK_PROPERTY_WATER = 898,
@@ -1723,19 +1724,37 @@ enum si_type {
 	SI_AID_PERIOD_PLUSJOBEXP = 940,
 	SI_AID_PERIOD_DEADPENALTY = 941,
 	SI_AID_PERIOD_ADDSTOREITEMCOUNT = 942,
+
 	SI_HISS = 950,
+
 	SI_NYANGGRASS = 952,
 	SI_CHATTERING = 953,
+
 	SI_GROOMING = 961,
 	SI_PROTECTIONOFSHRIMP = 962,
 	SI_EP16_2_BUFF_SS = 963,
 	SI_EP16_2_BUFF_SC = 964,
 	SI_EP16_2_BUFF_AC = 965,
 	SI_GS_MAGICAL_BULLET = 966,
+
 	SI_FALLEN_ANGEL = 976,
+
+	SI_BLAZE_BEAD = 979,
+	SI_FROZEN_BEAD = 980,
+	SI_BREEZE_BEAD = 981,
+
+	SI_AID_PERIOD_RECEIVEITEM_2ND = 983,
+	SI_AID_PERIOD_PLUSEXP_2ND = 984,
+	SI_AID_PERIOD_PLUSJOBEXP_2ND = 985,
+	SI_PRONTERA_JP = 986,
+
 	SI_GLOOM_CARD = 988,
 	SI_PHARAOH_CARD = 989,
 	SI_KIEL_CARD = 990,
+
+	SI_S_MANAPOTION = 995,
+	SI_M_DEFSCROLL = 996,
+
 	SI_MAX,
 };