From dcde888599e44657c7e2fbcefc194cfdf7e90ecf Mon Sep 17 00:00:00 2001
From: Hal9OOO <miglietta.francesco@gmail.com>
Date: Mon, 10 Dec 2012 23:32:57 +0100
Subject: First round-up of questchain cleaning.
---
npc/000-1/chest.txt | 6 +-----
npc/000-1/gugli.txt | 8 +++++---
npc/000-2-0/julia.txt | 2 ++
npc/000-2-1/alige.txt | 1 +
npc/000-2-1/chefgado.txt | 6 +++---
npc/000-2-1/peter.txt | 3 ++-
npc/000-2-3/box.txt | 40 ++++++++++++++++------------------------
npc/000-2-3/nard.txt | 31 +++++++++++++++++++------------
8 files changed, 49 insertions(+), 48 deletions(-)
diff --git a/npc/000-1/chest.txt b/npc/000-1/chest.txt
index 724be98e..88ddd196 100644
--- a/npc/000-1/chest.txt
+++ b/npc/000-1/chest.txt
@@ -25,12 +25,8 @@
l_Give:
if (@q > 1) goto l_Close;
- set @item, 515;
- set @count, 3;
- callfunc "InventoryPlace", @item, @count;
-
setq ShipQuests_Darlin, 2;
- set zeny, zeny + 400;
+ set zeny, zeny + 10;
getitem SeaDrops, 1;
getitem Aquada, 1;
getitem OldBook, 1;
diff --git a/npc/000-1/gugli.txt b/npc/000-1/gugli.txt
index 1f376271..c4a895ca 100644
--- a/npc/000-1/gugli.txt
+++ b/npc/000-1/gugli.txt
@@ -28,7 +28,7 @@ OnTalk:
set @gugli, getq(ShipQuests_Gugli);
set @gado, getq(ShipQuests_ChefGado);
- if (@gado > 3 && @nard == 3) goto l_AllComplete;
+ if (@nard > 3) goto l_AllComplete;
if (@nard > 1 || @gugli == 2) goto l_TaskCompleted;
if (@gugli == 1) goto l_TaskGiven;
@@ -137,9 +137,9 @@ l_Couwan:
mesq l("May this be a lesson for you.");
setq ShipQuests_Couwan, 2;
- set zeny, zeny+50;
+ set zeny, zeny+5;
if (countitem("FishBox") > 0) delitem "FishBox", 1;
- message strcharinfo(0), l("You receive 50GP!");
+ message strcharinfo(0), l("You receive 5GP!");
close;
l_Location:
@@ -187,6 +187,8 @@ l_TaskDone:
if (countitem("CroconutBox") == 1) delitem "CroconutBox", 1;
if (countitem("PlushroomBox") == 1) delitem "PlushroomBox", 1;
setq ShipQuests_Gugli, 2;
+
+ getexp 50, 0;
mesq l("Well done! The ship is now ready to sail again!");
next;
diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt
index 87ae9b74..6a5b3549 100644
--- a/npc/000-2-0/julia.txt
+++ b/npc/000-2-0/julia.txt
@@ -210,6 +210,8 @@ l_Regret:
mesq l("Gado! That coward lives in the past, I will ask Nard to punish him, again!");
next;
mesq l("Take this money for your wise choice. But do not try it again. Water has been merciful with you once... Do not tempt fate once more!");
+ set zeny, zeny + 50;
+ message strcharinfo(0), l("You receive 50GP!");
setq ShipQuests_ChefGado, 5;
close;
diff --git a/npc/000-2-1/alige.txt b/npc/000-2-1/alige.txt
index f8d785b9..823fa674 100644
--- a/npc/000-2-1/alige.txt
+++ b/npc/000-2-1/alige.txt
@@ -173,6 +173,7 @@ l_GiveReward:
setq ShipQuests_Alige, 3;
getitem "Piberries", rand(1,3);
+
close;
l_NoReward:
diff --git a/npc/000-2-1/chefgado.txt b/npc/000-2-1/chefgado.txt
index c171e9eb..7fc47fbb 100644
--- a/npc/000-2-1/chefgado.txt
+++ b/npc/000-2-1/chefgado.txt
@@ -99,9 +99,6 @@ l_QuestAccepted:
l_GotAll:
mes "";
- set @item, 717;
- set @count, 1;
- callfunc "InventoryPlace", @item, @count;
delitem "PiouLegs", 2;
delitem "Croconut", 1;
@@ -141,6 +138,9 @@ l_PoisonJulia:
mesn;
mesq l("The usurper has been punished! This is a great day! Take this reward as a prize for your loyalty to the old commander!");
+ set zeny, zeny + 25;
+ message strcharinfo(0), l("You receive 25GP!");
+ getitem "Bread", 2;
setq ShipQuests_ChefGado, 4;
close;
diff --git a/npc/000-2-1/peter.txt b/npc/000-2-1/peter.txt
index 61b09945..0e7f8790 100644
--- a/npc/000-2-1/peter.txt
+++ b/npc/000-2-1/peter.txt
@@ -272,7 +272,8 @@ l_Reward:
mesn;
mesq l("Good job!") + " " + l("Here's your reward!");
getexp 100, 0;
- set zeny, zeny + 500;
+ set zeny, zeny + 25;
+ message strcharinfo(0), l("You receive 25GP!");
setq ShipQuests_Peter, 5;
goto l_CleaningClose;
diff --git a/npc/000-2-3/box.txt b/npc/000-2-3/box.txt
index 45df8493..85365600 100644
--- a/npc/000-2-3/box.txt
+++ b/npc/000-2-3/box.txt
@@ -5,15 +5,18 @@
// Captain Nard dialogs.
// Nard does the introduction with a small quest.
// This quest is meant to teach the player how to use a weapon,and to bring food to the ship.
-// 2 bits array:
+// 4 bits array:
// ShipQuests
// Variable:
// ShipQuests_Nard
// Values:
// 0 Introduction of the boxes and Nard. This is displayed when the player never spoke to Nard or his box.
// 1 Nard spoke and gave access to the outdoor of the ship.
-// 2 Completed the quest.
-// 3 Opened the chest and finished the introduction.
+// 2 Completed the Gugli quest.
+// 3 ChefGado Quest accepted.
+// 4 ChefGado Quest completed and "Introduction" chapter finalized.
+// 5 Reward taken from the box.
+
000-2-3.gat,25,24,0 script Box 102;1,{
@@ -29,10 +32,16 @@
l("Take a Bandana."), -,
l("Nothing."), l_Quit;
- if (@q == 1) goto l_NotYet;
- if (@q == 2) goto l_Give;
- if (@q > 2) goto l_Already;
+ if (@q == 0) goto l_NoQuest;
+ if (@q == 4) goto l_Give;
+ if (@q > 4) goto l_Already;
+
+ setcamnpc "Nard";
+ mes "";
+ mesn "Nard";
+ mesq l("Please don't touch these hats, they are for crew members only.");
+l_NoQuest:
mes "";
mesn "Narrator";
mes col(l("Nard looks surprised and stops you."), 9);
@@ -64,35 +73,18 @@
mesq l("Now go outside and talk with Gugli, he'll tell you what we need.");
next;
- set @item, 718;
- set @count, 1;
- callfunc "InventoryPlace", @item, @count;
-
setq ShipQuests_Nard, 1;
getitem "JohanneKey", 1;
close;
-l_NotYet:
- setcamnpc "Nard";
- mes "";
- mesn "Nard";
- mesq l("Please don't touch these hats, they are for crew members only.");
-
l_Give:
setcamnpc "Nard";
mes "";
mesn "Nard";
- mesq l("Congrats!");
- next;
- mesn "Nard";
mesq l("You are now part of the crew. Thanks again for your help.");
- set @item, 2900;
- set @count, 1;
- callfunc "InventoryPlace", @item, @count;
-
- setq ShipQuests_Nard, 3;
+ setq ShipQuests_Nard, 5;
getitem "Bandana", 1;
// Need to add a skill for the crew at this line.
diff --git a/npc/000-2-3/nard.txt b/npc/000-2-3/nard.txt
index 53859159..2938f7d9 100644
--- a/npc/000-2-3/nard.txt
+++ b/npc/000-2-3/nard.txt
@@ -5,7 +5,7 @@
// Captain Nard dialogs.
// Nard does the introduction with a small quest.
// This quest is meant to teach the player how to use a weapon,and to bring food to the ship.
-// 2 bits array:
+// 4 bits array:
// ShipQuests
// Variable:
// 0 ShipQuests_Nard
@@ -14,8 +14,10 @@
// Values:
// 00 Introduction of the boxes and Nard. This is displayed when the player never spoke to Nard or his box.
// 01 Nard spoke and gave access to the outdoor of the ship.
-// 02 Completed the quest.
-// 03 Opened the chest and finished the introduction.
+// 02 Completed the Gugli quest.
+// 03 ChefGado Quest accepted.
+// 04 ChefGado Quest completed and "Introduction" chapter finalized.
+// 05 Reward taken from the box.
// 10 Never talked with Gugli.
// 11 Gugli gives you the task.
// 12 Gave all of the boxes to Gugli.
@@ -30,7 +32,8 @@ l_Checker:
if (@gado > 3 && @nard == 3) goto l_ChefQuestComplete;
if (@nard == 2) goto l_ChefQuestStart;
if (@nard == 3) goto l_ChefQuestGiven;
- if (@nard == 4) goto l_Already;
+ if (@nard == 4) goto l_Reward;
+ if (@nard > 4) goto l_Already;
if (@gugli == 2) goto l_Done;
if (@nard == 1) goto l_NotYet;
@@ -96,10 +99,6 @@ l_NeedContent:
mesq l("Now go outside and talk with Gugli, he'll tell you what we need.");
next;
- set @item, 718;
- set @count, 1;
- callfunc "InventoryPlace", @item, @count;
-
setq ShipQuests_Nard, 1;
getitem "JohanneKey", 1;
@@ -183,15 +182,17 @@ l_ChefQuestComplete:
next;
mesq l("You are now officially part of my crew! Thanks again for your help.");
next;
+ mesq l("Take your reward from the box next to my desk!");
+ next
- set @item, 2900;
- set @count, 1;
- callfunc "InventoryPlace", @item, @count;
+ menu
+ l("I will take it! Thank you captain!"), -;
setq ShipQuests_Nard, 4;
- getitem "Bandana", 1;
+
// Need to add a skill for the crew at this line.
+ mes "";
mesn "Narrator";
mes col(l("This is it, the end of the Second Beta Release of Evol Online!"), 9);
next;
@@ -201,6 +202,12 @@ l_ChefQuestComplete:
close;
+l_Reward:
+ mesn;
+ mesq l("Hey! There's a reward for you in the box next to me!");
+
+ close;
+
l_Already:
mesn;
mesq l("Sorry, I don't need any help right now. Come back later.");
--
cgit v1.2.3-70-g09d2