summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/map/maps.conf1
-rw-r--r--db/map_index.txt71
-rw-r--r--db/re/item_db.conf23
-rwxr-xr-xdb/re/map_cache.datbin23154 -> 23261 bytes
-rw-r--r--npc/003-1/_warps.txt1
-rw-r--r--npc/003-13/_import.txt3
-rw-r--r--npc/003-13/_warps.txt3
-rw-r--r--npc/005-1/_warps.txt1
-rw-r--r--npc/_import.txt1
9 files changed, 68 insertions, 36 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 7f86dc054..f1cc377b5 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -66,6 +66,7 @@ map_list: (
"002-4",
"003-1-2",
"003-1",
+ "003-13",
"003-2-0",
"003-2-1",
"003-2-2",
diff --git a/db/map_index.txt b/db/map_index.txt
index d92b970bb..2f7af185a 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -63,38 +63,39 @@
002-4 63
003-1-2 64
003-1 65
-003-2-0 66
-003-2-1 67
-003-2-2 68
-003-2 69
-003-3 70
-003-4 71
-003-5 72
-003-6 73
-003-7 74
-003-8 75
-004-1 76
-005-1 77
-005-2 78
-005-3 79
-005-4 80
-005-5 81
-005-6 82
-008-1 83
-008-2-0 84
-008-2-1 85
-008-2-10 86
-008-2-11 87
-008-2-12 88
-008-2-13 89
-008-2-14 90
-008-2-2 91
-008-2-3 92
-008-2-4 93
-008-2-5 94
-008-2-6 95
-008-2-7 96
-008-2-8 97
-008-2-9 98
-test 99
-testbg 100
+003-13 66
+003-2-0 67
+003-2-1 68
+003-2-2 69
+003-2 70
+003-3 71
+003-4 72
+003-5 73
+003-6 74
+003-7 75
+003-8 76
+004-1 77
+005-1 78
+005-2 79
+005-3 80
+005-4 81
+005-5 82
+005-6 83
+008-1 84
+008-2-0 85
+008-2-1 86
+008-2-10 87
+008-2-11 88
+008-2-12 89
+008-2-13 90
+008-2-14 91
+008-2-2 92
+008-2-3 93
+008-2-4 94
+008-2-5 95
+008-2-6 96
+008-2-7 97
+008-2-8 98
+008-2-9 99
+test 100
+testbg 101
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 41c3d272a..72251703d 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -9654,7 +9654,7 @@ item_db: (
Matk: 0
Def: 130
Range: 0
- Slots: 0
+ Slots: 1
Job: {
All: true
}
@@ -9668,6 +9668,27 @@ item_db: (
BuyingStore: true
Delay: 0
Sprite: 0
+ AllowCards: {
+ id5003: 1
+ id5004: 1
+ id5005: 1
+ id5006: 1
+ id5007: 1
+ id5008: 1
+ id5009: 1
+ id5010: 1
+ id5011: 1
+ id5012: 1
+ id5013: 1
+ id5014: 1
+ id5015: 1
+ id5016: 1
+ id5017: 1
+ id5018: 1
+ id5019: 1
+ id5020: 1
+ id5021: 1
+ }
},
{
Id: 2909
diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat
index f21ff532d..2f7577d6f 100755
--- a/db/re/map_cache.dat
+++ b/db/re/map_cache.dat
Binary files differ
diff --git a/npc/003-1/_warps.txt b/npc/003-1/_warps.txt
index be0479dc3..46b562f7b 100644
--- a/npc/003-1/_warps.txt
+++ b/npc/003-1/_warps.txt
@@ -13,6 +13,7 @@
003-1,111,137,0 warp #003-1_111_137 0,0,003-7,39,40
003-1,107,132,0 warp #003-1_107_132 0,0,003-7,29,31
003-1,112,100,0 warp #003-1_112_100 0,0,003-8,31,43
+003-1,82,68,0 warp #003-1_82_68 0,0,002-3,35,40
003-1,51,65,0 warp #003-1_51_65 0,0,003-2,42,34
003-1,115,93,0 warp #003-1_115_93 0,0,003-8,41,28
003-1,60,157,0 warp #003-1_60_157 0,0,004-1,64,57
diff --git a/npc/003-13/_import.txt b/npc/003-13/_import.txt
new file mode 100644
index 000000000..510fd0d6f
--- /dev/null
+++ b/npc/003-13/_import.txt
@@ -0,0 +1,3 @@
+// Map 003-13: duel map
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/003-13/_warps.txt",
diff --git a/npc/003-13/_warps.txt b/npc/003-13/_warps.txt
new file mode 100644
index 000000000..76857da05
--- /dev/null
+++ b/npc/003-13/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 003-13: duel map warps
+003-13,31,44,0 warp #003-13_31_44 0,0,003-1,100,100
diff --git a/npc/005-1/_warps.txt b/npc/005-1/_warps.txt
index a0d244861..7524340cf 100644
--- a/npc/005-1/_warps.txt
+++ b/npc/005-1/_warps.txt
@@ -1,5 +1,6 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 005-1: Candor Island warps
+005-1,43,107,0 warp #005-1_43_107 0,0,002-2,21,28
005-1,31,79,0 warp #005-1_31_79 0,0,005-2,33,42
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
diff --git a/npc/_import.txt b/npc/_import.txt
index 75717ef81..eb8110c79 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -65,6 +65,7 @@
@include "npc/002-4/_import.txt"
@include "npc/003-1-2/_import.txt"
@include "npc/003-1/_import.txt"
+@include "npc/003-13/_import.txt"
@include "npc/003-2-0/_import.txt"
@include "npc/003-2-1/_import.txt"
@include "npc/003-2-2/_import.txt"