chore: kongo class sp attack can be used twice in one sortie

poooi · Mar 28, 2022 · 160ee72 · 160ee72
1 parent cb60df7
commit 160ee72
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/views/components/ship/index.es b/views/components/ship/index.es
@@ -63,14 +63,14 @@ const fleetShipViewDataSelectorFactory = memoize((fleetId) =>
     [
       fleetShipsIdSelectorFactory(fleetId),
       fleetShipsDataWithEscapeSelectorFactory(fleetId),
-      (state) => get(state.sortie, 'spAttackUsed'),
+      (state) => get(state.sortie, 'spAttackCount'),
       (state) => get(state.info, 'useitems.95.api_count'),
       (state) => get(state.sortie, 'combinedFlag'),
     ],
-    (shipsId, shipsData, spAttackUsed, submarineSupplyCount, combinedFlag) => ({
+    (shipsId, shipsData, spAttackCount, submarineSupplyCount, combinedFlag) => ({
       shipsId,
       isSpAttack: isSpAttackAvailable(shipsData, {
-        spAttackUsed,
+        spAttackCount,
         submarineSupplyCount,
         combinedFlag,
         fleetId,

diff --git a/views/redux/sortie/index.es b/views/redux/sortie/index.es
@@ -21,7 +21,7 @@ const initState = {
   spotHistory: [],
   item: null,
   itemHistory: [],
-  spAttackUsed: false,
+  spAttackCount: 0,
 }
 
 const ensureArray = (x) => (isArray(x) ? x : [x])
@@ -67,7 +67,7 @@ export function reducer(state = initState, { type, path, postBody, body }) {
         spotHistory: [],
         item: null,
         itemHistory: [],
-        spAttackUsed: false,
+        spAttackCount: 0,
       }
 
     case '@@Response/kcsapi/api_req_sortie/battleresult':
@@ -169,7 +169,7 @@ export function reducer(state = initState, { type, path, postBody, body }) {
   ) {
     return {
       ...state,
-      spAttackUsed: true,
+      spAttackCount: state.spAttackCount + 1,
     }
   }
   return state

diff --git a/views/utils/sp_attack.es b/views/utils/sp_attack.es
@@ -6,7 +6,7 @@ const overNotLessThan =
   (...data) =>
     funcs.map((func) => func(...data)).filter((result) => result).length >= n
 
-const isSpAttackNotUsed = (shipsData, extraData) => !extraData.spAttackUsed
+const isSpAttackLessThan = (count) => (shipsData, extraData) => extraData.spAttackCount < count
 
 const hasSubmarineSupply = (shipsData, extraData) => extraData.submarineSupplyCount > 0
 
@@ -67,7 +67,7 @@ const isKirishimaKaiNi = shipIdIs(152)
 const isWarspite = _.overSome([shipIdIs(364), shipIdIs(439)])
 
 const isNelsonSpAttack = _.overEvery([
-  isSpAttackNotUsed,
+  isSpAttackLessThan(1),
   isFullFleet,
   overShip(0)(_.overEvery([isNelson, isNotMidDmg])),
   overShip(1)(isNotSub),
@@ -78,7 +78,7 @@ const isNelsonSpAttack = _.overEvery([
 ])
 
 const isNagatoSpAttack = _.overEvery([
-  isSpAttackNotUsed,
+  isSpAttackLessThan(1),
   isFullFleet,
   overShip(0)(_.overEvery([isNagatoKaiNi, isNotMidDmg])),
   overShip(1)(_.overEvery([isBattleShip, isNotHeavyDmg])),
@@ -89,7 +89,7 @@ const isNagatoSpAttack = _.overEvery([
 ])
 
 const isMutsuSpAttack = _.overEvery([
-  isSpAttackNotUsed,
+  isSpAttackLessThan(1),
   isFullFleet,
   overShip(0)(_.overEvery([isMutsuKaiNi, isNotMidDmg])),
   overShip(1)(_.overEvery([isBattleShip, isNotHeavyDmg])),
@@ -100,7 +100,7 @@ const isMutsuSpAttack = _.overEvery([
 ])
 
 const isColoradoSpAttack = _.overEvery([
-  isSpAttackNotUsed,
+  isSpAttackLessThan(1),
   isFullFleet,
   overShip(0)(_.overEvery([isColorado, isNotMidDmg])),
   overShip(1)(_.overEvery([isBattleShip, isNotHeavyDmg])),
@@ -111,7 +111,7 @@ const isColoradoSpAttack = _.overEvery([
 ])
 
 const isKongoClassKaiNiCSpAttack = _.overEvery([
-  isSpAttackNotUsed,
+  isSpAttackLessThan(2),
   isFleetWith5NonSubs,
   _.overSome([
     _.overEvery([