Theorically GUILD STORAGE is now allowed, for free, to all guild members

1 files changed, 16 insertions, 14 deletions

diff --git a/npc/003-2/estard.txt b/npc/003-2/estard.txt
index 7c6e6717e..71dab35cc 100644
--- a/npc/003-2/estard.txt
+++ b/npc/003-2/estard.txt
@@ -23,14 +23,10 @@
             lg("The cost to create a party is @@ GP, are you interested?",
                "The cost to create a party is @@ GP, are you interested?", .@party_price);
 
-        if (askyesno() == 1)
-        {
-            if (Zeny < .@party_price)
-            {
+        if (askyesno() == ASK_YES) {
+            if (Zeny < .@party_price) {
                 speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("You don't have enough money, bring me @@ GP.", .@party_price);
-            }
-            else
-            {
+            } else {
                 Zeny = Zeny - .@party_price;
                 setq General_Janus, 1;
                 skill NV_BASIC, 7, 0;
@@ -52,14 +48,10 @@
             l("Shall you disband your guild for whatever reason, you'll need to pay again. No refunds. No complaining."),
             l("The cost to create a guild is @@ GP.", .@guild_price);
 
-        if (askyesno() == 1)
-        {
-            if (Zeny < .@guild_price)
-            {
+        if (askyesno() == ASK_YES) {
+            if (Zeny < .@guild_price) {
                 speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("You don't have enough money, bring me @@ GP or join an already existing one.", .@guild_price);
-            }
-            else
-            {
+            } else {
                 inventoryplace Emperium, 1;
                 Zeny = Zeny - .@guild_price;
                 getitem Emperium, 1;
@@ -76,6 +68,12 @@
         return;
     }
 
+    function gstorage {
+        closedialog;
+        guildopenstorage();
+        close;
+        return;
+    }
 
     mesn;
     mesq lg("Welcome miss.", "Good day sir.");
@@ -95,6 +93,7 @@
             l("What service do you offer?"),
             rif(!getq(General_Janus), l("I would like to create a party.")),
             rif(getq(General_Janus) && getcharid(2) <= 0 && countitem(Emperium) == 0, l("I would like to create a guild.")),
+            rif(getq(General_Janus) && getcharid(2) > 0, l("I would like to open Guild Storage.")),
             menuaction(l("Quit"));
 
         switch (@menu)
@@ -108,6 +107,9 @@
             case 3:
                 create_guild;
                 break;
+            case 4:
+                gstorage;
+                break;
         }
     } while (@menu != 4);