fleethub-core 1.2.1 → 1.3.2

package/node/fleethub_core.d.ts

@@ -1,55 +1,8 @@
 /* tslint:disable */
 /* eslint-disable */
-/**
- * @param {Gear} gear
- * @returns {boolean}
- */
-export function air_squadron_can_equip(gear: Gear): boolean;
-/**
- * @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 function set_panic_hook(): void;
-export type AirStateRank = "Rank0" | "Rank1" | "Rank2" | "Rank3";
-
-export type AirState =
-  | "AirSupremacy"
-  | "AirSuperiority"
-  | "AirParity"
-  | "AirDenial"
-  | "AirIncapability";
-
-export type ShellingSupportSimulatorParams = {
-  attacker_formation: Formation;
-  target_formation: Formation;
-  engagement: Engagement;
-  custom_mods: CustomModifiers;
-};
-
-export type NightSituation = {
-  night_contact_rank: ContactRank | null;
-  starshell: boolean;
-  searchlight: boolean;
-};
-
 export type CompDayCutinRateInfo = {
   main: FleetDayCutinRateInfo;
   escort: FleetDayCutinRateInfo | null;
@@ -85,59 +38,59 @@ export type DamageInfo = {
   damage_state_map: NumMap<DamageState, number>;
 };
 
-export type GearTypes = [number, number, number, number, number];
+export type NumMap<K, V> = Partial<Record<K, V>>;
 
-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;
+export type OrgType =
+  | "Single"
+  | "CarrierTaskForce"
+  | "SurfaceTaskForce"
+  | "TransportEscort"
+  | "EnemySingle"
+  | "EnemyCombined";
+
+export type ContactRank = "Rank1" | "Rank2" | "Rank3";
+
+export type AirWaveType = "Jet" | "LandBase" | "Carrier";
+
+export type SimulatorResult = {
+  items: SimulatorResultItem[];
+  sunk_vec: [number, number, number][];
 };
 
-export type MasterVariantDef = { tag: string; id: number; name: string };
+export type SimulatorResultItem = {
+  id: string;
+  role: Role;
+  index: number;
+  damage_state_map: Record<DamageState, number>;
+};
 
-export type MasterAttrRule = { tag: string; name: string; expr: string };
+export type AswAttackType = "DepthCharge" | "Aircraft";
 
-export type MasterIBonusRule = { expr: string; formula: string };
+export type MasterData = {
+  gears: MasterGear[];
+  gear_attrs: MasterAttrRule[];
+  ships: MasterShip[];
+  ship_attrs: MasterAttrRule[];
+  equippable: MasterEquippable;
+  ibonuses: MasterIBonuses;
+  config: BattleConfig;
+};
 
-export type MasterIBonuses = {
-  shelling_power: MasterIBonusRule[];
-  carrier_shelling_power: MasterIBonusRule[];
-  shelling_accuracy: MasterIBonusRule[];
-  torpedo_power: MasterIBonusRule[];
-  torpedo_accuracy: MasterIBonusRule[];
-  torpedo_evasion: MasterIBonusRule[];
-  asw_power: MasterIBonusRule[];
-  asw_accuracy: MasterIBonusRule[];
-  night_power: MasterIBonusRule[];
-  night_accuracy: MasterIBonusRule[];
-  defense_power: MasterIBonusRule[];
-  contact_selection: MasterIBonusRule[];
-  fighter_power: MasterIBonusRule[];
-  adjusted_anti_air: MasterIBonusRule[];
-  fleet_anti_air: MasterIBonusRule[];
-  elos: MasterIBonusRule[];
+export type MasterEquippable = {
+  equip_stype: EquipStype[];
+  equip_exslot: number[];
+  equip_ship: MstEquipShip[];
+  equip_exslot_ship: MstEquipExslotShip[];
 };
 
-export type StatInterval = [number | null, number | null];
+export type MstEquipExslotShip = {
+  api_slotitem_id: number;
+  api_ship_ids: number[];
+};
+
+export type MstEquipShip = { api_ship_id: number; api_equip_type: number[] };
+
+export type EquipStype = { id: number; equip_type: number[] };
 
 export type MasterShip = {
   ship_id: number;
@@ -162,72 +115,140 @@ export type MasterShip = {
   next_id?: number;
   next_level?: number;
   slotnum: number;
-  slots: Array<number | null>;
+  slots: SlotSizeVec;
   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 StatInterval = [number | null, number | null];
 
-export type MasterData = {
-  gears: MasterGear[];
-  gear_attrs: MasterAttrRule[];
-  ships: MasterShip[];
-  ship_attrs: MasterAttrRule[];
-  equippable: MasterEquippable;
-  ibonuses: MasterIBonuses;
-  config: BattleConfig;
+export type MasterIBonuses = {
+  shelling_power: MasterIBonusRule[];
+  carrier_shelling_power: MasterIBonusRule[];
+  shelling_accuracy: MasterIBonusRule[];
+  torpedo_power: MasterIBonusRule[];
+  torpedo_accuracy: MasterIBonusRule[];
+  torpedo_evasion: MasterIBonusRule[];
+  asw_power: MasterIBonusRule[];
+  asw_accuracy: MasterIBonusRule[];
+  night_power: MasterIBonusRule[];
+  night_accuracy: MasterIBonusRule[];
+  defense_power: MasterIBonusRule[];
+  contact_selection: MasterIBonusRule[];
+  fighter_power: MasterIBonusRule[];
+  ship_anti_air: MasterIBonusRule[];
+  fleet_anti_air: MasterIBonusRule[];
+  elos: MasterIBonusRule[];
 };
 
-export type ContactRank = "Rank1" | "Rank2" | "Rank3";
+export type MasterIBonusRule = { expr: string; formula: string };
 
-export type AirWaveType = "Jet" | "LandBase" | "Carrier";
+export type MasterAttrRule = { tag: string; name: string; expr: string };
 
-export type SimulatorResult = {
-  items: SimulatorResultItem[];
-  sunk_vec: [number, number, number][];
-};
+export type MasterVariantDef = { tag: string; id: number; name: string };
 
-export type SimulatorResultItem = {
-  id: string;
-  role: Role;
-  index: number;
-  damage_state_map: Record<DamageState, number>;
+export type 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 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 GearCategory =
+  | "Fighter"
+  | "Bomber"
+  | "Recon"
+  | "MainGun"
+  | "Secondary"
+  | "Torpedo"
+  | "AntiSub"
+  | "Radar"
+  | "Landing"
+  | "Ration"
+  | "LandBased"
+  | "Misc";
 
-export type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
+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"
+  | "LargeLbAircraft"
+  | "JetFighter"
+  | "JetFighterBomber"
+  | "JetTorpedoBomber"
+  | "JetRecon"
+  | "LargeRadar2"
+  | "CbRecon2";
 
-export type SpeedGroup = "A" | "B1" | "B2" | "C";
+export type GearTypeIdArray = [number, number, number, number, number];
 
 export type ShipAttr =
   | "Abyssal"
@@ -244,6 +265,65 @@ export type ShipAttr =
   | "BattleshipSummerPrincess"
   | "HeavyCruiserSummerPrincess";
 
+export type Role = "Main" | "Escort";
+
+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 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 WarfareContext = {
+  attacker_env: WarfareShipEnvironment;
+  target_env: WarfareShipEnvironment;
+  engagement: Engagement;
+  air_state: AirState;
+  custom_mods: CustomModifiers;
+};
+
+export type WarfareShipEnvironment = {
+  org_type: OrgType;
+  role: Role;
+  ship_index: number;
+  fleet_len: number;
+  formation: Formation;
+  fleet_los_mod: number | null;
+};
+
 export type ShipType =
   | "Unknown"
   | "DE"
@@ -279,35 +359,6 @@ export type ShipCategory =
   | "Submarine"
   | "AuxiliaryShip";
 
-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 WarfareContext = {
-  attacker_env: WarfareShipEnvironment;
-  target_env: WarfareShipEnvironment;
-  engagement: Engagement;
-  air_state: AirState;
-  custom_mods: CustomModifiers;
-};
-
-export type 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 };
@@ -324,9 +375,11 @@ export type DayCutin =
   | "Zuiun"
   | "AirSea";
 
+export type Engagement = "GreenT" | "Parallel" | "HeadOn" | "RedT";
+
 export type EBonusFnGearInput = {
   gear_id: number;
-  types: GearTypes;
+  types: GearTypeIdArray;
   firepower: number;
   torpedo: number;
   anti_air: number;
@@ -362,6 +415,28 @@ export type EBonuses = {
   range: number;
 };
 
+export type AirStateRank = "Rank0" | "Rank1" | "Rank2" | "Rank3";
+
+export type AirState =
+  | "AirSupremacy"
+  | "AirSuperiority"
+  | "AirParity"
+  | "AirDenial"
+  | "AirIncapability";
+
+export type ShellingSupportSimulatorParams = {
+  attacker_formation: Formation;
+  target_formation: Formation;
+  engagement: Engagement;
+  custom_mods: CustomModifiers;
+};
+
+export type NightSituation = {
+  night_contact_rank: ContactRank | null;
+  starshell: boolean;
+  searchlight: boolean;
+};
+
 export type AttackPower = {
   precap: number;
   is_capped: boolean;
@@ -404,125 +479,8 @@ export type SpecialEnemyModifiers = {
 
 export type AttackPowerModifier = { a: number; b: number };
 
-export type GearState = {
-  id?: string;
-  gear_id: number;
-  exp?: number;
-  stars?: number;
-};
-
-export type 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 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 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 type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
-
-export type ShipStateMap = Record<ShipKey, ShipState>;
-
-export type Formation = SingleFormation | CombinedFormation;
-
-export type CombinedFormation =
-  | "Cruising1"
-  | "Cruising2"
-  | "Cruising3"
-  | "Cruising4";
-
-export type SingleFormation =
-  | "LineAhead"
-  | "DoubleLine"
-  | "Diamond"
-  | "Echelon"
-  | "LineAbreast"
-  | "Vanguard";
-
 export type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
 
-export type ShellingAttackType = "Normal" | "Carrier";
-
 export type FleetCutinAnalysis = {
   shelling: FleetCutinInfo[];
   night: FleetCutinInfo[];
@@ -541,29 +499,8 @@ export type FleetCutinInfoItem = {
   stats: AttackStats;
 };
 
-export type AttackInfo<AttackType, Cutin> = {
-  attack_type: AttackType;
-  items: AttackInfoItem<Cutin>[];
-  damage_state_map: NumMap<DamageState, number> | null;
-};
-
-export type AttackInfoItem<Cutin> = {
-  cutin: Cutin;
-  rate: number | null;
-  stats: AttackStats;
-};
-
-export type 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 CompAntiAirInfo = {
-  fleet_anti_air: number;
+  fleet_adjusted_anti_air: number;
   ships: ShipAntiAirInfo[];
   anti_air_cutin_chance: [number, number][];
 };
@@ -573,7 +510,7 @@ export type ShipAntiAirInfo = {
   adjusted_anti_air: number | null;
   proportional_shotdown_rate: number | null;
   fixed_shotdown_number: number | null;
-  minimum_bonus: number | null;
+  guaranteed: number | null;
   anti_air_cutin_chance: [number, number][];
   anti_air_propellant_barrage_chance: number | null;
 };
@@ -592,110 +529,26 @@ export type AirstrikeContactChance = {
   total: number;
 };
 
-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";
+import * as bindings from "../bindings";
+export * from "../bindings";
 
-export type GearCategory =
-  | "Fighter"
-  | "Bomber"
-  | "Recon"
-  | "MainGun"
-  | "Secondary"
-  | "Torpedo"
-  | "AntiSub"
-  | "Radar"
-  | "Landing"
-  | "Ration"
-  | "LandBased"
-  | "Misc";
+export type Formation = SingleFormation | CombinedFormation;
+
+export type CombinedFormation =
+  | "Cruising1"
+  | "Cruising2"
+  | "Cruising3"
+  | "Cruising4";
 
-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"
-  | "LargeLbAircraft"
-  | "JetFighter"
-  | "JetFighterBomber"
-  | "JetTorpedoBomber"
-  | "JetRecon"
-  | "LargeRadar2"
-  | "CbRecon2";
+export type SingleFormation =
+  | "LineAhead"
+  | "DoubleLine"
+  | "Diamond"
+  | "Echelon"
+  | "LineAbreast"
+  | "Vanguard";
+
+export type ShellingAttackType = "Normal" | "Carrier";
 
 export type NightBattleAttackType =
   | { t: "NightAttack"; c: NightAttackType }
@@ -705,31 +558,115 @@ export type DayBattleAttackType =
   | { t: "Shelling"; c: ShellingAttackType }
   | { t: "Asw"; c: AswAttackType };
 
-import * as bindings from "../bindings";
-export * from "../bindings";
+export type AttackInfo<AttackType, Cutin> = {
+  attack_type: AttackType;
+  items: AttackInfoItem<Cutin>[];
+  damage_state_map: NumMap<DamageState, number> | null;
+};
 
-export type NightAttackType = "Normal" | "ArkRoyal" | "Carrier";
+export type AttackInfoItem<Cutin> = {
+  cutin: Cutin;
+  rate: number | null;
+  stats: AttackStats;
+};
 
-export type NightSpecialAttack =
-  | { NightCutin: NightCutin }
-  | { FleetCutin: FleetCutin };
+export type 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 NightCutin =
-  | "MainTorpRadar"
-  | "TorpLookoutRadar"
-  | "TorpTsloTorp"
-  | "TorpTsloDrum"
-  | "DoubleAttack"
-  | "TorpTorpMain"
-  | "TorpTorpTorp"
-  | "MainMainSec"
-  | "MainMainMain"
-  | "SubTorpTorp"
-  | "SubRadarTorp"
-  | "Cvci1_25"
-  | "Cvci1_20"
-  | "Cvci1_18"
-  | "Photobomber";
+export type SlotSizeVec = (number | null)[];
+
+export type ShipStateMap = Record<ShipKey, ShipState>;
+
+export type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
+
+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 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 AirSquadronMode = "Sortie" | "AirDefense";
+
+export type FleetState = {
+  id?: string;
+  len?: number;
+  s1?: ShipState;
+  s2?: ShipState;
+  s3?: ShipState;
+  s4?: ShipState;
+  s5?: ShipState;
+  s6?: ShipState;
+  s7?: ShipState;
+};
+
+export type 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 type GearState = {
+  id?: string;
+  gear_id: number;
+  exp?: number;
+  stars?: number;
+};
 
 export type HitRate = { total: number; normal: number; critical: number };
 
@@ -768,6 +705,48 @@ export type WarfareAnalyzerShipEnvironment = {
   custom_mods: CustomModifiers;
 };
 
+export type Side = "Player" | "Enemy";
+
+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 NightAttackType = "Normal" | "ArkRoyal" | "Carrier";
+
+export type NightSpecialAttack =
+  | { NightCutin: NightCutin }
+  | { FleetCutin: FleetCutin };
+
+export type NightCutin =
+  | "MainTorpRadar"
+  | "TorpLookoutRadar"
+  | "TorpTsloTorp"
+  | "TorpTsloDrum"
+  | "DoubleAttack"
+  | "TorpTorpMain"
+  | "TorpTorpTorp"
+  | "MainMainSec"
+  | "MainMainMain"
+  | "SubTorpTorp"
+  | "SubRadarTorp"
+  | "Cvci1_25"
+  | "Cvci1_20"
+  | "Cvci1_18"
+  | "Photobomber";
+
 export type FleetCutin =
   | "NelsonTouch"
   | "NagatoCutin"
@@ -801,7 +780,7 @@ export type AntiAirCutinDef = {
   id: number;
   chance_numer: number | null;
   multiplier: number | null;
-  minimum_bonus: number | null;
+  guaranteed: number | null;
   sequential: boolean | null;
 };
 
@@ -858,11 +837,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 +877,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 +885,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 +979,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
@@ -1277,11 +1251,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 +1301,10 @@ export class Gear {
    * @returns {number}
    */
   expedition_bonus(): number;
