5th floor delivery billboard marker

Author: stefanseifert

src/components/round/botAction/ActionDelivery.vue

@@ -3,13 +3,14 @@
     <template #action>
       <div class="action">
         <AppIcon type="action" name="delivery" class="icon"/>:
-        <div class="windowSelection">{{action.floor}}{{action.windowSelection?.toUpperCase()}}</div>
+        <div class="windowSelection">{{floor}}{{floor < 5 ? action.windowSelection?.toUpperCase() : ''}}</div>
       </div>
     </template>
     <template #instruction>
       <p>
         <span v-html="t('rules.action.delivery.selectWindow')"></span><br/>
-        <span class="fw-bold" v-html="t('rules.action.delivery.selectedWindow', {floor:action.floor,selection:t(`windowSelection.${action.windowSelection}`)})"></span><br/>
+        <span v-if="floor < 5" class="fw-bold" v-html="t('rules.action.delivery.selectedWindow', {floor,selection:t(`windowSelection.${action.windowSelection}`)})"></span>
+        <span v-else class="fw-bold" v-html="t('rules.action.delivery.selectedWindowFloorOnly', {floor})"></span><br/>
         <FlowerIcon v-for="flower in action.flowers ?? []" :key="flower" :flower="flower"/>
       </p>
       <p v-html="t('rules.action.delivery.gainVPandXP', {vp:action.vp})"/>
@@ -53,6 +54,11 @@ export default defineComponent({
       required: false
     }
   },
+  computed: {
+    floor(): number {
+      return this.action.floor ?? 1
+    }
+  },
   mounted() {
     this.$emit('ready')
   }

src/locales/en.json

@@ -124,6 +124,7 @@
         "title": "Delivery",
         "selectWindow": "Lady Pei delivers to a window with the most matching flowers (ignoring missing flowers, if required):",
         "selectedWindow": "Floor {floor}, Window: {selection}",
+        "selectedWindowFloorOnly": "Floor {floor}",
         "gainVPandXP": "Lady Pei earns <b>{vp} VP</b> and 1 XP for each color used in the Window Box.",
         "placeMarker": "Place a marker from Lady Pei in the window above the box."
       },

src/services/BillboardMarkers.ts

@@ -1,6 +1,8 @@
 import { cloneDeep } from 'lodash'
 import { BillboardMarker } from '@/store/state'
 import { ref } from 'vue'
+import Player from './enum/Player'
+import WindowStates from './WindowStates'
 
 /**
  * Manages billboard markers per floor.
@@ -22,6 +24,29 @@ export default class BillboardMarkers {
     }
   }
 
+/**
+   * Adds a billboard marker to the floor (1-4) with the fewest total markers.
+   * Total markers per floor = bot deliveries across all windows on that floor + billboard markers.
+   * Ties are broken by choosing the highest floor.
+   * @returns the chosen floor number
+   */
+  public addMarkerToFloorWithLeastMarkers(windowStates: WindowStates) : number {
+    let bestFloor = 4
+    let bestCount = Infinity
+    for (let floor = 1; floor <= 4; floor++) {
+      const botDeliveries = windowStates.windowStates
+        .filter(w => w.floor === floor)
+        .reduce((sum, w) => sum + w.deliveries.filter(d => d === Player.BOT).length, 0)
+      const total = botDeliveries + this.getMarkerCount(floor)
+      if (total <= bestCount) {
+        bestCount = total
+        bestFloor = floor
+      }
+    }
+    this.addMarker(bestFloor)
+    return bestFloor
+  }
+
   public getMarkerCount(floor: number) : number {
     return this._markers.value.find(m => m.floor === floor)?.count ?? 0
   }

src/services/BotActions.ts

