summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--maps/re/010-1-9.mcachebin261 -> 260 bytes
-rw-r--r--maps/re/010-2.mcachebin1808 -> 1807 bytes
-rw-r--r--npc/010-1-11/_warps.txt2
-rw-r--r--npc/010-1-9/_import.txt1
-rw-r--r--npc/010-1-9/_mobs.txt4
-rw-r--r--npc/010-1/_warps.txt3
-rw-r--r--npc/010-2/_config.txt11
-rw-r--r--npc/010-2/_import.txt1
-rw-r--r--npc/010-2/_mobs.txt1
9 files changed, 20 insertions, 3 deletions
diff --git a/maps/re/010-1-9.mcache b/maps/re/010-1-9.mcache
index f06200c6a..1c059de1d 100644
--- a/maps/re/010-1-9.mcache
+++ b/maps/re/010-1-9.mcache
Binary files differ
diff --git a/maps/re/010-2.mcache b/maps/re/010-2.mcache
index e322a9a51..ae4b65760 100644
--- a/maps/re/010-2.mcache
+++ b/maps/re/010-2.mcache
Binary files differ
diff --git a/npc/010-1-11/_warps.txt b/npc/010-1-11/_warps.txt
index 11e27062b..f44c89739 100644
--- a/npc/010-1-11/_warps.txt
+++ b/npc/010-1-11/_warps.txt
@@ -1,3 +1,3 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 010-1-11: Canyon Cave warps
-010-1-11,36,30,0 warp #010-1-11_36_30 0,0,004-2-11,52,51
+010-1-11,36,30,0 warp #010-1-11_36_30 0,0,004-2-11,52,21
diff --git a/npc/010-1-9/_import.txt b/npc/010-1-9/_import.txt
index f4ba71291..29cc68809 100644
--- a/npc/010-1-9/_import.txt
+++ b/npc/010-1-9/_import.txt
@@ -1,3 +1,4 @@
// Map 010-1-9: Canyon Cave
// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-1-9/_mobs.txt",
"npc/010-1-9/_warps.txt",
diff --git a/npc/010-1-9/_mobs.txt b/npc/010-1-9/_mobs.txt
new file mode 100644
index 000000000..088c591d8
--- /dev/null
+++ b/npc/010-1-9/_mobs.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-1-9: Canyon Cave mobs
+010-1-9,44,41,14,21 monster Sarracenus 1125,2,35000,300000
+010-1-9,65,41,12,21 monster Sarracenus 1125,2,35000,300000
diff --git a/npc/010-1/_warps.txt b/npc/010-1/_warps.txt
index aa5103acf..35cd06668 100644
--- a/npc/010-1/_warps.txt
+++ b/npc/010-1/_warps.txt
@@ -7,7 +7,7 @@
010-1,51,53,0 warp #010-1_51_53 0,0,010-1-3,32,49
010-1,74,55,0 warp #010-1_74_55 0,0,010-1-3,53,54
010-1,87,51,0 warp #010-1_87_51 0,0,010-1-4,56,29
-010-1,67,63,0 warp #010-1_67_63 0,0,010-1-4,53,54
+010-1,67,63,0 warp #010-1_67_63 0,0,010-1-4,35,54
010-1,49,66,0 warp #010-1_49_66 0,0,010-1-5,56,38
010-1,44,73,0 warp #010-1_44_73 0,0,010-1-5,44,74
010-1,104,47,0 warp #010-1_104_47 0,0,010-1-6,70,64
@@ -20,7 +20,6 @@
010-1,45,29,0 warp #010-1_45_29 0,0,010-1-1,43,27
010-1,84,33,0 warp #010-1_84_33 0,0,010-1-6,46,45
010-1,75,69,0 warp #010-1_75_69 0,0,010-1-6,33,73
-010-1,107,41,0 warp #010-1_107_41 0,0,010-1-1,100,68
010-1,91,48,0 warp #010-1_91_48 0,0,010-1-10,55,37
010-1,41,35,0 warp #010-1_41_35 0,0,010-1-1,42,40
010-1,125,63,0 warp #010-1_125_63 0,0,010-1-1,166,88
diff --git a/npc/010-2/_config.txt b/npc/010-2/_config.txt
new file mode 100644
index 000000000..f10533931
--- /dev/null
+++ b/npc/010-2/_config.txt
@@ -0,0 +1,11 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-2: Desert Mountains conf
+
+010-2,209,70,0 script #010-2_209_70 NPC_CHEST,{
+ TreasureBox();
+ specialeffect(.dir == 0 ? 24 : 25, AREA, getnpcid()); // closed ? opening : closing
+ close;
+OnInit:
+ .distance=2;
+ end;
+}
diff --git a/npc/010-2/_import.txt b/npc/010-2/_import.txt
index 53caf284d..dcd05d416 100644
--- a/npc/010-2/_import.txt
+++ b/npc/010-2/_import.txt
@@ -1,5 +1,6 @@
// Map 010-2: Desert Mountains
// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-2/_config.txt",
"npc/010-2/_mobs.txt",
"npc/010-2/_warps.txt",
"npc/010-2/sawis.txt",
diff --git a/npc/010-2/_mobs.txt b/npc/010-2/_mobs.txt
index 866c45e34..75679a843 100644
--- a/npc/010-2/_mobs.txt
+++ b/npc/010-2/_mobs.txt
@@ -17,3 +17,4 @@
010-2,169,91,3,9 monster Snake 1122,4,35000,300000
010-2,151,78,28,45 monster Desert Maggot 1083,35,35000,150000
010-2,85,113,30,17 monster Desert Maggot 1083,20,35000,150000
+010-2,220,74,39,56 monster Desert Maggot 1083,24,35000,150000