This should include 006-2 Piou Isles in system

28 files changed, 337 insertions, 154 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index fc6134970..6552b6d60 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -57,6 +57,10 @@ map_list: (
     "005-7",
     "006-0",
     "006-1",
+    "006-2-1",
+    "006-2-2",
+    "006-2-3",
+    "006-2",
     "006-3",
     "006-4-1",
     "006-4",
diff --git a/db/map_index.txt b/db/map_index.txt
index 9243e6f2a..a5e18ca06 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -54,153 +54,157 @@
 005-7 54
 006-0 55
 006-1 56
-006-3 57
-006-4-1 58
-006-4 59
-007-1 60
-008-0 61
-008-1 62
-008-2 63
-009-1 64
-009-2 65
-009-3 66
-009-4 67
-009-5 68
-009-6 69
-009-7 70
-010-1-1 71
-010-1 72
-010-2 73
-011-1 74
-011-2 75
-011-3 76
-012-1 77
-012-2 78
-012-3 79
-012-4 80
-012-5 81
-012-6 82
-012-7 83
-012-8 84
-013-1 85
-014-1 86
-014-2-1 87
-014-2 88
-014-3 89
-014-4 90
-014-5-1 91
-014-5 92
-015-1 93
-015-2 94
-015-3 95
-015-4 96
-015-5 97
-015-6 98
-015-7 99
-015-8-1 100
-015-8 101
-016-1 102
-016-6 103
-016-7 104
-017-1 105
-017-10 106
-017-2-1 107
-017-2-2 108
-017-2 109
-017-3 110
-017-4 111
-017-5 112
-017-6 113
-017-7 114
-017-8 115
-018-1-1 116
-018-1 117
-018-2-1 118
-018-2-2 119
-018-2-3 120
-018-2-4 121
-018-2-5 122
-018-2 123
-018-3 124
-018-4-1 125
-018-4-2 126
-018-4 127
-018-5-0 128
-018-5-1 129
-018-5-2 130
-018-5-3 131
-018-5-4 132
-018-5-boss 133
-018-5 134
-018-6-0 135
-018-6-1 136
-018-6-2 137
-018-6-3 138
-019-1-1 139
-019-1 140
-019-2 141
-019-3 142
-019-4-1 143
-019-4 144
-020-1 145
-020-2 146
-020-3 147
-020-4 148
-020-5 149
-020-6 150
-020-7-1 151
-020-7-2 152
-020-7 153
-021-1 154
-021-2 155
-021-3 156
-021-4 157
-022-1 158
-023-1 159
-023-2 160
-023-3-1 161
-023-3-2 162
-023-3 163
-024-1 164
-024-10 165
-024-11 166
-024-12 167
-024-13 168
-024-14 169
-024-15 170
-024-16 171
-024-2 172
-024-3 173
-024-4 174
-024-5 175
-024-6 176
-024-7 177
-024-8 178
-024-9 179
-025-2-1 180
-025-2 181
-027-1 182
-boss 183
-botcheck 184
-guilds 185
-maze0 186
-maze1 187
-maze10 188
-maze11 189
-maze12 190
-maze13 191
-maze14 192
-maze15 193
-maze2 194
-maze3 195
-maze4 196
-maze5 197
-maze6 198
-maze7 199
-maze8 200
-maze9 201
-sec_pri 202
-soren-2 203
-soren 204
-test 205
-testbg 206
+006-2-1 57
+006-2-2 58
+006-2-3 59
+006-2 60
+006-3 61
+006-4-1 62
+006-4 63
+007-1 64
+008-0 65
+008-1 66
+008-2 67
+009-1 68
+009-2 69
+009-3 70
+009-4 71
+009-5 72
+009-6 73
+009-7 74
+010-1-1 75
+010-1 76
+010-2 77
+011-1 78
+011-2 79
+011-3 80
+012-1 81
+012-2 82
+012-3 83
+012-4 84
+012-5 85
+012-6 86
+012-7 87
+012-8 88
+013-1 89
+014-1 90
+014-2-1 91
+014-2 92
+014-3 93
+014-4 94
+014-5-1 95
+014-5 96
+015-1 97
+015-2 98
+015-3 99
+015-4 100
+015-5 101
+015-6 102
+015-7 103
+015-8-1 104
+015-8 105
+016-1 106
+016-6 107
+016-7 108
+017-1 109
+017-10 110
+017-2-1 111
+017-2-2 112
+017-2 113
+017-3 114
+017-4 115
+017-5 116
+017-6 117
+017-7 118
+017-8 119
+018-1-1 120
+018-1 121
+018-2-1 122
+018-2-2 123
+018-2-3 124
+018-2-4 125
+018-2-5 126
+018-2 127
+018-3 128
+018-4-1 129
+018-4-2 130
+018-4 131
+018-5-0 132
+018-5-1 133
+018-5-2 134
+018-5-3 135
+018-5-4 136
+018-5-boss 137
+018-5 138
+018-6-0 139
+018-6-1 140
+018-6-2 141
+018-6-3 142
+019-1-1 143
+019-1 144
+019-2 145
+019-3 146
+019-4-1 147
+019-4 148
+020-1 149
+020-2 150
+020-3 151
+020-4 152
+020-5 153
+020-6 154
+020-7-1 155
+020-7-2 156
+020-7 157
+021-1 158
+021-2 159
+021-3 160
+021-4 161
+022-1 162
+023-1 163
+023-2 164
+023-3-1 165
+023-3-2 166
+023-3 167
+024-1 168
+024-10 169
+024-11 170
+024-12 171
+024-13 172
+024-14 173
+024-15 174
+024-16 175
+024-2 176
+024-3 177
+024-4 178
+024-5 179
+024-6 180
+024-7 181
+024-8 182
+024-9 183
+025-2-1 184
+025-2 185
+027-1 186
+boss 187
+botcheck 188
+guilds 189
+maze0 190
+maze1 191
+maze10 192
+maze11 193
+maze12 194
+maze13 195
+maze14 196
+maze15 197
+maze2 198
+maze3 199
+maze4 200
+maze5 201
+maze6 202
+maze7 203
+maze8 204
+maze9 205
+sec_pri 206
+soren-2 207
+soren 208
+test 209
+testbg 210
diff --git a/maps/re/006-2-1.mcache b/maps/re/006-2-1.mcache
new file mode 100644
index 000000000..7cd852651
--- /dev/null
+++ b/maps/re/006-2-1.mcache
diff --git a/maps/re/006-2-2.mcache b/maps/re/006-2-2.mcache
new file mode 100644
index 000000000..bb3e52d4f
--- /dev/null
+++ b/maps/re/006-2-2.mcache
diff --git a/maps/re/006-2-3.mcache b/maps/re/006-2-3.mcache
new file mode 100644
index 000000000..aab409dbb
--- /dev/null
+++ b/maps/re/006-2-3.mcache
diff --git a/maps/re/006-2.mcache b/maps/re/006-2.mcache
new file mode 100644
index 000000000..512cea7ce
--- /dev/null
+++ b/maps/re/006-2.mcache
diff --git a/npc/006-0/core.txt b/npc/006-0/core.txt
index e12fb134f..3955a8513 100644
--- a/npc/006-0/core.txt
+++ b/npc/006-0/core.txt
@@ -6,7 +6,20 @@
     end;
 
 OnTouch:
-    //warp "006-2", 49, 53;
+    if (is_staff()) goto L_Accept; // FIXME
+    // Reject
+    specialeffect(5000, SELF, .name$);
     dispbottom l("The power which lies in Candor rejects your strength.");
+    sleep2(3000);
+    specialeffect(5002, SELF, .name$);
+    end;
+
+L_Accept:
+    specialeffect(5000, SELF, .name$);
+    dispbottom l("The power which lies in Candor acknowledges your strength.");
+    sleep2(2500);
+    warp "006-3", 49, 52;
+    sleep2(500);
+    specialeffect(5001, SELF, .name$);
     end;
 }
