FIX: Wrong ubncard calculation for custom ubn setup

Author: on3iro

src/Redux/Store/Expeditions/Expeditions/sideEffects/createBattle/__test__/getUpgradedBasicNemesisCardsResult.test.ts

@@ -1,3 +1,4 @@
+import * as types from 'aer-types'
 import { getRandomEntity } from 'Redux/helpers'
 
 import { getUpgradedBasicNemesisCardsResult } from '../getUpgradedBasicNemesisCardsResult'
@@ -75,7 +76,7 @@ describe('getUpgradedBasicNemesisCardsResult()', () => {
         },
       },
       [],
-      ['a', 'b'],
+      [],
       getRandomEntity,
       inputSeed
     )
@@ -86,4 +87,69 @@ describe('getUpgradedBasicNemesisCardsResult()', () => {
 
     spy.mockRestore()
   })
+
+  test("previousNemesisIds should still exist if type is regular'", () => {
+    const spy = jest.spyOn(
+      rollNewUpgradedNemesisCardsModule,
+      'rollNewUpgradedNemesisCards'
+    )
+
+    const inputSeed = { seed: 'test', state: true }
+    const result = getUpgradedBasicNemesisCardsResult(
+      {
+        tier: 2,
+        newUBNCards: { type: 'regular', addRandom: true },
+        treasure: {
+          hasTreasure: false,
+        },
+      },
+      [
+        {
+          id: 'TESTA',
+          name: 'Test A',
+          expansion: 'AE',
+          tier: 2,
+          type: 'Attack',
+          upgraded: true,
+        } as types.UpgradedBasicNemesisCard,
+      ],
+      ['a', 'b'],
+      getRandomEntity,
+      inputSeed
+    )
+
+    expect(result.result).toEqual(['a', 'b', 'TESTA'])
+    expect(result.seed).not.toEqual(inputSeed)
+    expect(spy).toHaveBeenCalled()
+
+    spy.mockRestore()
+  })
+
+  test("previousNemesisIds should still exist if type is custom'", () => {
+    const spy = jest.spyOn(
+      rollNewUpgradedNemesisCardsModule,
+      'rollNewUpgradedNemesisCards'
+    )
+
+    const inputSeed = { seed: 'test', state: true }
+    const result = getUpgradedBasicNemesisCardsResult(
+      {
+        tier: 2,
+        newUBNCards: { type: 'custom', ids: ['Wreck', 'NeedleDoom'] },
+        treasure: {
+          hasTreasure: false,
+        },
+      },
+      [],
+      ['a', 'b'],
+      getRandomEntity,
+      inputSeed
+    )
+
+    expect(result.result).toEqual(['a', 'b', 'Wreck', 'NeedleDoom'])
+    expect(result.seed).toEqual(inputSeed)
+    expect(spy).not.toHaveBeenCalled()
+
+    spy.mockRestore()
+  })
 })

src/Redux/Store/Expeditions/Expeditions/sideEffects/createBattle/getUpgradedBasicNemesisCardsResult.ts

@@ -21,7 +21,7 @@ export const getUpgradedBasicNemesisCardsResult = (
       : { result: previousUpgradedBasicNemesisCards, seed }
   } else if (config.newUBNCards.type === 'custom') {
     return {
-      result: config.newUBNCards.ids,
+      result: [...previousUpgradedBasicNemesisCards, ...config.newUBNCards.ids],
       seed,
     }
   }