fleethub-core 1.12.12 → 1.12.14

package/node/fleethub_core.d.ts

@@ -26,94 +26,6 @@ export type ShipAttr =
 
 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[];
-  day_cutin: DayCutinDef[];
-  night_cutin: NightCutinDef[];
-  historical_bonuses?: HistoricalBonusDef[];
-}
-
-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> {
-  data: Record<string, AttackReport<T>>;
-  damage_state_density: Histogram<DamageState, number> | null;
-  is_active: boolean;
-}
-
-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];
@@ -123,6 +35,16 @@ export type AirWaveType = "Jet" | "LandBase" | "Carrier";
 
 export type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
 
+export interface SlotSizeVecState {
+  ss1?: number;
+  ss2?: number;
+  ss3?: number;
+  ss4?: number;
+  ss5?: number;
+}
+
+export type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
+
 export interface ShipState extends GearVecState, SlotSizeVecState {
   id?: string;
   ship_id: number;
@@ -145,45 +67,42 @@ export interface ShipState extends GearVecState, SlotSizeVecState {
   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 type AirSquadronMode = "Sortie" | "AirDefense";
 
 export interface AirSquadronState extends GearVecState, SlotSizeVecState {
   id?: string;
   mode?: AirSquadronMode;
 }
 
-export type AirSquadronMode = "Sortie" | "AirDefense";
+export interface CompMeta {
+  fleets: Record<FleetType, FleetMeta>;
+}
 
 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 Role = "Main" | "Escort";
+
 export type Align = "Left" | "Right";
 
 export type Side = "Player" | "Enemy";
 
-export interface GearInput {
-  gear_id: number;
-  types: GearTypeIdArray;
+export interface ShipInput {
+  ship_id: number;
+  ctype: number;
+  stype: number;
+  yomi: string;
+}
+
+export interface EBonuses {
   firepower: number;
   torpedo: number;
   anti_air: number;
@@ -194,21 +113,11 @@ export interface GearInput {
   bombing: number;
   accuracy: number;
   range: number;
-  radius: number;
-  stars: number;
-  ace: number;
-}
-
-export interface ShipInput {
-  ship_id: number;
-  ctype: number;
-  stype: number;
-  yomi: string;
 }
 
-export type GearVecInput = GearInput[];
-
-export interface EBonuses {
+export interface GearInput {
+  gear_id: number;
+  types: GearTypeIdArray;
   firepower: number;
   torpedo: number;
   anti_air: number;
@@ -219,8 +128,13 @@ export interface EBonuses {
   bombing: number;
   accuracy: number;
   range: number;
+  radius: number;
+  stars: number;
+  ace: number;
 }
 
+export type GearVecInput = GearInput[];
+
 export type GearCategory =
   | "Fighter"
   | "Bomber"
@@ -299,8 +213,6 @@ export type GearType =
   | "CbRecon2"
   | "SecondaryGun2";
 
-export type FleetKey = "f1" | "f2" | "f3" | "f4";
-
 export interface OrgState {
   id?: string;
   f1?: FleetState;
@@ -317,9 +229,16 @@ export interface OrgState {
   boss_sup?: FleetKey;
 }
 
-export interface CompDayAnalysis {
-  day_cutin: CompDayCutinAnalysis;
-  fleet_cutin: FleetCutinReport<ShellingStyle>[];
+export type FleetKey = "f1" | "f2" | "f3" | "f4";
+
+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 CompAnalysis {
@@ -329,21 +248,16 @@ export interface CompAnalysis {
   anti_air: CompAntiAirAnalysis;
 }
 
+export interface CompDayAnalysis {
+  day_cutin: CompDayCutinAnalysis;
+  fleet_cutin: FleetCutinReport<ShellingStyle>[];
+}
+
 export interface CompNightAnalysis {
   night_cutin: CompNightCutinAnalysis;
   fleet_cutin: FleetCutinReport<NightAttackStyle>[];
 }
 
-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 ShipAnalyzerConfig {
   air_state?: AirState;
   engagement?: Engagement;
@@ -358,11 +272,6 @@ export interface AttackAnalyzerShipConfig
   fleet_los_mod?: number | null;
 }
 
-export interface SimulatorResult {
-  items: SimulatorResultItem[];
-  sunk_vec: [number, number, number][];
-}
-
 export interface SimulatorResultItem {
   id: string;
   fleet_type: FleetType;
@@ -370,40 +279,172 @@ export interface SimulatorResultItem {
   damage_state_map: Record<DamageState, number>;
 }
 
-export type SpeedGroup = "A" | "B1" | "B2" | "C";
-
-export interface SupportShellingSimulatorParams {
-  attacker_formation?: Formation;
-  target_formation?: Formation;
-  engagement: Engagement;
-  node_state: NodeState;
+export interface SimulatorResult {
+  items: SimulatorResultItem[];
+  sunk_vec: [number, number, number][];
 }
 
-export type NightAttackType = "Normal" | "Swordfish" | "Aerial";
-
-export type SupportShellingType = ShellingType;
-
-export type ShellingType = "Normal" | "Aerial";
-
-export type NightPhaseAttackType =
-  | { t: "Night"; c: NightAttackType }
-  | { t: "Asw"; c: AswAttackType };
+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 type AswAttackType = "DepthCharge" | "Aerial";
+export type StatInterval = [number | null, number | null];
 
-export type TorpedoAttackType = null;
+export interface GearVecState {
+  g1?: GearState;
+  g2?: GearState;
+  g3?: GearState;
+  g4?: GearState;
+  g5?: GearState;
+  gx?: GearState;
+}
 
-export type DayPhaseAttackType =
-  | { t: "Shelling"; c: ShellingType }
-  | { t: "Asw"; c: AswAttackType };
+export interface GearState {
+  id?: string;
+  gear_id: number;
+  exp?: number;
+  stars?: number;
+}
 
-export type AttackType =
+export interface FleetState {
+  id?: string;
+  len?: number;
+  s1?: ShipState;
+  s2?: ShipState;
+  s3?: ShipState;
+  s4?: ShipState;
+  s5?: ShipState;
+  s6?: ShipState;
+  s7?: ShipState;
+}
+
+export type DayPhaseAttackStyle = ShellingStyle | AswAttackStyle;
+
+export interface ShellingStyle {
+  tag: "ShellingStyle";
+  attack_type: ShellingType;
+  cutin: DayCutinLike | null;
+  power_mod: number;
+  accuracy_mod: number;
+  hits: number;
+}
+
+export interface SupportShellingStyle {
+  tag: "SupportShellingStyle";
+  attack_type: SupportShellingType;
+}
+
+export interface AswAttackStyle {
+  tag: "AswAttackStyle";
+  attack_type: AswAttackType;
+}
+
+export interface NightAttackStyle {
+  tag: "NightAttackStyle";
+  attack_type: NightAttackType;
+  cutin: NightCutinLike | null;
+  power_mod: number;
+  accuracy_mod: number;
+  hits: number;
+}
+
+export type NightPhaseAttackStyle = NightAttackStyle | AswAttackStyle;
+
+export interface TorpedoAttackStyle {
+  tag: "TorpedoAttackStyle";
+  attack_type: TorpedoAttackType;
+}
+
+export interface ShipConditions extends ShipPosition {
+  formation?: Formation;
+  amagiri_index?: number | null;
+}
+
+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 NodeAttackAnalyzerShipConfig extends NightFleetConditions {
+  formation?: Formation;
+}
+
+export interface NodeState {
+  map?: number;
+  node?: NodeId;
+  phase?: number;
+  debuff?: boolean;
+  disable_historical_mod?: boolean;
+  landing_battle?: boolean;
+}
+
+export type NodeId = string;
+
+export type DayPhaseAttackType =
+  | { t: "Shelling"; c: ShellingType }
+  | { t: "Asw"; c: AswAttackType };
+
+export type ShellingType = "Normal" | "Aerial";
+
+export type SupportShellingType = ShellingType;
+
+export type AttackType =
   | { t: "Asw"; c: AswAttackType }
   | { t: "Shelling"; c: ShellingType }
   | { t: "Night"; c: NightAttackType }
   | { t: "Torpedo" }
   | { t: "SupportShelling"; c: SupportShellingType };
 
+export type NightPhaseAttackType =
+  | { t: "Night"; c: NightAttackType }
+  | { t: "Asw"; c: AswAttackType };
+
+export type TorpedoAttackType = null;
+
+export type AswAttackType = "DepthCharge" | "Aerial";
+
+export type NightAttackType = "Normal" | "Swordfish" | "Aerial";
+
+export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
+
 export type SlotSizeVec = (number | null)[];
 
 export type GearTypeIdArray = [number, number, number, number, number];
@@ -425,10 +466,6 @@ export type SpecialEnemyType =
   | "SummerAircraftCarrierDemon"
   | "EuropeanWaterPrincess";
 
-export type Role = "Main" | "Escort";
-
-export type NightCutinLike = NightCutin | FleetCutin;
-
 export type FleetCutin =
   | "NelsonTouch"
   | "NagatoClassCutin"
@@ -439,6 +476,8 @@ export type FleetCutin =
   | "QueenElizabethClassCutin"
   | "RichelieuClassCutin";
 
+export type NightCutinLike = NightCutin | FleetCutin;
+
 export type NightCutin =
   | "MainTorpRadar"
   | "TorpLookoutRadar"
@@ -460,6 +499,8 @@ export type NightCutin =
   | "Cvci1_18"
   | "Photobomber";
 
+export type DayCutinLike = DayCutin | FleetCutin;
+
 export type DayCutin =
   | "Zuiun"
   | "AirSea"
@@ -472,7 +513,15 @@ export type DayCutin =
   | "BBA"
   | "BA";
 
-export type DayCutinLike = DayCutin | FleetCutin;
+export type ShipCategory =
+  | "Battleship"
+  | "AircraftCarrier"
+  | "HeavyCruiser"
+  | "LightCruiser"
+  | "Destroyer"
+  | "CoastalDefenseShip"
+  | "Submarine"
+  | "AuxiliaryShip";
 
 export type ShipType =
   | "Unknown"
@@ -499,16 +548,6 @@ export type ShipType =
   | "CT"
   | "AO";
 
-export type ShipCategory =
-  | "Battleship"
-  | "AircraftCarrier"
-  | "HeavyCruiser"
-  | "LightCruiser"
-  | "Destroyer"
-  | "CoastalDefenseShip"
-  | "Submarine"
-  | "AuxiliaryShip";
-
 export interface HitRateParams {
   accuracy_term: number;
   evasion_term: number;
@@ -524,8 +563,6 @@ export interface HitRate {
   total: number;
 }
 
-export type FhResult<T> = { Ok: T } | { Err: string };
-
 export interface DamageReport {
   miss_damage_min: number;
   miss_damage_max: number;
@@ -543,6 +580,14 @@ export interface DayCutinReport extends ActionReport<DayPhaseAttackStyle> {
   observation_term: number | null;
 }
 
+export interface ShipDayCutinAnalysis {
+  ship_id: number;
+  role: Role;
+  index: number;
+  rank3: DayCutinReport;
+  rank2: DayCutinReport;
+}
+
 export interface CompDayCutinAnalysis {
   rank3_air_state: AirState;
   rank2_air_state: AirState;
@@ -551,12 +596,11 @@ export interface CompDayCutinAnalysis {
   ships: ShipDayCutinAnalysis[];
 }
 
-export interface ShipDayCutinAnalysis {
+export interface ShipNightCutinAnalysis {
   ship_id: number;
-  role: Role;
   index: number;
-  rank3: DayCutinReport;
-  rank2: DayCutinReport;
+  normal: NightCutinActionReport;
+  chuuha: NightCutinActionReport;
 }
 
 export interface NightCutinActionReport
@@ -570,32 +614,185 @@ export interface NightContactChance {
   rank3: number;
 }
 
-export interface ShipNightCutinAnalysis {
-  ship_id: number;
-  index: number;
-  normal: NightCutinActionReport;
-  chuuha: NightCutinActionReport;
-}
-
 export interface CompNightCutinAnalysis {
   night_contact_chance: NightContactChance;
   ships: ShipNightCutinAnalysis[];
 }
 
-export type Engagement = "GreenT" | "Parallel" | "HeadOn" | "RedT";
+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 type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
+export type SpeedGroup = "A" | "B1" | "B2" | "C";
 
-export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
+export type FhResult<T> = { Ok: T } | { Err: string };
 
-export interface NightCutinDef {
-  tag: NightCutin;
+export interface SupportShellingSimulatorParams {
+  attacker_formation?: Formation;
+  target_formation?: Formation;
+  engagement: Engagement;
+  node_state: NodeState;
+}
+
+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 NationalityDef {
+  id: number;
+  ctypes: number[];
+}
+
+export interface MasterAttrRule<T> {
+  tag: T;
+  name: string;
+  expr: CompiledEvaler;
+}
+
+export type CompiledEvaler = string;
+
+export interface NightConditions {
+  player?: NightFleetConditions;
+  enemy?: NightFleetConditions;
+}
+
+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 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 =
+  | "Unknown"
+  | "HighAngleMount"
+  | "NightFighter"
+  | "NightAttacker"
+  | "HeavyBomber"
+  | "NightRecon"
+  | "MainGun"
+  | "Radar"
+  | "SurfaceRadar"
+  | "AirRadar"
+  | "DepthChargeProjector"
+  | "SynergisticDepthCharge"
+  | "AntiSubMortar"
+  | "AntiSubWeapon"
+  | "ApDepthCharge"
+  | "AntiSubAircraft"
+  | "LateModelBowTorpedo"
+  | "Seaplane"
+  | "CbAircraft"
+  | "LbAircraft"
+  | "JetAircraft"
+  | "Fighter"
+  | "Recon"
+  | "ObservationSeaplane"
+  | "CbFighterBomber"
+  | "AntiInstDiveBomber"
+  | "CbSwordfish"
+  | "SemiNightPlane"
+  | "HighAltitudeInterceptor";
+
+export interface 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[];
+  day_cutin: DayCutinDef[];
+  night_cutin: NightCutinDef[];
+  historical_bonuses?: HistoricalBonusDef[];
+}
+
+export interface ActionReport<T> {
+  data: Record<string, AttackReport<T>>;
+  damage_state_density: Histogram<DamageState, number> | null;
+  is_active: boolean;
+}
+
+export interface AttackReport<T> {
+  style: T;
+  proc_rate: number | null;
+  attack_power: AttackPower | null;
+  attack_power_params: AttackPowerParams | null;
   hits: number;
-  type_factor: number | null;
-  power_mod: number | null;
-  accuracy_mod: number | null;
+  hit_rate: HitRate | null;
+  hit_rate_params: HitRateParams | null;
+  damage: DamageReport | null;
 }
 
+export type Engagement = "GreenT" | "Parallel" | "HeadOn" | "RedT";
+
+export type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
+
 export interface HistoricalParams {
   power_mod: AttackPowerModifier;
   armor_penetration: number;
@@ -603,20 +800,33 @@ export interface HistoricalParams {
   target_evasion_mod: number;
 }
 
+export interface BattleDefinitions {
+  formation: Record<Formation, NestedFormationDef>;
+  anti_air_cutin: Record<number, AntiAirCutinDef>;
+  day_cutin: Record<DayCutin, DayCutinDef>;
+  night_cutin: Record<NightCutin, NightCutinDef>;
+  historical_bonuses: HistoricalBonusDef[];
+}
+
+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 NestedFormationDef =
   | FormationDef
   | { top_half: FormationDef; bottom_half: FormationDef };
 
-export interface AntiAirCutinDef {
-  id: number;
-  type_factor: number | null;
-  multiplier: number | null;
-  guaranteed: number | null;
-  sequential: boolean | null;
-}
-
-export interface DayCutinDef {
-  tag: DayCutin;
+export interface NightCutinDef {
+  tag: NightCutin;
   hits: number;
   type_factor: number | null;
   power_mod: number | null;
@@ -629,14 +839,6 @@ export interface FormationCombatModifiersDef {
   evasion_mod?: number;
 }
 
-export interface BattleDefinitions {
-  formation: Record<Formation, NestedFormationDef>;
-  anti_air_cutin: Record<number, AntiAirCutinDef>;
-  day_cutin: Record<DayCutin, DayCutinDef>;
-  night_cutin: Record<NightCutin, NightCutinDef>;
-  historical_bonuses: HistoricalBonusDef[];
-}
-
 export interface FormationDef {
   tag: Formation;
   protection_rate: number | null;
@@ -648,22 +850,20 @@ export interface FormationDef {
   support_shelling: FormationCombatModifiersDef;
 }
 
-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 interface DayCutinDef {
+  tag: DayCutin;
+  hits: number;
+  type_factor: number | null;
+  power_mod: number | null;
+  accuracy_mod: number | null;
 }
 
-export interface AttackPowerModifier {
-  a?: number;
-  b?: number;
+export interface AntiAirCutinDef {
+  id: number;
+  type_factor: number | null;
+  multiplier: number | null;
+  guaranteed: number | null;
+  sequential: boolean | null;
 }
 
 export interface SpecialEnemyModifiers {
@@ -675,12 +875,25 @@ export interface SpecialEnemyModifiers {
   honi_mod: AttackPowerModifier;
   toku_daihatsu_chiha_mod: AttackPowerModifier;
   toku_daihatsu_chiha_kai_mod: AttackPowerModifier;
+  army_infantry_mod: AttackPowerModifier;
+  army_infantry_chiha_kai_mod: AttackPowerModifier;
+  t97_tank_chiha_mod: AttackPowerModifier;
+  t97_tank_chiha_kai_mod: AttackPowerModifier;
+  landing_forces_mod: AttackPowerModifier;
+  landing_forces_group_mod: AttackPowerModifier;
+  landing_forces_t4_mod: AttackPowerModifier;
+  landing_forces_t4kai_mod: AttackPowerModifier;
   t4_tank_group_mod: AttackPowerModifier;
   t4_tank_kai_mod: AttackPowerModifier;
   postcap_general_mod: AttackPowerModifier;
   pt_mod: AttackPowerModifier | null;
 }
 
+export interface AttackPowerModifier {
+  a?: number;
+  b?: number;
+}
+
 export interface CustomPowerModifiers {
   precap_mod?: AttackPowerModifier;
   postcap_mod?: AttackPowerModifier;
@@ -699,19 +912,11 @@ export type OrgType =
 export type AirState =
   | "AirSupremacy"
   | "AirSuperiority"
-  | "AirParity"
-  | "AirDenial"
-  | "AirIncapability";
-
-export type AirStateRank = "Rank0" | "Rank1" | "Rank2" | "Rank3";
-
-export type SingleFormation =
-  | "LineAhead"
-  | "DoubleLine"
-  | "Diamond"
-  | "Echelon"
-  | "LineAbreast"
-  | "Vanguard";
+  | "AirParity"
+  | "AirDenial"
+  | "AirIncapability";
+
+export type AirStateRank = "Rank0" | "Rank1" | "Rank2" | "Rank3";
 
 export type Formation = SingleFormation | CombinedFormation;
 
@@ -721,11 +926,13 @@ export type CombinedFormation =
   | "Cruising3"
   | "Cruising4";
 
-export interface CompAntiAirAnalysis {
-  fleet_adjusted_anti_air: number;
-  ships: AntiAirReport[];
-  anti_air_cutin_chance: [number, number][];
-}
+export type SingleFormation =
+  | "LineAhead"
+  | "DoubleLine"
+  | "Diamond"
+  | "Echelon"
+  | "LineAbreast"
+  | "Vanguard";
 
 export interface AntiAirReport {
   ship_id: number;
@@ -739,10 +946,10 @@ export interface AntiAirReport {
   anti_air_propellant_barrage_chance: number | null;
 }
 
-export interface FleetCutinAttackReport<T> extends AttackReport<T> {
-  index: number;
-  ship_id: number;
-  power_mod: number;
+export interface CompAntiAirAnalysis {
+  fleet_adjusted_anti_air: number;
+  ships: AntiAirReport[];
+  anti_air_cutin_chance: [number, number][];
 }
 
 export interface FleetCutinReport<T> {
@@ -752,6 +959,12 @@ export interface FleetCutinReport<T> {
   attacks: FleetCutinAttackReport<T>[];
 }
 
+export interface FleetCutinAttackReport<T> extends AttackReport<T> {
+  index: number;
+  ship_id: number;
+  power_mod: number;
+}
+
 export interface AttackPower {
   precap: number;
   is_capped: boolean;
@@ -805,198 +1018,9 @@ export interface DayContactChance {
   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 =
-  | "Unknown"
-  | "HighAngleMount"
-  | "NightFighter"
-  | "NightAttacker"
-  | "HeavyBomber"
-  | "NightRecon"
-  | "MainGun"
-  | "Radar"
-  | "SurfaceRadar"
-  | "AirRadar"
-  | "DepthChargeProjector"
-  | "SynergisticDepthCharge"
-  | "AntiSubMortar"
-  | "AntiSubWeapon"
-  | "ApDepthCharge"
-  | "AntiSubAircraft"
-  | "LateModelBowTorpedo"
-  | "Seaplane"
-  | "CbAircraft"
-  | "LbAircraft"
-  | "JetAircraft"
-  | "Fighter"
-  | "Recon"
-  | "ObservationSeaplane"
-  | "CbFighterBomber"
-  | "AntiInstDiveBomber"
-  | "CbSwordfish"
-  | "SemiNightPlane"
-  | "HighAltitudeInterceptor";
-
-export interface 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 type StatInterval = [number | null, number | null];
-
-export interface GearVecState {
-  g1?: GearState;
-  g2?: GearState;
-  g3?: GearState;
-  g4?: GearState;
-  g5?: GearState;
-  gx?: GearState;
-}
-
-export interface GearState {
-  id?: string;
-  gear_id: number;
-  exp?: number;
-  stars?: number;
-}
-
-export interface ShellingStyle {
-  tag: "ShellingStyle";
-  attack_type: ShellingType;
-  cutin: DayCutinLike | null;
-  power_mod: number;
-  accuracy_mod: number;
-  hits: number;
-}
-
-export interface AswAttackStyle {
-  tag: "AswAttackStyle";
-  attack_type: AswAttackType;
-}
-
-export interface NightAttackStyle {
-  tag: "NightAttackStyle";
-  attack_type: NightAttackType;
-  cutin: NightCutinLike | null;
-  power_mod: number;
-  accuracy_mod: number;
-  hits: number;
-}
-
-export interface SupportShellingStyle {
-  tag: "SupportShellingStyle";
-  attack_type: SupportShellingType;
-}
-
-export interface TorpedoAttackStyle {
-  tag: "TorpedoAttackStyle";
-  attack_type: TorpedoAttackType;
-}
-
-export type NightPhaseAttackStyle = NightAttackStyle | AswAttackStyle;
-
-export type DayPhaseAttackStyle = ShellingStyle | AswAttackStyle;
-
-export interface ShipConditions extends ShipPosition {
-  formation?: Formation;
-  amagiri_index?: number | null;
-}
-
-export interface NodeAttackAnalyzerShipConfig extends NightFleetConditions {
-  formation?: Formation;
-}
-
-export interface NodeAttackAnalysis {
-  left: AttackAnalysis;
-  right: AttackAnalysis;
-  shelling_fleet_cutin: FleetCutinReport<ShellingStyle>[];
-  night_fleet_cutin: FleetCutinReport<NightAttackStyle>[];
-}
-
-export interface NodeAttackAnalyzerConfig {
-  air_state?: AirState;
-  engagement?: Engagement;
-  node_state?: NodeState;
-  left?: NodeAttackAnalyzerShipConfig;
-  right?: NodeAttackAnalyzerShipConfig;
+export interface MstStype {
+  api_id: number;
+  api_equip_type: Record<number, number>;
 }
 
 export interface MasterEquippability {
@@ -1007,10 +1031,7 @@ export interface MasterEquippability {
   rules: EquippabilityRule[];
 }
 
-export interface MstStype {
-  api_id: number;
-  api_equip_type: Record<number, number>;
-}
+export type MstEquipShipValue = null | number[];
 
 export interface EquippabilityRule {
   ship: CompiledEvaler;
@@ -1029,19 +1050,6 @@ export interface MstEquipExslotShip {
   api_stypes: Record<number, number> | null;
 }
 
-export type MstEquipShipValue = null | number[];
-
-export type NodeId = string;
-
-export interface NodeState {
-  map?: number;
-  node?: NodeId;
-  phase?: number;
-  debuff?: boolean;
-  disable_historical_mod?: boolean;
-  landing_battle?: boolean;
-}
-
 export type ContactRank = "Rank1" | "Rank2" | "Rank3";
 
 export class AirSquadron {
@@ -1311,12 +1319,6 @@ export class Ship {
   private constructor();
   free(): void;
   [Symbol.dispose](): void;
-  /**
-   * フィット砲補正
-   */
-  gunfit_accuracy(is_night: boolean): number;
-  state_day_gunfit_accuracy(): number | undefined;
-  state_night_gunfit_accuracy(): number | undefined;
   get_ebonus(key: string): number;
   is_abyssal(): boolean;
   is_amagiri(): boolean;
@@ -1375,6 +1377,12 @@ export class Ship {
   can_equip(gear: Gear, key: string): boolean;
   gear_keys(): string[];
   is_pt_imp(): boolean;
+  /**
+   * フィット砲補正
+   */
+  gunfit_accuracy(is_night: boolean): number;
+  state_day_gunfit_accuracy(): number | undefined;
+  state_night_gunfit_accuracy(): number | undefined;
   id: string;
   readonly hash: bigint;
   readonly ship_id: number;