From c53d1cfb3d94fb364ceaa123359e5ac7a4b9d065 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sat, 2 May 2020 04:55:21 -0300
Subject: Fix several tiny bugs and add some debug level to Jail On the first
live test I'm doing
---
npc/014-4/kamelot.txt | 5 ++++-
npc/042-10/ctrl.txt | 18 +++++++++---------
npc/042-3/jail.txt | 2 ++
3 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/npc/014-4/kamelot.txt b/npc/014-4/kamelot.txt
index d5c7ec05d..4cd584b19 100644
--- a/npc/014-4/kamelot.txt
+++ b/npc/014-4/kamelot.txt
@@ -123,7 +123,7 @@ OnDebug:
l("Quest - Skip Krukan fight"),
l("Quest - Find all Keys"),
l("Quest - Unlock Boss Room"),
- "",
+ l("Quest - Mark as Completed"),
"",
l("Warp - Jump to Entrance"), // 10
l("Warp - Jump to Weapon Room"),
@@ -141,6 +141,9 @@ OnDebug:
KamelotCleanup(.@g);
break;
// We now order from bottom-up
+ case 8:
+ $KAMELOT_QUEST[.@g]=$KAMELOT_QUEST[.@g]|64;
+ mes "WARNING: Quest concluded";
case 7:
$KAMELOT_QUEST[.@g]=$KAMELOT_QUEST[.@g]|8;
$KAMELOT_QUEST[.@g]=$KAMELOT_QUEST[.@g]|16;
diff --git a/npc/042-10/ctrl.txt b/npc/042-10/ctrl.txt
index e50df4c47..1e8bca386 100644
--- a/npc/042-10/ctrl.txt
+++ b/npc/042-10/ctrl.txt
@@ -40,7 +40,7 @@ L_NoAccess:
}
// Boss Room Warning
-042-10,150,25,0 script Warning#Kamelot NPC_HIDDEN,{
+042-10,150,25,0 script Warning#Kamelot NPC_NO_SPRITE,{
mesc ".:: "+l("DANGER!")+" ::.", 1;
mes "";
mesc l("I've sealed a massive amount of dark magic here."), 1;
@@ -227,7 +227,7 @@ function script KatazuliCore {
////////////////////////
// Katazuli's Engravings
-042-10,36,110,0 script Engraving#Katazuli1 NPC_HIDDEN,{
+042-10,36,110,0 script Engraving#Katazuli1 NPC_NO_SPRITE,{
mes "Read tutorial?";
select l("No"), l("Yes");
if (@menu == 2)
@@ -237,7 +237,7 @@ OnInit:
.distance=4;
end;
}
-042-10,124,85,0 duplicate(Engraving#Katazuli1) Engraving#Katazuli2 NPC_HIDDEN
+042-10,124,85,0 duplicate(Engraving#Katazuli1) Engraving#Katazuli2 NPC_NO_SPRITE
////////////////////////
@@ -297,7 +297,7 @@ OnTimer60000:
// Recover energy
.@id=.kataId;
.@m$=instance_mapname("042-10");
- .@power=min(0, getd("$@GTEMP_"+.@id+"_"+.@m$)-.@pow);
+ .@power=max(0, getd("$@GTEMP_"+.@id+"_"+.@m$)-.@pow);
setd("$@GTEMP_"+.@id+"_"+.@m$, .@power);
initnpctimer;
end;
@@ -361,7 +361,7 @@ OnTimer60000:
// Recover energy
.@id=.kataId;
.@m$=instance_mapname("042-10");
- .@power=min(0, getd("$@GTEMP_"+.@id+"_"+.@m$)-.@pow);
+ .@power=max(0, getd("$@GTEMP_"+.@id+"_"+.@m$)-.@pow);
setd("$@GTEMP_"+.@id+"_"+.@m$, .@power);
initnpctimer;
end;
@@ -500,10 +500,10 @@ OnInit:
}
// Other switches
-042-10,80,115,0 duplicate(#K4210Switch_1) #K4210Switch_2 NPC_HIDDEN,0,0 // S
-042-10,63,76,0 duplicate(#K4210Switch_1) #K4210Switch_4 NPC_HIDDEN,0,0 // W
-042-10,100,79,0 duplicate(#K4210Switch_1) #K4210Switch_8 NPC_HIDDEN,0,0 // E
-042-10,82,64,0 duplicate(#K4210Switch_1) #K4210Switch_16 NPC_HIDDEN,0,0 // C
+042-10,80,115,0 duplicate(#K4210Switch_1) #K4210Switch_2 NPC_SWITCH_OFFLINE,0,0 // S
+042-10,63,76,0 duplicate(#K4210Switch_1) #K4210Switch_4 NPC_SWITCH_OFFLINE,0,0 // W
+042-10,100,79,0 duplicate(#K4210Switch_1) #K4210Switch_8 NPC_SWITCH_OFFLINE,0,0 // E
+042-10,82,64,0 duplicate(#K4210Switch_1) #K4210Switch_16 NPC_SWITCH_OFFLINE,0,0 // C
diff --git a/npc/042-3/jail.txt b/npc/042-3/jail.txt
index a7b49739c..be54ef435 100644
--- a/npc/042-3/jail.txt
+++ b/npc/042-3/jail.txt
@@ -10,6 +10,7 @@
end;
OnKillSlime:
+ debugmes "Slime slain";
.@label$=instance_npcname(.name$)+"::OnKillSlime";
if (!playerattached()) {
debugmes "[ERROR] Player not Attached on Slime Death D:";
@@ -35,6 +36,7 @@ OnFirstSlime:
.@mob=monster(.@m$, .@x, .@y, strmobinfo(1, CopperSlime), CopperSlime, 1, .@label$);
// This should wipe the monster experience value
setunitdata(.@mob, UDT_LEVEL, 1);
+ debugmes "Slime is back";
end;
--
cgit v1.2.3-70-g09d2