From 277280062ed1f28fa2781c29c8a389e0f97d1760 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Thu, 15 Apr 2021 10:40:58 -0300 Subject: Should be obvious, but you are same guild/party as yourself -.- EVEN if you're not in a guild/party, so update filters. (Unlike Moubootaur Legends where these filters are only used if you are in either) --- db/pre-re/skill_db.conf | 2 +- npc/functions/filters.txt | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/db/pre-re/skill_db.conf b/db/pre-re/skill_db.conf index b312ed22..70a10009 100644 --- a/db/pre-re/skill_db.conf +++ b/db/pre-re/skill_db.conf @@ -39006,6 +39006,6 @@ skill_db: ( } }, // MakeSulphur Parum EnchantLifestone MakeArrow MakeIronPowder MakeShirt MakeTanktop MakeSTanktop -// Kalmurk MagicBlade ToxicDart Ingrav Knuclkes ArrowHail Joyplim Barrier(OK?) FlyingBackpack(?) Hide(?) Protect Shear Detsanc +// Kalmurk MagicBlade ToxicDart Ingrav Knuclkes ArrowHail Joyplim FlyingBackpack(?) Shear ) diff --git a/npc/functions/filters.txt b/npc/functions/filters.txt index 01e3a856..91e536dc 100644 --- a/npc/functions/filters.txt +++ b/npc/functions/filters.txt @@ -21,6 +21,8 @@ function script filter_notme { // filter_sameguild( id ) function script filter_sameguild { + if (getarg(0) == getcharid(3)) + return true; if (getcharid(2) < 1) return false; return (strcharinfo(2, "~!@tmw2.org", getarg(0)) == strcharinfo(2)); @@ -37,6 +39,8 @@ function script filter_sameguildnotyou { // filter_sameparty( id ) function script filter_sameparty { + if (getarg(0) == getcharid(3)) + return true; if (getcharid(1) < 1 && getarg(0) != getcharid(3)) return false; return (strcharinfo(1, "~!@tmw2.org", getarg(0)) == strcharinfo(1)); @@ -44,6 +48,8 @@ function script filter_sameparty { // filter_sameguildorparty( id ) function script filter_sameguildorparty { + if (getarg(0) == getcharid(3)) + return true; if (getcharid(2) < 1 && getcharid(1) < 1) return false; .@party=(strcharinfo(1, "~!@tmw2.org", getarg(0)) == strcharinfo(1)); -- cgit v1.2.3-60-g2f50