This should include 006-2 Piou Isles in system

22 files changed, 179 insertions, 4 deletions

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"