summaryrefslogtreecommitdiff
path: root/npc/042-2
diff options
context:
space:
mode:
Diffstat (limited to 'npc/042-2')
-rw-r--r--npc/042-2/_import.txt1
-rw-r--r--npc/042-2/_warps.txt3
-rw-r--r--npc/042-2/boss.txt16
3 files changed, 13 insertions, 7 deletions
diff --git a/npc/042-2/_import.txt b/npc/042-2/_import.txt
index 0f05b25bd..2d59e35c7 100644
--- a/npc/042-2/_import.txt
+++ b/npc/042-2/_import.txt
@@ -1,4 +1,3 @@
// Map 042-2: Camelot - Basement
// This file is generated automatically. All manually added changes will be removed when running the Converter.
-"npc/042-2/_warps.txt",
"npc/042-2/boss.txt",
diff --git a/npc/042-2/_warps.txt b/npc/042-2/_warps.txt
deleted file mode 100644
index 95f0f25a0..000000000
--- a/npc/042-2/_warps.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 042-2: Camelot - Basement warps
-042-2,44,60,0 warp #042-2_44_60 0,0,042-1,51,24
diff --git a/npc/042-2/boss.txt b/npc/042-2/boss.txt
index d7c3493f3..a115641be 100644
--- a/npc/042-2/boss.txt
+++ b/npc/042-2/boss.txt
@@ -4,9 +4,6 @@
// Micksha
// Description:
// Basement Boss Fight
-// TODO: maptimer to give EXP to helpers/survivors
-// TODO: Arrest scene (Razha)
-// TODO: Actual arresting (cycle though our 12 jails with modus)
// We'll be counting attendance now.
042-2,41,22,0 script #KDoor0422 NPC_HIDDEN,0,0,{
@@ -382,4 +379,17 @@ function kdoor0422Spawn {
// Script end
}
+// Required exit
+042-2,44,60,0 script #KDoor0422B NPC_HIDDEN,0,0,{
+ end;
+
+OnTouch:
+ .@g=getcharid(2);
+ if ($KAMELOT_QUEST[.@g] & 4) {
+ warp "042-1@"+.@g, 51, 24;
+ } else {
+ dispbottom l("Oh noes! The guards locked the door!");
+ }
+ end;
+}