summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaulc <lucashelaine14@gmail.com>2018-02-19 20:18:15 +0100
committerSaulc <lucashelaine14@gmail.com>2018-02-19 20:18:15 +0100
commit71584b600b909f0989f8bd4484577740bb601661 (patch)
tree14b3d96b24840fe4d12b6cd26e30b4e9fd7f3b3a
parent3aa9de13e52c2544811c4ce7e4f3d1aeaaa81e04 (diff)
downloadserverdata-71584b600b909f0989f8bd4484577740bb601661.tar.gz
serverdata-71584b600b909f0989f8bd4484577740bb601661.tar.bz2
serverdata-71584b600b909f0989f8bd4484577740bb601661.tar.xz
serverdata-71584b600b909f0989f8bd4484577740bb601661.zip
add 005-7 map
-rw-r--r--conf/map/maps.conf1
-rw-r--r--db/map_index.txt39
-rw-r--r--db/re/item_db.conf4
-rwxr-xr-xdb/re/map_cache.datbin11643 -> 11747 bytes
-rw-r--r--npc/003-1-3/_mobs.txt2
-rw-r--r--npc/003-1/_warps.txt2
-rw-r--r--npc/005-1/_warps.txt2
-rw-r--r--npc/005-7/_import.txt3
-rw-r--r--npc/005-7/_warps.txt3
-rw-r--r--npc/_import.txt1
10 files changed, 33 insertions, 24 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index f1399e59f..014423443 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -30,6 +30,7 @@ map_list: (
"005-4",
"005-5",
"005-6",
+ "005-7",
"008-1",
"008-2-0",
"008-2-1",
diff --git a/db/map_index.txt b/db/map_index.txt
index 4052ef5e3..da45b00eb 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -27,22 +27,23 @@
005-4 27
005-5 28
005-6 29
-008-1 30
-008-2-0 31
-008-2-1 32
-008-2-10 33
-008-2-11 34
-008-2-12 35
-008-2-13 36
-008-2-14 37
-008-2-2 38
-008-2-3 39
-008-2-4 40
-008-2-5 41
-008-2-6 42
-008-2-7 43
-008-2-8 44
-008-2-9 45
-aeros 46
-test 47
-testbg 48
+005-7 30
+008-1 31
+008-2-0 32
+008-2-1 33
+008-2-10 34
+008-2-11 35
+008-2-12 36
+008-2-13 37
+008-2-14 38
+008-2-2 39
+008-2-3 40
+008-2-4 41
+008-2-5 42
+008-2-6 43
+008-2-7 44
+008-2-8 45
+008-2-9 46
+aeros 47
+test 48
+testbg 49
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index c5b546d2d..7e29c6d56 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -11520,8 +11520,8 @@ item_db: (
}
Gender: "SEX_ANY"
Loc: ["EQP_HAND_R", "EQP_HAND_L"]
- WeaponLv: 40
- EquipLv: 3
+ WeaponLv: 1
+ EquipLv: 40
Refine: false
Subtype: "W_DAGGER"
BindOnEquip: false
diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat
index b0ab210f2..8f1898909 100755
--- a/db/re/map_cache.dat
+++ b/db/re/map_cache.dat
Binary files differ
diff --git a/npc/003-1-3/_mobs.txt b/npc/003-1-3/_mobs.txt
index 767ef1eb8..295582983 100644
--- a/npc/003-1-3/_mobs.txt
+++ b/npc/003-1-3/_mobs.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 003-1-3: magic school cave mobs
-003-1-3,55,58,29,22 monster Cave Snake 1035,8,35000,150000
+003-1-3,55,58,29,22 monster Cave Snake 1035,7,35000,150000
003-1-3,70,40,3,1 monster Bif 1058,1,35000,150000
diff --git a/npc/003-1/_warps.txt b/npc/003-1/_warps.txt
index bbd88c7e5..f9594c048 100644
--- a/npc/003-1/_warps.txt
+++ b/npc/003-1/_warps.txt
@@ -18,4 +18,4 @@
003-1,60,157,0 warp #003-1_60_157 4,0,004-1,63,57
003-1,116,120,0 warp #003-1_116_120 0,0,003-1-2,48,35
003-1,58,54,0 warp #003-1_58_54 0,0,003-1-3,82,82
-003-1,25,45,0 warp #003-1_25_45 0,0,003-1-3,35,85
+003-1,25,45,0 warp #003-1_25_45 0,0,003-1-3,37,85
diff --git a/npc/005-1/_warps.txt b/npc/005-1/_warps.txt
index a0d244861..48e3eb000 100644
--- a/npc/005-1/_warps.txt
+++ b/npc/005-1/_warps.txt
@@ -4,5 +4,5 @@
005-1,34,74,0 warp #005-1_34_74 0,0,005-3,25,42
005-1,48,70,0 warp #005-1_48_70 0,0,005-4,25,42
005-1,39,68,0 warp #005-1_39_68 0,0,005-5,25,41
-005-1,22,91,0 warp #005-1_22_91 0,0,005-5,24,41
+005-1,22,90,0 warp #005-1_22_90 0,0,005-7,45,37
005-1,43,75,0 warp #005-1_43_75 0,0,005-6,33,42
diff --git a/npc/005-7/_import.txt b/npc/005-7/_import.txt
new file mode 100644
index 000000000..aa79f2d31
--- /dev/null
+++ b/npc/005-7/_import.txt
@@ -0,0 +1,3 @@
+// Map 005-7: Training House
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/005-7/_warps.txt",
diff --git a/npc/005-7/_warps.txt b/npc/005-7/_warps.txt
new file mode 100644
index 000000000..16e673c26
--- /dev/null
+++ b/npc/005-7/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 005-7: Training House warps
+005-7,45,38,0 warp #005-7_45_38 0,0,005-1,22,91
diff --git a/npc/_import.txt b/npc/_import.txt
index ebf8d30d3..708cf36e2 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -29,6 +29,7 @@
@include "npc/005-4/_import.txt"
@include "npc/005-5/_import.txt"
@include "npc/005-6/_import.txt"
+@include "npc/005-7/_import.txt"
@include "npc/008-1/_import.txt"
@include "npc/008-2-0/_import.txt"
@include "npc/008-2-1/_import.txt"