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

5 files changed, 23 insertions, 42 deletions

diff --git a/npc/001-1/_import.txt b/npc/001-1/_import.txt
index 12b4774e2..886b2a814 100644
--- a/npc/001-1/_import.txt
+++ b/npc/001-1/_import.txt
@@ -13,7 +13,6 @@
 "npc/001-1/doors.txt",
 "npc/001-1/elmo.txt",
 "npc/001-1/enora.txt",
-"npc/001-1/eugene.txt",
 "npc/001-1/fexil.txt",
 "npc/001-1/flyingpiou.txt",
 "npc/001-1/harbours.txt",
@@ -39,5 +38,4 @@
 "npc/001-1/taree.txt",
 "npc/001-1/treeleaf.txt",
 "npc/001-1/trees.txt",
-"npc/001-1/wateranimation.txt",
 "npc/001-1/xilaxa.txt",
diff --git a/npc/001-1/wateranimation.txt b/npc/001-1/wateranimation.txt
deleted file mode 100644
index 285a7788f..000000000
--- a/npc/001-1/wateranimation.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-// Evol scripts.
-// Author:
-//    gumi
-//    Reid
-// Description:
-//    Water animations, splash, fishes, etc...
-
-001-1,116,123,0	script	#water_animation0	NPC_WATER_SPLASH,{
-
-    fishing; // begin or continue fishing
-    close;
-
-OnInit:
-    .sex = G_OTHER;
-    .distance = 5;
-    end;
-}
-
-001-1,119,102,0	duplicate(#water_animation0)	#water_animation1	NPC_WATER_SPLASH
-001-1,167,82,0	duplicate(#water_animation0)	#water_animation2	NPC_WATER_SPLASH
-001-1,167,40,0	duplicate(#water_animation0)	#water_animation3	NPC_WATER_SPLASH
-001-1,104,127,0	duplicate(#water_animation0)	#water_animation4	NPC_WATER_SPLASH
-001-1,166,123,0	duplicate(#water_animation0)	#water_animation5	NPC_WATER_SPLASH
-001-1,181,119,0	duplicate(#water_animation0)	#water_animation6	NPC_WATER_SPLASH
-001-1,202,114,0	duplicate(#water_animation0)	#water_animation7	NPC_WATER_SPLASH
-001-1,187,86,0	duplicate(#water_animation0)	#water_animation8	NPC_WATER_SPLASH
-001-1,32,57,0	duplicate(#water_animation0)	#water_animation9	NPC_WATER_SPLASH
-001-1,40,144,0	duplicate(#water_animation0)	#water_animation10	NPC_WATER_SPLASH
-001-1,58,131,0	duplicate(#water_animation0)	#water_animation11	NPC_WATER_SPLASH
-001-1,76,137,0	duplicate(#water_animation0)	#water_animation12	NPC_WATER_SPLASH
-001-1,109,132,0	duplicate(#water_animation0)	#water_animation13	NPC_WATER_SPLASH
-001-1,141,93,0	duplicate(#water_animation0)	#water_animation14	NPC_WATER_SPLASH
-001-1,168,57,0	duplicate(#water_animation0)	#water_animation15	NPC_WATER_SPLASH
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/001-1/eugene.txt b/npc/003-1/eugene.txt
index 442b950d8..cfb5e037a 100644
--- a/npc/001-1/eugene.txt
+++ b/npc/003-1/eugene.txt
@@ -5,13 +5,13 @@
 // Description:
 //    Fishman NPC
 // Quest variable:
-//    ArtisQuests_Fishman
+//    TulimsharQuests_Fishman
 // Quest stages:
 //    0 - not started
 //    1 - Eugene asked for items
 //    2 - completed
 
-001-1,113,120,0	script	Eugene	NPC_EUGENE,{
+003-1,80,127,0	script	Eugene	NPC_EUGENE,{
 
     .BaitID = SmallTentacles;
     .BaitCount = 10;
@@ -20,7 +20,7 @@
         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(ArtisQuests_Fishman);
+    .@q = getq(TulimsharQuests_Fishman);
     if (.@q == 1) goto L_CheckItems;
     if (.@q == 2) goto L_QuestDone;
 
@@ -35,7 +35,7 @@
                    l("Sorry, I'm doing other things at the moment.")))
     {
         case 1:
-            setq ArtisQuests_Fishman, 1;
+            setq TulimsharQuests_Fishman, 1;
             speech S_FIRST_BLANK_LINE,
                 l("Thank you. I'll wait here.");
             close;
@@ -67,7 +67,7 @@ L_CheckItems:
     delitem .BaitID, .BaitCount;
     getitem FishingRod, 1;
     getitem FishingGuideVolI, 1;
-    setq ArtisQuests_Fishman, 2;
+    setq TulimsharQuests_Fishman, 2;
     close;
 
 L_QuestDone:
@@ -82,3 +82,4 @@ OnInit:
     .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