remove lora_tay and dress_quest to include/argeas; merge lora_tay and dress to fur_quest

5 files changed, 65 insertions, 91 deletions

diff --git a/quests/argeas/_include.xml b/quests/argeas/_include.xml
index 9414ad15..3e73e69e 100644
--- a/quests/argeas/_include.xml
+++ b/quests/argeas/_include.xml
@@ -4,6 +4,5 @@
   <include name="quests/argeas/banu.xml"/>
   <include name="quests/argeas/letter_quest.xml"/>
   <include name="quests/argeas/orum_quest.xml"/>
-  <include name="quests/argeas/lora_tay.xml"/>
   <include name="quests/argeas/celestia.xml"/>
 </quests>
diff --git a/quests/argeas/lora_tay.xml b/quests/argeas/lora_tay.xml
deleted file mode 100644
index 2aa4799a..00000000
--- a/quests/argeas/lora_tay.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<quests>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule selector="//var/quest/@name" translate="yes"/>
-    <its:translateRule selector="//var/quest/name" translate="yes"/>
-    <its:translateRule selector="//var/quest/text" translate="yes"/>
-    <its:translateRule selector="//*" translate="no"/>
-  </its:rules>
-  <var id="25">
-    <effect map="010-2.tmx" npc="151" value="10" effect="45"/>
-    <effect map="010-2.tmx" npc="151" value="11" effect="46"/>
-    <quest name="Lora Tay The Legendary Seamstress" group="Argeas" incomplete="10">
-      <name>Lora Tay</name>
-      <text>Lora Tay has difficulty talking.</text>
-    </quest>
-    <quest name="Lora Tay The Legendary Seamstress" group="Argeas" complete="11,12,13,14,15,16,17,18,19,20,21,22,23">
-      <name>Lora Tay</name>
-      <text>A Bottle of Water has cured her cough.  Nice!</text>
-      <text/>
-      <text>Reward: 50,000 EXP.</text>
-    </quest>
-  </var>
-</quests>
diff --git a/quests/kaizei/_include.xml b/quests/kaizei/_include.xml
index 5dd71696..c6806830 100644
--- a/quests/kaizei/_include.xml
+++ b/quests/kaizei/_include.xml
@@ -5,5 +5,4 @@
   <include name="quests/kaizei/baktar.xml"/>
   <include name="quests/kaizei/blue_sage.xml"/>
   <include name="quests/kaizei/fur_quest.xml"/>
-  <include name="quests/kaizei/dress_quest.xml"/>
 </quests>
diff --git a/quests/kaizei/dress_quest.xml b/quests/kaizei/dress_quest.xml
deleted file mode 100644
index fb8f2679..00000000
--- a/quests/kaizei/dress_quest.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<quests>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule selector="//var/quest/@name" translate="yes"/>
-    <its:translateRule selector="//var/quest/name" translate="yes"/>
-    <its:translateRule selector="//var/quest/text" translate="yes"/>
-    <its:translateRule selector="//*" translate="no"/>
-  </its:rules>
-  <var id="25">
-    <effect map="020-2.tmx" npc="137" value="12,13,14,15,16,17,18,19,20,21,22" effect="45"/>
-    <effect map="020-2.tmx" npc="137" value="23" effect="46"/>
-    <quest name="Agostine's Dream Dress" group="Kaizei" incomplete="12">
-      <name>Agostine's Dream Dress</name>
-      <text>Agostine dreams of making a beautiful dress, but needs the help of Lora Tay.</text>
-    </quest>
-    <quest name="Agostine's Dream Dress" group="Kaizei" incomplete="13">
-      <name>Agostine's Dream Dress</name>
-      <text>Lora Tay asks for more information from Agostine.</text>
-    </quest>
-     <quest name="Agostine's Dream Dress" group="Kaizei" incomplete="14">
-      <name>Agostine's Dream Dress</name>
-      <text>Agostine gives you bundles of fine cloth to show to Lora Tay.</text>
-    </quest>
-     <quest name="Agostine's Dream Dress" group="Kaizei" incomplete="15">
-      <name>Agostine's Dream Dress</name>
-      <text>Lora Tay agrees to help Agostine, but she needs Silk Cocoons.</text>
-      <text/>
-      <text>%%E  180 [@@718|@@]</text>
-    </quest>
-     <quest name="Agostine's Dream Dress" group="Kaizei" incomplete="16">
-      <name>Agostine's Dream Dress</name>
-      <text>Lora Tay need you for retrieve the design to Agostine.</text>
-    </quest>
-     <quest name="Agostine's Dream Dress" group="Kaizei" incomplete="17">
-      <name>Agostine's Dream Dress</name>
-      <text>Lora Tay also needs Agostine's dress pattern.</text>
-    </quest>
-     <quest name="Agostine's Dream Dress" group="Kaizei" incomplete="18,19">
-      <name>Agostine's Dream Dress</name>
-      <text>Lora Tay works on the dress.  Wait outside before talking to Lora Tay again.</text>
-    </quest>   
-     <quest name="Agostine's Dream Dress" group="Kaizei" incomplete="20">
-      <name>Agostine's Dream Dress</name>
-      <text>Lora Tay says Agostine needs to finish the dress.</text>
-    </quest>   
-     <quest name="Agostine's Dream Dress" group="Kaizei" incomplete="21">
-      <name>Agostine's Dream Dress</name>
-      <text>Agostine needs Cotton Cloths to finish the dress.</text>
-      <text/>
-      <text>%%E  20 [@@660|@@]</text>
-    </quest>   
-     <quest name="Agostine's Dream Dress" group="Kaizei" incomplete="22">
-      <name>Agostine's Dream Dress</name>
-      <text>The Fine Dress is finished!  Agostine can sell this magnificent dress to you for 20,000 GP.</text>
-    </quest>   
-     <quest name="Agostine's Dream Dress" group="Kaizei" complete="23">
-      <name>Agostine's Dream Dress</name>
-      <text>The most beautiful dress in the world is yours!  Congratz!</text>
-      <text/>
-      <text>Quest Giver: Agostine.</text>
-      <text>Reward: [@@870|@@].</text>
-    </quest>
-  </var>
-</quests>
diff --git a/quests/kaizei/fur_quest.xml b/quests/kaizei/fur_quest.xml
index 6a5c99b5..2f7dd1a7 100644
--- a/quests/kaizei/fur_quest.xml
+++ b/quests/kaizei/fur_quest.xml
@@ -7,8 +7,10 @@
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
   <var id="25">
