Fix dummy coordinates and remove lots of bloat

2 files changed, 2 insertions, 36 deletions

diff --git a/npc/033-1/misc.txt b/npc/033-1/misc.txt
index c7c6426..5cab8dc 100644
--- a/npc/033-1/misc.txt
+++ b/npc/033-1/misc.txt
@@ -83,8 +83,8 @@ OnTouch:
     end;
 }
 
-// FIXME: Wrong coordinates?
-033-1,34,150,0	script	#Porthos02	NPC_NO_SPRITE,0,0,{
+// 34,150
+033-1,31,155,0	script	#Porthos02	NPC_NO_SPRITE,0,0,{
     end;
 OnTouch:
     /*
diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index 03e4442..ae347bd 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -136,44 +136,10 @@ function	script	HUB_Logout	{
     if (.@dead) {
         // It was PK
         if (killerrid > 2000000 && killerrid < 2100000) {
-            // PVP flag was off
-            /*
-            if (!getmapflag(.@mapa$, mf_pvp) && !getmapflag(.@mapa$, mf_pvp_noparty) && !getmapflag(.@mapa$, mf_pvpnoguild)) {
-                recovery(getcharid(3));
-                warp .@mapa$, .@a, .@b;
-                percentheal 100, 100;
-                dispbottom l("REVENGE TIME!");
-                .@trueid=getcharid(3);
-                //detachrid();
-                attachrid(killerrid);
-                setpcblock(PCBLOCK_SOFT, true);
-                sc_start SC_WALKSPEED,120000,50;
-                sc_end SC_CASH_PLUSEXP;
-                sc_end SC_OVERLAPEXPUP;
-                sc_start SC_OVERLAPEXPUP, 300000, -20;
-                dispbottom l("For cowardingly killing in a \"secure\" area, you will be severely punished.");
-                //Karma+=1;
-                sc_start SC_STUN, 15000, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK;
-                addtimer(15000, "#mobptsys::OnUnlock");
-                percentheal -88, -100;
-                detachrid();
-                attachrid(.@trueid);
-            }
-            */
             HONOR+=1;
         }
     }
 
-    // This allows code to override death penalty, just once:
-    // @deathpenalty_override
-    // Valid values: 1- No penalty. 2- Halved penalty.
-    // You must also set: @deathpenalty_realvalue and @deathpenalty_realvaljob
-    if (@deathpenalty_override && .@dead) {
-        if (is_staff())
-            debugmes("Old values: %d %d Current Values: %d %d", @deathpenalty_realvalue, @deathpenalty_realvaljob, readparam(BaseExp), readparam(JobExp));
-        addtimer(300, "#QuirinoHUB::OnNoPenaltyCommand");
-    }
-
     // Register logout time
     if (!.@dead) {
         CHAREG_CLEANUP=gettimetick(2);