summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2021-04-15 10:40:58 -0300
committerJesusaves <cpntb1@ymail.com>2021-04-15 10:40:58 -0300
commit277280062ed1f28fa2781c29c8a389e0f97d1760 (patch)
treeeaca23e3f57624cb38dcd8ecedf119d7e1e9d3c9
parenteb9b35cb6090c65ca8ee8c27c5f3888c06784f3a (diff)
downloadserverdata-277280062ed1f28fa2781c29c8a389e0f97d1760.tar.gz
serverdata-277280062ed1f28fa2781c29c8a389e0f97d1760.tar.bz2
serverdata-277280062ed1f28fa2781c29c8a389e0f97d1760.tar.xz
serverdata-277280062ed1f28fa2781c29c8a389e0f97d1760.zip
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)
-rw-r--r--db/pre-re/skill_db.conf2
-rw-r--r--npc/functions/filters.txt6
2 files changed, 7 insertions, 1 deletions
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, "~!<mk>@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, "~!<mk>@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, "~!<mk>@tmw2.org", getarg(0)) == strcharinfo(1));