-    <effect map="020-2.tmx" npc="137" value="1,3,4,5,7,8" effect="45"/>
-    <effect map="020-2.tmx" npc="137" value="2,6,9" effect="46"/>
+    <effect map="020-2.tmx" npc="137" value="1,3,4,5,7,8,12,13,14,15,16,17,18,19,20,21,22" effect="45"/>
+    <effect map="020-2.tmx" npc="137" value="2,6,9,23" effect="46"/>
+    <effect map="010-2.tmx" npc="151" value="10" effect="45"/>
+    <effect map="010-2.tmx" npc="151" value="11" effect="46"/>
     <quest name="Agostine The Tailor" group="Kaizei" incomplete="1">
       <name>Fur Quest</name>
       <text>Bring different beverages to Agostine in Nivalis.</text>
@@ -58,5 +60,66 @@
       <text>Quest Giver: Agostine.</text>
       <text>Reward: [@@655|@@]</text>
     </quest>
+    <quest name="Lora Tay The Legendary Seamstress" group="Argeas" incomplete="10">
+      <name>Lora Tay</name>
+      <text>Lora Tay has difficulty talking.</text>
+    </quest>
+    <quest name="Lora Tay The Legendary Seamstress" group="Argeas" complete="11,12,13,14,15,16,17,18,19,20,21,22,23">
+      <name>Lora Tay</name>
+      <text>A Bottle of Water has cured her cough.  Nice!</text>
+      <text/>
+      <text>Reward: 50,000 EXP.</text>
+    </quest>
+    <quest name="Agostine's Dream Dress" group="Kaizei" incomplete="12">
+      <name>Agostine's Dream Dress</name>
+      <text>Agostine dreams of making a beautiful dress, but needs the help of Lora Tay.</text>
+    </quest>
+    <quest name="Agostine's Dream Dress" group="Kaizei" incomplete="13">
+      <name>Agostine's Dream Dress</name>
+      <text>Lora Tay asks for more information from Agostine.</text>
+    </quest>
+     <quest name="Agostine's Dream Dress" group="Kaizei" incomplete="14">
+      <name>Agostine's Dream Dress</name>
+      <text>Agostine gives you bundles of fine cloth to show to Lora Tay.</text>
+    </quest>
+     <quest name="Agostine's Dream Dress" group="Kaizei" incomplete="15">
+      <name>Agostine's Dream Dress</name>
+      <text>Lora Tay agrees to help Agostine, but she needs Silk Cocoons.</text>
+      <text/>
+      <text>%%E  180 [@@718|@@]</text>
+    </quest>
+     <quest name="Agostine's Dream Dress" group="Kaizei" incomplete="16">
+      <name>Agostine's Dream Dress</name>
+      <text>Lora Tay need you for retrieve the design to Agostine.</text>
+    </quest>
+     <quest name="Agostine's Dream Dress" group="Kaizei" incomplete="17">
+      <name>Agostine's Dream Dress</name>
+      <text>Lora Tay also needs Agostine's dress pattern.</text>
+    </quest>
+     <quest name="Agostine's Dream Dress" group="Kaizei" incomplete="18,19">
+      <name>Agostine's Dream Dress</name>
+      <text>Lora Tay works on the dress.  Wait outside before talking to Lora Tay again.</text>
+    </quest>   
+     <quest name="Agostine's Dream Dress" group="Kaizei" incomplete="20">
+      <name>Agostine's Dream Dress</name>
+      <text>Lora Tay says Agostine needs to finish the dress.</text>
+    </quest>   
+     <quest name="Agostine's Dream Dress" group="Kaizei" incomplete="21">
+      <name>Agostine's Dream Dress</name>
+      <text>Agostine needs Cotton Cloths to finish the dress.</text>
+      <text/>
+      <text>%%E  20 [@@660|@@]</text>
+    </quest>   
+     <quest name="Agostine's Dream Dress" group="Kaizei" incomplete="22">
+      <name>Agostine's Dream Dress</name>
+      <text>The Fine Dress is finished!  Agostine can sell this magnificent dress to you for 20,000 GP.</text>
+    </quest>   
+     <quest name="Agostine's Dream Dress" group="Kaizei" complete="23">
+      <name>Agostine's Dream Dress</name>
+      <text>The most beautiful dress in the world is yours!  Congratz!</text>
+      <text/>
+      <text>Quest Giver: Agostine.</text>
+      <text>Reward: [@@870|@@].</text>
+    </quest>
   </var>
 </quests>