This either breaks stuff, or allows guild storage to be used from banks.

2 files changed, 12 insertions, 2 deletions

diff --git a/npc/functions/bank.txt b/npc/functions/bank.txt
index 40ff31dbd..00ca148a9 100644
--- a/npc/functions/bank.txt
+++ b/npc/functions/bank.txt
@@ -210,6 +210,7 @@ function	script	Banker	{
                 l("Did I received any mail?"),
                 rif(REBIRTH || is_sponsor(), l("I would like to use the Premium Storage.")),
                 rif(REBIRTH, l("I would like to use the Deluxe Storage.")),
+                rif(getcharid(2) > 0, l("I would like to use the Guild Storage.")),
                 l("What is this guild for?"),
                 l("Bye.");
 
@@ -271,15 +272,21 @@ function	script	Banker	{
                     }
                     break;
                 case 6:
+                    // FIXME: Raises a console warning of invalid map
+                    closeclientdialog;
+                    doevent "Guild Storage::OnStorage";
+                    close;
+                    break;
+                case 7:
                     mes "";
                     BKInfo();
                     break;
             }
-            if (@menu != 7) {
+            if (@menu != 8) {
                 speech S_FIRST_BLANK_LINE | S_LAST_NEXT | S_NO_NPC_NAME,
                     l("Something else?");
             }
-        } while (@menu != 7);
+        } while (@menu != 8);
     }
     closedialog;
     goodbye;
diff --git a/npc/guilds/storage.txt b/npc/guilds/storage.txt
index 2f8db6d22..e1f30e32a 100644
--- a/npc/guilds/storage.txt
+++ b/npc/guilds/storage.txt
@@ -5,6 +5,9 @@
 //  Guild Facility - Guild Storage
 
 guilds,33,28,0	script	Guild Storage	NPC_NO_SPRITE,{
+    goto OnStorage;
+
+OnStorage:
     .@gid=getcharid(2);
     if (.@gid < 1)
         end;