diff --git a/npc/006-0/piouisle.txt b/npc/006-0/piouisle.txt
index 023a3b21f..26030472e 100644
--- a/npc/006-0/piouisle.txt
+++ b/npc/006-0/piouisle.txt
@@ -17,8 +17,6 @@ OnInit:
     end;
 
 OnTouch:
-    //warp "006-2", 49, 53;
-    //dispbottom l("Please use the warp to the right");
-    dispbottom l("This area is not yet ready. Please use the portal to the right instead.");
+    warp "006-2", 68, 117;
     end;
 }
diff --git a/npc/006-2-1/_import.txt b/npc/006-2-1/_import.txt
new file mode 100644
index 000000000..2b4c270cb
--- /dev/null
+++ b/npc/006-2-1/_import.txt
@@ -0,0 +1,4 @@
+// Map 006-2-1: Piou Houses
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/006-2-1/_mobs.txt",
+"npc/006-2-1/_warps.txt",
diff --git a/npc/006-2-1/_mobs.txt b/npc/006-2-1/_mobs.txt
new file mode 100644
index 000000000..02ce45118
--- /dev/null
+++ b/npc/006-2-1/_mobs.txt
@@ -0,0 +1,7 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 006-2-1: Piou Houses mobs
+006-2-1,28,29,1,1	monster	Piousse	1003,4,30000,30000
+006-2-1,76,69,2,2	monster	Piou	1002,6,30000,30000
+006-2-1,79,27,7,3	monster	Piou	1002,4,30000,30000
+006-2-1,37,77,5,3	monster	Piou	1002,3,30000,30000
+006-2-1,37,69,5,3	monster	Piousse	1003,4,30000,30000
diff --git a/npc/006-2-1/_warps.txt b/npc/006-2-1/_warps.txt
new file mode 100644
index 000000000..b7725afc0
--- /dev/null
+++ b/npc/006-2-1/_warps.txt
@@ -0,0 +1,6 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 006-2-1: Piou Houses warps
+006-2-1,24,23,0	warp	#006-2-1_24_23	0,0,006-2,68,101
+006-2-1,38,65,0	warp	#006-2-1_38_65	0,0,006-2,87,97
+006-2-1,79,23,0	warp	#006-2-1_79_23	0,0,piou_1.tmx,92,97
+006-2-1,83,65,0	warp	#006-2-1_83_65	0,0,006-2,87,102
diff --git a/npc/006-2-2/_import.txt b/npc/006-2-2/_import.txt
new file mode 100644
index 000000000..87a636760
--- /dev/null
+++ b/npc/006-2-2/_import.txt
@@ -0,0 +1,4 @@
+// Map 006-2-2: Secret Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/006-2-2/_warps.txt",
+"npc/006-2-2/ctrl.txt",
diff --git a/npc/006-2-2/_warps.txt b/npc/006-2-2/_warps.txt
new file mode 100644
index 000000000..13697d056
--- /dev/null
+++ b/npc/006-2-2/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 006-2-2: Secret Cave warps
+006-2-2,36,52,0	warp	#006-2-2_36_52	0,0,006-2,71,87
diff --git a/npc/006-2-2/ctrl.txt b/npc/006-2-2/ctrl.txt
new file mode 100644
index 000000000..4288cdc25
--- /dev/null
+++ b/npc/006-2-2/ctrl.txt
@@ -0,0 +1,13 @@
+// TMW2 Script
+// Author:
+//    Jesusalva
+
+006-2-2,35,24,0	script	#PiouGate	NPC_HIDDEN,1,0,{
+    end;
+
+OnTouch:
+    // TODO Checks
+    dispbottom l("This gate is still sealed.");
+    end;
+}
+
diff --git a/npc/006-2-3/_import.txt b/npc/006-2-3/_import.txt
new file mode 100644
index 000000000..d6b7fb2f4
--- /dev/null
+++ b/npc/006-2-3/_import.txt
@@ -0,0 +1,4 @@
+// Map 006-2-3: Mushroom Cavern
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/006-2-3/_mobs.txt",
+"npc/006-2-3/_warps.txt",
diff --git a/npc/006-2-3/_mobs.txt b/npc/006-2-3/_mobs.txt
new file mode 100644
index 000000000..5d6841d7b
--- /dev/null
+++ b/npc/006-2-3/_mobs.txt
@@ -0,0 +1,7 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 006-2-3: Mushroom Cavern mobs
+006-2-3,40,40,5,5	monster	Tipiou	1016,3,30000,30000
+006-2-3,41,42,15,13	monster	Piou	1002,15,30000,30000
+006-2-3,40,40,8,7	monster	Silk Worm	1034,20,30000,30000
+006-2-3,46,42,6,10	monster	Red Butterfly	1025,8,30000,30000
+006-2-3,36,42,6,10	monster	Cyan Butterfly	1172,8,30000,30000
diff --git a/npc/006-2-3/_warps.txt b/npc/006-2-3/_warps.txt
new file mode 100644
index 000000000..7b2d083f8
--- /dev/null
+++ b/npc/006-2-3/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 006-2-3: Mushroom Cavern warps
+006-2-3,41,28,0	warp	#006-2-3_41_28	0,0,006-2,62,109
+006-2-3,41,56,0	warp	#006-2-3_41_56	0,0,006-2,68,113
diff --git a/npc/006-2/_import.txt b/npc/006-2/_import.txt
new file mode 100644
index 000000000..e459cf25a
--- /dev/null
+++ b/npc/006-2/_import.txt
@@ -0,0 +1,4 @@
+// Map 006-2: The Piou Islands
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/006-2/_mobs.txt",
+"npc/006-2/_warps.txt",
diff --git a/npc/006-2/_mobs.txt b/npc/006-2/_mobs.txt
new file mode 100644
index 000000000..a6054ddfe
--- /dev/null
+++ b/npc/006-2/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 006-2: The Piou Islands mobs
+006-2,68,72,9,6	monster	Forest Piou	1202,5,30000,30000
+006-2,92,100,9,6	monster	Piousse	1003,12,30000,30000
+006-2,68,102,9,6	monster	Mana Piou	1155,8,30000,30000
+006-2,44,100,9,6	monster	Piou	1002,18,30000,30000
+006-2,68,117,2,3	monster	Forest Piou	1202,1,20000,15000
+006-2,68,117,2,3	monster	Mana Piou	1155,1,20000,15000
diff --git a/npc/006-2/_warps.txt b/npc/006-2/_warps.txt
new file mode 100644
index 000000000..f6adfb1d5
--- /dev/null
+++ b/npc/006-2/_warps.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 006-2: The Piou Islands warps
+006-2,68,101,0	warp	#006-2_68_101	0,0,006-2-1,24,24
+006-2,87,97,0	warp	#006-2_87_97	0,0,006-2-1,38,65
+006-2,92,97,0	warp	#006-2_92_97	0,0,006-2-1,79,23
+006-2,87,102,0	warp	#006-2_87_102	0,0,006-2-1,83,65
+006-2,61,109,0	warp	#006-2_61_109	0,0,006-2-3,41,28
+006-2,68,113,0	warp	#006-2_68_113	0,0,006-2-3,41,56
+006-2,68,118,0	warp	#006-2_68_118	0,0,006-0,40,36
diff --git a/npc/006-3/_import.txt b/npc/006-3/_import.txt
index c5d479086..95a6b5c5c 100644
--- a/npc/006-3/_import.txt
+++ b/npc/006-3/_import.txt
@@ -2,3 +2,6 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/006-3/_mobs.txt",
 "npc/006-3/_warps.txt",
