summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2021-02-14 15:49:47 -0300
committerJesusaves <cpntb1@ymail.com>2021-02-14 15:49:47 -0300
commit16cf7d67834ab45de67a2dce2ec7406373547816 (patch)
tree776030194f37a96d4c4bb3592bca7cc690ccae9e /npc
parent2567194d7a32ba02fbdad286e803d8b0fa0393ac (diff)
downloadserverdata-16cf7d67834ab45de67a2dce2ec7406373547816.tar.gz
serverdata-16cf7d67834ab45de67a2dce2ec7406373547816.tar.bz2
serverdata-16cf7d67834ab45de67a2dce2ec7406373547816.tar.xz
serverdata-16cf7d67834ab45de67a2dce2ec7406373547816.zip
Replace the hack of pet jump on drowned map with the server-code patch
Diffstat (limited to 'npc')
-rw-r--r--npc/017-1/drowned_man.txt18
-rw-r--r--npc/018-5-boss/mapflag.txt2
2 files changed, 2 insertions, 18 deletions
diff --git a/npc/017-1/drowned_man.txt b/npc/017-1/drowned_man.txt
index 14330b8c3..96046123e 100644
--- a/npc/017-1/drowned_man.txt
+++ b/npc/017-1/drowned_man.txt
@@ -109,27 +109,9 @@ OnInit:
end;
}
- // Rate-limited? (3 seconds rate limit)
- if (@nojump >= gettimetick(2)+3) {
- dispbottom l("Gimme a sec to take a breath! I don't want to jump!");
- end;
- }
-
mesc l("Are you really going to jump here?");
next;
if (askyesno() == ASK_YES) {
- // Can't jump with pets
- // FIXME: Move it elsewhere - resist pet_Detective updates
- for (.@i=0+PiouEgg; .@i <= 0+MoggunEgg ; .@i++) {
- if (countitem(.@i) > 0) {
- mesc l("Can't bring pets with you..."), 1;
- next;
- mesc l("Do you really think the poor creature should jump a bridge in water and DIE?"), 1;
- @nojump=gettimetick(2);
- mesc l("* Put the %s safely in storage before jumping.", getitemlink(.@i));
- close;
- }
- }
// Do the jump!
closeclientdialog;
slide .x, .y;
diff --git a/npc/018-5-boss/mapflag.txt b/npc/018-5-boss/mapflag.txt
index 0c36c3058..918e92251 100644
--- a/npc/018-5-boss/mapflag.txt
+++ b/npc/018-5-boss/mapflag.txt
@@ -1 +1,3 @@
018-5-boss mapflag zone No Tricks
+018-5-0 mapflag nopet
+018-5-1 mapflag nopet