[skip ci] yeah, must revive at Terranite Cave >.<

1 files changed, 10 insertions, 8 deletions

diff --git a/npc/001-8/hub.txt b/npc/001-8/hub.txt
index 04e6122b5..bd6b3e07c 100644
--- a/npc/001-8/hub.txt
+++ b/npc/001-8/hub.txt
@@ -379,14 +379,6 @@ OnPCLogoutEvent:
     }
 
     // TODO: Checks which doesn't belong here shouldn't be here!
-    // Died on Terranite Cave where exp penalty is lower
-    if (.@mapa$ == "015-6" && @qhub_died) {
-        if (readparam(BaseExp) < readparam(BaseExp)*2/100)
-            end;
-        recovery(getcharid(3));
-        getexp readparam(BaseExp)*2/100, 0;
-        warp "Save", 0, 0;
-    }
     // Vanished on Cindy Cave
     if (.@mapa$ == "021-4" && strcharinfo(0) == $@CINDY_HERO$) {
         recovery(getcharid(3));
@@ -416,6 +408,12 @@ OnPCLogoutEvent:
         if (!is_staff())
             atcommand "@jail "+strcharinfo(0);
     }
+    // Died on Terranite Cave where exp penalty is lower
+    if (.@mapa$ == "015-6" && @qhub_died) {
+        @deathpenalty_override=2;
+        @deathpenalty_realvalue=readparam(BaseExp);
+        @deathpenalty_realvaljob=readparam(JobExp);
+    }
 
     // This allows code to override death penalty, just once:
     // @deathpenalty_override
@@ -443,6 +441,10 @@ OnNoPenaltyCommand:
     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);
 
+    // Revive and Warp you to save point or it'll have no effect
+    recovery(getcharid(3));
+    warp "Save", 0, 0;
+
     // Restitute the lost experience
     if (@deathpenalty_override == 1)
         getexp .@realvalue, .@realvaljob;