summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-08-07 22:59:02 -0300
committerJesusaves <cpntb1@ymail.com>2019-08-07 22:59:02 -0300
commit20997279964bf6afe101408219a246dcc2bcd09e (patch)
tree476882cecd59d4f0f26c90aec46abd3fa9d0b76f
parent0ed07673c0754bc8b07006ed0bab125763a266f3 (diff)
downloadserverdata-20997279964bf6afe101408219a246dcc2bcd09e.tar.gz
serverdata-20997279964bf6afe101408219a246dcc2bcd09e.tar.bz2
serverdata-20997279964bf6afe101408219a246dcc2bcd09e.tar.xz
serverdata-20997279964bf6afe101408219a246dcc2bcd09e.zip
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 -_-
-rw-r--r--npc/012-8/utils.txt6
-rw-r--r--npc/017-7/utils.txt7
-rw-r--r--npc/017-8/utils.txt7
-rw-r--r--npc/024-14/utils.txt28
-rw-r--r--npc/functions/estate.txt34
5 files changed, 38 insertions, 44 deletions
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;
+}
+