summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/014-4/kamelot.txt2
-rw-r--r--npc/042-10/_import.txt2
-rw-r--r--npc/042-10/_warps.txt9
-rw-r--r--npc/042-10/ctrl.txt80
-rw-r--r--npc/042-11/_import.txt2
-rw-r--r--npc/042-11/_warps.txt6
-rw-r--r--npc/042-11/boss.txt45
7 files changed, 128 insertions, 18 deletions
diff --git a/npc/014-4/kamelot.txt b/npc/014-4/kamelot.txt
index 9f0e270a7..05a45459b 100644
--- a/npc/014-4/kamelot.txt
+++ b/npc/014-4/kamelot.txt
@@ -18,7 +18,7 @@
// 4 - Weapon Room cutscene seen
// 8 - Sewer Gate open
// 16 - Magic Seal Broken
- // 32 - Boss cutscene seen (presumably, victory)
+ // 32 - Door opened
// 64 - Boss defeated
// $KAMELOT_KEYMASK [ guild_id ] = (bitmask) Keys and Lockpicks
// 1 - Treasure A (Boss Room key)
diff --git a/npc/042-10/_import.txt b/npc/042-10/_import.txt
index 8e72d1df3..2749a192f 100644
--- a/npc/042-10/_import.txt
+++ b/npc/042-10/_import.txt
@@ -1,3 +1,3 @@
// Map 042-10: Camelot Sewer West Path
// This file is generated automatically. All manually added changes will be removed when running the Converter.
-"npc/042-10/_warps.txt",
+"npc/042-10/ctrl.txt",
diff --git a/npc/042-10/_warps.txt b/npc/042-10/_warps.txt
deleted file mode 100644
index ab50c7a44..000000000
--- a/npc/042-10/_warps.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 042-10: Camelot Caves warps
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 042-10: Camelot Sewer West Path warps
-042-10,86,139,0 warp #042-10_86_139 3,0,042-7,61,57
-042-10,149,136,0 warp #042-10_149_136 0,0,042-6,55,21
-042-10,21,139,0 warp #042-10_21_139 2,0,042-8,80,55
-042-10,20,80,0 warp #042-10_20_80 0,6,042-9,98,22
-042-10,142,20,0 warp #042-10_142_20 4,0,042-11,41,56
diff --git a/npc/042-10/ctrl.txt b/npc/042-10/ctrl.txt
new file mode 100644
index 000000000..7b79ce21d
--- /dev/null
+++ b/npc/042-10/ctrl.txt
@@ -0,0 +1,80 @@
+// TMW 2 Script
+// Author:
+// Jesusalva
+// Micksha
+// Description:
+// Controls the great hall
+
+// None of the exits work
+042-10,86,139,0 script #KDoor04210a NPC_HIDDEN,3,0,{
+ end;
+
+OnTouch:
+ .@g=getcharid(2);
+ if (.@g < 1) percentheal -100, -100;
+ dispbottom l("OH NOES! The ceiling seems to have collapsed. I hope we got the key, or the quest is over for us!");
+ end;
+}
+
+042-10,149,136,0 duplicate(#KDoor04210a) #KDoor04210b NPC_HIDDEN,0,0
+042-10,21,139,0 duplicate(#KDoor04210a) #KDoor04210c NPC_HIDDEN,2,0
+042-10,20,80,0 duplicate(#KDoor04210a) #KDoor04210d NPC_HIDDEN,0,6
+
+
+// Boss Room control
+042-10,142,20,0 script #KDoor04210e NPC_HIDDEN,4,0,{
+ end;
+
+OnTouch:
+ .@g=getcharid(2);
+ if (.@g < 1) percentheal -100, -100;
+ if (!($KAMELOT_QUEST[.@g] & 16) || !($KAMELOT_QUEST[.@g] & 32)) goto L_NoAccess;
+ warp "042-11@"+.@g, 41, 56;
+ // TODO Fire Events
+ end;
+
+L_NoAccess:
+ dispbottom l("This door is locked, if we only had a %s...", getitemlink(KamelotKey));
+ end;
+}
+
+// Boss Room Warning
+042-10,150,25,0 script Warning#Kamelot NPC_HIDDEN,{
+ mesc ".:: "+l("DANGER!")+" ::.", 1;
+ mes "";
+ mesc l("I've sealed a massive amount of dark magic here."), 1;
+ mesc l("Do not break my seal to prevent the curse from reaching Kamelot."), 1;
+ mes "";
+ mes l("-- Merlin");
+ end;
+OnInit:
+ .distance=4;
+ end;
+}
+
+// Magic Seal Main
+042-10,135,42,0 script #KamelotSeal NPC_HIDDEN,0,4,{
+ end;
+
+OnTouch:
+ .@g=getcharid(2);
+ if (.@g < 1) percentheal -100, -100;
+ if (!($KAMELOT_QUEST[.@g] & 16)) goto L_NoAccess;
+ end;
+
+L_NoAccess:
+ slide 127, 36;
+ percentheal -10, -10;
+ dispbottom l("A powerful magic seal repeals you!");
+ end;
+}
+
+////////////////////////////////////////////////////////////////////
+// TODO: Catazuli spots
+// TODO: Door Mechanism
+// TODO: Spawn monsters
+
+
+
+
+
diff --git a/npc/042-11/_import.txt b/npc/042-11/_import.txt
index 3e3d6ffb6..fde2ef7f7 100644
--- a/npc/042-11/_import.txt
+++ b/npc/042-11/_import.txt
@@ -1,3 +1,3 @@
// Map 042-11: Camelot Sewer West Path
// This file is generated automatically. All manually added changes will be removed when running the Converter.
-"npc/042-11/_warps.txt",
+"npc/042-11/boss.txt",
diff --git a/npc/042-11/_warps.txt b/npc/042-11/_warps.txt
deleted file mode 100644
index c5ffd25ac..000000000
--- a/npc/042-11/_warps.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 042-11: Boss Chamber warps
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 042-11: Camelot Sewer West Path warps
-042-11,41,57,0 warp #042-11_41_57 4,0,042-10,143,21
-042-11,20,28,0 warp #042-11_20_28 0,2,042-0,46,25
diff --git a/npc/042-11/boss.txt b/npc/042-11/boss.txt
new file mode 100644
index 000000000..76ddac08f
--- /dev/null
+++ b/npc/042-11/boss.txt
@@ -0,0 +1,45 @@
+// TMW 2 Script
+// Author:
+// Jesusalva
+// Micksha
+// Description:
+// Controls the showdown
+042-11,41,57,0 script #KDoor04211a NPC_HIDDEN,4,0,{
+ end;
+
+OnTouch:
+ .@g=getcharid(2);
+ if (.@g < 1) percentheal -100, -100;
+ if (!($KAMELOT_QUEST[.@g] & 64)) goto L_NoAccess;
+ warp "042-10@"+.@g, 143, 21;
+ end;
+
+L_NoAccess:
+ dispbottom l("Can't leave right now.");
+ end;
+}
+
+042-11,20,28,0 script #KDoor04211b NPC_HIDDEN,0,2,{
+ end;
+
+OnTouch:
+ .@g=getcharid(2);
+ if (.@g < 1) percentheal -100, -100;
+ if (!($KAMELOT_QUEST[.@g] & 64)) goto L_NoAccess;
+ mes l("Are you sure you want leave?");
+ mesc l("You wont be able to go back!");
+ next;
+ if (askyesno() == ASK_YES)
+ warp "042-0@"+.@g, 46, 25;
+ close;
+
+L_NoAccess:
+ dispbottom l("Can't leave right now.");
+ end;
+}
+
+// TODO: Boss Showdown
+// TODO: Spawn GMGiftBox and Treasure Chests upon end
+
+
+