summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--maps/re/031-3.mcachebin99 -> 117 bytes
-rw-r--r--npc/031-1/_warps.txt1
-rw-r--r--npc/031-3/_import.txt2
-rw-r--r--npc/031-3/_warps.txt3
-rw-r--r--npc/031-3/cook.txt28
-rw-r--r--npc/items/books.txt11
6 files changed, 44 insertions, 1 deletions
diff --git a/maps/re/031-3.mcache b/maps/re/031-3.mcache
index a91c0a7e9..c1137e213 100644
--- a/maps/re/031-3.mcache
+++ b/maps/re/031-3.mcache
Binary files differ
diff --git a/npc/031-1/_warps.txt b/npc/031-1/_warps.txt
index 88cef1837..816af5326 100644
--- a/npc/031-1/_warps.txt
+++ b/npc/031-1/_warps.txt
@@ -6,3 +6,4 @@
031-1,56,47,0 warp #031-1_56_47 0,0,031-7,56,51
031-1,84,58,0 warp #031-1_84_58 0,0,031-5,95,48
031-1,74,85,0 warp #031-1_74_85 0,0,031-2,74,88
+031-1,92,73,0 warp #031-1_92_73 0,0,031-3,38,64
diff --git a/npc/031-3/_import.txt b/npc/031-3/_import.txt
index 18ac51784..5cb827671 100644
--- a/npc/031-3/_import.txt
+++ b/npc/031-3/_import.txt
@@ -1,2 +1,4 @@
// Map 031-3: Aethyr Indoors
// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/031-3/_warps.txt",
+"npc/031-3/cook.txt",
diff --git a/npc/031-3/_warps.txt b/npc/031-3/_warps.txt
new file mode 100644
index 000000000..d3e1344dc
--- /dev/null
+++ b/npc/031-3/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 031-3: Aethyr Indoors warps
+031-3,38,65,0 warp #031-3_38_65 0,0,031-1,92,74
diff --git a/npc/031-3/cook.txt b/npc/031-3/cook.txt
new file mode 100644
index 000000000..52a3c723f
--- /dev/null
+++ b/npc/031-3/cook.txt
@@ -0,0 +1,28 @@
+// TMW-2 Script.
+// Author:
+// Saulc
+// Jesusalva
+// Notes:
+// Teaches cooking, explains seasoning minigame, expiration, etc.
+// Doesn't teach any recipe, though (35,55)
+
+031-3,35,55,0 script Unnamed Cook NPC_SAVIOR,{
+ mesn;
+ mesq l("Ho... Congratulations in making this far.");
+ mesc l("He raises an eyebrown at you.");
+ close;
+
+OnInit:
+ .@npcId = getnpcid(.name$);
+ setunitdata(.@npcId, UDT_HEADBOTTOM, AlchemistArmor);
+ setunitdata(.@npcId, UDT_HEADMIDDLE, FurBoots);
+ setunitdata(.@npcId, UDT_HEADTOP, ChefHat);
+ setunitdata(.@npcId, UDT_HAIRSTYLE, 9);
+ setunitdata(.@npcId, UDT_HAIRCOLOR, 18);
+
+ .sex = G_MALE;
+ .distance = 5;
+ end;
+
+}
+
diff --git a/npc/items/books.txt b/npc/items/books.txt
index 928bca018..2eb84780f 100644
--- a/npc/items/books.txt
+++ b/npc/items/books.txt
@@ -634,6 +634,8 @@ function read_book {
rif2(8, getq(LoFQuest_Pets), l("List of Unlocked Pets and Food")),
rif2(9, CRAFTQUEST, l("Open Recipe Book")),
rif2(10, true, l("Read Rules")),
+ rif2(11, getskilllv(TMW2_COOKING), l("Open Cooking Manual")),
+ rif2(12, getq(General_Narrator) >= 16, l("Open Homunculus Manual")),
l("Close");
mes "";
@@ -753,6 +755,13 @@ function read_book {
case 10:
GameRules();
break;
+ case 11:
+ // WTF
+ break;
+ case 12:
+ closeclientdialog;
+ doevent("Notebook#MKHB::OnBookRead");
+ end;
default:
close;
}
@@ -763,7 +772,7 @@ function read_book {
OnShelfUse:
if (openbookshelf())
- read_book;
+ read_book();
bye;
OnUse: