diff options
| -rw-r--r-- | npc/003-0/trickmaster.txt | 8 | ||||
| -rw-r--r-- | npc/functions/filters.txt | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/npc/003-0/trickmaster.txt b/npc/003-0/trickmaster.txt index ddabbacb6..7a1d34b40 100644 --- a/npc/003-0/trickmaster.txt +++ b/npc/003-0/trickmaster.txt @@ -103,11 +103,11 @@ function standardMagic { function advancedMagic { if (MAGIC_LVL < 2) goto L_NoMagic; - //mes l(".:: There are no skills ::."); - //mesc l("You can bug Jesusalva to extend the Battlefield Control skills."); - //mes ""; + mes l(".:: There are no skills ::."); + mesc l("You can bug Jesusalva to extend the Battlefield Control skills."); + mes ""; menuint - "none", 0; + l("Cancel"), 0; return; } diff --git a/npc/functions/filters.txt b/npc/functions/filters.txt index 1b13aa59e..ff2a2dbf9 100644 --- a/npc/functions/filters.txt +++ b/npc/functions/filters.txt @@ -73,6 +73,8 @@ function script filter_hostile { getmapxy(.@m$, .@x, .@y, .@type, .@chkid); if (!ispvpmap(.@m$)) return false; + // FIXME: We already have !(filter_sameguildorparty()) + // We might be over-processing this // Honor party flag if (!getmapflag(.@mapa$, mf_pvp_noparty) && getcharid(1) == getcharid(1, strcharinfo(0, "", .@chkid))) |