+  /**
+   * @returns {boolean}
+   */
+  can_be_deployed_to_land_base(): boolean;
   /**
    */
   accuracy: number;
@@ -1334,9 +1312,6 @@ export class Gear {
    * @returns {number}
    */
   readonly ace: number;
-  /**
-   */
-  adjusted_anti_air_resistance: number;
   /**
    */
   anti_air: number;
@@ -1413,6 +1388,9 @@ export class Gear {
   /**
    */
   range: number;
+  /**
+   */
+  ship_anti_air_resistance: number;
   /**
    * @returns {number}
    */
@@ -1427,9 +1405,8 @@ export class Gear {
    */
   torpedo: number;
   /**
-   * @returns {any}
    */
-  readonly types: any;
+  types: Uint8Array;
   /**
    */
   xxh3: BigInt;
@@ -1438,9 +1415,6 @@ export class Gear {
  */
 export class IBonuses {
   free(): void;
-  /**
-   */
-  adjusted_anti_air: number;
   /**
    */
   asw_accuracy: number;
@@ -1477,6 +1451,9 @@ export class IBonuses {
   /**
    */
   shelling_power: number;
+  /**
+   */
+  ship_anti_air: number;
   /**
    */
   torpedo_accuracy: number;
@@ -1778,7 +1755,7 @@ export class Ship {
   /**
    * @returns {number}
    */
-  fleet_anti_air(): number;
+  fleet_anti_air_mod(): number;
   /**
    * @returns {number}
    */
@@ -1948,6 +1925,9 @@ export class Ship {
    * @returns {number}
    */
   readonly slotnum: number;
+  /**
+   */
+  slots: SlotSizeVec;
   /**
    * @returns {number}
    */