fleethub-core 1.7.0 → 1.7.3

package/node/fleethub_core.d.ts

@@ -65,6 +65,8 @@ export type ShellingAttackType = "Normal" | "Carrier";
 
 export type AirWaveType = "Jet" | "LandBase" | "Carrier";
 
+export type AswAttackType = "DepthCharge" | "Aircraft";
+
 export type OrgType =
   | "Single"
   | "CarrierTaskForce"
@@ -73,6 +75,14 @@ export type OrgType =
   | "EnemySingle"
   | "EnemyCombined";
 
+export type FleetCutin =
+  | "NelsonTouch"
+  | "NagatoCutin"
+  | "ColoradoCutin"
+  | "KongouCutin"
+  | "Yamato2ShipCutin"
+  | "Yamato3ShipCutin";
+
 export interface WarfareContext {
   attacker_env: WarfareShipEnvironment;
   target_env: WarfareShipEnvironment;
@@ -151,10 +161,6 @@ export interface AttackPowerModifier {
   b: number;
 }
 
-export type NumMap<K, V> = Partial<Record<K, V>>;
-
-export type Role = "Main" | "Escort";
-
 export interface MasterData {
   gears: MasterGear[];
   gear_attrs: MasterAttrRule<GearAttr>[];
@@ -181,6 +187,32 @@ export interface MasterAttrRule<T> {
   expr: string;
 }
 
+export interface CompDayCutinRateInfo {
+  main: FleetDayCutinRateInfo;
+  escort: FleetDayCutinRateInfo | null;
+}
+
+export interface FleetDayCutinRateInfo {
+  fleet_los_mod: number | null;
+  ships: ShipDayCutinRateInfo[];
+}
+
+export interface ShipDayCutinRateInfo {
+  ship_id: number;
+  air_supremacy: DayCutinRateInfo;
+  air_superiority: DayCutinRateInfo;
+}
+
+export interface DayCutinRateInfo {
+  observation_term: number | null;
+  rates: [DayCutin | null, number | null][];
+  total_cutin_rate: number | null;
+}
+
+export type NumMap<K, V> = Partial<Record<K, V>>;
+
+export type Role = "Main" | "Escort";
+
 export type GearCategory =
   | "Fighter"
   | "Bomber"
@@ -258,28 +290,6 @@ export type GearType =
 
 export type Engagement = "GreenT" | "Parallel" | "HeadOn" | "RedT";
 
-export interface CompDayCutinRateInfo {
-  main: FleetDayCutinRateInfo;
-  escort: FleetDayCutinRateInfo | null;
-}
-
-export interface FleetDayCutinRateInfo {
-  fleet_los_mod: number | null;
-  ships: ShipDayCutinRateInfo[];
-}
-
-export interface ShipDayCutinRateInfo {
-  ship_id: number;
-  air_supremacy: DayCutinRateInfo;
-  air_superiority: DayCutinRateInfo;
-}
-
-export interface DayCutinRateInfo {
-  observation_term: number | null;
-  rates: [DayCutin | null, number | null][];
-  total_cutin_rate: number | null;
-}
-
 export interface EBonuses {
   firepower: number;
   torpedo: number;
@@ -320,22 +330,6 @@ export interface GearInput {
 
 export type GearVecInput = GearInput[];
 
-export type ShipAttr =
-  | "Unknown"
-  | "Abyssal"
-  | "NightCarrier"
-  | "Installation"
-  | "RoyalNavy"
-  | "Kai2"
-  | "TurbineSpeedBonus"
-  | "Pillbox"
-  | "IsolatedIsland"
-  | "HarbourSummerPrincess"
-  | "SupplyDepot"
-  | "PtImp"
-  | "BattleshipSummerPrincess"
-  | "HeavyCruiserSummerPrincess";
-
 export type AirStateRank = "Rank0" | "Rank1" | "Rank2" | "Rank3";
 
 export type AirState =
@@ -407,6 +401,22 @@ export interface DamageInfo {
   damage_state_map: NumMap<DamageState, number>;
 }
 
+export type ShipAttr =
+  | "Unknown"
+  | "Abyssal"
+  | "NightCarrier"
+  | "Installation"
+  | "RoyalNavy"
+  | "Kai2"
+  | "TurbineSpeedBonus"
+  | "Pillbox"
+  | "IsolatedIsland"
+  | "HarbourSummerPrincess"
+  | "SupplyDepot"
+  | "PtImp"
+  | "BattleshipSummerPrincess"
+  | "HeavyCruiserSummerPrincess";
+
 export type GearAttr =
   | "Unknown"
   | "Abyssal"
@@ -454,8 +464,6 @@ export type SingleFormation =
   | "LineAbreast"
   | "Vanguard";
 
-export type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
-
 export interface CompAntiAirInfo {
   fleet_adjusted_anti_air: number;
   ships: ShipAntiAirInfo[];
@@ -486,55 +494,7 @@ export interface AirstrikeContactChance {
   total: number;
 }
 
-export type SlotSizeVec = (number | null)[];
-
-export type NightAttackType = "Normal" | "ArkRoyal" | "Carrier";
-
-export type NightSpecialAttack =
-  | { NightCutin: NightCutin }
-  | { FleetCutin: FleetCutin };
-
-export type NightCutin =
-  | "MainTorpRadar"
-  | "TorpLookoutRadar"
-  | "TorpTsloTorp"
-  | "TorpTsloDrum"
-  | "DoubleAttack"
-  | "TorpTorpMain"
-  | "TorpTorpTorp"
-  | "MainMainSec"
-  | "MainMainMain"
-  | "SubTorpTorp"
-  | "SubRadarTorp"
-  | "Cvci1_25"
-  | "Cvci1_20"
-  | "Cvci1_18"
-  | "Photobomber";
-
-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[];
@@ -558,21 +518,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 };
@@ -622,20 +567,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";
@@ -669,6 +603,8 @@ export interface ShipState extends GearVecState, SlotSizeVecState {
   asw_mod?: number;
   los_mod?: number;
   luck_mod?: number;
+  day_gunfit_accuracy?: number;
+  night_gunfit_accuracy?: number;
 }
 
 export interface SlotSizeVecState {
@@ -695,6 +631,121 @@ export interface GearState {
   stars?: number;
 }
 
+export type NightAttackType = "Normal" | "ArkRoyal" | "Carrier";
+
+export type NightSpecialAttack =
+  | { NightCutin: NightCutin }
+  | { FleetCutin: FleetCutin };
+
+export type NightCutin =
+  | "MainTorpRadar"
+  | "TorpLookoutRadar"
+  | "TorpTsloTorp"
+  | "TorpTsloDrum"
+  | "DoubleAttack"
+  | "TorpTorpMain"
+  | "TorpTorpTorp"
+  | "MainMainSec"
+  | "MainMainMain"
+  | "SubTorpTorp"
+  | "SubRadarTorp"
+  | "Cvci1_25"
+  | "Cvci1_20"
+  | "Cvci1_18"
+  | "Photobomber";
+
+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 interface BattleConfig {
+  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: FormationWarfareDef;
+  torpedo: FormationWarfareDef;
+  asw: FormationWarfareDef;
+  night: FormationWarfareDef;
+  shelling_support: FormationWarfareDef;
+}
+
+export interface FormationWarfareDef {
+  power_mod: number | null;
+  accuracy_mod: number | null;
+  evasion_mod: number | null;
+}
+
 export interface MasterShip {
   ship_id: number;
   name: string;
@@ -756,59 +807,9 @@ export interface WarfareAnalyzerShipEnvironment {
 
 export type GearTypeIdArray = [number, number, number, number, number];
 
-export type Side = "Player" | "Enemy";
-
-export interface BattleConfig {
-  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: FormationWarfareDef;
-  torpedo: FormationWarfareDef;
-  asw: FormationWarfareDef;
-  night: FormationWarfareDef;
-  shelling_support: FormationWarfareDef;
-}
+export type SlotSizeVec = (number | null)[];
 
-export interface FormationWarfareDef {
-  power_mod: number | null;
-  accuracy_mod: number | null;
-  evasion_mod: number | null;
-}
+export type Side = "Player" | "Enemy";
 
 export type SpecialEnemyType =
   | "None"
@@ -827,12 +828,6 @@ export type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
 
 export type SpeedGroup = "A" | "B1" | "B2" | "C";
 
-export type FleetCutin =
-  | "NelsonTouch"
-  | "NagatoCutin"
-  | "ColoradoCutin"
-  | "KongouCutin";
-
 export type ContactRank = "Rank1" | "Rank2" | "Rank3";
 
 export interface SimulatorResult {
@@ -847,8 +842,6 @@ export interface SimulatorResultItem {
   damage_state_map: Record<DamageState, number>;
 }
 
-export type AswAttackType = "DepthCharge" | "Aircraft";
-
 export interface FleetNightCutinRateInfo {
   night_contact_chance: NightContactChance;
   ships: ShipNightCutinRateInfo[];
@@ -912,7 +905,7 @@ export class AirSquadron {
   mode: AirSquadronMode;
   /**
    */
-  xxh3: BigInt;
+  xxh3: bigint;
 }
 /**
  */
@@ -1239,7 +1232,6 @@ export class Fleet {
    */
   reset_battle_state(): void;
   /**
-   * @returns {number | undefined}
    */
   readonly fleet_los_mod: number | undefined;
   /**
@@ -1250,7 +1242,7 @@ export class Fleet {
   len: number;
   /**
    */
-  xxh3: BigInt;
+  xxh3: bigint;
 }
 /**
  */
@@ -1269,6 +1261,10 @@ export class Gear {
    * @returns {GearCategory}
    */
   category(): GearCategory;
+  /**
+   * @returns {boolean}
+   */
+  is_high_angle_mount(): boolean;
   /**
    * @returns {boolean}
    */
@@ -1364,14 +1360,12 @@ export class Gear {
    */
   accuracy: number;
   /**
-   * @returns {number}
    */
   readonly ace: number;
   /**
    */
   anti_air: number;
   /**
-   * @returns {number}
    */
   readonly anti_bomber: number;
   /**
@@ -1408,11 +1402,9 @@ export class Gear {
    */
   gear_type: GearType;
   /**
-   * @returns {number}
    */
   readonly gear_type_id: number;
   /**
-   * @returns {number}
    */
   readonly icon_id: number;
   /**
@@ -1422,7 +1414,6 @@ export class Gear {
    */
   improvable: boolean;
   /**
-   * @returns {number}
    */
   readonly interception: number;
   /**
@@ -1447,7 +1438,6 @@ export class Gear {
    */
   ship_anti_air_resistance: number;
   /**
-   * @returns {number}
    */
   readonly special_type_id: number;
   /**
@@ -1464,7 +1454,7 @@ export class Gear {
   types: Uint8Array;
   /**
    */
-  xxh3: BigInt;
+  xxh3: bigint;
 }
 /**
  */
@@ -1657,7 +1647,7 @@ export class Org {
   sortie: string;
   /**
    */
-  xxh3: BigInt;
+  xxh3: bigint;
 }
 /**
  */
@@ -1815,11 +1805,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}
    */
@@ -1853,27 +1838,42 @@ export class Ship {
    * @returns {number | undefined}
    */
   elos(node_divaricated_factor: number): number | undefined;
+  /**
+   * 確殺攻撃力
+   * @returns {number | undefined}
+   */
+  ohko_power(): number | undefined;
   /**
    * @param {number} value
    */
   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;
   /**
@@ -1883,11 +1883,9 @@ export class Ship {
    */
   current_hp: number;
   /**
-   * @returns {number | undefined}
    */
   readonly evasion: number | undefined;
   /**
-   * @returns {number | undefined}
    */
   readonly firepower: number | undefined;
   /**
@@ -1896,78 +1894,64 @@ export class Ship {
   /**
    */
   id: string;
+  /**
+   */
+  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;
   /**
@@ -1977,41 +1961,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 {number}
-   */
-  readonly torpedo_accuracy_mod: number;
-  /**
-   * @returns {boolean}
    */
   readonly useful: boolean;
   /**
    */
-  xxh3: BigInt;
+  xxh3: bigint;
   /**
-   * @returns {string}
    */
   readonly yomi: string;
 }