summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJedzkie <jedzkie13@rocketmail.com>2015-12-22 15:46:14 +0800
committerJedzkie <jedzkie13@rocketmail.com>2015-12-22 15:46:14 +0800
commit312198bc5c9d86984f6cf4b7b802a741123d710f (patch)
tree6fd1f4ca12378ff01413f5ac86876df5912626bb
parent1f81a5998d0aef7569d31358b94a349612dd130a (diff)
downloadhercules-312198bc5c9d86984f6cf4b7b802a741123d710f.tar.gz
hercules-312198bc5c9d86984f6cf4b7b802a741123d710f.tar.bz2
hercules-312198bc5c9d86984f6cf4b7b802a741123d710f.tar.xz
hercules-312198bc5c9d86984f6cf4b7b802a741123d710f.zip
- Fixes #1005 (Thanks jTynne)
- Update NPC ID's
-rw-r--r--db/const.txt4
-rw-r--r--db/re/item_db.conf4
-rw-r--r--src/map/npc.h2
3 files changed, 7 insertions, 3 deletions
diff --git a/db/const.txt b/db/const.txt
index 104435660..94fc566d1 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -3369,6 +3369,10 @@ THANATOS_KEEP 10009
4_CENERE 10172
4_F_ARUNA_POP2 10173
4_JACK_HEAD 10174
+4_INJUSTICE 10175
+4_BLOODYMAN 10176
+4_GIBBET 10177
+4_DULLAHAN 10178
MER_LIF 6001
MER_AMISTR 6002
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 349b79524..a2e8d0a4e 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -112434,7 +112434,7 @@ item_db: (
Id: 14611
AegisName: "M_Def_Potion"
Name: "M Def Potion"
- Type: 11
+ Type: 2
Buy: 0
Weight: 10
Trade: {
@@ -112455,7 +112455,7 @@ item_db: (
Id: 14612
AegisName: "M_Mdef_Potion"
Name: "M Mdef Potion"
- Type: 11
+ Type: 2
Buy: 0
Weight: 10
Trade: {
diff --git a/src/map/npc.h b/src/map/npc.h
index 6f288d722..0b2729bcf 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -138,7 +138,7 @@ enum actor_classes {
#define MAX_NPC_CLASS 1000
// New NPC range
#define MAX_NPC_CLASS2_START 10001
-#define MAX_NPC_CLASS2_END 10174
+#define MAX_NPC_CLASS2_END 10178
//Script NPC events.
enum npce_event {