summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/map/maps.conf1
-rw-r--r--db/constants.conf2
-rw-r--r--db/map_index.txt83
-rw-r--r--db/re/item_db.conf3
-rw-r--r--db/re/mob_db.conf2
-rw-r--r--maps/re/001-1.mcachebin2025 -> 2051 bytes
-rw-r--r--maps/re/005-1.mcachebin865 -> 875 bytes
-rw-r--r--npc/003-1/_import.txt2
-rw-r--r--npc/_import.txt1
9 files changed, 50 insertions, 44 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 76cc2f14b..d0d6d54ae 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -7,6 +7,7 @@ map_list: (
"001-1",
"001-2",
"001-4",
+ "001-5",
"002-1",
"002-2",
"002-3",
diff --git a/db/constants.conf b/db/constants.conf
index 566781246..91ae10c25 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -3928,6 +3928,8 @@ constants_db: {
NPC_STATUE_R177: 177
NPC_STATUE_R178: 178
NPC_STATUE_EMPTY: 179
+ // Not animated NPCs
+ NPC_CONSTR_WORKER: 180
// Animated NPCs
NPC_CONFUSED_TREE: 400
diff --git a/db/map_index.txt b/db/map_index.txt
index ea1931869..7148a785f 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -4,44 +4,45 @@
001-1 4
001-2 5
001-4 6
-002-1 7
-002-2 8
-002-3 9
-002-4 10
-003-0-1 11
-003-0 12
-003-1-2 13
-003-1-3 14
-003-1 15
-003-10 16
-003-13 17
-003-2 18
-003-3 19
-003-4 20
-003-5 21
-003-6 22
-003-7 23
-003-8 24
-004-1 25
-004-2-1 26
-004-2 27
-005-1 28
-005-2 29
-005-3 30
-005-4 31
-005-5 32
-005-6 33
-005-7 34
-007-1 35
-009-1 36
-010-1-1 37
-010-1 38
-010-2 39
-011-1 40
-boss 41
-botcheck 42
-sec_pri 43
-soren-2 44
-soren 45
-test 46
-testbg 47
+001-5 7
+002-1 8
+002-2 9
+002-3 10
+002-4 11
+003-0-1 12
+003-0 13
+003-1-2 14
+003-1-3 15
+003-1 16
+003-10 17
+003-13 18
+003-2 19
+003-3 20
+003-4 21
+003-5 22
+003-6 23
+003-7 24
+003-8 25
+004-1 26
+004-2-1 27
+004-2 28
+005-1 29
+005-2 30
+005-3 31
+005-4 32
+005-5 33
+005-6 34
+005-7 35
+007-1 36
+009-1 37
+010-1-1 38
+010-1 39
+010-2 40
+011-1 41
+boss 42
+botcheck 43
+sec_pri 44
+soren-2 45
+soren 46
+test 47
+testbg 48
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 53e9e8801..2505c8e6d 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -2143,7 +2143,8 @@ item_db: (
Buy: 50000
Sell: 3000
Weight: 860
- KeepAfterUse: true //for moment yes but will be removed when quest willl be release
+ // For the moment yes, but will be removed when quest is released
+ KeepAfterUse: true
Refine: false
Script: <"
dispbottom "Impossible to read.";
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index ee68e17db..bf389a217 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -2596,7 +2596,7 @@ mob_db: (
CactusPotion: 200
RoastedMaggot: 150
SharpKnife: 150
- CrystallizedMaggot: 2
+ Pearl: 8
}
},
{
diff --git a/maps/re/001-1.mcache b/maps/re/001-1.mcache
index 3483e7e6f..6c3691ce4 100644
--- a/maps/re/001-1.mcache
+++ b/maps/re/001-1.mcache
Binary files differ
diff --git a/maps/re/005-1.mcache b/maps/re/005-1.mcache
index 1611081ed..d92fde6bf 100644
--- a/maps/re/005-1.mcache
+++ b/maps/re/005-1.mcache
Binary files differ
diff --git a/npc/003-1/_import.txt b/npc/003-1/_import.txt
index a24957df3..def86cd94 100644
--- a/npc/003-1/_import.txt
+++ b/npc/003-1/_import.txt
@@ -6,6 +6,7 @@
"npc/003-1/aidan.txt",
"npc/003-1/ched.txt",
"npc/003-1/constableperry.txt",
+"npc/003-1/eistein.txt",
"npc/003-1/eomie.txt",
"npc/003-1/eugene.txt",
"npc/003-1/events.txt",
@@ -33,4 +34,3 @@
"npc/003-1/tinris.txt",
"npc/003-1/wateranimation.txt",
"npc/003-1/well.txt",
-"npc/003-1/eistein.txt",
diff --git a/npc/_import.txt b/npc/_import.txt
index 08b0ffe4e..29fd2447a 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -6,6 +6,7 @@
@include "npc/001-1/_import.txt"
@include "npc/001-2/_import.txt"
@include "npc/001-4/_import.txt"
+@include "npc/001-5/_import.txt"
@include "npc/002-1/_import.txt"
@include "npc/002-2/_import.txt"
@include "npc/002-3/_import.txt"