+"npc/006-3/core.txt",
+"npc/006-3/piouisle.txt",
+"npc/006-3/warpcandorbattle.txt",
diff --git a/npc/006-3/core.txt b/npc/006-3/core.txt
new file mode 100644
index 000000000..ca5a6f9ca
--- /dev/null
+++ b/npc/006-3/core.txt
@@ -0,0 +1,15 @@
+// TMW2 Script
+// Author:
+//    Jesusalva
+
+006-3,46,26,0	script	Magic Barrier#0063	NPC_HIDDEN,0,0,{
+    end;
+
+OnTouch:
+    //warp "006-3", 49, 52;
+    specialeffect(5000, SELF, .name$);
+    dispbottom l("The power which lies in Candor rejects your strength.");
+    sleep2(3000);
+    specialeffect(5002, SELF, .name$);
+    end;
+}
diff --git a/npc/006-3/piouisle.txt b/npc/006-3/piouisle.txt
new file mode 100644
index 000000000..110e9f87c
--- /dev/null
+++ b/npc/006-3/piouisle.txt
@@ -0,0 +1,24 @@
+// TMW2 Script
+// Author:
+//    Jesusalva
+
+006-3,41,36,0	script	Sign#0063PI	NPC_SWORDS_SIGN,{
+    mesc l("*the text is too faded out to read*");
+    close;
+
+OnInit:
+    .sex = G_OTHER;
+    .distance = 3;
+    end;
+}
+
+// Effective warp
+006-3,66,62,0	script	Magic Barrier#Pi	NPC_HIDDEN,0,0,{
+    end;
+
+OnTouch:
+    //warp "006-2", 49, 53;
+    //dispbottom l("Please use the warp to the right");
+    dispbottom l("This area is not yet ready. Please use the portal to the right instead.");
+    end;
+}
diff --git a/npc/006-3/warpcandorbattle.txt b/npc/006-3/warpcandorbattle.txt
new file mode 100644
index 000000000..a4528381f
--- /dev/null
+++ b/npc/006-3/warpcandorbattle.txt
@@ -0,0 +1,27 @@
+// TMW2 Script
+// Author:
+//    Crazyfefe
+//    Jesusalva
+
+
+006-3,53,36,0	script	Sign#0060CF	NPC_SWORDS_SIGN,{
+    mesc l("To the courageous, thy foe is rancorous.");
+    close;
+
+OnInit:
+    .sex = G_OTHER;
+    .distance = 3;
+    end;
+}
+
+// Effective warp
+006-3,54,35,0	script	Magic Barrier	NPC_HIDDEN,0,0,{
+    end;
+
+OnTouch:
+    if (BaseLevel > 40)
+        warp "006-4", 32, 258;
+    else
+        dispbottom l("Your strength is not enough to power on this portal.");
+    end;
+}
diff --git a/npc/006-4/_import.txt b/npc/006-4/_import.txt
index 0719ad348..7479e6436 100644
--- a/npc/006-4/_import.txt
+++ b/npc/006-4/_import.txt
@@ -2,3 +2,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/006-4/_mobs.txt",
 "npc/006-4/_warps.txt",
