summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-01-14 01:14:30 -0200
committerJesusaves <cpntb1@ymail.com>2019-01-14 01:14:30 -0200
commit447c374c1c1a737b88be48b1059fec62916bcc3e (patch)
tree4015b9f9fca08b2bf101e71d955e5a8cd29f40eb
parent9ffc34ab0191ed290ae5f7c4be49b7cfca33bcc8 (diff)
downloadserverdata-447c374c1c1a737b88be48b1059fec62916bcc3e.tar.gz
serverdata-447c374c1c1a737b88be48b1059fec62916bcc3e.tar.bz2
serverdata-447c374c1c1a737b88be48b1059fec62916bcc3e.tar.xz
serverdata-447c374c1c1a737b88be48b1059fec62916bcc3e.zip
[skip ci] Terranite cave is a PVP map and nec hercules said that
a pvp map is a nopenalty map
-rw-r--r--npc/001-8/hub.txt5
-rw-r--r--npc/011-1/manastone.txt2
2 files changed, 2 insertions, 5 deletions
diff --git a/npc/001-8/hub.txt b/npc/001-8/hub.txt
index f959da53c..4377f0737 100644
--- a/npc/001-8/hub.txt
+++ b/npc/001-8/hub.txt
@@ -416,16 +416,11 @@ OnPCLogoutEvent:
if (!is_staff())
atcommand "@jail "+strcharinfo(0);
}
- // Death at terranite cave
- if (.@mapa$ ~= "015-6")
- @deathpenalty_override=2;
// This allows code to override death penalty, just once:
// @deathpenalty_override
// Valid values: 1- No penalty. 2- Halved penalty.
if (@deathpenalty_override && @qhub_died) {
- @deathpenalty_realvalue=readparam(BaseExp);
- @deathpenalty_realvaljob=readparam(JobExp);
if (is_staff())
debugmes("Old values: %d %d Current Values: %d %d", @deathpenalty_realvalue, @deathpenalty_realvaljob, readparam(BaseExp), readparam(JobExp));
addtimer(200, "#QuirinoHUB::OnNoPenaltyCommand");
diff --git a/npc/011-1/manastone.txt b/npc/011-1/manastone.txt
index 9e04b766f..ea430f716 100644
--- a/npc/011-1/manastone.txt
+++ b/npc/011-1/manastone.txt
@@ -73,6 +73,8 @@ L_LevelUp:
if (MAGIC_LVL) mes l("More Magic Power is granted to you, but you die from it.");
MAGIC_LVL = MAGIC_LVL+1;
// No penalty for death provoked by Mana Stone, see npc/001-8/hub.txt for more info
+ @deathpenalty_realvalue=readparam(BaseExp);
+ @deathpenalty_realvaljob=readparam(JobExp);
@deathpenalty_override=1;
percentheal -100, -100;
close;