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

1 files changed, 9 insertions, 10 deletions

diff --git a/npc/002-1/peter.txt b/npc/002-1/peter.txt
index 17939c011..a7b0e76f2 100644
--- a/npc/002-1/peter.txt
+++ b/npc/002-1/peter.txt
@@ -41,7 +41,7 @@
 // [10] = Shows how many seconds passed since the player done the quest.
 // Translation
 //      FR Translated
-002-1,72,34,0	script	AreaNPC	NPC_HIDDEN,0,1,{
+002-1,35,24,0	script	AreaNPC	NPC_HIDDEN,0,1,{
 
 OnTouch:
     if (BaseLevel < 8) goto L_Stop;
@@ -61,8 +61,7 @@ L_NoCountDown:
     close;
 
 OnLowTime:
-    getmapxy(.@m$, .@x, .@y, 0);
-    if (.@m$ == "002-2")
+    if (getmap() == "002-2")
         dispbottom l("Time is running out... Hurry up!");
     end;
 
@@ -97,7 +96,7 @@ L_NoGoodTick:
     close;
 }
 
-002-1,70,35,0	script	Peter	NPC_RATTO_SAILOR,{
+002-1,33,25,0	script	Peter	NPC_RATTO_SAILOR,{
     if (BaseLevel < 8) goto OnTooWeak;
     if ($@RAT_SAILOR_COUNTDOWN == 0) goto L_NoCountDown;
     if ((gettimetick(2) - $@RAT_SAILOR_COUNTDOWN) < 10) goto OnNoGoodTick;
@@ -136,7 +135,7 @@ OnTooWeak:
     goto L_Quit;
 
 OnStop:
-    warp "002-1", 72, 36;
+    warp "002-1", 35, 26;
 
     mesn;
     mesq l("You can't go there!");
@@ -219,7 +218,7 @@ OnStartOutside:
     $@RAT_SAILOR_HELPER$ = strcharinfo(0);
     $@RAT_SAILOR_DEATHS = PC_DIE_COUNTER;
     initnpctimer;
-    warp "002-2", 48, 28;
+    warp "002-2", 33, 24;
     addtimer(100000, "Peter::OnLowTime");
     doevent "RattosControl::OnSpawn";
 
@@ -262,7 +261,7 @@ OnDontneedHelp:
 L_Timeout:
     mesn;
     mesq l("Hey! Be careful. You can't stay in this basement for so long, you're going to get sick. Come outside and take a break, maybe you can try again later.");
-    warp "002-1", 72, 36;
+    warp "002-1", 35, 26;
 
     goto L_CleaningClose;
 
@@ -271,7 +270,7 @@ L_Logoff:
 
 L_Dead:
 // Warps the dead body outside, so it does not interfere with the getmapusers check.
-    if (getmapusers("002-2") > 0) warp "002-1", 72, 36;
+    if (getmapusers("002-2") > 0) warp "002-1", 35, 26;
 
     goto L_CleaningEnd;
 
@@ -280,7 +279,7 @@ L_Done:
     if($@RAT_SAILOR_CONTROL[10] < 5) goto L_NotYet;
     .@peter = getq(ShipQuests_Peter);
     if (.@peter == 2 || .@peter == 4) goto L_Reward;
-    warp "002-1", 72, 36;
+    warp "002-1", 35, 26;
 
     goto L_Thanks;
 
@@ -311,7 +310,7 @@ L_CleaningClose:
     close;
 
 L_Reward:
-    warp "002-1", 72, 36;
+    warp "002-1", 35, 26;
     setq ShipQuests_Peter, 5;
     .@peter = getq(ShipQuests_Peter);
     mesn;