Prepare Katazuli from Kamelot Castle

1 files changed, 35 insertions, 2 deletions

diff --git a/npc/042-10/ctrl.txt b/npc/042-10/ctrl.txt
index 7b79ce21d..6b595d7d5 100644
--- a/npc/042-10/ctrl.txt
+++ b/npc/042-10/ctrl.txt
@@ -28,7 +28,7 @@ OnTouch:
 OnTouch:
     .@g=getcharid(2);
     if (.@g < 1) percentheal -100, -100;
-    if (!($KAMELOT_QUEST[.@g] & 16) || !($KAMELOT_QUEST[.@g] & 32)) goto L_NoAccess;
+    if (!($KAMELOT_QUEST[.@g] & 8) || !($KAMELOT_QUEST[.@g] & 16) || !($KAMELOT_QUEST[.@g] & 32)) goto L_NoAccess;
     warp "042-11@"+.@g, 41, 56;
     // TODO Fire Events
     end;
@@ -59,13 +59,23 @@ OnInit:
 OnTouch:
     .@g=getcharid(2);
     if (.@g < 1) percentheal -100, -100;
-    if (!($KAMELOT_QUEST[.@g] & 16)) goto L_NoAccess;
+    if (!($KAMELOT_QUEST[.@g] & 16) && !($KAMELOT_QUEST[.@g] & 8)) goto L_NoAccessBlock;
+    if (!($KAMELOT_QUEST[.@g] & 16) || !($KAMELOT_QUEST[.@g] & 8)) goto L_NoAccess;
+    // You can pass freely, so we do nothing
     end;
 
 L_NoAccess:
     slide 127, 36;
+    percentheal -5, -5;
+    dispbottom l("A powerful magic seal repeals you!");
+    dispbottom l("It's weaker than before, probably only one is working right now.");
+    end;
+
+L_NoAccessBlock:
+    slide 127, 36;
     percentheal -10, -10;
     dispbottom l("A powerful magic seal repeals you!");
+    dispbottom l("We need to find what powers these two seals and disable it.");
     end;
 }
 
@@ -74,7 +84,30 @@ L_NoAccess:
 // TODO: Door Mechanism
 // TODO: Spawn monsters
 
+042-10,128,85,0	script	#Katazuli01	NPC_SUMMONING_CIRC,0,0,{
+    dispbottom l("This is probably related to the magical seals.");
+    end;
 
+OnInit:
+    .distance=2;
+    end;
 
+OnTouch:
+    npctalk l("TODO FIXME"); // TODO FIXME
+    end;
+}
+
+042-10,32,108,0	script	#Katazuli02	NPC_SUMMONING_CIRC,0,0,{
+    dispbottom l("This is probably related to the magical seals.");
+    end;
+
+OnInit:
+    .distance=2;
+    end;
+
+OnTouch:
+    npctalk l("TODO FIXME"); // TODO FIXME
+    end;
+}