+"npc/006-4/soulstone.txt",
diff --git a/npc/006-4/_warps.txt b/npc/006-4/_warps.txt
index 872c72394..f6e439f0c 100644
--- a/npc/006-4/_warps.txt
+++ b/npc/006-4/_warps.txt
@@ -1,3 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 006-4: Abandoned Island warps
 006-4,95,99,0	warp	#006-4_95_99	1,-1,006-4-1,58,60
+006-4,32,257,0	warp	#006-4_32_257	0,-1,006-3,54,36
diff --git a/npc/006-4/soulstone.txt b/npc/006-4/soulstone.txt
new file mode 100644
index 000000000..c9e6c92e6
--- /dev/null
+++ b/npc/006-4/soulstone.txt
@@ -0,0 +1,16 @@
+// TMW2 Script
+// Author:
+//    Jesusalva
+
+006-4,21,243,0	script	#WaterfallPass	NPC_HIDDEN,1,0,{
+    end;
+
+OnTouch:
+    slide 62, 163;
+    end;
+}
+
+006-4,62,164,0	script	Soul Stone#0064	NPC_NO_SPRITE,{
+    slide 22, 244;
+    end;
+}
diff --git a/npc/_import.txt b/npc/_import.txt
index 55cc7a74a..c2b4ac4dd 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -56,6 +56,10 @@
 @include "npc/005-7/_import.txt"
 @include "npc/006-0/_import.txt"
 @include "npc/006-1/_import.txt"
+@include "npc/006-2-1/_import.txt"
+@include "npc/006-2-2/_import.txt"
+@include "npc/006-2-3/_import.txt"
+@include "npc/006-2/_import.txt"
 @include "npc/006-3/_import.txt"
 @include "npc/006-4-1/_import.txt"
 @include "npc/006-4/_import.txt"