simplify price action

Author: stefanseifert

src/components/round/botAction/ActionPrice.vue

@@ -1,26 +1,11 @@
 <template>
-  <ActionBox :instruction-title="t('rules.action.price.title')" :currentCard="currentCard" :managedByApp="managedByApp">
+  <ActionBox :instruction-title="t('rules.action.price.title')" :currentCard="currentCard" :managedByApp="true">
     <template #action>
       <div class="action">
         <AppIcon type="action" :name="iconName" class="icon"/>
       </div>
-      <div class="mt-3" v-if="managedByApp || done">
-        <div class="mb-2" v-html="t('rules.action.price.priceIncreased', selectedFlowers.length)"></div>
-        <FlowerIcon v-for="flower in selectedFlowers" :key="flower" :flower="flower"/>
-      </div>
-      <div v-else class="mt-3" @click.stop>
-        <p v-html="t('rules.action.price.selectFlowers')"></p>
-        <FlowerSelection v-model="selectedFlowers" :marketPrices="navigationState.marketPrices" :max="flowerCount"/>
-        <div v-if="selectedFlowers.length == flowerCount" class="mt-2">
-          <button class="btn btn-secondary" @click="windowIsDefined()">{{t('rules.action.price.windowDefined')}}</button>
-        </div>
-        <div v-if="selectedFlowers.length == 0">
-          <div>{{t('rules.action.price.or')}}</div>
-          <div class="mt-1">
-            <button class="btn btn-secondary" @click="windowIsUndefined()">{{t('rules.action.price.windowUndefined')}}</button>
-          </div>
-        </div>
-      </div>
+      <div class="mt-2 mb-1" v-html="t('rules.action.price.priceIncreased', flowers.length)"></div>
+      <FlowerIcon v-for="flower in flowers" :key="flower" :flower="flower"/>
     </template>
     <template #instruction>
       <p v-html="t('rules.action.price.definedWindowInstruction')"/>
@@ -37,8 +22,6 @@ import Card from '@/services/Card'
 import { BotAction } from '@/services/BotActions'
 import ActionBox from '../ActionBox.vue'
 import AppIcon from '@/components/structure/AppIcon.vue'
-import FlowerSelection from '@/components/structure/FlowerSelection.vue'
-import PriceSelection from '@/services/enum/PriceSelection'
 import FlowerIcon from '@/components/structure/FlowerIcon.vue'
 import WindowSelection from '@/services/enum/WindowSelection'
 
