summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/001-8/hub.txt8
-rw-r--r--npc/006-1/crazyfefe.txt2
-rw-r--r--npc/017-3/dimonds.txt2
-rw-r--r--npc/021-4/main.txt2
4 files changed, 10 insertions, 4 deletions
diff --git a/npc/001-8/hub.txt b/npc/001-8/hub.txt
index fcf565786..e5b24ed65 100644
--- a/npc/001-8/hub.txt
+++ b/npc/001-8/hub.txt
@@ -379,13 +379,19 @@ OnPCLogoutEvent:
}
// TODO: Checks which doesn't belong here shouldn't be here!
- if (.@mapa$ == "015-6") {
+ 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;
}
+ if (.@mapa$ == "021-4" && strcharinfo(0) == $@CINDY_HERO) {
+ recovery(getcharid(3));
+ warp any("010-1", "010-2"), 0, 0;
+ percentheal -100, -100;
+ sc_start2 SC_POISON, 1, 90, 10000;
+ }
@qhub_victor=0;
@qhub_died=0;
diff --git a/npc/006-1/crazyfefe.txt b/npc/006-1/crazyfefe.txt
index bccfb3eb1..a6c3088a1 100644
--- a/npc/006-1/crazyfefe.txt
+++ b/npc/006-1/crazyfefe.txt
@@ -245,7 +245,7 @@ L_CleanUp:
// Rewards surviving players between rounds, according to performance, and get rid of dead PCs.
OnReward:
if (ispcdead()) {
- recovery();
+ recovery(getcharid(3));
warp "Save", 0, 0;
end;
}
diff --git a/npc/017-3/dimonds.txt b/npc/017-3/dimonds.txt
index b8491884c..685a12d95 100644
--- a/npc/017-3/dimonds.txt
+++ b/npc/017-3/dimonds.txt
@@ -615,7 +615,7 @@ OnInit:
if (@menu == 2)
close;
Zeny=Zeny-100;
- recovery();
+ recovery(getcharid(3));
if (rand(1,2) == 1)
sc_start SC_POISON, 60000, 0, 10000;
else
diff --git a/npc/021-4/main.txt b/npc/021-4/main.txt
index 7921e0f5b..75d6bff9e 100644
--- a/npc/021-4/main.txt
+++ b/npc/021-4/main.txt
@@ -141,7 +141,7 @@ OnFail:
OnReward:
if (ispcdead()) {
- recovery();
+ recovery(getcharid(3));
warp "Save", 0, 0;
end;
}