fleethub-core 1.7.13 → 1.8.2

package/pkg/fleethub_core.d.ts

@@ -1,199 +1,89 @@
 /* tslint:disable */
 /* eslint-disable */
+/**
+ * @param {ShipConditions} value
+ * @returns {ShipConditions}
+ */
+export function parse_ship_conditions(value: ShipConditions): ShipConditions;
 /**
  */
 export function set_panic_hook(): void;
-declare namespace ShipType {
-  export type Unknown = "Unknown";
-  export type DE = "DE";
-  export type DD = "DD";
-  export type CL = "CL";
-  export type CLT = "CLT";
-  export type CA = "CA";
-  export type CAV = "CAV";
-  export type CVL = "CVL";
-  export type FBB = "FBB";
-  export type BB = "BB";
-  export type BBV = "BBV";
-  export type CV = "CV";
-  export type XBB = "XBB";
-  export type SS = "SS";
-  export type SSV = "SSV";
-  export type AP = "AP";
-  export type AV = "AV";
-  export type LHA = "LHA";
-  export type CVB = "CVB";
-  export type AR = "AR";
-  export type AS = "AS";
-  export type CT = "CT";
-  export type AO = "AO";
+export interface ShipConditions extends ShipPosition {
+  formation?: Formation;
 }
 
-export type ShipType =
-  | ShipType.Unknown
-  | ShipType.DE
-  | ShipType.DD
-  | ShipType.CL
-  | ShipType.CLT
-  | ShipType.CA
-  | ShipType.CAV
-  | ShipType.CVL
-  | ShipType.FBB
-  | ShipType.BB
-  | ShipType.BBV
-  | ShipType.CV
-  | ShipType.XBB
-  | ShipType.SS
-  | ShipType.SSV
-  | ShipType.AP
-  | ShipType.AV
-  | ShipType.LHA
-  | ShipType.CVB
-  | ShipType.AR
-  | ShipType.AS
-  | ShipType.CT
-  | ShipType.AO;
-
-declare namespace ShipCategory {
-  export type Battleship = "Battleship";
-  export type AircraftCarrier = "AircraftCarrier";
-  export type HeavyCruiser = "HeavyCruiser";
-  export type LightCruiser = "LightCruiser";
-  export type Destroyer = "Destroyer";
-  export type CoastalDefenseShip = "CoastalDefenseShip";
-  export type Submarine = "Submarine";
-  export type AuxiliaryShip = "AuxiliaryShip";
+export interface BattleDefinitions {
+  formation: Record<Formation, NestedFormationDef>;
+  anti_air_cutin: Record<number, AntiAirCutinDef>;
+  day_cutin: Record<DayCutin, DayCutinDef>;
+  night_cutin: Record<NightCutin, NightCutinDef>;
 }
 
-export type ShipCategory =
-  | ShipCategory.Battleship
-  | ShipCategory.AircraftCarrier
-  | ShipCategory.HeavyCruiser
-  | ShipCategory.LightCruiser
-  | ShipCategory.Destroyer
-  | ShipCategory.CoastalDefenseShip
-  | ShipCategory.Submarine
-  | ShipCategory.AuxiliaryShip;
-
-declare namespace ShipAttr {
-  export type Unknown = "Unknown";
-  export type Abyssal = "Abyssal";
-  export type NightCarrier = "NightCarrier";
-  export type Installation = "Installation";
-  export type RoyalNavy = "RoyalNavy";
-  export type Kai2 = "Kai2";
-  export type TurbineSpeedBonus = "TurbineSpeedBonus";
-  export type Pillbox = "Pillbox";
-  export type IsolatedIsland = "IsolatedIsland";
-  export type HarbourSummerPrincess = "HarbourSummerPrincess";
-  export type SupplyDepot = "SupplyDepot";
-  export type PtImp = "PtImp";
-  export type BattleshipSummerPrincess = "BattleshipSummerPrincess";
-  export type HeavyCruiserSummerPrincess = "HeavyCruiserSummerPrincess";
+export interface NightCutinDef {
+  tag: NightCutin;
+  hits: number;
+  type_factor: number | null;
+  power_mod: number | null;
+  accuracy_mod: number | null;
 }
 
-export type ShipAttr =
-  | ShipAttr.Unknown
-  | ShipAttr.Abyssal
-  | ShipAttr.NightCarrier
-  | ShipAttr.Installation
-  | ShipAttr.RoyalNavy
-  | ShipAttr.Kai2
-  | ShipAttr.TurbineSpeedBonus
-  | ShipAttr.Pillbox
-  | ShipAttr.IsolatedIsland
-  | ShipAttr.HarbourSummerPrincess
-  | ShipAttr.SupplyDepot
-  | ShipAttr.PtImp
-  | ShipAttr.BattleshipSummerPrincess
-  | ShipAttr.HeavyCruiserSummerPrincess;
-
-declare namespace FleetCutin {
-  export type NelsonTouch = "NelsonTouch";
-  export type NagatoClassCutin = "NagatoClassCutin";
-  export type ColoradoClassCutin = "ColoradoClassCutin";
-  export type KongouClassCutin = "KongouClassCutin";
-  export type Yamato2ShipCutin = "Yamato2ShipCutin";
-  export type Yamato3ShipCutin = "Yamato3ShipCutin";
+export interface DayCutinDef {
+  tag: DayCutin;
+  hits: number;
+  type_factor: number | null;
+  power_mod: number | null;
+  accuracy_mod: number | null;
 }
 
-export type FleetCutin =
-  | FleetCutin.NelsonTouch
-  | FleetCutin.NagatoClassCutin
-  | FleetCutin.ColoradoClassCutin
-  | FleetCutin.KongouClassCutin
-  | FleetCutin.Yamato2ShipCutin
-  | FleetCutin.Yamato3ShipCutin;
-
-declare namespace AirStateRank {
-  export type Rank0 = "Rank0";
-  export type Rank1 = "Rank1";
-  export type Rank2 = "Rank2";
-  export type Rank3 = "Rank3";
+export interface AntiAirCutinDef {
+  id: number;
+  type_factor: number | null;
+  multiplier: number | null;
+  guaranteed: number | null;
+  sequential: boolean | null;
 }
 
-export type AirStateRank =
-  | AirStateRank.Rank0
-  | AirStateRank.Rank1
-  | AirStateRank.Rank2
-  | AirStateRank.Rank3;
-
-declare namespace AirState {
-  export type AirSupremacy = "AirSupremacy";
-  export type AirSuperiority = "AirSuperiority";
-  export type AirParity = "AirParity";
-  export type AirDenial = "AirDenial";
-  export type AirIncapability = "AirIncapability";
+type __NestedFormationDefFormationDef = FormationDef;
+declare namespace NestedFormationDef {
+  export type Normal = __NestedFormationDefFormationDef;
+  export type Vanguard = {
+    top_half: __NestedFormationDefFormationDef;
+    bottom_half: __NestedFormationDefFormationDef;
+  };
 }
 
-export type AirState =
-  | AirState.AirSupremacy
-  | AirState.AirSuperiority
-  | AirState.AirParity
-  | AirState.AirDenial
-  | AirState.AirIncapability;
-
-export interface MasterIBonuses {
-  shelling_power: MasterIBonusRule[];
-  carrier_shelling_power: MasterIBonusRule[];
-  shelling_accuracy: MasterIBonusRule[];
-  torpedo_power: MasterIBonusRule[];
-  torpedo_accuracy: MasterIBonusRule[];
-  torpedo_evasion: MasterIBonusRule[];
-  asw_power: MasterIBonusRule[];
-  asw_accuracy: MasterIBonusRule[];
-  night_power: MasterIBonusRule[];
-  night_accuracy: MasterIBonusRule[];
-  defense_power: MasterIBonusRule[];
-  contact_selection: MasterIBonusRule[];
-  fighter_power: MasterIBonusRule[];
-  ship_anti_air: MasterIBonusRule[];
-  fleet_anti_air: MasterIBonusRule[];
-  elos: MasterIBonusRule[];
-}
+export type NestedFormationDef =
+  | NestedFormationDef.Normal
+  | NestedFormationDef.Vanguard;
 
-export interface MasterIBonusRule {
-  expr: CompiledEvaler;
-  formula: CompiledEvaler;
+export interface FormationDef {
+  tag: Formation;
+  protection_rate: number | null;
+  fleet_anti_air_mod: number;
+  shelling: FormationCombatModifiersDef;
+  torpedo: FormationCombatModifiersDef;
+  asw: FormationCombatModifiersDef;
+  night: FormationCombatModifiersDef;
+  support_shelling: FormationCombatModifiersDef;
 }
 
-export interface FleetCutinAnalysis {
-  shelling: FleetCutinInfo[];
-  night: FleetCutinInfo[];
+export interface FormationCombatModifiersDef {
+  power_mod?: number;
+  accuracy_mod?: number;
+  evasion_mod?: number;
 }
 
-export interface FleetCutinInfo {
-  cutin: FleetCutin;
-  rate: number | null;
-  formation: Formation;
-  items: FleetCutinInfoItem[];
+export interface SupportShellingSimulatorParams {
+  attacker_formation?: Formation;
+  target_formation?: Formation;
+  engagement: Engagement;
 }
 
-export interface FleetCutinInfoItem {
-  ship_id: number;
-  cutin: FleetCutin;
-  fleet_cutin_mod: number;
-  stats: AttackStats;
+export interface ShipAnalyzerConfig {
+  air_state?: AirState;
+  engagement?: Engagement;
+  left?: AttackAnalyzerShipConfig;
+  right?: AttackAnalyzerShipConfig;
 }
 
 declare namespace SpecialEnemyType {
@@ -219,46 +109,113 @@ export type SpecialEnemyType =
   | SpecialEnemyType.BattleshipSummerPrincess
   | SpecialEnemyType.HeavyCruiserSummerPrincess;
 
-declare namespace MoraleState {
-  export type Sparkle = "Sparkle";
-  export type Normal = "Normal";
-  export type Orange = "Orange";
-  export type Red = "Red";
+type __NightCutinLikeFleetCutin = FleetCutin;
+type __NightCutinLikeNightCutin = NightCutin;
+declare namespace NightCutinLike {
+  export type NightCutin = __NightCutinLikeNightCutin;
+  export type FleetCutin = __NightCutinLikeFleetCutin;
 }
 
-export type MoraleState =
-  | MoraleState.Sparkle
-  | MoraleState.Normal
-  | MoraleState.Orange
-  | MoraleState.Red;
+export type NightCutinLike =
+  | NightCutinLike.NightCutin
+  | NightCutinLike.FleetCutin;
 
-declare namespace DamageState {
-  export type Normal = "Normal";
-  export type Shouha = "Shouha";
-  export type Chuuha = "Chuuha";
-  export type Taiha = "Taiha";
-  export type Sunk = "Sunk";
+type __DayCutinLikeDayCutin = DayCutin;
+type __DayCutinLikeFleetCutin = FleetCutin;
+declare namespace DayCutinLike {
+  export type DayCutin = __DayCutinLikeDayCutin;
+  export type FleetCutin = __DayCutinLikeFleetCutin;
 }
 
-export type DamageState =
-  | DamageState.Normal
-  | DamageState.Shouha
-  | DamageState.Chuuha
-  | DamageState.Taiha
-  | DamageState.Sunk;
+export type DayCutinLike = DayCutinLike.DayCutin | DayCutinLike.FleetCutin;
 
-declare namespace SpeedGroup {
-  export type A = "A";
-  export type B1 = "B1";
-  export type B2 = "B2";
-  export type C = "C";
+declare namespace FleetCutin {
+  export type NelsonTouch = "NelsonTouch";
+  export type NagatoClassCutin = "NagatoClassCutin";
+  export type ColoradoClassCutin = "ColoradoClassCutin";
+  export type KongouClassCutin = "KongouClassCutin";
+  export type Yamato2ShipCutin = "Yamato2ShipCutin";
+  export type Yamato3ShipCutin = "Yamato3ShipCutin";
 }
 
-export type SpeedGroup =
-  | SpeedGroup.A
-  | SpeedGroup.B1
-  | SpeedGroup.B2
-  | SpeedGroup.C;
+export type FleetCutin =
+  | FleetCutin.NelsonTouch
+  | FleetCutin.NagatoClassCutin
+  | FleetCutin.ColoradoClassCutin
+  | FleetCutin.KongouClassCutin
+  | FleetCutin.Yamato2ShipCutin
+  | FleetCutin.Yamato3ShipCutin;
+
+declare namespace NightCutin {
+  export type MainTorpRadar = "MainTorpRadar";
+  export type TorpLookoutRadar = "TorpLookoutRadar";
+  export type TorpTsloTorp = "TorpTsloTorp";
+  export type TorpTsloDrum = "TorpTsloDrum";
+  export type DoubleAttack = "DoubleAttack";
+  export type TorpTorpMain = "TorpTorpMain";
+  export type TorpTorpTorp = "TorpTorpTorp";
+  export type MainMainSec = "MainMainSec";
+  export type MainMainMain = "MainMainMain";
+  export type SubTorpTorp = "SubTorpTorp";
+  export type SubRadarTorp = "SubRadarTorp";
+  export type Cvci1_25 = "Cvci1_25";
+  export type Cvci1_20 = "Cvci1_20";
+  export type Cvci1_18 = "Cvci1_18";
+  export type Photobomber = "Photobomber";
+}
+
+export type NightCutin =
+  | NightCutin.MainTorpRadar
+  | NightCutin.TorpLookoutRadar
+  | NightCutin.TorpTsloTorp
+  | NightCutin.TorpTsloDrum
+  | NightCutin.DoubleAttack
+  | NightCutin.TorpTorpMain
+  | NightCutin.TorpTorpTorp
+  | NightCutin.MainMainSec
+  | NightCutin.MainMainMain
+  | NightCutin.SubTorpTorp
+  | NightCutin.SubRadarTorp
+  | NightCutin.Cvci1_25
+  | NightCutin.Cvci1_20
+  | NightCutin.Cvci1_18
+  | NightCutin.Photobomber;
+
+declare namespace DayCutin {
+  export type Zuiun = "Zuiun";
+  export type AirSea = "AirSea";
+  export type MainMain = "MainMain";
+  export type MainAp = "MainAp";
+  export type MainRadar = "MainRadar";
+  export type MainSec = "MainSec";
+  export type DoubleAttack = "DoubleAttack";
+  export type FBA = "FBA";
+  export type BBA = "BBA";
+  export type BA = "BA";
+}
+
+export type DayCutin =
+  | DayCutin.Zuiun
+  | DayCutin.AirSea
+  | DayCutin.MainMain
+  | DayCutin.MainAp
+  | DayCutin.MainRadar
+  | DayCutin.MainSec
+  | DayCutin.DoubleAttack
+  | DayCutin.FBA
+  | DayCutin.BBA
+  | DayCutin.BA;
+
+declare namespace ContactRank {
+  export type Rank1 = "Rank1";
+  export type Rank2 = "Rank2";
+  export type Rank3 = "Rank3";
+}
+
+export type ContactRank =
+  | ContactRank.Rank1
+  | ContactRank.Rank2
+  | ContactRank.Rank3;
 
 declare namespace AirWaveType {
   export type Jet = "Jet";
@@ -278,49 +235,25 @@ export interface SimulatorResult {
 
 export interface SimulatorResultItem {
   id: string;
-  role: Role;
+  fleet_type: FleetType;
   index: number;
   damage_state_map: Record<DamageState, number>;
 }
 
-declare namespace OrgType {
-  export type Single = "Single";
-  export type CarrierTaskForce = "CarrierTaskForce";
-  export type SurfaceTaskForce = "SurfaceTaskForce";
-  export type TransportEscort = "TransportEscort";
-  export type EnemySingle = "EnemySingle";
-  export type EnemyCombined = "EnemyCombined";
-}
-
-export type OrgType =
-  | OrgType.Single
-  | OrgType.CarrierTaskForce
-  | OrgType.SurfaceTaskForce
-  | OrgType.TransportEscort
-  | OrgType.EnemySingle
-  | OrgType.EnemyCombined;
-
-export interface CompMeta {
-  fleets: Record<FleetType, FleetMeta>;
-}
-
-export interface FleetMeta {
-  id: string;
-  len: number;
-  ships: [string, ShipMeta | null][];
-}
-
-export interface ShipMeta {
-  id: string;
-  ship_id: number;
-}
-
-declare namespace AswAttackType {
-  export type DepthCharge = "DepthCharge";
-  export type Aircraft = "Aircraft";
+declare namespace DamageState {
+  export type Normal = "Normal";
+  export type Shouha = "Shouha";
+  export type Chuuha = "Chuuha";
+  export type Taiha = "Taiha";
+  export type Sunk = "Sunk";
 }
 
-export type AswAttackType = AswAttackType.DepthCharge | AswAttackType.Aircraft;
+export type DamageState =
+  | DamageState.Normal
+  | DamageState.Shouha
+  | DamageState.Chuuha
+  | DamageState.Taiha
+  | DamageState.Sunk;
 
 declare namespace GearCategory {
   export type Fighter = "Fighter";
@@ -411,6 +344,7 @@ declare namespace GearType {
   export type JetRecon = "JetRecon";
   export type LargeRadar2 = "LargeRadar2";
   export type CbRecon2 = "CbRecon2";
+  export type SecondaryGun2 = "SecondaryGun2";
 }
 
 export type GearType =
@@ -472,45 +406,43 @@ export type GearType =
   | GearType.JetTorpedoBomber
   | GearType.JetRecon
   | GearType.LargeRadar2
-  | GearType.CbRecon2;
+  | GearType.CbRecon2
+  | GearType.SecondaryGun2;
+
+declare namespace AirStateRank {
+  export type Rank0 = "Rank0";
+  export type Rank1 = "Rank1";
+  export type Rank2 = "Rank2";
+  export type Rank3 = "Rank3";
+}
 
-export type NumMap<K, V> = Partial<Record<K, V>>;
+export type AirStateRank =
+  | AirStateRank.Rank0
+  | AirStateRank.Rank1
+  | AirStateRank.Rank2
+  | AirStateRank.Rank3;
 
-type __ShellingSpecialAttackDayCutin = DayCutin;
-type __ShellingSpecialAttackFleetCutin = FleetCutin;
-declare namespace ShellingSpecialAttack {
-  export type DayCutin = { DayCutin: __ShellingSpecialAttackDayCutin };
-  export type FleetCutin = { FleetCutin: __ShellingSpecialAttackFleetCutin };
+declare namespace AirState {
+  export type AirSupremacy = "AirSupremacy";
+  export type AirSuperiority = "AirSuperiority";
+  export type AirParity = "AirParity";
+  export type AirDenial = "AirDenial";
+  export type AirIncapability = "AirIncapability";
 }
 
-export type ShellingSpecialAttack =
-  | ShellingSpecialAttack.DayCutin
-  | ShellingSpecialAttack.FleetCutin;
+export type AirState =
+  | AirState.AirSupremacy
+  | AirState.AirSuperiority
+  | AirState.AirParity
+  | AirState.AirDenial
+  | AirState.AirIncapability;
 
-declare namespace DayCutin {
-  export type Zuiun = "Zuiun";
-  export type AirSea = "AirSea";
-  export type MainMain = "MainMain";
-  export type MainAp = "MainAp";
-  export type MainRadar = "MainRadar";
-  export type MainSec = "MainSec";
-  export type DoubleAttack = "DoubleAttack";
-  export type FBA = "FBA";
-  export type BBA = "BBA";
-  export type BA = "BA";
+declare namespace Side {
+  export type Player = "Player";
+  export type Enemy = "Enemy";
 }
 
-export type DayCutin =
-  | DayCutin.Zuiun
-  | DayCutin.AirSea
-  | DayCutin.MainMain
-  | DayCutin.MainAp
-  | DayCutin.MainRadar
-  | DayCutin.MainSec
-  | DayCutin.DoubleAttack
-  | DayCutin.FBA
-  | DayCutin.BBA
-  | DayCutin.BA;
+export type Side = Side.Player | Side.Enemy;
 
 declare namespace Role {
   export type Main = "Main";
@@ -519,6 +451,28 @@ declare namespace Role {
 
 export type Role = Role.Main | Role.Escort;
 
+export interface ShipPosition {
+  org_type?: OrgType;
+  fleet_type?: FleetType;
+  fleet_len?: number;
+  index?: number;
+}
+
+export interface CompMeta {
+  fleets: Record<FleetType, FleetMeta>;
+}
+
+export interface FleetMeta {
+  id: string;
+  len: number;
+  ships: [string, ShipMeta | null][];
+}
+
+export interface ShipMeta {
+  id: string;
+  ship_id: number;
+}
+
 declare namespace Engagement {
   export type GreenT = "GreenT";
   export type Parallel = "Parallel";
@@ -532,32 +486,79 @@ export type Engagement =
   | Engagement.HeadOn
   | Engagement.RedT;
 
-export interface ShipEnvironment {
-  org_type?: OrgType;
-  role?: Role;
-  index?: number;
-  fleet_len?: number;
-  formation?: Formation;
-  fleet_los_mod?: number | null;
-  night_conditions?: NightConditions;
+export type TorpedoAttackType = null;
+
+type __NightPhaseAttackTypeAswAttackType = AswAttackType;
+type __NightPhaseAttackTypeNightAttackType = NightAttackType;
+declare namespace NightPhaseAttackType {
+  export type Night = { t: "Night"; c: __NightPhaseAttackTypeNightAttackType };
+  export type Asw = { t: "Asw"; c: __NightPhaseAttackTypeAswAttackType };
+}
+
+export type NightPhaseAttackType =
+  | NightPhaseAttackType.Night
+  | NightPhaseAttackType.Asw;
+
+type __DayPhaseAttackTypeAswAttackType = AswAttackType;
+type __DayPhaseAttackTypeShellingType = ShellingType;
+declare namespace DayPhaseAttackType {
+  export type Shelling = { t: "Shelling"; c: __DayPhaseAttackTypeShellingType };
+  export type Asw = { t: "Asw"; c: __DayPhaseAttackTypeAswAttackType };
+}
+
+export type DayPhaseAttackType =
+  | DayPhaseAttackType.Shelling
+  | DayPhaseAttackType.Asw;
+
+type __AttackTypeAswAttackType = AswAttackType;
+type __AttackTypeNightAttackType = NightAttackType;
+type __AttackTypeShellingType = ShellingType;
+type __AttackTypeSupportShellingType = SupportShellingType;
+declare namespace AttackType {
+  export type Asw = { t: "Asw"; c: __AttackTypeAswAttackType };
+  export type Shelling = { t: "Shelling"; c: __AttackTypeShellingType };
+  export type Night = { t: "Night"; c: __AttackTypeNightAttackType };
+  export type Torpedo = { t: "Torpedo"; c: null };
+  export type SupportShelling = {
+    t: "SupportShelling";
+    c: __AttackTypeSupportShellingType;
+  };
 }
 
-export interface NightConditions {
-  night_contact_rank?: ContactRank | null;
-  starshell_index?: number | null;
-  searchlight_index?: number | null;
+export type AttackType =
+  | AttackType.Asw
+  | AttackType.Shelling
+  | AttackType.Night
+  | AttackType.Torpedo
+  | AttackType.SupportShelling;
+
+export type SupportShellingType = ShellingType;
+
+declare namespace NightAttackType {
+  export type Normal = "Normal";
+  export type Swordfish = "Swordfish";
+  export type Carrier = "Carrier";
 }
 
-export interface BattleConditions {
-  org_type: OrgType;
-  role: Role;
-  ship_index: number;
-  fleet_len: number;
-  formation: Formation;
-  fleet_los_mod: number | null;
-  night_conditions: NightConditions;
+export type NightAttackType =
+  | NightAttackType.Normal
+  | NightAttackType.Swordfish
+  | NightAttackType.Carrier;
+
+declare namespace ShellingType {
+  export type Normal = "Normal";
+  export type Carrier = "Carrier";
+}
+
+export type ShellingType = ShellingType.Normal | ShellingType.Carrier;
+
+declare namespace AswAttackType {
+  export type DepthCharge = "DepthCharge";
+  export type Aircraft = "Aircraft";
 }
 
+export type AswAttackType = AswAttackType.DepthCharge | AswAttackType.Aircraft;
+
 export interface MasterData {
   gears: MasterGear[];
   gear_attrs: MasterAttrRule<GearAttr>[];
@@ -584,26 +585,33 @@ export interface MasterAttrRule<T> {
   expr: string;
 }
 
-export interface CompDayCutinRateInfo {
-  main: FleetDayCutinRateInfo;
-  escort: FleetDayCutinRateInfo | null;
+export interface NodeAttackAnalyzerShipConfig extends NightFleetConditions {
+  formation?: Formation;
 }
 
-export interface FleetDayCutinRateInfo {
-  fleet_los_mod: number | null;
-  ships: ShipDayCutinRateInfo[];
+export interface NodeAttackAnalyzerConfig {
+  air_state?: AirState;
+  engagement?: Engagement;
+  left?: NodeAttackAnalyzerShipConfig;
+  right?: NodeAttackAnalyzerShipConfig;
 }
 
-export interface ShipDayCutinRateInfo {
-  ship_id: number;
-  air_supremacy: DayCutinRateInfo;
-  air_superiority: DayCutinRateInfo;
+export interface NodeAttackAnalysis {
+  left: AttackAnalysis;
+  right: AttackAnalysis;
 }
 
-export interface DayCutinRateInfo {
-  observation_term: number | null;
-  rates: [DayCutin | null, number | null][];
-  total_cutin_rate: number | null;
+export interface AttackAnalyzerConfig {
+  air_state?: AirState;
+  engagement?: Engagement;
+  attacker?: AttackAnalyzerShipConfig;
+  target?: AttackAnalyzerShipConfig;
+}
+
+export interface AttackAnalyzerShipConfig
+  extends ShipConditions,
+    NightFleetConditions {
+  fleet_los_mod?: number | null;
 }
 
 export interface EBonuses {
@@ -646,25 +654,56 @@ export interface GearInput {
 
 export type GearVecInput = GearInput[];
 
-export interface ShellingSupportSimulatorParams {
-  attacker_formation?: Formation;
-  target_formation?: Formation;
-  engagement: Engagement;
+declare namespace ShipAttr {
+  export type Unknown = "Unknown";
+  export type Abyssal = "Abyssal";
+  export type NightCarrier = "NightCarrier";
+  export type Installation = "Installation";
+  export type RoyalNavy = "RoyalNavy";
+  export type Kai2 = "Kai2";
+  export type TurbineSpeedBonus = "TurbineSpeedBonus";
+  export type Pillbox = "Pillbox";
+  export type IsolatedIsland = "IsolatedIsland";
+  export type HarbourSummerPrincess = "HarbourSummerPrincess";
+  export type SupplyDepot = "SupplyDepot";
+  export type PtImp = "PtImp";
+  export type BattleshipSummerPrincess = "BattleshipSummerPrincess";
+  export type HeavyCruiserSummerPrincess = "HeavyCruiserSummerPrincess";
 }
 
-export interface DamageInfo {
-  miss_damage_min: number;
-  miss_damage_max: number;
-  normal_damage_min: number;
-  normal_damage_max: number;
-  critical_damage_min: number;
-  critical_damage_max: number;
-  normal_scratch_rate: number;
-  critical_scratch_rate: number;
-  damage_map: NumMap<number, number>;
-  damage_state_map: NumMap<DamageState, number>;
+export type ShipAttr =
+  | ShipAttr.Unknown
+  | ShipAttr.Abyssal
+  | ShipAttr.NightCarrier
+  | ShipAttr.Installation
+  | ShipAttr.RoyalNavy
+  | ShipAttr.Kai2
+  | ShipAttr.TurbineSpeedBonus
+  | ShipAttr.Pillbox
+  | ShipAttr.IsolatedIsland
+  | ShipAttr.HarbourSummerPrincess
+  | ShipAttr.SupplyDepot
+  | ShipAttr.PtImp
+  | ShipAttr.BattleshipSummerPrincess
+  | ShipAttr.HeavyCruiserSummerPrincess;
+
+declare namespace OrgType {
+  export type Single = "Single";
+  export type CarrierTaskForce = "CarrierTaskForce";
+  export type SurfaceTaskForce = "SurfaceTaskForce";
+  export type TransportEscort = "TransportEscort";
+  export type EnemySingle = "EnemySingle";
+  export type EnemyCombined = "EnemyCombined";
 }
 
+export type OrgType =
+  | OrgType.Single
+  | OrgType.CarrierTaskForce
+  | OrgType.SurfaceTaskForce
+  | OrgType.TransportEscort
+  | OrgType.EnemySingle
+  | OrgType.EnemyCombined;
+
 declare namespace GearAttr {
   export type Unknown = "Unknown";
   export type Abyssal = "Abyssal";
@@ -681,6 +720,7 @@ declare namespace GearAttr {
   export type SynergisticDepthCharge = "SynergisticDepthCharge";
   export type AntiSubMortar = "AntiSubMortar";
   export type AntiSubWeapon = "AntiSubWeapon";
+  export type ApDepthCharge = "ApDepthCharge";
   export type AntiSubAircraft = "AntiSubAircraft";
   export type LateModelBowTorpedo = "LateModelBowTorpedo";
   export type Seaplane = "Seaplane";
@@ -697,36 +737,172 @@ declare namespace GearAttr {
   export type HighAltitudeInterceptor = "HighAltitudeInterceptor";
 }
 
-export type GearAttr =
-  | GearAttr.Unknown
-  | GearAttr.Abyssal
-  | GearAttr.HighAngleMount
-  | GearAttr.NightFighter
-  | GearAttr.NightAttacker
-  | GearAttr.HeavyBomber
-  | GearAttr.NightRecon
-  | GearAttr.MainGun
-  | GearAttr.Radar
-  | GearAttr.SurfaceRadar
-  | GearAttr.AirRadar
-  | GearAttr.DepthChargeProjector
-  | GearAttr.SynergisticDepthCharge
-  | GearAttr.AntiSubMortar
-  | GearAttr.AntiSubWeapon
-  | GearAttr.AntiSubAircraft
-  | GearAttr.LateModelBowTorpedo
-  | GearAttr.Seaplane
-  | GearAttr.CbAircraft
-  | GearAttr.LbAircraft
-  | GearAttr.JetAircraft
-  | GearAttr.Fighter
-  | GearAttr.Recon
-  | GearAttr.ObservationSeaplane
-  | GearAttr.CbFighterBomber
-  | GearAttr.AntiInstDiveBomber
-  | GearAttr.CbSwordfish
-  | GearAttr.SemiNightPlane
-  | GearAttr.HighAltitudeInterceptor;
+export type GearAttr =
+  | GearAttr.Unknown
+  | GearAttr.Abyssal
+  | GearAttr.HighAngleMount
+  | GearAttr.NightFighter
+  | GearAttr.NightAttacker
+  | GearAttr.HeavyBomber
+  | GearAttr.NightRecon
+  | GearAttr.MainGun
+  | GearAttr.Radar
+  | GearAttr.SurfaceRadar
+  | GearAttr.AirRadar
+  | GearAttr.DepthChargeProjector
+  | GearAttr.SynergisticDepthCharge
+  | GearAttr.AntiSubMortar
+  | GearAttr.AntiSubWeapon
+  | GearAttr.ApDepthCharge
+  | GearAttr.AntiSubAircraft
+  | GearAttr.LateModelBowTorpedo
+  | GearAttr.Seaplane
+  | GearAttr.CbAircraft
+  | GearAttr.LbAircraft
+  | GearAttr.JetAircraft
+  | GearAttr.Fighter
+  | GearAttr.Recon
+  | GearAttr.ObservationSeaplane
+  | GearAttr.CbFighterBomber
+  | GearAttr.AntiInstDiveBomber
+  | GearAttr.CbSwordfish
+  | GearAttr.SemiNightPlane
+  | GearAttr.HighAltitudeInterceptor;
+
+export interface SupportShellingStyle {
+  tag: "SupportShellingStyle";
+  attack_type: SupportShellingType;
+}
+
+type __NightPhaseAttackStyleAswAttackStyle = AswAttackStyle;
+type __NightPhaseAttackStyleNightAttackStyle = NightAttackStyle;
+declare namespace NightPhaseAttackStyle {
+  export type Night = __NightPhaseAttackStyleNightAttackStyle;
+  export type Asw = __NightPhaseAttackStyleAswAttackStyle;
+}
+
+export type NightPhaseAttackStyle =
+  | NightPhaseAttackStyle.Night
+  | NightPhaseAttackStyle.Asw;
+
+type __DayPhaseAttackStyleAswAttackStyle = AswAttackStyle;
+type __DayPhaseAttackStyleShellingStyle = ShellingStyle;
+declare namespace DayPhaseAttackStyle {
+  export type Shelling = __DayPhaseAttackStyleShellingStyle;
+  export type Asw = __DayPhaseAttackStyleAswAttackStyle;
+}
+
+export type DayPhaseAttackStyle =
+  | DayPhaseAttackStyle.Shelling
+  | DayPhaseAttackStyle.Asw;
+
+export interface TorpedoAttackStyle {
+  tag: "TorpedoAttackStyle";
+  attack_type: TorpedoAttackType;
+}
+
+export interface AswAttackStyle {
+  tag: "AswAttackStyle";
+  attack_type: AswAttackType;
+}
+
+export interface NightAttackStyle {
+  tag: "NightAttackStyle";
+  attack_type: NightAttackType;
+  cutin: NightCutinLike | null;
+  power_mod: number;
+  accuracy_mod: number;
+  hits: number;
+}
+
+export interface ShellingStyle {
+  tag: "ShellingStyle";
+  attack_type: ShellingType;
+  cutin: DayCutinLike | null;
+  power_mod: number;
+  accuracy_mod: number;
+  hits: number;
+}
+
+export interface MasterIBonuses {
+  shelling_power: MasterIBonusRule[];
+  carrier_shelling_power: MasterIBonusRule[];
+  shelling_accuracy: MasterIBonusRule[];
+  torpedo_power: MasterIBonusRule[];
+  torpedo_accuracy: MasterIBonusRule[];
+  torpedo_evasion: MasterIBonusRule[];
+  asw_power: MasterIBonusRule[];
+  asw_accuracy: MasterIBonusRule[];
+  night_power: MasterIBonusRule[];
+  night_accuracy: MasterIBonusRule[];
+  defense_power: MasterIBonusRule[];
+  contact_selection: MasterIBonusRule[];
+  fighter_power: MasterIBonusRule[];
+  ship_anti_air: MasterIBonusRule[];
+  fleet_anti_air: MasterIBonusRule[];
+  elos: MasterIBonusRule[];
+}
+
+export interface MasterIBonusRule {
+  expr: CompiledEvaler;
+  formula: CompiledEvaler;
+}
+
+export interface NightContactChance {
+  rank1: number;
+  rank2: number;
+  rank3: number;
+}
+
+export interface CompNightCutinAnalysis {
+  night_contact_chance: NightContactChance;
+  ships: ShipNightCutinAnalysis[];
+}
+
+export interface ShipNightCutinAnalysis {
+  ship_id: number;
+  index: number;
+  normal: NightCutinActionReport;
+  chuuha: NightCutinActionReport;
+}
+
+export interface NightCutinActionReport
+  extends ActionReport<NightPhaseAttackStyle> {
+  cutin_term: number | null;
+}
+
+export interface DamageReport {
+  miss_damage_min: number;
+  miss_damage_max: number;
+  normal_damage_min: number;
+  normal_damage_max: number;
+  critical_damage_min: number;
+  critical_damage_max: number;
+  normal_scratch_rate: number;
+  critical_scratch_rate: number;
+  damage_density: Histogram<number, number>;
+  damage_state_density: Histogram<DamageState, number>;
+}
+
+export interface CompAntiAirAnalysis {
+  fleet_adjusted_anti_air: number;
+  ships: AntiAirReport[];
+  anti_air_cutin_chance: [number, number][];
+}
+
+export interface AntiAirReport {
+  ship_id: number;
+  role: Role;
+  index: number;
+  adjusted_anti_air: number | null;
+  proportional_shotdown_rate: number | null;
+  fixed_shotdown_number: number | null;
+  guaranteed: number | null;
+  anti_air_cutin_chance: [number, number][];
+  anti_air_propellant_barrage_chance: number | null;
+}
+
+export type Histogram<K, V> = Partial<Record<K, V>>;
 
 type __FormationCombinedFormation = CombinedFormation;
 type __FormationSingleFormation = SingleFormation;
@@ -767,6 +943,19 @@ export type SingleFormation =
   | SingleFormation.LineAbreast
   | SingleFormation.Vanguard;
 
+declare namespace FleetType {
+  export type Main = "Main";
+  export type Escort = "Escort";
+  export type RouteSup = "RouteSup";
+  export type BossSup = "BossSup";
+}
+
+export type FleetType =
+  | FleetType.Main
+  | FleetType.Escort
+  | FleetType.RouteSup
+  | FleetType.BossSup;
+
 export interface CustomPowerModifiers {
   precap_mod?: AttackPowerModifier;
   postcap_mod?: AttackPowerModifier;
@@ -789,27 +978,6 @@ export interface AttackPowerModifier {
   b?: number;
 }
 
-export interface WarfareInfo {
-  day: AttackInfo<DayBattleAttackType, DayCutin | null> | null;
-  closing_torpedo: AttackInfo<null, null> | null;
-  night: AttackInfo<NightBattleAttackType, NightCutin | null> | null;
-  shelling_support: AttackInfo<null, null> | null;
-  opening_asw: AttackInfo<null, null> | null;
-}
-
-declare namespace FleetType {
-  export type Main = "Main";
-  export type Escort = "Escort";
-  export type RouteSup = "RouteSup";
-  export type BossSup = "BossSup";
-}
-
-export type FleetType =
-  | FleetType.Main
-  | FleetType.Escort
-  | FleetType.RouteSup
-  | FleetType.BossSup;
-
 export interface MasterEquippable {
   equip_stype: EquipStype[];
   equip_exslot: number[];
@@ -832,14 +1000,20 @@ export interface EquipStype {
   equip_type: number[];
 }
 
-declare namespace ShellingAttackType {
-  export type Normal = "Normal";
-  export type Carrier = "Carrier";
+export interface HitRate {
+  normal: number;
+  critical: number;
+  total: number;
 }
 
-export type ShellingAttackType =
-  | ShellingAttackType.Normal
-  | ShellingAttackType.Carrier;
+export interface HitRateParams {
+  accuracy_term: number;
+  evasion_term: number;
+  target_morale_mod: number;
+  critical_rate_constant: number;
+  critical_percentage_bonus: number;
+  hit_percentage_bonus: number;
+}
 
 export interface AttackPower {
   precap: number;
@@ -858,7 +1032,7 @@ export interface AttackPowerParams {
   postcap_mod: AttackPowerModifier;
   ap_shell_mod: number | null;
   carrier_power: number | null;
-  proficiency_critical_mod: number | null;
+  proficiency_critical_mod: number;
   armor_penetration: number;
   remaining_ammo_mod: number;
   special_enemy_mods: SpecialEnemyModifiers;
@@ -876,49 +1050,32 @@ export interface SpecialEnemyModifiers {
   pt_mod: AttackPowerModifier;
 }
 
-export interface AttackInfo<AttackType, Cutin> {
-  attack_type: AttackType;
-  items: AttackInfoItem<Cutin>[];
-  damage_state_map: NumMap<DamageState, number> | null;
+export interface CompDayCutinAnalysis {
+  rank3_air_state: AirState;
+  rank2_air_state: AirState;
+  main_fleet_los_mod: number | null;
+  escort_fleet_los_mod: number | null;
+  ships: ShipDayCutinAnalysis[];
 }
 
-export interface AttackInfoItem<Cutin> {
-  cutin: Cutin;
-  rate: number | null;
-  stats: AttackStats;
-}
-
-export interface AttackStats {
-  attack_power: AttackPower | null;
-  attack_power_params: AttackPowerParams | null;
-  hits: number;
-  hit_rate: HitRate | null;
-  hit_rate_params: HitRateParams | null;
-  damage: DamageInfo | null;
-}
-
-export interface CompAntiAirInfo {
-  fleet_adjusted_anti_air: number;
-  ships: ShipAntiAirInfo[];
-  anti_air_cutin_chance: [number, number][];
+export interface ShipDayCutinAnalysis {
+  ship_id: number;
+  role: Role;
+  index: number;
+  rank3: DayCutinReport;
+  rank2: DayCutinReport;
 }
 
-export interface ShipAntiAirInfo {
-  ship_id: number;
-  adjusted_anti_air: number | null;
-  proportional_shotdown_rate: number | null;
-  fixed_shotdown_number: number | null;
-  guaranteed: number | null;
-  anti_air_cutin_chance: [number, number][];
-  anti_air_propellant_barrage_chance: number | null;
+export interface DayCutinReport extends ActionReport<DayPhaseAttackStyle> {
+  observation_term: number | null;
 }
 
-export interface CompContactChanceInfo {
-  single: AirstrikeContactChance[] | null;
-  combined: AirstrikeContactChance[] | null;
+export interface ContactAnalysis {
+  single: DayContactChance[] | null;
+  combined: DayContactChance[] | null;
 }
 
-export interface AirstrikeContactChance {
+export interface DayContactChance {
   air_state: AirState;
   trigger_rate: number;
   rank3: number;
@@ -927,142 +1084,15 @@ export interface AirstrikeContactChance {
   total: number;
 }
 
-export type SlotSizeVec = (number | null)[];
-
-declare namespace Side {
-  export type Player = "Player";
-  export type Enemy = "Enemy";
-}
-
-export type Side = Side.Player | Side.Enemy;
-
-declare namespace NightAttackType {
-  export type Normal = "Normal";
-  export type ArkRoyal = "ArkRoyal";
-  export type Carrier = "Carrier";
-}
-
-export type NightAttackType =
-  | NightAttackType.Normal
-  | NightAttackType.ArkRoyal
-  | NightAttackType.Carrier;
-
-type __NightSpecialAttackFleetCutin = FleetCutin;
-type __NightSpecialAttackNightCutin = NightCutin;
-declare namespace NightSpecialAttack {
-  export type NightCutin = { NightCutin: __NightSpecialAttackNightCutin };
-  export type FleetCutin = { FleetCutin: __NightSpecialAttackFleetCutin };
-}
-
-export type NightSpecialAttack =
-  | NightSpecialAttack.NightCutin
-  | NightSpecialAttack.FleetCutin;
-
-declare namespace NightCutin {
-  export type MainTorpRadar = "MainTorpRadar";
-  export type TorpLookoutRadar = "TorpLookoutRadar";
-  export type TorpTsloTorp = "TorpTsloTorp";
-  export type TorpTsloDrum = "TorpTsloDrum";
-  export type DoubleAttack = "DoubleAttack";
-  export type TorpTorpMain = "TorpTorpMain";
-  export type TorpTorpTorp = "TorpTorpTorp";
-  export type MainMainSec = "MainMainSec";
-  export type MainMainMain = "MainMainMain";
-  export type SubTorpTorp = "SubTorpTorp";
-  export type SubRadarTorp = "SubRadarTorp";
-  export type Cvci1_25 = "Cvci1_25";
-  export type Cvci1_20 = "Cvci1_20";
-  export type Cvci1_18 = "Cvci1_18";
-  export type Photobomber = "Photobomber";
-}
-
-export type NightCutin =
-  | NightCutin.MainTorpRadar
-  | NightCutin.TorpLookoutRadar
-  | NightCutin.TorpTsloTorp
-  | NightCutin.TorpTsloDrum
-  | NightCutin.DoubleAttack
-  | NightCutin.TorpTorpMain
-  | NightCutin.TorpTorpTorp
-  | NightCutin.MainMainSec
-  | NightCutin.MainMainMain
-  | NightCutin.SubTorpTorp
-  | NightCutin.SubRadarTorp
-  | NightCutin.Cvci1_25
-  | NightCutin.Cvci1_20
-  | NightCutin.Cvci1_18
-  | NightCutin.Photobomber;
-
-declare namespace ContactRank {
-  export type Rank1 = "Rank1";
-  export type Rank2 = "Rank2";
-  export type Rank3 = "Rank3";
-}
-
-export type ContactRank =
-  | ContactRank.Rank1
-  | ContactRank.Rank2
-  | ContactRank.Rank3;
-
-export interface BattleDefinitions {
-  formation: Record<Formation, NestedFormationDef>;
-  anti_air_cutin: Record<number, AntiAirCutinDef>;
-  day_cutin: Record<DayCutin, DayCutinDef>;
-  night_cutin: Record<NightCutin, NightCutinDef>;
-}
-
-export interface NightCutinDef {
-  tag: NightCutin;
-  hits: number;
-  type_factor: number | null;
-  power_mod: number | null;
-  accuracy_mod: number | null;
-}
-
-export interface DayCutinDef {
-  tag: DayCutin;
-  hits: number;
-  type_factor: number | null;
-  power_mod: number | null;
-  accuracy_mod: number | null;
-}
-
-export interface AntiAirCutinDef {
-  id: number;
-  type_factor: number | null;
-  multiplier: number | null;
-  guaranteed: number | null;
-  sequential: boolean | null;
-}
-
-type __NestedFormationDefFormationDef = FormationDef;
-declare namespace NestedFormationDef {
-  export type Normal = __NestedFormationDefFormationDef;
-  export type Vanguard = {
-    top_half: __NestedFormationDefFormationDef;
-    bottom_half: __NestedFormationDefFormationDef;
-  };
-}
-
-export type NestedFormationDef =
-  | NestedFormationDef.Normal
-  | NestedFormationDef.Vanguard;
-
-export interface FormationDef {
-  tag: Formation;
-  protection_rate: number | null;
-  fleet_anti_air_mod: number;
-  shelling: FormationWarfareDef;
-  torpedo: FormationWarfareDef;
-  asw: FormationWarfareDef;
-  night: FormationWarfareDef;
-  shelling_support: FormationWarfareDef;
-}
-
-export interface FormationWarfareDef {
-  power_mod: number | null;
-  accuracy_mod: number | null;
-  evasion_mod: number | null;
+export interface AttackAnalysis {
+  attacker_is_player: boolean;
+  attacker_ship_id: number;
+  target_ship_id: number;
+  day: ActionReport<DayPhaseAttackStyle>;
+  night: ActionReport<NightPhaseAttackStyle>;
+  closing_torpedo: ActionReport<TorpedoAttackStyle>;
+  opening_asw: ActionReport<AswAttackStyle>;
+  support_shelling: ActionReport<SupportShellingStyle>;
 }
 
 export interface MasterShip {
@@ -1081,94 +1111,59 @@ export interface MasterShip {
   asw: StatInterval;
   los: StatInterval;
   luck: StatInterval;
-  torpedo_accuracy?: number;
-  basic_evasion_term?: number;
-  speed: number;
-  range?: number;
-  fuel?: number;
-  ammo?: number;
-  next_id?: number;
-  next_level?: number;
-  slotnum: number;
-  slots: SlotSizeVec;
-  stock: GearState[];
-  speed_group?: SpeedGroup;
-  useful?: boolean;
-}
-
-export type StatInterval = [number | null, number | null];
-
-export interface MasterGear {
-  gear_id: number;
-  name: string;
-  types: GearTypeIdArray;
-  special_type?: number;
-  max_hp?: number;
-  firepower?: number;
-  armor?: number;
-  torpedo?: number;
-  anti_air?: number;
-  speed?: number;
-  bombing?: number;
-  asw?: number;
-  los?: number;
-  luck?: number;
-  accuracy?: number;
-  evasion?: number;
+  torpedo_accuracy?: number;
+  basic_evasion_term?: number;
+  speed: number;
   range?: number;
-  radius?: number;
-  cost?: number;
-  improvable?: boolean;
-  ship_anti_air_resistance?: number;
-  fleet_anti_air_resistance?: number;
+  fuel?: number;
+  ammo?: number;
+  next_id?: number;
+  next_level?: number;
+  slotnum: number;
+  slots: SlotSizeVec;
+  stock: GearState[];
+  speed_group?: SpeedGroup;
+  useful?: boolean;
 }
 
-export interface WarfareContext {
-  attacker_env: ShipEnvironment;
-  target_env: ShipEnvironment;
+export type StatInterval = [number | null, number | null];
+
+export interface CompAnalyzerConfig {
   engagement: Engagement;
-  air_state: AirState;
+  formation: Formation;
+  anti_air_cutin: number | null;
+  ship_anti_air_resist: number;
+  fleet_anti_air_resist: number;
+  left_night_fleet_conditions: NightFleetConditions;
+  right_night_fleet_conditions: NightFleetConditions;
 }
 
-type __NightBattleAttackTypeAswAttackType = AswAttackType;
-type __NightBattleAttackTypeNightAttackType = NightAttackType;
-declare namespace NightBattleAttackType {
-  export type NightAttack = {
-    t: "NightAttack";
-    c: __NightBattleAttackTypeNightAttackType;
-  };
-  export type Asw = { t: "Asw"; c: __NightBattleAttackTypeAswAttackType };
+export interface CompNightAnalysis {
+  night_cutin: CompNightCutinAnalysis;
+  fleet_cutin: FleetCutinReport<NightAttackStyle>[];
 }
 
-export type NightBattleAttackType =
-  | NightBattleAttackType.NightAttack
-  | NightBattleAttackType.Asw;
-
-type __DayBattleAttackTypeAswAttackType = AswAttackType;
-type __DayBattleAttackTypeShellingAttackType = ShellingAttackType;
-declare namespace DayBattleAttackType {
-  export type Shelling = {
-    t: "Shelling";
-    c: __DayBattleAttackTypeShellingAttackType;
-  };
-  export type Asw = { t: "Asw"; c: __DayBattleAttackTypeAswAttackType };
+export interface CompDayAnalysis {
+  day_cutin: CompDayCutinAnalysis;
+  fleet_cutin: FleetCutinReport<ShellingStyle>[];
 }
 
-export type DayBattleAttackType =
-  | DayBattleAttackType.Shelling
-  | DayBattleAttackType.Asw;
-
-export interface WarfareAnalysisResult {
-  player: AttackAnalysisResult;
-  enemy: AttackAnalysisResult;
+export interface CompAnalysis {
+  day: CompDayAnalysis;
+  night: CompNightAnalysis;
+  contact: ContactAnalysis;
+  anti_air: CompAntiAirAnalysis;
 }
 
-export interface AttackAnalysisResult {
-  day: AttackInfo<DayBattleAttackType, DayCutin | null> | null;
-  closing_torpedo: AttackInfo<null, null> | null;
-  night: AttackInfo<NightBattleAttackType, NightCutin | null> | null;
-  shelling_support: AttackInfo<null, null> | null;
-  opening_asw: AttackInfo<null, null> | null;
+export interface AttackReport<T> {
+  style: T;
+  proc_rate: number | null;
+  attack_power: AttackPower | null;
+  attack_power_params: AttackPowerParams | null;
+  hits: number;
+  hit_rate: HitRate | null;
+  hit_rate_params: HitRateParams | null;
+  damage: DamageReport | null;
 }
 
 export type ShipStateMap = Record<ShipKey, ShipState>;
@@ -1280,60 +1275,177 @@ export interface GearState {
   stars?: number;
 }
 
-export interface HitRate {
-  total: number;
-  normal: number;
-  critical: number;
+declare namespace SpeedGroup {
+  export type A = "A";
+  export type B1 = "B1";
+  export type B2 = "B2";
+  export type C = "C";
 }
 
-export interface HitRateParams {
-  accuracy_term: number;
-  evasion_term: number;
-  target_morale_mod: number;
-  critical_rate_constant: number;
-  critical_percentage_bonus: number;
-  hit_percentage_bonus: number;
+export type SpeedGroup =
+  | SpeedGroup.A
+  | SpeedGroup.B1
+  | SpeedGroup.B2
+  | SpeedGroup.C;
+
+export type SlotSizeVec = (number | null)[];
+
+export interface NightFleetConditions {
+  night_contact_rank?: ContactRank | null;
+  starshell_index?: number | null;
+  searchlight_index?: number | null;
+  activates_large_searchlight?: boolean;
+}
+
+export interface NightConditions {
+  player?: NightFleetConditions;
+  enemy?: NightFleetConditions;
+}
+
+export interface BattleConditions {
+  org_type: OrgType;
+  role: Role;
+  ship_index: number;
+  fleet_len: number;
+  formation: Formation;
+  fleet_los_mod: number | null;
+  night_conditions: NightFleetConditions;
+}
+
+export interface MasterGear {
+  gear_id: number;
+  name: string;
+  types: GearTypeIdArray;
+  special_type?: number;
+  max_hp?: number;
+  firepower?: number;
+  armor?: number;
+  torpedo?: number;
+  anti_air?: number;
+  speed?: number;
+  bombing?: number;
+  asw?: number;
+  los?: number;
+  luck?: number;
+  accuracy?: number;
+  evasion?: number;
+  range?: number;
+  radius?: number;
+  cost?: number;
+  improvable?: boolean;
+  ship_anti_air_resist?: number;
+  fleet_anti_air_resist?: number;
+}
+
+export interface ActionReport<T> {
+  data: Record<string, AttackReport<T>>;
+  damage_state_density: Histogram<DamageState, number> | null;
+  is_active: boolean;
 }
 
 export type GearTypeIdArray = [number, number, number, number, number];
 
-declare namespace ShellingAttackType {
-  export type Normal = "Normal";
-  export type Carrier = "Carrier";
+declare namespace ShipType {
+  export type Unknown = "Unknown";
+  export type DE = "DE";
+  export type DD = "DD";
+  export type CL = "CL";
+  export type CLT = "CLT";
+  export type CA = "CA";
+  export type CAV = "CAV";
+  export type CVL = "CVL";
+  export type FBB = "FBB";
+  export type BB = "BB";
+  export type BBV = "BBV";
+  export type CV = "CV";
+  export type XBB = "XBB";
+  export type SS = "SS";
+  export type SSV = "SSV";
+  export type AP = "AP";
+  export type AV = "AV";
+  export type LHA = "LHA";
+  export type CVB = "CVB";
+  export type AR = "AR";
+  export type AS = "AS";
+  export type CT = "CT";
+  export type AO = "AO";
 }
 
-export type ShellingAttackType =
-  | ShellingAttackType.Normal
-  | ShellingAttackType.Carrier;
+export type ShipType =
+  | ShipType.Unknown
+  | ShipType.DE
+  | ShipType.DD
+  | ShipType.CL
+  | ShipType.CLT
+  | ShipType.CA
+  | ShipType.CAV
+  | ShipType.CVL
+  | ShipType.FBB
+  | ShipType.BB
+  | ShipType.BBV
+  | ShipType.CV
+  | ShipType.XBB
+  | ShipType.SS
+  | ShipType.SSV
+  | ShipType.AP
+  | ShipType.AV
+  | ShipType.LHA
+  | ShipType.CVB
+  | ShipType.AR
+  | ShipType.AS
+  | ShipType.CT
+  | ShipType.AO;
 
-declare namespace AswAttackType {
-  export type DepthCharge = "DepthCharge";
-  export type Aircraft = "Aircraft";
+declare namespace ShipCategory {
+  export type Battleship = "Battleship";
+  export type AircraftCarrier = "AircraftCarrier";
+  export type HeavyCruiser = "HeavyCruiser";
+  export type LightCruiser = "LightCruiser";
+  export type Destroyer = "Destroyer";
+  export type CoastalDefenseShip = "CoastalDefenseShip";
+  export type Submarine = "Submarine";
+  export type AuxiliaryShip = "AuxiliaryShip";
 }
 
-export type AswAttackType = AswAttackType.DepthCharge | AswAttackType.Aircraft;
+export type ShipCategory =
+  | ShipCategory.Battleship
+  | ShipCategory.AircraftCarrier
+  | ShipCategory.HeavyCruiser
+  | ShipCategory.LightCruiser
+  | ShipCategory.Destroyer
+  | ShipCategory.CoastalDefenseShip
+  | ShipCategory.Submarine
+  | ShipCategory.AuxiliaryShip;
 
-export interface FleetNightCutinRateInfo {
-  night_contact_chance: NightContactChance;
-  ships: ShipNightCutinRateInfo[];
+declare namespace MoraleState {
+  export type Sparkle = "Sparkle";
+  export type Normal = "Normal";
+  export type Orange = "Orange";
+  export type Red = "Red";
 }
 
-export interface ShipNightCutinRateInfo {
-  ship_id: number;
-  normal: NightCutinRateInfo;
-  chuuha: NightCutinRateInfo;
+export type MoraleState =
+  | MoraleState.Sparkle
+  | MoraleState.Normal
+  | MoraleState.Orange
+  | MoraleState.Red;
+
+export interface FleetCutinAnalysis {
+  shelling: FleetCutinReport<ShellingStyle>[];
+  night: FleetCutinReport<NightAttackStyle>[];
 }
 
-export interface NightCutinRateInfo {
-  cutin_term: number | null;
-  rates: [NightCutin | null, number | null][];
+export interface FleetCutinReport<T> {
+  cutin: FleetCutin;
+  rate: number | null;
+  formation: Formation;
+  attacks: FleetCutinAttackReport<T>[];
 }
 
-export interface NightContactChance {
-  rank1: number;
-  rank2: number;
-  rank3: number;
-  total: number;
+export interface FleetCutinAttackReport<T> extends AttackReport<T> {
+  index: number;
+  ship_id: number;
+  power_mod: number;
 }
 
 /**
@@ -1370,71 +1482,76 @@ export class AirSquadron {
   radius(): number;
   /**
    */
-  id: string;
+  hash: bigint;
   /**
    */
-  mode: AirSquadronMode;
+  id: string;
   /**
    */
-  xxh3: bigint;
+  mode: AirSquadronMode;
 }
 /**
  */
 export class Analyzer {
   free(): void;
   /**
-   * @param {Comp} comp
-   * @param {Formation} formation
-   * @param {number} ship_anti_air_resist
-   * @param {number} fleet_anti_air_resist
-   * @param {number | undefined} aaci
-   * @returns {CompAntiAirInfo}
-   */
-  analyze_anti_air(
-    comp: Comp,
-    formation: Formation,
-    ship_anti_air_resist: number,
-    fleet_anti_air_resist: number,
-    aaci?: number
-  ): CompAntiAirInfo;
-  /**
-   * @param {Comp} comp
-   * @returns {CompDayCutinRateInfo}
-   */
-  analyze_day_cutin(comp: Comp): CompDayCutinRateInfo;
-  /**
-   * @param {Comp} comp
-   * @param {NightConditions} attacker_conditions
-   * @param {NightConditions} target_conditions
-   * @returns {FleetNightCutinRateInfo}
-   */
-  analyze_night_cutin(
-    comp: Comp,
-    attacker_conditions: NightConditions,
-    target_conditions: NightConditions
-  ): FleetNightCutinRateInfo;
-  /**
-   * @param {Comp} comp
-   * @returns {CompContactChanceInfo}
-   */
-  analyze_contact_chance(comp: Comp): CompContactChanceInfo;
-  /**
-   * @param {WarfareContext} params
+   * @param {AttackAnalyzerConfig} config
    * @param {Ship} attacker
    * @param {Ship} target
-   * @returns {WarfareInfo}
+   * @returns {AttackAnalysis}
    */
-  analyze_warfare(
-    params: WarfareContext,
+  analyze_attack(
+    config: AttackAnalyzerConfig,
     attacker: Ship,
     target: Ship
-  ): WarfareInfo;
+  ): AttackAnalysis;
+  /**
+   * @param {ShipAnalyzerConfig} config
+   * @param {Ship} left
+   * @param {Ship} right
+   * @param {boolean} attacker_is_left
+   * @returns {AttackAnalysis}
+   */
+  analyze_attack_by_ship_analyzer(
+    config: ShipAnalyzerConfig,
+    left: Ship,
+    right: Ship,
+    attacker_is_left: boolean
+  ): AttackAnalysis;
+  /**
+   * @param {NodeAttackAnalyzerConfig} config
+   * @param {Comp} left_comp
+   * @param {Ship} left_ship
+   * @param {Comp} right_comp
+   * @param {Ship} right_ship
+   * @returns {NodeAttackAnalysis}
+   */
+  analyze_node_attack(
+    config: NodeAttackAnalyzerConfig,
+    left_comp: Comp,
+    left_ship: Ship,
+    right_comp: Comp,
+    right_ship: Ship
+  ): NodeAttackAnalysis;
   /**
    * @param {Comp} comp
-   * @param {Engagement} engagement
-   * @returns {FleetCutinAnalysis}
+   * @param {CompAnalyzerConfig} config
+   * @returns {CompAnalysis}
+   */
+  analyze_comp(comp: Comp, config: CompAnalyzerConfig): CompAnalysis;
+  /**
+   * @param {Comp} player_comp
+   * @param {Comp} enemy_comp
+   * @param {NodeAttackAnalyzerConfig} config
+   * @param {number} times
+   * @returns {SimulatorResult}
    */
-  analyze_fleet_cutin(comp: Comp, engagement: Engagement): FleetCutinAnalysis;
+  simulate_support_shelling(
+    player_comp: Comp,
+    enemy_comp: Comp,
+    config: NodeAttackAnalyzerConfig,
+    times: number
+  ): SimulatorResult;
 }
 /**
  */
@@ -1520,12 +1637,9 @@ export class Comp {
   /**
    * @param {Ship} ship
    * @param {Formation | undefined} formation
-   * @returns {ShipEnvironment}
+   * @returns {ShipConditions}
    */
-  create_warfare_ship_environment(
-    ship: Ship,
-    formation?: Formation
-  ): ShipEnvironment;
+  get_ship_conditions(ship: Ship, formation?: Formation): ShipConditions;
   /**
    */
   boss_sup?: Fleet;
@@ -1534,13 +1648,13 @@ export class Comp {
   escort?: Fleet;
   /**
    */
-  hq_level: number;
+  readonly hq_level: number;
   /**
    */
   main: Fleet;
   /**
    */
-  org_type: OrgType;
+  readonly org_type: OrgType;
   /**
    */
   route_sup?: Fleet;
@@ -1601,19 +1715,6 @@ export class FhCore {
    * @returns {Analyzer}
    */
   create_analyzer(): Analyzer;
-  /**
-   * @param {Comp} player
-   * @param {Comp} enemy
-   * @param {ShellingSupportSimulatorParams} params
-   * @param {number} times
-   * @returns {SimulatorResult}
-   */
-  simulate_shelling_support(
-    player: Comp,
-    enemy: Comp,
-    params: ShellingSupportSimulatorParams,
-    times: number
-  ): SimulatorResult;
 }
 /**
  */
@@ -1711,13 +1812,13 @@ export class Fleet {
   readonly fleet_los_mod: number | undefined;
   /**
    */
-  id: string;
+  readonly hash: bigint;
   /**
    */
-  len: number;
+  id: string;
   /**
    */
-  xxh3: bigint;
+  readonly len: number;
 }
 /**
  */
@@ -1755,7 +1856,7 @@ export class Gear {
   /**
    * @returns {number}
    */
-  proficiency_critical_power_mod(): number;
+  exp_critical_bonus(): number;
   /**
    * @param {number} slot_size
    * @returns {number}
@@ -1833,52 +1934,55 @@ export class Gear {
   can_be_deployed_to_land_base(): boolean;
   /**
    */
-  accuracy: number;
+  readonly accuracy: number;
   /**
    */
   readonly ace: number;
   /**
    */
-  anti_air: number;
+  readonly anti_air: number;
   /**
    */
   readonly anti_bomber: number;
   /**
    */
-  armor: number;
+  readonly armor: number;
   /**
    */
-  asw: number;
+  readonly asw: number;
   /**
    */
-  bombing: number;
+  readonly bombing: number;
   /**
    */
-  cost: number;
+  readonly cost: number;
   /**
    */
-  default_exp: number;
+  readonly default_exp: number;
   /**
    */
-  evasion: number;
+  readonly evasion: number;
   /**
    */
-  exp: number;
+  readonly exp: number;
   /**
    */
-  firepower: number;
+  readonly firepower: number;
   /**
    */
-  fleet_anti_air_resistance: number;
+  readonly fleet_anti_air_resist: number;
   /**
    */
-  gear_id: number;
+  readonly gear_id: number;
   /**
    */
-  gear_type: GearType;
+  readonly gear_type: GearType;
   /**
    */
   readonly gear_type_id: number;
+  /**
+   */
+  readonly hash: bigint;
   /**
    */
   readonly icon_id: number;
@@ -1887,49 +1991,46 @@ export class Gear {
   id: string;
   /**
    */
-  improvable: boolean;
+  readonly improvable: boolean;
   /**
    */
   readonly interception: number;
   /**
    */
-  los: number;
+  readonly los: number;
   /**
    */
-  luck: number;
+  readonly luck: number;
   /**
    */
-  max_hp: number;
+  readonly max_hp: number;
   /**
    */
   name: string;
   /**
    */
-  radius: number;
+  readonly radius: number;
   /**
    */
-  range: number;
+  readonly range: number;
   /**
    */
-  ship_anti_air_resistance: number;
+  readonly ship_anti_air_resist: number;
   /**
    */
-  readonly special_type_id: number;
+  readonly special_type: number;
   /**
    */
-  speed: number;
+  readonly speed: number;
   /**
    */
-  stars: number;
+  readonly stars: number;
   /**
    */
-  torpedo: number;
+  readonly torpedo: number;
   /**
    */
   types: Uint8Array;
-  /**
-   */
-  xxh3: bigint;
 }
 /**
  */
@@ -2098,22 +2199,22 @@ export class Org {
   boss_sup?: string;
   /**
    */
-  hq_level: number;
+  readonly hash: bigint;
+  /**
+   */
+  readonly hq_level: number;
   /**
    */
   id: string;
   /**
    */
-  org_type: OrgType;
+  readonly org_type: OrgType;
   /**
    */
   route_sup?: string;
   /**
    */
   sortie: string;
-  /**
-   */
-  xxh3: bigint;
 }
 /**
  */
@@ -2268,6 +2369,13 @@ export class Ship {
    */
   fleet_los_factor(): number | undefined;
   /**
+   * 加重対空
+   * @param {Side} side
+   * @returns {number | undefined}
+   */
+  ship_adjusted_anti_air(side: Side): number | undefined;
+  /**
+   * 艦隊対空補正
    * @returns {number}
    */
   fleet_anti_air_mod(): number;
@@ -2313,10 +2421,6 @@ export class Ship {
    * @returns {number | undefined}
    */
   ohko_power(): number | undefined;
-  /**
-   * @param {number} value
-   */
-  take_damage(value: number): void;
   /**
    * @returns {number | undefined}
    */
@@ -2336,7 +2440,7 @@ export class Ship {
   readonly accuracy: number;
   /**
    */
-  ammo: number;
+  readonly ammo: number;
   /**
    */
   readonly anti_air: number | undefined;
@@ -2348,10 +2452,10 @@ export class Ship {
   readonly asw: number | undefined;
   /**
    */
-  ctype: number;
+  readonly ctype: number;
   /**
    */
-  current_hp: number;
+  readonly current_hp: number;
   /**
    */
   readonly evasion: number | undefined;
@@ -2360,7 +2464,10 @@ export class Ship {
   readonly firepower: number | undefined;
   /**
    */
-  fuel: number;
+  readonly fuel: number;
+  /**
+   */
+  readonly hash: bigint;
   /**
    */
   id: string;
@@ -2369,7 +2476,7 @@ export class Ship {
   readonly innate_torpedo_accuracy: number;
   /**
    */
-  level: number;
+  readonly level: number;
   /**
    */
   readonly los: number | undefined;
@@ -2387,7 +2494,7 @@ export class Ship {
   readonly max_hp: number | undefined;
   /**
    */
-  morale: number;
+  readonly morale: number;
   /**
    */
   readonly naked_anti_air: number | undefined;
@@ -2426,10 +2533,10 @@ export class Ship {
   readonly range: number | undefined;
   /**
    */
-  ship_id: number;
+  readonly ship_id: number;
   /**
    */
-  ship_type: ShipType;
+  readonly ship_type: ShipType;
   /**
    */
   readonly slotnum: number;
@@ -2451,9 +2558,6 @@ export class Ship {
   /**
    */
   readonly useful: boolean;
-  /**
-   */
-  xxh3: bigint;
   /**
    */
   readonly yomi: string;