From f04057d32d6b52f7b4db334d974a165a380d2e27 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Fri, 31 Dec 2021 10:45:46 -0300
Subject: Force players to use Waterfall. Regenerate maps. Fix file location.

---
 npc/015-3/_import.txt |  1 +
 npc/015-3/_mobs.txt   |  7 ++++---
 npc/015-3/arkim.txt   |  1 +
 npc/015-3/logic.txt   | 27 +++++++++++++++++++++++++++
 4 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 npc/015-3/logic.txt

(limited to 'npc/015-3')

diff --git a/npc/015-3/_import.txt b/npc/015-3/_import.txt
index b733b05a3..2a8f058b8 100644
--- a/npc/015-3/_import.txt
+++ b/npc/015-3/_import.txt
@@ -4,3 +4,4 @@
 "npc/015-3/_mobs.txt",
 "npc/015-3/_warps.txt",
 "npc/015-3/arkim.txt",
+"npc/015-3/logic.txt",
diff --git a/npc/015-3/_mobs.txt b/npc/015-3/_mobs.txt
index 41536efe9..c8aa5cb47 100644
--- a/npc/015-3/_mobs.txt
+++ b/npc/015-3/_mobs.txt
@@ -2,11 +2,11 @@
 // Map 015-3: Butterfly Caves mobs
 015-3,160,179,19,18	monster	Cave Bat	1039,24,30000,40000
 015-3,142,31,24,14	monster	Green Slime	1085,5,30000,40000
-015-3,118,179,22,18	monster	Cave Snake	1035,12,30000,20000
+015-3,118,179,22,18	monster	Cave Snake	1035,9,30000,20000
 015-3,157,110,22,18	monster	Snake	1122,12,30000,20000
 015-3,144,94,32,39	monster	Black Scorpion	1074,12,30000,20000
 015-3,156,66,24,14	monster	Robin Bandit	1153,5,30000,40000
-015-3,113,100,55,37	monster	Red Slime	1092,57,30000,40000
+015-3,113,100,55,37	monster	Red Slime	1092,47,30000,40000
 015-3,107,177,14,8	monster	Archant	1026,2,30000,40000
 015-3,46,44,31,18	monster	Night Scorpion	1077,1,3600000,1800000
 015-3,86,59,28,32	monster	Terranite	1167,3,100000,40000
@@ -14,5 +14,6 @@
 015-3,84,142,23,50	monster	Troll	1171,6,100000,30000
 015-3,32,37,31,12	monster	Copper Slime Mother	1238,1,300000,120000
 015-3,38,49,26,17	monster	Gobo Bear	1214,5,40000,20000
+015-3,132,189,8,10	monster	Snake	1122,1,30000,20000
 015-3,102,105,81,87	monster	Small Emerald Bif	1104,6,65000,45000
-015-3,98,123,24,62	monster	Copper Slime	1088,12,40000,40000
+015-3,98,123,24,62	monster	Copper Slime	1088,10,40000,40000
diff --git a/npc/015-3/arkim.txt b/npc/015-3/arkim.txt
index f39b33dea..2d226a64f 100644
--- a/npc/015-3/arkim.txt
+++ b/npc/015-3/arkim.txt
@@ -165,6 +165,7 @@ L_PirateMap:
     else if (.@q == 3) pmap_intro();
     else if (.@q == 4) pmap_wrong();
     // IMPLICIT FALLTHROUGH
+    .@q = getq(HurnscaldQuest_PirateCave);
     if (.@q == 5) pmap_right();
     close;
 
diff --git a/npc/015-3/logic.txt b/npc/015-3/logic.txt
new file mode 100644
index 000000000..00440173b
--- /dev/null
+++ b/npc/015-3/logic.txt
@@ -0,0 +1,27 @@
+// TMW2 scripts.
+// Authors:
+//    Diogo_RBG
+//    Jesusalva
+// Description:
+//    Pirate Caves gateway main logic
+//    Adapted from TMW-BR for Moubootaur Legends
+
+015-3,128,161,0	script	#0153WG1	NPC_HIDDEN,0,0,{
+    end;
+OnTouch:
+    compareandsetq HurnscaldQuest_PirateCave, 3, 4;
+    compareandsetq HurnscaldQuest_PirateCave, 5, 6;
+    slide 166, 38;
+    end;
+}
+
+015-3,132,23,0	script	#0153WG2	NPC_HIDDEN,0,0,{
+    end;
+OnTouch:
+    if (getq(HurnscaldQuest_PirateCave) >= 6) {
+        slide 98, 162;
+    }
+    end;
+}
+
+
-- 
cgit v1.2.3-70-g09d2