From 7d449dc95b10543b595c273a3fc5244a0e92e837 Mon Sep 17 00:00:00 2001 From: Saulc Date: Wed, 7 Feb 2018 22:26:19 +0100 Subject: fix quest.db and add Fishing in Tulimshar 003-1 --- db/quest_db.conf | 10 +++--- npc/001-1/_import.txt | 2 -- npc/001-1/eugene.txt | 84 ------------------------------------------- npc/001-1/wateranimation.txt | 33 ----------------- npc/003-1/_import.txt | 1 + npc/003-1/eugene.txt | 85 ++++++++++++++++++++++++++++++++++++++++++++ npc/003-1/wateranimation.txt | 18 ++++++++-- 7 files changed, 107 insertions(+), 126 deletions(-) delete mode 100644 npc/001-1/eugene.txt delete mode 100644 npc/001-1/wateranimation.txt create mode 100644 npc/003-1/eugene.txt diff --git a/db/quest_db.conf b/db/quest_db.conf index 45bff12b6..1bd0a2d63 100644 --- a/db/quest_db.conf +++ b/db/quest_db.conf @@ -115,7 +115,7 @@ quest_db: ( }, { Id: 22 - Name: "ArtisQuests_Fishman" + Name: "TulimsharQuests_Fishman" }, { Id: 23 @@ -179,11 +179,11 @@ quest_db: ( }, { Id: 38 -<<<<<<< HEAD Name: "CandorQuest_Maya" -======= - Name: "ArtisQuest_Apana" ->>>>>>> 35753b2705a52c648a61a11d175dcc93a31bc3f5 +}, +{ + Id: 39 + Name: "CandorQuest_Apana" }, { Id: 1000 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/eugene.txt b/npc/001-1/eugene.txt deleted file mode 100644 index 442b950d8..000000000 --- a/npc/001-1/eugene.txt +++ /dev/null @@ -1,84 +0,0 @@ -// Evol scripts. -// Authors: -// Reid -// Travolta -// Description: -// Fishman NPC -// Quest variable: -// ArtisQuests_Fishman -// Quest stages: -// 0 - not started -// 1 - Eugene asked for items -// 2 - completed - -001-1,113,120,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(ArtisQuests_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 ArtisQuests_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 ArtisQuests_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/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/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 -- cgit v1.2.3-60-g2f50