diff options
| author | Dastgir <dastgir@users.noreply.github.com> | 2015-11-16 18:42:51 +0530 |
|---|---|---|
| committer | Dastgir <dastgir@users.noreply.github.com> | 2015-11-16 18:42:51 +0530 |
| commit | 44a79fd2d56ca8c9ec0a13eb3ce206d940e0d4ae (patch) | |
| tree | 61f4e85c39417148abbcb02fbd0de16493143524 | |
| parent | 847a0ef43121d6c7422197861f224e68421c1bae (diff) | |
| parent | 1c98c39607036854882e94fc4343fee3d14dcf50 (diff) | |
| download | hercules-44a79fd2d56ca8c9ec0a13eb3ce206d940e0d4ae.tar.gz hercules-44a79fd2d56ca8c9ec0a13eb3ce206d940e0d4ae.tar.bz2 hercules-44a79fd2d56ca8c9ec0a13eb3ce206d940e0d4ae.tar.xz hercules-44a79fd2d56ca8c9ec0a13eb3ce206d940e0d4ae.zip | |
Merge pull request #869 from Jedzkie/ItemDB_Updates
Update new NPC ID's.
| -rw-r--r-- | db/const.txt | 61 | ||||
| -rw-r--r-- | src/map/npc.h | 2 |
2 files changed, 62 insertions, 1 deletions
diff --git a/db/const.txt b/db/const.txt index 792f8f56e..d8895f554 100644 --- a/db/const.txt +++ b/db/const.txt @@ -3252,6 +3252,67 @@ THANATOS_KEEP 10009 4_JP_EDGA_H 10111 4_JP_BRAGOLEM_H 10112 4_EL_AQUA 10113 +4_EP16_NIHIL 10114 +4_EP16_SPICA 10115 +4_EP16_SKIA 10116 +4_EP16_PETER 10117 +4_EP16_CRUX 10118 +4_EP16_GRANZ 10119 +4_EP16_STOLZ 10120 +4_EP16_EGEO 10121 +4_EP16_COOK 10122 +4_EP16_MARK 10123 +4_EP16_TAMARIN 10124 +4_EP16_POE 10125 +4_EP16_ISAAC 10126 +4_EP16_HELMUT 10127 +4_EP16_WOLF 10128 +4_EP16_MEYER 10129 +4_EP16_AGNES 10130 +4_EP16_FOOD 10131 +4_EP16_LOUVIERE 10132 +4_EP16_MAX 10133 +4_EP16_SPIEGEL 10134 +4_MOONLIGHT 10135 +4_MISTRESS 10136 +4_DRACULA 10137 +4_STORMKNIGHT 10138 +4_TATTER 10139 +4_AS_RAGGED_GOLEM 10140 +4_AS_BLOODY_KNIGHT 10141 +4_AS_WIND_GHOST 10142 +4_F_BIJOU 10143 +4_EP16_COOK2 10144 +4_SERVICE_30_M_01 10145 +4_SERVICE_30_F_01 10146 +4_SCR_AT_ROBOTS 10147 +4_F_RANGER 10148 +4_WAG 10149 +4_NPC_TRAP 10150 +4_RAGGLER 10151 +4_DR_PEPE 10152 +4_DR_GAMBERI 10153 +4_DR_AGLIO 10154 +4_DR_OLIO 10155 +4_DR_STELO 10156 +4_DR_TORTEL 10157 +4_BASIL_STAVE 10158 +4_DOU_JINDO 10159 +4_DOU_SIBA 10160 +4_TARUTUPI 10161 +4_DR_SOLDIER 10162 +4_DR_M_01 10163 +4_DR_M_02 10164 +4_DR_F_01 10165 +4_DR_F_02 10166 +4_DR_KID_01 10167 +4_JP_2015EVT 10168 +4_ALLIGATOR 10169 +4_ANOLIAN 10170 +4_TACNU 10171 +4_CENERE 10172 +4_F_ARUNA_POP2 10173 +4_JACK_HEAD 10174 MER_LIF 6001 MER_AMISTR 6002 diff --git a/src/map/npc.h b/src/map/npc.h index de403fe76..60be1fbe4 100644 --- a/src/map/npc.h +++ b/src/map/npc.h @@ -121,7 +121,7 @@ enum actor_classes { #define MAX_NPC_CLASS 1000 // New NPC range #define MAX_NPC_CLASS2_START 10001 -#define MAX_NPC_CLASS2_END 10110 +#define MAX_NPC_CLASS2_END 10174 //Script NPC events. enum npce_event { |