fleethub-core 1.7.1 → 1.7.5

package/node/fleethub_core.d.ts

@@ -54,16 +54,43 @@ export type DayCutin =
   | "Zuiun"
   | "AirSea";
 
-export interface ShellingSupportSimulatorParams {
-  attacker_formation: Formation;
-  target_formation: Formation;
-  engagement: Engagement;
-  custom_mods: CustomModifiers;
+export type ShellingAttackType = "Normal" | "Carrier";
+
+export interface FleetCutinAnalysis {
+  shelling: FleetCutinInfo[];
+  night: FleetCutinInfo[];
 }
 
-export type ShellingAttackType = "Normal" | "Carrier";
+export interface FleetCutinInfo {
+  cutin: FleetCutin;
+  rate: number | null;
+  formation: Formation;
+  items: FleetCutinInfoItem[];
+}
 
-export type AirWaveType = "Jet" | "LandBase" | "Carrier";
+export interface FleetCutinInfoItem {
+  ship_id: number;
+  cutin: FleetCutin;
+  fleet_cutin_mod: number;
+  stats: AttackStats;
+}
+
+export type SpecialEnemyType =
+  | "None"
+  | "SoftSkinned"
+  | "Pillbox"
+  | "IsolatedIsland"
+  | "SupplyDepot"
+  | "HarbourSummerPrincess"
+  | "PtImp"
+  | "BattleshipSummerPrincess"
+  | "HeavyCruiserSummerPrincess";
+
+export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
+
+export type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
+
+export type SpeedGroup = "A" | "B1" | "B2" | "C";
 
 export type AswAttackType = "DepthCharge" | "Aircraft";
 
@@ -83,22 +110,9 @@ export type FleetCutin =
   | "Yamato2ShipCutin"
   | "Yamato3ShipCutin";
 
-export interface WarfareContext {
-  attacker_env: WarfareShipEnvironment;
-  target_env: WarfareShipEnvironment;
-  engagement: Engagement;
-  air_state: AirState;
-  custom_mods: CustomModifiers;
-}
+export type AirWaveType = "Jet" | "LandBase" | "Carrier";
 
-export interface WarfareShipEnvironment {
-  org_type: OrgType;
-  role: Role;
-  ship_index: number;
-  fleet_len: number;
-  formation: Formation;
-  fleet_los_mod: number | null;
-}
+export type NumMap<K, V> = Partial<Record<K, V>>;
 
 export type Role = "Main" | "Escort";
 
@@ -117,52 +131,6 @@ export interface ShipMeta {
   ship_id: 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 | null;
-  armor_penetration: number;
-  remaining_ammo_mod: number;
-  special_enemy_mods: SpecialEnemyModifiers;
-  custom_mods: CustomModifiers;
-}
-
-export interface CustomModifiers {
-  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 MasterData {
   gears: MasterGear[];
   gear_attrs: MasterAttrRule<GearAttr>[];
@@ -189,6 +157,22 @@ export interface MasterAttrRule<T> {
   expr: string;
 }
 
+export interface WarfareContext {
+  attacker_env: WarfareShipEnvironment;
+  target_env: WarfareShipEnvironment;
+  engagement: Engagement;
+  air_state: AirState;
+}
+
+export interface WarfareShipEnvironment {
+  org_type: OrgType;
+  role: Role;
+  ship_index: number;
+  fleet_len: number;
+  formation: Formation;
+  fleet_los_mod: number | null;
+}
+
 export interface CompDayCutinRateInfo {
   main: FleetDayCutinRateInfo;
   escort: FleetDayCutinRateInfo | null;
@@ -211,8 +195,6 @@ export interface DayCutinRateInfo {
   total_cutin_rate: number | null;
 }
 
-export type NumMap<K, V> = Partial<Record<K, V>>;
-
 export type GearCategory =
   | "Fighter"
   | "Bomber"
@@ -339,6 +321,12 @@ export type AirState =
   | "AirDenial"
   | "AirIncapability";
 
+export interface ShellingSupportSimulatorParams {
+  attacker_formation: Formation;
+  target_formation: Formation;
+  engagement: Engagement;
+}
+
 export interface MasterIBonuses {
   shelling_power: MasterIBonusRule[];
   carrier_shelling_power: MasterIBonusRule[];
@@ -369,25 +357,6 @@ export interface NightSituation {
   searchlight: boolean;
 }
 
-export interface FleetCutinAnalysis {
-  shelling: FleetCutinInfo[];
-  night: FleetCutinInfo[];
-}
-
-export interface FleetCutinInfo {
-  cutin: FleetCutin;
-  rate: number | null;
-  formation: Formation;
-  items: FleetCutinInfoItem[];
-}
-
-export interface FleetCutinInfoItem {
-  ship_id: number;
-  cutin: FleetCutin;
-  fleet_cutin_mod: number;
-  stats: AttackStats;
-}
-
 export interface DamageInfo {
   miss_damage_min: number;
   miss_damage_max: number;
@@ -433,7 +402,62 @@ export type SingleFormation =
   | "LineAbreast"
   | "Vanguard";
 
-export type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
+export interface CustomPowerModifiers {
+  precap_mod?: AttackPowerModifier;
+  postcap_mod?: AttackPowerModifier;
+  basic_power_mod?: AttackPowerModifier;
+}
+
+export interface SpecialEnemyModifiers {
+  precap_general_mod: AttackPowerModifier;
+  stype_mod: AttackPowerModifier;
+  landing_craft_synergy_mod: AttackPowerModifier;
+  toku_daihatsu_tank_mod: AttackPowerModifier;
+  m4a1dd_mod: AttackPowerModifier;
+  honi_mod: AttackPowerModifier;
+  postcap_general_mod: AttackPowerModifier;
+  pt_mod: AttackPowerModifier;
+}
+
+export interface AttackPowerModifier {
+  a?: number;
+  b?: number;
+}
+
+export interface AttackPower {
+  precap: number;
+  is_capped: boolean;
+  capped: number;
+  normal: number;
+  critical: number;
+  armor_penetration: number;
+  remaining_ammo_mod: number;
+}
+
+export interface AttackPowerParams {
+  basic: number;
+  cap: number;
+  precap_mod: AttackPowerModifier;
+  postcap_mod: AttackPowerModifier;
+  ap_shell_mod: number | null;
+  carrier_power: number | null;
+  proficiency_critical_mod: number | null;
+  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 CompAntiAirInfo {
   fleet_adjusted_anti_air: number;
@@ -467,6 +491,8 @@ export interface AirstrikeContactChance {
 
 export type SlotSizeVec = (number | null)[];
 
+export type Side = "Player" | "Enemy";
+
 export type GearAttr =
   | "Unknown"
   | "Abyssal"
@@ -498,30 +524,7 @@ export type GearAttr =
   | "SemiNightPlane"
   | "HighAltitudeInterceptor";
 
-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_resistance?: number;
-  fleet_anti_air_resistance?: number;
-}
+export type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
 
 export interface MasterEquippable {
   equip_stype: EquipStype[];
@@ -545,21 +548,6 @@ export interface EquipStype {
   equip_type: number[];
 }
 
-export interface HitRate {
-  total: number;
-  normal: number;
-  critical: number;
-}
-
-export interface HitRateParams {
-  accuracy_term: number;
-  evasion_term: number;
-  target_morale_mod: number;
-  critical_rate_constant: number;
-  critical_percentage_bonus: number;
-  hit_percentage_bonus: number;
-}
-
 export type NightBattleAttackType =
   | { t: "NightAttack"; c: NightAttackType }
   | { t: "Asw"; c: AswAttackType };
@@ -609,20 +597,9 @@ export interface OrgState {
   boss_sup?: string;
 }
 
-export interface AirSquadronState {
+export interface AirSquadronState extends GearVecState, SlotSizeVecState {
   id?: string;
   mode?: AirSquadronMode;
-  g1?: GearState;
-  g2?: GearState;
-  g3?: GearState;
-  g4?: GearState;
-  g5?: GearState;
-  gx?: GearState;
-  ss1?: number;
-  ss2?: number;
-  ss3?: number;
-  ss4?: number;
-  ss5?: number;
 }
 
 export type AirSquadronMode = "Sortie" | "AirDefense";
@@ -656,6 +633,9 @@ export interface ShipState extends GearVecState, SlotSizeVecState {
   asw_mod?: number;
   los_mod?: number;
   luck_mod?: number;
+  day_gunfit_accuracy?: number;
+  night_gunfit_accuracy?: number;
+  custom_power_mods?: CustomPowerModifiers;
 }
 
 export interface SlotSizeVecState {
@@ -682,6 +662,46 @@ export interface GearState {
   stars?: number;
 }
 
+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_resistance?: number;
+  fleet_anti_air_resistance?: number;
+}
+
+export interface HitRate {
+  total: number;
+  normal: number;
+  critical: number;
+}
+
+export interface HitRateParams {
+  accuracy_term: number;
+  evasion_term: number;
+  target_morale_mod: number;
+  critical_rate_constant: number;
+  critical_percentage_bonus: number;
+  hit_percentage_bonus: number;
+}
+
 export type NightAttackType = "Normal" | "ArkRoyal" | "Carrier";
 
 export type NightSpecialAttack =
@@ -705,32 +725,6 @@ export type NightCutin =
   | "Cvci1_18"
   | "Photobomber";
 
-export interface WarfareInfo {
-  day: AttackInfo<DayBattleAttackType, DayCutin | null> | null;
-  closing_torpedo: AttackInfo<null, null> | null;
-  night: AttackInfo<NightBattleAttackType, NightCutin | null> | null;
-  shelling_support: AttackInfo<null, null> | null;
-  opening_asw: AttackInfo<null, null> | null;
-}
-
-export interface WarfareAnalyzerContext {
-  attacker_env: WarfareAnalyzerShipEnvironment;
-  target_env: WarfareAnalyzerShipEnvironment;
-  engagement: Engagement;
-  air_state: AirState;
-}
-
-export interface WarfareAnalyzerShipEnvironment {
-  org_type: OrgType;
-  role: Role;
-  ship_index: number;
-  fleet_len: number;
-  formation: Formation;
-  fleet_los_mod: number | null;
-  night_situation: NightSituation;
-  custom_mods: CustomModifiers;
-}
-
 export interface BattleConfig {
   formation: Record<Formation, NestedFormationDef>;
   anti_air_cutin: Record<number, AntiAirCutinDef>;
@@ -818,25 +812,6 @@ export type StatInterval = [number | null, number | null];
 
 export type GearTypeIdArray = [number, number, number, number, number];
 
-export type Side = "Player" | "Enemy";
-
-export type SpecialEnemyType =
-  | "None"
-  | "SoftSkinned"
-  | "Pillbox"
-  | "IsolatedIsland"
-  | "SupplyDepot"
-  | "HarbourSummerPrincess"
-  | "PtImp"
-  | "BattleshipSummerPrincess"
-  | "HeavyCruiserSummerPrincess";
-
-export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
-
-export type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
-
-export type SpeedGroup = "A" | "B1" | "B2" | "C";
-
 export type ContactRank = "Rank1" | "Rank2" | "Rank3";
 
 export interface SimulatorResult {
@@ -851,6 +826,31 @@ export interface SimulatorResultItem {
   damage_state_map: Record<DamageState, number>;
 }
 
+export interface WarfareInfo {
+  day: AttackInfo<DayBattleAttackType, DayCutin | null> | null;
+  closing_torpedo: AttackInfo<null, null> | null;
+  night: AttackInfo<NightBattleAttackType, NightCutin | null> | null;
+  shelling_support: AttackInfo<null, null> | null;
+  opening_asw: AttackInfo<null, null> | null;
+}
+
+export interface WarfareAnalyzerContext {
+  attacker_env: WarfareAnalyzerShipEnvironment;
+  target_env: WarfareAnalyzerShipEnvironment;
+  engagement: Engagement;
+  air_state: AirState;
+}
+
+export interface WarfareAnalyzerShipEnvironment {
+  org_type: OrgType;
+  role: Role;
+  ship_index: number;
+  fleet_len: number;
+  formation: Formation;
+  fleet_los_mod: number | null;
+  night_situation: NightSituation;
+}
+
 export interface FleetNightCutinRateInfo {
   night_contact_chance: NightContactChance;
   ships: ShipNightCutinRateInfo[];
@@ -914,7 +914,7 @@ export class AirSquadron {
   mode: AirSquadronMode;
   /**
    */
-  xxh3: BigInt;
+  xxh3: bigint;
 }
 /**
  */
@@ -1241,7 +1241,6 @@ export class Fleet {
    */
   reset_battle_state(): void;
   /**
-   * @returns {number | undefined}
    */
   readonly fleet_los_mod: number | undefined;
   /**
@@ -1252,7 +1251,7 @@ export class Fleet {
   len: number;
   /**
    */
-  xxh3: BigInt;
+  xxh3: bigint;
 }
 /**
  */
@@ -1370,14 +1369,12 @@ export class Gear {
    */
   accuracy: number;
   /**
-   * @returns {number}
    */
   readonly ace: number;
   /**
    */
   anti_air: number;
   /**
-   * @returns {number}
    */
   readonly anti_bomber: number;
   /**
@@ -1414,11 +1411,9 @@ export class Gear {
    */
   gear_type: GearType;
   /**
-   * @returns {number}
    */
   readonly gear_type_id: number;
   /**
-   * @returns {number}
    */
   readonly icon_id: number;
   /**
@@ -1428,7 +1423,6 @@ export class Gear {
    */
   improvable: boolean;
   /**
-   * @returns {number}
    */
   readonly interception: number;
   /**
@@ -1453,7 +1447,6 @@ export class Gear {
    */
   ship_anti_air_resistance: number;
   /**
-   * @returns {number}
    */
   readonly special_type_id: number;
   /**
@@ -1470,7 +1463,7 @@ export class Gear {
   types: Uint8Array;
   /**
    */
-  xxh3: BigInt;
+  xxh3: bigint;
 }
 /**
  */
@@ -1663,7 +1656,7 @@ export class Org {
   sortie: string;
   /**
    */
-  xxh3: BigInt;
+  xxh3: bigint;
 }
 /**
  */
@@ -1682,6 +1675,10 @@ export class Ship {
    * @returns {ShipState}
    */
   state(): ShipState;
+  /**
+   * @returns {CustomPowerModifiers}
+   */
+  custom_power_mods(): CustomPowerModifiers;
   /**
    * @returns {ShipMeta}
    */
@@ -1821,11 +1818,6 @@ export class Ship {
    * @returns {number}
    */
   cruiser_fit_bonus(): number;
-  /**
-   * @param {boolean} is_night
-   * @returns {number}
-   */
-  fit_gun_bonus(is_night: boolean): number;
   /**
    * @returns {number | undefined}
    */
@@ -1869,22 +1861,32 @@ export class Ship {
    */
   take_damage(value: number): 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;
+  /**
+   */
   readonly accuracy: number;
   /**
    */
   ammo: number;
   /**
-   * @returns {number | undefined}
    */
   readonly anti_air: number | undefined;
   /**
-   * @returns {number | undefined}
    */
   readonly armor: number | undefined;
   /**
-   * @returns {number | undefined}
    */
   readonly asw: number | undefined;
   /**
@@ -1894,11 +1896,9 @@ export class Ship {
    */
   current_hp: number;
   /**
-   * @returns {number | undefined}
    */
   readonly evasion: number | undefined;
   /**
-   * @returns {number | undefined}
    */
   readonly firepower: number | undefined;
   /**
@@ -1908,81 +1908,63 @@ export class Ship {
    */
   id: string;
   /**
-   * @returns {number}
    */
   readonly innate_torpedo_accuracy: number;
   /**
    */
   level: number;
   /**
-   * @returns {number | undefined}
    */
   readonly los: number | undefined;
   /**
-   * @returns {number | undefined}
    */
   readonly luck: number | undefined;
   /**
-   * @returns {number}
    */
   readonly max_ammo: number;
   /**
-   * @returns {number}
    */
   readonly max_fuel: number;
   /**
-   * @returns {number | undefined}
    */
   readonly max_hp: number | undefined;
   /**
    */
   morale: number;
   /**
-   * @returns {number | undefined}
    */
   readonly naked_anti_air: number | undefined;
   /**
-   * @returns {number | undefined}
    */
   readonly naked_armor: number | undefined;
   /**
-   * @returns {number | undefined}
    */
   readonly naked_asw: number | undefined;
   /**
-   * @returns {number | undefined}
    */
   readonly naked_evasion: number | undefined;
   /**
-   * @returns {number | undefined}
    */
   readonly naked_firepower: number | undefined;
   /**
-   * @returns {number | undefined}
    */
   readonly naked_los: number | undefined;
   /**
-   * @returns {number | undefined}
    */
   readonly naked_range: number | undefined;
   /**
-   * @returns {number}
    */
   readonly naked_speed: number;
   /**
-   * @returns {number | undefined}
    */
   readonly naked_torpedo: number | undefined;
   /**
-   * @returns {string}
    */
   readonly name: string;
   /**
-   * @returns {number}
    */
   readonly next_id: number;
   /**
-   * @returns {number | undefined}
    */
   readonly range: number | undefined;
   /**
@@ -1992,37 +1974,30 @@ export class Ship {
    */
   ship_type: ShipType;
   /**
-   * @returns {number}
    */
   readonly slotnum: number;
   /**
    */
   slots: SlotSizeVec;
   /**
-   * @returns {number}
    */
   readonly sort_id: number;
   /**
-   * @returns {number}
    */
   readonly speed: number;
   /**
-   * @returns {number}
    */
   readonly stype: number;
   /**
-   * @returns {number | undefined}
    */
   readonly torpedo: number | undefined;
   /**
-   * @returns {boolean}
    */
   readonly useful: boolean;
   /**
    */
-  xxh3: BigInt;
+  xxh3: bigint;
   /**
-   * @returns {string}
    */
   readonly yomi: string;
 }