summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-07-06 17:48:52 -0300
committerJesusaves <cpntb1@ymail.com>2020-07-06 17:48:52 -0300
commit17b0b7a0cc127af981f40f0d9067927a7443dce9 (patch)
treef6647cdd84568adbca1e61c824cf59fb91a846d3
parentad98d5ce00f02c6fc0ca6c12b3d1e659a1050e4f (diff)
downloadserverdata-17b0b7a0cc127af981f40f0d9067927a7443dce9.tar.gz
serverdata-17b0b7a0cc127af981f40f0d9067927a7443dce9.tar.bz2
serverdata-17b0b7a0cc127af981f40f0d9067927a7443dce9.tar.xz
serverdata-17b0b7a0cc127af981f40f0d9067927a7443dce9.zip
I really don't want this variable
We might want to have CRAFT_SANDWICH though. Possibly as flag 2 - it is bitwise, we can have CRAFT_SANDWICH|CRAFT_COOKING
-rw-r--r--db/constants.conf3
-rw-r--r--npc/008-2-16/stove.txt6
-rw-r--r--npc/008-2-16/yannika.txt3
3 files changed, 5 insertions, 7 deletions
diff --git a/db/constants.conf b/db/constants.conf
index a326cc09..cbbb5615 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -4193,9 +4193,6 @@ constants_db: {
CRAFT_TAILORING: 32
CRAFT_JEWELERY: 64
- // May be changed later
- CRAFT_SANDWICH: 4
-
comment__: "Being actions"
ACTION_STAND: 0
ACTION_MOVE: 1
diff --git a/npc/008-2-16/stove.txt b/npc/008-2-16/stove.txt
index 2ae17b67..40dfeca9 100644
--- a/npc/008-2-16/stove.txt
+++ b/npc/008-2-16/stove.txt
@@ -25,14 +25,14 @@
setskin "craft4";
.@var$ = requestcraft(4); // Limit: 4 items
.@craft = initcraft(.@var$);
- .@entry = findcraftentry(.@craft, CRAFT_SANDWICH);
+ .@entry = findcraftentry(.@craft, CRAFT_COOKING);
setskin "";
// Does the recipe exist and is a sandwich?
if (.@entry < 0)
{
narrator
- l("You don't know how to make a sandwich with that."),
+ l("You don't know how any recipe with that."),
l("Do you want to try again?");
if (askyesno() == ASK_YES)
.@tryAgain=true;
@@ -62,7 +62,7 @@
else
{
narrator
- l("You don't know how to make a sandwich with that."),
+ l("You don't know how any recipe with that."),
l("Do you want to try again?");
}
diff --git a/npc/008-2-16/yannika.txt b/npc/008-2-16/yannika.txt
index 22da3c63..9599a5d9 100644
--- a/npc/008-2-16/yannika.txt
+++ b/npc/008-2-16/yannika.txt
@@ -112,6 +112,7 @@
}
// Yannika can make sandwiches for players
+ // FIXME: Actually, Yannika will cook anything for players >__>
function sudo_make_sandwich
{
speech
@@ -128,7 +129,7 @@
setskin "craft4";
.@var$ = requestcraft(4); // Limit: 4 items
.@craft = initcraft(.@var$);
- .@entry = findcraftentry(.@craft, CRAFT_SANDWICH);
+ .@entry = findcraftentry(.@craft, CRAFT_COOKING);
setskin "";
// Does the recipe exist and is a sandwich?