Update to new 002-1 map: Don't get used to it, I'm going to change again

This time, I want to delete 002-4.
I'll move Nard to 002-3, Juliet and the drunkard to 002-1.

3 files changed, 9 insertions, 4 deletions

diff --git a/maps/re/002-1.mcache b/maps/re/002-1.mcache
index d11f82879..d33dbdbf6 100644
--- a/maps/re/002-1.mcache
+++ b/maps/re/002-1.mcache
diff --git a/npc/002-1/hammock.txt b/npc/002-1/hammock.txt
index 4c355bfec..97bea9152 100644
--- a/npc/002-1/hammock.txt
+++ b/npc/002-1/hammock.txt
@@ -66,3 +66,8 @@ OnUnTouch:
 OnTimer5440:
     hamTimerLeft;
 }
+
+002-1,58,25,0	duplicate(#hammock9)	#hammock1	NPC_LEFT_HAMMOCK,1,0
+002-1,58,27,0	duplicate(#hammock9)	#hammock2	NPC_LEFT_HAMMOCK,1,0
+002-1,58,29,0	duplicate(#hammock9)	#hammock3	NPC_LEFT_HAMMOCK,1,0
+
diff --git a/npc/002-1/knife.txt b/npc/002-1/knife.txt
index e8761bd44..a8d368e73 100644
--- a/npc/002-1/knife.txt
+++ b/npc/002-1/knife.txt
@@ -11,11 +11,11 @@
 //    0   Default, not taken.
 //    1   Knife taken.
 
-002-1,50,24,0	script	#knife	NPC_KNIVES,{
+002-1,31,28,0	script	#knife	NPC_KNIVES,{
     .@q = getq(ShipQuests_Knife);
-    if (.@q) close;
+    if (.@q) end;
 
-    mesn "Narrator";
+    mesn l("Narrator");
     mesc l("There are some old rusty knives on the table. Would you like to take one?");
     next;
 
@@ -33,7 +33,7 @@ L_Give:
     setq ShipQuests_Knife, 1;
     getitem RustyKnife, 1;
 
-    mesn "Narrator";
+    mesn l("Narrator");
     mesc l("To open your inventory, use the F3 key or use your mouse to select it in the above menu in your client.");
     next;
     mesc l("When your inventory is open, you can equip an item by selecting it and clicking 'Equip'. You can do the same to unequip an item by clicking on 'Unequip'.");