summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/map/maps.conf1
-rw-r--r--db/map_index.txt15
-rw-r--r--db/re/mob_db.conf4
-rw-r--r--maps/re/012-1.mcachebin960 -> 970 bytes
-rw-r--r--maps/re/012-3.mcachebin0 -> 82 bytes
-rw-r--r--npc/012-1/_mobs.txt8
-rw-r--r--npc/012-1/_warps.txt1
-rw-r--r--npc/012-3/_import.txt3
-rw-r--r--npc/012-3/_warps.txt3
-rw-r--r--npc/_import.txt1
10 files changed, 23 insertions, 13 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 3cc8c092b..b96c9bd1f 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -48,6 +48,7 @@ map_list: (
"011-2",
"012-1",
"012-2",
+ "012-3",
"boss",
"botcheck",
"sec_pri",
diff --git a/db/map_index.txt b/db/map_index.txt
index ef314c63f..4bb05c22e 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -45,10 +45,11 @@
011-2 45
012-1 46
012-2 47
-boss 48
-botcheck 49
-sec_pri 50
-soren-2 51
-soren 52
-test 53
-testbg 54
+012-3 48
+boss 49
+botcheck 50
+sec_pri 51
+soren-2 52
+soren 53
+test 54
+testbg 55
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index 347fa040b..fabcb1c5a 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -1812,8 +1812,8 @@ mob_db: (
TinOre: 30
LeadOre: 20
GoldOre: 10
- TerraniteOre: 5
- TitaniumOre: 3
+ TitaniumOre: 5
+ TerraniteOre: 3
IridiumOre: 2
PlatinumOre: 1
}
diff --git a/maps/re/012-1.mcache b/maps/re/012-1.mcache
index 0a1d53988..a7c9a1ee9 100644
--- a/maps/re/012-1.mcache
+++ b/maps/re/012-1.mcache
Binary files differ
diff --git a/maps/re/012-3.mcache b/maps/re/012-3.mcache
new file mode 100644
index 000000000..fe25607bc
--- /dev/null
+++ b/maps/re/012-3.mcache
Binary files differ
diff --git a/npc/012-1/_mobs.txt b/npc/012-1/_mobs.txt
index 8366caa10..1d7d42f95 100644
--- a/npc/012-1/_mobs.txt
+++ b/npc/012-1/_mobs.txt
@@ -1,8 +1,8 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 012-1: Hurnscald mobs
-012-1,90,64,35,14 monster Red Butterfly 1025,4,30000,90000
+012-1,90,63,35,14 monster Red Butterfly 1025,4,30000,90000
012-1,90,62,36,15 monster Mana Bug 1075,5,30000,90000
-012-1,92,30,45,15 monster Pinkie 1132,8,30000,90000
-012-1,135,59,7,29 monster Piousse 1003,6,40000,60000
+012-1,92,33,45,15 monster Pinkie 1132,8,30000,90000
+012-1,44,47,21,32 monster Clover Patch 1028,4,60000,90000
+012-1,135,58,7,29 monster Piousse 1003,6,40000,60000
012-1,85,86,52,15 monster Silk Worm 1034,5,30000,30000
-012-1,46,48,21,32 monster Clover Patch 1028,4,60000,90000
diff --git a/npc/012-1/_warps.txt b/npc/012-1/_warps.txt
index 37ad92fc8..dbbaa2867 100644
--- a/npc/012-1/_warps.txt
+++ b/npc/012-1/_warps.txt
@@ -1,3 +1,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 012-1: Hurnscald warps
012-1,65,55,0 warp #012-1_65_55 0,0,012-2,36,46
+012-1,89,58,0 warp #012-1_89_58 0,0,012-3,41,45
diff --git a/npc/012-3/_import.txt b/npc/012-3/_import.txt
new file mode 100644
index 000000000..d27bc10f1
--- /dev/null
+++ b/npc/012-3/_import.txt
@@ -0,0 +1,3 @@
+// Map 012-3: Archery Shop
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/012-3/_warps.txt",
diff --git a/npc/012-3/_warps.txt b/npc/012-3/_warps.txt
new file mode 100644
index 000000000..0b817222d
--- /dev/null
+++ b/npc/012-3/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 012-3: Archery Shop warps
+012-3,41,46,0 warp #012-3_41_46 0,0,012-1,89,59
diff --git a/npc/_import.txt b/npc/_import.txt
index 7a29506ee..8def1a1dd 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -47,6 +47,7 @@
@include "npc/011-2/_import.txt"
@include "npc/012-1/_import.txt"
@include "npc/012-2/_import.txt"
+@include "npc/012-3/_import.txt"
@include "npc/boss/_import.txt"
@include "npc/botcheck/_import.txt"
@include "npc/sec_pri/_import.txt"