diff options
| -rw-r--r-- | db/re/map_zone_db.conf | 3 | ||||
| -rw-r--r-- | npc/017-1/drowned_man.txt | 18 | ||||
| -rw-r--r-- | npc/018-5-boss/mapflag.txt | 2 |
3 files changed, 4 insertions, 19 deletions
diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf index 402a1cbb2..e74b6a29c 100644 --- a/db/re/map_zone_db.conf +++ b/db/re/map_zone_db.conf @@ -108,7 +108,7 @@ zones: ( } }, { - /* No Tricks Zone prevents penalty and NV_TRICKDEAD */ + /* No Tricks Zone prevents penalty and NV_TRICKDEAD (and pets) */ name: "No Tricks" disabled_skills: { @@ -120,6 +120,7 @@ zones: ( } mapflags: ( + "nopet", "nopenalty", "nosave 000-1,22,22", ) 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 |