diff options
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/functions/guild.txt | 4 | ||||
| -rw-r--r-- | npc/guilds/management.txt | 5 |
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) |