From 0b822b68cfa79cedd4f5ea21b1d8e78f5d998a12 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Thu, 30 Apr 2020 03:56:02 -0300
Subject: Script Control some of Kamelot Castle warps.

---
 npc/042-2/_import.txt |  1 -
 npc/042-2/_warps.txt  |  3 ---
 npc/042-2/boss.txt    | 16 +++++++++++++---
 npc/042-3/_warps.txt  |  1 -
 npc/042-3/jail.txt    | 10 ++++++++++
 5 files changed, 23 insertions(+), 8 deletions(-)
 delete mode 100644 npc/042-2/_warps.txt

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;
+}
 
diff --git a/npc/042-3/_warps.txt b/npc/042-3/_warps.txt
index f7176b91c..d86c4911e 100644
--- a/npc/042-3/_warps.txt
+++ b/npc/042-3/_warps.txt
@@ -1,4 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 042-3: Camelot - Jail warps
-042-3,58,140,0	warp	#042-3_58_140	0,0,042-2,41,23
 042-3,63,19,0	warp	#042-3_63_19	1,0,042-4,60,77
diff --git a/npc/042-3/jail.txt b/npc/042-3/jail.txt
index 5108d459a..19c346a6c 100644
--- a/npc/042-3/jail.txt
+++ b/npc/042-3/jail.txt
@@ -119,3 +119,13 @@ OnKamelotSlide:
 
 
 
+// Required exit
+042-3,58,140,0	script	#KDoor0423B	NPC_HIDDEN,0,0,{
+    end;
+
+OnTouch:
+    .@g=getcharid(2);
+    warp "042-3@"+.@g, 41, 23;
+    end;
+}
+
-- 
cgit v1.2.3-60-g2f50