fleethub-core 1.8.9 → 1.8.12

package/pkg/fleethub_core.d.ts

@@ -1,15 +1,13 @@
 /* tslint:disable */
 /* eslint-disable */
-/**
- */
-export function set_panic_hook(): void;
 /**
  * @param {ShipConditions} value
  * @returns {ShipConditions}
  */
 export function parse_ship_conditions(value: ShipConditions): ShipConditions;
-export type Role = "Main" | "Escort";
-
+/**
+ */
+export function set_panic_hook(): void;
 export interface ShipPosition {
   org_type?: OrgType;
   fleet_type?: FleetType;
@@ -34,58 +32,6 @@ export interface ShipMeta {
 
 export type Engagement = "GreenT" | "Parallel" | "HeadOn" | "RedT";
 
-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 type NestedFormationDef =
-  | FormationDef
-  | { top_half: FormationDef; bottom_half: FormationDef };
-
-export interface FormationDef {
-  tag: Formation;
-  protection_rate: number | null;
-  fleet_anti_air_mod: number;
-  shelling: FormationCombatModifiersDef;
-  torpedo: FormationCombatModifiersDef;
-  asw: FormationCombatModifiersDef;
-  night: FormationCombatModifiersDef;
-  support_shelling: FormationCombatModifiersDef;
-}
-
-export interface FormationCombatModifiersDef {
-  power_mod?: number;
-  accuracy_mod?: number;
-  evasion_mod?: number;
-}
-
 export type TorpedoAttackType = null;
 
 export type NightPhaseAttackType =
@@ -111,19 +57,146 @@ export type ShellingType = "Normal" | "Carrier";
 
 export type AswAttackType = "DepthCharge" | "Aircraft";
 
-export type AirStateRank = "Rank0" | "Rank1" | "Rank2" | "Rank3";
+export type FhResult<T> = { Ok: T } | { Err: string };
 
-export type AirState =
-  | "AirSupremacy"
-  | "AirSuperiority"
-  | "AirParity"
-  | "AirDenial"
-  | "AirIncapability";
+export interface NodeAttackAnalysis2 {
+  data: AttackAnalysis[];
+}
 
 export type CompiledEvaler = string;
 
+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 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 SpeedGroup = "A" | "B1" | "B2" | "C";
 
+export type SlotSizeVec = (number | null)[];
+
+export interface NightFleetConditions {
+  night_contact_rank?: ContactRank | null;
+  starshell_index?: number | null;
+  searchlight_index?: number | null;
+  activates_large_searchlight?: boolean;
+}
+
+export interface NightConditions {
+  player?: NightFleetConditions;
+  enemy?: NightFleetConditions;
+}
+
+export interface BattleConditions {
+  org_type: OrgType;
+  role: Role;
+  ship_index: number;
+  fleet_len: number;
+  formation: Formation;
+  fleet_los_mod: number | null;
+  night_conditions: NightFleetConditions;
+}
+
+export interface MasterGear {
+  gear_id: number;
+  name: string;
+  types: GearTypeIdArray;
+  special_type?: number;
+  max_hp?: number;
+  firepower?: number;
+  armor?: number;
+  torpedo?: number;
+  anti_air?: number;
+  speed?: number;
+  bombing?: number;
+  asw?: number;
+  los?: number;
+  luck?: number;
+  accuracy?: number;
+  evasion?: number;
+  range?: number;
+  radius?: number;
+  cost?: number;
+  improvable?: boolean;
+  ship_anti_air_resist?: number;
+  fleet_anti_air_resist?: number;
+}
+
 export interface ActionReport<T> {
   data: Record<string, AttackReport<T>>;
   damage_state_density: Histogram<DamageState, number> | null;
@@ -132,6 +205,10 @@ export interface ActionReport<T> {
 
 export type GearTypeIdArray = [number, number, number, number, number];
 
+export type Align = "Left" | "Right";
+
+export type Side = "Player" | "Enemy";
+
 export type ShipType =
   | "Unknown"
   | "DE"
@@ -167,48 +244,7 @@ export type ShipCategory =
   | "Submarine"
   | "AuxiliaryShip";
 
-export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
-
-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 type Role = "Main" | "Escort";
 
 export interface MasterIBonuses {
   shelling_power: MasterIBonusRule[];
@@ -253,16 +289,53 @@ export interface FleetCutinAttackReport<T> extends AttackReport<T> {
   power_mod: number;
 }
 
-export type SpecialEnemyType =
-  | "None"
-  | "SoftSkinned"
-  | "Pillbox"
-  | "IsolatedIsland"
-  | "SupplyDepot"
-  | "HarbourSummerPrincess"
-  | "PtImp"
-  | "BattleshipSummerPrincess"
-  | "HeavyCruiserSummerPrincess";
+export interface MoveShipPayload {
+  current: [string, string, ShipKey];
+  target: [string | null, string, ShipKey];
+}
+
+export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
+
+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 type ContactRank = "Rank1" | "Rank2" | "Rank3";
 
@@ -280,6 +353,8 @@ export interface SimulatorResultItem {
   damage_state_map: Record<DamageState, number>;
 }
 
+export type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
+
 export type GearCategory =
   | "Fighter"
   | "Bomber"
@@ -358,7 +433,14 @@ export type GearType =
 
 export type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
 
-export type FhResult<T> = { Ok: T } | { Err: string };
+export type AirStateRank = "Rank0" | "Rank1" | "Rank2" | "Rank3";
+
+export type AirState =
+  | "AirSupremacy"
+  | "AirSuperiority"
+  | "AirParity"
+  | "AirDenial"
+  | "AirIncapability";
 
 export interface MasterData extends MasterBattleDefinitions {
   created_at: number;
@@ -437,33 +519,10 @@ export interface GearInput {
 
 export type GearVecInput = GearInput[];
 
-export type Side = "Player" | "Enemy";
-
 export interface ShipConditions extends ShipPosition {
   formation?: Formation;
 }
 
-export type OrgType =
-  | "Single"
-  | "CarrierTaskForce"
-  | "SurfaceTaskForce"
-  | "TransportEscort"
-  | "EnemySingle"
-  | "EnemyCombined";
-
-export interface SupportShellingSimulatorParams {
-  attacker_formation?: Formation;
-  target_formation?: Formation;
-  engagement: Engagement;
-}
-
-export interface ShipAnalyzerConfig {
-  air_state?: AirState;
-  engagement?: Engagement;
-  left?: AttackAnalyzerShipConfig;
-  right?: AttackAnalyzerShipConfig;
-}
-
 export type ShipAttr =
   | "Unknown"
   | "Abyssal"
@@ -476,10 +535,78 @@ export type ShipAttr =
   | "IsolatedIsland"
   | "HarbourSummerPrincess"
   | "SupplyDepot"
+  | "NewSupplyDepot"
   | "PtImp"
   | "BattleshipSummerPrincess"
   | "HeavyCruiserSummerPrincess";
 
+export type OrgType =
+  | "Single"
+  | "CarrierTaskForce"
+  | "SurfaceTaskForce"
+  | "TransportEscort"
+  | "EnemySingle"
+  | "EnemyCombined";
+
+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 type NestedFormationDef =
+  | FormationDef
+  | { top_half: FormationDef; bottom_half: FormationDef };
+
+export interface FormationDef {
+  tag: Formation;
+  protection_rate: number | null;
+  fleet_anti_air_mod: number;
+  shelling: FormationCombatModifiersDef;
+  torpedo: FormationCombatModifiersDef;
+  asw: FormationCombatModifiersDef;
+  night: FormationCombatModifiersDef;
+  support_shelling: FormationCombatModifiersDef;
+}
+
+export interface FormationCombatModifiersDef {
+  power_mod?: number;
+  accuracy_mod?: number;
+  evasion_mod?: number;
+}
+
+export interface ShipAnalyzerConfig {
+  air_state?: AirState;
+  engagement?: Engagement;
+  left?: AttackAnalyzerShipConfig;
+  right?: AttackAnalyzerShipConfig;
+}
+
 export type GearAttr =
   | "Unknown"
   | "Abyssal"
@@ -512,6 +639,14 @@ 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[];
@@ -569,28 +704,6 @@ export interface ShellingStyle {
   hits: number;
 }
 
-export interface CustomPowerModifiers {
-  precap_mod?: AttackPowerModifier;
-  postcap_mod?: AttackPowerModifier;
-  basic_power_mod?: AttackPowerModifier;
-}
-
-export interface SpecialEnemyModifiers {
-  precap_general_mod: AttackPowerModifier;
-  stype_mod: AttackPowerModifier;
-  landing_craft_synergy_mod: AttackPowerModifier;
-  toku_daihatsu_tank_mod: AttackPowerModifier;
-  m4a1dd_mod: AttackPowerModifier;
-  honi_mod: AttackPowerModifier;
-  postcap_general_mod: AttackPowerModifier;
-  pt_mod: AttackPowerModifier;
-}
-
-export interface AttackPowerModifier {
-  a?: number;
-  b?: number;
-}
-
 export interface AttackPower {
   precap: number;
   is_capped: boolean;
@@ -670,6 +783,18 @@ export interface AttackAnalyzerShipConfig
 
 export type Histogram<K, V> = Partial<Record<K, V>>;
 
+export type SpecialEnemyType =
+  | "None"
+  | "SoftSkinned"
+  | "Pillbox"
+  | "IsolatedIsland"
+  | "SupplyDepot"
+  | "NewSupplyDepot"
+  | "HarbourSummerPrincess"
+  | "PtImp"
+  | "BattleshipSummerPrincess"
+  | "HeavyCruiserSummerPrincess";
+
 export type Formation = SingleFormation | CombinedFormation;
 
 export type CombinedFormation =
@@ -686,11 +811,26 @@ export type SingleFormation =
   | "LineAbreast"
   | "Vanguard";
 
-export interface MasterBattleDefinitions {
-  formation: NestedFormationDef[];
-  anti_air_cutin: AntiAirCutinDef[];
-  day_cutin: DayCutinDef[];
-  night_cutin: NightCutinDef[];
+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 HitRate {
@@ -817,6 +957,13 @@ export interface EquipStype {
   equip_type: number[];
 }
 
+export interface MasterBattleDefinitions {
+  formation: NestedFormationDef[];
+  anti_air_cutin: AntiAirCutinDef[];
+  day_cutin: DayCutinDef[];
+  night_cutin: NightCutinDef[];
+}
+
 export interface CompAnalyzerConfig {
   engagement: Engagement;
   formation: Formation;
@@ -855,140 +1002,6 @@ export interface AttackReport<T> {
   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;
-  searchlight_index?: number | null;
-  activates_large_searchlight?: boolean;
-}
-
-export interface NightConditions {
-  player?: NightFleetConditions;
-  enemy?: NightFleetConditions;
-}
-
-export interface BattleConditions {
-  org_type: OrgType;
-  role: Role;
-  ship_index: number;
-  fleet_len: number;
-  formation: Formation;
-  fleet_los_mod: number | null;
-  night_conditions: NightFleetConditions;
-}
-
-export interface MasterGear {
-  gear_id: number;
-  name: string;
-  types: GearTypeIdArray;
-  special_type?: number;
-  max_hp?: number;
-  firepower?: number;
-  armor?: number;
-  torpedo?: number;
-  anti_air?: number;
-  speed?: number;
-  bombing?: number;
-  asw?: number;
-  los?: number;
-  luck?: number;
-  accuracy?: number;
-  evasion?: number;
-  range?: number;
-  radius?: number;
-  cost?: number;
-  improvable?: boolean;
-  ship_anti_air_resist?: number;
-  fleet_anti_air_resist?: number;
-}
-
 /**
  */
 export class AirSquadron {
@@ -1063,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
@@ -1118,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}
@@ -1170,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;
@@ -1303,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}
@@ -1563,11 +1594,26 @@ export class Gear {
 export class Org {
   free(): void;
   /**
-   * @param {Role} role
-   * @param {string} key
    * @returns {string | undefined}
    */
-  get_ship_entity_id(role: Role, key: string): string | undefined;
+  first_ship_id(): string | undefined;
+  /**
+   * @param {FleetKey} fleet_key
+   * @param {ShipKey} ship_key
+   * @returns {number | undefined}
+   */
+  get_ship_mid(fleet_key: FleetKey, ship_key: ShipKey): number | undefined;
+  /**
+   * @param {FleetKey} fleet_key
+   * @param {ShipKey} ship_key
+   * @returns {string | undefined}
+   */
+  get_ship_eid(fleet_key: FleetKey, ship_key: ShipKey): string | undefined;
+  /**
+   * @param {FleetKey} key
+   * @returns {string}
+   */
+  get_fleet_id(key: FleetKey): string;
   /**
    * @returns {(string)[]}
    */
@@ -1581,24 +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 {FleetKey} fleet_key
+   * @param {ShipKey} ship_key
+   * @returns {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 {FleetKey} key
+   * @returns {(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}
@@ -1642,9 +1699,25 @@ export class Org {
    * @returns {number}
    */
   high_altitude_interception_power(): number;
+  /**
+   * @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}
+   */
+  get_fleet_type(key: FleetKey): FleetType | undefined;
   /**
    */
-  boss_sup?: string;
+  readonly boss_sup: FleetKey | undefined;
   /**
    */
   readonly hash: bigint;
@@ -1659,10 +1732,10 @@ export class Org {
   readonly org_type: OrgType;
   /**
    */
-  route_sup?: string;
+  readonly route_sup: FleetKey | undefined;
   /**
    */
-  sortie: string;
+  readonly sortie: FleetKey;
 }
 /**
  */
@@ -1807,6 +1880,14 @@ export class Ship {
    * @returns {boolean}
    */
   is_pt_imp(): boolean;
+  /**
+   * @returns {SpecialEnemyType}
+   */
+  special_enemy_type(): SpecialEnemyType;
+  /**
+   * @returns {boolean}
+   */
+  is_attackable_by_torpedo(): boolean;
   /**
    * @param {number} index
    * @returns {number | undefined}