From eca038e00b9937d6c177bd8cddc8b5b1a2e9c5a9 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Wed, 13 May 2020 00:57:23 -0300 Subject: Replace our script-induced deaths with new, custom, die() command This will fix one of the HardCore Server bugs. --- npc/042-10/ctrl.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'npc/042-10/ctrl.txt') diff --git a/npc/042-10/ctrl.txt b/npc/042-10/ctrl.txt index 64fc1195c..bb13e8d5c 100644 --- a/npc/042-10/ctrl.txt +++ b/npc/042-10/ctrl.txt @@ -11,7 +11,7 @@ OnTouch: .@g=getcharid(2); - if (.@g < 1) percentheal -100, -100; + if (.@g < 1) die(); dispbottom l("OH NOES! The ceiling seems to have collapsed. I hope we got the key, or the quest is over for us!"); end; } @@ -27,7 +27,7 @@ OnTouch: OnTouch: .@g=getcharid(2); - if (.@g < 1) percentheal -100, -100; + if (.@g < 1) die(); if (!($KAMELOT_QUEST[.@g] & 8) || !($KAMELOT_QUEST[.@g] & 16) || !($KAMELOT_QUEST[.@g] & 32)) goto L_NoAccess; warp "042-11@"+.@g, 41, 56; addtimer 3000, "#KamelotBoss::OnDialog"; @@ -59,7 +59,7 @@ OnInit: OnTouch: .@g=getcharid(2); - if (.@g < 1) percentheal -100, -100; + if (.@g < 1) die(); 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 @@ -552,7 +552,7 @@ OnKillMob: // Maybe a reward is due .@g=getcharid(2); - if (.@g < 1) percentheal -100, -100; + if (.@g < 1) die(); getexp $KAMELOT_MX[.@g]*10, $KAMELOT_MX[.@g]*5; .@delay=max(5000, 30000-$KAMELOT_PC[.@g]*1250); // FALLTHROUGH -- cgit v1.2.3-60-g2f50