summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2018-10-25 22:59:26 -0300
committerJesusaves <cpntb1@ymail.com>2018-10-25 23:00:10 -0300
commit61c6393855cb76e1cd6b8b08d99ea911b6bf38b8 (patch)
tree6e10813521ea2b6fb55288aba32d78be2970b732 /npc
parent10a56e69db5d71b1278c7eb5625bb827e6ecb477 (diff)
downloadserverdata-61c6393855cb76e1cd6b8b08d99ea911b6bf38b8.tar.gz
serverdata-61c6393855cb76e1cd6b8b08d99ea911b6bf38b8.tar.bz2
serverdata-61c6393855cb76e1cd6b8b08d99ea911b6bf38b8.tar.xz
serverdata-61c6393855cb76e1cd6b8b08d99ea911b6bf38b8.zip
Correct bugs reported by @demure
Diffstat (limited to 'npc')
-rw-r--r--npc/001-8/hub.txt6
-rw-r--r--npc/019-2/angela.txt1
-rw-r--r--npc/021-1/yeti.txt10
-rw-r--r--npc/021-4/doors.txt2
-rw-r--r--npc/021-4/main.txt13
5 files changed, 21 insertions, 11 deletions
diff --git a/npc/001-8/hub.txt b/npc/001-8/hub.txt
index e5b24ed65..5312984ae 100644
--- a/npc/001-8/hub.txt
+++ b/npc/001-8/hub.txt
@@ -391,6 +391,12 @@ OnPCLogoutEvent:
warp any("010-1", "010-2"), 0, 0;
percentheal -100, -100;
sc_start2 SC_POISON, 1, 90, 10000;
+ } else if (.@mapa$ == "021-4") {
+ .@pl = getmapusers("021-4")-1;
+ if (.@pl < 1)
+ donpcevent("Cindy#Outside::OnCleanUp");
+ recovery(getcharid(3));
+ warp "Save", 0, 0;
}
@qhub_victor=0;
diff --git a/npc/019-2/angela.txt b/npc/019-2/angela.txt
index 227094959..9fce3c279 100644
--- a/npc/019-2/angela.txt
+++ b/npc/019-2/angela.txt
@@ -94,6 +94,7 @@ L_Start:
mes "";
mesc l("[Quest Accepted]"), 1;
mesc l("Rescue Cindy from the Ice Labyrinth and the evil Yetis. This is a global, multiplayer quest."), 1;
+ mesc l("Advised party size: From 3 and above");
channelmes("#world", strcharinfo(0) + " said to be brave enough to help Angela rescuing her daughter!");
setq NivalisQuest_Cindy, 1;
close;
diff --git a/npc/021-1/yeti.txt b/npc/021-1/yeti.txt
index ea9f62ae1..d924d5263 100644
--- a/npc/021-1/yeti.txt
+++ b/npc/021-1/yeti.txt
@@ -79,7 +79,7 @@ L_Assigned:
mesq l("I am his right-hand Yeti, so I could grant you passage to his Throne Room to slay the rogue Yetis...");
next;
mesn;
- mesq l("...But saving me won't be enough, so build trust by the kind gift of 80 @@. I'll be waiting.", getitemlink(MoubooSteak)); // A normal Steak could do, but...
+ mesq l("...But saving me won't be enough, so build trust by the kind gift of 60 @@. I'll be waiting.", getitemlink(MoubooSteak)); // A normal Steak could do, but...
setq NivalisQuest_Cindy, 2;
}
close;
@@ -95,10 +95,10 @@ L_Assigned:
L_Report:
mesn;
- mesq l("Did you brought us a kind gift of good will, on the worth of 80 @@, to offer to our King?", getitemlink(MoubooSteak));
+ mesq l("Did you brought us a kind gift of good will, on the worth of 60 @@, to offer to our King?", getitemlink(MoubooSteak));
next;
select
- rif(countitem(MoubooSteak) >= 80, l("Yes, here they are.")), // Demure was here
+ rif(countitem(MoubooSteak) >= 60, l("Yes, here they are.")), // Demure was here
l("Not yet.");
mes "";
if (@menu == 2) {
@@ -106,7 +106,7 @@ L_Report:
mesq l("Then please bring me this, so I can help you back.");
close;
}
- delitem MoubooSteak, 80;
+ delitem MoubooSteak, 60;
setq NivalisQuest_Cindy, 3;
mesn;
mesq l("Great. I hereby task you to kill the rogue Yetis on the Yeti King Throne Room. Of course, you won't be able to leave until all of them are dead.");
@@ -160,7 +160,7 @@ L_Disrupt:
L_Warning:
mesn;
- mesq l("Stupid @@, get out of this cave before I lose my patience!", get_race());
+ mesq l("Stupid @@, get out of this cave before I lose my patience! Mercury... Show up already!", get_race());
close;
L_Hit:
diff --git a/npc/021-4/doors.txt b/npc/021-4/doors.txt
index c97aec317..1d84e72d5 100644
--- a/npc/021-4/doors.txt
+++ b/npc/021-4/doors.txt
@@ -8,7 +8,7 @@
if ($@CINDY_STATE % 2 == 1 && $@CINDY_STATE < 150000) goto L_Blocked;
if ($@CINDY_STATE > 150000) goto L_Check;
L_Warp:
- warp "021-3", 24, 123;
+ warp "021-3", 24, 122;
end;
L_Blocked:
diff --git a/npc/021-4/main.txt b/npc/021-4/main.txt
index 75d6bff9e..eb146ca5a 100644
--- a/npc/021-4/main.txt
+++ b/npc/021-4/main.txt
@@ -42,8 +42,9 @@ function script CindySwitch_Check_214 {
goto L_Cheat;
if ($@CINDY_STATE > 150000) goto L_Reset;
if ($@CINDY_STATE % 2 == 0) goto L_Start;
- if (CindySwitch_Check_214() == 5) {
+ if (CindySwitch_Check_214() == 5 && !.canfinish) {
// Gate is open, advance to stage 2
+ .canfinish=1;
.lifetime+=3;
.wtime=0;
mapannounce "021-4", "*roaaaaar*",0;
@@ -52,8 +53,7 @@ function script CindySwitch_Check_214 {
.@pl = getmapusers("021-4")+1;
areamonster "021-4", 20, 20, 100, 80, "Yeti", Yeti, (.@pl/2)+rand(2,6), "Cindy#Outside::OnPetDeath";
areamonster "021-4", 20, 20, 100, 80, "Moggun", Moggun, ($@CINDY_STATE/2)+1, "Cindy#Outside::OnPetDeath";
- areamonster "021-4", 20, 20, 100, 80, "Slime Blast", SlimeBlast, $@CINDY_STATE+1, "Cindy#Outside::OnPetDeath";
- .canfinish=1;
+ areamonster "021-4", 20, 20, 100, 80, "Slime Blast", SlimeBlast, $@CINDY_STATE+1;
}
hello; end;
@@ -153,6 +153,7 @@ OnReward:
getexp 10000, JobLevel;
end;
+OnCleanUp:
L_CleanUp:
.lifetime=0;
.wtime=0;
@@ -177,14 +178,16 @@ OnTimer2500:
goto L_CleanUp;
}
.wtime+=5;
- if (.wtime >= rand(60,80)) {
+ if (.wtime >= rand(60,90)) {
.wtime=0;
.lifetime+=1;
.@pl = getmapusers("021-4")+1;
// If gate was unlocked, more Yetis will appear depending on switches state.
if (.canfinish)
.@pl+=5-CindySwitch_Check_214();
- areamonster "021-4", 20, 20, 100, 80, "Yeti", Yeti, (.@pl/2)+($@CINDY_STATE/2)+(.lifetime/3), "Cindy#Outside::OnPetDeath";
+ .@value=(.@pl/2)+($@CINDY_STATE/2)+(.lifetime/3);
+ areamonster "021-4", 20, 20, 100, 80, "Yeti", Yeti, (.@value+1)/2, "Cindy#Outside::OnPetDeath";
+ areamonster "021-4", 20, 20, 100, 80, "Moggun", Moggun, (.@value+1)/2, "Cindy#Outside::OnPetDeath";
npctalk any("Yetis!",
"Watch out!",
"More of them are coming!",