diff options
| author | Haru <haru@dotalux.com> | 2017-04-20 18:38:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-20 18:38:17 +0200 |
| commit | d2bcca50d2adfee5fe402bd790d4bd2dd133e158 (patch) | |
| tree | 0cce8bcf4217ac05117499b626ede9dd9fe19d97 | |
| parent | 17b04a885341bd381ba419ec59f212ec84a23c4b (diff) | |
| parent | 83bd27683fafdc0cc13d7a09ae1f0309d90a41ea (diff) | |
| download | hercules-d2bcca50d2adfee5fe402bd790d4bd2dd133e158.tar.gz hercules-d2bcca50d2adfee5fe402bd790d4bd2dd133e158.tar.bz2 hercules-d2bcca50d2adfee5fe402bd790d4bd2dd133e158.tar.xz hercules-d2bcca50d2adfee5fe402bd790d4bd2dd133e158.zip | |
Merge pull request #1692 from Jedzkie/4-NPC
Update NPC ID
| -rw-r--r-- | db/constants.conf | 45 | ||||
| -rw-r--r-- | src/map/npc.h | 3 |
2 files changed, 46 insertions, 2 deletions
diff --git a/db/constants.conf b/db/constants.conf index 79530e7d1..d98a3d036 100644 --- a/db/constants.conf +++ b/db/constants.conf @@ -3504,6 +3504,51 @@ constants_db: { 4_F_REBELLION2: 10201 4_F_REBELLION3: 10202 4_M_ILYA: 10203 + // Free ID - 10204 + 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 + JP_NPC01: 10236 + 4_PURPLE_WARP: 10237 + 4_F_NARIN: 10238 + 4_M_URGENT_MAN: 10239 + 4_M_KEEN_SOLDIER: 10240 + 4_F_SLOPPY_WOMAN: 10241 + 4_F_DRKAFRA01: 10242 + 4_M_DRZONDA01: 10243 + 4_M_SWD_RENO: 10244 + 4_M_KNG_RENO: 10245 + 4_M_AC_RUMIN: 10246 + 4_M_HIGH_WIZARD: 10247 + 4_SYSTEM_BOX: 10248 comment__: "Mercenary IDs" MER_LIF: 6001 diff --git a/src/map/npc.h b/src/map/npc.h index 6180e9765..3bd11d536 100644 --- a/src/map/npc.h +++ b/src/map/npc.h @@ -125,7 +125,6 @@ struct npc_data { struct hplugin_data_store *hdata; ///< HPM Plugin Data Store }; - #define START_NPC_NUM 110000000 enum actor_classes { @@ -142,7 +141,7 @@ enum actor_classes { #define MAX_NPC_CLASS 1000 // New NPC range #define MAX_NPC_CLASS2_START 10001 -#define MAX_NPC_CLASS2_END 10203 +#define MAX_NPC_CLASS2_END 10248 //Script NPC events. enum npce_event { |