fleethub-core 1.8.7 → 1.8.10

package/node/fleethub_core.d.ts

@@ -1,30 +1,14 @@
 /* tslint:disable */
 /* eslint-disable */
+/**
+ */
+export function set_panic_hook(): void;
 /**
  * @param {ShipConditions} value
  * @returns {ShipConditions}
  */
 export function parse_ship_conditions(value: ShipConditions): ShipConditions;
-/**
- */
-export function set_panic_hook(): void;
-declare namespace Side {
-  export type Player = "Player";
-  export type Enemy = "Enemy";
-}
-
-export type Side = Side.Player | Side.Enemy;
-
-export interface ShipConditions extends ShipPosition {
-  formation?: Formation;
-}
-
-declare namespace Role {
-  export type Main = "Main";
-  export type Escort = "Escort";
-}
-
-export type Role = Role.Main | Role.Escort;
+export type Side = "Player" | "Enemy";
 
 export interface ShipPosition {
   org_type?: OrgType;
@@ -33,18 +17,22 @@ export interface ShipPosition {
   index?: number;
 }
 
-declare namespace Engagement {
-  export type GreenT = "GreenT";
-  export type Parallel = "Parallel";
-  export type HeadOn = "HeadOn";
-  export type RedT = "RedT";
+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 Engagement =
-  | Engagement.GreenT
-  | Engagement.Parallel
-  | Engagement.HeadOn
-  | Engagement.RedT;
+export type Engagement = "GreenT" | "Parallel" | "HeadOn" | "RedT";
 
 export interface BattleDefinitions {
   formation: Record<Formation, NestedFormationDef>;
@@ -77,18 +65,9 @@ export interface AntiAirCutinDef {
   sequential: boolean | null;
 }
 
-type __NestedFormationDefFormationDef = FormationDef;
-declare namespace NestedFormationDef {
-  export type Normal = __NestedFormationDefFormationDef;
-  export type Vanguard = {
-    top_half: __NestedFormationDefFormationDef;
-    bottom_half: __NestedFormationDefFormationDef;
-  };
-}
-
 export type NestedFormationDef =
-  | NestedFormationDef.Normal
-  | NestedFormationDef.Vanguard;
+  | FormationDef
+  | { top_half: FormationDef; bottom_half: FormationDef };
 
 export interface FormationDef {
   tag: Formation;
@@ -107,506 +86,407 @@ export interface FormationCombatModifiersDef {
   evasion_mod?: number;
 }
 
-export interface ShipAnalyzerConfig {
-  air_state?: AirState;
-  engagement?: Engagement;
-  left?: AttackAnalyzerShipConfig;
-  right?: AttackAnalyzerShipConfig;
-}
+export type CompiledEvaler = string;
 
-declare namespace SpecialEnemyType {
-  export type None = "None";
-  export type SoftSkinned = "SoftSkinned";
-  export type Pillbox = "Pillbox";
-  export type IsolatedIsland = "IsolatedIsland";
-  export type SupplyDepot = "SupplyDepot";
-  export type HarbourSummerPrincess = "HarbourSummerPrincess";
-  export type PtImp = "PtImp";
-  export type BattleshipSummerPrincess = "BattleshipSummerPrincess";
-  export type HeavyCruiserSummerPrincess = "HeavyCruiserSummerPrincess";
+export interface OrgState {
+  id?: string;
+  f1?: FleetState;
+  f2?: FleetState;
+  f3?: FleetState;
+  f4?: FleetState;
+  a1?: AirSquadronState;
+  a2?: AirSquadronState;
+  a3?: AirSquadronState;
+  hq_level?: number;
+  org_type?: OrgType;
+  sortie?: FleetKey;
+  route_sup?: FleetKey;
+  boss_sup?: FleetKey;
 }
 
-export type SpecialEnemyType =
-  | SpecialEnemyType.None
-  | SpecialEnemyType.SoftSkinned
-  | SpecialEnemyType.Pillbox
-  | SpecialEnemyType.IsolatedIsland
-  | SpecialEnemyType.SupplyDepot
-  | SpecialEnemyType.HarbourSummerPrincess
-  | SpecialEnemyType.PtImp
-  | SpecialEnemyType.BattleshipSummerPrincess
-  | SpecialEnemyType.HeavyCruiserSummerPrincess;
-
-declare namespace MoraleState {
-  export type Sparkle = "Sparkle";
-  export type Normal = "Normal";
-  export type Orange = "Orange";
-  export type Red = "Red";
-}
-
-export type MoraleState =
-  | MoraleState.Sparkle
-  | MoraleState.Normal
-  | MoraleState.Orange
-  | MoraleState.Red;
-
-type __NightCutinLikeFleetCutin = FleetCutin;
-type __NightCutinLikeNightCutin = NightCutin;
-declare namespace NightCutinLike {
-  export type NightCutin = __NightCutinLikeNightCutin;
-  export type FleetCutin = __NightCutinLikeFleetCutin;
-}
-
-export type NightCutinLike =
-  | NightCutinLike.NightCutin
-  | NightCutinLike.FleetCutin;
-
-type __DayCutinLikeDayCutin = DayCutin;
-type __DayCutinLikeFleetCutin = FleetCutin;
-declare namespace DayCutinLike {
-  export type DayCutin = __DayCutinLikeDayCutin;
-  export type FleetCutin = __DayCutinLikeFleetCutin;
-}
-
-export type DayCutinLike = DayCutinLike.DayCutin | DayCutinLike.FleetCutin;
-
-declare namespace FleetCutin {
-  export type NelsonTouch = "NelsonTouch";
-  export type NagatoClassCutin = "NagatoClassCutin";
-  export type ColoradoClassCutin = "ColoradoClassCutin";
-  export type KongouClassCutin = "KongouClassCutin";
-  export type Yamato2ShipCutin = "Yamato2ShipCutin";
-  export type Yamato3ShipCutin = "Yamato3ShipCutin";
+export interface AirSquadronState extends GearVecState, SlotSizeVecState {
+  id?: string;
+  mode?: AirSquadronMode;
 }
 
-export type FleetCutin =
-  | FleetCutin.NelsonTouch
-  | FleetCutin.NagatoClassCutin
-  | FleetCutin.ColoradoClassCutin
-  | FleetCutin.KongouClassCutin
-  | FleetCutin.Yamato2ShipCutin
-  | FleetCutin.Yamato3ShipCutin;
-
-declare namespace NightCutin {
-  export type MainTorpRadar = "MainTorpRadar";
-  export type TorpLookoutRadar = "TorpLookoutRadar";
-  export type TorpTsloTorp = "TorpTsloTorp";
-  export type TorpTsloDrum = "TorpTsloDrum";
-  export type DoubleAttack = "DoubleAttack";
-  export type TorpTorpMain = "TorpTorpMain";
-  export type TorpTorpTorp = "TorpTorpTorp";
-  export type MainMainSec = "MainMainSec";
-  export type MainMainMain = "MainMainMain";
-  export type SubTorpTorp = "SubTorpTorp";
-  export type SubRadarTorp = "SubRadarTorp";
-  export type Cvci1_25 = "Cvci1_25";
-  export type Cvci1_20 = "Cvci1_20";
-  export type Cvci1_18 = "Cvci1_18";
-  export type Photobomber = "Photobomber";
-}
+export type AirSquadronMode = "Sortie" | "AirDefense";
 
-export type NightCutin =
-  | NightCutin.MainTorpRadar
-  | NightCutin.TorpLookoutRadar
-  | NightCutin.TorpTsloTorp
-  | NightCutin.TorpTsloDrum
-  | NightCutin.DoubleAttack
-  | NightCutin.TorpTorpMain
-  | NightCutin.TorpTorpTorp
-  | NightCutin.MainMainSec
-  | NightCutin.MainMainMain
-  | NightCutin.SubTorpTorp
-  | NightCutin.SubRadarTorp
-  | NightCutin.Cvci1_25
-  | NightCutin.Cvci1_20
-  | NightCutin.Cvci1_18
-  | NightCutin.Photobomber;
-
-declare namespace DayCutin {
-  export type Zuiun = "Zuiun";
-  export type AirSea = "AirSea";
-  export type MainMain = "MainMain";
-  export type MainAp = "MainAp";
-  export type MainRadar = "MainRadar";
-  export type MainSec = "MainSec";
-  export type DoubleAttack = "DoubleAttack";
-  export type FBA = "FBA";
-  export type BBA = "BBA";
-  export type BA = "BA";
+export interface FleetState {
+  id?: string;
+  len?: number;
+  s1?: ShipState;
+  s2?: ShipState;
+  s3?: ShipState;
+  s4?: ShipState;
+  s5?: ShipState;
+  s6?: ShipState;
+  s7?: ShipState;
 }
 
-export type DayCutin =
-  | DayCutin.Zuiun
-  | DayCutin.AirSea
-  | DayCutin.MainMain
-  | DayCutin.MainAp
-  | DayCutin.MainRadar
-  | DayCutin.MainSec
-  | DayCutin.DoubleAttack
-  | DayCutin.FBA
-  | DayCutin.BBA
-  | DayCutin.BA;
-
-declare namespace ContactRank {
-  export type Rank1 = "Rank1";
-  export type Rank2 = "Rank2";
-  export type Rank3 = "Rank3";
-}
-
-export type ContactRank =
-  | ContactRank.Rank1
-  | ContactRank.Rank2
-  | ContactRank.Rank3;
-
-declare namespace AirWaveType {
-  export type Jet = "Jet";
-  export type LandBase = "LandBase";
-  export type Carrier = "Carrier";
-}
-
-export type AirWaveType =
-  | AirWaveType.Jet
-  | AirWaveType.LandBase
-  | AirWaveType.Carrier;
-
-export interface SimulatorResult {
-  items: SimulatorResultItem[];
-  sunk_vec: [number, number, number][];
+export interface ShipState extends GearVecState, SlotSizeVecState {
+  id?: string;
+  ship_id: number;
+  level?: number;
+  current_hp?: number;
+  morale?: number;
+  ammo?: number;
+  fuel?: number;
+  max_hp_mod?: number;
+  firepower_mod?: number;
+  torpedo_mod?: number;
+  armor_mod?: number;
+  anti_air_mod?: number;
+  evasion_mod?: number;
+  asw_mod?: number;
+  los_mod?: number;
+  luck_mod?: number;
+  day_gunfit_accuracy?: number;
+  night_gunfit_accuracy?: number;
+  custom_power_mods?: CustomPowerModifiers;
 }
 
-export interface SimulatorResultItem {
-  id: string;
-  fleet_type: FleetType;
-  index: number;
-  damage_state_map: Record<DamageState, number>;
+export interface SlotSizeVecState {
+  ss1?: number;
+  ss2?: number;
+  ss3?: number;
+  ss4?: number;
+  ss5?: number;
 }
 
-declare namespace GearCategory {
-  export type Fighter = "Fighter";
-  export type Bomber = "Bomber";
-  export type Recon = "Recon";
-  export type MainGun = "MainGun";
-  export type Secondary = "Secondary";
-  export type Torpedo = "Torpedo";
-  export type AntiSub = "AntiSub";
-  export type Radar = "Radar";
-  export type Landing = "Landing";
-  export type Ration = "Ration";
-  export type LandBased = "LandBased";
-  export type Misc = "Misc";
+export interface GearVecState {
+  g1?: GearState;
+  g2?: GearState;
+  g3?: GearState;
+  g4?: GearState;
+  g5?: GearState;
+  gx?: GearState;
 }
 
-export type GearCategory =
-  | GearCategory.Fighter
-  | GearCategory.Bomber
-  | GearCategory.Recon
-  | GearCategory.MainGun
-  | GearCategory.Secondary
-  | GearCategory.Torpedo
-  | GearCategory.AntiSub
-  | GearCategory.Radar
-  | GearCategory.Landing
-  | GearCategory.Ration
-  | GearCategory.LandBased
-  | GearCategory.Misc;
-
-declare namespace GearType {
-  export type Unknown = "Unknown";
-  export type SmallMainGun = "SmallMainGun";
-  export type MediumMainGun = "MediumMainGun";
-  export type LargeMainGun = "LargeMainGun";
-  export type SecondaryGun = "SecondaryGun";
-  export type Torpedo = "Torpedo";
-  export type CbFighter = "CbFighter";
-  export type CbDiveBomber = "CbDiveBomber";
-  export type CbTorpedoBomber = "CbTorpedoBomber";
-  export type CbRecon = "CbRecon";
-  export type ReconSeaplane = "ReconSeaplane";
-  export type SeaplaneBomber = "SeaplaneBomber";
-  export type SmallRadar = "SmallRadar";
-  export type LargeRadar = "LargeRadar";
-  export type Sonar = "Sonar";
-  export type DepthCharge = "DepthCharge";
-  export type ExtraArmor = "ExtraArmor";
-  export type Engine = "Engine";
-  export type AntiAirShell = "AntiAirShell";
-  export type ApShell = "ApShell";
-  export type VtFuze = "VtFuze";
-  export type AntiAirGun = "AntiAirGun";
-  export type MidgetSubmarine = "MidgetSubmarine";
-  export type EmergencyRepair = "EmergencyRepair";
-  export type LandingCraft = "LandingCraft";
-  export type Rotorcraft = "Rotorcraft";
-  export type AntiSubPatrolAircraft = "AntiSubPatrolAircraft";
-  export type MediumArmor = "MediumArmor";
-  export type LargeArmor = "LargeArmor";
-  export type Searchlight = "Searchlight";
-  export type SupplyContainer = "SupplyContainer";
-  export type ShipRepairFacility = "ShipRepairFacility";
-  export type SubmarineTorpedo = "SubmarineTorpedo";
-  export type Starshell = "Starshell";
-  export type CommandFacility = "CommandFacility";
-  export type AviationPersonnel = "AviationPersonnel";
-  export type AntiAirFireDirector = "AntiAirFireDirector";
-  export type AntiGroundEquipment = "AntiGroundEquipment";
-  export type LargeMainGun2 = "LargeMainGun2";
-  export type ShipPersonnel = "ShipPersonnel";
-  export type LargeSonar = "LargeSonar";
-  export type LargeFlyingBoat = "LargeFlyingBoat";
-  export type LargeSearchlight = "LargeSearchlight";
-  export type CombatRation = "CombatRation";
-  export type Supplies = "Supplies";
-  export type SeaplaneFighter = "SeaplaneFighter";
-  export type AmphibiousTank = "AmphibiousTank";
-  export type LbAttacker = "LbAttacker";
-  export type LbFighter = "LbFighter";
-  export type LbRecon = "LbRecon";
-  export type TransportationMaterial = "TransportationMaterial";
-  export type SubmarineEquipment = "SubmarineEquipment";
-  export type LargeLbAircraft = "LargeLbAircraft";
-  export type JetFighter = "JetFighter";
-  export type JetFighterBomber = "JetFighterBomber";
-  export type JetTorpedoBomber = "JetTorpedoBomber";
-  export type JetRecon = "JetRecon";
-  export type LargeRadar2 = "LargeRadar2";
-  export type CbRecon2 = "CbRecon2";
-  export type SecondaryGun2 = "SecondaryGun2";
+export interface GearState {
+  id?: string;
+  gear_id: number;
+  exp?: number;
+  stars?: number;
 }
 
-export type GearType =
-  | GearType.Unknown
-  | GearType.SmallMainGun
-  | GearType.MediumMainGun
-  | GearType.LargeMainGun
-  | GearType.SecondaryGun
-  | GearType.Torpedo
-  | GearType.CbFighter
-  | GearType.CbDiveBomber
-  | GearType.CbTorpedoBomber
-  | GearType.CbRecon
-  | GearType.ReconSeaplane
-  | GearType.SeaplaneBomber
-  | GearType.SmallRadar
-  | GearType.LargeRadar
-  | GearType.Sonar
-  | GearType.DepthCharge
-  | GearType.ExtraArmor
-  | GearType.Engine
-  | GearType.AntiAirShell
-  | GearType.ApShell
-  | GearType.VtFuze
-  | GearType.AntiAirGun
-  | GearType.MidgetSubmarine
-  | GearType.EmergencyRepair
-  | GearType.LandingCraft
-  | GearType.Rotorcraft
-  | GearType.AntiSubPatrolAircraft
-  | GearType.MediumArmor
-  | GearType.LargeArmor
-  | GearType.Searchlight
-  | GearType.SupplyContainer
-  | GearType.ShipRepairFacility
-  | GearType.SubmarineTorpedo
-  | GearType.Starshell
-  | GearType.CommandFacility
-  | GearType.AviationPersonnel
-  | GearType.AntiAirFireDirector
-  | GearType.AntiGroundEquipment
-  | GearType.LargeMainGun2
-  | GearType.ShipPersonnel
-  | GearType.LargeSonar
-  | GearType.LargeFlyingBoat
-  | GearType.LargeSearchlight
-  | GearType.CombatRation
-  | GearType.Supplies
-  | GearType.SeaplaneFighter
-  | GearType.AmphibiousTank
-  | GearType.LbAttacker
-  | GearType.LbFighter
-  | GearType.LbRecon
-  | GearType.TransportationMaterial
-  | GearType.SubmarineEquipment
-  | GearType.LargeLbAircraft
-  | GearType.JetFighter
-  | GearType.JetFighterBomber
-  | GearType.JetTorpedoBomber
-  | GearType.JetRecon
-  | GearType.LargeRadar2
-  | GearType.CbRecon2
-  | GearType.SecondaryGun2;
-
-declare namespace DamageState {
-  export type Normal = "Normal";
-  export type Shouha = "Shouha";
-  export type Chuuha = "Chuuha";
-  export type Taiha = "Taiha";
-  export type Sunk = "Sunk";
-}
-
-export type DamageState =
-  | DamageState.Normal
-  | DamageState.Shouha
-  | DamageState.Chuuha
-  | DamageState.Taiha
-  | DamageState.Sunk;
+export type SpeedGroup = "A" | "B1" | "B2" | "C";
 
-export interface NodeAttackAnalyzerShipConfig extends NightFleetConditions {
-  formation?: Formation;
+export type SlotSizeVec = (number | null)[];
+
+export type Role = "Main" | "Escort";
+
+export interface ActionReport<T> {
+  data: Record<string, AttackReport<T>>;
+  damage_state_density: Histogram<DamageState, number> | null;
+  is_active: boolean;
 }
 
-export interface NodeAttackAnalyzerConfig {
-  air_state?: AirState;
-  engagement?: Engagement;
-  left?: NodeAttackAnalyzerShipConfig;
-  right?: NodeAttackAnalyzerShipConfig;
+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 ShipCategory =
+  | "Battleship"
+  | "AircraftCarrier"
+  | "HeavyCruiser"
+  | "LightCruiser"
+  | "Destroyer"
+  | "CoastalDefenseShip"
+  | "Submarine"
+  | "AuxiliaryShip";
+
+export type NightCutinLike = NightCutin | FleetCutin;
+
+export type DayCutinLike = DayCutin | FleetCutin;
+
+export type FleetCutin =
+  | "NelsonTouch"
+  | "NagatoClassCutin"
+  | "ColoradoClassCutin"
+  | "KongouClassCutin"
+  | "Yamato2ShipCutin"
+  | "Yamato3ShipCutin";
+
+export type NightCutin =
+  | "MainTorpRadar"
+  | "TorpLookoutRadar"
+  | "TorpTsloTorp"
+  | "TorpTsloDrum"
+  | "DoubleAttack"
+  | "TorpTorpMain"
+  | "TorpTorpTorp"
+  | "MainMainSec"
+  | "MainMainMain"
+  | "SubTorpTorp"
+  | "SubRadarTorp"
+  | "Cvci1_25"
+  | "Cvci1_20"
+  | "Cvci1_18"
+  | "Photobomber";
+
+export type DayCutin =
+  | "Zuiun"
+  | "AirSea"
+  | "MainMain"
+  | "MainAp"
+  | "MainRadar"
+  | "MainSec"
+  | "DoubleAttack"
+  | "FBA"
+  | "BBA"
+  | "BA";
+
+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 NodeAttackAnalysis {
-  left: AttackAnalysis;
-  right: AttackAnalysis;
+export interface MasterIBonusRule {
+  expr: CompiledEvaler;
+  formula: CompiledEvaler;
 }
 
-export interface CompMeta {
-  fleets: Record<FleetType, FleetMeta>;
+export interface FleetCutinAnalysis {
+  shelling: FleetCutinReport<ShellingStyle>[];
+  night: FleetCutinReport<NightAttackStyle>[];
 }
 
-export interface FleetMeta {
-  id: string;
-  len: number;
-  ships: [string, ShipMeta | null][];
+export interface FleetCutinReport<T> {
+  cutin: FleetCutin;
+  rate: number | null;
+  formation: Formation;
+  attacks: FleetCutinAttackReport<T>[];
 }
 
-export interface ShipMeta {
-  id: string;
+export interface FleetCutinAttackReport<T> extends AttackReport<T> {
+  index: number;
   ship_id: number;
+  power_mod: number;
 }
 
-export type TorpedoAttackType = null;
-
-type __NightPhaseAttackTypeAswAttackType = AswAttackType;
-type __NightPhaseAttackTypeNightAttackType = NightAttackType;
-declare namespace NightPhaseAttackType {
-  export type Night = { t: "Night"; c: __NightPhaseAttackTypeNightAttackType };
-  export type Asw = { t: "Asw"; c: __NightPhaseAttackTypeAswAttackType };
+export interface MoveShipPayload {
+  current: [string, string, ShipKey];
+  target: [string | null, string, ShipKey];
 }
 
-export type NightPhaseAttackType =
-  | NightPhaseAttackType.Night
-  | NightPhaseAttackType.Asw;
+export type GearTypeIdArray = [number, number, number, number, number];
+
+export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
 
-type __DayPhaseAttackTypeAswAttackType = AswAttackType;
-type __DayPhaseAttackTypeShellingType = ShellingType;
-declare namespace DayPhaseAttackType {
-  export type Shelling = { t: "Shelling"; c: __DayPhaseAttackTypeShellingType };
-  export type Asw = { t: "Asw"; c: __DayPhaseAttackTypeAswAttackType };
+export type AirWaveType = "Jet" | "LandBase" | "Carrier";
+
+export interface SimulatorResult {
+  items: SimulatorResultItem[];
+  sunk_vec: [number, number, number][];
 }
 
-export type DayPhaseAttackType =
-  | DayPhaseAttackType.Shelling
-  | DayPhaseAttackType.Asw;
-
-type __AttackTypeAswAttackType = AswAttackType;
-type __AttackTypeNightAttackType = NightAttackType;
-type __AttackTypeShellingType = ShellingType;
-type __AttackTypeSupportShellingType = SupportShellingType;
-declare namespace AttackType {
-  export type Asw = { t: "Asw"; c: __AttackTypeAswAttackType };
-  export type Shelling = { t: "Shelling"; c: __AttackTypeShellingType };
-  export type Night = { t: "Night"; c: __AttackTypeNightAttackType };
-  export type Torpedo = { t: "Torpedo"; c: null };
-  export type SupportShelling = {
-    t: "SupportShelling";
-    c: __AttackTypeSupportShellingType;
-  };
+export interface SimulatorResultItem {
+  id: string;
+  fleet_type: FleetType;
+  index: number;
+  damage_state_map: Record<DamageState, number>;
 }
 
-export type AttackType =
-  | AttackType.Asw
-  | AttackType.Shelling
-  | AttackType.Night
-  | AttackType.Torpedo
-  | AttackType.SupportShelling;
+export type SpecialEnemyType =
+  | "None"
+  | "SoftSkinned"
+  | "Pillbox"
+  | "IsolatedIsland"
+  | "SupplyDepot"
+  | "HarbourSummerPrincess"
+  | "PtImp"
+  | "BattleshipSummerPrincess"
+  | "HeavyCruiserSummerPrincess";
 
-export type SupportShellingType = ShellingType;
+export type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
 
-declare namespace NightAttackType {
-  export type Normal = "Normal";
-  export type Swordfish = "Swordfish";
-  export type Carrier = "Carrier";
-}
+export type ContactRank = "Rank1" | "Rank2" | "Rank3";
 
-export type NightAttackType =
-  | NightAttackType.Normal
-  | NightAttackType.Swordfish
-  | NightAttackType.Carrier;
+export type GearCategory =
+  | "Fighter"
+  | "Bomber"
+  | "Recon"
+  | "MainGun"
+  | "Secondary"
+  | "Torpedo"
+  | "AntiSub"
+  | "Radar"
+  | "Landing"
+  | "Ration"
+  | "LandBased"
+  | "Misc";
 
-declare namespace ShellingType {
-  export type Normal = "Normal";
-  export type Carrier = "Carrier";
-}
+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 ShellingType = ShellingType.Normal | ShellingType.Carrier;
+export type TorpedoAttackType = null;
 
-declare namespace AswAttackType {
-  export type DepthCharge = "DepthCharge";
-  export type Aircraft = "Aircraft";
-}
+export type NightPhaseAttackType =
+  | { t: "Night"; c: NightAttackType }
+  | { t: "Asw"; c: AswAttackType };
 
-export type AswAttackType = AswAttackType.DepthCharge | AswAttackType.Aircraft;
+export type DayPhaseAttackType =
+  | { t: "Shelling"; c: ShellingType }
+  | { t: "Asw"; c: AswAttackType };
 
-declare namespace AirStateRank {
-  export type Rank0 = "Rank0";
-  export type Rank1 = "Rank1";
-  export type Rank2 = "Rank2";
-  export type Rank3 = "Rank3";
-}
+export type AttackType =
+  | { t: "Asw"; c: AswAttackType }
+  | { t: "Shelling"; c: ShellingType }
+  | { t: "Night"; c: NightAttackType }
+  | { t: "Torpedo" }
+  | { t: "SupportShelling"; c: SupportShellingType };
 
-export type AirStateRank =
-  | AirStateRank.Rank0
-  | AirStateRank.Rank1
-  | AirStateRank.Rank2
-  | AirStateRank.Rank3;
+export type SupportShellingType = ShellingType;
 
-declare namespace AirState {
-  export type AirSupremacy = "AirSupremacy";
-  export type AirSuperiority = "AirSuperiority";
-  export type AirParity = "AirParity";
-  export type AirDenial = "AirDenial";
-  export type AirIncapability = "AirIncapability";
-}
+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 =
-  | AirState.AirSupremacy
-  | AirState.AirSuperiority
-  | AirState.AirParity
-  | AirState.AirDenial
-  | AirState.AirIncapability;
+  | "AirSupremacy"
+  | "AirSuperiority"
+  | "AirParity"
+  | "AirDenial"
+  | "AirIncapability";
 
-export interface MasterData {
+export type FhResult<T> = { Ok: T } | { Err: string };
+
+export interface MasterData extends MasterBattleDefinitions {
   created_at: number;
   gears: MasterGear[];
   gear_attrs: MasterAttrRule<GearAttr>[];
   ships: MasterShip[];
   ship_attrs: MasterAttrRule<ShipAttr>[];
   ibonuses: MasterIBonuses;
-  equippable: MasterEquippable;
-  formation: NestedFormationDef[];
-  anti_air_cutin: AntiAirCutinDef[];
-  day_cutin: DayCutinDef[];
-  night_cutin: NightCutinDef[];
+  equippable: MasterEquippability;
 }
 
-export interface MasterConfig {
-  formation: NestedFormationDef[];
-  anti_air_cutin: AntiAirCutinDef[];
-  day_cutin: DayCutinDef[];
-  night_cutin: NightCutinDef[];
+export interface NationalityDef {
+  id: number;
+  ctypes: number[];
 }
 
 export interface MasterAttrRule<T> {
   tag: T;
   name: string;
-  expr: string;
+  expr: CompiledEvaler;
+}
+
+export interface NodeAttackAnalyzerShipConfig extends NightFleetConditions {
+  formation?: Formation;
+}
+
+export interface NodeAttackAnalyzerConfig {
+  air_state?: AirState;
+  engagement?: Engagement;
+  left?: NodeAttackAnalyzerShipConfig;
+  right?: NodeAttackAnalyzerShipConfig;
+}
+
+export interface NodeAttackAnalysis {
+  left: AttackAnalysis;
+  right: AttackAnalysis;
 }
 
 export interface EBonuses {
@@ -649,147 +529,109 @@ export interface GearInput {
 
 export type GearVecInput = GearInput[];
 
-declare namespace ShipAttr {
-  export type Unknown = "Unknown";
-  export type Abyssal = "Abyssal";
-  export type NightCarrier = "NightCarrier";
-  export type Installation = "Installation";
-  export type RoyalNavy = "RoyalNavy";
-  export type Kai2 = "Kai2";
-  export type TurbineSpeedBonus = "TurbineSpeedBonus";
-  export type Pillbox = "Pillbox";
-  export type IsolatedIsland = "IsolatedIsland";
-  export type HarbourSummerPrincess = "HarbourSummerPrincess";
-  export type SupplyDepot = "SupplyDepot";
-  export type PtImp = "PtImp";
-  export type BattleshipSummerPrincess = "BattleshipSummerPrincess";
-  export type HeavyCruiserSummerPrincess = "HeavyCruiserSummerPrincess";
+export interface ShipConditions extends ShipPosition {
+  formation?: Formation;
 }
 
 export type ShipAttr =
-  | ShipAttr.Unknown
-  | ShipAttr.Abyssal
-  | ShipAttr.NightCarrier
-  | ShipAttr.Installation
-  | ShipAttr.RoyalNavy
-  | ShipAttr.Kai2
-  | ShipAttr.TurbineSpeedBonus
-  | ShipAttr.Pillbox
-  | ShipAttr.IsolatedIsland
-  | ShipAttr.HarbourSummerPrincess
-  | ShipAttr.SupplyDepot
-  | ShipAttr.PtImp
-  | ShipAttr.BattleshipSummerPrincess
-  | ShipAttr.HeavyCruiserSummerPrincess;
-
-declare namespace OrgType {
-  export type Single = "Single";
-  export type CarrierTaskForce = "CarrierTaskForce";
-  export type SurfaceTaskForce = "SurfaceTaskForce";
-  export type TransportEscort = "TransportEscort";
-  export type EnemySingle = "EnemySingle";
-  export type EnemyCombined = "EnemyCombined";
-}
+  | "Unknown"
+  | "Abyssal"
+  | "NightCarrier"
+  | "Installation"
+  | "RoyalNavy"
+  | "Kai2"
+  | "TurbineSpeedBonus"
+  | "Pillbox"
+  | "IsolatedIsland"
+  | "HarbourSummerPrincess"
+  | "SupplyDepot"
+  | "PtImp"
+  | "BattleshipSummerPrincess"
+  | "HeavyCruiserSummerPrincess";
 
 export type OrgType =
-  | OrgType.Single
-  | OrgType.CarrierTaskForce
-  | OrgType.SurfaceTaskForce
-  | OrgType.TransportEscort
-  | OrgType.EnemySingle
-  | OrgType.EnemyCombined;
-
-declare namespace GearAttr {
-  export type Unknown = "Unknown";
-  export type Abyssal = "Abyssal";
-  export type HighAngleMount = "HighAngleMount";
-  export type NightFighter = "NightFighter";
-  export type NightAttacker = "NightAttacker";
-  export type HeavyBomber = "HeavyBomber";
-  export type NightRecon = "NightRecon";
-  export type MainGun = "MainGun";
-  export type Radar = "Radar";
-  export type SurfaceRadar = "SurfaceRadar";
-  export type AirRadar = "AirRadar";
-  export type DepthChargeProjector = "DepthChargeProjector";
-  export type SynergisticDepthCharge = "SynergisticDepthCharge";
-  export type AntiSubMortar = "AntiSubMortar";
-  export type AntiSubWeapon = "AntiSubWeapon";
-  export type ApDepthCharge = "ApDepthCharge";
-  export type AntiSubAircraft = "AntiSubAircraft";
-  export type LateModelBowTorpedo = "LateModelBowTorpedo";
-  export type Seaplane = "Seaplane";
-  export type CbAircraft = "CbAircraft";
-  export type LbAircraft = "LbAircraft";
-  export type JetAircraft = "JetAircraft";
-  export type Fighter = "Fighter";
-  export type Recon = "Recon";
-  export type ObservationSeaplane = "ObservationSeaplane";
-  export type CbFighterBomber = "CbFighterBomber";
-  export type AntiInstDiveBomber = "AntiInstDiveBomber";
-  export type CbSwordfish = "CbSwordfish";
-  export type SemiNightPlane = "SemiNightPlane";
-  export type HighAltitudeInterceptor = "HighAltitudeInterceptor";
-}
+  | "Single"
+  | "CarrierTaskForce"
+  | "SurfaceTaskForce"
+  | "TransportEscort"
+  | "EnemySingle"
+  | "EnemyCombined";
 
 export type GearAttr =
-  | GearAttr.Unknown
-  | GearAttr.Abyssal
-  | GearAttr.HighAngleMount
-  | GearAttr.NightFighter
-  | GearAttr.NightAttacker
-  | GearAttr.HeavyBomber
-  | GearAttr.NightRecon
-  | GearAttr.MainGun
-  | GearAttr.Radar
-  | GearAttr.SurfaceRadar
-  | GearAttr.AirRadar
-  | GearAttr.DepthChargeProjector
-  | GearAttr.SynergisticDepthCharge
-  | GearAttr.AntiSubMortar
-  | GearAttr.AntiSubWeapon
-  | GearAttr.ApDepthCharge
-  | GearAttr.AntiSubAircraft
-  | GearAttr.LateModelBowTorpedo
-  | GearAttr.Seaplane
-  | GearAttr.CbAircraft
-  | GearAttr.LbAircraft
-  | GearAttr.JetAircraft
-  | GearAttr.Fighter
-  | GearAttr.Recon
-  | GearAttr.ObservationSeaplane
-  | GearAttr.CbFighterBomber
-  | GearAttr.AntiInstDiveBomber
-  | GearAttr.CbSwordfish
-  | GearAttr.SemiNightPlane
-  | GearAttr.HighAltitudeInterceptor;
+  | "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 SupportShellingStyle {
-  tag: "SupportShellingStyle";
-  attack_type: SupportShellingType;
+export interface SupportShellingSimulatorParams {
+  attacker_formation?: Formation;
+  target_formation?: Formation;
+  engagement: Engagement;
+}
+
+export interface ShipAnalyzerConfig {
+  air_state?: AirState;
+  engagement?: Engagement;
+  left?: AttackAnalyzerShipConfig;
+  right?: AttackAnalyzerShipConfig;
+}
+
+export interface CompAntiAirAnalysis {
+  fleet_adjusted_anti_air: number;
+  ships: AntiAirReport[];
+  anti_air_cutin_chance: [number, number][];
 }
 
-type __NightPhaseAttackStyleAswAttackStyle = AswAttackStyle;
-type __NightPhaseAttackStyleNightAttackStyle = NightAttackStyle;
-declare namespace NightPhaseAttackStyle {
-  export type Night = __NightPhaseAttackStyleNightAttackStyle;
-  export type Asw = __NightPhaseAttackStyleAswAttackStyle;
+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 NightPhaseAttackStyle =
-  | NightPhaseAttackStyle.Night
-  | NightPhaseAttackStyle.Asw;
+export type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
 
-type __DayPhaseAttackStyleAswAttackStyle = AswAttackStyle;
-type __DayPhaseAttackStyleShellingStyle = ShellingStyle;
-declare namespace DayPhaseAttackStyle {
-  export type Shelling = __DayPhaseAttackStyleShellingStyle;
-  export type Asw = __DayPhaseAttackStyleAswAttackStyle;
+export interface SupportShellingStyle {
+  tag: "SupportShellingStyle";
+  attack_type: SupportShellingType;
 }
 
-export type DayPhaseAttackStyle =
-  | DayPhaseAttackStyle.Shelling
-  | DayPhaseAttackStyle.Asw;
+export type NightPhaseAttackStyle = NightAttackStyle | AswAttackStyle;
+
+export type DayPhaseAttackStyle = ShellingStyle | AswAttackStyle;
 
 export interface TorpedoAttackStyle {
   tag: "TorpedoAttackStyle";
@@ -819,34 +661,39 @@ export interface ShellingStyle {
   hits: number;
 }
 
-export interface SupportShellingSimulatorParams {
-  attacker_formation?: Formation;
-  target_formation?: Formation;
-  engagement: Engagement;
+export interface AttackPower {
+  precap: number;
+  is_capped: boolean;
+  capped: number;
+  normal: number;
+  critical: number;
+  armor_penetration: number;
+  remaining_ammo_mod: number;
 }
 
-export interface MasterIBonuses {
-  shelling_power: MasterIBonusRule[];
-  carrier_shelling_power: MasterIBonusRule[];
-  shelling_accuracy: MasterIBonusRule[];
-  torpedo_power: MasterIBonusRule[];
-  torpedo_accuracy: MasterIBonusRule[];
-  torpedo_evasion: MasterIBonusRule[];
-  asw_power: MasterIBonusRule[];
-  asw_accuracy: MasterIBonusRule[];
-  night_power: MasterIBonusRule[];
-  night_accuracy: MasterIBonusRule[];
-  defense_power: MasterIBonusRule[];
-  contact_selection: MasterIBonusRule[];
-  fighter_power: MasterIBonusRule[];
-  ship_anti_air: MasterIBonusRule[];
-  fleet_anti_air: MasterIBonusRule[];
-  elos: MasterIBonusRule[];
+export 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 MasterIBonusRule {
-  expr: CompiledEvaler;
-  formula: CompiledEvaler;
+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 NightContactChance {
@@ -885,77 +732,29 @@ 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 interface AttackAnalyzerShipConfig
+  extends ShipConditions,
+    NightFleetConditions {
+  fleet_los_mod?: number | null;
 }
 
 export type Histogram<K, V> = Partial<Record<K, V>>;
 
-type __FormationCombinedFormation = CombinedFormation;
-type __FormationSingleFormation = SingleFormation;
-declare namespace Formation {
-  export type Single = __FormationSingleFormation;
-  export type Combined = __FormationCombinedFormation;
-}
-
-export type Formation = Formation.Single | Formation.Combined;
-
-declare namespace CombinedFormation {
-  export type Cruising1 = "Cruising1";
-  export type Cruising2 = "Cruising2";
-  export type Cruising3 = "Cruising3";
-  export type Cruising4 = "Cruising4";
-}
+export type Formation = SingleFormation | CombinedFormation;
 
 export type CombinedFormation =
-  | CombinedFormation.Cruising1
-  | CombinedFormation.Cruising2
-  | CombinedFormation.Cruising3
-  | CombinedFormation.Cruising4;
-
-declare namespace SingleFormation {
-  export type LineAhead = "LineAhead";
-  export type DoubleLine = "DoubleLine";
-  export type Diamond = "Diamond";
-  export type Echelon = "Echelon";
-  export type LineAbreast = "LineAbreast";
-  export type Vanguard = "Vanguard";
-}
+  | "Cruising1"
+  | "Cruising2"
+  | "Cruising3"
+  | "Cruising4";
 
 export type SingleFormation =
-  | SingleFormation.LineAhead
-  | SingleFormation.DoubleLine
-  | SingleFormation.Diamond
-  | SingleFormation.Echelon
-  | SingleFormation.LineAbreast
-  | SingleFormation.Vanguard;
-
-declare namespace FleetType {
-  export type Main = "Main";
-  export type Escort = "Escort";
-  export type RouteSup = "RouteSup";
-  export type BossSup = "BossSup";
-}
-
-export type FleetType =
-  | FleetType.Main
-  | FleetType.Escort
-  | FleetType.RouteSup
-  | FleetType.BossSup;
+  | "LineAhead"
+  | "DoubleLine"
+  | "Diamond"
+  | "Echelon"
+  | "LineAbreast"
+  | "Vanguard";
 
 export interface CustomPowerModifiers {
   precap_mod?: AttackPowerModifier;
@@ -979,26 +778,11 @@ export interface AttackPowerModifier {
   b?: number;
 }
 
-export interface MasterEquippable {
-  equip_stype: EquipStype[];
-  equip_exslot: number[];
-  equip_ship: MstEquipShip[];
-  equip_exslot_ship: MstEquipExslotShip[];
-}
-
-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 MasterBattleDefinitions {
+  formation: NestedFormationDef[];
+  anti_air_cutin: AntiAirCutinDef[];
+  day_cutin: DayCutinDef[];
+  night_cutin: NightCutinDef[];
 }
 
 export interface HitRate {
@@ -1016,41 +800,6 @@ export interface HitRateParams {
   hit_percentage_bonus: 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;
-  carrier_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 CompDayCutinAnalysis {
   rank3_air_state: AirState;
   rank2_air_state: AirState;
@@ -1085,12 +834,6 @@ export interface DayContactChance {
   total: number;
 }
 
-export interface AttackAnalyzerShipConfig
-  extends ShipConditions,
-    NightFleetConditions {
-  fleet_los_mod?: number | null;
-}
-
 export interface AttackAnalysis {
   attacker_is_player: boolean;
   attacker_ship_id: number;
@@ -1102,34 +845,13 @@ export interface AttackAnalysis {
   support_shelling: ActionReport<SupportShellingStyle>;
 }
 
-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 MasterShip {
   ship_id: number;
   name: string;
   yomi: string;
   stype: number;
   ctype: number;
+  nationality?: number;
   sort_id?: number;
   max_hp: StatInterval;
   firepower: StatInterval;
@@ -1155,7 +877,37 @@ export interface MasterShip {
   useful?: boolean;
 }
 
-export type StatInterval = [number | null, number | null];
+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 CompAnalyzerConfig {
   engagement: Engagement;
@@ -1184,141 +936,28 @@ export interface CompAnalysis {
   anti_air: CompAntiAirAnalysis;
 }
 
-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 ShipStateMap = Record<ShipKey, ShipState>;
-
-declare namespace ShipKey {
-  export type s1 = "s1";
-  export type s2 = "s2";
-  export type s3 = "s3";
-  export type s4 = "s4";
-  export type s5 = "s5";
-  export type s6 = "s6";
-  export type s7 = "s7";
-}
-
-export type ShipKey =
-  | ShipKey.s1
-  | ShipKey.s2
-  | ShipKey.s3
-  | ShipKey.s4
-  | ShipKey.s5
-  | ShipKey.s6
-  | ShipKey.s7;
-
-export interface OrgState {
-  id?: string;
-  f1?: FleetState;
-  f2?: FleetState;
-  f3?: FleetState;
-  f4?: FleetState;
-  a1?: AirSquadronState;
-  a2?: AirSquadronState;
-  a3?: AirSquadronState;
-  hq_level?: number;
-  org_type?: OrgType;
-  sortie?: string;
-  route_sup?: string;
-  boss_sup?: string;
-}
-
-export interface AirSquadronState extends GearVecState, SlotSizeVecState {
-  id?: string;
-  mode?: AirSquadronMode;
-}
-
-declare namespace AirSquadronMode {
-  export type Sortie = "Sortie";
-  export type AirDefense = "AirDefense";
-}
-
-export type AirSquadronMode =
-  | AirSquadronMode.Sortie
-  | AirSquadronMode.AirDefense;
-
-export interface FleetState {
-  id?: string;
-  len?: number;
-  s1?: ShipState;
-  s2?: ShipState;
-  s3?: ShipState;
-  s4?: ShipState;
-  s5?: ShipState;
-  s6?: ShipState;
-  s7?: ShipState;
-}
-
-export interface ShipState extends GearVecState, SlotSizeVecState {
-  id?: string;
-  ship_id: number;
-  level?: number;
-  current_hp?: number;
-  morale?: number;
-  ammo?: number;
-  fuel?: number;
-  max_hp_mod?: number;
-  firepower_mod?: number;
-  torpedo_mod?: number;
-  armor_mod?: number;
-  anti_air_mod?: number;
-  evasion_mod?: number;
-  asw_mod?: number;
-  los_mod?: number;
-  luck_mod?: number;
-  day_gunfit_accuracy?: number;
-  night_gunfit_accuracy?: number;
-  custom_power_mods?: CustomPowerModifiers;
-}
-
-export interface SlotSizeVecState {
-  ss1?: number;
-  ss2?: number;
-  ss3?: number;
-  ss4?: number;
-  ss5?: number;
-}
-
-export interface GearVecState {
-  g1?: GearState;
-  g2?: GearState;
-  g3?: GearState;
-  g4?: GearState;
-  g5?: GearState;
-  gx?: GearState;
+export interface NightFleetConditions {
+  night_contact_rank?: ContactRank | null;
+  starshell_index?: number | null;
+  searchlight_index?: number | null;
+  activates_large_searchlight?: boolean;
 }
 
-export interface GearState {
-  id?: string;
-  gear_id: number;
-  exp?: number;
-  stars?: number;
+export interface NightConditions {
+  player?: NightFleetConditions;
+  enemy?: NightFleetConditions;
 }
 
-declare namespace SpeedGroup {
-  export type A = "A";
-  export type B1 = "B1";
-  export type B2 = "B2";
-  export type C = "C";
+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 SpeedGroup =
-  | SpeedGroup.A
-  | SpeedGroup.B1
-  | SpeedGroup.B2
-  | SpeedGroup.C;
-
-export type SlotSizeVec = (number | null)[];
-
 export interface MasterGear {
   gear_id: number;
   name: string;
@@ -1344,102 +983,15 @@ export interface MasterGear {
   fleet_anti_air_resist?: number;
 }
 
-export type GearTypeIdArray = [number, number, number, number, number];
-
-declare namespace ShipType {
-  export type Unknown = "Unknown";
-  export type DE = "DE";
-  export type DD = "DD";
-  export type CL = "CL";
-  export type CLT = "CLT";
-  export type CA = "CA";
-  export type CAV = "CAV";
-  export type CVL = "CVL";
-  export type FBB = "FBB";
-  export type BB = "BB";
-  export type BBV = "BBV";
-  export type CV = "CV";
-  export type XBB = "XBB";
-  export type SS = "SS";
-  export type SSV = "SSV";
-  export type AP = "AP";
-  export type AV = "AV";
-  export type LHA = "LHA";
-  export type CVB = "CVB";
-  export type AR = "AR";
-  export type AS = "AS";
-  export type CT = "CT";
-  export type AO = "AO";
-}
-
-export type ShipType =
-  | ShipType.Unknown
-  | ShipType.DE
-  | ShipType.DD
-  | ShipType.CL
-  | ShipType.CLT
-  | ShipType.CA
-  | ShipType.CAV
-  | ShipType.CVL
-  | ShipType.FBB
-  | ShipType.BB
-  | ShipType.BBV
-  | ShipType.CV
-  | ShipType.XBB
-  | ShipType.SS
-  | ShipType.SSV
-  | ShipType.AP
-  | ShipType.AV
-  | ShipType.LHA
-  | ShipType.CVB
-  | ShipType.AR
-  | ShipType.AS
-  | ShipType.CT
-  | ShipType.AO;
-
-declare namespace ShipCategory {
-  export type Battleship = "Battleship";
-  export type AircraftCarrier = "AircraftCarrier";
-  export type HeavyCruiser = "HeavyCruiser";
-  export type LightCruiser = "LightCruiser";
-  export type Destroyer = "Destroyer";
-  export type CoastalDefenseShip = "CoastalDefenseShip";
-  export type Submarine = "Submarine";
-  export type AuxiliaryShip = "AuxiliaryShip";
-}
-
-export type ShipCategory =
-  | ShipCategory.Battleship
-  | ShipCategory.AircraftCarrier
-  | ShipCategory.HeavyCruiser
-  | ShipCategory.LightCruiser
-  | ShipCategory.Destroyer
-  | ShipCategory.CoastalDefenseShip
-  | ShipCategory.Submarine
-  | ShipCategory.AuxiliaryShip;
-
-export interface FleetCutinAnalysis {
-  shelling: FleetCutinReport<ShellingStyle>[];
-  night: FleetCutinReport<NightAttackStyle>[];
-}
-
-export interface FleetCutinReport<T> {
-  cutin: FleetCutin;
-  rate: number | null;
-  formation: Formation;
-  attacks: FleetCutinAttackReport<T>[];
-}
-
-export interface FleetCutinAttackReport<T> extends AttackReport<T> {
-  index: number;
-  ship_id: number;
-  power_mod: number;
-}
-
-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;
 }
 
 /**
@@ -1571,16 +1123,16 @@ export class Comp {
   get_fleet_id(ft: FleetType): string | undefined;
   /**
    * @param {FleetType} ft
-   * @param {string} key
+   * @param {ShipKey} key
    * @returns {Ship | undefined}
    */
-  get_ship_with_clone(ft: FleetType, key: string): Ship | undefined;
+  get_ship_with_clone(ft: FleetType, key: ShipKey): Ship | undefined;
   /**
    * @param {FleetType} ft
-   * @param {string} key
+   * @param {ShipKey} key
    * @returns {string | undefined}
    */
-  get_ship_entity_id(ft: FleetType, key: string): string | undefined;
+  get_ship_entity_id(ft: FleetType, key: ShipKey): string | undefined;
   /**
    * @param {string} id
    * @returns {Ship | undefined}
@@ -1623,6 +1175,11 @@ export class Comp {
    * @returns {ShipConditions}
    */
   get_ship_conditions(ship: Ship, formation?: Formation): ShipConditions;
+  /**
+   * @param {FleetType} fleet_type
+   * @returns {number | undefined}
+   */
+  fleet_los_mod(fleet_type: FleetType): number | undefined;
   /**
    */
   boss_sup?: Fleet;
@@ -1756,10 +1313,10 @@ export class Fleet {
    */
   count_ships(): number;
   /**
-   * @param {string} key
+   * @param {ShipKey} key
    * @returns {Ship | undefined}
    */
-  get_ship(key: string): Ship | undefined;
+  get_ship(key: ShipKey): Ship | undefined;
   /**
    * @param {AirWaveType} air_type
    * @returns {number | undefined}
@@ -2013,81 +1570,33 @@ export class Gear {
 }
 /**
  */
-export class IBonuses {
+export class Org {
   free(): void;
   /**
+   * @returns {string | undefined}
    */
-  asw_accuracy: number;
-  /**
-   */
-  asw_power: number;
-  /**
-   */
-  carrier_shelling_power: number;
-  /**
-   */
-  contact_selection: number;
-  /**
-   */
-  defense_power: number;
-  /**
-   */
-  elos: number;
-  /**
-   */
-  fighter_power: number;
-  /**
-   */
-  fleet_anti_air: number;
-  /**
-   */
-  night_accuracy: number;
-  /**
-   */
-  night_power: number;
-  /**
-   */
-  shelling_accuracy: number;
-  /**
-   */
-  shelling_power: number;
-  /**
-   */
-  ship_anti_air: number;
-  /**
-   */
-  torpedo_accuracy: number;
-  /**
-   */
-  torpedo_evasion: number;
+  first_ship_id(): string | undefined;
   /**
+   * @param {FleetKey} fleet_key
+   * @param {ShipKey} ship_key
+   * @returns {number | undefined}
    */
-  torpedo_power: number;
-}
-/**
- */
-export class Org {
-  free(): void;
+  get_ship_mid(fleet_key: FleetKey, ship_key: ShipKey): number | undefined;
   /**
-   * @param {Role} role
-   * @returns {number}
+   * @param {FleetKey} fleet_key
+   * @param {ShipKey} ship_key
+   * @returns {string | undefined}
    */
-  fleet_len(role: Role): number;
+  get_ship_eid(fleet_key: FleetKey, ship_key: ShipKey): string | undefined;
   /**
-   * @param {Role} role
-   * @param {string} key
-   * @returns {string | undefined}
+   * @param {FleetKey} key
+   * @returns {string}
    */
-  get_ship_entity_id(role: Role, key: string): string | undefined;
+  get_fleet_id(key: FleetKey): string;
   /**
    * @returns {(string)[]}
    */
   air_squadron_ids(): string[];
-  /**
-   * @param {Role} role
-   * @returns {number | undefined}
-   */
-  fleet_los_mod(role: Role): number | undefined;
   /**
    * @returns {Uint16Array}
    */
@@ -2097,35 +1606,35 @@ export class Org {
    */
   escort_ship_ids(): Uint16Array;
   /**
-   * @param {string} key
+   * @param {FleetKey} key
    * @returns {Fleet}
    */
-  clone_fleet(key: string): Fleet;
+  clone_fleet(key: FleetKey): Fleet;
   /**
-   * @param {Role} role
-   * @param {string} key
+   * @param {FleetKey} fleet_key
+   * @param {ShipKey} ship_key
    * @returns {Ship | undefined}
    */
-  get_ship(role: Role, key: string): Ship | undefined;
+  clone_ship(fleet_key: FleetKey, ship_key: ShipKey): Ship | undefined;
   /**
    * @param {string} id
    * @returns {Ship | undefined}
    */
   get_ship_by_id(id: string): Ship | undefined;
   /**
-   * @param {Role} role
-   * @returns {string}
+   * @param {FleetKey} key
+   * @returns {(string)[]}
    */
-  get_fleet_id_by_role(role: Role): string;
+  ship_keys(key: FleetKey): string[];
   /**
    * @returns {Comp}
    */
   create_comp(): Comp;
   /**
-   * @param {string} key
+   * @param {FleetKey} key
    * @returns {Comp}
    */
-  create_comp_by_key(key: string): Comp;
+  create_comp_by_key(key: FleetKey): Comp;
   /**
    * @param {string} key
    * @returns {AirSquadron}
@@ -2170,12 +1679,24 @@ export class Org {
    */
   high_altitude_interception_power(): number;
   /**
-   * @returns {Org}
+   * @param {string} id
+   * @param {number} x
+   * @param {number} y
+   * @returns {MoveShipPayload | undefined}
+   */
+  create_move_ship_payload(
+    id: string,
+    x: number,
+    y: number
+  ): MoveShipPayload | undefined;
+  /**
+   * @param {FleetKey} key
+   * @returns {FleetType | undefined}
    */
-  static default(): Org;
+  get_fleet_type(key: FleetKey): FleetType | undefined;
   /**
    */
-  boss_sup?: string;
+  readonly boss_sup: FleetKey | undefined;
   /**
    */
   readonly hash: bigint;
@@ -2190,15 +1711,29 @@ export class Org {
   readonly org_type: OrgType;
   /**
    */
-  route_sup?: string;
+  readonly route_sup: FleetKey | undefined;
   /**
    */
-  sortie: string;
+  readonly sortie: FleetKey;
 }
 /**
  */
 export class Ship {
   free(): void;
+  /**
+   * @returns {number | undefined}
+   */
+  state_day_gunfit_accuracy(): number | undefined;
+  /**
+   * @returns {number | undefined}
+   */
+  state_night_gunfit_accuracy(): number | undefined;
+  /**
+   * フィット砲補正
+   * @param {boolean} is_night
+   * @returns {number}
+   */
+  gunfit_accuracy(is_night: boolean): number;
   /**
    * @returns {Ship}
    */
@@ -2404,20 +1939,6 @@ export class Ship {
    * @returns {number | undefined}
    */
   ohko_power(): number | undefined;
-  /**
-   * @returns {number | undefined}
-   */
-  state_day_gunfit_accuracy(): number | undefined;
-  /**
-   * @returns {number | undefined}
-   */
-  state_night_gunfit_accuracy(): number | undefined;
-  /**
-   * フィット砲補正
-   * @param {boolean} is_night
-   * @returns {number}
-   */
-  gunfit_accuracy(is_night: boolean): number;
   /**
    */
   readonly accuracy: number;