fleethub-core 1.7.9 → 1.7.11

package/pkg/fleethub_core.d.ts

@@ -75,135 +75,118 @@ 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 AirStateRank {
+  export type Rank0 = "Rank0";
+  export type Rank1 = "Rank1";
+  export type Rank2 = "Rank2";
+  export type Rank3 = "Rank3";
 }
 
-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 AirStateRank =
+  | AirStateRank.Rank0
+  | AirStateRank.Rank1
+  | AirStateRank.Rank2
+  | AirStateRank.Rank3;
 
-declare namespace Engagement {
-  export type GreenT = "GreenT";
-  export type Parallel = "Parallel";
-  export type HeadOn = "HeadOn";
-  export type RedT = "RedT";
+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 Engagement =
-  | Engagement.GreenT
-  | Engagement.Parallel
-  | Engagement.HeadOn
-  | Engagement.RedT;
+export type AirState =
+  | AirState.AirSupremacy
+  | AirState.AirSuperiority
+  | AirState.AirParity
+  | AirState.AirDenial
+  | AirState.AirIncapability;
 
-declare namespace SpecialEnemyType {
-  export type None = "None";
-  export type SoftSkinned = "SoftSkinned";
-  export type Pillbox = "Pillbox";
-  export type IsolatedIsland = "IsolatedIsland";
-  export type SupplyDepot = "SupplyDepot";
-  export type HarbourSummerPrincess = "HarbourSummerPrincess";
-  export type PtImp = "PtImp";
-  export type BattleshipSummerPrincess = "BattleshipSummerPrincess";
-  export type HeavyCruiserSummerPrincess = "HeavyCruiserSummerPrincess";
+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 SpecialEnemyType =
-  | SpecialEnemyType.None
-  | SpecialEnemyType.SoftSkinned
-  | SpecialEnemyType.Pillbox
-  | SpecialEnemyType.IsolatedIsland
-  | SpecialEnemyType.SupplyDepot
-  | SpecialEnemyType.HarbourSummerPrincess
-  | SpecialEnemyType.PtImp
-  | SpecialEnemyType.BattleshipSummerPrincess
-  | SpecialEnemyType.HeavyCruiserSummerPrincess;
-
-declare namespace MoraleState {
-  export type Sparkle = "Sparkle";
-  export type Normal = "Normal";
-  export type Orange = "Orange";
-  export type Red = "Red";
+export interface MasterIBonusRule {
+  expr: CompiledEvaler;
+  formula: CompiledEvaler;
 }
 
-export type MoraleState =
-  | MoraleState.Sparkle
-  | MoraleState.Normal
-  | MoraleState.Orange
-  | MoraleState.Red;
-
-declare namespace DamageState {
+declare namespace ShellingAttackType {
   export type Normal = "Normal";
-  export type Shouha = "Shouha";
-  export type Chuuha = "Chuuha";
-  export type Taiha = "Taiha";
-  export type Sunk = "Sunk";
+  export type Carrier = "Carrier";
 }
 
-export type DamageState =
-  | DamageState.Normal
-  | DamageState.Shouha
-  | DamageState.Chuuha
-  | DamageState.Taiha
-  | DamageState.Sunk;
+export type ShellingAttackType =
+  | ShellingAttackType.Normal
+  | ShellingAttackType.Carrier;
 
-declare namespace SpeedGroup {
-  export type A = "A";
-  export type B1 = "B1";
-  export type B2 = "B2";
-  export type C = "C";
+export interface FleetCutinAnalysis {
+  shelling: FleetCutinInfo[];
+  night: FleetCutinInfo[];
 }
 
-export type SpeedGroup =
-  | SpeedGroup.A
-  | SpeedGroup.B1
-  | SpeedGroup.B2
-  | SpeedGroup.C;
-
-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 interface FleetCutinInfo {
+  cutin: FleetCutin;
+  rate: number | null;
+  formation: Formation;
+  items: FleetCutinInfoItem[];
 }
 
-export type FleetCutin =
-  | FleetCutin.NelsonTouch
-  | FleetCutin.NagatoCutin
-  | FleetCutin.ColoradoCutin
-  | FleetCutin.KongouCutin
-  | FleetCutin.Yamato2ShipCutin
-  | FleetCutin.Yamato3ShipCutin;
+export interface FleetCutinInfoItem {
+  ship_id: number;
+  cutin: FleetCutin;
+  fleet_cutin_mod: number;
+  stats: AttackStats;
+}
 
 declare namespace AirWaveType {
   export type Jet = "Jet";
@@ -252,21 +235,12 @@ export type OrgType =
   | OrgType.EnemySingle
   | OrgType.EnemyCombined;
 
-export interface WarfareContext {
-  attacker_env: WarfareShipEnvironment;
-  target_env: WarfareShipEnvironment;
-  engagement: Engagement;
-  air_state: AirState;
+declare namespace Role {
+  export type Main = "Main";
+  export type Escort = "Escort";
 }
 
-export interface WarfareShipEnvironment {
-  org_type: OrgType;
-  role: Role;
-  ship_index: number;
-  fleet_len: number;
-  formation: Formation;
-  fleet_los_mod: number | null;
-}
+export type Role = Role.Main | Role.Escort;
 
 export interface CompMeta {
   fleets: Record<FleetType, FleetMeta>;
@@ -283,41 +257,6 @@ 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 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;
-
 declare namespace GearCategory {
   export type Fighter = "Fighter";
   export type Bomber = "Bomber";
@@ -470,13 +409,116 @@ export type GearType =
   | GearType.LargeRadar2
   | GearType.CbRecon2;
 
-export interface CompDayCutinRateInfo {
-  main: FleetDayCutinRateInfo;
-  escort: FleetDayCutinRateInfo | null;
+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 FleetDayCutinRateInfo {
-  fleet_los_mod: number | null;
+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 type NumMap<K, V> = Partial<Record<K, V>>;
+
+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 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 CompDayCutinRateInfo {
+  main: FleetDayCutinRateInfo;
+  escort: FleetDayCutinRateInfo | null;
+}
+
+export interface FleetDayCutinRateInfo {
+  fleet_los_mod: number | null;
   ships: ShipDayCutinRateInfo[];
 }
 
@@ -523,261 +565,32 @@ export interface GearInput {
   asw: number;
   los: number;
   bombing: number;
-  accuracy: number;
-  range: number;
-  radius: number;
-  stars: number;
-  ace: number;
-}
-
-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 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;
-}
-
-declare namespace ShellingAttackType {
-  export type Normal = "Normal";
-  export type Carrier = "Carrier";
-}
-
-export type ShellingAttackType =
-  | ShellingAttackType.Normal
-  | ShellingAttackType.Carrier;
-
-export interface NightSituation {
-  night_contact_rank: ContactRank | null;
-  starshell: boolean;
-  searchlight: boolean;
-}
-
-export interface FleetCutinAnalysis {
-  shelling: FleetCutinInfo[];
-  night: FleetCutinInfo[];
-}
-
-export interface FleetCutinInfo {
-  cutin: FleetCutin;
-  rate: number | null;
-  formation: Formation;
-  items: FleetCutinInfoItem[];
-}
-
-export interface FleetCutinInfoItem {
-  ship_id: number;
-  cutin: FleetCutin;
-  fleet_cutin_mod: number;
-  stats: AttackStats;
-}
-
-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>;
-}
-
-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 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;
-
-type __FormationCombinedFormation = CombinedFormation;
-type __FormationSingleFormation = SingleFormation;
-declare namespace Formation {
-  export type Single = __FormationSingleFormation;
-  export type Combined = __FormationCombinedFormation;
-}
-
-export type Formation = Formation.Single | Formation.Combined;
-
-declare namespace CombinedFormation {
-  export type Cruising1 = "Cruising1";
-  export type Cruising2 = "Cruising2";
-  export type Cruising3 = "Cruising3";
-  export type Cruising4 = "Cruising4";
-}
-
-export type CombinedFormation =
-  | CombinedFormation.Cruising1
-  | CombinedFormation.Cruising2
-  | CombinedFormation.Cruising3
-  | CombinedFormation.Cruising4;
-
-declare namespace SingleFormation {
-  export type LineAhead = "LineAhead";
-  export type DoubleLine = "DoubleLine";
-  export type Diamond = "Diamond";
-  export type Echelon = "Echelon";
-  export type LineAbreast = "LineAbreast";
-  export type Vanguard = "Vanguard";
-}
-
-export type SingleFormation =
-  | SingleFormation.LineAhead
-  | SingleFormation.DoubleLine
-  | SingleFormation.Diamond
-  | SingleFormation.Echelon
-  | SingleFormation.LineAbreast
-  | SingleFormation.Vanguard;
-
-export interface CustomPowerModifiers {
-  precap_mod?: AttackPowerModifier;
-  postcap_mod?: AttackPowerModifier;
-  basic_power_mod?: AttackPowerModifier;
-}
-
-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 AttackPowerModifier {
-  a?: number;
-  b?: number;
-}
-
-export interface ShellingSupportSimulatorParams {
-  attacker_formation: Formation;
-  target_formation: Formation;
-  engagement: Engagement;
-}
-
-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;
+  accuracy: number;
+  range: number;
+  radius: number;
+  stars: number;
+  ace: number;
 }
 
-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 type GearVecInput = GearInput[];
 
-export interface CompContactChanceInfo {
-  single: AirstrikeContactChance[] | null;
-  combined: AirstrikeContactChance[] | null;
+export interface ShellingSupportSimulatorParams {
+  attacker_formation?: Formation;
+  target_formation?: Formation;
+  engagement: Engagement;
 }
 
-export interface AirstrikeContactChance {
-  air_state: AirState;
-  trigger_rate: number;
-  rank3: number;
-  rank2: number;
-  rank1: number;
-  total: number;
+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>;
 }
 
 declare namespace GearAttr {
@@ -843,6 +656,92 @@ export type GearAttr =
   | GearAttr.SemiNightPlane
   | GearAttr.HighAltitudeInterceptor;
 
+type __FormationCombinedFormation = CombinedFormation;
+type __FormationSingleFormation = SingleFormation;
+declare namespace Formation {
+  export type Single = __FormationSingleFormation;
+  export type Combined = __FormationCombinedFormation;
+}
+
+export type Formation = Formation.Single | Formation.Combined;
+
+declare namespace CombinedFormation {
+  export type Cruising1 = "Cruising1";
+  export type Cruising2 = "Cruising2";
+  export type Cruising3 = "Cruising3";
+  export type Cruising4 = "Cruising4";
+}
+
+export type CombinedFormation =
+  | CombinedFormation.Cruising1
+  | CombinedFormation.Cruising2
+  | CombinedFormation.Cruising3
+  | CombinedFormation.Cruising4;
+
+declare namespace SingleFormation {
+  export type LineAhead = "LineAhead";
+  export type DoubleLine = "DoubleLine";
+  export type Diamond = "Diamond";
+  export type Echelon = "Echelon";
+  export type LineAbreast = "LineAbreast";
+  export type Vanguard = "Vanguard";
+}
+
+export type SingleFormation =
+  | SingleFormation.LineAhead
+  | SingleFormation.DoubleLine
+  | SingleFormation.Diamond
+  | SingleFormation.Echelon
+  | SingleFormation.LineAbreast
+  | SingleFormation.Vanguard;
+
+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 FleetCutin =
+  | FleetCutin.NelsonTouch
+  | FleetCutin.NagatoClassCutin
+  | FleetCutin.ColoradoClassCutin
+  | FleetCutin.KongouClassCutin
+  | FleetCutin.Yamato2ShipCutin
+  | FleetCutin.Yamato3ShipCutin;
+
+export interface CustomPowerModifiers {
+  precap_mod?: AttackPowerModifier;
+  postcap_mod?: AttackPowerModifier;
+  basic_power_mod?: AttackPowerModifier;
+}
+
+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 AttackPowerModifier {
+  a?: number;
+  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";
@@ -878,153 +777,98 @@ export interface EquipStype {
   equip_type: number[];
 }
 
-export interface AttackInfo<AttackType, Cutin> {
-  attack_type: AttackType;
-  items: AttackInfoItem<Cutin>[];
-  damage_state_map: NumMap<DamageState, number> | null;
-}
-
-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 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 WarfareContext {
+  attacker_env: ShipEnvironment;
+  target_env: ShipEnvironment;
+  engagement: Engagement;
+  air_state: AirState;
 }
 
-export type SlotSizeVec = (number | null)[];
-
-declare namespace Side {
-  export type Player = "Player";
-  export type Enemy = "Enemy";
+export interface AttackPower {
+  precap: number;
+  is_capped: boolean;
+  capped: number;
+  normal: number;
+  critical: number;
+  armor_penetration: number;
+  remaining_ammo_mod: number;
 }
 
-export type Side = Side.Player | Side.Enemy;
-
-declare namespace NightAttackType {
-  export type Normal = "Normal";
-  export type ArkRoyal = "ArkRoyal";
-  export type Carrier = "Carrier";
+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 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 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 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 interface AttackInfo<AttackType, Cutin> {
+  attack_type: AttackType;
+  items: AttackInfoItem<Cutin>[];
+  damage_state_map: NumMap<DamageState, number> | null;
 }
 
-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;
-
-export interface HitRate {
-  total: number;
-  normal: number;
-  critical: number;
+export interface AttackInfoItem<Cutin> {
+  cutin: Cutin;
+  rate: number | null;
+  stats: AttackStats;
 }
 
-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 AttackStats {
+  attack_power: AttackPower | null;
+  attack_power_params: AttackPowerParams | null;
+  hits: number;
+  hit_rate: HitRate | null;
+  hit_rate_params: HitRateParams | null;
+  damage: DamageInfo | null;
 }
 
-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 CompAntiAirInfo {
+  fleet_adjusted_anti_air: number;
+  ships: ShipAntiAirInfo[];
+  anti_air_cutin_chance: [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 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 type DayBattleAttackType =
-  | DayBattleAttackType.Shelling
-  | DayBattleAttackType.Asw;
+export interface CompContactChanceInfo {
+  single: AirstrikeContactChance[] | null;
+  combined: AirstrikeContactChance[] | null;
+}
 
-export type GearTypeIdArray = [number, number, number, number, number];
+export interface AirstrikeContactChance {
+  air_state: AirState;
+  trigger_rate: number;
+  rank3: number;
+  rank2: number;
+  rank1: number;
+  total: number;
+}
 
 export type ShipStateMap = Record<ShipKey, ShipState>;
 
@@ -1135,6 +979,72 @@ export interface GearState {
   stars?: 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";
@@ -1146,6 +1056,36 @@ export type ContactRank =
   | 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 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 type DayBattleAttackType =
+  | DayBattleAttackType.Shelling
+  | DayBattleAttackType.Asw;
+
+export type GearTypeIdArray = [number, number, number, number, number];
+
 export interface BattleConfig {
   formation: Record<Formation, NestedFormationDef>;
   anti_air_cutin: Record<number, AntiAirCutinDef>;
@@ -1265,29 +1205,19 @@ export interface MasterGear {
   fleet_anti_air_resistance?: 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;
-}
-
-export interface WarfareAnalyzerContext {
-  attacker_env: WarfareAnalyzerShipEnvironment;
-  target_env: WarfareAnalyzerShipEnvironment;
-  engagement: Engagement;
-  air_state: AirState;
+export interface HitRate {
+  total: number;
+  normal: number;
+  critical: number;
 }
 
-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 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 FleetNightCutinRateInfo {
@@ -1313,6 +1243,70 @@ export interface NightContactChance {
   total: number;
 }
 
+declare namespace SpecialEnemyType {
+  export type None = "None";
+  export type SoftSkinned = "SoftSkinned";
+  export type Pillbox = "Pillbox";
+  export type IsolatedIsland = "IsolatedIsland";
+  export type SupplyDepot = "SupplyDepot";
+  export type HarbourSummerPrincess = "HarbourSummerPrincess";
+  export type PtImp = "PtImp";
+  export type BattleshipSummerPrincess = "BattleshipSummerPrincess";
+  export type HeavyCruiserSummerPrincess = "HeavyCruiserSummerPrincess";
+}
+
+export type SpecialEnemyType =
+  | SpecialEnemyType.None
+  | SpecialEnemyType.SoftSkinned
+  | SpecialEnemyType.Pillbox
+  | SpecialEnemyType.IsolatedIsland
+  | SpecialEnemyType.SupplyDepot
+  | SpecialEnemyType.HarbourSummerPrincess
+  | SpecialEnemyType.PtImp
+  | SpecialEnemyType.BattleshipSummerPrincess
+  | SpecialEnemyType.HeavyCruiserSummerPrincess;
+
+declare namespace MoraleState {
+  export type Sparkle = "Sparkle";
+  export type Normal = "Normal";
+  export type Orange = "Orange";
+  export type Red = "Red";
+}
+
+export type MoraleState =
+  | MoraleState.Sparkle
+  | MoraleState.Normal
+  | MoraleState.Orange
+  | MoraleState.Red;
+
+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 DamageState =
+  | DamageState.Normal
+  | DamageState.Shouha
+  | DamageState.Chuuha
+  | DamageState.Taiha
+  | DamageState.Sunk;
+
+declare namespace SpeedGroup {
+  export type A = "A";
+  export type B1 = "B1";
+  export type B2 = "B2";
+  export type C = "C";
+}
+
+export type SpeedGroup =
+  | SpeedGroup.A
+  | SpeedGroup.B1
+  | SpeedGroup.B2
+  | SpeedGroup.C;
+
 /**
  */
 export class AirSquadron {
@@ -1381,14 +1375,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 +1390,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 +1490,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 +2060,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}
    */