summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/001-1/eugene.txt12
-rw-r--r--npc/001-1/wateranimation.txt18
-rw-r--r--npc/functions/fishing.txt10
3 files changed, 18 insertions, 22 deletions
diff --git a/npc/001-1/eugene.txt b/npc/001-1/eugene.txt
index ad64bf0c7..677683d14 100644
--- a/npc/001-1/eugene.txt
+++ b/npc/001-1/eugene.txt
@@ -16,7 +16,7 @@
.BaitID = SmallTentacles;
.BaitCount = 10;
- narrator
+ narrator 0,
l("You see a raijin boy, sitting on the edge of the dock."),
l("He's holding a fishing rod, and his eyes are pointed towards the surface of the sea.");
@@ -24,7 +24,7 @@
if (.@q == 2) goto L_QuestDone;
if (.@q == 1) goto L_CheckItems;
- speech
+ speech 0,
l("Ahoi."),
l("Hey, check out my brand new fishing rod. I bought it only today."),
l("I was so excited, I wanted to try it as soon as possible."),
@@ -36,12 +36,10 @@
{
case 1:
setq ArtisQuests_Fishman, 1;
- mes "";
speech
l("Thank you. I'll wait here.");
close;
case 2:
- mes "";
speech
l("But I'm almost out of @@...", getitemlink(.BaitID));
close;
@@ -50,13 +48,13 @@
L_CheckItems:
if (countitem(.BaitID) < .BaitCount)
{
- speech
+ speech 0,
l("Sorry, but you don't have what I need for bait."),
l("I need @@ @@.", .BaitCount, getitemlink(.BaitID));
close;
}
- speech
+ speech 0,
l("That's exactly what I needed."),
l("As a thank you, accept my old fishing rod."),
l("It's not as good as my new one, but still useful."),
@@ -72,7 +70,7 @@ L_CheckItems:
L_QuestDone:
// Idea for future: Eugene telling fishman jokes.
- speech
+ speech 0,
l("Ahoy, @@!", strcharinfo(0)),
l("Is the fish biting today?");
close;
diff --git a/npc/001-1/wateranimation.txt b/npc/001-1/wateranimation.txt
index ddd885168..3edf87de2 100644
--- a/npc/001-1/wateranimation.txt
+++ b/npc/001-1/wateranimation.txt
@@ -5,7 +5,7 @@
// Water animations, splash, fishes, etc...
001-1,116,123,0 script #water_animation0 NPC_WATER_SPLASH,{
- narrator
+ narrator 0,
l("You see some fish reflecting the sun on the surface of the ocean.");
fishing;
close;
@@ -17,7 +17,7 @@ OnInit:
}
001-1,119,102,0 script #water_animation1 NPC_WATER_SPLASH,{
- narrator
+ narrator 0,
l("You see some fish reflecting the sun on the surface of the ocean.");
fishing;
close;
@@ -29,7 +29,7 @@ OnInit:
}
001-1,167,82,0 script #water_animation2 NPC_WATER_SPLASH,{
- narrator
+ narrator 0,
l("You see some fish reflecting the sun on the surface of the ocean.");
fishing;
close;
@@ -41,7 +41,7 @@ OnInit:
}
001-1,167,40,0 script #water_animation3 NPC_WATER_SPLASH,{
- narrator
+ narrator 0,
l("You see some fish reflecting the sun on the surface of the ocean.");
fishing;
close;
@@ -53,7 +53,7 @@ OnInit:
}
001-1,104,127,0 script #water_animation4 NPC_WATER_SPLASH,{
- narrator
+ narrator 0,
l("You see some fish reflecting the sun on the surface of the ocean.");
fishing;
close;
@@ -65,7 +65,7 @@ OnInit:
}
001-1,166,123,0 script #water_animation5 NPC_WATER_SPLASH,{
- narrator
+ narrator 0,
l("You see some fish reflecting the sun on the surface of the ocean.");
fishing;
close;
@@ -77,7 +77,7 @@ OnInit:
}
001-1,181,119,0 script #water_animation6 NPC_WATER_SPLASH,{
- narrator
+ narrator 0,
l("You see some fish reflecting the sun on the surface of the ocean.");
fishing;
close;
@@ -89,7 +89,7 @@ OnInit:
}
001-1,202,114,0 script #water_animation7 NPC_WATER_SPLASH,{
- narrator
+ narrator 0,
l("You see some fish reflecting the sun on the surface of the ocean.");
fishing;
close;
@@ -101,7 +101,7 @@ OnInit:
}
001-1,187,86,0 script #water_animation8 NPC_WATER_SPLASH,{
- narrator
+ narrator 0,
l("You see some fish reflecting the sun on the surface of the ocean.");
fishing;
close;
diff --git a/npc/functions/fishing.txt b/npc/functions/fishing.txt
index 728c53537..3445c1256 100644
--- a/npc/functions/fishing.txt
+++ b/npc/functions/fishing.txt
@@ -50,11 +50,10 @@ L_ChooseBait:
return -2;
}
- narrator
+ narrator 0,
l("What will be the bait for the fish?");
.@idx = select(.@sel$);
- mes "";
if (.@idx == .@cnt + 1)
{
narrator l("You take your fishing rod and leave.");
@@ -66,12 +65,15 @@ L_ChooseBait:
narrator l("You use a @@ as a bait.", getitemname(.@bait));
mes col(l("You patiently wait..."), 9);
+ mes "";
L_Wait:
sleep2 rand(.@wait_time_min, .@wait_time_max);
.@tick = gettimetick(0);
+
mes col(l("Splash!"), 9);
+ mes "";
menuint
l("Pull!"), 1,
@@ -91,7 +93,6 @@ L_Wait:
{
getitem .@fish_id, 1;
- mes "";
narrator
l("You caught a @@!", getitemname(.@fish_id));
@@ -99,7 +100,6 @@ L_Wait:
}
else
{
- mes "";
narrator
l("You pulled too late and lost the bait.");
@@ -107,7 +107,6 @@ L_Wait:
}
case 2:
- mes "";
.@curr_wait_times += 1;
if (.@curr_wait_times > .@max_wait_times)
@@ -126,7 +125,6 @@ L_Wait:
break;
case 3:
- mes "";
narrator
l("You take your fishing rod and leave.");
return 0;