From 0ef89a7106f81e02426f2fb3d6499176098085df Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Fri, 15 Mar 2019 09:29:31 -0300
Subject: Introduce the "Normal Member" and the "Treasurer" guild roles. Only
 Normal Member and above can use the Guild Storage.

---
 npc/guilds/management.txt | 16 ++++++++++++++--
 npc/guilds/storage.txt    |  5 +++++
 2 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'npc/guilds')

diff --git a/npc/guilds/management.txt b/npc/guilds/management.txt
index 4b099adee..cd1f5ae78 100644
--- a/npc/guilds/management.txt
+++ b/npc/guilds/management.txt
@@ -14,9 +14,13 @@ guilds,35,30,0	script	Guild Management	NPC_NO_SPRITE,{
     else
         mesc l("Guild Lv @@, @@/@@ EXP to level up", getguildlvl(.@gid), getguildexp(.@gid), "???");
 
+    //         mesc l("The average player level is @@", getguildavg(.@gid));
+    mesc l("Your position on the guild: @@", getguildrole(.@gid, getcharid(3), true));
+
     // I forgot a function to get player title and allow any guildmaster to change this
     if (strcharinfo(0) == getguildmaster(.@gid))
     {
+        next;
         do
         {
             gmaster();
@@ -35,8 +39,8 @@ guilds,35,30,0	script	Guild Management	NPC_NO_SPRITE,{
             l("Guild Master"), GPOS_GUILDMASTER,
             l("Vice Leader"), GPOS_VICELEADER,
             l("Recruiter"), GPOS_RECRUITER,
-            l("Position 4"), GPOS_4,
-            l("Position 5"), GPOS_5,
+            l("Treasurer"), GPOS_TREASURER,
+            l("Normal Member"), GPOS_5,
             l("Newbie"), GPOS_NEWBIE;
         mes "";
         .@idx=0+@menuret;
@@ -60,6 +64,14 @@ guilds,35,30,0	script	Guild Management	NPC_NO_SPRITE,{
                 .@name$="Recruiter";
                 .@perm=GPERM_INVITE;
                 break;
+            case GPOS_TREASURER:
+                .@name$="Treasurer";
+                .@perm=0;
+                break;
+            case GPOS_5:
+                .@name$="Member";
+                .@perm=0;
+                break;
             case GPOS_NEWBIE:
                 .@name$="Newbie";
                 .@perm=0;
diff --git a/npc/guilds/storage.txt b/npc/guilds/storage.txt
index 97218fbb1..316071d9f 100644
--- a/npc/guilds/storage.txt
+++ b/npc/guilds/storage.txt
@@ -12,6 +12,11 @@ guilds,33,28,0	script	Guild Storage	NPC_NO_SPRITE,{
     }
     else
     {
+        if (getguildrole(.@gid, getcharid(3)) > GPOS_5)
+        {
+            dispbottom l("Your position must be the one of a regular member or above.");
+            end;
+        }
         if (guildopenstorage())
         {
             npctalkonce l("Someone else is using the guild storage right now. Please wait.");
-- 
cgit v1.2.3-60-g2f50