From 20997279964bf6afe101408219a246dcc2bcd09e Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Wed, 7 Aug 2019 22:59:02 -0300
Subject: Unify all cauldrons with the apartment function, which is now an
 util. This means I can add new systems using the cauldron, and split them at
 a later date if I deem fit. Note Halinarzo houses does not comes with a
 Cauldron -_-

---
 npc/012-8/utils.txt      |  6 +-----
 npc/017-7/utils.txt      |  7 +------
 npc/017-8/utils.txt      |  7 +------
 npc/024-14/utils.txt     | 28 +---------------------------
 npc/functions/estate.txt | 34 ++++++++++++++++++++++++++++++++++
 5 files changed, 38 insertions(+), 44 deletions(-)

(limited to 'npc')

diff --git a/npc/012-8/utils.txt b/npc/012-8/utils.txt
index 20e3e8a84..952a3221b 100644
--- a/npc/012-8/utils.txt
+++ b/npc/012-8/utils.txt
@@ -83,11 +83,7 @@ OnInit:
 
 
 012-8,29,24,0	script	Cauldron#RES_0128	NPC_NO_SPRITE,{
-    mesc l("What will you brew today?");
-    if (AlchemySystem(CRAFT_PLAYER))
-        mesc l("Success!"), 3;
-    else
-        mesc l("That didn't work!"), 1;
+    realestate_cauldron();
     close;
 
 OnInit:
diff --git a/npc/017-7/utils.txt b/npc/017-7/utils.txt
index 10763ae52..604bf19fe 100644
--- a/npc/017-7/utils.txt
+++ b/npc/017-7/utils.txt
@@ -83,13 +83,8 @@ OnInit:
 
 
 017-7,29,24,0	script	Cauldron#RES_0177	NPC_NO_SPRITE,{
-    mesc l("What will you brew today?");
-    if (AlchemySystem(CRAFT_PLAYER))
-        mesc l("Success!"), 3;
-    else
-        mesc l("That didn't work!"), 1;
+    realestate_cauldron();
     close;
-    end;
 
 OnInit:
     .distance=3;
diff --git a/npc/017-8/utils.txt b/npc/017-8/utils.txt
index e903ac87f..ec0966b7d 100644
--- a/npc/017-8/utils.txt
+++ b/npc/017-8/utils.txt
@@ -83,13 +83,8 @@ OnInit:
 
 
 017-8,29,24,0	script	Cauldron#RES_0178	NPC_NO_SPRITE,{
-    mesc l("What will you brew today?");
-    if (AlchemySystem(CRAFT_PLAYER))
-        mesc l("Success!"), 3;
-    else
-        mesc l("That didn't work!"), 1;
+    realestate_cauldron();
     close;
-    end;
 
 OnInit:
     .distance=3;
diff --git a/npc/024-14/utils.txt b/npc/024-14/utils.txt
index 7fd73a69f..ad9c51134 100644
--- a/npc/024-14/utils.txt
+++ b/npc/024-14/utils.txt
@@ -60,33 +60,7 @@ OnInit:
 
 
 024-14,28,27,0	script	Cauldron#RES_PPL	NPC_NO_SPRITE,{
-    select
-        l("Alchemy"),
-        l("Crafting");
-    mes "";
-    if (@menu == 1) {
-        do {
-            mesc l("What will you brew today?");
-            if (AlchemySystem(CRAFT_PLAYER))
-                mesc l("Success!"), 3;
-            else
-                mesc l("That didn't work!"), 1;
-            next;
-            mesc l("Try again?");
-        } while (askyesno() == ASK_YES);
-    }
-    else if (@menu == 2) {
-        do {
-            mesc l("What will you craft today?");
-            if (SmithSystem(CRAFT_PLAYER))
-                mesc l("Success!"), 3;
-            else
-                mesc l("That didn't work!"), 1;
-            next;
-            mesc l("Try again?");
-        } while (askyesno() == ASK_YES);
-    }
-
+    realestate_cauldron();
     close;
 
 OnInit:
diff --git a/npc/functions/estate.txt b/npc/functions/estate.txt
index 7bd5679da..a6a3168e1 100644
--- a/npc/functions/estate.txt
+++ b/npc/functions/estate.txt
@@ -331,3 +331,37 @@ function	script	realestate_piano	{
     return;
 }
 
+
+
+// Cauldron Mobilia
+// realestate_cauldron (  )
+function	script	realestate_cauldron	{
+    select
+        l("Alchemy"),
+        l("Crafting");
+    mes "";
+    if (@menu == 1) {
+        do {
+            mesc l("What will you brew today?");
+            if (AlchemySystem(CRAFT_PLAYER))
+                mesc l("Success!"), 3;
+            else
+                mesc l("That didn't work!"), 1;
+            next;
+            mesc l("Try again?");
+        } while (askyesno() == ASK_YES);
+    }
+    else if (@menu == 2) {
+        do {
+            mesc l("What will you craft today?");
+            if (SmithSystem(CRAFT_PLAYER))
+                mesc l("Success!"), 3;
+            else
+                mesc l("That didn't work!"), 1;
+            next;
+            mesc l("Try again?");
+        } while (askyesno() == ASK_YES);
+    }
+    return;
+}
+
-- 
cgit v1.2.3-60-g2f50