fix quest.db and add Fishing in Tulimshar 003-1

3 files changed, 102 insertions, 2 deletions

diff --git a/npc/003-1/_import.txt b/npc/003-1/_import.txt
index 22a3ccd53..826b53fb9 100644
--- a/npc/003-1/_import.txt
+++ b/npc/003-1/_import.txt
@@ -6,6 +6,7 @@
 "npc/003-1/constableperry.txt",
 "npc/003-1/cyndala.txt",
 "npc/003-1/eomie.txt",
+"npc/003-1/eugene.txt",
 "npc/003-1/gladys.txt",
 "npc/003-1/inac.txt",
 "npc/003-1/inar.txt",
diff --git a/npc/003-1/eugene.txt b/npc/003-1/eugene.txt
new file mode 100644
index 000000000..cfb5e037a
--- /dev/null
+++ b/npc/003-1/eugene.txt
@@ -0,0 +1,85 @@
+// Evol scripts.
+// Authors:
+//    Reid
+//    Travolta
+// Description:
+//    Fishman NPC
+// Quest variable:
+//    TulimsharQuests_Fishman
+// Quest stages:
+//    0 - not started
+//    1 - Eugene asked for items
+//    2 - completed
+
+003-1,80,127,0	script	Eugene	NPC_EUGENE,{
+
+    .BaitID = SmallTentacles;
+    .BaitCount = 10;
+
+    narrator S_LAST_NEXT,
+        l("You see a raijin boy, sitting on the edge of the dock."),
+        l("He's holding a fishing rod, while gazing out at the sea.");
+
+    .@q = getq(TulimsharQuests_Fishman);
+    if (.@q == 1) goto L_CheckItems;
+    if (.@q == 2) goto L_QuestDone;
+
+    speech S_LAST_BLANK_LINE,
+        l("Ahoi."),
+        l("Hey, check out my brand new fishing rod. I bought it just today."),
+        l("I was so excited, I wanted to try it as soon as possible."),
+        l("So in a hurry, I forgot to take enough bait for fishing."),
+        lg("Be a friend and bring me @@ @@.", "Be a friend and bring me @@ @@.", .BaitCount, getitemlink(.BaitID));
+
+    switch (select(l("I'll be back in no time."),
+                   l("Sorry, I'm doing other things at the moment.")))
+    {
+        case 1:
+            setq TulimsharQuests_Fishman, 1;
+            speech S_FIRST_BLANK_LINE,
+                l("Thank you. I'll wait here.");
+            close;
+        case 2:
+            speech S_FIRST_BLANK_LINE,
+                l("But I'm almost out of @@...", getitemlink(.BaitID));
+            close;
+    }
+
+L_CheckItems:
+    if (countitem(.BaitID) < .BaitCount)
+    {
+        speech
+            l("Sorry, but you don't have what I need."),
+            l("I need @@ @@.", .BaitCount, getitemlink(.BaitID));
+        close;
+    }
+
+    speech
+        l("That's exactly what I needed!"),
+        l("To thank you, accept my old fishing rod."),
+        l("It's not as good as my new one, but still very useful."),
+        l("Just look at that water! There's a whole bunch of fish down there."),
+        l("Oh, and you will need this book too, it will help you learn the basics of fishing."),
+        lg("You might even get lucky, and get a @@.",
+           "You might even get lucky, and get a @@.", getitemlink(GrassCarp)),
+        l("Have a good time fishing!");
+
+    delitem .BaitID, .BaitCount;
+    getitem FishingRod, 1;
+    getitem FishingGuideVolI, 1;
+    setq TulimsharQuests_Fishman, 2;
+    close;
+
+L_QuestDone:
+    // Idea for future: Eugene telling fishman jokes.
+    speech
+        l("Ahoy, @@!", strcharinfo(0)),
+        l("Are the fish biting today?");
+    close;
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 2;
+    end;
+}
+
diff --git a/npc/003-1/wateranimation.txt b/npc/003-1/wateranimation.txt
index 48a4b3cfa..c495e71b8 100644
--- a/npc/003-1/wateranimation.txt
+++ b/npc/003-1/wateranimation.txt
@@ -5,7 +5,7 @@
 // Description:
 //    Water animations, splash, fishes, etc...
 
-003-1,104,100,0	script	#water_animation0	NPC_WATER_SPLASH,{
+003-1,83,128,0	script	#water_animation0	NPC_WATER_SPLASH,{
 
     fishing; // begin or continue fishing
     close;
@@ -16,4 +16,18 @@ OnInit:
     end;
 }
 
-003-1,108,102,0	duplicate(#water_animation0)	#water_animation16	NPC_WATER_SPLASH
\ No newline at end of file
+003-1,87,125,0	duplicate(#water_animation0)	#water_animation1	NPC_WATER_SPLASH
+003-1,88,120,0	duplicate(#water_animation0)	#water_animation2	NPC_WATER_SPLASH
+003-1,76,120,0	duplicate(#water_animation0)	#water_animation3	NPC_WATER_SPLASH
+003-1,75,127,0	duplicate(#water_animation0)	#water_animation4	NPC_WATER_SPLASH
+003-1,79,111,0	duplicate(#water_animation0)	#water_animation5	NPC_WATER_SPLASH
+003-1,82,105,0	duplicate(#water_animation0)	#water_animation6	NPC_WATER_SPLASH
+003-1,85,110,0	duplicate(#water_animation0)	#water_animation7	NPC_WATER_SPLASH
+003-1,88,113,0	duplicate(#water_animation0)	#water_animation8	NPC_WATER_SPLASH
+003-1,86,126,0	duplicate(#water_animation0)	#water_animation9	NPC_WATER_SPLASH
+003-1,87,132,0	duplicate(#water_animation0)	#water_animation10	NPC_WATER_SPLASH
+003-1,83,111,0	duplicate(#water_animation0)	#water_animation11	NPC_WATER_SPLASH
+003-1,78,144,0	duplicate(#water_animation0)	#water_animation12	NPC_WATER_SPLASH
+003-1,83,140,0	duplicate(#water_animation0)	#water_animation13	NPC_WATER_SPLASH
+003-1,72,147,0	duplicate(#water_animation0)	#water_animation14	NPC_WATER_SPLASH
+003-1,72,122,0	duplicate(#water_animation0)	#water_animation15	NPC_WATER_SPLASH