Regenerate mapsjesusalva/legion

14 files changed, 59 insertions, 83 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 50edf2f0..1c8e62df 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -56,6 +56,7 @@ map_list: (
     "001-2-9",
     "001-3-0",
     "001-3-1",
+    "001-3-2",
     "008-1-1",
     "008-1",
     "008-2-0",
diff --git a/db/map_index.txt b/db/map_index.txt
index 9885b94d..a0edf6c9 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -53,41 +53,42 @@
 001-2-9 53
 001-3-0 54
 001-3-1 55
-008-1-1 56
-008-1 57
-008-2-0 58
-008-2-1 59
-008-2-10 60
-008-2-11 61
-008-2-12 62
-008-2-13 63
-008-2-14 64
-008-2-15 65
-008-2-16 66
-008-2-17 67
-008-2-18 68
-008-2-19 69
-008-2-2 70
-008-2-20 71
-008-2-21 72
-008-2-22 73
-008-2-23 74
-008-2-24 75
-008-2-25 76
-008-2-26 77
-008-2-27 78
-008-2-28 79
-008-2-29 80
-008-2-3 81
-008-2-30 82
-008-2-4 83
-008-2-5 84
-008-2-6 85
-008-2-7 86
-008-2-8 87
-008-2-9 88
-008-3-0 89
-008-3-1 90
-008-4-1 91
-test 92
-testbg 93
+001-3-2 56
+008-1-1 57
+008-1 58
+008-2-0 59
+008-2-1 60
+008-2-10 61
+008-2-11 62
+008-2-12 63
+008-2-13 64
+008-2-14 65
+008-2-15 66
+008-2-16 67
+008-2-17 68
+008-2-18 69
+008-2-19 70
+008-2-2 71
+008-2-20 72
+008-2-21 73
+008-2-22 74
+008-2-23 75
+008-2-24 76
+008-2-25 77
+008-2-26 78
+008-2-27 79
+008-2-28 80
+008-2-29 81
+008-2-3 82
+008-2-30 83
+008-2-4 84
+008-2-5 85
+008-2-6 86
+008-2-7 87
+008-2-8 88
+008-2-9 89
+008-3-0 90
+008-3-1 91
+008-4-1 92
+test 93
+testbg 94
diff --git a/maps/re/001-1.mcache b/maps/re/001-1.mcache
index 7795236e..6ce64adc 100644
--- a/maps/re/001-1.mcache
+++ b/maps/re/001-1.mcache
diff --git a/maps/re/001-3-1.mcache b/maps/re/001-3-1.mcache
index 1a2f1a6a..f8239cdc 100644
--- a/maps/re/001-3-1.mcache
+++ b/maps/re/001-3-1.mcache
diff --git a/maps/re/001-3-2.mcache b/maps/re/001-3-2.mcache
new file mode 100644
index 00000000..a3747e0f
--- /dev/null
+++ b/maps/re/001-3-2.mcache
diff --git a/maps/re/008-1.mcache b/maps/re/008-1.mcache
index bd439b3c..6938421a 100644
--- a/maps/re/008-1.mcache
+++ b/maps/re/008-1.mcache
diff --git a/maps/re/008-3-0.mcache b/maps/re/008-3-0.mcache
index 9e1e9179..5a291c6f 100644
--- a/maps/re/008-3-0.mcache
+++ b/maps/re/008-3-0.mcache
diff --git a/npc/001-3-0/_warps.txt b/npc/001-3-0/_warps.txt
index 65b56ff5..d192e4ef 100644
--- a/npc/001-3-0/_warps.txt
+++ b/npc/001-3-0/_warps.txt
@@ -3,6 +3,6 @@
 001-3-0,196,35,0	warp	#001-3-0_196_35	0,0,001-1,197,35
 001-3-0,172,41,0	warp	#001-3-0_172_41	0,0,001-3-1,34,58
 001-3-0,162,40,0	warp	#001-3-0_162_40	0,0,001-3-1,23,57
-001-3-0,198,61,0	warp	#001-3-0_198_61	0,0,001-1,199,61
+001-3-0,198,60,0	warp	#001-3-0_198_60	0,0,001-1,199,61
 001-3-0,152,55,0	warp	#001-3-0_152_55	0,0,001-1,152,51
 001-3-0,85,130,0	warp	#001-3-0_85_130	0,0,001-1,86,130
diff --git a/npc/001-3-1/_warps.txt b/npc/001-3-1/_warps.txt
index f0c3d747..4f79c590 100644
--- a/npc/001-3-1/_warps.txt
+++ b/npc/001-3-1/_warps.txt
@@ -2,3 +2,4 @@
 // Map 001-3-1: Rivercave warps
 001-3-1,24,58,0	warp	#001-3-1_24_58	1,0,001-3-0,162,41
 001-3-1,35,59,0	warp	#001-3-1_35_59	1,0,001-3-0,172,42
+001-3-1,30,19,0	warp	#001-3-1_30_19	0,0,001-3-2,30,116
diff --git a/npc/001-3-2/_import.txt b/npc/001-3-2/_import.txt
new file mode 100644
index 00000000..d427b6ed
--- /dev/null
+++ b/npc/001-3-2/_import.txt
@@ -0,0 +1,3 @@
+// Map 001-3-2: Hideout
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/001-3-2/_warps.txt",
diff --git a/npc/001-3-2/_warps.txt b/npc/001-3-2/_warps.txt
new file mode 100644
index 00000000..6b35b231
--- /dev/null
+++ b/npc/001-3-2/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 001-3-2: Hideout warps
+001-3-2,30,117,0	warp	#001-3-2_30_117	0,0,001-3-1,30,20
diff --git a/npc/008-1-1/_mobs.txt b/npc/008-1-1/_mobs.txt
index a34ccc1c..4bb14ace 100644
--- a/npc/008-1-1/_mobs.txt
+++ b/npc/008-1-1/_mobs.txt
@@ -20,47 +20,11 @@
 008-1-1,68,29,7,7	monster	Mouboo	1023,3,30000,60000
 008-1-1,126,45,0,0	monster	Beehive	1056,1,30000,100000
 008-1-1,121,45,0,0	monster	Beehive	1056,1,30000,100000
-008-1-1,94,41,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,94,38,0,0	monster	Blue Rose	1061,1,20000,15000
-008-1-1,94,48,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,93,45,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,93,39,0,0	monster	Blue Rose	1061,1,20000,15000
-008-1-1,94,39,0,0	monster	Blue Rose	1061,1,20000,15000
-008-1-1,95,39,0,0	monster	Blue Rose	1061,1,20000,15000
-008-1-1,94,40,0,0	monster	Blue Rose	1061,1,20000,15000
-008-1-1,93,42,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,94,42,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,94,43,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,95,42,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,96,42,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,96,41,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,97,42,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,97,43,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,98,42,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,99,42,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,99,41,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,94,45,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,94,46,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,95,45,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,95,44,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,96,45,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,97,45,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,97,46,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,97,44,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,98,45,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,99,45,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,98,46,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,95,46,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,93,48,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,94,47,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,95,48,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,96,48,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,96,47,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,97,48,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,98,48,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,98,47,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,99,48,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,98,49,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,97,49,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,95,49,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,94,49,0,0	monster	Yellow Rose	1060,1,20000,15000
+008-1-1,94,39,0,0	monster	Blue Rose	1061,1,250000,100000
+008-1-1,98,42,0,0	monster	Yellow Tulip	1059,1,180000,85000
+008-1-1,95,45,0,0	monster	Red Rose	1062,1,210000,95000
+008-1-1,98,48,0,0	monster	Yellow Rose	1060,1,195000,65000
+008-1-1,95,43,0,0	monster	Yellow Tulip	1059,1,180000,85000
+008-1-1,97,46,0,0	monster	Red Rose	1062,1,210000,95000
+008-1-1,96,49,0,0	monster	Yellow Rose	1060,1,195000,65000
+008-1-1,93,48,0,0	monster	Yellow Rose	1060,1,195000,65000
diff --git a/npc/008-2-7/_import.txt b/npc/008-2-7/_import.txt
index 4cb38df9..d3391d83 100644
--- a/npc/008-2-7/_import.txt
+++ b/npc/008-2-7/_import.txt
@@ -3,4 +3,6 @@
 "npc/008-2-7/_savepoints.txt",
 "npc/008-2-7/_warps.txt",
 "npc/008-2-7/mapflags.txt",
+"npc/008-2-7/shop.txt",
+"npc/008-2-7/simon.txt",
 "npc/008-2-7/wyara.txt",
diff --git a/npc/_import.txt b/npc/_import.txt
index 23aef7f4..c19f2e32 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -55,6 +55,7 @@
 @include "npc/001-2-9/_import.txt"
 @include "npc/001-3-0/_import.txt"
 @include "npc/001-3-1/_import.txt"
+@include "npc/001-3-2/_import.txt"
 @include "npc/008-1-1/_import.txt"
 @include "npc/008-1/_import.txt"
 @include "npc/008-2-0/_import.txt"