diff options
| author | Jesusaves <cpntb1@ymail.com> | 2022-11-07 00:25:17 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2022-11-07 00:25:17 -0300 |
| commit | 1ce45e518bec34cbefe1efa56b776a08ba4e68be (patch) | |
| tree | cc8c080c7c9bada782d0ff6531cdc684e0549d00 /npc/commands | |
| parent | 5c65874cc82bc7e33b86cad89619470bb40073be (diff) | |
| download | serverdata-1ce45e518bec34cbefe1efa56b776a08ba4e68be.tar.gz serverdata-1ce45e518bec34cbefe1efa56b776a08ba4e68be.tar.bz2 serverdata-1ce45e518bec34cbefe1efa56b776a08ba4e68be.tar.xz serverdata-1ce45e518bec34cbefe1efa56b776a08ba4e68be.zip | |
Some minor changes to make sure dead people will run only the correct timers
Diffstat (limited to 'npc/commands')
| -rw-r--r-- | npc/commands/event.txt | 2 | ||||
| -rw-r--r-- | npc/commands/python.txt | 3 | ||||
| -rw-r--r-- | npc/commands/welcome.txt | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/npc/commands/event.txt b/npc/commands/event.txt index 8b1dc023c..504ca4e50 100644 --- a/npc/commands/event.txt +++ b/npc/commands/event.txt @@ -426,7 +426,7 @@ OnEffect: dispbottom l("You must not be using mana to do this trip."); atcommand "@refresh"; end; - } else if (readparam(Hp) < @toeventval1) { + } else if (readparam(Hp) < @toeventval1 || ispcdead()) { dispbottom l("You cannot be fighting to do this trip."); atcommand "@refresh"; end; diff --git a/npc/commands/python.txt b/npc/commands/python.txt index 5273731c3..81753b368 100644 --- a/npc/commands/python.txt +++ b/npc/commands/python.txt @@ -9,7 +9,7 @@ OnCall: specialeffect(34, AREA, playerattached()); - .@zone$=getmapinfo(MAPINFO_ZONE, .@mapa$); + .@zone$=getmapinfo(MAPINFO_ZONE, getmap()); if (.@zone$ == "MMO") end; sc_start SC_CASH_DEATHPENALTY, 1000, 1; @@ -17,6 +17,7 @@ OnCall: end; OnKill: + if (ispcdead()) end; percentheal -100, -100; //dispbottom l("Oh look, it is Cupid!"); end; diff --git a/npc/commands/welcome.txt b/npc/commands/welcome.txt index 00304472d..a49e5c6a8 100644 --- a/npc/commands/welcome.txt +++ b/npc/commands/welcome.txt @@ -20,6 +20,7 @@ OnCall: OnEffect: @toeventchk=0; removespecialeffect(FX_CIRCLE, SELF, getcharid(3)); + if (ispcdead()) end; // Reversions (warp back) // Not in Candor: Resave your @welcome reversion snippet if (getmap() != "005-1") { |