summaryrefslogtreecommitdiff
path: root/npc/001-8/hub.txt
diff options
context:
space:
mode:
Diffstat (limited to 'npc/001-8/hub.txt')
-rw-r--r--npc/001-8/hub.txt18
1 files changed, 12 insertions, 6 deletions
diff --git a/npc/001-8/hub.txt b/npc/001-8/hub.txt
index bd6b3e07c..7e217c93a 100644
--- a/npc/001-8/hub.txt
+++ b/npc/001-8/hub.txt
@@ -421,7 +421,7 @@ OnPCLogoutEvent:
if (@deathpenalty_override && @qhub_died) {
if (is_staff())
debugmes("Old values: %d %d Current Values: %d %d", @deathpenalty_realvalue, @deathpenalty_realvaljob, readparam(BaseExp), readparam(JobExp));
- addtimer(200, "#QuirinoHUB::OnNoPenaltyCommand");
+ addtimer(300, "#QuirinoHUB::OnNoPenaltyCommand");
}
@qhub_victor=0;
@@ -433,23 +433,27 @@ OnCancel:
warp "Save", 0, 0;
end;
+// No penalty override
OnNoPenaltyCommand:
- .@realvalue=@deathpenalty_realvalue-readparam(BaseExp);
- .@realvaljob=@deathpenalty_realvaljob-readparam(JobExp);
+ @realvalue=@deathpenalty_realvalue-readparam(BaseExp);
+ @realvaljob=@deathpenalty_realvaljob-readparam(JobExp);
// GM Report
if (is_staff())
- debugmes("Old values: %d %d Current Values: %d %d Real Difference: %d %d", @deathpenalty_realvalue, @deathpenalty_realvaljob, readparam(BaseExp), readparam(JobExp), .@realvalue, .@realvaljob);
+ debugmes("Old values: %d %d Current Values: %d %d Real Difference: %d %d", @deathpenalty_realvalue, @deathpenalty_realvaljob, readparam(BaseExp), readparam(JobExp), @realvalue, @realvaljob);
// Revive and Warp you to save point or it'll have no effect
recovery(getcharid(3));
warp "Save", 0, 0;
+ addtimer(500, "#QuirinoHUB::OnNoPenaltyCommand2");
+ end;
+OnNoPenaltyCommand2:
// Restitute the lost experience
if (@deathpenalty_override == 1)
- getexp .@realvalue, .@realvaljob;
+ getexp @realvalue, @realvaljob;
else if (@deathpenalty_override == 2)
- getexp .@realvalue/2, .@realvaljob/2;
+ getexp @realvalue/2, @realvaljob/2;
else
dispbottom l("BUG, REPORT ME: QHUB PENALTY OVERRIDE INVALID SIGNAL @@", @deathpenalty_override);
@@ -457,6 +461,8 @@ OnNoPenaltyCommand:
@deathpenalty_override=0;
@deathpenalty_realvalue=0;
@deathpenalty_realvaljob=0;
+ @realvalue=0;
+ @realvaljob=0;
end;
}