002-2 Ship Basement was entirely redrawn. Update maps and npcs accordingly.

2 files changed, 19 insertions, 50 deletions

diff --git a/npc/002-2/doors.txt b/npc/002-2/doors.txt
index 0263d87c2..ef5ad0f95 100644
--- a/npc/002-2/doors.txt
+++ b/npc/002-2/doors.txt
@@ -2,16 +2,13 @@
 // Authors:
 //  Jesusalva
 // 
-// Evol scripts.
-// Authors:
-//    Ablu
-//    Alastrim
-//    Reid
+// Originally an Evol script authored by:
+//    Ablu, Alastrim and Reid
 // 
 // Description:
 //    Doors NPCs.
 
-002-2,48,29,0	script	DoorUpwards	NPC_HIDDEN,0,0,{
+002-2,33,25,0	script	0022#DoorUpwards	NPC_HIDDEN,0,0,{
 
 OnTouch:
     if (mobcount("002-2","all") > 0) goto L_Warn;
@@ -30,50 +27,21 @@ L_Warn:
         l("Yes."), L_Warp,
         l("No."), -;
 
-    warp "002-2", 48, 28;
+    warp "002-2", 33, 25;
     closeclientdialog;
     close;
 
 L_Warp:
     if (LOCATION$ == "") 
-        warp "002-1", 72, 36;
+        warp "002-1", 35, 26;
     else
-        warp "002-1@"+LOCATION$, 72, 36;
+        warp "002-1@"+LOCATION$, 35, 26;
     closeclientdialog;
     close;
 }
 
-002-2,24,31,0	script	LeftDoor	NPC_HIDDEN,0,0,{
-
-OnTouch:
-    dispbottom l("I can't go there now.");
+002-2,43,25,0	script	#Alige0022	NPC_ALIGE_BARREL,{
+    npctalkonce l("This barrel seems suspicious...");
     end;
-    mesn "Narrator";
-    mesc l("It seems that you need a key to open this door.");
-    next;
-    mesc l("What do you want to do?");
-    next;
-
-    menu
-        rif(countitem(718) > 0, l("Use the key.")), L_Warp,
-        l("Break the door."), L_Break,
-        l("Go away."), -;
-
-    closeclientdialog;
-    close;
-
-L_Break:
-
-    mes "";
-    mesn "Narrator";
-    mesc l("You hear a loud scream. It must be the creaking of the wooden door...");
-
-    close;
-
-L_Warp:
-    mes "";
-    mesn "Narrator";
-    mesc l("Wait, it seems someone is blocking the door from the other side!");
-
-    close;
 }
+
diff --git a/npc/002-2/ratto.txt b/npc/002-2/ratto.txt
index 32499f437..5a5933ef3 100644
--- a/npc/002-2/ratto.txt
+++ b/npc/002-2/ratto.txt
@@ -1,3 +1,4 @@
+// TMW2 Script; midly modified by Jesusalva.
 // Evol scripts.
 // Authors:
 //    Ablu
@@ -17,35 +18,35 @@
 // [8] = Shows how many seconds passed since ratto number 4 died.
 // [9] = Shows how many seconds passed since the player started the quest.
 
-002-2,47,30,0	script	RattosControl	NPC_HIDDEN,{
+002-2,0,0,0	script	RattosControl	NPC_HIDDEN,{
 
 OnSpawn:
-    areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto1Death";
-    areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto2Death";
-    areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto3Death";
-    areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto4Death";
+    areamonster "002-2", 23, 19, 57, 40, "Ratto", Ratto, 1, "RattosControl::OnRatto1Death";
+    areamonster "002-2", 23, 19, 57, 40, "Ratto", Ratto, 1, "RattosControl::OnRatto2Death";
+    areamonster "002-2", 23, 19, 57, 40, "Ratto", Ratto, 1, "RattosControl::OnRatto3Death";
+    areamonster "002-2", 23, 19, 57, 40, "Ratto", Ratto, 1, "RattosControl::OnRatto4Death";
     close;
 
 OnRatto1Respawn:
-    areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto1Death";
+    areamonster "002-2", 23, 19, 57, 40, "Ratto", Ratto, 1, "RattosControl::OnRatto1Death";
     $@RAT_SAILOR_CONTROL[1] = 0;
     $@RAT_SAILOR_CONTROL[5] = 0;
     end;
 
 OnRatto2Respawn:
-    areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto2Death";
+    areamonster "002-2", 23, 19, 57, 40, "Ratto", Ratto, 1, "RattosControl::OnRatto2Death";
     $@RAT_SAILOR_CONTROL[2] = 0;
     $@RAT_SAILOR_CONTROL[6] = 0;
     end;
 
 OnRatto3Respawn:
-    areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto3Death";
+    areamonster "002-2", 23, 19, 57, 40, "Ratto", Ratto, 1, "RattosControl::OnRatto3Death";
     $@RAT_SAILOR_CONTROL[3] = 0;
     $@RAT_SAILOR_CONTROL[7] = 0;
     end;
 
 OnRatto4Respawn:
-    areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto4Death";
+    areamonster "002-2", 23, 19, 57, 40, "Ratto", Ratto, 1, "RattosControl::OnRatto4Death";
     $@RAT_SAILOR_CONTROL[4] = 0;
     $@RAT_SAILOR_CONTROL[8] = 0;
     end;