@@ -48,21 +31,17 @@ export default defineComponent({
   components: {
     ActionBox,
     AppIcon,
-    FlowerSelection,
     FlowerIcon
   },
   emits: ['ready'],
   setup(props) {
     const { t } = useI18n()
 
-    // window already defined?
     const floor = props.action.floor ?? 1
     const windowSelection = props.action.windowSelection ?? WindowSelection.LEFT
-    const windowState = props.navigationState.botPersistence.windowStates.getWindowState(floor, windowSelection)
-    const selectedFlowers = ref(windowState?.flowers ?? [])
-    const managedByApp = (windowState != undefined)
+    const flowers = props.action.flowers ?? []
 
-    return { t, floor, windowSelection, selectedFlowers, managedByApp }
+    return { t, floor, windowSelection, flowers }
   },
   props: {
     action: {
@@ -91,32 +70,8 @@ export default defineComponent({
       return this.floor
     }
   },
-  methods: {
-    windowIsDefined() : void {
-      this.navigationState.botPersistence.windowStates.setWindowState(this.floor, this.windowSelection, this.selectedFlowers, [])
-      this.doIncreasePrices()
-    },
-    windowIsUndefined() : void {
-      if (this.action.priceSelection == PriceSelection.MOST_EXPENSIVE) {
-        this.selectedFlowers = [this.navigationState.marketPrices.getMostExpensiveFlower()]
-      }
-      else {
-        this.selectedFlowers = [this.navigationState.marketPrices.getCheapestFlower()]
-      }
-      this.doIncreasePrices()
-    },
-    doIncreasePrices() : void {
-      for (const flower of this.selectedFlowers) {
-        this.navigationState.marketPrices.increase(flower)
-      }
-      this.done = true
-      this.$emit('ready')
-    }
-  },
   mounted() {
-    if (this.managedByApp) {
-      this.$emit('ready')
-    }
+    this.$emit('ready')
   }
 })
 </script>

src/locales/en.json

@@ -127,10 +127,6 @@
       },
       "price": {
         "title": "Price",
-        "selectFlowers": "Select the flowers defined for this window:",
-        "or": "or",
-        "windowDefined": "Done",
-        "windowUndefined": "Window is undefined",
         "priceIncreased": "Price increased for flower: | Price increased for flowers:",
         "definedWindowInstruction": "If the given window is defined, the price for <i>each flower</i> in that box is increased.",
         "undefinedWindowInstruction": {

src/services/BotActions.ts

@@ -7,6 +7,8 @@ import Action from './enum/Action'
 import Season from './enum/Season'
 import NavigationState from '@/util/NavigationState'
 import WindowStates from './WindowStates'
+import WindowSelection from './enum/WindowSelection'
+import PriceSelection from './enum/PriceSelection'
 
 /**
  * Collects the bot's actions and manages the automatic actions.
@@ -88,14 +90,19 @@ export default class BotActions {
           break
 
         case Action.PRICE:
-          // if windows is already defined: increase price of flowers in that window by 1, otherwise wait for user input
-          if (action.floor && action.windowSelection) {
-            const windowState = this._windowStates.getWindowState(action.floor, action.windowSelection)
-            if (windowState) {
-              for (const flower of windowState.flowers) {
-                this._marketPrices.increase(flower)
-              }
-            }
+          // if windows is already defined: increase price of flowers in that window by 1, otherwise increase 1 least/most expensive flower
+          const windowState = this._windowStates.getWindowState(action.floor ?? 1, action.windowSelection ?? WindowSelection.LEFT)
+          if (windowState) {
+            botAction.flowers = windowState.flowers
+          }
+          else if (action.priceSelection == PriceSelection.MOST_EXPENSIVE) {
+            botAction.flowers = [this._marketPrices.getMostExpensiveFlower()]
+          }
+          else {
+            botAction.flowers = [this._marketPrices.getCheapestFlower()]
+          }
+          for (const flower of botAction.flowers) {
+            this._marketPrices.increase(flower)
           }
           break
       }
@@ -126,5 +133,6 @@ export default class BotActions {
 
 export interface BotAction extends CardAction {
   flower?: Flower
+  flowers?: Flower[]
   vp?: number
 }

tests/unit/services/BotActions.spec.ts

@@ -158,13 +158,36 @@ describe('services/BotActions', () => {
       expect(navigationState.marketPrices.getPrice(Flower.BLUE)).to.eq(4)
     })
 
-    it('window not yet defined - no price changes', () => {
+    it('window not yet defined - falls back to most expensive flower', () => {
       const cardDeck = mockCardDeck({ pile: ['price-1'] })
       cardDeck.draw()
       const windowStates = WindowStates.new()
       const navigationState = mockNavigationState({
         marketPrices: [
-          { flower: Flower.RED, price: 4 },
+          { flower: Flower.RED, price: 3 },
+          { flower: Flower.BLUE, price: 6 },
+        ],
+        windowStates,
+        cardDeck
+      })
+
+      const botActions = new BotActions(navigationState)
+
+      expect(botActions.actions[0].action).to.eq(Action.PRICE)
+      expect(botActions.actions[0].flowers).to.eql([Flower.BLUE])
+      // BLUE was most expensive, increased from 6 to 7
+      expect(navigationState.marketPrices.getPrice(Flower.BLUE)).to.eq(7)
+      expect(navigationState.marketPrices.getPrice(Flower.RED)).to.eq(3)
+    })
+
+    it('window not yet defined - falls back to cheapest flower', () => {
+      const cardDeck = mockCardDeck({ pile: ['price-2'] })
+      cardDeck.draw()
+      const windowStates = WindowStates.new()
+      const navigationState = mockNavigationState({
+        marketPrices: [
+          { flower: Flower.RED, price: 3 },
+          { flower: Flower.BLUE, price: 6 },
         ],
         windowStates,
         cardDeck
@@ -173,7 +196,10 @@ describe('services/BotActions', () => {
       const botActions = new BotActions(navigationState)
 
       expect(botActions.actions[0].action).to.eq(Action.PRICE)
+      expect(botActions.actions[0].flowers).to.eql([Flower.RED])
+      // RED was cheapest, increased from 3 to 4
       expect(navigationState.marketPrices.getPrice(Flower.RED)).to.eq(4)
+      expect(navigationState.marketPrices.getPrice(Flower.BLUE)).to.eq(6)
     })
   })