From d9f6484496be46a381ae5303efe0254aa1d873eb Mon Sep 17 00:00:00 2001
From: Vincent Petithory <vincent.petithory@gmail.com>
Date: Sun, 2 Sep 2012 23:41:16 +0200
Subject: Agostine and Lora Tay quest fixes:
* add missing money check when buying the dress
* lora tay gives a better hint on what to do
when she works on the dress.
* the condition to have the dress finished is now a 30 seconds wait.
* spelling errors and some dialogs improvements by Qwerty Dragon
---
world/map/npc/010-1/_import.txt | 1 -
world/map/npc/010-1/loratayworking.txt | 7 -------
world/map/npc/010-2/loratay.txt | 23 +++++++++++++++--------
world/map/npc/020-2/furquest.txt | 32 ++++++++++++++++++++------------
4 files changed, 35 insertions(+), 28 deletions(-)
delete mode 100644 world/map/npc/010-1/loratayworking.txt
diff --git a/world/map/npc/010-1/_import.txt b/world/map/npc/010-1/_import.txt
index ffb5d31a..c784dbe5 100644
--- a/world/map/npc/010-1/_import.txt
+++ b/world/map/npc/010-1/_import.txt
@@ -3,4 +3,3 @@
map: 010-1.gat
npc: npc/010-1/_mobs.txt
npc: npc/010-1/_warps.txt
-npc: npc/010-1/loratayworking.txt
diff --git a/world/map/npc/010-1/loratayworking.txt b/world/map/npc/010-1/loratayworking.txt
deleted file mode 100644
index 5103ef60..00000000
--- a/world/map/npc/010-1/loratayworking.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-010-1.gat,36,96,0|script|#loratayworking|32767,0,0{
-OnTouch:
- if (QUEST_WG_state != 18)
- end;
- set QUEST_WG_state, 19;
- end;
-}
diff --git a/world/map/npc/010-2/loratay.txt b/world/map/npc/010-2/loratay.txt
index 6335d7a7..4b9a629f 100644
--- a/world/map/npc/010-2/loratay.txt
+++ b/world/map/npc/010-2/loratay.txt
@@ -263,7 +263,7 @@ L_agostine_proposal:
mes "[Lora Tay the Seamstress]";
mes "\"That cheat! What could he possibly want from me?";
- mes "We don't even have the same style in seeming. Is this a joke?\"";
+ mes "We don't even have the same style in seaming. Is this a joke?\"";
next;
menu
@@ -300,14 +300,14 @@ L_proposal_show_materials:
next;
menu
- "He said this dress would be his first dress creation and he wanted it to be fabulous!", -;
+ "He said this garment would be his first dress creation and he wanted it to be fabulous!", -;
mes "[Lora Tay the Seamstress]";
mes "\"Fine I will accept his offer...";
mes "But the materials he has given you need some sewing on the edges.\"";
next;
mes "[Lora Tay the Seamstress]";
- mes "\"I will fix them, but I cannot use normal threading to fix this materials.";
+ mes "\"I will fix them, but I cannot use normal threading to fix these materials.";
mes "I will need a soft thin thread so I won't spoil the textures.\"";
next;
@@ -316,7 +316,7 @@ L_proposal_show_materials:
L_proposal_search_items:
mes "[Lora Tay the Seamstress]";
mes "\"Please bring me " + @FINEDRESS_COCOONS + " silk cocoons.";
- mes "This should cover the materials needs and will leave extra for sewing the pieces together later on.\"";
+ mes "This should cover the materials needed, and will leave extra for sewing the pieces together later on.\"";
next;
menu
@@ -340,7 +340,7 @@ L_proposal_give_items:
mes "[Lora Tay the Seamstress]";
mes "\"Great, now I can spin the silk threading and fix this mess made of these fine materials.";
mes "While I do this, you will need to go get the design drawings from Agostine...";
- mes "Every taylor puts their designs on paper before they forget about it.\"";
+ mes "Every tailor puts their designs on paper before they forget about it.\"";
next;
goto L_proposal_retrieve_design;
@@ -368,13 +368,20 @@ L_proposal_bringing_design:
goto L_proposal_wait_dress_finished;
L_proposal_wait_dress_finished:
- mes "[Lora Tay the Seamstress]";
- mes "\"Come back later and the dress will be finished!\"";
+ // Sets @time_start to the current time
+ // if not set yet, or if the player logged off.
+ if (@time_start == 0) set @time_start, gettimetick(2);
+ if (gettimetick(2) - @time_start > 30)
+ goto L_proposal_dress_finished;
+ mes "[Lora Tay the Seamstress]";
+ mes "\"It will take some time to have the dress finished.";
+ mes "Meanwhile, why don't you go take some air outside?\"";
close;
L_proposal_dress_finished:
+ set QUEST_WG_state, 19;
mes "[Lora Tay the Seamstress]";
- mes "\"Well it was difficult seeming with such fragile materials.";
+ mes "\"Well it was difficult seaming with such fragile materials.";
mes "But I have done it. The design is finished except for one part of it.\"";
next;
diff --git a/world/map/npc/020-2/furquest.txt b/world/map/npc/020-2/furquest.txt
index 0a021fcb..8614a428 100644
--- a/world/map/npc/020-2/furquest.txt
+++ b/world/map/npc/020-2/furquest.txt
@@ -366,26 +366,26 @@ L_State_14:
mes "[Agostine, The Legendary Tailor]";
mes "\"There is a new fashion I've been dying to try out!";
- mes "But I don't have all the knowledge in the world about seeming this wonderful fashion.\"";
+ mes "But I don't have all the knowledge in the world about seaming this wonderful fashion.\"";
next;
menu
"Ah, that's too bad...", L_Close,
- "I know another taylor who might know!", -;
+ "I know another tailor who might know!", -;
mes "[Agostine, The Legendary Tailor]";
- mes "\"What taylor may that be?";
+ mes "\"What tailor may that be?";
mes "I haven't been out of Nivalis for quite some time since I have been busy with clothes for the people of the town.";
- mes "If you can tell me the name of this great taylor, maybe we can work something out, like a collaboration!\"";
+ mes "If you can tell me the name of this great tailor, maybe we can work something out, like a collaboration!\"";
next;
menu
- "Well... There is a taylor in Dimond's Cove who makes pretty good clothing. Her name is Lora Tay.", -;
+ "Well... There is a tailor in Dimond's Cove who makes pretty good clothing. Her name is Lora Tay.", -;
mes "[Agostine, The Legendary Tailor]";
mes "\"I had almost forgotten about Lora Tay.";
mes "She has tried to put me out of business a few times long ago.";
mes "But I am willing to collaborate with her to make this fine fashion come alive.";
- mes "Will you go ask her if she is willing to help sew and seem this fashion I will create?\"";
+ mes "Will you go ask her if she is willing to help sew and seam this fashion I will create?\"";
menu
"Sure thing! Be back soon.", L_State_14_Accept,
@@ -412,7 +412,7 @@ L_State_15:
mes "[Agostine, The Legendary Tailor]";
mes "\"Well I had a dream of a woman in a beautiful dress I would like to recreate from my dream...";
mes "But the thing is I have never sewn a dress this fabulous in my life!";
- mes "This is why I wanted an experienced taylor to help me with it.\"";
+ mes "This is why I wanted an experienced tailor to help me with it.\"";
next;
menu
@@ -424,8 +424,8 @@ L_State_15:
mes "These are the finest materials in my whole house and have been saving them for something special such as this.\"";
next;
- message strcharinfo(0), "Agostine gives you a set of fine materials that you carefully put in your backpack.";
- mes "Agostine gives you a set of fine materials that you carefully put in your backpack.";
+ message strcharinfo(0), "Agostine gives you bundles of luxurious cloth that you carefully put in your backpack.";
+ mes "Agostine gives you bundles of luxurious cloth that you carefully put in your backpack.";
next;
mes "[Agostine, The Legendary Tailor]";
@@ -472,8 +472,8 @@ L_State_16:
set QUEST_WG_state, 17;
- message strcharinfo(0), "Agostine folds carefully his designs and gives you the paper that you put in your pocket.";
- mes "Agostine folds carefully his designs and gives you the paper that you put in your pocket.";
+ message strcharinfo(0), "Agostine gives you a folio containing his designs, that you put in a hidden compartment in your backpack.";
+ mes "Agostine gives you a folio containing his designs, that you put in a hidden compartment in your backpack.";
close;
@@ -502,7 +502,7 @@ L_State_17:
L_State_17_AskItems:
mes "[Agostine, The Legendary Tailor]";
- mes "\"Do you think you can get some for me? I will need about " + @FINEDRESS_COTTON_CLOTHS + " cotton cloths to finish this master piece.\"";
+ mes "\"I will need about " + @FINEDRESS_COTTON_CLOTHS + " cotton cloths to finish this master piece. Do you think you can get some for me?\"";
next;
menu
@@ -569,6 +569,8 @@ L_State_17_BuyDress:
"Wow that sounds great I'll take it!", -,
"I'll think about it...", L_Close;
+ if (Zeny < @FINEDRESS_GP)
+ goto L_State_17_NoMoney;
getinventorylist;
if (@inventory_count == 100)
goto L_State_17_InventoryFull;
@@ -579,6 +581,12 @@ L_State_17_BuyDress:
close;
+L_State_17_NoMoney:
+ mes "[Agostine, The Legendary Tailor]";
+ mes "\"Check your pockets my friend,";
+ mes "and come back when you have the money.\"";
+ close;
+
L_State_17_InventoryFull:
mes "[Agostine, The Legendary Tailor]";
mes "\"My friend, you don't have room to carry my master piece. Come back when you do.\"";
--
cgit v1.2.3-70-g09d2