fleethub-core 1.8.8 → 1.8.11

package/node/fleethub_core.d.ts

@@ -15,62 +15,143 @@ export interface ShipPosition {
   index?: number;
 }
 
-export interface BattleDefinitions {
-  formation: Record<Formation, NestedFormationDef>;
-  anti_air_cutin: Record<number, AntiAirCutinDef>;
-  day_cutin: Record<DayCutin, DayCutinDef>;
-  night_cutin: Record<NightCutin, NightCutinDef>;
+export interface CompMeta {
+  fleets: Record<FleetType, FleetMeta>;
 }
 
-export interface NightCutinDef {
-  tag: NightCutin;
-  hits: number;
-  type_factor: number | null;
-  power_mod: number | null;
-  accuracy_mod: number | null;
+export interface FleetMeta {
+  id: string;
+  len: number;
+  ships: [string, ShipMeta | null][];
 }
 
-export interface DayCutinDef {
-  tag: DayCutin;
-  hits: number;
-  type_factor: number | null;
-  power_mod: number | null;
-  accuracy_mod: number | null;
+export interface ShipMeta {
+  id: string;
+  ship_id: number;
 }
 
-export interface AntiAirCutinDef {
-  id: number;
-  type_factor: number | null;
-  multiplier: number | null;
-  guaranteed: number | null;
-  sequential: boolean | null;
+export type Engagement = "GreenT" | "Parallel" | "HeadOn" | "RedT";
+
+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 FhResult<T> = { Ok: T } | { Err: string };
+
+export interface NodeAttackAnalysis2 {
+  data: AttackAnalysis[];
 }
 
-export type NestedFormationDef =
-  | FormationDef
-  | { top_half: FormationDef; bottom_half: FormationDef };
+export type CompiledEvaler = string;
 
-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 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 interface FormationCombatModifiersDef {
-  power_mod?: number;
-  accuracy_mod?: number;
+export interface AirSquadronState extends GearVecState, SlotSizeVecState {
+  id?: string;
+  mode?: AirSquadronMode;
+}
+
+export type AirSquadronMode = "Sortie" | "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 type CompiledEvaler = string;
+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 GearState {
+  id?: string;
+  gear_id: number;
+  exp?: number;
+  stars?: number;
+}
 
 export type SpeedGroup = "A" | "B1" | "B2" | "C";
 
+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;
@@ -79,6 +160,22 @@ export interface ActionReport<T> {
 
 export type GearTypeIdArray = [number, number, number, number, number];
 
+export type SpecialEnemyType =
+  | "None"
+  | "SoftSkinned"
+  | "Pillbox"
+  | "IsolatedIsland"
+  | "SupplyDepot"
+  | "NewSupplyDepot"
+  | "HarbourSummerPrincess"
+  | "PtImp"
+  | "BattleshipSummerPrincess"
+  | "HeavyCruiserSummerPrincess";
+
+export type Align = "Left" | "Right";
+
+export type Side = "Player" | "Enemy";
+
 export type ShipType =
   | "Unknown"
   | "DE"
@@ -114,6 +211,54 @@ export type ShipCategory =
   | "Submarine"
   | "AuxiliaryShip";
 
+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 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 MoveShipPayload {
+  current: [string, string, ShipKey];
+  target: [string | null, string, ShipKey];
+}
+
 export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
 
 export type NightCutinLike = NightCutin | FleetCutin;
@@ -157,24 +302,6 @@ export type DayCutin =
   | "BBA"
   | "BA";
 
-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 type ContactRank = "Rank1" | "Rank2" | "Rank3";
 
 export type AirWaveType = "Jet" | "LandBase" | "Carrier";
@@ -191,16 +318,7 @@ export interface SimulatorResultItem {
   damage_state_map: Record<DamageState, number>;
 }
 
-export type SpecialEnemyType =
-  | "None"
-  | "SoftSkinned"
-  | "Pillbox"
-  | "IsolatedIsland"
-  | "SupplyDepot"
-  | "HarbourSummerPrincess"
-  | "PtImp"
-  | "BattleshipSummerPrincess"
-  | "HeavyCruiserSummerPrincess";
+export type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
 
 export type GearCategory =
   | "Fighter"
@@ -280,6 +398,15 @@ export type GearType =
 
 export type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
 
+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[];
@@ -301,57 +428,6 @@ export interface MasterAttrRule<T> {
   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 NodeAttackAnalyzerShipConfig extends NightFleetConditions {
   formation?: Formation;
 }
@@ -368,19 +444,6 @@ export interface NodeAttackAnalysis {
   right: AttackAnalysis;
 }
 
-export type Side = "Player" | "Enemy";
-
-export type Role = "Main" | "Escort";
-
-export type Engagement = "GreenT" | "Parallel" | "HeadOn" | "RedT";
-
-export interface ShipAnalyzerConfig {
-  air_state?: AirState;
-  engagement?: Engagement;
-  left?: AttackAnalyzerShipConfig;
-  right?: AttackAnalyzerShipConfig;
-}
-
 export interface EBonuses {
   firepower: number;
   torpedo: number;
@@ -437,6 +500,7 @@ export type ShipAttr =
   | "IsolatedIsland"
   | "HarbourSummerPrincess"
   | "SupplyDepot"
+  | "NewSupplyDepot"
   | "PtImp"
   | "BattleshipSummerPrincess"
   | "HeavyCruiserSummerPrincess";
@@ -449,52 +513,63 @@ export type OrgType =
   | "EnemySingle"
   | "EnemyCombined";
 
-export interface SupportShellingSimulatorParams {
-  attacker_formation?: Formation;
-  target_formation?: Formation;
-  engagement: Engagement;
+export interface BattleDefinitions {
+  formation: Record<Formation, NestedFormationDef>;
+  anti_air_cutin: Record<number, AntiAirCutinDef>;
+  day_cutin: Record<DayCutin, DayCutinDef>;
+  night_cutin: Record<NightCutin, NightCutinDef>;
+}
+
+export interface NightCutinDef {
+  tag: NightCutin;
+  hits: number;
+  type_factor: number | null;
+  power_mod: number | null;
+  accuracy_mod: number | null;
+}
+
+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 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 type NestedFormationDef =
+  | FormationDef
+  | { top_half: FormationDef; bottom_half: FormationDef };
 
-export interface MasterIBonusRule {
-  expr: CompiledEvaler;
-  formula: CompiledEvaler;
+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 CompAntiAirAnalysis {
-  fleet_adjusted_anti_air: number;
-  ships: AntiAirReport[];
-  anti_air_cutin_chance: [number, number][];
+export interface FormationCombatModifiersDef {
+  power_mod?: number;
+  accuracy_mod?: number;
+  evasion_mod?: 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 ShipAnalyzerConfig {
+  air_state?: AirState;
+  engagement?: Engagement;
+  left?: AttackAnalyzerShipConfig;
+  right?: AttackAnalyzerShipConfig;
 }
 
 export type GearAttr =
@@ -529,6 +604,32 @@ 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 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 FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
 
 export interface SupportShellingStyle {
@@ -584,7 +685,7 @@ export interface AttackPowerParams {
   precap_mod: AttackPowerModifier;
   postcap_mod: AttackPowerModifier;
   ap_shell_mod: number | null;
-  carrier_power: number | null;
+  aerial_power: number | null;
   proficiency_critical_mod: number;
   armor_penetration: number;
   remaining_ammo_mod: number;
@@ -843,104 +944,6 @@ 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>;
-
-export type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "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;
-}
-
-export type AirSquadronMode = "Sortie" | "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 GearState {
-  id?: string;
-  gear_id: number;
-  exp?: number;
-  stars?: number;
-}
-
-export type SlotSizeVec = (number | null)[];
-
 export interface NightFleetConditions {
   night_contact_rank?: ContactRank | null;
   starshell_index?: number | null;
@@ -988,6 +991,17 @@ export interface MasterGear {
   fleet_anti_air_resist?: number;
 }
 
+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 class AirSquadron {
@@ -1062,6 +1076,19 @@ export class Analyzer {
     right_comp: Comp,
     right_ship: Ship
   ): NodeAttackAnalysis;
+  /**
+   * @param {NodeAttackAnalyzerConfig} config
+   * @param {Comp} left_comp
+   * @param {Comp} right_comp
+   * @param {string} attacker_id
+   * @returns {NodeAttackAnalysis2 | undefined}
+   */
+  analyze_node_attack2(
+    config: NodeAttackAnalyzerConfig,
+    left_comp: Comp,
+    right_comp: Comp,
+    attacker_id: string
+  ): NodeAttackAnalysis2 | undefined;
   /**
    * @param {Comp} comp
    * @param {CompAnalyzerConfig} config
@@ -1117,16 +1144,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}
@@ -1169,6 +1196,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;
@@ -1302,10 +1334,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}
@@ -1559,81 +1591,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}
    */
@@ -1643,35 +1627,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}
@@ -1716,12 +1700,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;
@@ -1736,10 +1732,10 @@ export class Org {
   readonly org_type: OrgType;
   /**
    */
-  route_sup?: string;
+  readonly route_sup: FleetKey | undefined;
   /**
    */
-  sortie: string;
+  readonly sortie: FleetKey;
 }
 /**
  */
@@ -1884,6 +1880,10 @@ export class Ship {
    * @returns {boolean}
    */
   is_pt_imp(): boolean;
+  /**
+   * @returns {boolean}
+   */
+  is_attackable_by_torpedo(): boolean;
   /**
    * @param {number} index
    * @returns {number | undefined}