Remove showCount XML attribute.

book8sect138: Avoid duplicates in sell objects.
tonib · Nov 10, 2019 · 11e02df · 11e02df
1 parent 09d3124
commit 11e02df
Showing 12 changed files with 15 additions and 17 deletions.
diff --git a/src/ts/controller/mechanics/mechanicsEngine.ts b/src/ts/controller/mechanics/mechanicsEngine.ts
@@ -763,11 +763,8 @@ const mechanicsEngine = {
         // Object can be used directly from the section, without picking it?
         const useOnSection = ($(rule).attr("useOnSection") === "true");
 
-        // Show arrows count for quiver
-        const showCount = ($(rule).attr("showCount") === "true");
-
         // Add the object to the available objects on the section
-        sectionState.addObjectToSection(objectId, price, unlimited, count, showCount, useOnSection);
+        sectionState.addObjectToSection(objectId, price, unlimited, count, useOnSection);
 
         sectionState.markRuleAsExecuted(rule);
     },
@@ -822,6 +819,7 @@ const mechanicsEngine = {
                         price,
                         count: 0,
                     });
+                    except.push(id); // Avoid duplicates
                 }
             }
         }

diff --git a/src/ts/model/sectionState.ts b/src/ts/model/sectionState.ts
@@ -260,11 +260,10 @@ class SectionState {
      * @param unlimited True if there are an infinite number of this kind of object on the section
      * @param count Only applies if id = 'quiver' (number of arrows on the quiver), 'arrow' (number of arrows), or 'money' (number of Gold Crowns),
      * or if price is is not zero (-> you buy "count" items for one "price")
-     * @param showCount Only applies if id = 'quiver' (show the number of arrows on the quiver)
      * @param useOnSection The object is allowed to be used on the section (not picked object)?
      */
     public addObjectToSection(objectId: string , price: number = 0, unlimited: boolean = false, count: number = 0 ,
-                              showCount: boolean = false , useOnSection: boolean = false ) {
+                              useOnSection: boolean = false ) {
 
         // Special cases:
         if ( objectId === "money" ) {
@@ -282,7 +281,7 @@ class SectionState {
             price,
             unlimited,
             count: (objectId === Item.QUIVER || objectId === Item.ARROW || objectId === Item.MONEY || price > 0 ? count : 0 ),
-            showCount: (objectId === Item.QUIVER ? showCount : false),
+            showCount: false,
             useOnSection,
         });
     }

diff --git a/src/ts/views/viewsUtils/objectsTable.ts b/src/ts/views/viewsUtils/objectsTable.ts
@@ -86,11 +86,13 @@ class ObjectsTable {
                     price : 0,
                     unlimited : false,
                     count,
-                    showCount : (obj === Item.QUIVER && this.type === ObjectsTableType.INVENTORY),
                     useOnSection : false,
                 };
             }
 
+            // Show arrows count of quiver only in action chart or count > 0
+            info.showCount = (info.id === Item.QUIVER && (info.count > 0 || this.type === ObjectsTableType.INVENTORY));
+
             this.objects.push( new ObjectsTableItem( info, this.type ) );
         }
     }

diff --git a/src/www/data/mechanics-10.xml b/src/www/data/mechanics-10.xml
@@ -45,7 +45,7 @@
 
             <object objectId="sword" />
             <object objectId="bow" />
-            <object objectId="quiver" count="6" showCount="true" />
+            <object objectId="quiver" count="6" />
             <object objectId="rope" />
             <object objectId="laumspurpotion4" />
             <object objectId="lantern" />

diff --git a/src/www/data/mechanics-11.xml b/src/www/data/mechanics-11.xml
@@ -44,7 +44,7 @@
 
                 <object objectId="sword" />
                 <object objectId="bow" />
-                <object objectId="quiver" count="6" showCount="true" />
+                <object objectId="quiver" count="6" />
                 <object objectId="rope" />
                 <object objectId="laumspurpotion4" />
                 <object objectId="lantern" />

diff --git a/src/www/data/mechanics-12.xml b/src/www/data/mechanics-12.xml
@@ -45,7 +45,7 @@
 
             <object objectId="sword" />
             <object objectId="bow" />
-            <object objectId="quiver" count="6" showCount="true" />
+            <object objectId="quiver" count="6" />
             <object objectId="rope" />
             <object objectId="laumspurpotion4" />
             <object objectId="lantern" />

diff --git a/src/www/data/mechanics-13.xml b/src/www/data/mechanics-13.xml
@@ -46,7 +46,7 @@
 
             <object objectId="sword" />
             <object objectId="bow" />
-            <object objectId="quiver" count="6" showCount="true" />
+            <object objectId="quiver" count="6" />
             <object objectId="axe" />
             <object objectId="meal" index="0" />
             <object objectId="meal" index="1" />

diff --git a/src/www/data/mechanics-6.xml b/src/www/data/mechanics-6.xml
@@ -49,7 +49,7 @@
             <object objectId="laumspurpotion4" />
             <object objectId="warhammer" />
             <object objectId="bow" />
-            <object objectId="quiver" count="6" showCount="true" />
+            <object objectId="quiver" count="6" />
             <object objectId="meal" index="0" />
             <object objectId="meal" index="1" />
             <object objectId="meal" index="2" />

diff --git a/src/www/data/mechanics-7.xml b/src/www/data/mechanics-7.xml
@@ -45,7 +45,7 @@
 
             <object objectId="sword" />
             <object objectId="bow" />
-            <object objectId="quiver" count="6" showCount="true" />
+            <object objectId="quiver" count="6" />
             <object objectId="rope" />
             <object objectId="laumspurpotion4" />
             <object objectId="lantern" />

diff --git a/src/www/data/mechanics-8.xml b/src/www/data/mechanics-8.xml
@@ -45,7 +45,7 @@
 
             <object objectId="sword" />
             <object objectId="bow" />
-            <object objectId="quiver" count="6" showCount="true" />
+            <object objectId="quiver" count="6" />
             <object objectId="rope" />
             <object objectId="laumspurpotion4" />
             <object objectId="lantern" />

diff --git a/src/www/data/mechanics-9.xml b/src/www/data/mechanics-9.xml
@@ -47,7 +47,7 @@
 
             <object objectId="sword" />
             <object objectId="bow" />
-            <object objectId="quiver" count="6" showCount="true" />
+            <object objectId="quiver" count="6" />
             <object objectId="rope" />
             <object objectId="laumspurpotion4" />
             <object objectId="lantern" />

diff --git a/src/www/data/mechanics.xsd b/src/www/data/mechanics.xsd
@@ -186,7 +186,6 @@
         <xs:attribute name="objectId" type="xs:string" use="required" />
         <xs:attribute name="price" type="xs:string" />
         <xs:attribute name="count" type="xs:nonNegativeInteger" />
-        <xs:attribute name="showCount" type="xs:boolean" />
         <xs:attribute name="useOnSection" type="xs:boolean" />
         <xs:attribute name="unlimited" type="xs:boolean" />
         <xs:attribute name="index" type="xs:nonNegativeInteger" />