fleethub-core 1.12.5 → 1.12.7

package/pkg/fleethub_core.d.ts

@@ -1,642 +1,786 @@
 /* tslint:disable */
 /* eslint-disable */
-export function set_panic_hook(): void;
 export function parse_ship_conditions(value: ShipConditions): ShipConditions;
+export function set_panic_hook(): void;
+
+export type CompiledEvaler = string;
+
 export interface MasterData extends MasterBattleDefinitions {
-    created_at: number;
-    gears: MasterGear[];
-    gear_attrs: MasterAttrRule<GearAttr>[];
-    ships: MasterShip[];
-    ship_attrs: MasterAttrRule<ShipAttr>[];
-    ibonuses: MasterIBonuses;
-    equippability: MasterEquippability;
+  created_at: number;
+  gears: MasterGear[];
+  gear_attrs: MasterAttrRule<GearAttr>[];
+  ships: MasterShip[];
+  ship_attrs: MasterAttrRule<ShipAttr>[];
+  ibonuses: MasterIBonuses;
+  equippability: MasterEquippability;
 }
 
 export interface NationalityDef {
-    id: number;
-    ctypes: number[];
+  id: number;
+  ctypes: number[];
 }
 
 export interface MasterAttrRule<T> {
-    tag: T;
-    name: string;
-    expr: CompiledEvaler;
+  tag: T;
+  name: string;
+  expr: CompiledEvaler;
 }
 
