summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--maps/re/002-1.mcachebin202 -> 197 bytes
-rw-r--r--maps/re/002-2.mcachebin146 -> 183 bytes
-rw-r--r--npc/002-1/arpan.txt4
-rw-r--r--npc/002-1/hammock.txt63
-rw-r--r--npc/002-1/peter.txt19
-rw-r--r--npc/002-2/doors.txt50
-rw-r--r--npc/002-2/ratto.txt19
7 files changed, 34 insertions, 121 deletions
diff --git a/maps/re/002-1.mcache b/maps/re/002-1.mcache
index c8a7a2b18..d11f82879 100644
--- a/maps/re/002-1.mcache
+++ b/maps/re/002-1.mcache
Binary files differ
diff --git a/maps/re/002-2.mcache b/maps/re/002-2.mcache
index 646a8e063..abb728f24 100644
--- a/maps/re/002-2.mcache
+++ b/maps/re/002-2.mcache
Binary files differ
diff --git a/npc/002-1/arpan.txt b/npc/002-1/arpan.txt
index 21035a25e..5fc12f121 100644
--- a/npc/002-1/arpan.txt
+++ b/npc/002-1/arpan.txt
@@ -144,7 +144,8 @@ L_Story:
mes "";
mesq lg("You were yaying sleeping for quite some time there. Our shipkeeper, Juliet, was here with you, and she did her best to heal your injuries.");
next;
- if (.@q_julia == 0) setq ShipQuests_Julia, 1;
+ if (.@q_julia == 0)
+ setq ShipQuests_Julia, 1;
mesq lg("Yaya, you should go see her! She'll be happy to see you.");
next;
mesq lg("Also, we took your yayed clothes, as they were... Yeyeye... In a bad shape. Go check the chest near your bed, there are some other ones inside.");
@@ -206,6 +207,7 @@ L_Julia:
mesn "Narrator";
mesc l("Juliet is on the upper level of the ship, use the arrow keys to walk to the stairs or click on the stairs at the top right of your screen.");
+ mesc l("In other words, simply just walk right and go down the stairs.");
next;
goto L_Menu;
diff --git a/npc/002-1/hammock.txt b/npc/002-1/hammock.txt
index c2423628d..4c355bfec 100644
--- a/npc/002-1/hammock.txt
+++ b/npc/002-1/hammock.txt
@@ -1,69 +1,12 @@
+// TMW2 Script
+// Notes:
+// Hammocks 1~5 were deleted during 002-1 ship hold remapping
// Evol scripts.
// Author:
// Reid
// Description:
// Animated hammock at the mid level of the ship.
-002-1,32,27,0 script #hammock1 NPC_LEFT_HAMMOCK,1,0,{
-
-OnTouch:
- hamTouchLeft;
-
-OnUnTouch:
- hamUnTouch;
-
-OnTimer5440:
- hamTimerLeft;
-}
-
-002-1,32,25,0 script #hammock2 NPC_LEFT_HAMMOCK,1,0,{
-
-OnTouch:
- hamTouchLeft;
-
-OnUnTouch:
- hamUnTouch;
-
-OnTimer5440:
- hamTimerLeft;
-}
-
-002-1,37,25,0 script #hammock3 NPC_RIGHT_HAMMOCK,1,0,{
-
-OnTouch:
- hamTouchLeft;
-
-OnUnTouch:
- hamUnTouch;
-
-OnTimer5440:
- hamTimerLeft;
-}
-
-002-1,37,27,0 script #hammock4 NPC_RIGHT_HAMMOCK,1,0,{
-
-OnTouch:
- hamTouchLeft;
-
-OnUnTouch:
- hamUnTouch;
-
-OnTimer5440:
- hamTimerLeft;
-}
-
-002-1,37,29,0 script #hammock5 NPC_RIGHT_HAMMOCK,1,0,{
-
-OnTouch:
- hamTouchLeft;
-
-OnUnTouch:
- hamUnTouch;
-
-OnTimer5440:
- hamTimerLeft;
-}
-
002-1,37,34,0 script #hammock6 NPC_RIGHT_HAMMOCK,1,0,{
OnTouch:
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;
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;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 00:49:46 +0000