summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-10-20 18:23:53 -0300
committerJesusaves <cpntb1@ymail.com>2019-10-20 18:23:53 -0300
commit10225ad351574621a1f48d346bdd16b3ee74b5f3 (patch)
treeed5cafce0c1526e49459366b4b81629af079ec4f /npc
parentde69093c71c287d645c0ccebb8e256bb771afa95 (diff)
downloadserverdata-10225ad351574621a1f48d346bdd16b3ee74b5f3.tar.gz
serverdata-10225ad351574621a1f48d346bdd16b3ee74b5f3.tar.bz2
serverdata-10225ad351574621a1f48d346bdd16b3ee74b5f3.tar.xz
serverdata-10225ad351574621a1f48d346bdd16b3ee74b5f3.zip
getguildpostitle was fixed so use it instead (thanks gumi)
Diffstat (limited to 'npc')
-rw-r--r--npc/functions/guild.txt4
-rw-r--r--npc/guilds/management.txt5
2 files changed, 6 insertions, 3 deletions
diff --git a/npc/functions/guild.txt b/npc/functions/guild.txt
index 6b9d95299..92a0a3802 100644
--- a/npc/functions/guild.txt
+++ b/npc/functions/guild.txt
@@ -23,6 +23,10 @@ function script getguildrole {
if (!.@type)
return .@pos;
+ // Wait, we now have a command for this
+ return getguildpostitle(.@gid, .@pos);
+
+ // Legacy behavior
switch (.@pos) {
case GPOS_GUILDMASTER:
return "Guild Master";
diff --git a/npc/guilds/management.txt b/npc/guilds/management.txt
index 02cff3309..af7c16061 100644
--- a/npc/guilds/management.txt
+++ b/npc/guilds/management.txt
@@ -33,7 +33,7 @@ guilds,35,30,0 script Guild Management NPC_NO_SPRITE,{
// mesc l("The average player level is @@", getguildavg(.@gid));
//mesc l("Your position on the guild: @@", getguildrole(.@gid, getcharid(3), true));
mesc l("You are the guild's \"%s\", and you contribute with %02d%% EXP.",
- getguildrole(.@gid, getcharid(3), true),//getguildpostitle(.@gid, .@pos),
+ getguildpostitle(.@gid, .@pos),
getguildpostax(.@gid, .@pos));
//getguildpostitle(.@gid, .@pos)
@@ -66,8 +66,7 @@ guilds,35,30,0 script Guild Management NPC_NO_SPRITE,{
.@idx=0+@menuret;
if (.@idx < 0)
return;
- //mesc l("The guild's \"%s\" currently contribute with %02d%% EXP.", getguildpostitle(.@gid, .@idx), getguildpostax(.@gid, .@idx));
- mesc l("The guild's \"%s\" currently contribute with %02d%% EXP.", getguildrole(.@gid, getcharid(3), true), getguildpostax(.@gid, .@idx));
+ mesc l("The guild's \"%s\" currently contribute with %02d%% EXP.", getguildpostitle(.@gid, .@pos), getguildpostax(.@gid, .@idx));
mesc l("Please write how much in percent is EXP Tax for member (range: 0~50)"), 1;
input .@exptax;
if (.@exptax < 0 || .@exptax > 50)