condition delivering to 5th floor

Author: stefanseifert

src/services/WindowStates.ts

@@ -57,6 +57,8 @@ export default class WindowStates {
   public getBestMatchingDeliveryWindow(flowers: Flower[]) : WindowState|undefined {
     // get all defined windows that are not fully delivered yet, already ordered in bot's priority
     const windows = this._windowStates.value.filter(w => w.deliveries.length < 4)
+      // do not deliver to the 5th Floor unless match at least two flowers
+      .filter(w => w.floor < 5 || flowers.length >= 2)
       .toSorted((a, b) => {
         const matchA = getFlowerMatchCount(a.flowers, flowers)
         const matchB = getFlowerMatchCount(b.flowers, flowers)

tests/unit/services/BotActions.spec.ts

@@ -755,10 +755,9 @@ describe('services/BotActions', () => {
       const botActions = new BotActions(navigationState)
 
       const action = botActions.actions[0]
-      // floor 1 has RED, garden has YELLOW → 0 matches but floor 5 might be better
-      // floor 5 has all 5 flowers, garden has YELLOW → 1 match → 2 VP
-      // Actually the best match is floor 5 (1 match vs floor 1 with 0 match)
-      expect(action.vp).to.eq(2)
+      // floor 1 has RED, garden has YELLOW → 0 matches
+      // floor 5 is excluded because only 1 flower available (needs >= 2)
+      expect(action.vp).to.eq(0)
     })
 
     it('XP only includes flowers present in current season', () => {

tests/unit/services/WindowStates.spec.ts

@@ -249,6 +249,55 @@ describe('services/WindowStates', () => {
     expect(result?.windowSelection).to.eq(WindowSelection.LEFT)
   })
 
+  it('getBestMatchingDeliveryWindow-skips5thFloorWithSingleFlower', () => {
+    const dw = WindowStates.fromPersistence([
+      { floor: 5, windowSelection: WindowSelection.LEFT, flowers: [Flower.ORANGE, Flower.BLUE, Flower.YELLOW, Flower.PURPLE, Flower.RED], deliveries: [] },
+      { floor: 2, windowSelection: WindowSelection.LEFT, flowers: [Flower.RED, Flower.BLUE], deliveries: [] }
+    ])
+
+    // only 1 flower → 5th floor should be skipped, picks floor 2
+    const result = dw.getBestMatchingDeliveryWindow([Flower.RED])
+
+    expect(result?.floor).to.eq(2)
+    expect(result?.windowSelection).to.eq(WindowSelection.LEFT)
+  })
+
+  it('getBestMatchingDeliveryWindow-allows5thFloorWithTwoFlowers', () => {
+    const dw = WindowStates.fromPersistence([
+      { floor: 5, windowSelection: WindowSelection.LEFT, flowers: [Flower.ORANGE, Flower.BLUE, Flower.YELLOW, Flower.PURPLE, Flower.RED], deliveries: [] },
+      { floor: 2, windowSelection: WindowSelection.LEFT, flowers: [Flower.RED, Flower.BLUE], deliveries: [] }
+    ])
+
+    // 2 flowers → 5th floor is allowed, both match 2, floor 2 has 0 missing vs floor 5 has 3 missing → floor 2 wins
+    const result = dw.getBestMatchingDeliveryWindow([Flower.RED, Flower.BLUE])
+
+    expect(result?.floor).to.eq(2)
+    expect(result?.windowSelection).to.eq(WindowSelection.LEFT)
+  })
+
+  it('getBestMatchingDeliveryWindow-skips5thFloorWithSingleFlower-noOtherWindows', () => {
+    const dw = WindowStates.fromPersistence([
+      { floor: 5, windowSelection: WindowSelection.LEFT, flowers: [Flower.ORANGE, Flower.BLUE, Flower.YELLOW, Flower.PURPLE, Flower.RED], deliveries: [] }
+    ])
+
+    // only 1 flower and only 5th floor available → no match
+    const result = dw.getBestMatchingDeliveryWindow([Flower.RED])
+
+    expect(result).to.be.undefined
+  })
+
+  it('getBestMatchingDeliveryWindow-allows5thFloorWithTwoFlowers-only5thFloor', () => {
+    const dw = WindowStates.fromPersistence([
+      { floor: 5, windowSelection: WindowSelection.LEFT, flowers: [Flower.ORANGE, Flower.BLUE, Flower.YELLOW, Flower.PURPLE, Flower.RED], deliveries: [] }
+    ])
+
+    // 2 flowers and only 5th floor → 5th floor is allowed
+    const result = dw.getBestMatchingDeliveryWindow([Flower.RED, Flower.BLUE])
+
+    expect(result?.floor).to.eq(5)
+    expect(result?.windowSelection).to.eq(WindowSelection.LEFT)
+  })
+
   it('getBestMatchingUndefinedWindow-picksHighestUndefined', () => {
     // only floor 5 left is defined, all others undefined
     const dw = WindowStates.new()