-export interface MasterShip {
-    ship_id: number;
-    name: string;
-    yomi: string;
-    stype: number;
-    ctype: number;
-    nationality?: number;
-    sort_id?: number;
-    max_hp: StatInterval;
-    firepower: StatInterval;
-    armor: StatInterval;
-    torpedo: StatInterval;
-    evasion: StatInterval;
-    anti_air: StatInterval;
-    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 interface AttackAnalyzerShipConfig
+  extends ShipConditions,
+    NightFleetConditions {
+  balloons?: number;
+  fleet_los_mod?: number | null;
 }
 
-export type StatInterval = [number | null, number | null];
+export type AirSquadronMode = "Sortie" | "AirDefense";
 
-export interface AttackAnalyzerShipConfig extends ShipConditions, NightFleetConditions {
-    balloons?: number;
-    fleet_los_mod?: number | null;
+export interface AirSquadronState extends GearVecState, SlotSizeVecState {
+  id?: string;
+  mode?: AirSquadronMode;
 }
 
-export type GearAttr = "Unknown" | "HighAngleMount" | "NightFighter" | "NightAttacker" | "HeavyBomber" | "NightRecon" | "MainGun" | "Radar" | "SurfaceRadar" | "AirRadar" | "DepthChargeProjector" | "SynergisticDepthCharge" | "AntiSubMortar" | "AntiSubWeapon" | "ApDepthCharge" | "AntiSubAircraft" | "LateModelBowTorpedo" | "Seaplane" | "CbAircraft" | "LbAircraft" | "JetAircraft" | "Fighter" | "Recon" | "ObservationSeaplane" | "CbFighterBomber" | "AntiInstDiveBomber" | "CbSwordfish" | "SemiNightPlane" | "HighAltitudeInterceptor";
+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 NightConditions {
+  player?: NightFleetConditions;
+  enemy?: NightFleetConditions;
+}
 
-export type Histogram<K extends keyof any, V> = Partial<Record<K, V>>;
+export interface NightFleetConditions {
+  night_contact_rank?: ContactRank | null;
+  starshell_index?: number | null;
+  searchlight_index?: number | null;
+  activates_large_searchlight?: boolean;
+}
+
+export type GearAttr =
+  | "Unknown"
+  | "HighAngleMount"
+  | "NightFighter"
+  | "NightAttacker"
+  | "HeavyBomber"
+  | "NightRecon"
+  | "MainGun"
+  | "Radar"
+  | "SurfaceRadar"
+  | "AirRadar"
+  | "DepthChargeProjector"
+  | "SynergisticDepthCharge"
+  | "AntiSubMortar"
+  | "AntiSubWeapon"
+  | "ApDepthCharge"
+  | "AntiSubAircraft"
+  | "LateModelBowTorpedo"
+  | "Seaplane"
+  | "CbAircraft"
+  | "LbAircraft"
+  | "JetAircraft"
+  | "Fighter"
+  | "Recon"
+  | "ObservationSeaplane"
+  | "CbFighterBomber"
+  | "AntiInstDiveBomber"
+  | "CbSwordfish"
+  | "SemiNightPlane"
+  | "HighAltitudeInterceptor";
 
+export interface ShipPosition {
+  org_type?: OrgType;
+  fleet_type?: FleetType;
+  fleet_len?: number;
+  index?: number;
+}
 
-export interface SimulatorResult {
-    items: SimulatorResultItem[];
-    sunk_vec: [number, number, number][];
+export type Histogram<K extends keyof any, V> = Partial<Record<K, V>>;
+
+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;
+  historical_aircraft_group?: number;
 }
 
-export interface SimulatorResultItem {
-    id: string;
-    fleet_type: FleetType;
-    index: number;
-    damage_state_map: Record<DamageState, number>;
+export interface CompAnalyzerConfig {
+  engagement: Engagement;
+  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;
 }
 
-export interface MasterBattleDefinitions {
-    formation: NestedFormationDef[];
-    anti_air_cutin: AntiAirCutinDef[];
-    day_cutin: DayCutinDef[];
-    night_cutin: NightCutinDef[];
-    historical_bonuses?: HistoricalBonusDef[];
+export interface CompNightAnalysis {
+  night_cutin: CompNightCutinAnalysis;
+  fleet_cutin: FleetCutinReport<NightAttackStyle>[];
 }
 
-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 CompDayAnalysis {
+  day_cutin: CompDayCutinAnalysis;
+  fleet_cutin: FleetCutinReport<ShellingStyle>[];
 }
 
-export interface ContactAnalysis {
-    single: DayContactChance[] | null;
-    combined: DayContactChance[] | null;
+export interface CompAnalysis {
+  day: CompDayAnalysis;
+  night: CompNightAnalysis;
+  contact: ContactAnalysis;
+  anti_air: CompAntiAirAnalysis;
 }
 
-export interface DayContactChance {
-    air_state: AirState;
-    trigger_rate: number;
-    rank3: number;
-    rank2: number;
-    rank1: number;
-    total: number;
+export type SpeedGroup = "A" | "B1" | "B2" | "C";
+
+export type FhResult<T> = { Ok: T } | { Err: string };
+
+export interface MasterShip {
+  ship_id: number;
+  name: string;
+  yomi: string;
+  stype: number;
+  ctype: number;
+  nationality?: number;
+  sort_id?: number;
+  max_hp: StatInterval;
+  firepower: StatInterval;
+  armor: StatInterval;
+  torpedo: StatInterval;
+  evasion: StatInterval;
+  anti_air: StatInterval;
+  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 interface AttackPowerModifier {
-    a?: number;
-    b?: number;
+export type StatInterval = [number | null, number | null];
+
+export interface MasterIBonuses {
+  shelling_power: MasterIBonusRule[];
+  shelling_accuracy: MasterIBonusRule[];
+  shelling_aerial_power: MasterIBonusRule[];
+  torpedo_power: MasterIBonusRule[];
+  torpedo_accuracy: MasterIBonusRule[];
+  torpedo_evasion: MasterIBonusRule[];
+  asw_power: MasterIBonusRule[];
+  asw_accuracy: MasterIBonusRule[];
+  night_power: MasterIBonusRule[];
+  night_aerial_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 SpecialEnemyModifiers {
-    precap_general_mod: AttackPowerModifier;
-    stype_mod: AttackPowerModifier;
-    landing_craft_synergy_mod: AttackPowerModifier;
-    toku_daihatsu_tank_mod: AttackPowerModifier;
-    m4a1dd_mod: AttackPowerModifier;
-    honi_mod: AttackPowerModifier;
-    toku_daihatsu_chiha_mod: AttackPowerModifier;
-    toku_daihatsu_chiha_kai_mod: AttackPowerModifier;
-    t4_tank_group_mod: AttackPowerModifier;
-    t4_tank_kai_mod: AttackPowerModifier;
-    postcap_general_mod: AttackPowerModifier;
-    pt_mod: AttackPowerModifier | null;
+export interface MasterIBonusRule {
+  expr: CompiledEvaler;
+  formula: CompiledEvaler;
+}
+
+export type ShipAttr =
+  | "Unknown"
+  | "NightCarrier"
+  | "Installation"
+  | "RoyalNavy"
+  | "Kai2"
+  | "TurbineSpeedBonus"
+  | "NewModelBoilerSpeedBonus"
+  | "Pillbox"
+  | "IsolatedIsland"
+  | "HarbourSummerPrincess"
+  | "SupplyDepot"
+  | "NewSupplyDepot"
+  | "PtImp"
+  | "BattleshipSummerPrincess"
+  | "HeavyCruiserSummerPrincess"
+  | "AnchorageWaterDemonVacationMode"
+  | "FrenchBattleshipPrincess"
+  | "DockPrincess"
+  | "SummerAircraftCarrierDemon";
+
+export interface MoveShipPayload {
+  current: [string, string, ShipKey];
+  target: [string | null, string, ShipKey];
 }
 
-export interface CustomPowerModifiers {
-    precap_mod?: AttackPowerModifier;
-    postcap_mod?: AttackPowerModifier;
-    basic_power_mod?: AttackPowerModifier;
-    historical_mod?: AttackPowerModifier;
+export type GearVecInput = GearInput[];
+
+export interface GearInput {
+  gear_id: number;
+  types: GearTypeIdArray;
+  firepower: number;
+  torpedo: number;
+  anti_air: number;
+  armor: number;
+  evasion: number;
+  asw: number;
+  los: number;
+  bombing: number;
+  accuracy: number;
+  range: number;
+  radius: number;
+  stars: number;
+  ace: number;
 }
 
-export interface ShipMeta {
-    id: string;
-    ship_id: number;
+export interface ShipInput {
+  ship_id: number;
+  ctype: number;
+  stype: number;
+  yomi: string;
 }
 
-export interface FleetMeta {
-    id: string;
-    len: number;
-    ships: [string, ShipMeta | null][];
+export interface EBonuses {
+  firepower: number;
+  torpedo: number;
+  anti_air: number;
+  armor: number;
+  evasion: number;
+  asw: number;
+  los: number;
+  bombing: number;
+  accuracy: number;
+  range: number;
 }
 
-export interface CompMeta {
-    fleets: Record<FleetType, FleetMeta>;
+export interface SimulatorResult {
+  items: SimulatorResultItem[];
+  sunk_vec: [number, number, number][];
 }
 
-export type GearTypeIdArray = [number, number, number, number, number];
+export interface SimulatorResultItem {
+  id: string;
+  fleet_type: FleetType;
+  index: number;
+  damage_state_map: Record<DamageState, number>;
+}
 
-export interface SupportShellingSimulatorParams {
-    attacker_formation?: Formation;
-    target_formation?: Formation;
-    engagement: Engagement;
-    node_state: NodeState;
+export interface ShellingStyle {
+  tag: "ShellingStyle";
+  attack_type: ShellingType;
+  cutin: DayCutinLike | null;
+  power_mod: number;
+  accuracy_mod: number;
+  hits: number;
 }
 
-export type SlotSizeVec = (number | null)[];
+export interface NightAttackStyle {
+  tag: "NightAttackStyle";
+  attack_type: NightAttackType;
+  cutin: NightCutinLike | null;
+  power_mod: number;
+  accuracy_mod: number;
+  hits: number;
+}
 
-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 interface AswAttackStyle {
+  tag: "AswAttackStyle";
+  attack_type: AswAttackType;
 }
 
-export type AirWaveType = "Jet" | "LandBase" | "Carrier";
+export interface TorpedoAttackStyle {
+  tag: "TorpedoAttackStyle";
+  attack_type: TorpedoAttackType;
+}
 
-export type AirState = "AirSupremacy" | "AirSuperiority" | "AirParity" | "AirDenial" | "AirIncapability";
+export type DayPhaseAttackStyle = ShellingStyle | AswAttackStyle;
 
-export type AirStateRank = "Rank0" | "Rank1" | "Rank2" | "Rank3";
+export type NightPhaseAttackStyle = NightAttackStyle | AswAttackStyle;
 
-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 SupportShellingStyle {
+  tag: "SupportShellingStyle";
+  attack_type: SupportShellingType;
 }
 
-export interface NightConditions {
-    player?: NightFleetConditions;
-    enemy?: NightFleetConditions;
-}
+export type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
 
-export interface NightFleetConditions {
-    night_contact_rank?: ContactRank | null;
-    starshell_index?: number | null;
-    searchlight_index?: number | null;
-    activates_large_searchlight?: boolean;
+export interface ShipMeta {
+  id: string;
+  ship_id: number;
 }
 
-export type Engagement = "GreenT" | "Parallel" | "HeadOn" | "RedT";
-
-export interface GearState {
-    id?: string;
-    gear_id: number;
-    exp?: number;
-    stars?: number;
+export interface FleetMeta {
+  id: string;
+  len: number;
+  ships: [string, ShipMeta | null][];
 }
 
-export interface GearVecState {
-    g1?: GearState;
-    g2?: GearState;
-    g3?: GearState;
-    g4?: GearState;
-    g5?: GearState;
-    gx?: GearState;
+export interface CompMeta {
+  fleets: Record<FleetType, FleetMeta>;
 }
 
-export type NodeId = string;
-
-export interface NodeState {
-    map?: number;
-    node?: NodeId;
-    phase?: number;
-    debuff?: boolean;
-    disable_historical_mod?: boolean;
-    landing_battle?: boolean;
+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?: FleetKey;
+  route_sup?: FleetKey;
+  boss_sup?: FleetKey;
 }
 
-export type OrgType = "Single" | "CarrierTaskForce" | "SurfaceTaskForce" | "TransportEscort" | "EnemySingle" | "EnemyCombined";
+export type FleetKey = "f1" | "f2" | "f3" | "f4";
 
-export interface ShipPosition {
-    org_type?: OrgType;
-    fleet_type?: FleetType;
-    fleet_len?: number;
-    index?: number;
-}
+export type OrgType =
+  | "Single"
+  | "CarrierTaskForce"
+  | "SurfaceTaskForce"
+  | "TransportEscort"
+  | "EnemySingle"
+  | "EnemyCombined";
 
 export interface SlotSizeVecState {
-    ss1?: number;
-    ss2?: number;
-    ss3?: number;
-    ss4?: number;
-    ss5?: number;
+  ss1?: number;
+  ss2?: number;
+  ss3?: number;
+  ss4?: number;
+  ss5?: number;
 }
 
 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;
+  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 type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
 
-export interface MasterIBonuses {
-    shelling_power: MasterIBonusRule[];
-    shelling_accuracy: MasterIBonusRule[];
-    shelling_aerial_power: MasterIBonusRule[];
-    torpedo_power: MasterIBonusRule[];
-    torpedo_accuracy: MasterIBonusRule[];
-    torpedo_evasion: MasterIBonusRule[];
-    asw_power: MasterIBonusRule[];
-    asw_accuracy: MasterIBonusRule[];
-    night_power: MasterIBonusRule[];
-    night_aerial_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 EquippabilityRule {
-    ship: CompiledEvaler;
-    keys?: string[];
-    include?: string;
-    exclude?: string;
-}
+export type Side = "Player" | "Enemy";
 
-export interface MasterEquippability {
-    equip_stype: EquipStype[];
-    equip_exslot: number[];
-    equip_ship: MstEquipShip[];
-    equip_exslot_ship: Record<number, MstEquipExslotShip>;
-    rules: EquippabilityRule[];
-}
+export type Align = "Left" | "Right";
 
-export interface MstEquipExslotShip {
-    api_ctypes: Record<number, number> | null;
-    api_ship_ids: Record<number, number> | null;
-    api_stypes: Record<number, number> | null;
-}
+export type GearTypeIdArray = [number, number, number, number, number];
 
-export interface MstEquipShip {
-    api_ship_id: number;
-    api_equip_type: number[];
-}
+export interface SupportShellingSimulatorParams {
+  attacker_formation?: Formation;
+  target_formation?: Formation;
+  engagement: Engagement;
+  node_state: NodeState;
+}
+
+export type SingleFormation =
+  | "LineAhead"
+  | "DoubleLine"
+  | "Diamond"
+  | "Echelon"
+  | "LineAbreast"
+  | "Vanguard";
+
+export type CombinedFormation =
+  | "Cruising1"
+  | "Cruising2"
+  | "Cruising3"
+  | "Cruising4";
 
-export interface EquipStype {
-    id: number;
-    equip_type: number[];
-}
+export type Formation = SingleFormation | CombinedFormation;
 
-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 type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
 
-export interface ShipDayCutinAnalysis {
-    ship_id: number;
-    role: Role;
-    index: number;
-    rank3: DayCutinReport;
-    rank2: DayCutinReport;
-}
+export type Role = "Main" | "Escort";
 
-export interface DayCutinReport extends ActionReport<DayPhaseAttackStyle> {
-    observation_term: number | null;
-}
+export type SpecialEnemyType =
+  | "None"
+  | "SoftSkinned"
+  | "Pillbox"
+  | "IsolatedIsland"
+  | "SupplyDepot"
+  | "NewSupplyDepot"
+  | "HarbourSummerPrincess"
+  | "PtImp"
+  | "BattleshipSummerPrincess"
+  | "HeavyCruiserSummerPrincess"
+  | "FrenchBattleshipPrincess"
+  | "AnchorageWaterDemonVacationMode"
+  | "DockPrincess"
+  | "SummerAircraftCarrierDemon";
 
-export interface CompAnalyzerConfig {
-    engagement: Engagement;
-    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;
+export interface HitRate {
+  normal: number;
+  critical: number;
+  total: number;
 }
 
-export interface CompNightAnalysis {
-    night_cutin: CompNightCutinAnalysis;
-    fleet_cutin: FleetCutinReport<NightAttackStyle>[];
+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 CompDayAnalysis {
-    day_cutin: CompDayCutinAnalysis;
-    fleet_cutin: FleetCutinReport<ShellingStyle>[];
+export interface AttackPower {
+  precap: number;
+  is_capped: boolean;
+  capped: number;
+  normal: number;
+  critical: number;
+  armor_penetration: number;
+  remaining_ammo_mod: number;
 }
 
-export interface CompAnalysis {
-    day: CompDayAnalysis;
-    night: CompNightAnalysis;
-    contact: ContactAnalysis;
-    anti_air: CompAntiAirAnalysis;
+export interface AttackPowerParams {
+  is_cutin: boolean;
+  basic: number;
+  cap: number;
+  precap_mod: AttackPowerModifier;
+  postcap_mod: AttackPowerModifier;
+  ap_shell_mod: number | null;
+  aerial_power: number | null;
+  proficiency_critical_mod: number;
+  armor_penetration: number;
+  remaining_ammo_mod: number;
+  balloon_mod: number;
+  special_enemy_mods: SpecialEnemyModifiers;
+  historical_mod: AttackPowerModifier;
+  custom_mods: CustomPowerModifiers;
 }
 
 export interface CompAntiAirAnalysis {
-    fleet_adjusted_anti_air: number;
-    ships: AntiAirReport[];
-    anti_air_cutin_chance: [number, number][];
+  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 interface ShellingStyle {
-    tag: "ShellingStyle";
-    attack_type: ShellingType;
-    cutin: DayCutinLike | null;
-    power_mod: number;
-    accuracy_mod: number;
-    hits: number;
-}
-
-export interface NightAttackStyle {
-    tag: "NightAttackStyle";
-    attack_type: NightAttackType;
-    cutin: NightCutinLike | null;
-    power_mod: number;
-    accuracy_mod: number;
-    hits: number;
+  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 interface AswAttackStyle {
-    tag: "AswAttackStyle";
-    attack_type: AswAttackType;
+export interface AttackPowerModifier {
+  a?: number;
+  b?: number;
 }
 
-export interface TorpedoAttackStyle {
-    tag: "TorpedoAttackStyle";
-    attack_type: TorpedoAttackType;
+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;
+  toku_daihatsu_chiha_mod: AttackPowerModifier;
+  toku_daihatsu_chiha_kai_mod: AttackPowerModifier;
+  t4_tank_group_mod: AttackPowerModifier;
+  t4_tank_kai_mod: AttackPowerModifier;
+  postcap_general_mod: AttackPowerModifier;
+  pt_mod: AttackPowerModifier | null;
 }
 
-export type DayPhaseAttackStyle = ShellingStyle | AswAttackStyle;
-
-export type NightPhaseAttackStyle = NightAttackStyle | AswAttackStyle;
-
-export interface SupportShellingStyle {
-    tag: "SupportShellingStyle";
-    attack_type: SupportShellingType;
+export interface CustomPowerModifiers {
+  precap_mod?: AttackPowerModifier;
+  postcap_mod?: AttackPowerModifier;
+  basic_power_mod?: AttackPowerModifier;
+  historical_mod?: AttackPowerModifier;
 }
 
 export interface FormationCombatModifiersDef {
-    power_mod?: number;
-    accuracy_mod?: number;
-    evasion_mod?: number;
+  power_mod?: number;
+  accuracy_mod?: number;
+  evasion_mod?: number;
 }
 
 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;
+  tag: Formation;
+  protection_rate: number | null;
+  fleet_anti_air_mod: number;
+  shelling: FormationCombatModifiersDef;
+  torpedo: FormationCombatModifiersDef;
+  asw: FormationCombatModifiersDef;
+  night: FormationCombatModifiersDef;
+  support_shelling: FormationCombatModifiersDef;
 }
 
-export type NestedFormationDef = FormationDef | { top_half: FormationDef; bottom_half: FormationDef };
+export type NestedFormationDef =
+  | FormationDef
+  | { top_half: FormationDef; bottom_half: FormationDef };
 
 export interface AntiAirCutinDef {
-    id: number;
-    type_factor: number | null;
-    multiplier: number | null;
-    guaranteed: number | null;
-    sequential: boolean | null;
+  id: number;
+  type_factor: number | null;
+  multiplier: number | null;
+  guaranteed: number | null;
+  sequential: boolean | null;
 }
 
 export interface DayCutinDef {
-    tag: DayCutin;
-    hits: number;
-    type_factor: number | null;
-    power_mod: number | null;
-    accuracy_mod: number | null;
+  tag: DayCutin;
+  hits: number;
+  type_factor: number | null;
+  power_mod: number | null;
+  accuracy_mod: number | null;
 }
 
 export interface HistoricalBonusDef {
-    map?: number;
-    node?: CompiledEvaler;
-    phase?: number;
-    debuff?: boolean;
-    ship?: CompiledEvaler;
-    enemy?: CompiledEvaler;
-    power_mod?: AttackPowerModifier;
-    armor_penetration?: number;
-    accuracy_mod?: number;
-    evasion_mod?: number;
+  map?: number;
+  node?: CompiledEvaler;
+  phase?: number;
+  debuff?: boolean;
+  ship?: CompiledEvaler;
+  enemy?: CompiledEvaler;
+  power_mod?: AttackPowerModifier;
+  armor_penetration?: number;
+  accuracy_mod?: number;
+  evasion_mod?: number;
 }
 
 export interface HistoricalParams {
-    power_mod: AttackPowerModifier;
-    armor_penetration: number;
-    accuracy_mod: number;
-    target_evasion_mod: number;
+  power_mod: AttackPowerModifier;
+  armor_penetration: number;
+  accuracy_mod: number;
+  target_evasion_mod: number;
 }
 
 export interface NightCutinDef {
-    tag: NightCutin;
-    hits: number;
-    type_factor: number | null;
-    power_mod: number | null;
-    accuracy_mod: number | null;
+  tag: NightCutin;
+  hits: number;
+  type_factor: number | null;
+  power_mod: number | null;
+  accuracy_mod: number | null;
 }
 
 export interface BattleDefinitions {
-    formation: Record<Formation, NestedFormationDef>;
-    anti_air_cutin: Record<number, AntiAirCutinDef>;
-    day_cutin: Record<DayCutin, DayCutinDef>;
-    night_cutin: Record<NightCutin, NightCutinDef>;
-    historical_bonuses: HistoricalBonusDef[];
+  formation: Record<Formation, NestedFormationDef>;
+  anti_air_cutin: Record<number, AntiAirCutinDef>;
+  day_cutin: Record<DayCutin, DayCutinDef>;
+  night_cutin: Record<NightCutin, NightCutinDef>;
+  historical_bonuses: HistoricalBonusDef[];
 }
 
-export type SpeedGroup = "A" | "B1" | "B2" | "C";
-
-
-export type CompiledEvaler = string;
+export type ContactRank = "Rank1" | "Rank2" | "Rank3";
 
+export type DayCutin =
+  | "Zuiun"
+  | "AirSea"
+  | "MainMain"
+  | "MainAp"
+  | "MainRadar"
+  | "MainSec"
+  | "DoubleAttack"
+  | "FBA"
+  | "BBA"
+  | "BA";
+
+export type NightCutin =
+  | "MainTorpRadar"
+  | "TorpLookoutRadar"
+  | "TorpTsloTorp"
+  | "TorpTsloDrum"
+  | "NightZuiun2Radar"
+  | "NightZuiun2"
+  | "NightZuiunRadar"
+  | "NightZuiun"
+  | "DoubleAttack"
+  | "TorpTorpMain"
+  | "TorpTorpTorp"
+  | "MainMainSec"
+  | "MainMainMain"
+  | "SubTorpTorp"
+  | "SubRadarTorp"
+  | "Cvci1_25"
+  | "Cvci1_20"
+  | "Cvci1_18"
+  | "Photobomber";
+
+export type FleetCutin =
+  | "NelsonTouch"
+  | "NagatoClassCutin"
+  | "ColoradoClassCutin"
+  | "KongouClassCutin"
+  | "Yamato2ShipCutin"
+  | "Yamato3ShipCutin";
 
-export interface ShipAnalyzerConfig {
-    air_state?: AirState;
-    engagement?: Engagement;
-    left?: AttackAnalyzerShipConfig;
-    right?: AttackAnalyzerShipConfig;
-}
+export type DayCutinLike = DayCutin | FleetCutin;
 
-export type AirSquadronMode = "Sortie" | "AirDefense";
+export type NightCutinLike = NightCutin | FleetCutin;
 
-export interface AirSquadronState extends GearVecState, SlotSizeVecState {
-    id?: string;
-    mode?: AirSquadronMode;
+export interface GearState {
+  id?: string;
+  gear_id: number;
+  exp?: number;
+  stars?: number;
 }
 
-export type SingleFormation = "LineAhead" | "DoubleLine" | "Diamond" | "Echelon" | "LineAbreast" | "Vanguard";
-
-export type CombinedFormation = "Cruising1" | "Cruising2" | "Cruising3" | "Cruising4";
-
-export type Formation = SingleFormation | CombinedFormation;
-
-export interface HitRate {
-    normal: number;
-    critical: number;
-    total: number;
+export interface GearVecState {
+  g1?: GearState;
+  g2?: GearState;
+  g3?: GearState;
+  g4?: GearState;
+  g5?: GearState;
+  gx?: GearState;
 }
 
-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 MasterBattleDefinitions {
+  formation: NestedFormationDef[];
+  anti_air_cutin: AntiAirCutinDef[];
+  day_cutin: DayCutinDef[];
+  night_cutin: NightCutinDef[];
+  historical_bonuses?: HistoricalBonusDef[];
 }
 
-export interface AttackPower {
-    precap: number;
-    is_capped: boolean;
-    capped: number;
-    normal: number;
-    critical: number;
-    armor_penetration: number;
-    remaining_ammo_mod: number;
+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 interface AttackPowerParams {
-    is_cutin: boolean;
-    basic: number;
-    cap: number;
-    precap_mod: AttackPowerModifier;
-    postcap_mod: AttackPowerModifier;
-    ap_shell_mod: number | null;
-    aerial_power: number | null;
-    proficiency_critical_mod: number;
-    armor_penetration: number;
-    remaining_ammo_mod: number;
-    balloon_mod: number;
-    special_enemy_mods: SpecialEnemyModifiers;
-    historical_mod: AttackPowerModifier;
-    custom_mods: CustomPowerModifiers;
+export interface ActionReport<T> {
+  data: Record<string, AttackReport<T>>;
+  damage_state_density: Histogram<DamageState, number> | null;
+  is_active: boolean;
 }
 
-export interface ActionReport<T> {
-    data: Record<string, AttackReport<T>>;
-    damage_state_density: Histogram<DamageState, number> | null;
-    is_active: boolean;
+export interface FleetState {
+  id?: string;
+  len?: number;
+  s1?: ShipState;
+  s2?: ShipState;
+  s3?: ShipState;
+  s4?: ShipState;
+  s5?: ShipState;
+  s6?: ShipState;
+  s7?: ShipState;
 }
 
-export type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
+export type NodeId = string;
 
-export interface FleetState {
-    id?: string;
-    len?: number;
-    s1?: ShipState;
-    s2?: ShipState;
-    s3?: ShipState;
-    s4?: ShipState;
-    s5?: ShipState;
-    s6?: ShipState;
-    s7?: ShipState;
+export interface NodeState {
+  map?: number;
+  node?: NodeId;
+  phase?: number;
+  debuff?: boolean;
+  disable_historical_mod?: boolean;
+  landing_battle?: boolean;
 }
 
-export type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
+export interface NodeAttackAnalyzerShipConfig extends NightFleetConditions {
+  formation?: Formation;
+}
 
-export type FhResult<T> = { Ok: T } | { Err: string };
+export interface NodeAttackAnalyzerConfig {
+  air_state?: AirState;
+  engagement?: Engagement;
+  node_state?: NodeState;
+  left?: NodeAttackAnalyzerShipConfig;
+  right?: NodeAttackAnalyzerShipConfig;
+}
 
-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;
-    historical_aircraft_group?: number;
+export interface NodeAttackAnalysis {
+  left: AttackAnalysis;
+  right: AttackAnalysis;
+  shelling_fleet_cutin: FleetCutinReport<ShellingStyle>[];
+  night_fleet_cutin: FleetCutinReport<NightAttackStyle>[];
 }
 
 export interface FleetCutinReport<T> {
-    cutin: FleetCutin;
-    rate: number | null;
-    formation: Formation;
-    attacks: FleetCutinAttackReport<T>[];
+  cutin: FleetCutin;
+  rate: number | null;
+  formation: Formation;
+  attacks: FleetCutinAttackReport<T>[];
 }
 
 export interface FleetCutinAttackReport<T> extends AttackReport<T> {
-    index: number;
-    ship_id: number;
-    power_mod: number;
+  index: number;
+  ship_id: number;
+  power_mod: number;
 }
 
+export interface AttackAnalysis {
+  attacker_is_player: boolean;
+  attacker_ship_id: number;
+  target_ship_id: number;
+  historical_params: HistoricalParams;
+  day: ActionReport<DayPhaseAttackStyle>;
+  night: ActionReport<NightPhaseAttackStyle>;
+  closing_torpedo: ActionReport<TorpedoAttackStyle>;
+  opening_asw: ActionReport<AswAttackStyle>;
+  support_shelling: ActionReport<SupportShellingStyle>;
+}
+
+export type AirState =
+  | "AirSupremacy"
+  | "AirSuperiority"
+  | "AirParity"
+  | "AirDenial"
+  | "AirIncapability";
+
+export type AirStateRank = "Rank0" | "Rank1" | "Rank2" | "Rank3";
+
 export type AswAttackType = "DepthCharge" | "Aerial";
 
 export type ShellingType = "Normal" | "Aerial";
@@ -645,170 +789,260 @@ export type NightAttackType = "Normal" | "Swordfish" | "Aerial";
 
 export type SupportShellingType = ShellingType;
 
-export type AttackType = { t: "Asw"; c: AswAttackType } | { t: "Shelling"; c: ShellingType } | { t: "Night"; c: NightAttackType } | { t: "Torpedo" } | { t: "SupportShelling"; c: SupportShellingType };
+export type AttackType =
+  | { t: "Asw"; c: AswAttackType }
+  | { t: "Shelling"; c: ShellingType }
+  | { t: "Night"; c: NightAttackType }
+  | { t: "Torpedo" }
+  | { t: "SupportShelling"; c: SupportShellingType };
 
-export type DayPhaseAttackType = { t: "Shelling"; c: ShellingType } | { t: "Asw"; c: AswAttackType };
+export type DayPhaseAttackType =
+  | { t: "Shelling"; c: ShellingType }
+  | { t: "Asw"; c: AswAttackType };
 
-export type NightPhaseAttackType = { t: "Night"; c: NightAttackType } | { t: "Asw"; c: AswAttackType };
+export type NightPhaseAttackType =
+  | { t: "Night"; c: NightAttackType }
+  | { t: "Asw"; c: AswAttackType };
 
 export type TorpedoAttackType = null;
 
-export type DayCutin = "Zuiun" | "AirSea" | "MainMain" | "MainAp" | "MainRadar" | "MainSec" | "DoubleAttack" | "FBA" | "BBA" | "BA";
-
-export type NightCutin = "MainTorpRadar" | "TorpLookoutRadar" | "TorpTsloTorp" | "TorpTsloDrum" | "NightZuiun2Radar" | "NightZuiun2" | "NightZuiunRadar" | "NightZuiun" | "DoubleAttack" | "TorpTorpMain" | "TorpTorpTorp" | "MainMainSec" | "MainMainMain" | "SubTorpTorp" | "SubRadarTorp" | "Cvci1_25" | "Cvci1_20" | "Cvci1_18" | "Photobomber";
-
-export type FleetCutin = "NelsonTouch" | "NagatoClassCutin" | "ColoradoClassCutin" | "KongouClassCutin" | "Yamato2ShipCutin" | "Yamato3ShipCutin";
-
-export type DayCutinLike = DayCutin | FleetCutin;
-
-export type NightCutinLike = NightCutin | FleetCutin;
-
-export type GearType = "Unknown" | "SmallMainGun" | "MediumMainGun" | "LargeMainGun" | "SecondaryGun" | "Torpedo" | "CbFighter" | "CbDiveBomber" | "CbTorpedoBomber" | "CbRecon" | "ReconSeaplane" | "SeaplaneBomber" | "SmallRadar" | "LargeRadar" | "Sonar" | "DepthCharge" | "ExtraArmor" | "Engine" | "AntiAirShell" | "ApShell" | "VtFuze" | "AntiAirGun" | "MidgetSubmarine" | "EmergencyRepair" | "LandingCraft" | "Rotorcraft" | "AntiSubPatrolAircraft" | "MediumArmor" | "LargeArmor" | "Searchlight" | "SupplyContainer" | "ShipRepairFacility" | "SubmarineTorpedo" | "Starshell" | "CommandFacility" | "AviationPersonnel" | "AntiAirFireDirector" | "AntiGroundEquipment" | "LargeMainGun2" | "ShipPersonnel" | "LargeSonar" | "LargeFlyingBoat" | "LargeSearchlight" | "CombatRation" | "Supplies" | "SeaplaneFighter" | "AmphibiousTank" | "LbAttacker" | "LbFighter" | "LbRecon" | "TransportationMaterial" | "SubmarineEquipment" | "LandingForce" | "LargeLbAircraft" | "SurfaceEquipment" | "JetFighter" | "JetFighterBomber" | "JetTorpedoBomber" | "JetRecon" | "LargeRadar2" | "CbRecon2" | "SecondaryGun2";
-
-export type GearCategory = "Fighter" | "Bomber" | "Recon" | "MainGun" | "Secondary" | "Torpedo" | "AntiSub" | "Radar" | "Landing" | "Ration" | "LandBased" | "Misc";
-
-export interface MoveShipPayload {
-    current: [string, string, ShipKey];
-    target: [string | null, string, ShipKey];
-}
+export type Engagement = "GreenT" | "Parallel" | "HeadOn" | "RedT";
 
-export type GearVecInput = GearInput[];
+export type GearType =
+  | "Unknown"
+  | "SmallMainGun"
+  | "MediumMainGun"
+  | "LargeMainGun"
+  | "SecondaryGun"
+  | "Torpedo"
+  | "CbFighter"
+  | "CbDiveBomber"
+  | "CbTorpedoBomber"
+  | "CbRecon"
+  | "ReconSeaplane"
+  | "SeaplaneBomber"
+  | "SmallRadar"
+  | "LargeRadar"
+  | "Sonar"
+  | "DepthCharge"
+  | "ExtraArmor"
+  | "Engine"
+  | "AntiAirShell"
+  | "ApShell"
+  | "VtFuze"
+  | "AntiAirGun"
+  | "MidgetSubmarine"
+  | "EmergencyRepair"
+  | "LandingCraft"
+  | "Rotorcraft"
+  | "AntiSubPatrolAircraft"
+  | "MediumArmor"
+  | "LargeArmor"
+  | "Searchlight"
+  | "SupplyContainer"
+  | "ShipRepairFacility"
+  | "SubmarineTorpedo"
+  | "Starshell"
+  | "CommandFacility"
+  | "AviationPersonnel"
+  | "AntiAirFireDirector"
+  | "AntiGroundEquipment"
+  | "LargeMainGun2"
+  | "ShipPersonnel"
+  | "LargeSonar"
+  | "LargeFlyingBoat"
+  | "LargeSearchlight"
+  | "CombatRation"
+  | "Supplies"
+  | "SeaplaneFighter"
+  | "AmphibiousTank"
+  | "LbAttacker"
+  | "LbFighter"
+  | "LbRecon"
+  | "TransportationMaterial"
+  | "SubmarineEquipment"
+  | "LandingForce"
+  | "LargeLbAircraft"
+  | "SurfaceEquipment"
+  | "JetFighter"
+  | "JetFighterBomber"
+  | "JetTorpedoBomber"
+  | "JetRecon"
+  | "LargeRadar2"
+  | "CbRecon2"
+  | "SecondaryGun2";
+
+export type GearCategory =
+  | "Fighter"
+  | "Bomber"
+  | "Recon"
+  | "MainGun"
+  | "Secondary"
+  | "Torpedo"
+  | "AntiSub"
+  | "Radar"
+  | "Landing"
+  | "Ration"
+  | "LandBased"
+  | "Misc";
 
-export interface GearInput {
-    gear_id: number;
-    types: GearTypeIdArray;
-    firepower: number;
-    torpedo: number;
-    anti_air: number;
-    armor: number;
-    evasion: number;
-    asw: number;
-    los: number;
-    bombing: number;
-    accuracy: number;
-    range: number;
-    radius: number;
-    stars: number;
-    ace: number;
+export interface ShipConditions extends ShipPosition {
+  formation?: Formation;
+  amagiri_index?: number | null;
 }
 
-export interface ShipInput {
-    ship_id: number;
-    ctype: number;
-    stype: number;
-    yomi: string;
+export interface NightContactChance {
+  rank1: number;
+  rank2: number;
+  rank3: number;
 }
 
-export interface EBonuses {
-    firepower: number;
-    torpedo: number;
-    anti_air: number;
-    armor: number;
-    evasion: number;
-    asw: number;
-    los: number;
-    bombing: number;
-    accuracy: number;
-    range: number;
+export interface CompNightCutinAnalysis {
+  night_contact_chance: NightContactChance;
+  ships: ShipNightCutinAnalysis[];
 }
 
-export interface NodeAttackAnalyzerShipConfig extends NightFleetConditions {
-    formation?: Formation;
+export interface ShipNightCutinAnalysis {
+  ship_id: number;
+  index: number;
+  normal: NightCutinActionReport;
+  chuuha: NightCutinActionReport;
 }
 
-export interface NodeAttackAnalyzerConfig {
-    air_state?: AirState;
-    engagement?: Engagement;
-    node_state?: NodeState;
-    left?: NodeAttackAnalyzerShipConfig;
-    right?: NodeAttackAnalyzerShipConfig;
+export interface NightCutinActionReport
+  extends ActionReport<NightPhaseAttackStyle> {
+  cutin_term: number | null;
 }
 
-export interface NodeAttackAnalysis {
-    left: AttackAnalysis;
-    right: AttackAnalysis;
-    shelling_fleet_cutin: FleetCutinReport<ShellingStyle>[];
-    night_fleet_cutin: FleetCutinReport<NightAttackStyle>[];
+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 NightContactChance {
-    rank1: number;
-    rank2: number;
-    rank3: number;
+export interface ShipDayCutinAnalysis {
+  ship_id: number;
+  role: Role;
+  index: number;
+  rank3: DayCutinReport;
+  rank2: DayCutinReport;
 }
 
-export interface CompNightCutinAnalysis {
-    night_contact_chance: NightContactChance;
-    ships: ShipNightCutinAnalysis[];
+export interface DayCutinReport extends ActionReport<DayPhaseAttackStyle> {
+  observation_term: number | null;
 }
 
-export interface ShipNightCutinAnalysis {
-    ship_id: number;
-    index: number;
-    normal: NightCutinActionReport;
-    chuuha: NightCutinActionReport;
+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 NightCutinActionReport extends ActionReport<NightPhaseAttackStyle> {
-    cutin_term: number | null;
+export interface ContactAnalysis {
+  single: DayContactChance[] | null;
+  combined: DayContactChance[] | null;
 }
 
-export interface AttackAnalysis {
-    attacker_is_player: boolean;
-    attacker_ship_id: number;
-    target_ship_id: number;
-    historical_params: HistoricalParams;
-    day: ActionReport<DayPhaseAttackStyle>;
-    night: ActionReport<NightPhaseAttackStyle>;
-    closing_torpedo: ActionReport<TorpedoAttackStyle>;
-    opening_asw: ActionReport<AswAttackStyle>;
-    support_shelling: ActionReport<SupportShellingStyle>;
+export interface DayContactChance {
+  air_state: AirState;
+  trigger_rate: number;
+  rank3: number;
+  rank2: number;
+  rank1: number;
+  total: number;
 }
 
-export type ContactRank = "Rank1" | "Rank2" | "Rank3";
-
-export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
+export type AirWaveType = "Jet" | "LandBase" | "Carrier";
 
-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?: FleetKey;
-    route_sup?: FleetKey;
-    boss_sup?: FleetKey;
-}
+export type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
 
-export type FleetKey = "f1" | "f2" | "f3" | "f4";
+export type ShipCategory =
+  | "Battleship"
+  | "AircraftCarrier"
+  | "HeavyCruiser"
+  | "LightCruiser"
+  | "Destroyer"
+  | "CoastalDefenseShip"
+  | "Submarine"
+  | "AuxiliaryShip";
+
+export type ShipType =
+  | "Unknown"
+  | "DE"
+  | "DD"
+  | "CL"
+  | "CLT"
+  | "CA"
+  | "CAV"
+  | "CVL"
+  | "FBB"
+  | "BB"
+  | "BBV"
+  | "CV"
+  | "XBB"
+  | "SS"
+  | "SSV"
+  | "AP"
+  | "AV"
+  | "LHA"
+  | "CVB"
+  | "AR"
+  | "AS"
+  | "CT"
+  | "AO";
 
-export type Role = "Main" | "Escort";
+export type SlotSizeVec = (number | null)[];
 
-export type ShipAttr = "Unknown" | "NightCarrier" | "Installation" | "RoyalNavy" | "Kai2" | "TurbineSpeedBonus" | "NewModelBoilerSpeedBonus" | "Pillbox" | "IsolatedIsland" | "HarbourSummerPrincess" | "SupplyDepot" | "NewSupplyDepot" | "PtImp" | "BattleshipSummerPrincess" | "HeavyCruiserSummerPrincess" | "AnchorageWaterDemonVacationMode" | "FrenchBattleshipPrincess" | "DockPrincess" | "SummerAircraftCarrierDemon";
+export interface EquippabilityRule {
+  ship: CompiledEvaler;
+  keys?: string[];
+  include?: string;
+  exclude?: string;
+}
 
-export interface ShipConditions extends ShipPosition {
-    formation?: Formation;
-    amagiri_index?: number | null;
+export interface MasterEquippability {
+  equip_stype: Record<number, Record<number, number>>;
+  equip_exslot: number[];
+  equip_ship: Record<number, MstEquipShip>;
+  equip_exslot_ship: Record<number, MstEquipExslotShip>;
+  rules: EquippabilityRule[];
 }
 
-export type ShipCategory = "Battleship" | "AircraftCarrier" | "HeavyCruiser" | "LightCruiser" | "Destroyer" | "CoastalDefenseShip" | "Submarine" | "AuxiliaryShip";
+export interface MstEquipExslotShip {
+  api_ctypes: Record<number, number> | null;
+  api_ship_ids: Record<number, number> | null;
+  api_stypes: Record<number, number> | null;
+}
 
-export type ShipType = "Unknown" | "DE" | "DD" | "CL" | "CLT" | "CA" | "CAV" | "CVL" | "FBB" | "BB" | "BBV" | "CV" | "XBB" | "SS" | "SSV" | "AP" | "AV" | "LHA" | "CVB" | "AR" | "AS" | "CT" | "AO";
+export type MstEquipShip = Record<number, MstEquipShipValue>;
 
-export type Side = "Player" | "Enemy";
+export type MstEquipShipValue = "Null" | { GearIds: number[] };
 
-export type Align = "Left" | "Right";
+export interface EquipStype {
+  id: number;
+  equip_type: number[];
+}
 
-export type SpecialEnemyType = "None" | "SoftSkinned" | "Pillbox" | "IsolatedIsland" | "SupplyDepot" | "NewSupplyDepot" | "HarbourSummerPrincess" | "PtImp" | "BattleshipSummerPrincess" | "HeavyCruiserSummerPrincess" | "FrenchBattleshipPrincess" | "AnchorageWaterDemonVacationMode" | "DockPrincess" | "SummerAircraftCarrierDemon";
+export interface ShipAnalyzerConfig {
+  air_state?: AirState;
+  engagement?: Engagement;
+  left?: AttackAnalyzerShipConfig;
+  right?: AttackAnalyzerShipConfig;
+}
 
 export class AirSquadron {
   private constructor();
   free(): void;
+  [Symbol.dispose](): void;
   get_gear(key: string): Gear | undefined;
   get_slot_size(index: number): number;
   get_max_slot_size(index: number): number;
@@ -825,14 +1059,32 @@ export class AirSquadron {
 export class Analyzer {
   private constructor();
   free(): void;
-  analyze_ship_attack(config: ShipAnalyzerConfig, left: Ship, right: Ship, attacker_is_left: boolean): AttackAnalysis;
-  analyze_node_attack(config: NodeAttackAnalyzerConfig, left_comp: Comp, left_ship: Ship, right_comp: Comp, right_ship: Ship): NodeAttackAnalysis;
+  [Symbol.dispose](): void;
+  analyze_ship_attack(
+    config: ShipAnalyzerConfig,
+    left: Ship,
+    right: Ship,
+    attacker_is_left: boolean,
+  ): AttackAnalysis;
+  analyze_node_attack(
+    config: NodeAttackAnalyzerConfig,
+    left_comp: Comp,
+    left_ship: Ship,
+    right_comp: Comp,
+    right_ship: Ship,
+  ): NodeAttackAnalysis;
   analyze_comp(comp: Comp, config: CompAnalyzerConfig): CompAnalysis;
-  simulate_support_shelling(player_comp: Comp, enemy_comp: Comp, config: NodeAttackAnalyzerConfig, times: number): SimulatorResult;
+  simulate_support_shelling(
+    player_comp: Comp,
+    enemy_comp: Comp,
+    config: NodeAttackAnalyzerConfig,
+    times: number,
+  ): SimulatorResult;
 }
 export class Comp {
   private constructor();
   free(): void;
+  [Symbol.dispose](): void;
   side(): Side;
   is_combined(): boolean;
   is_player(): boolean;
@@ -853,7 +1105,10 @@ export class Comp {
   /**
    * 制空値
    */
-  fighter_power(escort_participates: boolean, air_type: AirWaveType): number | undefined;
+  fighter_power(
+    escort_participates: boolean,
+    air_type: AirWaveType,
+  ): number | undefined;
   /**
    * マップ索敵
    */
@@ -877,6 +1132,7 @@ export class Comp {
 }
 export class FhCore {
   free(): void;
+  [Symbol.dispose](): void;
   constructor(js_master: MasterData);
   create_gear(input?: GearState | null): Gear | undefined;
   create_ship(input?: ShipState | null): Ship | undefined;
@@ -886,21 +1142,33 @@ export class FhCore {
   create_ship_state_by_id(ship_id: number): ShipState | undefined;
   create_ship_by_id(ship_id: number): Ship | undefined;
   create_all_ships(): Ship[];
-  create_comp_by_map_enemy(main: Uint16Array, escort?: Uint16Array | null): Comp;
+  create_comp_by_map_enemy(
+    main: Uint16Array,
+    escort?: Uint16Array | null,
+  ): Comp;
   create_default_ship(): Ship;
   create_analyzer(): Analyzer;
 }
 export class Fleet {
   private constructor();
   free(): void;
+  [Symbol.dispose](): void;
   meta(): FleetMeta;
   ship_keys(): string[];
   ship_ids(): string[];
   get_gear_ids_by_improvable(): string[];
   get_gear_ids_by_proficiency(): string[];
   get_damage_bound(id: string, state: DamageState): number | undefined;
-  get_remaining_fuel(id: string, rate: number, ceil: boolean): number | undefined;
-  get_remaining_ammo(id: string, rate: number, ceil: boolean): number | undefined;
+  get_remaining_fuel(
+    id: string,
+    rate: number,
+    ceil: boolean,
+  ): number | undefined;
+  get_remaining_ammo(
+    id: string,
+    rate: number,
+    ceil: boolean,
+  ): number | undefined;
   count_ships(): number;
   get_ship(key: ShipKey): Ship | undefined;
   fighter_power(air_type: AirWaveType): number | undefined;
@@ -926,6 +1194,7 @@ export class Fleet {
 export class Gear {
   private constructor();
   free(): void;
+  [Symbol.dispose](): void;
   static default(): Gear;
   has_attr(attr: GearAttr): boolean;
   category(): GearCategory;
@@ -989,6 +1258,7 @@ export class Gear {
 export class Org {
   private constructor();
   free(): void;
+  [Symbol.dispose](): void;
   first_ship_id(): string | undefined;
   get_ship_mid(fleet_key: FleetKey, ship_key: ShipKey): number | undefined;
   get_ship_eid(fleet_key: FleetKey, ship_key: ShipKey): string | undefined;
@@ -1018,7 +1288,11 @@ export class Org {
    * 高高度迎撃時の基地制空値
    */
   high_altitude_interception_power(): number;
-  create_move_ship_payload(id: string, x: number, y: number): MoveShipPayload | undefined;
+  create_move_ship_payload(
+    id: string,
+    x: number,
+    y: number,
+  ): MoveShipPayload | undefined;
   get_fleet_type(key: FleetKey): FleetType | undefined;
   id: string;
   readonly hash: bigint;
@@ -1031,12 +1305,7 @@ export class Org {
 export class Ship {
   private constructor();
   free(): void;
-  state_day_gunfit_accuracy(): number | undefined;
-  state_night_gunfit_accuracy(): number | undefined;
-  /**
-   * フィット砲補正
-   */
-  gunfit_accuracy(is_night: boolean): number;
+  [Symbol.dispose](): void;
   static default(): Ship;
   eq_id(id: string): boolean;
   state(): ShipState;
@@ -1083,7 +1352,11 @@ export class Ship {
   cruiser_fit_bonus(): number;
   basic_accuracy_term(): number | undefined;
   basic_evasion_term(): number | undefined;
-  evasion_term(formation_mod: number, postcap_additive: number, postcap_multiplicative: number): number | undefined;
+  evasion_term(
+    formation_mod: number,
+    postcap_additive: number,
+    postcap_multiplicative: number,
+  ): number | undefined;
   basic_defense_power(armor_penetration: number): number | undefined;
   transport_point(): number;
   elos(node_divaricated_factor: number): number | undefined;
@@ -1091,6 +1364,12 @@ export class Ship {
    * 確殺攻撃力
    */
   ohko_power(): number | undefined;
+  state_day_gunfit_accuracy(): number | undefined;
+  state_night_gunfit_accuracy(): number | undefined;
+  /**
+   * フィット砲補正
+   */
+  gunfit_accuracy(is_night: boolean): number;
   id: string;
   readonly hash: bigint;
   readonly ship_id: number;