From 694626591f8c2ed6484ef2c911fc78a6ef7117a0 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Thu, 28 Apr 2022 10:23:08 -0300
Subject: Gemini Inn unlocked

---
 npc/014-2-2/_import.txt |  3 +++
 npc/014-2-2/_warps.txt  |  3 +++
 npc/014-2/_import.txt   |  1 +
 npc/014-2/_warps.txt    |  1 +
 npc/014-2/trap.txt      | 52 +++++++++++++++++++++++++++++++++++++++++++++++++
 npc/034-4/exit.txt      |  2 +-
 npc/_import.txt         |  1 +
 7 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 npc/014-2-2/_import.txt
 create mode 100644 npc/014-2-2/_warps.txt
 create mode 100644 npc/014-2/trap.txt

(limited to 'npc')

diff --git a/npc/014-2-2/_import.txt b/npc/014-2-2/_import.txt
new file mode 100644
index 000000000..0c96b6aa0
--- /dev/null
+++ b/npc/014-2-2/_import.txt
@@ -0,0 +1,3 @@
+// Map 014-2-2: Forsaken Inn
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/014-2-2/_warps.txt",
diff --git a/npc/014-2-2/_warps.txt b/npc/014-2-2/_warps.txt
new file mode 100644
index 000000000..ff20d0aa0
--- /dev/null
+++ b/npc/014-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 014-2-2: Forsaken Inn warps
+014-2-2,34,35,0	warp	#014-2-2_34_35	0,0,014-2,183,77
diff --git a/npc/014-2/_import.txt b/npc/014-2/_import.txt
index 4cadbd274..1ee7fb0b6 100644
--- a/npc/014-2/_import.txt
+++ b/npc/014-2/_import.txt
@@ -5,3 +5,4 @@
 "npc/014-2/carla.txt",
 "npc/014-2/guards.txt",
 "npc/014-2/mouboo.txt",
+"npc/014-2/trap.txt",
diff --git a/npc/014-2/_warps.txt b/npc/014-2/_warps.txt
index 0a2817bd9..c159673d0 100644
--- a/npc/014-2/_warps.txt
+++ b/npc/014-2/_warps.txt
@@ -2,4 +2,5 @@
 // Map 014-2: Woodlands Southeast warps
 014-2,179,21,0	warp	#014-2_179_21	3,0,012-1,78,101
 014-2,232,20,0	warp	#014-2_232_20	2,0,012-1,132,100
+014-2,183,76,0	warp	#014-2_183_76	0,0,014-2-2,34,34
 014-2,49,24,0	warp	#014-2_49_24	1,0,014-3,130,134
diff --git a/npc/014-2/trap.txt b/npc/014-2/trap.txt
new file mode 100644
index 000000000..924943dbd
--- /dev/null
+++ b/npc/014-2/trap.txt
@@ -0,0 +1,52 @@
+// TMW2 scripts.
+// Authors:
+//    Jesusalva
+// Description:
+//    Gemini Sisters Quest - Traps
+
+014-2,230,58,0	script	#GeminiTrap1	NPC_HIDDEN,0,0,{
+OnTouch:
+    if (getq(General_Narrator) < 16) {
+        mesc l("WARNING:"), 1;
+        mes l("You are not welcome on this island.");
+        mes "";
+        mes l("No mercy will be shown, turn back now!");
+        mes "";
+        mes l("-- Valia G.");
+        close;
+    }
+    end;
+}
+
+014-2,230,60,0	script	#GeminiTrap2	NPC_HIDDEN,0,0,{
+OnTouch:
+    if (getq(General_Narrator) < 16) {
+        slide 230, 56;
+        dispbottom l("You are pushed back with extreme force!");
+        percentheal -15, 0;
+    }
+    end;
+}
+
+014-2,228,64,0	script	#GeminiTrap3	NPC_HIDDEN,0,0,{
+OnTouch:
+    if (getq(General_Narrator) < 16) {
+        slide 230, 56;
+        dispbottom l("You are pushed back with absolute force!");
+        percentheal -85, 0;
+    }
+    end;
+}
+
+// Should never trigger
+014-2,221,69,0	script	#GeminiTrap4	NPC_HIDDEN,1,1,{
+OnTouch:
+    if (getq(General_Narrator) < 16) {
+        warp "Save", 0, 0;
+        dispbottom l("You don't feel so well... And then, you're dead.");
+        die();
+        end;
+    }
+    end;
+}
+
diff --git a/npc/034-4/exit.txt b/npc/034-4/exit.txt
index 8afc3392a..a20664099 100644
--- a/npc/034-4/exit.txt
+++ b/npc/034-4/exit.txt
@@ -144,7 +144,7 @@ OnTouch:
     // Defeating the boss yields a bonus
     InitMaze(7200);
     dispbottom l("It was a trap! We must escape!");
-    sleep2(2000);
+    sleep2(2500);
     @forced_sick$ = getmap();
 	doevent "#DungeonCore::OnSick";
     end;
diff --git a/npc/_import.txt b/npc/_import.txt
index 782d21fdf..d6a59f20c 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -153,6 +153,7 @@
 @include "npc/013-1/_import.txt"
 @include "npc/014-1/_import.txt"
 @include "npc/014-2-1/_import.txt"
+@include "npc/014-2-2/_import.txt"
 @include "npc/014-2/_import.txt"
 @include "npc/014-3/_import.txt"
 @include "npc/014-4/_import.txt"
-- 
cgit v1.2.3-60-g2f50