fleethub-core 1.7.8 → 1.7.13

package/pkg/fleethub_core.d.ts

@@ -75,50 +75,107 @@ export type ShipCategory =
   | ShipCategory.Submarine
   | ShipCategory.AuxiliaryShip;
 
-type __ShellingSpecialAttackDayCutin = DayCutin;
-type __ShellingSpecialAttackFleetCutin = FleetCutin;
-declare namespace ShellingSpecialAttack {
-  export type DayCutin = { DayCutin: __ShellingSpecialAttackDayCutin };
-  export type FleetCutin = { FleetCutin: __ShellingSpecialAttackFleetCutin };
+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 type ShellingSpecialAttack =
-  | ShellingSpecialAttack.DayCutin
-  | ShellingSpecialAttack.FleetCutin;
+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 DayCutin {
-  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 Zuiun = "Zuiun";
-  export type AirSea = "AirSea";
+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 DayCutin =
-  | DayCutin.MainMain
-  | DayCutin.MainAp
-  | DayCutin.MainRadar
-  | DayCutin.MainSec
-  | DayCutin.DoubleAttack
-  | DayCutin.FBA
-  | DayCutin.BBA
-  | DayCutin.BA
-  | DayCutin.Zuiun
-  | DayCutin.AirSea;
+export type FleetCutin =
+  | FleetCutin.NelsonTouch
+  | FleetCutin.NagatoClassCutin
+  | FleetCutin.ColoradoClassCutin
+  | FleetCutin.KongouClassCutin
+  | FleetCutin.Yamato2ShipCutin
+  | FleetCutin.Yamato3ShipCutin;
 
-declare namespace ShellingAttackType {
-  export type Normal = "Normal";
-  export type Carrier = "Carrier";
+declare namespace AirStateRank {
+  export type Rank0 = "Rank0";
+  export type Rank1 = "Rank1";
+  export type Rank2 = "Rank2";
+  export type Rank3 = "Rank3";
 }
 
-export type ShellingAttackType =
-  | ShellingAttackType.Normal
-  | ShellingAttackType.Carrier;
+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";
+}
+
+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 interface MasterIBonusRule {
+  expr: CompiledEvaler;
+  formula: CompiledEvaler;
+}
 
 export interface FleetCutinAnalysis {
   shelling: FleetCutinInfo[];
@@ -203,12 +260,28 @@ export type SpeedGroup =
   | SpeedGroup.B2
   | SpeedGroup.C;
 
-declare namespace AswAttackType {
-  export type DepthCharge = "DepthCharge";
-  export type Aircraft = "Aircraft";
+declare namespace AirWaveType {
+  export type Jet = "Jet";
+  export type LandBase = "LandBase";
+  export type Carrier = "Carrier";
 }
 
-export type AswAttackType = AswAttackType.DepthCharge | AswAttackType.Aircraft;
+export type AirWaveType =
+  | AirWaveType.Jet
+  | AirWaveType.LandBase
+  | AirWaveType.Carrier;
+
+export interface SimulatorResult {
+  items: SimulatorResultItem[];
+  sunk_vec: [number, number, number][];
+}
+
+export interface SimulatorResultItem {
+  id: string;
+  role: Role;
+  index: number;
+  damage_state_map: Record<DamageState, number>;
+}
 
 declare namespace OrgType {
   export type Single = "Single";
@@ -227,43 +300,6 @@ export type OrgType =
   | OrgType.EnemySingle
   | OrgType.EnemyCombined;
 
-declare namespace FleetCutin {
-  export type NelsonTouch = "NelsonTouch";
-  export type NagatoCutin = "NagatoCutin";
-  export type ColoradoCutin = "ColoradoCutin";
-  export type KongouCutin = "KongouCutin";
-  export type Yamato2ShipCutin = "Yamato2ShipCutin";
-  export type Yamato3ShipCutin = "Yamato3ShipCutin";
-}
-
-export type FleetCutin =
-  | FleetCutin.NelsonTouch
-  | FleetCutin.NagatoCutin
-  | FleetCutin.ColoradoCutin
-  | FleetCutin.KongouCutin
-  | FleetCutin.Yamato2ShipCutin
-  | FleetCutin.Yamato3ShipCutin;
-
-declare namespace AirWaveType {
-  export type Jet = "Jet";
-  export type LandBase = "LandBase";
-  export type Carrier = "Carrier";
-}
-
-export type AirWaveType =
-  | AirWaveType.Jet
-  | AirWaveType.LandBase
-  | AirWaveType.Carrier;
-
-export type NumMap<K, V> = Partial<Record<K, V>>;
-
-declare namespace Role {
-  export type Main = "Main";
-  export type Escort = "Escort";
-}
-
-export type Role = Role.Main | Role.Escort;
-
 export interface CompMeta {
   fleets: Record<FleetType, FleetMeta>;
 }
@@ -279,69 +315,12 @@ export interface ShipMeta {
   ship_id: number;
 }
 
-export interface MasterData {
-  gears: MasterGear[];
-  gear_attrs: MasterAttrRule<GearAttr>[];
-  ships: MasterShip[];
-  ship_attrs: MasterAttrRule<ShipAttr>[];
-  ibonuses: MasterIBonuses;
-  equippable: MasterEquippable;
-  formation: NestedFormationDef[];
-  anti_air_cutin: AntiAirCutinDef[];
-  day_cutin: DayCutinDef[];
-  night_cutin: NightCutinDef[];
-}
-
-export interface MasterConfig {
-  formation: NestedFormationDef[];
-  anti_air_cutin: AntiAirCutinDef[];
-  day_cutin: DayCutinDef[];
-  night_cutin: NightCutinDef[];
-}
-
-export interface MasterAttrRule<T> {
-  tag: T;
-  name: string;
-  expr: string;
-}
-
-export interface WarfareContext {
-  attacker_env: WarfareShipEnvironment;
-  target_env: WarfareShipEnvironment;
-  engagement: Engagement;
-  air_state: AirState;
-}
-
-export interface WarfareShipEnvironment {
-  org_type: OrgType;
-  role: Role;
-  ship_index: number;
-  fleet_len: number;
-  formation: Formation;
-  fleet_los_mod: number | null;
-}
-
-export interface CompDayCutinRateInfo {
-  main: FleetDayCutinRateInfo;
-  escort: FleetDayCutinRateInfo | null;
-}
-
-export interface FleetDayCutinRateInfo {
-  fleet_los_mod: number | null;
-  ships: ShipDayCutinRateInfo[];
-}
-
-export interface ShipDayCutinRateInfo {
-  ship_id: number;
-  air_supremacy: DayCutinRateInfo;
-  air_superiority: DayCutinRateInfo;
+declare namespace AswAttackType {
+  export type DepthCharge = "DepthCharge";
+  export type Aircraft = "Aircraft";
 }
 
-export interface DayCutinRateInfo {
-  observation_term: number | null;
-  rates: [DayCutin | null, number | null][];
-  total_cutin_rate: number | null;
-}
+export type AswAttackType = AswAttackType.DepthCharge | AswAttackType.Aircraft;
 
 declare namespace GearCategory {
   export type Fighter = "Fighter";
@@ -495,18 +474,137 @@ export type GearType =
   | GearType.LargeRadar2
   | GearType.CbRecon2;
 
-declare namespace Engagement {
-  export type GreenT = "GreenT";
-  export type Parallel = "Parallel";
-  export type HeadOn = "HeadOn";
-  export type RedT = "RedT";
-}
+export type NumMap<K, V> = Partial<Record<K, V>>;
 
-export type Engagement =
-  | Engagement.GreenT
-  | Engagement.Parallel
-  | Engagement.HeadOn
-  | Engagement.RedT;
+type __ShellingSpecialAttackDayCutin = DayCutin;
+type __ShellingSpecialAttackFleetCutin = FleetCutin;
+declare namespace ShellingSpecialAttack {
+  export type DayCutin = { DayCutin: __ShellingSpecialAttackDayCutin };
+  export type FleetCutin = { FleetCutin: __ShellingSpecialAttackFleetCutin };
+}
+
+export type ShellingSpecialAttack =
+  | ShellingSpecialAttack.DayCutin
+  | ShellingSpecialAttack.FleetCutin;
+
+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 Role {
+  export type Main = "Main";
+  export type Escort = "Escort";
+}
+
+export type Role = Role.Main | Role.Escort;
+
+declare namespace Engagement {
+  export type GreenT = "GreenT";
+  export type Parallel = "Parallel";
+  export type HeadOn = "HeadOn";
+  export type RedT = "RedT";
+}
+
+export type Engagement =
+  | Engagement.GreenT
+  | Engagement.Parallel
+  | 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 interface NightConditions {
+  night_contact_rank?: ContactRank | null;
+  starshell_index?: number | null;
+  searchlight_index?: number | null;
+}
+
+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 interface MasterData {
+  gears: MasterGear[];
+  gear_attrs: MasterAttrRule<GearAttr>[];
+  ships: MasterShip[];
+  ship_attrs: MasterAttrRule<ShipAttr>[];
+  ibonuses: MasterIBonuses;
+  equippable: MasterEquippable;
+  formation: NestedFormationDef[];
+  anti_air_cutin: AntiAirCutinDef[];
+  day_cutin: DayCutinDef[];
+  night_cutin: NightCutinDef[];
+}
+
+export interface MasterConfig {
+  formation: NestedFormationDef[];
+  anti_air_cutin: AntiAirCutinDef[];
+  day_cutin: DayCutinDef[];
+  night_cutin: NightCutinDef[];
+}
+
+export interface MasterAttrRule<T> {
+  tag: T;
+  name: string;
+  expr: string;
+}
+
+export interface CompDayCutinRateInfo {
+  main: FleetDayCutinRateInfo;
+  escort: FleetDayCutinRateInfo | null;
+}
+
+export interface FleetDayCutinRateInfo {
+  fleet_los_mod: number | null;
+  ships: ShipDayCutinRateInfo[];
+}
+
+export interface ShipDayCutinRateInfo {
+  ship_id: number;
+  air_supremacy: DayCutinRateInfo;
+  air_superiority: DayCutinRateInfo;
+}
+
+export interface DayCutinRateInfo {
+  observation_term: number | null;
+  rates: [DayCutin | null, number | null][];
+  total_cutin_rate: number | null;
+}
 
 export interface EBonuses {
   firepower: number;
@@ -548,70 +646,12 @@ export interface GearInput {
 
 export type GearVecInput = GearInput[];
 
-declare namespace AirStateRank {
-  export type Rank0 = "Rank0";
-  export type Rank1 = "Rank1";
-  export type Rank2 = "Rank2";
-  export type Rank3 = "Rank3";
-}
-
-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";
-}
-
-export type AirState =
-  | AirState.AirSupremacy
-  | AirState.AirSuperiority
-  | AirState.AirParity
-  | AirState.AirDenial
-  | AirState.AirIncapability;
-
 export interface ShellingSupportSimulatorParams {
-  attacker_formation: Formation;
-  target_formation: Formation;
+  attacker_formation?: Formation;
+  target_formation?: Formation;
   engagement: Engagement;
 }
 
-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 NightSituation {
-  night_contact_rank: ContactRank | null;
-  starshell: boolean;
-  searchlight: boolean;
-}
-
 export interface DamageInfo {
   miss_damage_min: number;
   miss_damage_max: number;
@@ -625,38 +665,68 @@ export interface DamageInfo {
   damage_state_map: NumMap<DamageState, number>;
 }
 
-declare namespace ShipAttr {
+declare namespace GearAttr {
   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 type HighAngleMount = "HighAngleMount";
+  export type NightFighter = "NightFighter";
+  export type NightAttacker = "NightAttacker";
+  export type HeavyBomber = "HeavyBomber";
+  export type NightRecon = "NightRecon";
+  export type MainGun = "MainGun";
+  export type Radar = "Radar";
+  export type SurfaceRadar = "SurfaceRadar";
+  export type AirRadar = "AirRadar";
+  export type DepthChargeProjector = "DepthChargeProjector";
+  export type SynergisticDepthCharge = "SynergisticDepthCharge";
+  export type AntiSubMortar = "AntiSubMortar";
+  export type AntiSubWeapon = "AntiSubWeapon";
+  export type AntiSubAircraft = "AntiSubAircraft";
+  export type LateModelBowTorpedo = "LateModelBowTorpedo";
+  export type Seaplane = "Seaplane";
+  export type CbAircraft = "CbAircraft";
+  export type LbAircraft = "LbAircraft";
+  export type JetAircraft = "JetAircraft";
+  export type Fighter = "Fighter";
+  export type Recon = "Recon";
+  export type ObservationSeaplane = "ObservationSeaplane";
+  export type CbFighterBomber = "CbFighterBomber";
+  export type AntiInstDiveBomber = "AntiInstDiveBomber";
+  export type CbSwordfish = "CbSwordfish";
+  export type SemiNightPlane = "SemiNightPlane";
+  export type HighAltitudeInterceptor = "HighAltitudeInterceptor";
 }
 
-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;
+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;
 
 type __FormationCombinedFormation = CombinedFormation;
 type __FormationSingleFormation = SingleFormation;
@@ -719,143 +789,14 @@ export interface AttackPowerModifier {
   b?: number;
 }
 
-export interface AttackPower {
-  precap: number;
-  is_capped: boolean;
-  capped: number;
-  normal: number;
-  critical: number;
-  armor_penetration: number;
-  remaining_ammo_mod: number;
-}
-
-export interface AttackPowerParams {
-  basic: number;
-  cap: number;
-  precap_mod: AttackPowerModifier;
-  postcap_mod: AttackPowerModifier;
-  ap_shell_mod: number | null;
-  carrier_power: number | null;
-  proficiency_critical_mod: number | null;
-  armor_penetration: number;
-  remaining_ammo_mod: number;
-  special_enemy_mods: SpecialEnemyModifiers;
-  custom_mods: CustomPowerModifiers;
-}
-
-export interface SpecialEnemyModifiers {
-  precap_general_mod: AttackPowerModifier;
-  stype_mod: AttackPowerModifier;
-  landing_craft_synergy_mod: AttackPowerModifier;
-  toku_daihatsu_tank_mod: AttackPowerModifier;
-  m4a1dd_mod: AttackPowerModifier;
-  honi_mod: AttackPowerModifier;
-  postcap_general_mod: AttackPowerModifier;
-  pt_mod: AttackPowerModifier;
-}
-
-export interface CompAntiAirInfo {
-  fleet_adjusted_anti_air: number;
-  ships: ShipAntiAirInfo[];
-  anti_air_cutin_chance: [number, number][];
-}
-
-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 CompContactChanceInfo {
-  single: AirstrikeContactChance[] | null;
-  combined: AirstrikeContactChance[] | null;
-}
-
-export interface AirstrikeContactChance {
-  air_state: AirState;
-  trigger_rate: number;
-  rank3: number;
-  rank2: number;
-  rank1: number;
-  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 GearAttr {
-  export type Unknown = "Unknown";
-  export type Abyssal = "Abyssal";
-  export type HighAngleMount = "HighAngleMount";
-  export type NightFighter = "NightFighter";
-  export type NightAttacker = "NightAttacker";
-  export type HeavyBomber = "HeavyBomber";
-  export type MainGun = "MainGun";
-  export type Radar = "Radar";
-  export type SurfaceRadar = "SurfaceRadar";
-  export type AirRadar = "AirRadar";
-  export type DepthChargeProjector = "DepthChargeProjector";
-  export type SynergisticDepthCharge = "SynergisticDepthCharge";
-  export type AntiSubMortar = "AntiSubMortar";
-  export type AntiSubWeapon = "AntiSubWeapon";
-  export type AntiSubAircraft = "AntiSubAircraft";
-  export type LateModelBowTorpedo = "LateModelBowTorpedo";
-  export type Seaplane = "Seaplane";
-  export type CbAircraft = "CbAircraft";
-  export type LbAircraft = "LbAircraft";
-  export type JetAircraft = "JetAircraft";
-  export type Fighter = "Fighter";
-  export type Recon = "Recon";
-  export type ObservationSeaplane = "ObservationSeaplane";
-  export type CbFighterBomber = "CbFighterBomber";
-  export type AntiInstDiveBomber = "AntiInstDiveBomber";
-  export type NightRecon = "NightRecon";
-  export type CbSwordfish = "CbSwordfish";
-  export type SemiNightPlane = "SemiNightPlane";
-  export type HighAltitudeInterceptor = "HighAltitudeInterceptor";
+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;
 }
 
-export type GearAttr =
-  | GearAttr.Unknown
-  | GearAttr.Abyssal
-  | GearAttr.HighAngleMount
-  | GearAttr.NightFighter
-  | GearAttr.NightAttacker
-  | GearAttr.HeavyBomber
-  | 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.NightRecon
-  | GearAttr.CbSwordfish
-  | GearAttr.SemiNightPlane
-  | GearAttr.HighAltitudeInterceptor;
-
 declare namespace FleetType {
   export type Main = "Main";
   export type Escort = "Escort";
@@ -891,33 +832,49 @@ export interface EquipStype {
   equip_type: number[];
 }
 
-type __NightBattleAttackTypeAswAttackType = AswAttackType;
-type __NightBattleAttackTypeNightAttackType = NightAttackType;
-declare namespace NightBattleAttackType {
-  export type NightAttack = {
-    t: "NightAttack";
-    c: __NightBattleAttackTypeNightAttackType;
-  };
-  export type Asw = { t: "Asw"; c: __NightBattleAttackTypeAswAttackType };
+declare namespace ShellingAttackType {
+  export type Normal = "Normal";
+  export type Carrier = "Carrier";
 }
 
-export type NightBattleAttackType =
-  | NightBattleAttackType.NightAttack
-  | NightBattleAttackType.Asw;
+export type ShellingAttackType =
+  | ShellingAttackType.Normal
+  | ShellingAttackType.Carrier;
 
-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 AttackPower {
+  precap: number;
+  is_capped: boolean;
+  capped: number;
+  normal: number;
+  critical: number;
+  armor_penetration: number;
+  remaining_ammo_mod: number;
 }
 
-export type DayBattleAttackType =
-  | DayBattleAttackType.Shelling
-  | DayBattleAttackType.Asw;
+export interface AttackPowerParams {
+  basic: number;
+  cap: number;
+  precap_mod: AttackPowerModifier;
+  postcap_mod: AttackPowerModifier;
+  ap_shell_mod: number | null;
+  carrier_power: number | null;
+  proficiency_critical_mod: number | null;
+  armor_penetration: number;
+  remaining_ammo_mod: number;
+  special_enemy_mods: SpecialEnemyModifiers;
+  custom_mods: CustomPowerModifiers;
+}
+
+export interface SpecialEnemyModifiers {
+  precap_general_mod: AttackPowerModifier;
+  stype_mod: AttackPowerModifier;
+  landing_craft_synergy_mod: AttackPowerModifier;
+  toku_daihatsu_tank_mod: AttackPowerModifier;
+  m4a1dd_mod: AttackPowerModifier;
+  honi_mod: AttackPowerModifier;
+  postcap_general_mod: AttackPowerModifier;
+  pt_mod: AttackPowerModifier;
+}
 
 export interface AttackInfo<AttackType, Cutin> {
   attack_type: AttackType;
@@ -940,155 +897,45 @@ export interface AttackStats {
   damage: DamageInfo | null;
 }
 
-export type ShipStateMap = Record<ShipKey, ShipState>;
-
-declare namespace ShipKey {
-  export type s1 = "s1";
-  export type s2 = "s2";
-  export type s3 = "s3";
-  export type s4 = "s4";
-  export type s5 = "s5";
-  export type s6 = "s6";
-  export type s7 = "s7";
-}
-
-export type ShipKey =
-  | ShipKey.s1
-  | ShipKey.s2
-  | ShipKey.s3
-  | ShipKey.s4
-  | ShipKey.s5
-  | ShipKey.s6
-  | ShipKey.s7;
-
-export interface OrgState {
-  id?: string;
-  f1?: FleetState;
-  f2?: FleetState;
-  f3?: FleetState;
-  f4?: FleetState;
-  a1?: AirSquadronState;
-  a2?: AirSquadronState;
-  a3?: AirSquadronState;
-  hq_level?: number;
-  org_type?: OrgType;
-  sortie?: string;
-  route_sup?: string;
-  boss_sup?: string;
-}
-
-export interface AirSquadronState extends GearVecState, SlotSizeVecState {
-  id?: string;
-  mode?: AirSquadronMode;
-}
-
-declare namespace AirSquadronMode {
-  export type Sortie = "Sortie";
-  export type AirDefense = "AirDefense";
-}
-
-export type AirSquadronMode =
-  | AirSquadronMode.Sortie
-  | AirSquadronMode.AirDefense;
-
-export interface FleetState {
-  id?: string;
-  len?: number;
-  s1?: ShipState;
-  s2?: ShipState;
-  s3?: ShipState;
-  s4?: ShipState;
-  s5?: ShipState;
-  s6?: ShipState;
-  s7?: ShipState;
+export interface CompAntiAirInfo {
+  fleet_adjusted_anti_air: number;
+  ships: ShipAntiAirInfo[];
+  anti_air_cutin_chance: [number, number][];
 }
 
-export interface ShipState extends GearVecState, SlotSizeVecState {
-  id?: string;
+export interface ShipAntiAirInfo {
   ship_id: number;
-  level?: number;
-  current_hp?: number;
-  morale?: number;
-  ammo?: number;
-  fuel?: number;
-  max_hp_mod?: number;
-  firepower_mod?: number;
-  torpedo_mod?: number;
-  armor_mod?: number;
-  anti_air_mod?: number;
-  evasion_mod?: number;
-  asw_mod?: number;
-  los_mod?: number;
-  luck_mod?: number;
-  day_gunfit_accuracy?: number;
-  night_gunfit_accuracy?: number;
-  custom_power_mods?: CustomPowerModifiers;
-}
-
-export interface SlotSizeVecState {
-  ss1?: number;
-  ss2?: number;
-  ss3?: number;
-  ss4?: number;
-  ss5?: number;
-}
-
-export interface GearVecState {
-  g1?: GearState;
-  g2?: GearState;
-  g3?: GearState;
-  g4?: GearState;
-  g5?: GearState;
-  gx?: GearState;
-}
-
-export interface GearState {
-  id?: string;
-  gear_id: number;
-  exp?: number;
-  stars?: 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 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_resistance?: number;
-  fleet_anti_air_resistance?: number;
+export interface CompContactChanceInfo {
+  single: AirstrikeContactChance[] | null;
+  combined: AirstrikeContactChance[] | null;
 }
 
-export interface HitRate {
+export interface AirstrikeContactChance {
+  air_state: AirState;
+  trigger_rate: number;
+  rank3: number;
+  rank2: number;
+  rank1: number;
   total: number;
-  normal: number;
-  critical: number;
 }
 
-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 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";
@@ -1146,7 +993,18 @@ export type NightCutin =
   | NightCutin.Cvci1_18
   | NightCutin.Photobomber;
 
-export interface BattleConfig {
+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>;
@@ -1240,32 +1098,72 @@ export interface MasterShip {
 
 export type StatInterval = [number | null, number | null];
 
-export type GearTypeIdArray = [number, number, number, number, number];
+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_resistance?: number;
+  fleet_anti_air_resistance?: number;
+}
 
-declare namespace ContactRank {
-  export type Rank1 = "Rank1";
-  export type Rank2 = "Rank2";
-  export type Rank3 = "Rank3";
+export interface WarfareContext {
+  attacker_env: ShipEnvironment;
+  target_env: ShipEnvironment;
+  engagement: Engagement;
+  air_state: AirState;
 }
 
-export type ContactRank =
-  | ContactRank.Rank1
-  | ContactRank.Rank2
-  | ContactRank.Rank3;
+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 SimulatorResult {
-  items: SimulatorResultItem[];
-  sunk_vec: [number, number, number][];
+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 SimulatorResultItem {
-  id: string;
-  role: Role;
-  index: number;
-  damage_state_map: Record<DamageState, number>;
+export type DayBattleAttackType =
+  | DayBattleAttackType.Shelling
+  | DayBattleAttackType.Asw;
+
+export interface WarfareAnalysisResult {
+  player: AttackAnalysisResult;
+  enemy: AttackAnalysisResult;
 }
 
-export interface WarfareInfo {
+export interface AttackAnalysisResult {
   day: AttackInfo<DayBattleAttackType, DayCutin | null> | null;
   closing_torpedo: AttackInfo<null, null> | null;
   night: AttackInfo<NightBattleAttackType, NightCutin | null> | null;
@@ -1273,23 +1171,148 @@ export interface WarfareInfo {
   opening_asw: AttackInfo<null, null> | null;
 }
 
-export interface WarfareAnalyzerContext {
-  attacker_env: WarfareAnalyzerShipEnvironment;
-  target_env: WarfareAnalyzerShipEnvironment;
-  engagement: Engagement;
-  air_state: AirState;
+export type ShipStateMap = Record<ShipKey, ShipState>;
+
+declare namespace ShipKey {
+  export type s1 = "s1";
+  export type s2 = "s2";
+  export type s3 = "s3";
+  export type s4 = "s4";
+  export type s5 = "s5";
+  export type s6 = "s6";
+  export type s7 = "s7";
 }
 
-export interface WarfareAnalyzerShipEnvironment {
-  org_type: OrgType;
-  role: Role;
-  ship_index: number;
-  fleet_len: number;
-  formation: Formation;
-  fleet_los_mod: number | null;
-  night_situation: NightSituation;
+export type ShipKey =
+  | ShipKey.s1
+  | ShipKey.s2
+  | ShipKey.s3
+  | ShipKey.s4
+  | ShipKey.s5
+  | ShipKey.s6
+  | ShipKey.s7;
+
+export interface OrgState {
+  id?: string;
+  f1?: FleetState;
+  f2?: FleetState;
+  f3?: FleetState;
+  f4?: FleetState;
+  a1?: AirSquadronState;
+  a2?: AirSquadronState;
+  a3?: AirSquadronState;
+  hq_level?: number;
+  org_type?: OrgType;
+  sortie?: string;
+  route_sup?: string;
+  boss_sup?: string;
+}
+
+export interface AirSquadronState extends GearVecState, SlotSizeVecState {
+  id?: string;
+  mode?: AirSquadronMode;
+}
+
+declare namespace AirSquadronMode {
+  export type Sortie = "Sortie";
+  export type AirDefense = "AirDefense";
+}
+
+export type AirSquadronMode =
+  | AirSquadronMode.Sortie
+  | AirSquadronMode.AirDefense;
+
+export interface FleetState {
+  id?: string;
+  len?: number;
+  s1?: ShipState;
+  s2?: ShipState;
+  s3?: ShipState;
+  s4?: ShipState;
+  s5?: ShipState;
+  s6?: ShipState;
+  s7?: ShipState;
+}
+
+export interface ShipState extends GearVecState, SlotSizeVecState {
+  id?: string;
+  ship_id: number;
+  level?: number;
+  current_hp?: number;
+  morale?: number;
+  ammo?: number;
+  fuel?: number;
+  max_hp_mod?: number;
+  firepower_mod?: number;
+  torpedo_mod?: number;
+  armor_mod?: number;
+  anti_air_mod?: number;
+  evasion_mod?: number;
+  asw_mod?: number;
+  los_mod?: number;
+  luck_mod?: number;
+  day_gunfit_accuracy?: number;
+  night_gunfit_accuracy?: number;
+  custom_power_mods?: CustomPowerModifiers;
 }
 
+export interface SlotSizeVecState {
+  ss1?: number;
+  ss2?: number;
+  ss3?: number;
+  ss4?: number;
+  ss5?: number;
+}
+
+export interface GearVecState {
+  g1?: GearState;
+  g2?: GearState;
+  g3?: GearState;
+  g4?: GearState;
+  g5?: GearState;
+  gx?: GearState;
+}
+
+export interface GearState {
+  id?: string;
+  gear_id: number;
+  exp?: number;
+  stars?: number;
+}
+
+export interface HitRate {
+  total: number;
+  normal: number;
+  critical: number;
+}
+
+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 GearTypeIdArray = [number, number, number, number, number];
+
+declare namespace ShellingAttackType {
+  export type Normal = "Normal";
+  export type Carrier = "Carrier";
+}
+
+export type ShellingAttackType =
+  | ShellingAttackType.Normal
+  | ShellingAttackType.Carrier;
+
+declare namespace AswAttackType {
+  export type DepthCharge = "DepthCharge";
+  export type Aircraft = "Aircraft";
+}
+
+export type AswAttackType = AswAttackType.DepthCharge | AswAttackType.Aircraft;
+
 export interface FleetNightCutinRateInfo {
   night_contact_chance: NightContactChance;
   ships: ShipNightCutinRateInfo[];
@@ -1381,14 +1404,14 @@ export class Analyzer {
   analyze_day_cutin(comp: Comp): CompDayCutinRateInfo;
   /**
    * @param {Comp} comp
-   * @param {NightSituation} attacker_situation
-   * @param {NightSituation} target_situation
+   * @param {NightConditions} attacker_conditions
+   * @param {NightConditions} target_conditions
    * @returns {FleetNightCutinRateInfo}
    */
   analyze_night_cutin(
     comp: Comp,
-    attacker_situation: NightSituation,
-    target_situation: NightSituation
+    attacker_conditions: NightConditions,
+    target_conditions: NightConditions
   ): FleetNightCutinRateInfo;
   /**
    * @param {Comp} comp
@@ -1396,13 +1419,13 @@ export class Analyzer {
    */
   analyze_contact_chance(comp: Comp): CompContactChanceInfo;
   /**
-   * @param {WarfareAnalyzerContext} params
+   * @param {WarfareContext} params
    * @param {Ship} attacker
    * @param {Ship} target
    * @returns {WarfareInfo}
    */
   analyze_warfare(
-    params: WarfareAnalyzerContext,
+    params: WarfareContext,
     attacker: Ship,
     target: Ship
   ): WarfareInfo;
@@ -1496,13 +1519,13 @@ export class Comp {
   transport_point(): number;
   /**
    * @param {Ship} ship
-   * @param {Formation} formation
-   * @returns {WarfareShipEnvironment}
+   * @param {Formation | undefined} formation
+   * @returns {ShipEnvironment}
    */
   create_warfare_ship_environment(
     ship: Ship,
-    formation: Formation
-  ): WarfareShipEnvironment;
+    formation?: Formation
+  ): ShipEnvironment;
   /**
    */
   boss_sup?: Fleet;
@@ -2066,15 +2089,6 @@ export class Org {
    * @returns {number}
    */
   high_altitude_interception_power(): number;
-  /**
-   * @param {Ship} ship
-   * @param {Formation} formation
-   * @returns {WarfareShipEnvironment}
-   */
-  create_warfare_ship_environment(
-    ship: Ship,
-    formation: Formation
-  ): WarfareShipEnvironment;
   /**
    * @returns {Org}
    */