@@ -26,6 +26,7 @@ export default class BotActions {
   private readonly _billboardMarkers : BillboardMarkers
   private readonly _season : Season
   private readonly _actions : BotAction[]
+  private readonly _additionalActions : BotAction[] = []
 
   public constructor(navigationState: NavigationState) {
     this._marketPrices = navigationState.marketPrices
@@ -39,7 +40,7 @@ export default class BotActions {
   }
 
   public get actions(): readonly BotAction[] {
-    return this._actions
+    return [...this._actions, ...this._additionalActions]
   }
 
   /**
@@ -185,6 +186,12 @@ export default class BotActions {
       botAction.vp = this.getVPFromMatchingFlowers(window.flowers, currentSeasonFlowers)
       botAction.xp = window.flowers.filter(flower => currentSeasonFlowers.includes(flower))
       this._windowStates.addDelivery(window.floor, window.windowSelection, Player.BOT)
+
+      // on 5th floor: also add billboard marker to floor with least total markers
+      if (botAction.floor === 5) {
+        const billboardFloor = this._billboardMarkers.addMarkerToFloorWithLeastMarkers(this._windowStates)
+        this._additionalActions.push({ action: Action.BILLBOARD, floor: billboardFloor })
+      }
       return true
     }
     return false

tests/unit/services/BillboardMarkers.spec.ts

@@ -1,4 +1,8 @@
 import BillboardMarkers from '@/services/BillboardMarkers'
+import Player from '@/services/enum/Player'
+import WindowSelection from '@/services/enum/WindowSelection'
+import WindowStates from '@/services/WindowStates'
+import { WindowState } from '@/store/state'
 import { expect } from 'chai'
 
 describe('services/BillboardMarkers', () => {
@@ -69,4 +73,95 @@ describe('services/BillboardMarkers', () => {
     expect(markers.getMarkerCount(2)).to.eq(2)
   })
 
+  it('addMarkerToFloorWithLeastMarkers - all empty', () => {
+    const markers = BillboardMarkers.new()
+    const windowStates = WindowStates.fromPersistence([])
+
+    const floor = markers.addMarkerToFloorWithLeastMarkers(windowStates)
+
+    // all floors tied at 0, highest floor wins
+    expect(floor).to.eq(4)
+    expect(markers.getMarkerCount(4)).to.eq(1)
+  })
+
+  it('addMarkerToFloorWithLeastMarkers - billboard markers only', () => {
+    const markers = BillboardMarkers.fromPersistence([
+      { floor: 3, count: 2 },
+      { floor: 4, count: 1 }
+    ])
+    const windowStates = WindowStates.fromPersistence([])
+
+    const floor = markers.addMarkerToFloorWithLeastMarkers(windowStates)
+
+    // floor 1=0, floor 2=0 → tied, highest floor wins → floor 2
+    expect(floor).to.eq(2)
+    expect(markers.getMarkerCount(2)).to.eq(1)
+  })
+
+  it('addMarkerToFloorWithLeastMarkers - bot deliveries counted', () => {
+    const markers = BillboardMarkers.new()
+    const windows: WindowState[] = [
+      { floor: 2, windowSelection: WindowSelection.LEFT, flowers: [], deliveries: [Player.BOT, Player.BOT] },
+      { floor: 2, windowSelection: WindowSelection.RIGHT, flowers: [], deliveries: [Player.BOT] },
+      { floor: 3, windowSelection: WindowSelection.LEFT, flowers: [], deliveries: [Player.BOT] }
+    ]
+    const windowStates = WindowStates.fromPersistence(windows)
+
+    const floor = markers.addMarkerToFloorWithLeastMarkers(windowStates)
+
+    // floor 1=0, floor 2=3, floor 3=1, floor 4=0 → tied 1&4 at 0, highest wins → floor 4
+    expect(floor).to.eq(4)
+    expect(markers.getMarkerCount(4)).to.eq(1)
+  })
+
+  it('addMarkerToFloorWithLeastMarkers - only bot deliveries count, not player', () => {
+    const markers = BillboardMarkers.new()
+    const windows: WindowState[] = [
+      { floor: 4, windowSelection: WindowSelection.LEFT, flowers: [], deliveries: [Player.PLAYER, Player.PLAYER] },
+      { floor: 3, windowSelection: WindowSelection.LEFT, flowers: [], deliveries: [Player.BOT] }
+    ]
+    const windowStates = WindowStates.fromPersistence(windows)
+
+    const floor = markers.addMarkerToFloorWithLeastMarkers(windowStates)
+
+    // floor 1=0, floor 2=0, floor 3=1, floor 4=0 (player deliveries not counted)
+    // tied 1,2,4 at 0, highest wins → floor 4
+    expect(floor).to.eq(4)
+  })
+
+  it('addMarkerToFloorWithLeastMarkers - combined markers and deliveries', () => {
+    const markers = BillboardMarkers.fromPersistence([
+      { floor: 1, count: 1 },
+      { floor: 4, count: 2 }
+    ])
+    const windows: WindowState[] = [
+      { floor: 2, windowSelection: WindowSelection.LEFT, flowers: [], deliveries: [Player.BOT, Player.BOT] },
+      { floor: 3, windowSelection: WindowSelection.LEFT, flowers: [], deliveries: [Player.BOT] }
+    ]
+    const windowStates = WindowStates.fromPersistence(windows)
+
+    const floor = markers.addMarkerToFloorWithLeastMarkers(windowStates)
+
+    // floor 1=1, floor 2=2, floor 3=1, floor 4=2 → tied 1&3 at 1, highest wins → floor 3
+    expect(floor).to.eq(3)
+    expect(markers.getMarkerCount(3)).to.eq(1)
+  })
+
+  it('addMarkerToFloorWithLeastMarkers - ignores floor 5', () => {
+    const markers = BillboardMarkers.new()
+    const windows: WindowState[] = [
+      { floor: 1, windowSelection: WindowSelection.LEFT, flowers: [], deliveries: [Player.BOT] },
+      { floor: 2, windowSelection: WindowSelection.LEFT, flowers: [], deliveries: [Player.BOT] },
+      { floor: 3, windowSelection: WindowSelection.LEFT, flowers: [], deliveries: [Player.BOT] },
+      { floor: 4, windowSelection: WindowSelection.LEFT, flowers: [], deliveries: [Player.BOT] },
+      { floor: 5, windowSelection: WindowSelection.LEFT, flowers: [], deliveries: [] }
+    ]
+    const windowStates = WindowStates.fromPersistence(windows)
+
+    const floor = markers.addMarkerToFloorWithLeastMarkers(windowStates)
+
+    // all floors 1-4 tied at 1, highest wins → floor 4 (not floor 5)
+    expect(floor).to.eq(4)
+  })
+
 })

tests/unit/services/BotActions.spec.ts

@@ -725,18 +725,89 @@ describe('services/BotActions', () => {
         ]
       })
       const windowStates = WindowStates.new()
+      const billboardMarkers = BillboardMarkers.new()
       // floor 5 already has all 5 flowers defined by default
       const navigationState = mockNavigationState({
         season: Season.AUTUMN,
         garden,
         windowStates,
+        billboardMarkers,
         cardDeck
       })
 
       const botActions = new BotActions(navigationState)
 
       const action = botActions.actions[0]
       expect(action.vp).to.eq(16) // 5 matches → 16 VP
+      // 5th floor delivery triggers additional billboard marker
+      expect(botActions.actions.length).to.eq(2)
+      expect(botActions.actions[1].action).to.eq(Action.BILLBOARD)
+    })
+
+    it('5th floor delivery adds billboard marker to floor with least total markers', () => {
+      const cardDeck = mockCardDeck({ pile: ['delivery-1'] })
+      cardDeck.draw()
+      const garden = mockBotGarden({
+        seasons: [
+          { season: Season.AUTUMN, flowers: [Flower.ORANGE, Flower.BLUE, Flower.YELLOW, Flower.PURPLE, Flower.RED] }
+        ]
+      })
+      const windowStates = WindowStates.new()
+      // add bot deliveries so floors 3 and 4 have markers
+      windowStates.setWindowState(3, WindowSelection.LEFT, [Flower.RED, Flower.BLUE, Flower.PURPLE], [Player.BOT, Player.BOT])
+      windowStates.setWindowState(4, WindowSelection.LEFT, [Flower.RED, Flower.BLUE, Flower.PURPLE, Flower.YELLOW], [Player.BOT])
+      const billboardMarkers = BillboardMarkers.fromPersistence([
+        { floor: 1, count: 1 },
+        { floor: 2, count: 1 }
+      ])
+      const navigationState = mockNavigationState({
+        season: Season.AUTUMN,
+        garden,
+        windowStates,
+        billboardMarkers,
+        cardDeck
+      })
+
+      const botActions = new BotActions(navigationState)
+
+      // floor totals: 1=1, 2=1, 3=2, 4=1 → tied at 1: floors 1,2,4 → highest wins → floor 4
+      expect(botActions.actions.length).to.eq(2)
+      expect(botActions.actions[0].action).to.eq(Action.DELIVERY)
+      expect(botActions.actions[0].floor).to.eq(5)
+      expect(botActions.actions[1].action).to.eq(Action.BILLBOARD)
+      expect(botActions.actions[1].floor).to.eq(4)
+      expect(billboardMarkers.getMarkerCount(4)).to.eq(1)
+    })
+
+    it('non-5th floor delivery does not add billboard marker', () => {
+      const cardDeck = mockCardDeck({ pile: ['delivery-1'] })
+      cardDeck.draw()
+      const garden = mockBotGarden({
+        seasons: [
+          { season: Season.AUTUMN, flowers: [Flower.RED, Flower.BLUE] }
+        ]
+      })
+      const windowStates = WindowStates.new()
+      windowStates.setWindowState(2, WindowSelection.LEFT, [Flower.RED, Flower.BLUE], [])
+      const billboardMarkers = BillboardMarkers.new()
+      const navigationState = mockNavigationState({
+        season: Season.AUTUMN,
+        garden,
+        windowStates,
+        billboardMarkers,
+        cardDeck
+      })
+
+      const botActions = new BotActions(navigationState)
+
+      expect(botActions.actions.length).to.eq(1)
+      expect(botActions.actions[0].action).to.eq(Action.DELIVERY)
+      expect(botActions.actions[0].floor).to.eq(2)
+      // no additional billboard action
+      expect(billboardMarkers.getMarkerCount(1)).to.eq(0)
+      expect(billboardMarkers.getMarkerCount(2)).to.eq(0)
+      expect(billboardMarkers.getMarkerCount(3)).to.eq(0)
+      expect(billboardMarkers.getMarkerCount(4)).to.eq(0)
     })
 
     it('sets VP to 0 when no flowers match', () => {