fleethub-core 1.3.0 → 1.3.3

package/node/fleethub_core.d.ts

@@ -1,102 +1,56 @@
 /* tslint:disable */
 /* eslint-disable */
-/**
- * @param {Gear} gear
- * @returns {boolean}
- */
-export function air_squadron_can_equip(gear: Gear): boolean;
 /**
  */
 export function set_panic_hook(): void;
-/**
- * @param {OrgType} org_type
- * @returns {boolean}
- */
-export function org_type_is_single(org_type: OrgType): boolean;
-/**
- * @param {OrgType} org_type
- * @returns {Formation}
- */
-export function org_type_default_formation(org_type: OrgType): Formation;
-/**
- * @param {OrgType} org_type
- * @returns {boolean}
- */
-export function org_type_is_player(org_type: OrgType): boolean;
-/**
- * @param {OrgType} org_type
- * @returns {Side}
- */
-export function org_type_side(org_type: OrgType): Side;
-export type CompDayCutinRateInfo = {
-  main: FleetDayCutinRateInfo;
-  escort: FleetDayCutinRateInfo | null;
-};
-
-export type FleetDayCutinRateInfo = {
-  fleet_los_mod: number | null;
-  ships: ShipDayCutinRateInfo[];
-};
+export interface EBonusFnGearInput {
+  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 type ShipDayCutinRateInfo = {
+export interface EBonusFnShipInput {
   ship_id: number;
-  air_supremacy: DayCutinRateInfo;
-  air_superiority: DayCutinRateInfo;
-};
-
-export type DayCutinRateInfo = {
-  observation_term: number | null;
-  rates: [DayCutin | null, number | null][];
-  total_cutin_rate: number | null;
-};
-
-export type DamageInfo = {
-  miss_damage_min: number;
-  miss_damage_max: number;
-  normal_damage_min: number;
-  normal_damage_max: number;
-  critical_damage_min: number;
-  critical_damage_max: number;
-  normal_scratch_rate: number;
-  critical_scratch_rate: number;
-  damage_map: NumMap<number, number>;
-  damage_state_map: NumMap<DamageState, number>;
-};
-
-export type GearTypes = [number, number, number, number, number];
-
-export type MasterGear = {
-  gear_id: number;
-  name: string;
-  types: GearTypes;
-  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;
-  adjusted_anti_air_resistance?: number;
-  fleet_anti_air_resistance?: number;
-};
+  ctype: number;
+  stype: number;
+  yomi: string;
+}
 
-export type MasterVariantDef = { tag: string; id: number; name: string };
+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 type MasterAttrRule = { tag: string; name: string; expr: string };
+export type AirStateRank = "Rank0" | "Rank1" | "Rank2" | "Rank3";
 
-export type MasterIBonusRule = { expr: string; formula: string };
+export type AirState =
+  | "AirSupremacy"
+  | "AirSuperiority"
+  | "AirParity"
+  | "AirDenial"
+  | "AirIncapability";
 
-export type MasterIBonuses = {
+export interface MasterIBonuses {
   shelling_power: MasterIBonusRule[];
   carrier_shelling_power: MasterIBonusRule[];
   shelling_accuracy: MasterIBonusRule[];
@@ -110,197 +64,61 @@ export type MasterIBonuses = {
   defense_power: MasterIBonusRule[];
   contact_selection: MasterIBonusRule[];
   fighter_power: MasterIBonusRule[];
-  adjusted_anti_air: MasterIBonusRule[];
+  ship_anti_air: MasterIBonusRule[];
   fleet_anti_air: MasterIBonusRule[];
   elos: MasterIBonusRule[];
-};
-
-export type StatInterval = [number | null, number | null];
-
-export type MasterShip = {
-  ship_id: number;
-  name: string;
-  yomi: string;
-  stype: number;
-  ctype: number;
-  sort_id?: number;
-  max_hp: StatInterval;
-  firepower: StatInterval;
-  armor: StatInterval;
-  torpedo: StatInterval;
-  evasion: StatInterval;
-  anti_air: StatInterval;
-  asw: StatInterval;
-  los: StatInterval;
-  luck: StatInterval;
-  speed: number;
-  range?: number;
-  fuel?: number;
-  ammo?: number;
-  next_id?: number;
-  next_level?: number;
-  slotnum: number;
-  slots: Array<number | null>;
-  stock: Array<GearState>;
-  speed_group?: SpeedGroup;
-  useful?: boolean;
-};
-
-export type EquipStype = { id: number; equip_type: number[] };
-
-export type MstEquipShip = { api_ship_id: number; api_equip_type: number[] };
-
-export type MstEquipExslotShip = {
-  api_slotitem_id: number;
-  api_ship_ids: number[];
-};
-
-export type MasterEquippable = {
-  equip_stype: EquipStype[];
-  equip_exslot: number[];
-  equip_ship: MstEquipShip[];
-  equip_exslot_ship: MstEquipExslotShip[];
-};
-
-export type MasterData = {
-  gears: MasterGear[];
-  gear_attrs: MasterAttrRule[];
-  ships: MasterShip[];
-  ship_attrs: MasterAttrRule[];
-  equippable: MasterEquippable;
-  ibonuses: MasterIBonuses;
-  config: BattleConfig;
-};
-
-export type ContactRank = "Rank1" | "Rank2" | "Rank3";
-
-export type SimulatorResult = {
-  items: SimulatorResultItem[];
-  sunk_vec: [number, number, number][];
-};
-
-export type SimulatorResultItem = {
-  id: string;
-  role: Role;
-  index: number;
-  damage_state_map: Record<DamageState, number>;
-};
-
-export type AswAttackType = "DepthCharge" | "Aircraft";
-
-export type SpecialEnemyType =
-  | "None"
-  | "SoftSkinned"
-  | "Pillbox"
-  | "IsolatedIsland"
-  | "SupplyDepot"
-  | "HarbourSummerPrincess"
-  | "PtImp"
-  | "BattleshipSummerPrincess"
-  | "HeavyCruiserSummerPrincess";
-
-export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
-
-export type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
+}
 
-export type SpeedGroup = "A" | "B1" | "B2" | "C";
+export interface MasterIBonusRule {
+  expr: CompiledEvaler;
+  formula: CompiledEvaler;
+}
 
-export type ShipAttr =
-  | "Abyssal"
-  | "NightCarrier"
-  | "Installation"
-  | "RoyalNavy"
-  | "Kai2"
-  | "TurbineSpeedBonus"
-  | "Pillbox"
-  | "IsolatedIsland"
-  | "HarbourSummerPrincess"
-  | "SupplyDepot"
-  | "PtImp"
-  | "BattleshipSummerPrincess"
-  | "HeavyCruiserSummerPrincess";
+export interface NightSituation {
+  night_contact_rank: ContactRank | null;
+  starshell: boolean;
+  searchlight: boolean;
+}
 
-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 interface DamageInfo {
+  miss_damage_min: number;
+  miss_damage_max: number;
+  normal_damage_min: number;
+  normal_damage_max: number;
+  critical_damage_min: number;
+  critical_damage_max: number;
+  normal_scratch_rate: number;
+  critical_scratch_rate: number;
+  damage_map: NumMap<number, number>;
+  damage_state_map: NumMap<DamageState, number>;
+}
 
-export type ShipCategory =
-  | "Battleship"
-  | "AircraftCarrier"
-  | "HeavyCruiser"
-  | "LightCruiser"
-  | "Destroyer"
-  | "CoastalDefenseShip"
-  | "Submarine"
-  | "AuxiliaryShip";
+export type OrgType =
+  | "Single"
+  | "CarrierTaskForce"
+  | "SurfaceTaskForce"
+  | "TransportEscort"
+  | "EnemySingle"
+  | "EnemyCombined";
 
-export type WarfareContext = {
+export interface WarfareContext {
   attacker_env: WarfareShipEnvironment;
   target_env: WarfareShipEnvironment;
   engagement: Engagement;
   air_state: AirState;
   custom_mods: CustomModifiers;
-};
+}
 
-export type WarfareShipEnvironment = {
+export interface WarfareShipEnvironment {
   org_type: OrgType;
   role: Role;
   ship_index: number;
   fleet_len: number;
   formation: Formation;
   fleet_los_mod: number | null;
-};
-
-export type ShellingSpecialAttack =
-  | { DayCutin: DayCutin }
-  | { FleetCutin: FleetCutin };
-
-export type DayCutin =
-  | "MainMain"
-  | "MainAp"
-  | "MainRadar"
-  | "MainSec"
-  | "DoubleAttack"
-  | "FBA"
-  | "BBA"
-  | "BA"
-  | "Zuiun"
-  | "AirSea";
-
-export type CompMeta = { fleets: Record<FleetType, FleetMeta> };
-
-export type FleetMeta = {
-  id: string;
-  len: number;
-  ships: [string, ShipMeta | null][];
-};
-
-export type ShipMeta = { id: string; ship_id: number };
-
-export type Engagement = "GreenT" | "Parallel" | "HeadOn" | "RedT";
+}
 
-export type AttackPower = {
+export interface AttackPower {
   precap: number;
   is_capped: boolean;
   capped: number;
@@ -308,9 +126,9 @@ export type AttackPower = {
   critical: number;
   armor_penetration: number;
   remaining_ammo_mod: number;
-};
+}
 
-export type AttackPowerParams = {
+export interface AttackPowerParams {
   basic: number;
   cap: number;
   precap_mod: AttackPowerModifier;
@@ -322,14 +140,14 @@ export type AttackPowerParams = {
   remaining_ammo_mod: number;
   special_enemy_mods: SpecialEnemyModifiers;
   custom_mods: CustomModifiers;
-};
+}
 
-export type CustomModifiers = {
+export interface CustomModifiers {
   precap_mod: AttackPowerModifier;
   postcap_mod: AttackPowerModifier;
-};
+}
 
-export type SpecialEnemyModifiers = {
+export interface SpecialEnemyModifiers {
   precap_general_mod: AttackPowerModifier;
   stype_mod: AttackPowerModifier;
   landing_craft_synergy_mod: AttackPowerModifier;
@@ -338,216 +156,104 @@ export type SpecialEnemyModifiers = {
   honi_mod: AttackPowerModifier;
   postcap_general_mod: AttackPowerModifier;
   pt_mod: AttackPowerModifier;
-};
-
-export type AttackPowerModifier = { a: number; b: number };
-
-export type EBonusFnGearInput = {
-  gear_id: number;
-  types: GearTypes;
-  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 type EBonusFnShipInput = {
-  ship_id: number;
-  ctype: number;
-  stype: number;
-  yomi: string;
-};
-
-export type EBonuses = {
-  firepower: number;
-  torpedo: number;
-  anti_air: number;
-  armor: number;
-  evasion: number;
-  asw: number;
-  los: number;
-  bombing: number;
-  accuracy: number;
-  range: number;
-};
+}
 
-export type AirStateRank = "Rank0" | "Rank1" | "Rank2" | "Rank3";
+export interface AttackPowerModifier {
+  a: number;
+  b: number;
+}
 
-export type AirState =
-  | "AirSupremacy"
-  | "AirSuperiority"
-  | "AirParity"
-  | "AirDenial"
-  | "AirIncapability";
+export type NumMap<K, V> = Partial<Record<K, V>>;
 
-export type ShellingSupportSimulatorParams = {
-  attacker_formation: Formation;
-  target_formation: Formation;
-  engagement: Engagement;
-  custom_mods: CustomModifiers;
-};
+export type Role = "Main" | "Escort";
 
-export type NightSituation = {
-  night_contact_rank: ContactRank | null;
-  starshell: boolean;
-  searchlight: boolean;
-};
+export interface CompMeta {
+  fleets: Record<FleetType, FleetMeta>;
+}
 
-export type GearState = {
-  id?: string;
-  gear_id: number;
-  exp?: number;
-  stars?: number;
-};
+export interface FleetMeta {
+  id: string;
+  len: number;
+  ships: [string, ShipMeta | null][];
+}
 
-export type ShipState = {
-  id?: string;
+export interface ShipMeta {
+  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;
-  g1?: GearState;
-  g2?: GearState;
-  g3?: GearState;
-  g4?: GearState;
-  g5?: GearState;
-  gx?: GearState;
-  ss1?: number;
-  ss2?: number;
-  ss3?: number;
-  ss4?: number;
-  ss5?: number;
-};
-
-export type FleetState = {
-  id?: string;
-  len?: number;
-  s1?: ShipState;
-  s2?: ShipState;
-  s3?: ShipState;
-  s4?: ShipState;
-  s5?: ShipState;
-  s6?: ShipState;
-  s7?: ShipState;
-};
-
-export type AirSquadronMode = "Sortie" | "AirDefense";
-
-export type AirSquadronState = {
-  id?: string;
-  mode?: AirSquadronMode;
-  g1?: GearState;
-  g2?: GearState;
-  g3?: GearState;
-  g4?: GearState;
-  g5?: GearState;
-  gx?: GearState;
-  ss1?: number;
-  ss2?: number;
-  ss3?: number;
-  ss4?: number;
-  ss5?: number;
-};
-
-export type Side = "Player" | "Enemy";
-
-export type OrgType =
-  | "Single"
-  | "CarrierTaskForce"
-  | "SurfaceTaskForce"
-  | "TransportEscort"
-  | "EnemySingle"
-  | "EnemyCombined";
+}
 
-export type Role = "Main" | "Escort";
+export interface CompDayCutinRateInfo {
+  main: FleetDayCutinRateInfo;
+  escort: FleetDayCutinRateInfo | null;
+}
 
-export type OrgState = {
-  id?: string;
-  f1?: FleetState;
-  f2?: FleetState;
-  f3?: FleetState;
-  f4?: FleetState;
-  a1?: AirSquadronState;
-  a2?: AirSquadronState;
-  a3?: AirSquadronState;
-  hq_level?: number;
-  org_type?: OrgType;
-  sortie?: string;
-  route_sup?: string;
-  boss_sup?: string;
-};
+export interface FleetDayCutinRateInfo {
+  fleet_los_mod: number | null;
+  ships: ShipDayCutinRateInfo[];
+}
 
-export type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
+export interface ShipDayCutinRateInfo {
+  ship_id: number;
+  air_supremacy: DayCutinRateInfo;
+  air_superiority: DayCutinRateInfo;
+}
 
-export type ShipStateMap = Record<ShipKey, ShipState>;
+export interface DayCutinRateInfo {
+  observation_term: number | null;
+  rates: [DayCutin | null, number | null][];
+  total_cutin_rate: number | null;
+}
 
-export type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
+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 CompAntiAirInfo = {
-  fleet_anti_air: number;
-  ships: ShipAntiAirInfo[];
-  anti_air_cutin_chance: [number, number][];
-};
+export type ShipCategory =
+  | "Battleship"
+  | "AircraftCarrier"
+  | "HeavyCruiser"
+  | "LightCruiser"
+  | "Destroyer"
+  | "CoastalDefenseShip"
+  | "Submarine"
+  | "AuxiliaryShip";
 
-export type ShipAntiAirInfo = {
-  ship_id: number;
-  adjusted_anti_air: number | null;
-  proportional_shotdown_rate: number | null;
-  fixed_shotdown_number: number | null;
-  minimum_bonus: number | null;
-  anti_air_cutin_chance: [number, number][];
-  anti_air_propellant_barrage_chance: number | null;
-};
+export type ShellingSpecialAttack =
+  | { DayCutin: DayCutin }
+  | { FleetCutin: FleetCutin };
 
-export type GearAttr =
-  | "Abyssal"
-  | "HighAngleMount"
-  | "NightFighter"
-  | "NightAttacker"
-  | "HeavyBomber"
-  | "MainGun"
-  | "Radar"
-  | "SurfaceRadar"
-  | "AirRadar"
-  | "DepthChargeProjector"
-  | "AdditionalDepthCharge"
-  | "AntiSubMortar"
-  | "AntiSubWeapon"
-  | "AntiSubAircraft"
-  | "LateModelBowTorpedo"
-  | "Seaplane"
-  | "CbAircraft"
-  | "LbAircraft"
-  | "JetAircraft"
-  | "Fighter"
-  | "Recon"
-  | "ObservationSeaplane"
-  | "CbFighterBomber"
-  | "AntiInstDiveBomber"
-  | "NightRecon"
-  | "CbSwordfish"
-  | "SemiNightPlane"
-  | "HighAltitudeInterceptor";
+export type DayCutin =
+  | "MainMain"
+  | "MainAp"
+  | "MainRadar"
+  | "MainSec"
+  | "DoubleAttack"
+  | "FBA"
+  | "BBA"
+  | "BA"
+  | "Zuiun"
+  | "AirSea";
 
 export type GearCategory =
   | "Fighter"
@@ -624,6 +330,89 @@ export type GearType =
   | "LargeRadar2"
   | "CbRecon2";
 
+export type Engagement = "GreenT" | "Parallel" | "HeadOn" | "RedT";
+
+export interface ShellingSupportSimulatorParams {
+  attacker_formation: Formation;
+  target_formation: Formation;
+  engagement: Engagement;
+  custom_mods: CustomModifiers;
+}
+
+export interface MasterData {
+  gears: MasterGear[];
+  gear_attrs: MasterAttrRule<GearAttr>[];
+  ships: MasterShip[];
+  ship_attrs: MasterAttrRule<ShipAttr>[];
+  ibonuses: MasterIBonuses;
+  equippable: MasterEquippable;
+  formation: NestedFormationDef[];
+  anti_air_cutin: AntiAirCutinDef[];
+  day_cutin: DayCutinDef[];
+  night_cutin: NightCutinDef[];
+}
+
+export interface MasterConfig {
+  formation: NestedFormationDef[];
+  anti_air_cutin: AntiAirCutinDef[];
+  day_cutin: DayCutinDef[];
+  night_cutin: NightCutinDef[];
+}
+
+export interface MasterAttrRule<T> {
+  tag: T;
+  name: string;
+  expr: string;
+}
+
+export interface MasterShip {
+  ship_id: number;
+  name: string;
+  yomi: string;
+  stype: number;
+  ctype: 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;
+  speed: number;
+  range?: number;
+  fuel?: number;
+  ammo?: number;
+  next_id?: number;
+  next_level?: number;
+  slotnum: number;
+  slots: SlotSizeVec;
+  stock: GearState[];
+  speed_group?: SpeedGroup;
+  useful?: boolean;
+}
+
+export type StatInterval = [number | null, number | null];
+
+export type ShipAttr =
+  | "Unknown"
+  | "Abyssal"
+  | "NightCarrier"
+  | "Installation"
+  | "RoyalNavy"
+  | "Kai2"
+  | "TurbineSpeedBonus"
+  | "Pillbox"
+  | "IsolatedIsland"
+  | "HarbourSummerPrincess"
+  | "SupplyDepot"
+  | "PtImp"
+  | "BattleshipSummerPrincess"
+  | "HeavyCruiserSummerPrincess";
+
 export type Formation = SingleFormation | CombinedFormation;
 
 export type CombinedFormation =
@@ -640,71 +429,133 @@ export type SingleFormation =
   | "LineAbreast"
   | "Vanguard";
 
-export type FleetCutinAnalysis = {
+export type ShellingAttackType = "Normal" | "Carrier";
+
+export interface FleetCutinAnalysis {
   shelling: FleetCutinInfo[];
   night: FleetCutinInfo[];
-};
+}
+
+export interface FleetCutinInfo {
+  cutin: FleetCutin;
+  formation: Formation;
+  items: FleetCutinInfoItem[];
+}
+
+export interface FleetCutinInfoItem {
+  ship_id: number;
+  cutin: FleetCutin;
+  fleet_cutin_mod: number;
+  stats: AttackStats;
+}
+
+export interface CompContactChanceInfo {
+  single: AirstrikeContactChance[] | null;
+  combined: AirstrikeContactChance[] | null;
+}
+
+export interface AirstrikeContactChance {
+  air_state: AirState;
+  trigger_rate: number;
+  rank3: number;
+  rank2: number;
+  rank1: number;
+  total: number;
+}
+
+export type GearAttr =
+  | "Unknown"
+  | "Abyssal"
+  | "HighAngleMount"
+  | "NightFighter"
+  | "NightAttacker"
+  | "HeavyBomber"
+  | "MainGun"
+  | "Radar"
+  | "SurfaceRadar"
+  | "AirRadar"
+  | "DepthChargeProjector"
+  | "AdditionalDepthCharge"
+  | "AntiSubMortar"
+  | "AntiSubWeapon"
+  | "AntiSubAircraft"
+  | "LateModelBowTorpedo"
+  | "Seaplane"
+  | "CbAircraft"
+  | "LbAircraft"
+  | "JetAircraft"
+  | "Fighter"
+  | "Recon"
+  | "ObservationSeaplane"
+  | "CbFighterBomber"
+  | "AntiInstDiveBomber"
+  | "NightRecon"
+  | "CbSwordfish"
+  | "SemiNightPlane"
+  | "HighAltitudeInterceptor";
+
+export type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
+
+export interface MasterEquippable {
+  equip_stype: EquipStype[];
+  equip_exslot: number[];
+  equip_ship: MstEquipShip[];
+  equip_exslot_ship: MstEquipExslotShip[];
+}
+
+export interface MstEquipExslotShip {
+  api_slotitem_id: number;
+  api_ship_ids: number[];
+}
 
-export type FleetCutinInfo = {
-  cutin: FleetCutin;
-  formation: Formation;
-  items: FleetCutinInfoItem[];
-};
+export interface MstEquipShip {
+  api_ship_id: number;
+  api_equip_type: number[];
+}
 
-export type FleetCutinInfoItem = {
-  ship_id: number;
-  cutin: FleetCutin;
-  fleet_cutin_mod: number;
-  stats: AttackStats;
-};
+export interface EquipStype {
+  id: number;
+  equip_type: number[];
+}
 
-export type AttackInfo<AttackType, Cutin> = {
+export interface AttackInfo<AttackType, Cutin> {
   attack_type: AttackType;
   items: AttackInfoItem<Cutin>[];
   damage_state_map: NumMap<DamageState, number> | null;
-};
+}
 
-export type AttackInfoItem<Cutin> = {
+export interface AttackInfoItem<Cutin> {
   cutin: Cutin;
   rate: number | null;
   stats: AttackStats;
-};
+}
 
-export type AttackStats = {
+export interface AttackStats {
   attack_power: AttackPower | null;
   attack_power_params: AttackPowerParams | null;
   hits: number;
   hit_rate: HitRate | null;
   hit_rate_params: HitRateParams | null;
   damage: DamageInfo | null;
-};
-
-export type CompContactChanceInfo = {
-  single: AirstrikeContactChance[] | null;
-  combined: AirstrikeContactChance[] | null;
-};
-
-export type AirstrikeContactChance = {
-  air_state: AirState;
-  trigger_rate: number;
-  rank3: number;
-  rank2: number;
-  rank1: number;
-  total: number;
-};
-
-export type ShellingAttackType = "Normal" | "Carrier";
+}
 
-export type NightBattleAttackType =
-  | { t: "NightAttack"; c: NightAttackType }
-  | { t: "Asw"; c: AswAttackType };
+export interface CompAntiAirInfo {
+  fleet_adjusted_anti_air: number;
+  ships: ShipAntiAirInfo[];
+  anti_air_cutin_chance: [number, number][];
+}
 
-export type DayBattleAttackType =
-  | { t: "Shelling"; c: ShellingAttackType }
-  | { t: "Asw"; c: AswAttackType };
+export interface ShipAntiAirInfo {
+  ship_id: number;
+  adjusted_anti_air: number | null;
+  proportional_shotdown_rate: number | null;
+  fixed_shotdown_number: number | null;
+  guaranteed: number | null;
+  anti_air_cutin_chance: [number, number][];
+  anti_air_propellant_barrage_chance: number | null;
+}
 
-import * as bindings from "../bindings";
-export * from "../bindings";
+export type Side = "Player" | "Enemy";
 
 export type NightAttackType = "Normal" | "ArkRoyal" | "Carrier";
 
@@ -729,33 +580,70 @@ export type NightCutin =
   | "Cvci1_18"
   | "Photobomber";
 
-export type HitRate = { total: number; normal: number; critical: number };
+export interface MasterGear {
+  gear_id: number;
+  name: string;
+  types: GearTypeIdArray;
+  special_type?: number;
+  max_hp?: number;
+  firepower?: number;
+  armor?: number;
+  torpedo?: number;
+  anti_air?: number;
+  speed?: number;
+  bombing?: number;
+  asw?: number;
+  los?: number;
+  luck?: number;
+  accuracy?: number;
+  evasion?: number;
+  range?: number;
+  radius?: number;
+  cost?: number;
+  improvable?: boolean;
+  ship_anti_air_resistance?: number;
+  fleet_anti_air_resistance?: number;
+}
+
+export interface HitRate {
+  total: number;
+  normal: number;
+  critical: number;
+}
 
-export type HitRateParams = {
+export interface HitRateParams {
   accuracy_term: number;
   evasion_term: number;
   target_morale_mod: number;
   critical_rate_constant: number;
   critical_percentage_bonus: number;
   hit_percentage_bonus: number;
-};
+}
+
+export type NightBattleAttackType =
+  | { t: "NightAttack"; c: NightAttackType }
+  | { t: "Asw"; c: AswAttackType };
+
+export type DayBattleAttackType =
+  | { t: "Shelling"; c: ShellingAttackType }
+  | { t: "Asw"; c: AswAttackType };
 
-export type WarfareInfo = {
+export interface WarfareInfo {
   day: AttackInfo<DayBattleAttackType, DayCutin | null> | null;
   closing_torpedo: AttackInfo<null, null> | null;
   night: AttackInfo<NightBattleAttackType, NightCutin | null> | null;
   shelling_support: AttackInfo<null, null> | null;
   opening_asw: AttackInfo<null, null> | null;
-};
+}
 
-export type WarfareAnalyzerContext = {
+export interface WarfareAnalyzerContext {
   attacker_env: WarfareAnalyzerShipEnvironment;
   target_env: WarfareAnalyzerShipEnvironment;
   engagement: Engagement;
   air_state: AirState;
-};
+}
 
-export type WarfareAnalyzerShipEnvironment = {
+export interface WarfareAnalyzerShipEnvironment {
   org_type: OrgType;
   role: Role;
   ship_index: number;
@@ -764,7 +652,115 @@ export type WarfareAnalyzerShipEnvironment = {
   fleet_los_mod: number | null;
   night_situation: NightSituation;
   custom_mods: CustomModifiers;
-};
+}
+
+export type ShipStateMap = Record<ShipKey, ShipState>;
+
+export type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
+
+export interface OrgState {
+  id?: string;
+  f1?: FleetState;
+  f2?: FleetState;
+  f3?: FleetState;
+  f4?: FleetState;
+  a1?: AirSquadronState;
+  a2?: AirSquadronState;
+  a3?: AirSquadronState;
+  hq_level?: number;
+  org_type?: OrgType;
+  sortie?: string;
+  route_sup?: string;
+  boss_sup?: string;
+}
+
+export interface AirSquadronState {
+  id?: string;
+  mode?: AirSquadronMode;
+  g1?: GearState;
+  g2?: GearState;
+  g3?: GearState;
+  g4?: GearState;
+  g5?: GearState;
+  gx?: GearState;
+  ss1?: number;
+  ss2?: number;
+  ss3?: number;
+  ss4?: number;
+  ss5?: number;
+}
+
+export type AirSquadronMode = "Sortie" | "AirDefense";
+
+export interface FleetState {
+  id?: string;
+  len?: number;
+  s1?: ShipState;
+  s2?: ShipState;
+  s3?: ShipState;
+  s4?: ShipState;
+  s5?: ShipState;
+  s6?: ShipState;
+  s7?: ShipState;
+}
+
+export interface ShipState {
+  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;
+  g1?: GearState;
+  g2?: GearState;
+  g3?: GearState;
+  g4?: GearState;
+  g5?: GearState;
+  gx?: GearState;
+  ss1?: number;
+  ss2?: number;
+  ss3?: number;
+  ss4?: number;
+  ss5?: number;
+}
+
+export interface GearState {
+  id?: string;
+  gear_id: number;
+  exp?: number;
+  stars?: number;
+}
+
+export type GearTypeIdArray = [number, number, number, number, number];
+
+export type SlotSizeVec = (number | null)[];
+
+export type SpecialEnemyType =
+  | "None"
+  | "SoftSkinned"
+  | "Pillbox"
+  | "IsolatedIsland"
+  | "SupplyDepot"
+  | "HarbourSummerPrincess"
+  | "PtImp"
+  | "BattleshipSummerPrincess"
+  | "HeavyCruiserSummerPrincess";
+
+export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
+
+export type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
+
+export type SpeedGroup = "A" | "B1" | "B2" | "C";
 
 export type FleetCutin =
   | "NelsonTouch"
@@ -772,42 +768,79 @@ export type FleetCutin =
   | "ColoradoCutin"
   | "KongouCutin";
 
-export type BattleConfig = {
-  formation: NestedFormationDef[];
-  anti_air_cutin: AntiAirCutinDef[];
-  day_cutin: DayCutinDef[];
-  night_cutin: NightCutinDef[];
-};
+export type ContactRank = "Rank1" | "Rank2" | "Rank3";
+
+export interface SimulatorResult {
+  items: SimulatorResultItem[];
+  sunk_vec: [number, number, number][];
+}
+
+export interface SimulatorResultItem {
+  id: string;
+  role: Role;
+  index: number;
+  damage_state_map: Record<DamageState, number>;
+}
+
+export interface FleetNightCutinRateInfo {
+  night_contact_chance: NightContactChance;
+  ships: ShipNightCutinRateInfo[];
+}
+
+export interface ShipNightCutinRateInfo {
+  ship_id: number;
+  normal: NightCutinRateInfo;
+  chuuha: NightCutinRateInfo;
+}
+
+export interface NightCutinRateInfo {
+  cutin_term: number | null;
+  rates: [NightCutin | null, number | null][];
+}
+
+export interface NightContactChance {
+  rank1: number;
+  rank2: number;
+  rank3: number;
+  total: number;
+}
 
-export type NightCutinDef = {
+export interface BattleConfig {
+  formation: Record<Formation, NestedFormationDef>;
+  anti_air_cutin: Record<number, AntiAirCutinDef>;
+  day_cutin: Record<DayCutin, DayCutinDef>;
+  night_cutin: Record<NightCutin, NightCutinDef>;
+}
+
+export interface NightCutinDef {
   tag: NightCutin;
   hits: number;
   chance_denom: number | null;
   power_mod: number | null;
   accuracy_mod: number | null;
-};
+}
 
-export type DayCutinDef = {
+export interface DayCutinDef {
   tag: DayCutin;
   hits: number;
   chance_denom: number | null;
   power_mod: number | null;
   accuracy_mod: number | null;
-};
+}
 
-export type AntiAirCutinDef = {
+export interface AntiAirCutinDef {
   id: number;
   chance_numer: number | null;
   multiplier: number | null;
-  minimum_bonus: number | null;
+  guaranteed: number | null;
   sequential: boolean | null;
-};
+}
 
 export type NestedFormationDef =
   | FormationDef
   | { top_half: FormationDef; bottom_half: FormationDef };
 
-export type FormationDef = {
+export interface FormationDef {
   tag: Formation;
   protection_rate: number | null;
   fleet_anti_air_mod: number;
@@ -816,38 +849,17 @@ export type FormationDef = {
   asw: FormationWarfareDef;
   night: FormationWarfareDef;
   shelling_support: FormationWarfareDef;
-};
+}
 
-export type FormationWarfareDef = {
+export interface FormationWarfareDef {
   power_mod: number | null;
   accuracy_mod: number | null;
   evasion_mod: number | null;
-};
+}
 
 export type AirWaveType = "Jet" | "LandBase" | "Carrier";
 
-export type FleetNightCutinRateInfo = {
-  night_contact_chance: NightContactChance;
-  ships: ShipNightCutinRateInfo[];
-};
-
-export type ShipNightCutinRateInfo = {
-  ship_id: number;
-  normal: NightCutinRateInfo;
-  chuuha: NightCutinRateInfo;
-};
-
-export type NightCutinRateInfo = {
-  cutin_term: number | null;
-  rates: [NightCutin | null, number | null][];
-};
-
-export type NightContactChance = {
-  rank1: number;
-  rank2: number;
-  rank3: number;
-  total: number;
-};
+export type AswAttackType = "DepthCharge" | "Aircraft";
 
 /**
  */
@@ -858,11 +870,6 @@ export class AirSquadron {
    * @returns {Gear | undefined}
    */
   get_gear(key: string): Gear | undefined;
-  /**
-   * @param {Gear} gear
-   * @returns {boolean}
-   */
-  can_equip(gear: Gear): boolean;
   /**
    * @param {number} index
    * @returns {number}
@@ -903,7 +910,7 @@ export class Analyzer {
   /**
    * @param {Comp} comp
    * @param {Formation} formation
-   * @param {number} adjusted_anti_air_resist
+   * @param {number} ship_anti_air_resist
    * @param {number} fleet_anti_air_resist
    * @param {number | undefined} aaci
    * @returns {CompAntiAirInfo}
@@ -911,7 +918,7 @@ export class Analyzer {
   analyze_anti_air(
     comp: Comp,
     formation: Formation,
-    adjusted_anti_air_resist: number,
+    ship_anti_air_resist: number,
     fleet_anti_air_resist: number,
     aaci?: number
   ): CompAntiAirInfo;
@@ -1005,11 +1012,11 @@ export class Comp {
    */
   default_formation(): Formation;
   /**
-   * 艦隊対空値
+   * 艦隊防空値
    * @param {number} formation_mod
    * @returns {number}
    */
-  fleet_anti_air(formation_mod: number): number;
+  adjusted_anti_air(formation_mod: number): number;
   /**
    * 制空値
    * @param {boolean} escort_participates
@@ -1064,10 +1071,10 @@ export class Comp {
 export class FhCore {
   free(): void;
   /**
-   * @param {any} js_master
+   * @param {MasterData} js_master
    * @param {Function} js_fn
    */
-  constructor(js_master: any, js_fn: Function);
+  constructor(js_master: MasterData, js_fn: Function);
   /**
    * @param {GearState | undefined} input
    * @returns {Gear | undefined}
@@ -1277,11 +1284,11 @@ export class Gear {
   /**
    * @returns {number}
    */
-  fleet_anti_air(): number;
+  fleet_anti_air_mod(): number;
   /**
    * @returns {number}
    */
-  adjusted_anti_air(): number;
+  ship_anti_air_mod(): number;
   /**
    * @param {number} slot_size
    * @returns {number}
@@ -1327,6 +1334,10 @@ export class Gear {
    * @returns {number}
    */
   expedition_bonus(): number;
+  /**
+   * @returns {boolean}
+   */
+  can_be_deployed_to_land_base(): boolean;
   /**
    */
   accuracy: number;
@@ -1334,9 +1345,6 @@ export class Gear {
    * @returns {number}
    */
   readonly ace: number;
-  /**
-   */
-  adjusted_anti_air_resistance: number;
   /**
    */
   anti_air: number;
@@ -1413,6 +1421,9 @@ export class Gear {
   /**
    */
   range: number;
+  /**
+   */
+  ship_anti_air_resistance: number;
   /**
    * @returns {number}
    */
@@ -1427,9 +1438,8 @@ export class Gear {
    */
   torpedo: number;
   /**
-   * @returns {any}
    */
-  readonly types: any;
+  types: Uint8Array;
   /**
    */
   xxh3: BigInt;
@@ -1438,9 +1448,6 @@ export class Gear {
  */
 export class IBonuses {
   free(): void;
-  /**
-   */
-  adjusted_anti_air: number;
   /**
    */
   asw_accuracy: number;
@@ -1477,6 +1484,9 @@ export class IBonuses {
   /**
    */
   shelling_power: number;
+  /**
+   */
+  ship_anti_air: number;
   /**
    */
   torpedo_accuracy: number;
@@ -1778,7 +1788,7 @@ export class Ship {
   /**
    * @returns {number}
    */
-  fleet_anti_air(): number;
+  fleet_anti_air_mod(): number;
   /**
    * @returns {number}
    */
@@ -1948,6 +1958,9 @@ export class Ship {
    * @returns {number}
    */
   readonly slotnum: number;
+  /**
+   */
+  slots: SlotSizeVec;
   /**
    * @returns {number}
    */