feat: add enemy escort night battle engagement check

assets/i18n/en-US.json

@@ -47,6 +47,7 @@
   "Next Spot": "Next Spot",
   "last_chosen": "Last chosen: ",
   "smoke": "Smoke screen activated",
+  "escortNightInfo": "Night battle may target the Escort Fleet",
   "A_rank": "A rank",
   "Transport Point": "Transport Point (TP)",
   "Tank Transport Point": "Tank Transport Point (TP)",

assets/i18n/ja-JP.json

@@ -69,6 +69,7 @@
   "Ship parameters include equipment bonus": "装備込みのステータスを表示する",
   "last_chosen": "前の選択：",
   "smoke": "煙幕発動",
+  "escortNightInfo": "随伴艦隊と夜戦の可能性あり",
   "Carrier Task Force": "空母機動部隊",
   "Surface Task Force": "水上打撃部隊",
   "Transport Escort": "輸送護衛部隊",

assets/i18n/ko-KR.json

@@ -48,6 +48,7 @@
   "Not in sortie": "출격중이 아닙니다",
   "last_chosen": "Last chosen: ",
   "smoke": "Smoke screen activated",
+  "escortNightInfo": "야간전 시 호위 함대와 교전할 가능성이 있음",
   "A_rank": "A rank",
   "Transport Point": "Transport Point (TP)",
   "Tank Transport Point": "Tank Transport Point (TP)"

assets/i18n/zh-CN.json

@@ -69,6 +69,7 @@
   "Ship parameters include equipment bonus": "舰娘属性包含装备加成",
   "last_chosen": "上次选择：",
   "smoke": "烟幕发动",
+  "escortNightInfo": "夜战可能与随伴舰队交战",
   "Carrier Task Force": "空母机动部队",
   "Surface Task Force": "水上打击部队",
   "Transport Escort": "输送护卫部队",

assets/i18n/zh-TW.json

@@ -69,6 +69,7 @@
   "Ship parameters include equipment bonus": "艦娘屬性包含裝備加成",
   "last_chosen": "上次選擇：",
   "smoke": "煙幕發動",
+  "escortNightInfo": "夜戰可能與隨伴艦隊交戰",
   "Carrier Task Force": "空母機動部隊",
   "Surface Task Force": "水上打擊部隊",
   "Transport Escort": "輸送護衛部隊",

src/game-handler.ts

@@ -130,6 +130,7 @@ const handleGameResponse = (e: Event): void => {
     result,
     battleForm,
     eFormation,
+    hasEnteredNightBattle,
   } = battleState
   isBaseDefense = false
   let updateFleetStateFromLibBattle = !!battleRef
@@ -146,6 +147,7 @@ const handleGameResponse = (e: Event): void => {
         eventKind,
         result,
         airForce,
+        hasEnteredNightBattle,
       } = initBattleState)
       updateFleetStateFromLibBattle = false
       break
@@ -167,7 +169,7 @@ const handleGameResponse = (e: Event): void => {
       eventId = api_event_id === undefined ? eventId : api_event_id
       eventKind = api_event_kind === undefined ? eventKind : api_event_kind
       mapAreaId = api_maparea_id === undefined ? mapAreaId : api_maparea_id
-      ;({ enemyFleet, enemyEscort, landBase, airForce } = initBattleState)
+      ;({ enemyFleet, enemyEscort, landBase, airForce, hasEnteredNightBattle } = initBattleState)
 
       if (_showAirRaid && api_destruction_battle != null) {
         const destructionBattleArray = Array.isArray(api_destruction_battle)
@@ -349,6 +351,7 @@ const handleGameResponse = (e: Event): void => {
       result,
       battleForm,
       eFormation,
+      hasEnteredNightBattle,
       ...newState,
     }),
   )

src/index.tsx

