From 13e61047d9d39fba6869394b2cb8e41f164c1bf1 Mon Sep 17 00:00:00 2001
From: Celtic Minstrel <celtic.minstrel.ca@some.place>
Date: Mon, 2 Dec 2019 01:18:24 -0500
Subject: [PATCH] VoDT: Merge Bristow's shops into a single shop

---
 rsrc/scenarios/valleydy/scenario.xml    | 17 ++++++++---------
 rsrc/scenarios/valleydy/towns/talk1.xml | 20 ++++----------------
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/rsrc/scenarios/valleydy/scenario.xml b/rsrc/scenarios/valleydy/scenario.xml
index 1429b8cf..d1c1c4b9 100644
--- a/rsrc/scenarios/valleydy/scenario.xml
+++ b/rsrc/scenarios/valleydy/scenario.xml
@@ -236,7 +236,7 @@
             </entries>
         </shop>
         <shop>
-            <name>Bristow&apos;s Weapons</name>
+            <name>Bristow&apos;s Smithy</name>
             <type>live</type>
             <prompt>shop</prompt>
             <face>0</face>
@@ -266,14 +266,6 @@
                 <item quantity="infinite">53</item>
                 <item quantity="infinite">54</item>
                 <item quantity="infinite">55</item>
-            </entries>
-        </shop>
-        <shop>
-            <name>Bristow&apos;s Armor</name>
-            <type>live</type>
-            <prompt>shop</prompt>
-            <face>0</face>
-            <entries>
                 <item quantity="infinite">120</item>
                 <item quantity="infinite">121</item>
                 <item quantity="infinite">122</item>
@@ -288,6 +280,13 @@
                 <item quantity="infinite">131</item>
             </entries>
         </shop>
+        <shop>
+            <name>Unused Shop</name>
+            <type>live</type>
+            <prompt>shop</prompt>
+            <face>0</face>
+            <entries />
+        </shop>
         <shop>
             <name>Karen&apos;s Arcana</name>
             <type>live</type>
diff --git a/rsrc/scenarios/valleydy/towns/talk1.xml b/rsrc/scenarios/valleydy/towns/talk1.xml
index 89a80ce5..1d6901b5 100644
--- a/rsrc/scenarios/valleydy/towns/talk1.xml
+++ b/rsrc/scenarios/valleydy/towns/talk1.xml
@@ -373,19 +373,19 @@
         </text>
     </node>
     <node for="12">
-        <keyword>purc</keyword>
         <keyword>disc</keyword>
+        <keyword>xxxx</keyword>
         <type>reg</type>
         <param>0</param>
         <param>0</param>
         <param>0</param>
         <param>0</param>
         <text>
-            <![CDATA["Times are hard, but I'll give you what discount I can. Do you want weapons or armor?"]]>
+            <![CDATA["Times are hard, but I'll give you what discount I can. Just let me know when you're ready to purchase."]]>
         </text>
     </node>
     <node for="12">
-        <keyword>weap</keyword>
+        <keyword>purc</keyword>
         <keyword>xxxx</keyword>
         <type>shop</type>
         <param>1</param>
@@ -393,19 +393,7 @@
         <param>0</param>
         <param>0</param>
         <text>
-            <![CDATA[Bristow's Weapons]]>
-        </text>
-    </node>
-    <node for="12">
-        <keyword>armo</keyword>
-        <keyword>xxxx</keyword>
-        <type>shop</type>
-        <param>1</param>
-        <param>8</param>
-        <param>0</param>
-        <param>0</param>
-        <text>
-            <![CDATA[Bristow's Armor]]>
+            <![CDATA[Bristow's Smithy]]>
         </text>
     </node>
     <node for="12">