fleethub-core 1.9.1 → 1.10.1

package/pkg/fleethub_core.d.ts

@@ -8,164 +8,82 @@ export function parse_ship_conditions(value: ShipConditions): ShipConditions;
 /**
  */
 export function set_panic_hook(): void;
-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"
-  | "SecondaryGun2";
-
-export type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
+export type SpeedGroup = "A" | "B1" | "B2" | "C";
 
-export interface BattleDefinitions {
-  formation: Record<Formation, NestedFormationDef>;
-  anti_air_cutin: Record<number, AntiAirCutinDef>;
-  day_cutin: Record<DayCutin, DayCutinDef>;
-  night_cutin: Record<NightCutin, NightCutinDef>;
-}
+export type SlotSizeVec = (number | null)[];
 
-export interface NightCutinDef {
-  tag: NightCutin;
-  hits: number;
-  type_factor: number | null;
-  power_mod: number | null;
-  accuracy_mod: number | null;
+export interface NightFleetConditions {
+  night_contact_rank?: ContactRank | null;
+  starshell_index?: number | null;
+  searchlight_index?: number | null;
+  activates_large_searchlight?: boolean;
 }
 
-export interface DayCutinDef {
-  tag: DayCutin;
-  hits: number;
-  type_factor: number | null;
-  power_mod: number | null;
-  accuracy_mod: number | null;
+export interface NightConditions {
+  player?: NightFleetConditions;
+  enemy?: NightFleetConditions;
 }
 
-export interface AntiAirCutinDef {
-  id: number;
-  type_factor: number | null;
-  multiplier: number | null;
-  guaranteed: number | null;
-  sequential: boolean | null;
+export interface BattleConditions {
+  org_type: OrgType;
+  role: Role;
+  ship_index: number;
+  fleet_len: number;
+  formation: Formation;
+  fleet_los_mod: number | null;
+  night_conditions: NightFleetConditions;
 }
 
-export type NestedFormationDef =
-  | FormationDef
-  | { top_half: FormationDef; bottom_half: FormationDef };
-
-export interface FormationDef {
-  tag: Formation;
-  protection_rate: number | null;
-  fleet_anti_air_mod: number;
-  shelling: FormationCombatModifiersDef;
-  torpedo: FormationCombatModifiersDef;
-  asw: FormationCombatModifiersDef;
-  night: FormationCombatModifiersDef;
-  support_shelling: FormationCombatModifiersDef;
+export interface 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;
 }
 
-export interface FormationCombatModifiersDef {
-  power_mod?: number;
-  accuracy_mod?: number;
-  evasion_mod?: number;
+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 type AirStateRank = "Rank0" | "Rank1" | "Rank2" | "Rank3";
-
-export type AirState =
-  | "AirSupremacy"
-  | "AirSuperiority"
-  | "AirParity"
-  | "AirDenial"
-  | "AirIncapability";
-
-export interface MasterData extends MasterBattleDefinitions {
-  created_at: number;
-  gears: MasterGear[];
-  gear_attrs: MasterAttrRule<GearAttr>[];
-  ships: MasterShip[];
-  ship_attrs: MasterAttrRule<ShipAttr>[];
-  ibonuses: MasterIBonuses;
-  equippable: MasterEquippability;
+export interface CompNightAnalysis {
+  night_cutin: CompNightCutinAnalysis;
+  fleet_cutin: FleetCutinReport<NightAttackStyle>[];
 }
 
-export interface NationalityDef {
-  id: number;
-  ctypes: number[];
+export interface CompDayAnalysis {
+  day_cutin: CompDayCutinAnalysis;
+  fleet_cutin: FleetCutinReport<ShellingStyle>[];
 }
 
-export interface MasterAttrRule<T> {
-  tag: T;
-  name: string;
-  expr: CompiledEvaler;
+export interface CompAnalysis {
+  day: CompDayAnalysis;
+  night: CompNightAnalysis;
+  contact: ContactAnalysis;
+  anti_air: CompAntiAirAnalysis;
 }
 
 export interface OrgState {
@@ -249,8 +167,6 @@ export interface GearState {
   stars?: number;
 }
 
-export type SlotSizeVec = (number | null)[];
-
 export type ShipType =
   | "Unknown"
   | "DE"
@@ -293,6 +209,7 @@ export interface NodeAttackAnalyzerShipConfig extends NightFleetConditions {
 export interface NodeAttackAnalyzerConfig {
   air_state?: AirState;
   engagement?: Engagement;
+  node_state?: NodeState;
   left?: NodeAttackAnalyzerShipConfig;
   right?: NodeAttackAnalyzerShipConfig;
 }
@@ -316,6 +233,47 @@ export type Align = "Left" | "Right";
 
 export type Side = "Player" | "Enemy";
 
+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 AttackReport<T> {
+  style: T;
+  proc_rate: number | null;
+  attack_power: AttackPower | null;
+  attack_power_params: AttackPowerParams | null;
+  hits: number;
+  hit_rate: HitRate | null;
+  hit_rate_params: HitRateParams | null;
+  damage: DamageReport | null;
+}
+
+export interface MoveShipPayload {
+  current: [string, string, ShipKey];
+  target: [string | null, string, ShipKey];
+}
+
 export type Role = "Main" | "Escort";
 
 export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
@@ -361,23 +319,74 @@ export type DayCutin =
   | "BBA"
   | "BA";
 
-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 type AirWaveType = "Jet" | "LandBase" | "Carrier";
 
-export interface MoveShipPayload {
-  current: [string, string, ShipKey];
-  target: [string | null, string, ShipKey];
+export type ContactRank = "Rank1" | "Rank2" | "Rank3";
+
+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 type AirWaveType = "Jet" | "LandBase" | "Carrier";
+export interface NightCutinDef {
+  tag: NightCutin;
+  hits: number;
+  type_factor: number | null;
+  power_mod: number | null;
+  accuracy_mod: number | null;
+}
+
+export interface HistoricalBonusDef {
+  map?: number;
+  node?: CompiledEvaler;
+  phase?: number;
+  debuff?: boolean;
+  ship?: CompiledEvaler;
+  enemy?: CompiledEvaler;
+  power_mod?: 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 AntiAirCutinDef {
+  id: number;
+  type_factor: number | null;
+  multiplier: number | null;
+  guaranteed: number | null;
+  sequential: boolean | null;
+}
+
+export type NestedFormationDef =
+  | FormationDef
+  | { top_half: FormationDef; bottom_half: FormationDef };
+
+export interface FormationDef {
+  tag: Formation;
+  protection_rate: number | null;
+  fleet_anti_air_mod: number;
+  shelling: FormationCombatModifiersDef;
+  torpedo: FormationCombatModifiersDef;
+  asw: FormationCombatModifiersDef;
+  night: FormationCombatModifiersDef;
+  support_shelling: FormationCombatModifiersDef;
+}
+
+export interface FormationCombatModifiersDef {
+  power_mod?: number;
+  accuracy_mod?: number;
+  evasion_mod?: number;
+}
 
 export interface SimulatorResult {
   items: SimulatorResultItem[];
@@ -391,29 +400,29 @@ export interface SimulatorResultItem {
   damage_state_map: Record<DamageState, 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 AttackPower {
+  precap: number;
+  is_capped: boolean;
+  capped: number;
+  normal: number;
+  critical: number;
+  armor_penetration: number;
+  remaining_ammo_mod: number;
 }
 
-export interface MasterIBonusRule {
-  expr: CompiledEvaler;
-  formula: CompiledEvaler;
+export interface AttackPowerParams {
+  basic: number;
+  cap: number;
+  precap_mod: AttackPowerModifier;
+  postcap_mod: AttackPowerModifier;
+  ap_shell_mod: number | null;
+  aerial_power: number | null;
+  proficiency_critical_mod: number;
+  armor_penetration: number;
+  remaining_ammo_mod: number;
+  special_enemy_mods: SpecialEnemyModifiers;
+  historical_mod: number;
+  custom_mods: CustomPowerModifiers;
 }
 
 export type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
@@ -423,53 +432,103 @@ export interface ShipConditions extends ShipPosition {
   amagiri_index?: number | null;
 }
 
-export type ContactRank = "Rank1" | "Rank2" | "Rank3";
+export type GearCategory =
+  | "Fighter"
+  | "Bomber"
+  | "Recon"
+  | "MainGun"
+  | "Secondary"
+  | "Torpedo"
+  | "AntiSub"
+  | "Radar"
+  | "Landing"
+  | "Ration"
+  | "LandBased"
+  | "Misc";
 
-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 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"
+  | "SecondaryGun2";
 
-export interface ShipInput {
-  ship_id: number;
-  ctype: number;
-  stype: number;
-  yomi: string;
-}
+export type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
 
-export interface GearInput {
-  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 interface MasterData extends MasterBattleDefinitions {
+  created_at: number;
+  gears: MasterGear[];
+  gear_attrs: MasterAttrRule<GearAttr>[];
+  ships: MasterShip[];
+  ship_attrs: MasterAttrRule<ShipAttr>[];
+  ibonuses: MasterIBonuses;
+  equippability: MasterEquippability;
 }
 
-export type GearVecInput = GearInput[];
+export interface NationalityDef {
+  id: number;
+  ctypes: number[];
+}
 
-export interface ShipPosition {
-  org_type?: OrgType;
-  fleet_type?: FleetType;
-  fleet_len?: number;
-  index?: number;
+export interface MasterAttrRule<T> {
+  tag: T;
+  name: string;
+  expr: CompiledEvaler;
 }
 
 export interface CompMeta {
@@ -487,8 +546,6 @@ export interface ShipMeta {
   ship_id: number;
 }
 
-export type Engagement = "GreenT" | "Parallel" | "HeadOn" | "RedT";
-
 export type TorpedoAttackType = null;
 
 export type NightPhaseAttackType =
@@ -514,15 +571,90 @@ export type ShellingType = "Normal" | "Carrier";
 
 export type AswAttackType = "DepthCharge" | "Aircraft";
 
+export type AirStateRank = "Rank0" | "Rank1" | "Rank2" | "Rank3";
+
+export type AirState =
+  | "AirSupremacy"
+  | "AirSuperiority"
+  | "AirParity"
+  | "AirDenial"
+  | "AirIncapability";
+
 export type FhResult<T> = { Ok: T } | { Err: string };
 
-export interface ShipAnalyzerConfig {
-  air_state?: AirState;
-  engagement?: Engagement;
-  left?: AttackAnalyzerShipConfig;
-  right?: AttackAnalyzerShipConfig;
+export interface ShipPosition {
+  org_type?: OrgType;
+  fleet_type?: FleetType;
+  fleet_len?: number;
+  index?: number;
+}
+
+export type Engagement = "GreenT" | "Parallel" | "HeadOn" | "RedT";
+
+export interface CustomPowerModifiers {
+  precap_mod?: AttackPowerModifier;
+  postcap_mod?: AttackPowerModifier;
+  basic_power_mod?: AttackPowerModifier;
+}
+
+export interface SpecialEnemyModifiers {
+  precap_general_mod: AttackPowerModifier;
+  stype_mod: AttackPowerModifier;
+  landing_craft_synergy_mod: AttackPowerModifier;
+  toku_daihatsu_tank_mod: AttackPowerModifier;
+  m4a1dd_mod: AttackPowerModifier;
+  honi_mod: AttackPowerModifier;
+  postcap_general_mod: AttackPowerModifier;
+  pt_mod: AttackPowerModifier;
+}
+
+export interface AttackPowerModifier {
+  a?: number;
+  b?: number;
+}
+
+export type CompiledEvaler = 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 interface ShipInput {
+  ship_id: number;
+  ctype: number;
+  stype: number;
+  yomi: string;
+}
+
+export interface GearInput {
+  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 GearVecInput = GearInput[];
+
 export type ShipAttr =
   | "Unknown"
   | "Abyssal"
@@ -548,38 +680,6 @@ export type OrgType =
   | "EnemySingle"
   | "EnemyCombined";
 
-export type GearAttr =
-  | "Unknown"
-  | "Abyssal"
-  | "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 type FleetKey = "f1" | "f2" | "f3" | "f4";
 
 export interface SupportShellingSimulatorParams {
@@ -588,6 +688,21 @@ export interface SupportShellingSimulatorParams {
   engagement: Engagement;
 }
 
+export interface MasterBattleDefinitions {
+  formation: NestedFormationDef[];
+  anti_air_cutin: AntiAirCutinDef[];
+  day_cutin: DayCutinDef[];
+  night_cutin: NightCutinDef[];
+  historical_bonuses?: HistoricalBonusDef[];
+}
+
+export interface ShipAnalyzerConfig {
+  air_state?: AirState;
+  engagement?: Engagement;
+  left?: AttackAnalyzerShipConfig;
+  right?: AttackAnalyzerShipConfig;
+}
+
 export interface NightContactChance {
   rank1: number;
   rank2: number;
@@ -611,6 +726,12 @@ export interface NightCutinActionReport
   cutin_term: number | null;
 }
 
+export interface AttackAnalyzerShipConfig
+  extends ShipConditions,
+    NightFleetConditions {
+  fleet_los_mod?: number | null;
+}
+
 export interface CompAntiAirAnalysis {
   fleet_adjusted_anti_air: number;
   ships: AntiAirReport[];
@@ -629,6 +750,38 @@ export interface AntiAirReport {
   anti_air_propellant_barrage_chance: number | null;
 }
 
+export type GearAttr =
+  | "Unknown"
+  | "Abyssal"
+  | "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 type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
 
 export interface SupportShellingStyle {
@@ -668,63 +821,6 @@ export interface ShellingStyle {
   hits: number;
 }
 
-export interface CustomPowerModifiers {
-  precap_mod?: AttackPowerModifier;
-  postcap_mod?: AttackPowerModifier;
-  basic_power_mod?: AttackPowerModifier;
-}
-
-export interface SpecialEnemyModifiers {
-  precap_general_mod: AttackPowerModifier;
-  stype_mod: AttackPowerModifier;
-  landing_craft_synergy_mod: AttackPowerModifier;
-  toku_daihatsu_tank_mod: AttackPowerModifier;
-  m4a1dd_mod: AttackPowerModifier;
-  honi_mod: AttackPowerModifier;
-  postcap_general_mod: AttackPowerModifier;
-  pt_mod: AttackPowerModifier;
-}
-
-export interface AttackPowerModifier {
-  a?: number;
-  b?: number;
-}
-
-export interface AttackPower {
-  precap: number;
-  is_capped: boolean;
-  capped: number;
-  normal: number;
-  critical: number;
-  armor_penetration: number;
-  remaining_ammo_mod: number;
-}
-
-export interface AttackPowerParams {
-  basic: number;
-  cap: number;
-  precap_mod: AttackPowerModifier;
-  postcap_mod: AttackPowerModifier;
-  ap_shell_mod: number | null;
-  aerial_power: number | null;
-  proficiency_critical_mod: number;
-  armor_penetration: number;
-  remaining_ammo_mod: number;
-  special_enemy_mods: SpecialEnemyModifiers;
-  custom_mods: CustomPowerModifiers;
-}
-
-export interface SpecialEnemyModifiers {
-  precap_general_mod: AttackPowerModifier;
-  stype_mod: AttackPowerModifier;
-  landing_craft_synergy_mod: AttackPowerModifier;
-  toku_daihatsu_tank_mod: AttackPowerModifier;
-  m4a1dd_mod: AttackPowerModifier;
-  honi_mod: AttackPowerModifier;
-  postcap_general_mod: AttackPowerModifier;
-  pt_mod: AttackPowerModifier;
-}
-
 export interface FleetCutinReport<T> {
   cutin: FleetCutin;
   rate: number | null;
@@ -751,14 +847,6 @@ export interface DamageReport {
   damage_state_density: Histogram<DamageState, number>;
 }
 
-export interface AttackAnalyzerShipConfig
-  extends ShipConditions,
-    NightFleetConditions {
-  fleet_los_mod?: number | null;
-}
-
-export type Histogram<K, V> = Partial<Record<K, V>>;
-
 export type Formation = SingleFormation | CombinedFormation;
 
 export type CombinedFormation =
@@ -806,6 +894,8 @@ export interface AttackAnalysis {
   support_shelling: ActionReport<SupportShellingStyle>;
 }
 
+export type Histogram<K, V> = Partial<Record<K, V>>;
+
 export type SpecialEnemyType =
   | "None"
   | "SoftSkinned"
@@ -818,6 +908,15 @@ export type SpecialEnemyType =
   | "BattleshipSummerPrincess"
   | "HeavyCruiserSummerPrincess";
 
+export interface NodeState {
+  map?: number;
+  node?: NodeId;
+  phase?: number;
+  debuff?: boolean;
+}
+
+export type NodeId = string;
+
 export interface MasterShip {
   ship_id: number;
   name: string;
@@ -882,13 +981,6 @@ export interface EquipStype {
   equip_type: number[];
 }
 
-export interface MasterBattleDefinitions {
-  formation: NestedFormationDef[];
-  anti_air_cutin: AntiAirCutinDef[];
-  day_cutin: DayCutinDef[];
-  night_cutin: NightCutinDef[];
-}
-
 export interface HitRate {
   normal: number;
   critical: number;
@@ -918,84 +1010,6 @@ export interface DayContactChance {
   total: number;
 }
 
-export interface CompAnalyzerConfig {
-  engagement: Engagement;
-  formation: Formation;
-  anti_air_cutin: number | null;
-  ship_anti_air_resist: number;
-  fleet_anti_air_resist: number;
-  left_night_fleet_conditions: NightFleetConditions;
-  right_night_fleet_conditions: NightFleetConditions;
-}
-
-export interface CompNightAnalysis {
-  night_cutin: CompNightCutinAnalysis;
-  fleet_cutin: FleetCutinReport<NightAttackStyle>[];
-}
-
-export interface CompDayAnalysis {
-  day_cutin: CompDayCutinAnalysis;
-  fleet_cutin: FleetCutinReport<ShellingStyle>[];
-}
-
-export interface CompAnalysis {
-  day: CompDayAnalysis;
-  night: CompNightAnalysis;
-  contact: ContactAnalysis;
-  anti_air: CompAntiAirAnalysis;
-}
-
-export type CompiledEvaler = string;
-
-export type SpeedGroup = "A" | "B1" | "B2" | "C";
-
-export interface NightFleetConditions {
-  night_contact_rank?: ContactRank | null;
-  starshell_index?: number | null;
-  searchlight_index?: number | null;
-  activates_large_searchlight?: boolean;
-}
-
-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 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;
-}
-
 /**
  */
 export class AirSquadron {
@@ -1110,6 +1124,15 @@ export class Comp {
    * @returns {boolean}
    */
   is_enemy(): boolean;
+  /**
+   * @param {string} id
+   * @returns {boolean}
+   */
+  has_ship_eid(id: string): boolean;
+  /**
+   * @returns {string | undefined}
+   */
+  first_ship_id(): string | undefined;
   /**
    * @returns {boolean}
    */