fleethub-core 1.10.0 → 1.10.1

package/pkg/fleethub_core.d.ts

@@ -8,179 +8,10 @@ export function parse_ship_conditions(value: ShipConditions): ShipConditions;
 /**
  */
 export function set_panic_hook(): void;
-export type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
-
-export interface ShipConditions extends ShipPosition {
-  formation?: Formation;
-  amagiri_index?: number | null;
-}
-
-export interface ShipPosition {
-  org_type?: OrgType;
-  fleet_type?: FleetType;
-  fleet_len?: number;
-  index?: number;
-}
-
-export interface NodeState {
-  map?: number;
-  node?: NodeId;
-  phase?: number;
-  debuff?: boolean;
-}
-
-export type NodeId = string;
-
-export interface CompMeta {
-  fleets: Record<FleetType, FleetMeta>;
-}
-
-export interface FleetMeta {
-  id: string;
-  len: number;
-  ships: [string, ShipMeta | null][];
-}
-
-export interface ShipMeta {
-  id: string;
-  ship_id: number;
-}
-
-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 TorpedoAttackType = null;
-
-export type NightPhaseAttackType =
-  | { t: "Night"; c: NightAttackType }
-  | { t: "Asw"; c: AswAttackType };
-
-export type DayPhaseAttackType =
-  | { t: "Shelling"; c: ShellingType }
-  | { t: "Asw"; c: AswAttackType };
-
-export type AttackType =
-  | { t: "Asw"; c: AswAttackType }
-  | { t: "Shelling"; c: ShellingType }
-  | { t: "Night"; c: NightAttackType }
-  | { t: "Torpedo" }
-  | { t: "SupportShelling"; c: SupportShellingType };
-
-export type SupportShellingType = ShellingType;
-
-export type NightAttackType = "Normal" | "Swordfish" | "Carrier";
-
-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 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 SpeedGroup = "A" | "B1" | "B2" | "C";
 
