fleethub-core 1.2.0 → 1.3.1

package/node/fleethub_core.d.ts

@@ -28,64 +28,26 @@ export function org_type_side(org_type: OrgType): Side;
 /**
  */
 export function set_panic_hook(): void;
-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 CompDayCutinRateInfo = {
+  main: FleetDayCutinRateInfo;
+  escort: FleetDayCutinRateInfo | null;
 };
 
-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 FleetDayCutinRateInfo = {
+  fleet_los_mod: number | null;
+  ships: ShipDayCutinRateInfo[];
 };
 
-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 ShipDayCutinRateInfo = {
+  ship_id: number;
+  air_supremacy: DayCutinRateInfo;
+  air_superiority: DayCutinRateInfo;
 };
 
-export type NightSituation = {
-  night_contact_rank: ContactRank | null;
-  starshell: boolean;
-  searchlight: boolean;
+export type DayCutinRateInfo = {
+  observation_term: number | null;
+  rates: [DayCutin | null, number | null][];
+  total_cutin_rate: number | null;
 };
 
 export type DamageInfo = {
@@ -101,64 +63,6 @@ export type DamageInfo = {
   damage_state_map: NumMap<DamageState, number>;
 };
 
-export type FleetCutin =
-  | "NelsonTouch"
-  | "NagatoCutin"
-  | "ColoradoCutin"
-  | "KongouCutin";
-
-export type BattleConfig = {
-  formation: NestedFormationDef[];
-  anti_air_cutin: AntiAirCutinDef[];
-  day_cutin: DayCutinDef[];
-  night_cutin: NightCutinDef[];
-};
-
-export type NightCutinDef = {
-  tag: NightCutin;
-  hits: number;
-  chance_denom: number | null;
-  power_mod: number | null;
-  accuracy_mod: number | null;
-};
-
-export type DayCutinDef = {
-  tag: DayCutin;
-  hits: number;
-  chance_denom: number | null;
-  power_mod: number | null;
-  accuracy_mod: number | null;
-};
-
-export type AntiAirCutinDef = {
-  id: number;
-  chance_numer: number | null;
-  multiplier: number | null;
-  minimum_bonus: number | null;
-  sequential: boolean | null;
-};
-
-export type NestedFormationDef =
-  | FormationDef
-  | { top_half: FormationDef; bottom_half: FormationDef };
-
-export type FormationDef = {
-  tag: Formation;
-  protection_rate: number | null;
-  fleet_anti_air_mod: number;
-  shelling: FormationWarfareDef;
-  torpedo: FormationWarfareDef;
-  asw: FormationWarfareDef;
-  night: FormationWarfareDef;
-  shelling_support: FormationWarfareDef;
-};
-
-export type FormationWarfareDef = {
-  power_mod: number | null;
-  accuracy_mod: number | null;
-  evasion_mod: number | null;
-};
-
 export type AirWaveType = "Jet" | "LandBase" | "Carrier";
 
 export type SimulatorResult = {
@@ -196,59 +100,64 @@ export type NightContactChance = {
   total: 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 CompMeta = { fleets: Record<FleetType, FleetMeta> };
+
+export type FleetMeta = {
+  id: string;
+  len: number;
+  ships: [string, ShipMeta | null][];
 };
 
-export type MasterVariantDef = { tag: string; id: number; name: string };
+export type ShipMeta = { id: string; ship_id: number };
 
-export type MasterAttrRule = { tag: string; name: string; expr: string };
+export type ContactRank = "Rank1" | "Rank2" | "Rank3";
 
-export type MasterIBonusRule = { expr: string; formula: string };
+export type WarfareContext = {
+  attacker_env: WarfareShipEnvironment;
+  target_env: WarfareShipEnvironment;
+  engagement: Engagement;
+  air_state: AirState;
+  custom_mods: CustomModifiers;
+};
 
-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 WarfareShipEnvironment = {
+  org_type: OrgType;
+  role: Role;
+  ship_index: number;
+  fleet_len: number;
+  formation: Formation;
+  fleet_los_mod: number | null;
 };
 
-export type StatInterval = [number | null, number | null];
+export type AswAttackType = "DepthCharge" | "Aircraft";
+
+export type MasterData = {
+  gears: MasterGear[];
+  gear_attrs: MasterAttrRule[];
+  ships: MasterShip[];
+  ship_attrs: MasterAttrRule[];
+  equippable: MasterEquippable;
+  ibonuses: MasterIBonuses;
+  config: BattleConfig;
+};
+
+export type MasterEquippable = {
+  equip_stype: EquipStype[];
+  equip_exslot: number[];
+  equip_ship: MstEquipShip[];
+  equip_exslot_ship: MstEquipExslotShip[];
+};
+
+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;
@@ -273,68 +182,220 @@ 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 StatInterval = [number | null, number | null];
 
-export type MstEquipExslotShip = {
-  api_slotitem_id: number;
-  api_ship_ids: number[];
+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 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 MasterAttrRule = { tag: string; name: string; expr: string };
+
+export type MasterVariantDef = { tag: string; id: number; name: string };
+
+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;
+  adjusted_anti_air_resistance?: number;
+  fleet_anti_air_resistance?: number;
 };
 
-export type ContactRank = "Rank1" | "Rank2" | "Rank3";
+export type GearCategory =
+  | "Fighter"
+  | "Bomber"
+  | "Recon"
+  | "MainGun"
+  | "Secondary"
+  | "Torpedo"
+  | "AntiSub"
+  | "Radar"
+  | "Landing"
+  | "Ration"
+  | "LandBased"
+  | "Misc";
 
-export type CompMeta = { fleets: Record<FleetType, FleetMeta> };
+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 FleetMeta = {
-  id: string;
-  len: number;
-  ships: [string, ShipMeta | null][];
-};
+export type GearTypeIdArray = [number, number, number, number, number];
 
-export type ShipMeta = { id: string; ship_id: number };
+export type ShipAttr =
+  | "Abyssal"
+  | "NightCarrier"
+  | "Installation"
+  | "RoyalNavy"
+  | "Kai2"
+  | "TurbineSpeedBonus"
+  | "Pillbox"
+  | "IsolatedIsland"
+  | "HarbourSummerPrincess"
+  | "SupplyDepot"
+  | "PtImp"
+  | "BattleshipSummerPrincess"
+  | "HeavyCruiserSummerPrincess";
 
-export type WarfareContext = {
-  attacker_env: WarfareShipEnvironment;
-  target_env: WarfareShipEnvironment;
-  engagement: Engagement;
-  air_state: AirState;
-  custom_mods: CustomModifiers;
-};
+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 WarfareShipEnvironment = {
-  org_type: OrgType;
-  role: Role;
-  ship_index: number;
-  fleet_len: number;
-  formation: Formation;
-  fleet_los_mod: number | null;
-};
+export type ShipType =
+  | "Unknown"
+  | "DE"
+  | "DD"
+  | "CL"
+  | "CLT"
+  | "CA"
+  | "CAV"
+  | "CVL"
+  | "FBB"
+  | "BB"
+  | "BBV"
+  | "CV"
+  | "XBB"
+  | "SS"
+  | "SSV"
+  | "AP"
+  | "AV"
+  | "LHA"
+  | "CVB"
+  | "AR"
+  | "AS"
+  | "CT"
+  | "AO";
 
-export type AswAttackType = "DepthCharge" | "Aircraft";
+export type ShipCategory =
+  | "Battleship"
+  | "AircraftCarrier"
+  | "HeavyCruiser"
+  | "LightCruiser"
+  | "Destroyer"
+  | "CoastalDefenseShip"
+  | "Submarine"
+  | "AuxiliaryShip";
 
 export type ShellingSpecialAttack =
   | { DayCutin: DayCutin }
@@ -354,6 +415,66 @@ export type DayCutin =
 
 export type Engagement = "GreenT" | "Parallel" | "HeadOn" | "RedT";
 
+export type 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 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 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;
@@ -491,158 +612,9 @@ export type OrgState = {
   boss_sup?: string;
 };
 
-export type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
-
-export type ShipStateMap = Record<ShipKey, ShipState>;
-
-export type CompDayCutinRateInfo = {
-  main: FleetDayCutinRateInfo;
-  escort: FleetDayCutinRateInfo | null;
-};
-
-export type FleetDayCutinRateInfo = {
-  fleet_los_mod: number | null;
-  ships: ShipDayCutinRateInfo[];
-};
-
-export type ShipDayCutinRateInfo = {
-  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 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 GearCategory =
-  | "Fighter"
-  | "Bomber"
-  | "Recon"
-  | "MainGun"
-  | "Secondary"
-  | "Torpedo"
-  | "AntiSub"
-  | "Radar"
-  | "Landing"
-  | "Ration"
-  | "LandBased"
-  | "Misc";
-
-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 FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
-
-export type ShellingAttackType = "Normal" | "Carrier";
-
-export type FleetCutinAnalysis = {
-  shelling: FleetCutinInfo[];
-  night: FleetCutinInfo[];
-};
-
-export type FleetCutinInfo = {
-  cutin: FleetCutin;
-  formation: Formation;
-  items: FleetCutinInfoItem[];
-};
-
-export type FleetCutinInfoItem = {
-  ship_id: number;
-  cutin: FleetCutin;
-  fleet_cutin_mod: number;
-  stats: AttackStats;
-};
+export type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
+
+export type ShipStateMap = Record<ShipKey, ShipState>;
 
 export type CompAntiAirInfo = {
   fleet_anti_air: number;
@@ -660,20 +632,6 @@ export type ShipAntiAirInfo = {
   anti_air_propellant_barrage_chance: number | 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 Formation = SingleFormation | CombinedFormation;
 
 export type CombinedFormation =
@@ -690,6 +648,10 @@ export type SingleFormation =
   | "LineAbreast"
   | "Vanguard";
 
+export type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
+
+export type ShellingAttackType = "Normal" | "Carrier";
+
 export type NightBattleAttackType =
   | { t: "NightAttack"; c: NightAttackType }
   | { t: "Asw"; c: AswAttackType };
@@ -698,6 +660,24 @@ export type DayBattleAttackType =
   | { t: "Shelling"; c: ShellingAttackType }
   | { t: "Asw"; c: AswAttackType };
 
+export type FleetCutinAnalysis = {
+  shelling: FleetCutinInfo[];
+  night: FleetCutinInfo[];
+};
+
+export type FleetCutinInfo = {
+  cutin: FleetCutin;
+  formation: Formation;
+  items: FleetCutinInfoItem[];
+};
+
+export type FleetCutinInfoItem = {
+  ship_id: number;
+  cutin: FleetCutin;
+  fleet_cutin_mod: number;
+  stats: AttackStats;
+};
+
 export type AttackInfo<AttackType, Cutin> = {
   attack_type: AttackType;
   items: AttackInfoItem<Cutin>[];
@@ -719,191 +699,47 @@ export type AttackStats = {
   damage: DamageInfo | 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 CompContactChanceInfo = {
+  single: AirstrikeContactChance[] | null;
+  combined: AirstrikeContactChance[] | null;
+};
 
-export type SpeedGroup = "A" | "B1" | "B2" | "C";
+export type AirstrikeContactChance = {
+  air_state: AirState;
+  trigger_rate: number;
+  rank3: number;
+  rank2: number;
+  rank1: number;
+  total: number;
+};
 
-export type ShipAttr =
-  | "Abyssal"
-  | "NightCarrier"
-  | "Installation"
-  | "RoyalNavy"
-  | "Kai2"
-  | "TurbineSpeedBonus"
-  | "Pillbox"
-  | "IsolatedIsland"
-  | "HarbourSummerPrincess"
-  | "SupplyDepot"
-  | "PtImp"
-  | "BattleshipSummerPrincess"
-  | "HeavyCruiserSummerPrincess";
+import * as bindings from "../bindings";
+export * from "../bindings";
 
-export type ShipClass =
-  | "Unknown"
-  | "AyanamiClass"
-  | "IseClass"
-  | "KagaClass"
-  | "KumaClass"
-  | "AkatsukiClass"
-  | "KongouClass"
-  | "FurutakaClass"
-  | "TakaoClass"
-  | "MogamiClass"
-  | "HatsuharuClass"
-  | "ShouhouClass"
-  | "FubukiClass"
-  | "AobaClass"
-  | "AkagiClass"
-  | "ChitoseClass"
-  | "SendaiClass"
-  | "SouryuuClass"
-  | "AsashioClass"
-  | "NagatoClass"
-  | "NagaraClass"
-  | "TenryuuClass"
-  | "ShimakazeClass"
-  | "ShiratsuyuClass"
-  | "HiyouClass"
-  | "HiryuuClass"
-  | "FusouClass"
-  | "HoushouClass"
-  | "MutsukiClass"
-  | "MyoukouClass"
-  | "KagerouClass"
-  | "ToneClass"
-  | "RyuujouClass"
-  | "ShoukakuClass"
-  | "YuubariClass"
-  | "KaidaiVIClass"
-  | "JunsenTypeBKai2"
-  | "YamatoClass"
-  | "YuugumoClass"
-  | "JunsenTypeB"
-  | "Junsen3Class"
-  | "AganoClass"
-  | "FleetOfFog"
-  | "TaihouClass"
-  | "I400Class"
-  | "HeiClassAmphibiousAssaultShip"
-  | "Type3SubmergenceTransportVehicle"
-  | "BismarckClass"
-  | "Z1Class"
-  | "RepairShip"
-  | "TaigeiClass"
-  | "RyuuhouClass"
-  | "OoyodoClass"
-  | "UnryuuClass"
-  | "AkizukiClass"
-  | "AdmiralHipperClass"
-  | "KatoriClass"
-  | "TypeIXCClass"
-  | "VittorioVenetoClass"
-  | "AkitsushimaClass"
-  | "RevisedKazahayaClass"
-  | "MaestraleClass"
-  | "MizuhoClass"
-  | "GrafZeppelinClass"
-  | "ZaraClass"
-  | "IowaClass"
-  | "KamikazeClass"
-  | "QueenElizabethClass"
-  | "AquilaClass"
-  | "LexingtonClass"
-  | "CommandantTesteClass"
-  | "JunsenTypeAKai2"
-  | "KamoiClass"
-  | "GangutClass"
-  | "ShimushuClass"
-  | "KasugaMaruClass"
-  | "TaiyouClass"
-  | "EtorofuClass"
-  | "ArkRoyalClass"
-  | "RichelieuClass"
-  | "MarconiClass"
-  | "TashkentClass"
-  | "JClass"
-  | "CasablancaClass"
-  | "EssexClass"
-  | "HiburiClass"
-  | "RoSeries"
-  | "JohnCButlerClass"
-  | "NelsonClass"
-  | "GotlandClass"
-  | "NisshinClass"
-  | "FletcherClass"
-  | "DucaDegliAbruzziClass"
-  | "ColoradoClass"
-  | "MikuraClass"
-  | "NorthamptonClass"
-  | "PerthClass"
-  | "R1"
-  | "DeRuyterClass"
-  | "AtlantaClass"
-  | "JingeiClass"
-  | "MatsuClass"
-  | "SouthDakotaClass"
-  | "JunsenTypeC"
-  | "TypeDCoastalDefenseShip"
-  | "YorktownClass"
-  | "StLouisClass"
-  | "NorthCarolinaClass"
-  | "TownClass"
-  | "SentakaType"
-  | "BrooklynClass"
-  | "AuxiliaryTransportShip"
-  | "IllustriousClass"
-  | "ConteDiCavourClass";
+export type SlotSizeVec = (number | null)[];
 
-export type ShipType =
-  | "Unknown"
-  | "DE"
-  | "DD"
-  | "CL"
-  | "CLT"
-  | "CA"
-  | "CAV"
-  | "CVL"
-  | "FBB"
-  | "BB"
-  | "BBV"
-  | "CV"
-  | "XBB"
-  | "SS"
-  | "SSV"
-  | "AP"
-  | "AV"
-  | "LHA"
-  | "CVB"
-  | "AR"
-  | "AS"
-  | "CT"
-  | "AO";
+export type NightAttackType = "Normal" | "ArkRoyal" | "Carrier";
 
-export type ShipCategory =
-  | "Battleship"
-  | "AircraftCarrier"
-  | "HeavyCruiser"
-  | "LightCruiser"
-  | "Destroyer"
-  | "CoastalDefenseShip"
-  | "Submarine"
-  | "AuxiliaryShip";
+export type NightSpecialAttack =
+  | { NightCutin: NightCutin }
+  | { FleetCutin: FleetCutin };
 
-import * as bindings from "../bindings";
-export * from "../bindings";
+export type NightCutin =
+  | "MainTorpRadar"
+  | "TorpLookoutRadar"
+  | "TorpTsloTorp"
+  | "TorpTsloDrum"
+  | "DoubleAttack"
+  | "TorpTorpMain"
+  | "TorpTorpTorp"
+  | "MainMainSec"
+  | "MainMainMain"
+  | "SubTorpTorp"
+  | "SubRadarTorp"
+  | "Cvci1_25"
+  | "Cvci1_20"
+  | "Cvci1_18"
+  | "Photobomber";
 
 export type HitRate = { total: number; normal: number; critical: number };
 
@@ -942,28 +778,80 @@ export type WarfareAnalyzerShipEnvironment = {
   custom_mods: CustomModifiers;
 };
 
-export type NightAttackType = "Normal" | "ArkRoyal" | "Carrier";
+export type SpecialEnemyType =
+  | "None"
+  | "SoftSkinned"
+  | "Pillbox"
+  | "IsolatedIsland"
+  | "SupplyDepot"
+  | "HarbourSummerPrincess"
+  | "PtImp"
+  | "BattleshipSummerPrincess"
+  | "HeavyCruiserSummerPrincess";
 
-export type NightSpecialAttack =
-  | { NightCutin: NightCutin }
-  | { FleetCutin: FleetCutin };
+export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
 
-export type NightCutin =
-  | "MainTorpRadar"
-  | "TorpLookoutRadar"
-  | "TorpTsloTorp"
-  | "TorpTsloDrum"
-  | "DoubleAttack"
-  | "TorpTorpMain"
-  | "TorpTorpTorp"
-  | "MainMainSec"
-  | "MainMainMain"
-  | "SubTorpTorp"
-  | "SubRadarTorp"
-  | "Cvci1_25"
-  | "Cvci1_20"
-  | "Cvci1_18"
-  | "Photobomber";
+export type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
+
+export type SpeedGroup = "A" | "B1" | "B2" | "C";
+
+export type FleetCutin =
+  | "NelsonTouch"
+  | "NagatoCutin"
+  | "ColoradoCutin"
+  | "KongouCutin";
+
+export type BattleConfig = {
+  formation: NestedFormationDef[];
+  anti_air_cutin: AntiAirCutinDef[];
+  day_cutin: DayCutinDef[];
+  night_cutin: NightCutinDef[];
+};
+
+export type NightCutinDef = {
+  tag: NightCutin;
+  hits: number;
+  chance_denom: number | null;
+  power_mod: number | null;
+  accuracy_mod: number | null;
+};
+
+export type DayCutinDef = {
+  tag: DayCutin;
+  hits: number;
+  chance_denom: number | null;
+  power_mod: number | null;
+  accuracy_mod: number | null;
+};
+
+export type AntiAirCutinDef = {
+  id: number;
+  chance_numer: number | null;
+  multiplier: number | null;
+  minimum_bonus: number | null;
+  sequential: boolean | null;
+};
+
+export type NestedFormationDef =
+  | FormationDef
+  | { top_half: FormationDef; bottom_half: FormationDef };
+
+export type FormationDef = {
+  tag: Formation;
+  protection_rate: number | null;
+  fleet_anti_air_mod: number;
+  shelling: FormationWarfareDef;
+  torpedo: FormationWarfareDef;
+  asw: FormationWarfareDef;
+  night: FormationWarfareDef;
+  shelling_support: FormationWarfareDef;
+};
+
+export type FormationWarfareDef = {
+  power_mod: number | null;
+  accuracy_mod: number | null;
+  evasion_mod: number | null;
+};
 
 /**
  */
@@ -1082,6 +970,10 @@ export class Comp {
    * @returns {boolean}
    */
   is_combined(): boolean;
+  /**
+   * @returns {boolean}
+   */
+  is_player(): boolean;
   /**
    * @returns {boolean}
    */
@@ -1143,6 +1035,15 @@ export class Comp {
    * @returns {number}
    */
   transport_point(): number;
+  /**
+   * @param {Ship} ship
+   * @param {Formation} formation
+   * @returns {WarfareShipEnvironment}
+   */
+  create_warfare_ship_environment(
+    ship: Ship,
+    formation: Formation
+  ): WarfareShipEnvironment;
   /**
    */
   boss_sup?: Fleet;
@@ -1530,9 +1431,8 @@ export class Gear {
    */
   torpedo: number;
   /**
-   * @returns {any}
    */
-  readonly types: any;
+  types: Uint8Array;
   /**
    */
   xxh3: BigInt;
@@ -1665,6 +1565,10 @@ export class Org {
    * @returns {(string)[]}
    */
   get_air_squadron_gear_ids_by_proficiency(): string[];
+  /**
+   * @returns {Side}
+   */
+  side(): Side;
   /**
    * @returns {boolean}
    */
@@ -1911,10 +1815,6 @@ export class Ship {
    * @returns {number | undefined}
    */
   basic_defense_power(armor_penetration: number): number | undefined;
-  /**
-   * @returns {Uint8Array}
-   */
-  get_possible_anti_air_cutin_ids(): Uint8Array;
   /**
    * @returns {number}
    */
@@ -1948,9 +1848,8 @@ export class Ship {
    */
   readonly asw: number | undefined;
   /**
-   * @returns {number}
    */
-  readonly ctype: number;
+  ctype: number;
   /**
    */
   current_hp: number;
@@ -2042,9 +1941,6 @@ export class Ship {
    * @returns {number | undefined}
    */
   readonly range: number | undefined;
-  /**
-   */
-  ship_class: ShipClass;
   /**
    */
   ship_id: number;
@@ -2055,6 +1951,9 @@ export class Ship {
    * @returns {number}
    */
   readonly slotnum: number;
+  /**
+   */
+  slots: SlotSizeVec;
   /**
    * @returns {number}
    */