@@ -48,6 +48,7 @@ export const Prophet: FC = () => {
     airControl,
     isBaseDefense,
     isHeavyBomberDefense,
+    hasEnteredNightBattle,
     sortieState,
     eventId,
     eventKind,
@@ -71,6 +72,7 @@ export const Prophet: FC = () => {
         airControl={airControl}
         isBaseDefense={isBaseDefense}
         isHeavyBomberDefense={isHeavyBomberDefense}
+        hasEnteredNightBattle={hasEnteredNightBattle}
         sortieState={sortieState}
         eventId={eventId}
         eventKind={eventKind}

src/redux.ts

@@ -129,6 +129,7 @@ export const initBattleState: BattleDisplayState = {
   airControl: '',
   isBaseDefense: false,
   isHeavyBomberDefense: false,
+  hasEnteredNightBattle: false,
   sortieState: SortieState.InPort,
   mapAreaId: 0,
   eventId: 0,

src/types.ts

@@ -34,6 +34,7 @@ export interface BattleDisplayState {
   airControl: string
   isBaseDefense: boolean
   isHeavyBomberDefense: boolean
+  hasEnteredNightBattle: boolean
   sortieState: SortieStateValue
   mapAreaId: number
   eventId: number

src/utils/lib-battle-adapter.ts

@@ -245,6 +245,7 @@ export const synthesizeInfo = (
   eFormation: Formation | ''
   fFormation: Formation | ''
   smokeType: number
+  hasEnteredNightBattle: boolean
   result: Result
 } => {
   let mainFleet = _simulator.mainFleet
@@ -273,10 +274,11 @@ export const synthesizeInfo = (
   let fLost = 0
   let eResidule = 0
   let eLost = 0
+  let hasEnteredNightBattle = false
 
   _.each(stages, (stage: Stage | null) => {
     if (stage == null) return
-    const { engagement, aerial, type } = stage
+    const { engagement, aerial, type, subtype } = stage
 
     if (engagement && type === StageType.Engagement) {
       battleForm = engagement.engagement ?? ''
@@ -285,6 +287,8 @@ export const synthesizeInfo = (
       smokeType = engagement.smokeType ?? 0
     }
 
+    if (subtype === StageType.Night) hasEnteredNightBattle = true
+
     if (aerial && type === StageType.Aerial) {
       const { fPlaneInit, fPlaneNow, ePlaneInit, ePlaneNow, control } = aerial
       fResidule = fPlaneNow ?? 0
@@ -324,6 +328,7 @@ export const synthesizeInfo = (
     eFormation,
     fFormation,
     smokeType,
+    hasEnteredNightBattle,
     result,
   }
 }

src/views/battle-info.tsx

@@ -42,6 +42,7 @@ interface BattleInfoProps {
   battleForm?: string
   airControl?: string
   smokeType?: number
+  escortNight?: boolean
 }
 
 const BattleInfo: FC<BattleInfoProps> = ({
@@ -50,6 +51,7 @@ const BattleInfo: FC<BattleInfoProps> = ({
   battleForm = '',
   airControl = '',
   smokeType = 0,
+  escortNight = false,
 }) => {
   const { t } = useTranslation('poi-plugin-prophet')
   return (
@@ -71,6 +73,7 @@ const BattleInfo: FC<BattleInfoProps> = ({
         _t(battleForm),
         _t(airControl),
         ...(smokeType ? [`${t('smoke')}: ${smokeType}`] : []),
+        ...(escortNight ? [t('escortNightInfo')] : []),
       ]).map((text) => (
         <div key={text}>{text}</div>
       ))}

src/views/battle-view-area.tsx

@@ -162,6 +162,7 @@ interface BattleViewAreaProps {
   airControl?: string
   isBaseDefense?: boolean
   isHeavyBomberDefense?: boolean
+  hasEnteredNightBattle: boolean
   sortieState?: SortieStateValue
   eventId?: number
   eventKind?: number
@@ -184,6 +185,7 @@ const BattleViewArea: FC<BattleViewAreaProps> = ({
   airControl = '',
   isBaseDefense,
   isHeavyBomberDefense,
+  hasEnteredNightBattle = false,
   sortieState = SortieState.InPort,
   eventId = 0,
   eventKind = 0,
@@ -307,6 +309,18 @@ const BattleViewArea: FC<BattleViewAreaProps> = ({
       <noscript />
     )
 
+    const checkEnemyNightEngagementFleet = (enemyEscort: (Ship | null)[]): boolean => {
+      let v = 0
+      for (const [idx, ship] of enemyEscort.entries()) {
+        if (!ship || ship.maxHP <= 0 || ship.nowHP <= 0 || ship.hpUnknown) continue
+
+        v +=
+          (ship.nowHP * 4 <= ship.maxHP ? 0 : ship.nowHP * 2 <= ship.maxHP ? 7 : 10) +
+          (idx === 0 ? 10 : 0)
+      }
+      return v >= 30
+    }
+
     const combatInfo = (
       <ProphetInfo>
         <CombatTitle>
@@ -367,6 +381,9 @@ const BattleViewArea: FC<BattleViewAreaProps> = ({
         battleForm={battleForm}
         airControl={airControl}
         smokeType={smokeType}
+        escortNight={
+          !hasEnteredNightBattle && checkEnemyNightEngagementFleet(enemyEscort)
+        }
       />
     )