+export type SlotSizeVec = (number | null)[];
+
 export interface NightFleetConditions {
   night_contact_rank?: ContactRank | null;
   starshell_index?: number | null;
@@ -228,34 +59,31 @@ export interface MasterGear {
   fleet_anti_air_resist?: number;
 }
 
-export interface EquippabilityRule {
-  ship: CompiledEvaler;
-  keys?: string[];
-  include?: string;
-  exclude?: string;
-}
-
-export interface MasterEquippability {
-  equip_stype: EquipStype[];
-  equip_exslot: number[];
-  equip_ship: MstEquipShip[];
-  equip_exslot_ship: MstEquipExslotShip[];
-  rules: EquippabilityRule[];
+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 MstEquipExslotShip {
-  api_slotitem_id: number;
-  api_ship_ids: number[];
+export interface CompNightAnalysis {
+  night_cutin: CompNightCutinAnalysis;
+  fleet_cutin: FleetCutinReport<NightAttackStyle>[];
 }
 
-export interface MstEquipShip {
-  api_ship_id: number;
-  api_equip_type: number[];
+export interface CompDayAnalysis {
+  day_cutin: CompDayCutinAnalysis;
+  fleet_cutin: FleetCutinReport<ShellingStyle>[];
 }
 
-export interface EquipStype {
-  id: number;
-  equip_type: number[];
+export interface CompAnalysis {
+  day: CompDayAnalysis;
+  night: CompNightAnalysis;
+  contact: ContactAnalysis;
+  anti_air: CompAntiAirAnalysis;
 }
 
 export interface OrgState {
@@ -339,8 +167,6 @@ export interface GearState {
   stars?: number;
 }
 
-export type SlotSizeVec = (number | null)[];
-
 export type ShipType =
   | "Unknown"
   | "DE"
@@ -407,9 +233,30 @@ export type Align = "Left" | "Right";
 
 export type Side = "Player" | "Enemy";
 
-export type Role = "Main" | "Escort";
+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 type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
+export interface MasterIBonusRule {
+  expr: CompiledEvaler;
+  formula: CompiledEvaler;
+}
 
 export interface AttackReport<T> {
   style: T;
@@ -427,6 +274,10 @@ export interface MoveShipPayload {
   target: [string | null, string, ShipKey];
 }
 
+export type Role = "Main" | "Escort";
+
+export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
+
 export type NightCutinLike = NightCutin | FleetCutin;
 
 export type DayCutinLike = DayCutin | FleetCutin;
@@ -468,46 +319,9 @@ export type DayCutin =
   | "BBA"
   | "BA";
 
-export type ContactRank = "Rank1" | "Rank2" | "Rank3";
-
 export type AirWaveType = "Jet" | "LandBase" | "Carrier";
 
-export interface SimulatorResult {
-  items: SimulatorResultItem[];
-  sunk_vec: [number, number, number][];
-}
-
-export interface SimulatorResultItem {
-  id: string;
-  fleet_type: FleetType;
-  index: number;
-  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 MasterIBonusRule {
-  expr: CompiledEvaler;
-  formula: CompiledEvaler;
-}
+export type ContactRank = "Rank1" | "Rank2" | "Rank3";
 
 export interface BattleDefinitions {
   formation: Record<Formation, NestedFormationDef>;
@@ -527,7 +341,7 @@ export interface NightCutinDef {
 
 export interface HistoricalBonusDef {
   map?: number;
-  node?: NodeId;
+  node?: CompiledEvaler;
   phase?: number;
   debuff?: boolean;
   ship?: CompiledEvaler;
@@ -574,17 +388,233 @@ export interface FormationCombatModifiersDef {
   evasion_mod?: number;
 }
 
-export type Engagement = "GreenT" | "Parallel" | "HeadOn" | "RedT";
+export interface SimulatorResult {
+  items: SimulatorResultItem[];
+  sunk_vec: [number, number, number][];
+}
+
+export interface SimulatorResultItem {
+  id: string;
+  fleet_type: FleetType;
+  index: number;
+  damage_state_map: Record<DamageState, 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;
+  historical_mod: number;
+  custom_mods: CustomPowerModifiers;
+}
+
+export type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
+
+export interface ShipConditions extends ShipPosition {
+  formation?: Formation;
+  amagiri_index?: number | null;
+}
+
+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 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 interface CompMeta {
+  fleets: Record<FleetType, FleetMeta>;
+}
+
+export interface FleetMeta {
+  id: string;
+  len: number;
+  ships: [string, ShipMeta | null][];
+}
+
+export interface ShipMeta {
+  id: string;
+  ship_id: number;
+}
+
+export type TorpedoAttackType = null;
+
+export type NightPhaseAttackType =
+  | { t: "Night"; c: NightAttackType }
+  | { t: "Asw"; c: AswAttackType };
+
+export type DayPhaseAttackType =
+  | { t: "Shelling"; c: ShellingType }
+  | { t: "Asw"; c: AswAttackType };
+
+export type AttackType =
+  | { t: "Asw"; c: AswAttackType }
+  | { t: "Shelling"; c: ShellingType }
+  | { t: "Night"; c: NightAttackType }
+  | { t: "Torpedo" }
+  | { t: "SupportShelling"; c: SupportShellingType };
+
+export type SupportShellingType = ShellingType;
+
+export type NightAttackType = "Normal" | "Swordfish" | "Carrier";
+
+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;
@@ -623,32 +653,102 @@ export interface GearInput {
   ace: number;
 }
 
-export type GearVecInput = GearInput[];
+export type GearVecInput = GearInput[];
+
+export type ShipAttr =
+  | "Unknown"
+  | "Abyssal"
+  | "NightCarrier"
+  | "Installation"
+  | "RoyalNavy"
+  | "Kai2"
+  | "TurbineSpeedBonus"
+  | "Pillbox"
+  | "IsolatedIsland"
+  | "HarbourSummerPrincess"
+  | "SupplyDepot"
+  | "NewSupplyDepot"
+  | "PtImp"
+  | "BattleshipSummerPrincess"
+  | "HeavyCruiserSummerPrincess";
+
+export type OrgType =
+  | "Single"
+  | "CarrierTaskForce"
+  | "SurfaceTaskForce"
+  | "TransportEscort"
+  | "EnemySingle"
+  | "EnemyCombined";
+
+export type FleetKey = "f1" | "f2" | "f3" | "f4";
+
+export interface SupportShellingSimulatorParams {
+  attacker_formation?: Formation;
+  target_formation?: Formation;
+  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;
+  rank3: number;
+}
+
+export interface CompNightCutinAnalysis {
+  night_contact_chance: NightContactChance;
+  ships: ShipNightCutinAnalysis[];
+}
+
+export interface ShipNightCutinAnalysis {
+  ship_id: number;
+  index: number;
+  normal: NightCutinActionReport;
+  chuuha: NightCutinActionReport;
+}
 
-export type ShipAttr =
-  | "Unknown"
-  | "Abyssal"
-  | "NightCarrier"
-  | "Installation"
-  | "RoyalNavy"
-  | "Kai2"
-  | "TurbineSpeedBonus"
-  | "Pillbox"
-  | "IsolatedIsland"
-  | "HarbourSummerPrincess"
-  | "SupplyDepot"
-  | "NewSupplyDepot"
-  | "PtImp"
-  | "BattleshipSummerPrincess"
-  | "HeavyCruiserSummerPrincess";
+export interface NightCutinActionReport
+  extends ActionReport<NightPhaseAttackStyle> {
+  cutin_term: number | null;
+}
 
-export type OrgType =
-  | "Single"
-  | "CarrierTaskForce"
-  | "SurfaceTaskForce"
-  | "TransportEscort"
-  | "EnemySingle"
-  | "EnemyCombined";
+export interface AttackAnalyzerShipConfig
+  extends ShipConditions,
+    NightFleetConditions {
+  fleet_los_mod?: number | null;
+}
+
+export interface CompAntiAirAnalysis {
+  fleet_adjusted_anti_air: number;
+  ships: AntiAirReport[];
+  anti_air_cutin_chance: [number, number][];
+}
+
+export interface AntiAirReport {
+  ship_id: number;
+  role: Role;
+  index: number;
+  adjusted_anti_air: number | null;
+  proportional_shotdown_rate: number | null;
+  fixed_shotdown_number: number | null;
+  guaranteed: number | null;
+  anti_air_cutin_chance: [number, number][];
+  anti_air_propellant_barrage_chance: number | null;
+}
 
 export type GearAttr =
   | "Unknown"
@@ -682,27 +782,7 @@ export type GearAttr =
   | "SemiNightPlane"
   | "HighAltitudeInterceptor";
 
-export type FleetKey = "f1" | "f2" | "f3" | "f4";
-
-export interface SupportShellingSimulatorParams {
-  attacker_formation?: Formation;
-  target_formation?: Formation;
-  engagement: Engagement;
-}
-
-export interface MasterBattleDefinitions {
-  formation: NestedFormationDef[];
-  anti_air_cutin: AntiAirCutinDef[];
-  day_cutin: DayCutinDef[];
-  night_cutin: NightCutinDef[];
-  historical_bonuses?: HistoricalBonusDef[];
-}
-
-export interface AttackAnalyzerShipConfig
-  extends ShipConditions,
-    NightFleetConditions {
-  fleet_los_mod?: number | null;
-}
+export type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
 
 export interface SupportShellingStyle {
   tag: "SupportShellingStyle";
@@ -741,29 +821,6 @@ export interface ShellingStyle {
   hits: number;
 }
 
-export interface NightContactChance {
-  rank1: number;
-  rank2: number;
-  rank3: number;
-}
-
-export interface CompNightCutinAnalysis {
-  night_contact_chance: NightContactChance;
-  ships: ShipNightCutinAnalysis[];
-}
-
-export interface ShipNightCutinAnalysis {
-  ship_id: number;
-  index: number;
-  normal: NightCutinActionReport;
-  chuuha: NightCutinActionReport;
-}
-
-export interface NightCutinActionReport
-  extends ActionReport<NightPhaseAttackStyle> {
-  cutin_term: number | null;
-}
-
 export interface FleetCutinReport<T> {
   cutin: FleetCutin;
   rate: number | null;
@@ -790,26 +847,6 @@ export interface DamageReport {
   damage_state_density: Histogram<DamageState, number>;
 }
 
-export interface CompAntiAirAnalysis {
-  fleet_adjusted_anti_air: number;
-  ships: AntiAirReport[];
-  anti_air_cutin_chance: [number, number][];
-}
-
-export interface AntiAirReport {
-  ship_id: number;
-  role: Role;
-  index: number;
-  adjusted_anti_air: number | null;
-  proportional_shotdown_rate: number | null;
-  fixed_shotdown_number: number | null;
-  guaranteed: number | null;
-  anti_air_cutin_chance: [number, number][];
-  anti_air_propellant_barrage_chance: number | null;
-}
-
-export type CompiledEvaler = string;
-
 export type Formation = SingleFormation | CombinedFormation;
 
 export type CombinedFormation =
@@ -826,66 +863,6 @@ export type SingleFormation =
   | "LineAbreast"
   | "Vanguard";
 
-export type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
-
-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;
-  historical_mod: number;
-  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 CompDayCutinAnalysis {
   rank3_air_state: AirState;
   rank2_air_state: AirState;
@@ -931,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;
@@ -965,6 +951,36 @@ export interface MasterShip {
 
 export type StatInterval = [number | null, number | null];
 
+export interface EquippabilityRule {
+  ship: CompiledEvaler;
+  keys?: string[];
+  include?: string;
+  exclude?: string;
+}
+
+export interface MasterEquippability {
+  equip_stype: EquipStype[];
+  equip_exslot: number[];
+  equip_ship: MstEquipShip[];
+  equip_exslot_ship: MstEquipExslotShip[];
+  rules: EquippabilityRule[];
+}
+
+export interface MstEquipExslotShip {
+  api_slotitem_id: number;
+  api_ship_ids: number[];
+}
+
+export interface MstEquipShip {
+  api_ship_id: number;
+  api_equip_type: number[];
+}
+
+export interface EquipStype {
+  id: number;
+  equip_type: number[];
+}
+
 export interface HitRate {
   normal: number;
   critical: number;
@@ -994,33 +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 class AirSquadron {
@@ -1135,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}
    */