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-3/boss.txt | 25 +++++++++++++++++--------
npc/015-3/_import.txt | 1 +
npc/015-3/_mobs.txt | 7 ++++---
npc/015-3/arkim.txt | 1 +
npc/015-3/logic.txt | 27 +++++++++++++++++++++++++++
npc/015-8/_import.txt | 1 -
npc/015-8/logic.txt | 26 --------------------------
7 files changed, 50 insertions(+), 38 deletions(-)
create mode 100644 npc/015-3/logic.txt
delete mode 100644 npc/015-8/logic.txt
diff --git a/npc/015-3-3/boss.txt b/npc/015-3-3/boss.txt
index eab30c194..09e4459e8 100644
--- a/npc/015-3-3/boss.txt
+++ b/npc/015-3-3/boss.txt
@@ -6,17 +6,17 @@
015-3-3,100,67,0 script Pirate Treasure Chest NPC_CHEST,{
/* Boss Showdown incomplete */
- if (getq(HurnscaldQuest_PirateCave) < 6) {
+ if (getq(HurnscaldQuest_PirateCave) < 7) {
warp "015-3-2", 24, 62;
end;
}
/* Treasure Chest logic */
- if (getq(HurnscaldQuest_PirateCave) == 6) {
+ if (getq(HurnscaldQuest_PirateCave) == 7) {
// You'll always get the maximum prize the first time
TreasureBox(99999);
Zeny+=rand2(5700, 6200);
getexp 1000, 320;
- compareandsetq HurnscaldQuest_PirateCave, 6, 7;
+ compareandsetq HurnscaldQuest_PirateCave, 7, 8;
} else {
TreasureBox(100); // 1% extra chance
}
@@ -31,7 +31,7 @@ OnInit:
015-3-3,100,62,0 script #Marley NPC_HIDDEN,2,0,{
end;
OnTouch:
- if (getq(HurnscaldQuest_PirateCave) >= 6) end;
+ if (getq(HurnscaldQuest_PirateCave) >= 7) end;
slide 70, 50;
if (mobcount("015-3-3", "#Marley::OnWin")) end;
// Cutscene + Boss!
@@ -48,14 +48,23 @@ OnTouch:
// Spawn the boss!
monster("015-3-3", 69, 54, strmobinfo(1, Marley), Marley, 1, "#Marley::OnWin");
// And the reinforcements...
- areamonster("015-3-3", 62, 47, 81, 57, strmobinfo(1, Thug), Thug, 7);
- areamonster("015-3-3", 62, 47, 81, 57, strmobinfo(1, Swashbuckler), Swashbuckler, 7);
- areamonster("015-3-3", 62, 47, 81, 57, strmobinfo(1, Grenadier), Grenadier, 7);
+ areamonster("015-3-3", 62, 47, 81, 57, strmobinfo(1, Thug), Thug, 4);
+ areamonster("015-3-3", 62, 47, 81, 57, strmobinfo(1, Swashbuckler), Swashbuckler, 4);
+ areamonster("015-3-3", 62, 47, 81, 57, strmobinfo(1, Grenadier), Grenadier, 4);
+ initnpctimer;
+ end;
+
+// Extra reinforcements if Marley still alive
+OnTimer30000:
+ if (!mobcount("015-3-3", "#Marley::OnWin")) end;
+ areamonster("015-3-3", 62, 47, 81, 57, strmobinfo(1, Thug), Thug, 3);
+ areamonster("015-3-3", 62, 47, 81, 57, strmobinfo(1, Swashbuckler), Swashbuckler, 3);
+ areamonster("015-3-3", 62, 47, 81, 57, strmobinfo(1, Grenadier), Grenadier, 3);
end;
OnWin:
dispbottom l("Marley : You... thief... *grumble*");
- compareandsetq HurnscaldQuest_PirateCave, 5, 6;
+ compareandsetq HurnscaldQuest_PirateCave, 6, 7;
end;
}
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;
+}
+
+
diff --git a/npc/015-8/_import.txt b/npc/015-8/_import.txt
index e71682db8..27ea8907a 100644
--- a/npc/015-8/_import.txt
+++ b/npc/015-8/_import.txt
@@ -3,6 +3,5 @@
"npc/015-8/015-8_blackbox.txt",
"npc/015-8/_mobs.txt",
"npc/015-8/config.txt",
-"npc/015-8/logic.txt",
"npc/015-8/puzzle.txt",
"npc/015-8/sealedshrine.txt",
diff --git a/npc/015-8/logic.txt b/npc/015-8/logic.txt
deleted file mode 100644
index 04d3780be..000000000
--- a/npc/015-8/logic.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-// 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;
- slide 166, 38;
- end;
-}
-
-015-3,132,23,0 script #0153WG2 NPC_HIDDEN,0,0,{
- end;
-OnTouch:
- if (getq(HurnscaldQuest_PirateCave) >= 5) {
- slide 98, 162;
- }
- end;
-}
-
-
--
cgit v1.2.3-70-g09d2