Expand Saulc's Palace facilities so anyone can use, not just debug staff

3 files changed, 59 insertions, 4 deletions

diff --git a/npc/001-3-1/alchemy.txt b/npc/001-3-1/alchemy.txt
index a9c15dd93..a4c5c84a9 100644
--- a/npc/001-3-1/alchemy.txt
+++ b/npc/001-3-1/alchemy.txt
@@ -6,7 +6,21 @@
 
 
 001-3-1,32,89,0	script	GM Alchemy Table	NPC_NO_SPRITE,{
-    if (!$@GM_OVERRIDE || $EVENT$ == "") goto L_Offline;
+    if ($EVENT$ == "") goto L_Offline;
+    if ($@GM_OVERRIDE) goto L_Master;
+    mesc l("Welcome to Saulc's Magic Alchemy Table!");
+    mesc l("What will you brew today?");
+    mesc l("Operation cost: %s GP", fnum(500)), 1;
+    if (Zeny < 500) close;
+    if (AlchemySystem()) {
+        Zeny -= 500;
+        mesc l("Success!"), 3;
+    } else {
+        mesc l("That didn't work!"), 1;
+    }
+    close;
+
+L_Master:
     mesc l("Welcome to Saulc's Magic Alchemy Table!");
     mesc l("This table will prepare the potion for you, no skill required!");
     mesc l("What will you brew today?");
@@ -25,3 +39,11 @@ OnInit:
     end;
 }
 
+001-3-1,22,89,0	duplicate(GM Cooking Stove)	GM Alchemy Table#1	NPC_NO_SPRITE
+001-3-1,28,89,0	duplicate(GM Cooking Stove)	GM Alchemy Table#2	NPC_NO_SPRITE
+001-3-1,37,89,0	duplicate(GM Cooking Stove)	GM Alchemy Table#3	NPC_NO_SPRITE
+001-3-1,22,102,0	duplicate(GM Cooking Stove)	GM Alchemy Table#4	NPC_NO_SPRITE
+001-3-1,28,102,0	duplicate(GM Cooking Stove)	GM Alchemy Table#5	NPC_NO_SPRITE
+001-3-1,32,102,0	duplicate(GM Cooking Stove)	GM Alchemy Table#6	NPC_NO_SPRITE
+001-3-1,37,102,0	duplicate(GM Cooking Stove)	GM Alchemy Table#7	NPC_NO_SPRITE
+
diff --git a/npc/001-3-1/cooking.txt b/npc/001-3-1/cooking.txt
index 4c4ceab8d..1e8aecb45 100644
--- a/npc/001-3-1/cooking.txt
+++ b/npc/001-3-1/cooking.txt
@@ -6,7 +6,21 @@
 
 
 001-3-1,52,110,0	script	GM Cooking Stove	NPC_NO_SPRITE,{
-    if (!$@GM_OVERRIDE || $EVENT$ == "") goto L_Offline;
+    if ($EVENT$ == "") goto L_Offline;
+    if ($@GM_OVERRIDE) goto L_Master;
+    mesc l("Welcome to Saulc's Magic Cooking Stove!");
+    mesc l("What will you cook today?");
+    mesc l("Operation cost: %s GP", fnum(1500)), 1;
+    if (Zeny < 1500) close;
+    if (CookingSystem()) {
+        Zeny -= 1500;
+        mesc l("Success!"), 3;
+    } else {
+        mesc l("That didn't work!"), 1;
+    }
+    close;
+
+L_Master:
     mesc l("Welcome to Saulc's Magic Cooking Stove!");
     mesc l("This table will prepare food for you, no skill required!");
     mesc l("What will you cook today?");
@@ -25,3 +39,7 @@ OnInit:
     end;
 }
 
+001-3-1,56,110,0	duplicate(GM Cooking Stove)	GM Cooking Stove#1	NPC_NO_SPRITE
+001-3-1,60,110,0	duplicate(GM Cooking Stove)	GM Cooking Stove#2	NPC_NO_SPRITE
+001-3-1,64,110,0	duplicate(GM Cooking Stove)	GM Cooking Stove#3	NPC_NO_SPRITE
+001-3-1,68,110,0	duplicate(GM Cooking Stove)	GM Cooking Stove#4	NPC_NO_SPRITE
diff --git a/npc/001-3-1/smith.txt b/npc/001-3-1/smith.txt
index 7de825aca..4878f283f 100644
--- a/npc/001-3-1/smith.txt
+++ b/npc/001-3-1/smith.txt
@@ -6,11 +6,24 @@
 
 
 001-3-1,52,86,0	script	GM Black Smithy	NPC_NO_SPRITE,{
-    if (!$@GM_OVERRIDE || $EVENT$ == "") goto L_Offline;
+    if ($EVENT$ == "") goto L_Offline;
+    if ($@GM_OVERRIDE) goto L_Master;
+    mesc l("Welcome to Saulc's Magic Smith Table!");
+    mesc l("What will you craft today?");
+    mesc l("Operation cost: %s GP", fnum(1000)), 1;
+    if (Zeny < 1000) close;
+    if (SmithSystem()) {
+        Zeny -= 1000;
+        mesc l("Success!"), 3;
+    } else {
+        mesc l("That didn't work!"), 1;
+    }
+    close;
+
+L_Master:
     mesc l("Welcome to Saulc's Magic Smith Table!");
     mesc l("This forge will prepare equipment for you, no skill required!");
     mesc l("What will you craft today?");
-    //mesc l("You need to have an @@ equipped.", getitemlink(Knife)), 1;
     if (SmithSystem(CRAFT_NPC))
         mesc l("Success!"), 3;
     else
@@ -26,3 +39,5 @@ OnInit:
     end;
 }
 
+001-3-1,62,86,0	duplicate(GM Black Smithy)	GM Black Smithy#1	NPC_NO_SPRITE
+