fleethub-core 1.12.10 → 1.12.12

package/node/fleethub_core.d.ts

@@ -2,6 +2,81 @@
 /* eslint-disable */
 export function parse_ship_conditions(value: ShipConditions): ShipConditions;
 export function set_panic_hook(): void;
+export type ShipAttr =
+  | "Unknown"
+  | "NightCarrier"
+  | "Installation"
+  | "RoyalNavy"
+  | "Kai2"
+  | "TurbineSpeedBonus"
+  | "NewModelBoilerSpeedBonus"
+  | "Pillbox"
+  | "IsolatedIsland"
+  | "HarbourSummerPrincess"
+  | "SupplyDepot"
+  | "NewSupplyDepot"
+  | "PtImp"
+  | "BattleshipSummerPrincess"
+  | "HeavyCruiserSummerPrincess"
+  | "AnchorageWaterDemonVacationMode"
+  | "FrenchBattleshipPrincess"
+  | "DockPrincess"
+  | "SummerAircraftCarrierDemon"
+  | "EuropeanWaterPrincess";
+
+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 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 MasterBattleDefinitions {
   formation: NestedFormationDef[];
   anti_air_cutin: AntiAirCutinDef[];
@@ -10,17 +85,16 @@ export interface MasterBattleDefinitions {
   historical_bonuses?: HistoricalBonusDef[];
 }
 
-export interface FleetCutinReport<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;
+export interface FleetState {
+  id?: string;
+  len?: number;
+  s1?: ShipState;
+  s2?: ShipState;
+  s3?: ShipState;
+  s4?: ShipState;
+  s5?: ShipState;
+  s6?: ShipState;
+  s7?: ShipState;
 }
 
 export interface ActionReport<T> {
@@ -29,14 +103,83 @@ export interface ActionReport<T> {
   is_active: boolean;
 }
 
-export type SpeedGroup = "A" | "B1" | "B2" | "C";
+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 MoveShipPayload {
   current: [string, string, ShipKey];
   target: [string | null, string, ShipKey];
 }
 
-export type GearVecInput = GearInput[];
+export type AirWaveType = "Jet" | "LandBase" | "Carrier";
+
+export type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
+
+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 type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
+
+export interface SlotSizeVecState {
+  ss1?: number;
+  ss2?: number;
+  ss3?: number;
+  ss4?: number;
+  ss5?: number;
+}
+
+export interface AirSquadronState extends GearVecState, SlotSizeVecState {
+  id?: string;
+  mode?: AirSquadronMode;
+}
+
+export type AirSquadronMode = "Sortie" | "AirDefense";
+
+export interface ShipMeta {
+  id: string;
+  ship_id: number;
+}
+
+export interface CompMeta {
+  fleets: Record<FleetType, FleetMeta>;
+}
+
+export interface FleetMeta {
+  id: string;
+  len: number;
+  ships: [string, ShipMeta | null][];
+}
+
+export type Align = "Left" | "Right";
+
+export type Side = "Player" | "Enemy";
 
 export interface GearInput {
   gear_id: number;
@@ -63,6 +206,8 @@ export interface ShipInput {
   yomi: string;
 }
 
+export type GearVecInput = GearInput[];
+
 export interface EBonuses {
   firepower: number;
   torpedo: number;
@@ -76,102 +221,85 @@ export interface EBonuses {
   range: number;
 }
 
-export interface SimulatorResult {
-  items: SimulatorResultItem[];
-  sunk_vec: [number, number, number][];
-}
+export type GearCategory =
+  | "Fighter"
+  | "Bomber"
+  | "Recon"
+  | "MainGun"
+  | "Secondary"
+  | "Torpedo"
+  | "AntiSub"
+  | "Radar"
+  | "Landing"
+  | "Ration"
+  | "LandBased"
+  | "Misc";
 
-export interface SimulatorResultItem {
-  id: string;
-  fleet_type: FleetType;
-  index: number;
-  damage_state_map: Record<DamageState, number>;
-}
+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 interface HitRate {
-  normal: number;
-  critical: number;
-  total: 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 interface AttackAnalyzerShipConfig
-  extends ShipConditions,
-    NightFleetConditions {
-  balloons?: number;
-  fleet_los_mod?: number | null;
-}
-
-export type AirSquadronMode = "Sortie" | "AirDefense";
-
-export interface AirSquadronState extends GearVecState, SlotSizeVecState {
-  id?: string;
-  mode?: AirSquadronMode;
-}
-
-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;
-}
-
-export interface AswAttackStyle {
-  tag: "AswAttackStyle";
-  attack_type: AswAttackType;
-}
-
-export interface TorpedoAttackStyle {
-  tag: "TorpedoAttackStyle";
-  attack_type: TorpedoAttackType;
-}
-
-export type DayPhaseAttackStyle = ShellingStyle | AswAttackStyle;
-
-export type NightPhaseAttackStyle = NightAttackStyle | AswAttackStyle;
-
-export interface SupportShellingStyle {
-  tag: "SupportShellingStyle";
-  attack_type: SupportShellingType;
-}
-
-export type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
-
-export type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
-
-export interface ShipMeta {
-  id: string;
-  ship_id: number;
-}
-
-export interface FleetMeta {
-  id: string;
-  len: number;
-  ships: [string, ShipMeta | null][];
-}
-
-export interface CompMeta {
-  fleets: Record<FleetType, FleetMeta>;
-}
+export type FleetKey = "f1" | "f2" | "f3" | "f4";
 
 export interface OrgState {
   id?: string;
@@ -189,232 +317,162 @@ export interface OrgState {
   boss_sup?: FleetKey;
 }
 
-export type FleetKey = "f1" | "f2" | "f3" | "f4";
-
-export interface SlotSizeVecState {
-  ss1?: number;
-  ss2?: number;
-  ss3?: number;
-  ss4?: number;
-  ss5?: number;
+export interface CompDayAnalysis {
+  day_cutin: CompDayCutinAnalysis;
+  fleet_cutin: FleetCutinReport<ShellingStyle>[];
 }
 
-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 CompAnalysis {
+  day: CompDayAnalysis;
+  night: CompNightAnalysis;
+  contact: ContactAnalysis;
+  anti_air: CompAntiAirAnalysis;
 }
 
-export type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
-
-export type Side = "Player" | "Enemy";
+export interface CompNightAnalysis {
+  night_cutin: CompNightCutinAnalysis;
+  fleet_cutin: FleetCutinReport<NightAttackStyle>[];
+}
 
-export type Align = "Left" | "Right";
+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 MasterData extends MasterBattleDefinitions {
-  created_at: number;
-  gears: MasterGear[];
-  gear_attrs: MasterAttrRule<GearAttr>[];
-  ships: MasterShip[];
-  ship_attrs: MasterAttrRule<ShipAttr>[];
-  ibonuses: MasterIBonuses;
-  equippability: MasterEquippability;
+export interface ShipAnalyzerConfig {
+  air_state?: AirState;
+  engagement?: Engagement;
+  left?: AttackAnalyzerShipConfig;
+  right?: AttackAnalyzerShipConfig;
 }
 
-export interface NationalityDef {
-  id: number;
-  ctypes: number[];
+export interface AttackAnalyzerShipConfig
+  extends ShipConditions,
+    NightFleetConditions {
+  balloons?: number;
+  fleet_los_mod?: number | null;
 }
 
-export interface MasterAttrRule<T> {
-  tag: T;
-  name: string;
-  expr: CompiledEvaler;
+export interface SimulatorResult {
+  items: SimulatorResultItem[];
+  sunk_vec: [number, number, number][];
 }
 
-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 SimulatorResultItem {
+  id: string;
+  fleet_type: FleetType;
+  index: number;
+  damage_state_map: Record<DamageState, number>;
 }
 
-export type StatInterval = [number | null, number | null];
+export type SpeedGroup = "A" | "B1" | "B2" | "C";
 
-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 SupportShellingSimulatorParams {
+  attacker_formation?: Formation;
+  target_formation?: Formation;
+  engagement: Engagement;
+  node_state: NodeState;
 }
 
-export interface MasterIBonusRule {
-  expr: CompiledEvaler;
-  formula: CompiledEvaler;
-}
+export type NightAttackType = "Normal" | "Swordfish" | "Aerial";
 
-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 SupportShellingType = ShellingType;
 
-export type GearCategory =
-  | "Fighter"
-  | "Bomber"
-  | "Recon"
-  | "MainGun"
-  | "Secondary"
-  | "Torpedo"
-  | "AntiSub"
-  | "Radar"
-  | "Landing"
-  | "Ration"
-  | "LandBased"
-  | "Misc";
+export type ShellingType = "Normal" | "Aerial";
 
-export type ShipAttr =
-  | "Unknown"
-  | "NightCarrier"
-  | "Installation"
-  | "RoyalNavy"
-  | "Kai2"
-  | "TurbineSpeedBonus"
-  | "NewModelBoilerSpeedBonus"
+export type NightPhaseAttackType =
+  | { t: "Night"; c: NightAttackType }
+  | { t: "Asw"; c: AswAttackType };
+
+export type AswAttackType = "DepthCharge" | "Aerial";
+
+export type TorpedoAttackType = null;
+
+export type DayPhaseAttackType =
+  | { t: "Shelling"; c: ShellingType }
+  | { t: "Asw"; c: AswAttackType };
+
+export type AttackType =
+  | { t: "Asw"; c: AswAttackType }
+  | { t: "Shelling"; c: ShellingType }
+  | { t: "Night"; c: NightAttackType }
+  | { t: "Torpedo" }
+  | { t: "SupportShelling"; c: SupportShellingType };
+
+export type SlotSizeVec = (number | null)[];
+
+export type GearTypeIdArray = [number, number, number, number, number];
+
+export type SpecialEnemyType =
+  | "None"
+  | "SoftSkinned"
   | "Pillbox"
   | "IsolatedIsland"
-  | "HarbourSummerPrincess"
   | "SupplyDepot"
   | "NewSupplyDepot"
+  | "HarbourSummerPrincess"
   | "PtImp"
   | "BattleshipSummerPrincess"
   | "HeavyCruiserSummerPrincess"
-  | "AnchorageWaterDemonVacationMode"
   | "FrenchBattleshipPrincess"
+  | "AnchorageWaterDemonVacationMode"
   | "DockPrincess"
-  | "SummerAircraftCarrierDemon";
+  | "SummerAircraftCarrierDemon"
+  | "EuropeanWaterPrincess";
 
-export type ShipCategory =
-  | "Battleship"
-  | "AircraftCarrier"
-  | "HeavyCruiser"
-  | "LightCruiser"
-  | "Destroyer"
-  | "CoastalDefenseShip"
-  | "Submarine"
-  | "AuxiliaryShip";
+export type Role = "Main" | "Escort";
+
+export type NightCutinLike = NightCutin | FleetCutin;
+
+export type FleetCutin =
+  | "NelsonTouch"
+  | "NagatoClassCutin"
+  | "ColoradoClassCutin"
+  | "KongouClassCutin"
+  | "Yamato2ShipCutin"
+  | "Yamato3ShipCutin"
+  | "QueenElizabethClassCutin"
+  | "RichelieuClassCutin";
+
+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 DayCutin =
+  | "Zuiun"
+  | "AirSea"
+  | "MainMain"
+  | "MainAp"
+  | "MainRadar"
+  | "MainSec"
+  | "DoubleAttack"
+  | "FBA"
+  | "BBA"
+  | "BA";
+
+export type DayCutinLike = DayCutin | FleetCutin;
 
 export type ShipType =
   | "Unknown"
@@ -441,115 +499,108 @@ export type ShipType =
   | "CT"
   | "AO";
 
-export type CompiledEvaler = string;
-
-export interface EquippabilityRule {
-  ship: CompiledEvaler;
-  keys?: string[];
-  include?: string;
-  exclude?: string;
-}
-
-export interface MasterEquippability {
-  equip_stype: MstStype[];
-  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 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 MstEquipShip {
-  api_equip_type: Record<number, MstEquipShipValue>;
+export interface HitRate {
+  normal: number;
+  critical: number;
+  total: number;
 }
 
-export type MstEquipShipValue = null | number[];
+export type FhResult<T> = { Ok: T } | { Err: string };
 
-export interface MstStype {
-  api_id: number;
-  api_equip_type: Record<number, number>;
+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 type FhResult<T> = { Ok: T } | { Err: string };
-
-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 DayCutinReport extends ActionReport<DayPhaseAttackStyle> {
+  observation_term: number | null;
 }
 
-export interface CompAntiAirAnalysis {
-  fleet_adjusted_anti_air: number;
-  ships: AntiAirReport[];
-  anti_air_cutin_chance: [number, number][];
+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 AntiAirReport {
+export interface ShipDayCutinAnalysis {
   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;
+  rank3: DayCutinReport;
+  rank2: DayCutinReport;
 }
 
-export type AirWaveType = "Jet" | "LandBase" | "Carrier";
+export interface NightCutinActionReport
+  extends ActionReport<NightPhaseAttackStyle> {
+  cutin_term: number | null;
+}
 
-export interface AttackPowerModifier {
-  a?: number;
-  b?: number;
+export interface NightContactChance {
+  rank1: number;
+  rank2: number;
+  rank3: 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;
-  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 ShipNightCutinAnalysis {
+  ship_id: number;
+  index: number;
+  normal: NightCutinActionReport;
+  chuuha: NightCutinActionReport;
 }
 
-export interface CustomPowerModifiers {
-  precap_mod?: AttackPowerModifier;
-  postcap_mod?: AttackPowerModifier;
-  basic_power_mod?: AttackPowerModifier;
-  historical_mod?: AttackPowerModifier;
+export interface CompNightCutinAnalysis {
+  night_contact_chance: NightContactChance;
+  ships: ShipNightCutinAnalysis[];
 }
 
-export interface FormationCombatModifiersDef {
-  power_mod?: number;
-  accuracy_mod?: number;
-  evasion_mod?: number;
+export type Engagement = "GreenT" | "Parallel" | "HeadOn" | "RedT";
+
+export type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
+
+export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
+
+export interface NightCutinDef {
+  tag: NightCutin;
+  hits: number;
+  type_factor: number | null;
+  power_mod: number | null;
+  accuracy_mod: number | null;
 }
 
-export interface FormationDef {
-  tag: Formation;
-  protection_rate: number | null;
-  fleet_anti_air_mod: number;
-  shelling: FormationCombatModifiersDef;
-  torpedo: FormationCombatModifiersDef;
-  asw: FormationCombatModifiersDef;
-  night: FormationCombatModifiersDef;
-  support_shelling: FormationCombatModifiersDef;
+export interface HistoricalParams {
+  power_mod: AttackPowerModifier;
+  armor_penetration: number;
+  accuracy_mod: number;
+  target_evasion_mod: number;
 }
 
 export type NestedFormationDef =
@@ -572,34 +623,12 @@ export interface DayCutinDef {
   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;
+export interface FormationCombatModifiersDef {
+  power_mod?: number;
   accuracy_mod?: number;
   evasion_mod?: number;
 }
 
-export interface HistoricalParams {
-  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;
-}
-
 export interface BattleDefinitions {
   formation: Record<Formation, NestedFormationDef>;
   anti_air_cutin: Record<number, AntiAirCutinDef>;
@@ -608,115 +637,65 @@ export interface BattleDefinitions {
   historical_bonuses: HistoricalBonusDef[];
 }
 
-export type ContactRank = "Rank1" | "Rank2" | "Rank3";
-
-export interface GearState {
-  id?: string;
-  gear_id: number;
-  exp?: number;
-  stars?: number;
-}
-
-export interface GearVecState {
-  g1?: GearState;
-  g2?: GearState;
-  g3?: GearState;
-  g4?: GearState;
-  g5?: GearState;
-  gx?: GearState;
-}
-
-export type Histogram<K extends keyof any, V> = Partial<Record<K, V>>;
-
-export interface ShipAnalyzerConfig {
-  air_state?: AirState;
-  engagement?: Engagement;
-  left?: AttackAnalyzerShipConfig;
-  right?: AttackAnalyzerShipConfig;
-}
-
-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 CompNightAnalysis {
-  night_cutin: CompNightCutinAnalysis;
-  fleet_cutin: FleetCutinReport<NightAttackStyle>[];
-}
-
-export interface CompDayAnalysis {
-  day_cutin: CompDayCutinAnalysis;
-  fleet_cutin: FleetCutinReport<ShellingStyle>[];
+export interface FormationDef {
+  tag: Formation;
+  protection_rate: number | null;
+  fleet_anti_air_mod: number;
+  shelling: FormationCombatModifiersDef;
+  torpedo: FormationCombatModifiersDef;
+  asw: FormationCombatModifiersDef;
+  night: FormationCombatModifiersDef;
+  support_shelling: FormationCombatModifiersDef;
 }
 
-export interface CompAnalysis {
-  day: CompDayAnalysis;
-  night: CompNightAnalysis;
-  contact: ContactAnalysis;
-  anti_air: CompAntiAirAnalysis;
+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;
 }
 
-export type GearTypeIdArray = [number, number, number, number, number];
-
-export interface SupportShellingSimulatorParams {
-  attacker_formation?: Formation;
-  target_formation?: Formation;
-  engagement: Engagement;
-  node_state: NodeState;
+export interface AttackPowerModifier {
+  a?: number;
+  b?: number;
 }
 
-export type Engagement = "GreenT" | "Parallel" | "HeadOn" | "RedT";
-
-export type SingleFormation =
-  | "LineAhead"
-  | "DoubleLine"
-  | "Diamond"
-  | "Echelon"
-  | "LineAbreast"
-  | "Vanguard";
-
-export type CombinedFormation =
-  | "Cruising1"
-  | "Cruising2"
-  | "Cruising3"
-  | "Cruising4";
-
-export type Formation = SingleFormation | CombinedFormation;
-
-export type Role = "Main" | "Escort";
-
-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 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 CustomPowerModifiers {
+  precap_mod?: AttackPowerModifier;
+  postcap_mod?: AttackPowerModifier;
+  basic_power_mod?: AttackPowerModifier;
+  historical_mod?: AttackPowerModifier;
 }
 
+export type OrgType =
+  | "Single"
+  | "CarrierTaskForce"
+  | "SurfaceTaskForce"
+  | "TransportEscort"
+  | "EnemySingle"
+  | "EnemyCombined";
+
 export type AirState =
   | "AirSupremacy"
   | "AirSuperiority"
@@ -726,41 +705,51 @@ export type AirState =
 
 export type AirStateRank = "Rank0" | "Rank1" | "Rank2" | "Rank3";
 
-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 type SingleFormation =
+  | "LineAhead"
+  | "DoubleLine"
+  | "Diamond"
+  | "Echelon"
+  | "LineAbreast"
+  | "Vanguard";
 
-export interface NightConditions {
-  player?: NightFleetConditions;
-  enemy?: NightFleetConditions;
+export type Formation = SingleFormation | CombinedFormation;
+
+export type CombinedFormation =
+  | "Cruising1"
+  | "Cruising2"
+  | "Cruising3"
+  | "Cruising4";
+
+export interface CompAntiAirAnalysis {
+  fleet_adjusted_anti_air: number;
+  ships: AntiAirReport[];
+  anti_air_cutin_chance: [number, number][];
 }
 
-export interface NightFleetConditions {
-  night_contact_rank?: ContactRank | null;
-  starshell_index?: number | null;
-  searchlight_index?: number | null;
-  activates_large_searchlight?: boolean;
+export interface AntiAirReport {
+  ship_id: number;
+  role: Role;
+  index: number;
+  adjusted_anti_air: number | null;
+  proportional_shotdown_rate: number | null;
+  fixed_shotdown_number: number | null;
+  guaranteed: number | null;
+  anti_air_cutin_chance: [number, number][];
+  anti_air_propellant_barrage_chance: number | null;
 }
 
-export type OrgType =
-  | "Single"
-  | "CarrierTaskForce"
-  | "SurfaceTaskForce"
-  | "TransportEscort"
-  | "EnemySingle"
-  | "EnemyCombined";
+export interface FleetCutinAttackReport<T> extends AttackReport<T> {
+  index: number;
+  ship_id: number;
+  power_mod: number;
+}
 
-export interface ShipPosition {
-  org_type?: OrgType;
-  fleet_type?: FleetType;
-  fleet_len?: number;
-  index?: number;
+export interface FleetCutinReport<T> {
+  cutin: FleetCutin;
+  rate: number | null;
+  formation: Formation;
+  attacks: FleetCutinAttackReport<T>[];
 }
 
 export interface AttackPower {
@@ -790,25 +779,6 @@ export interface AttackPowerParams {
   custom_mods: CustomPowerModifiers;
 }
 
-export interface NodeAttackAnalyzerShipConfig extends NightFleetConditions {
-  formation?: Formation;
-}
-
-export interface NodeAttackAnalyzerConfig {
-  air_state?: AirState;
-  engagement?: Engagement;
-  node_state?: NodeState;
-  left?: NodeAttackAnalyzerShipConfig;
-  right?: NodeAttackAnalyzerShipConfig;
-}
-
-export interface NodeAttackAnalysis {
-  left: AttackAnalysis;
-  right: AttackAnalysis;
-  shelling_fleet_cutin: FleetCutinReport<ShellingStyle>[];
-  night_fleet_cutin: FleetCutinReport<NightAttackStyle>[];
-}
-
 export interface AttackAnalysis {
   attacker_is_player: boolean;
   attacker_ship_id: number;
@@ -821,16 +791,70 @@ export interface AttackAnalysis {
   support_shelling: ActionReport<SupportShellingStyle>;
 }
 
-export interface FleetState {
-  id?: string;
-  len?: number;
-  s1?: ShipState;
-  s2?: ShipState;
-  s3?: ShipState;
-  s4?: ShipState;
-  s5?: ShipState;
-  s6?: ShipState;
-  s7?: ShipState;
+export interface ContactAnalysis {
+  single: DayContactChance[] | null;
+  combined: DayContactChance[] | null;
+}
+
+export interface DayContactChance {
+  air_state: AirState;
+  trigger_rate: number;
+  rank3: number;
+  rank2: number;
+  rank1: number;
+  total: number;
+}
+
+export interface MasterData extends MasterBattleDefinitions {
+  created_at: number;
+  gears: MasterGear[];
+  gear_attrs: MasterAttrRule<GearAttr>[];
+  ships: MasterShip[];
+  ship_attrs: MasterAttrRule<ShipAttr>[];
+  ibonuses: MasterIBonuses;
+  equippability: MasterEquippability;
+}
+
+export interface MasterAttrRule<T> {
+  tag: T;
+  name: string;
+  expr: CompiledEvaler;
+}
+
+export interface NationalityDef {
+  id: number;
+  ctypes: number[];
+}
+
+export type CompiledEvaler = string;
+
+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 interface NightFleetConditions {
+  night_contact_rank?: ContactRank | null;
+  starshell_index?: number | null;
+  searchlight_index?: number | null;
+  activates_large_searchlight?: boolean;
+}
+
+export interface ShipPosition {
+  org_type?: OrgType;
+  fleet_type?: FleetType;
+  fleet_len?: number;
+  index?: number;
 }
 
 export type GearAttr =
@@ -864,152 +888,148 @@ export type GearAttr =
   | "SemiNightPlane"
   | "HighAltitudeInterceptor";
 
-export interface ShipConditions extends ShipPosition {
-  formation?: Formation;
-  amagiri_index?: number | null;
-}
-
-export interface NightContactChance {
-  rank1: number;
-  rank2: number;
-  rank3: number;
-}
-
-export interface CompNightCutinAnalysis {
-  night_contact_chance: NightContactChance;
-  ships: ShipNightCutinAnalysis[];
-}
-
-export interface ShipNightCutinAnalysis {
+export interface MasterShip {
   ship_id: number;
-  index: number;
-  normal: NightCutinActionReport;
-  chuuha: NightCutinActionReport;
-}
-
-export interface NightCutinActionReport
-  extends ActionReport<NightPhaseAttackStyle> {
-  cutin_term: number | null;
+  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 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 StatInterval = [number | null, number | null];
 
-export interface ShipDayCutinAnalysis {
-  ship_id: number;
-  role: Role;
-  index: number;
-  rank3: DayCutinReport;
-  rank2: DayCutinReport;
+export interface GearVecState {
+  g1?: GearState;
+  g2?: GearState;
+  g3?: GearState;
+  g4?: GearState;
+  g5?: GearState;
+  gx?: GearState;
 }
 
-export interface DayCutinReport extends ActionReport<DayPhaseAttackStyle> {
-  observation_term: number | null;
+export interface GearState {
+  id?: string;
+  gear_id: number;
+  exp?: number;
+  stars?: number;
 }
 
-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 ShellingStyle {
+  tag: "ShellingStyle";
+  attack_type: ShellingType;
+  cutin: DayCutinLike | null;
+  power_mod: number;
+  accuracy_mod: number;
+  hits: number;
 }
 
-export interface ContactAnalysis {
-  single: DayContactChance[] | null;
-  combined: DayContactChance[] | null;
+export interface AswAttackStyle {
+  tag: "AswAttackStyle";
+  attack_type: AswAttackType;
 }
 
-export interface DayContactChance {
-  air_state: AirState;
-  trigger_rate: number;
-  rank3: number;
-  rank2: number;
-  rank1: number;
-  total: number;
+export interface NightAttackStyle {
+  tag: "NightAttackStyle";
+  attack_type: NightAttackType;
+  cutin: NightCutinLike | null;
+  power_mod: number;
+  accuracy_mod: number;
+  hits: number;
 }
 
-export type AswAttackType = "DepthCharge" | "Aerial";
+export interface SupportShellingStyle {
+  tag: "SupportShellingStyle";
+  attack_type: SupportShellingType;
+}
 
-export type ShellingType = "Normal" | "Aerial";
+export interface TorpedoAttackStyle {
+  tag: "TorpedoAttackStyle";
+  attack_type: TorpedoAttackType;
+}
 
-export type NightAttackType = "Normal" | "Swordfish" | "Aerial";
+export type NightPhaseAttackStyle = NightAttackStyle | AswAttackStyle;
 
-export type SupportShellingType = ShellingType;
+export type DayPhaseAttackStyle = ShellingStyle | AswAttackStyle;
 
-export type AttackType =
-  | { t: "Asw"; c: AswAttackType }
-  | { t: "Shelling"; c: ShellingType }
-  | { t: "Night"; c: NightAttackType }
-  | { t: "Torpedo" }
-  | { t: "SupportShelling"; c: SupportShellingType };
+export interface ShipConditions extends ShipPosition {
+  formation?: Formation;
+  amagiri_index?: number | null;
+}
 
-export type DayPhaseAttackType =
-  | { t: "Shelling"; c: ShellingType }
-  | { t: "Asw"; c: AswAttackType };
+export interface NodeAttackAnalyzerShipConfig extends NightFleetConditions {
+  formation?: Formation;
+}
 
-export type NightPhaseAttackType =
-  | { t: "Night"; c: NightAttackType }
-  | { t: "Asw"; c: AswAttackType };
+export interface NodeAttackAnalysis {
+  left: AttackAnalysis;
+  right: AttackAnalysis;
+  shelling_fleet_cutin: FleetCutinReport<ShellingStyle>[];
+  night_fleet_cutin: FleetCutinReport<NightAttackStyle>[];
+}
 
-export type TorpedoAttackType = null;
+export interface NodeAttackAnalyzerConfig {
+  air_state?: AirState;
+  engagement?: Engagement;
+  node_state?: NodeState;
+  left?: NodeAttackAnalyzerShipConfig;
+  right?: NodeAttackAnalyzerShipConfig;
+}
 
-export type DayCutin =
-  | "Zuiun"
-  | "AirSea"
-  | "MainMain"
-  | "MainAp"
-  | "MainRadar"
-  | "MainSec"
-  | "DoubleAttack"
-  | "FBA"
-  | "BBA"
-  | "BA";
+export interface MasterEquippability {
+  equip_stype: MstStype[];
+  equip_exslot: number[];
+  equip_ship: Record<number, MstEquipShip>;
+  equip_exslot_ship: Record<number, MstEquipExslotShip>;
+  rules: EquippabilityRule[];
+}
 
-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 interface MstStype {
+  api_id: number;
+  api_equip_type: Record<number, number>;
+}
 
-export type FleetCutin =
-  | "NelsonTouch"
-  | "NagatoClassCutin"
-  | "ColoradoClassCutin"
-  | "KongouClassCutin"
-  | "Yamato2ShipCutin"
-  | "Yamato3ShipCutin";
+export interface EquippabilityRule {
+  ship: CompiledEvaler;
+  keys?: string[];
+  include?: string;
+  exclude?: string;
+}
 
-export type DayCutinLike = DayCutin | FleetCutin;
+export interface MstEquipShip {
+  api_equip_type: Record<number, MstEquipShipValue>;
+}
 
-export type NightCutinLike = NightCutin | FleetCutin;
+export interface MstEquipExslotShip {
+  api_ctypes: Record<number, number> | null;
+  api_ship_ids: Record<number, number> | null;
+  api_stypes: Record<number, number> | null;
+}
 
-export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
+export type MstEquipShipValue = null | number[];
 
 export type NodeId = string;
 
@@ -1022,37 +1042,21 @@ export interface NodeState {
   landing_battle?: boolean;
 }
 
-export type SlotSizeVec = (number | null)[];
-
-export type SpecialEnemyType =
-  | "None"
-  | "SoftSkinned"
-  | "Pillbox"
-  | "IsolatedIsland"
-  | "SupplyDepot"
-  | "NewSupplyDepot"
-  | "HarbourSummerPrincess"
-  | "PtImp"
-  | "BattleshipSummerPrincess"
-  | "HeavyCruiserSummerPrincess"
-  | "FrenchBattleshipPrincess"
-  | "AnchorageWaterDemonVacationMode"
-  | "DockPrincess"
-  | "SummerAircraftCarrierDemon";
+export type ContactRank = "Rank1" | "Rank2" | "Rank3";
 
 export class AirSquadron {
   private constructor();
   free(): void;
   [Symbol.dispose](): void;
-  get_gear(key: string): Gear | undefined;
+  fighter_power(): number;
   get_slot_size(index: number): number;
   get_max_slot_size(index: number): number;
-  fighter_power(): number;
   interception_power(): number;
   /**
    * 行動半径
    */
   radius(): number;
+  get_gear(key: string): Gear | undefined;
   id: string;
   hash: bigint;
   mode: AirSquadronMode;
@@ -1061,12 +1065,7 @@ export class Analyzer {
   private constructor();
   free(): void;
   [Symbol.dispose](): void;
-  analyze_ship_attack(
-    config: ShipAnalyzerConfig,
-    left: Ship,
-    right: Ship,
-    attacker_is_left: boolean,
-  ): AttackAnalysis;
+  analyze_comp(comp: Comp, config: CompAnalyzerConfig): CompAnalysis;
   analyze_node_attack(
     config: NodeAttackAnalyzerConfig,
     left_comp: Comp,
@@ -1074,7 +1073,12 @@ export class Analyzer {
     right_comp: Comp,
     right_ship: Ship,
   ): NodeAttackAnalysis;
-  analyze_comp(comp: Comp, config: CompAnalyzerConfig): CompAnalysis;
+  analyze_ship_attack(
+    config: ShipAnalyzerConfig,
+    left: Ship,
+    right: Ship,
+    attacker_is_left: boolean,
+  ): AttackAnalysis;
   simulate_support_shelling(
     player_comp: Comp,
     enemy_comp: Comp,
@@ -1086,23 +1090,9 @@ export class Comp {
   private constructor();
   free(): void;
   [Symbol.dispose](): void;
-  side(): Side;
   is_combined(): boolean;
-  is_player(): boolean;
-  is_enemy(): boolean;
-  has_ship_eid(id: string): boolean;
-  first_ship_id(): string | undefined;
-  has_route_sup(): boolean;
-  meta(): CompMeta;
   get_fleet_id(ft: FleetType): string | undefined;
-  get_ship_with_clone(ft: FleetType, key: ShipKey): Ship | undefined;
-  get_ship_entity_id(ft: FleetType, key: ShipKey): string | undefined;
-  get_ship_by_eid_with_clone(id: string): Ship | undefined;
-  default_formation(): Formation;
-  /**
-   * 艦隊防空値
-   */
-  adjusted_anti_air(formation_mod: number): number;
+  has_ship_eid(id: string): boolean;
   /**
    * 制空値
    */
@@ -1110,17 +1100,31 @@ export class Comp {
     escort_participates: boolean,
     air_type: AirWaveType,
   ): number | undefined;
-  /**
-   * マップ索敵
-   */
-  elos(node_divaricated_factor: number): number | undefined;
+  first_ship_id(): string | undefined;
+  fleet_los_mod(fleet_type: FleetType): number | undefined;
+  has_route_sup(): boolean;
   /**
    * 輸送物資量(TP)
    */
   transport_point(): number;
+  /**
+   * 艦隊防空値
+   */
+  adjusted_anti_air(formation_mod: number): number;
+  default_formation(): Formation;
+  get_ship_entity_id(ft: FleetType, key: ShipKey): string | undefined;
   get_ship_conditions(ship: Ship, formation?: Formation | null): ShipConditions;
-  fleet_los_mod(fleet_type: FleetType): number | undefined;
+  get_ship_with_clone(ft: FleetType, key: ShipKey): Ship | undefined;
+  get_ship_by_eid_with_clone(id: string): Ship | undefined;
+  /**
+   * マップ索敵
+   */
+  elos(node_divaricated_factor: number): number | undefined;
+  meta(): CompMeta;
+  side(): Side;
   balloons(): number;
+  is_enemy(): boolean;
+  is_player(): boolean;
   readonly org_type: OrgType;
   readonly hq_level: number;
   main: Fleet;
@@ -1134,59 +1138,59 @@ export class Comp {
 export class FhCore {
   free(): void;
   [Symbol.dispose](): void;
-  constructor(js_master: MasterData);
+  create_org(input?: OrgState | null): Org | undefined;
   create_gear(input?: GearState | null): Gear | undefined;
   create_ship(input?: ShipState | null): Ship | undefined;
-  create_air_squadron(input?: AirSquadronState | null): AirSquadron;
   create_fleet(input?: FleetState | null): Fleet;
-  create_org(input?: OrgState | null): Org | undefined;
-  create_ship_state_by_id(ship_id: number): ShipState | undefined;
-  create_ship_by_id(ship_id: number): Ship | undefined;
+  create_analyzer(): Analyzer;
   create_all_ships(): Ship[];
+  create_ship_by_id(ship_id: number): Ship | undefined;
+  create_air_squadron(input?: AirSquadronState | null): AirSquadron;
+  create_default_ship(): Ship;
+  create_ship_state_by_id(ship_id: number): ShipState | undefined;
   create_comp_by_map_enemy(
     main: Uint16Array,
     escort?: Uint16Array | null,
   ): Comp;
-  create_default_ship(): Ship;
-  create_analyzer(): Analyzer;
+  constructor(js_master: MasterData);
 }
 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[];
+  count_ships(): number;
+  fighter_power(air_type: AirWaveType): number | undefined;
+  /**
+   * 遠征ボーナス
+   */
+  expedition_bonus(): number;
   get_damage_bound(id: string, state: DamageState): number | undefined;
-  get_remaining_fuel(
+  sum_ship_stat_by(key: string): number | undefined;
+  get_remaining_ammo(
     id: string,
     rate: number,
     ceil: boolean,
   ): number | undefined;
-  get_remaining_ammo(
+  get_remaining_fuel(
     id: string,
     rate: number,
     ceil: boolean,
   ): number | undefined;
-  count_ships(): number;
-  get_ship(key: ShipKey): Ship | undefined;
-  fighter_power(air_type: AirWaveType): number | undefined;
-  /**
-   * マップ索敵
-   */
-  elos(hq_level: number, node_divaricated_factor: number): number | undefined;
+  reset_battle_state(): void;
   /**
    * 航空索敵スコア
    */
   aviation_detection_score(): number | undefined;
+  get_gear_ids_by_improvable(): string[];
+  get_gear_ids_by_proficiency(): string[];
   /**
-   * 遠征ボーナス
+   * マップ索敵
    */
-  expedition_bonus(): number;
-  sum_ship_stat_by(key: string): number | undefined;
-  reset_battle_state(): void;
+  elos(hq_level: number, node_divaricated_factor: number): number | undefined;
+  meta(): FleetMeta;
+  get_ship(key: ShipKey): Ship | undefined;
+  ship_ids(): string[];
+  ship_keys(): string[];
   id: string;
   readonly hash: bigint;
   readonly len: number;
@@ -1196,32 +1200,32 @@ export class Gear {
   private constructor();
   free(): void;
   [Symbol.dispose](): void;
-  static default(): Gear;
-  has_attr(attr: GearAttr): boolean;
-  category(): GearCategory;
-  is_high_angle_mount(): boolean;
-  is_carrier_shelling_plane(): boolean;
-  is_hayabusa_20th_squadron(): boolean;
-  has_proficiency(): boolean;
+  is_abyssal(): boolean;
+  is_balloon(): boolean;
+  is_night_plane(): boolean;
   max_exp_eq_120(): boolean;
+  has_proficiency(): boolean;
+  expedition_bonus(): number;
+  is_night_fighter(): boolean;
+  is_night_attacker(): boolean;
+  night_plane_power(slot_size: number, anti_inst: boolean): number;
+  ship_anti_air_mod(): number;
   calc_fighter_power(slot_size: number): number;
-  calc_interception_power(slot_size: number): number;
   fleet_anti_air_mod(): number;
-  ship_anti_air_mod(): number;
-  calc_contact_trigger_factor(slot_size: number): number;
-  contact_selection_rate(rank: AirStateRank): number;
   night_contact_rate(level: number): number;
-  is_night_attacker(): boolean;
-  is_night_fighter(): boolean;
-  is_night_plane(): boolean;
-  night_plane_power(slot_size: number, anti_inst: boolean): number;
-  elos(): number;
-  is_abyssal(): boolean;
+  is_high_angle_mount(): boolean;
+  contact_selection_rate(rank: AirStateRank): number;
+  calc_interception_power(slot_size: number): number;
+  is_carrier_shelling_plane(): boolean;
+  is_hayabusa_20th_squadron(): boolean;
+  calc_contact_trigger_factor(slot_size: number): number;
+  can_be_deployed_to_land_base(): boolean;
   is_abyssal_cuttlefish_torpedo(): boolean;
   is_abyssal_patrolling_attack_hawk(): boolean;
-  expedition_bonus(): number;
-  can_be_deployed_to_land_base(): boolean;
-  is_balloon(): boolean;
+  elos(): number;
+  static default(): Gear;
+  category(): GearCategory;
+  has_attr(attr: GearAttr): boolean;
   id: string;
   readonly hash: bigint;
   readonly gear_id: number;
@@ -1249,52 +1253,52 @@ export class Gear {
   readonly improvable: boolean;
   readonly ship_anti_air_resist: number;
   readonly fleet_anti_air_resist: number;
+  readonly anti_bomber: number;
   readonly gear_type_id: number;
+  readonly interception: number;
   readonly special_type: number;
-  readonly icon_id: number;
   readonly ace: number;
-  readonly anti_bomber: number;
-  readonly interception: number;
+  readonly icon_id: number;
 }
 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;
+  clone_ship(fleet_key: FleetKey, ship_key: ShipKey): Ship | undefined;
+  clone_fleet(key: FleetKey): Fleet;
+  create_comp(): Comp;
+  is_combined(): boolean;
   get_fleet_id(key: FleetKey): string;
-  air_squadron_ids(): string[];
+  get_ship_eid(fleet_key: FleetKey, ship_key: ShipKey): string | undefined;
+  get_ship_mid(fleet_key: FleetKey, ship_key: ShipKey): number | undefined;
+  first_ship_id(): string | undefined;
   main_ship_ids(): Uint16Array;
-  escort_ship_ids(): Uint16Array;
-  clone_fleet(key: FleetKey): Fleet;
-  clone_ship(fleet_key: FleetKey, ship_key: ShipKey): Ship | undefined;
+  get_fleet_type(key: FleetKey): FleetType | undefined;
   get_ship_by_id(id: string): Ship | undefined;
-  ship_keys(key: FleetKey): string[];
-  create_comp(): Comp;
-  create_comp_by_key(key: FleetKey): Comp;
+  escort_ship_ids(): Uint16Array;
+  air_squadron_ids(): string[];
   get_air_squadron(key: string): AirSquadron;
-  get_air_squadron_gear_ids_by_improvable(): string[];
-  get_air_squadron_gear_ids_by_proficiency(): string[];
-  side(): Side;
-  is_player(): boolean;
-  is_enemy(): boolean;
-  is_single(): boolean;
-  is_combined(): boolean;
+  create_comp_by_key(key: FleetKey): Comp;
   /**
    * 防空時の基地制空値
    */
   interception_power(): number;
-  /**
-   * 高高度迎撃時の基地制空値
-   */
-  high_altitude_interception_power(): number;
   create_move_ship_payload(
     id: string,
     x: number,
     y: number,
   ): MoveShipPayload | undefined;
-  get_fleet_type(key: FleetKey): FleetType | undefined;
+  /**
+   * 高高度迎撃時の基地制空値
+   */
+  high_altitude_interception_power(): number;
+  get_air_squadron_gear_ids_by_improvable(): string[];
+  get_air_squadron_gear_ids_by_proficiency(): string[];
+  side(): Side;
+  is_enemy(): boolean;
+  is_player(): boolean;
+  is_single(): boolean;
+  ship_keys(key: FleetKey): string[];
   id: string;
   readonly hash: bigint;
   readonly hq_level: number;
@@ -1307,70 +1311,70 @@ export class Ship {
   private constructor();
   free(): void;
   [Symbol.dispose](): void;
-  state_day_gunfit_accuracy(): number | undefined;
-  state_night_gunfit_accuracy(): number | undefined;
   /**
    * フィット砲補正
    */
   gunfit_accuracy(is_night: boolean): number;
-  static default(): Ship;
-  eq_id(id: string): boolean;
-  state(): ShipState;
-  custom_power_mods(): CustomPowerModifiers;
-  meta(): ShipMeta;
-  damage_state(): DamageState;
-  morale_state(): MoraleState;
-  category(): ShipCategory;
-  has_attr(attr: ShipAttr): boolean;
-  gear_keys(): string[];
-  get_gear(key: string): Gear | undefined;
-  get_damage_bound(state: DamageState): number | undefined;
-  get_remaining_fuel(rate: number, ceil: boolean): number;
-  get_remaining_ammo(rate: number, ceil: boolean): number;
-  has_unknown_stat(key: string): boolean;
-  get_naked_stat(key: string): number | undefined;
-  get_stat_interval_left(key: string): number | undefined;
-  get_stat_interval_right(key: string): number | undefined;
-  get_gear_stat(key: string): number;
+  state_day_gunfit_accuracy(): number | undefined;
+  state_night_gunfit_accuracy(): number | undefined;
   get_ebonus(key: string): number;
-  get_stat_mod(key: string): number | undefined;
   is_abyssal(): boolean;
-  is_submarine(): boolean;
   is_amagiri(): boolean;
-  can_equip(gear: Gear, key: string): boolean;
-  is_installation(): boolean;
-  is_pt_imp(): boolean;
-  special_enemy_type(): SpecialEnemyType;
-  is_attackable_by_torpedo(): boolean;
-  get_slot_size(index: number): number | undefined;
-  get_max_slot_size(index: number): number | undefined;
-  remaining_ammo_mod(): number;
-  remaining_fuel_mod(): number;
-  fighter_power(air_type: AirWaveType): number | undefined;
-  fleet_los_factor(): number | undefined;
-  /**
-   * 加重対空
-   */
-  ship_adjusted_anti_air(side: Side): number | undefined;
   /**
-   * 艦隊対空補正
+   * 確殺攻撃力
    */
-  fleet_anti_air_mod(): number;
-  cruiser_fit_bonus(): number;
-  basic_accuracy_term(): number | undefined;
-  basic_evasion_term(): number | undefined;
+  ohko_power(): number | undefined;
+  damage_state(): DamageState;
   evasion_term(
     formation_mod: number,
     postcap_additive: number,
     postcap_multiplicative: number,
   ): number | undefined;
-  basic_defense_power(armor_penetration: number): number | undefined;
+  get_stat_mod(key: string): number | undefined;
+  is_submarine(): boolean;
+  morale_state(): MoraleState;
+  fighter_power(air_type: AirWaveType): number | undefined;
+  get_gear_stat(key: string): number;
+  get_slot_size(index: number): number | undefined;
+  get_naked_stat(key: string): number | undefined;
+  is_installation(): boolean;
   transport_point(): number;
-  elos(node_divaricated_factor: number): number | undefined;
+  fleet_los_factor(): number | undefined;
+  get_damage_bound(state: DamageState): number | undefined;
+  has_unknown_stat(key: string): boolean;
+  cruiser_fit_bonus(): number;
+  custom_power_mods(): CustomPowerModifiers;
+  get_max_slot_size(index: number): number | undefined;
+  basic_evasion_term(): number | undefined;
   /**
-   * 確殺攻撃力
+   * 艦隊対空補正
    */
-  ohko_power(): number | undefined;
+  fleet_anti_air_mod(): number;
+  get_remaining_ammo(rate: number, ceil: boolean): number;
+  get_remaining_fuel(rate: number, ceil: boolean): number;
+  remaining_ammo_mod(): number;
+  remaining_fuel_mod(): number;
+  special_enemy_type(): SpecialEnemyType;
+  basic_accuracy_term(): number | undefined;
+  basic_defense_power(armor_penetration: number): number | undefined;
+  get_stat_interval_left(key: string): number | undefined;
+  /**
+   * 加重対空
+   */
+  ship_adjusted_anti_air(side: Side): number | undefined;
+  get_stat_interval_right(key: string): number | undefined;
+  is_attackable_by_torpedo(): boolean;
+  elos(node_divaricated_factor: number): number | undefined;
+  meta(): ShipMeta;
+  eq_id(id: string): boolean;
+  state(): ShipState;
+  static default(): Ship;
+  category(): ShipCategory;
+  get_gear(key: string): Gear | undefined;
+  has_attr(attr: ShipAttr): boolean;
+  can_equip(gear: Gear, key: string): boolean;
+  gear_keys(): string[];
+  is_pt_imp(): boolean;
   id: string;
   readonly hash: bigint;
   readonly ship_id: number;
@@ -1382,36 +1386,36 @@ export class Ship {
   readonly ship_type: ShipType;
   readonly ctype: number;
   slots: SlotSizeVec;
-  readonly naked_firepower: number | undefined;
-  readonly naked_torpedo: number | undefined;
   readonly naked_armor: number | undefined;
-  readonly naked_anti_air: number | undefined;
+  readonly naked_range: number | undefined;
+  readonly naked_speed: number;
+  readonly remodel_rank: number;
   readonly naked_evasion: number | undefined;
-  readonly naked_asw: number | undefined;
-  readonly naked_los: number | undefined;
-  readonly firepower: number | undefined;
-  readonly torpedo: number | undefined;
-  readonly armor: number | undefined;
-  readonly anti_air: number | undefined;
-  readonly evasion: number | undefined;
+  readonly naked_torpedo: number | undefined;
+  readonly naked_anti_air: number | undefined;
+  readonly naked_firepower: number | undefined;
+  readonly innate_torpedo_accuracy: number;
   readonly asw: number | undefined;
   readonly los: number | undefined;
+  readonly luck: number | undefined;
   readonly name: string;
   readonly yomi: string;
+  readonly armor: number | undefined;
+  readonly range: number | undefined;
+  readonly speed: number;
   readonly stype: number;
-  readonly sort_id: number;
-  readonly remodel_rank: number;
-  readonly slotnum: number;
-  readonly next_id: number;
-  readonly useful: boolean;
   readonly max_hp: number | undefined;
+  readonly useful: boolean;
+  readonly evasion: number | undefined;
+  readonly next_id: number;
+  readonly slotnum: number;
+  readonly sort_id: number;
+  readonly torpedo: number | undefined;
+  readonly accuracy: number;
+  readonly anti_air: number | undefined;
   readonly max_ammo: number;
   readonly max_fuel: number;
-  readonly naked_range: number | undefined;
-  readonly naked_speed: number;
-  readonly luck: number | undefined;
-  readonly range: number | undefined;
-  readonly speed: number;
-  readonly accuracy: number;
-  readonly innate_torpedo_accuracy: number;
+  readonly firepower: number | undefined;
+  readonly naked_asw: number | undefined;
+  readonly naked_los: number | undefined;
 }