fleethub-core 1.10.15 → 1.10.17

package/node/fleethub_core.d.ts

@@ -8,81 +8,6 @@ export function parse_ship_conditions(value: ShipConditions): ShipConditions;
 /**
  */
 export function set_panic_hook(): void;
-
-export type Histogram<K extends keyof any, V> = Partial<Record<K, V>>;
-
-export interface NodeAttackAnalyzerShipConfig extends NightFleetConditions {
-  formation?: Formation;
-}
-
-export interface NodeAttackAnalyzerConfig {
-  air_state?: AirState;
-  engagement?: Engagement;
-  node_state?: NodeState;
-  left?: NodeAttackAnalyzerShipConfig;
-  right?: NodeAttackAnalyzerShipConfig;
-}
-
-export interface NodeAttackAnalysis {
-  left: AttackAnalysis;
-  right: AttackAnalysis;
-  shelling_fleet_cutin: FleetCutinReport<ShellingStyle>[];
-  night_fleet_cutin: FleetCutinReport<NightAttackStyle>[];
-}
-
-export interface CompAnalyzerConfig {
-  engagement: Engagement;
-  formation: Formation;
-  anti_air_cutin: number | null;
-  ship_anti_air_resist: number;
-  fleet_anti_air_resist: number;
-  left_night_fleet_conditions: NightFleetConditions;
-  right_night_fleet_conditions: NightFleetConditions;
-}
-
-export interface CompNightAnalysis {
-  night_cutin: CompNightCutinAnalysis;
-  fleet_cutin: FleetCutinReport<NightAttackStyle>[];
-}
-
-export interface CompDayAnalysis {
-  day_cutin: CompDayCutinAnalysis;
-  fleet_cutin: FleetCutinReport<ShellingStyle>[];
-}
-
-export interface CompAnalysis {
-  day: CompDayAnalysis;
-  night: CompNightAnalysis;
-  contact: ContactAnalysis;
-  anti_air: CompAntiAirAnalysis;
-}
-
-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 OrgType =
-  | "Single"
-  | "CarrierTaskForce"
-  | "SurfaceTaskForce"
-  | "TransportEscort"
-  | "EnemySingle"
-  | "EnemyCombined";
-
 export type GearVecInput = GearInput[];
 
 export interface GearInput {
@@ -123,34 +48,6 @@ export interface EBonuses {
   range: number;
 }
 
-export interface HitRate {
-  normal: number;
-  critical: number;
-  total: 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 DamageReport {
-  miss_damage_min: number;
-  miss_damage_max: number;
-  normal_damage_min: number;
-  normal_damage_max: number;
-  critical_damage_min: number;
-  critical_damage_max: number;
-  normal_scratch_rate: number;
-  critical_scratch_rate: number;
-  damage_density: Histogram<number, number>;
-  damage_state_density: Histogram<DamageState, number>;
-}
-
 export interface ContactAnalysis {
   single: DayContactChance[] | null;
   combined: DayContactChance[] | null;
@@ -165,16 +62,6 @@ export interface DayContactChance {
   total: number;
 }
 
-export type NodeId = string;
-
-export interface NodeState {
-  map?: number;
-  node?: NodeId;
-  phase?: number;
-  debuff?: boolean;
-  disable_historical_mod?: boolean;
-}
-
 export interface OrgState {
   id?: string;
   f1?: FleetState;
@@ -193,6 +80,77 @@ export interface OrgState {
 
 export type FleetKey = "f1" | "f2" | "f3" | "f4";
 
+export interface HitRate {
+  normal: number;
+  critical: number;
+  total: 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 DamageReport {
+  miss_damage_min: number;
+  miss_damage_max: number;
+  normal_damage_min: number;
+  normal_damage_max: number;
+  critical_damage_min: number;
+  critical_damage_max: number;
+  normal_scratch_rate: number;
+  critical_scratch_rate: number;
+  damage_density: Histogram<number, number>;
+  damage_state_density: Histogram<DamageState, number>;
+}
+
+export interface AttackAnalysis {
+  attacker_is_player: boolean;
+  attacker_ship_id: number;
+  target_ship_id: number;
+  historical_params: HistoricalParams;
+  day: ActionReport<DayPhaseAttackStyle>;
+  night: ActionReport<NightPhaseAttackStyle>;
+  closing_torpedo: ActionReport<TorpedoAttackStyle>;
+  opening_asw: ActionReport<AswAttackStyle>;
+  support_shelling: ActionReport<SupportShellingStyle>;
+}
+
+export type GearAttr =
+  | "Unknown"
+  | "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 ShipCategory =
   | "Battleship"
   | "AircraftCarrier"
@@ -230,18 +188,6 @@ export type ShipType =
 
 export type SlotSizeVec = (number | null)[];
 
-export interface AttackAnalysis {
-  attacker_is_player: boolean;
-  attacker_ship_id: number;
-  target_ship_id: number;
-  historical_params: HistoricalParams;
-  day: ActionReport<DayPhaseAttackStyle>;
-  night: ActionReport<NightPhaseAttackStyle>;
-  closing_torpedo: ActionReport<TorpedoAttackStyle>;
-  opening_asw: ActionReport<AswAttackStyle>;
-  support_shelling: ActionReport<SupportShellingStyle>;
-}
-
 export type SingleFormation =
   | "LineAhead"
   | "DoubleLine"
@@ -258,40 +204,14 @@ export type CombinedFormation =
 
 export type Formation = SingleFormation | CombinedFormation;
 
-export type GearAttr =
-  | "Unknown"
-  | "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 NodeId = string;
 
-export interface MoveShipPayload {
-  current: [string, string, ShipKey];
-  target: [string | null, string, ShipKey];
+export interface NodeState {
+  map?: number;
+  node?: NodeId;
+  phase?: number;
+  debuff?: boolean;
+  disable_historical_mod?: boolean;
 }
 
 export interface EquippabilityRule {
@@ -346,6 +266,27 @@ export interface NightFleetConditions {
   activates_large_searchlight?: boolean;
 }
 
+export interface GearState {
+  id?: string;
+  gear_id: number;
+  exp?: number;
+  stars?: number;
+}
+
+export interface GearVecState {
+  g1?: GearState;
+  g2?: GearState;
+  g3?: GearState;
+  g4?: GearState;
+  g5?: GearState;
+  gx?: GearState;
+}
+
+export interface MoveShipPayload {
+  current: [string, string, ShipKey];
+  target: [string | null, string, ShipKey];
+}
+
 export type DayCutin =
   | "Zuiun"
   | "AirSea"
@@ -387,26 +328,8 @@ export type DayCutinLike = DayCutin | FleetCutin;
 
 export type NightCutinLike = NightCutin | FleetCutin;
 
-export interface GearState {
-  id?: string;
-  gear_id: number;
-  exp?: number;
-  stars?: number;
-}
-
-export interface GearVecState {
-  g1?: GearState;
-  g2?: GearState;
-  g3?: GearState;
-  g4?: GearState;
-  g5?: GearState;
-  gx?: GearState;
-}
-
 export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
 
-export type Role = "Main" | "Escort";
-
 export interface SlotSizeVecState {
   ss1?: number;
   ss2?: number;
@@ -461,6 +384,40 @@ export interface SimulatorResultItem {
   damage_state_map: Record<DamageState, number>;
 }
 
+export interface MasterShip {
+  ship_id: number;
+  name: string;
+  yomi: string;
+  stype: number;
+  ctype: number;
+  nationality?: number;
+  sort_id?: number;
+  max_hp: StatInterval;
+  firepower: StatInterval;
+  armor: StatInterval;
+  torpedo: StatInterval;
+  evasion: StatInterval;
+  anti_air: StatInterval;
+  asw: StatInterval;
+  los: StatInterval;
+  luck: StatInterval;
+  torpedo_accuracy?: number;
+  basic_evasion_term?: number;
+  speed: number;
+  range?: number;
+  fuel?: number;
+  ammo?: number;
+  next_id?: number;
+  next_level?: number;
+  slotnum: number;
+  slots: SlotSizeVec;
+  stock: GearState[];
+  speed_group?: SpeedGroup;
+  useful?: boolean;
+}
+
+export type StatInterval = [number | null, number | null];
+
 export interface ActionReport<T> {
   data: Record<string, AttackReport<T>>;
   damage_state_density: Histogram<DamageState, number> | null;
@@ -577,44 +534,12 @@ export interface FleetState {
   s7?: ShipState;
 }
 
+export type Role = "Main" | "Escort";
+
 export type Side = "Player" | "Enemy";
 
 export type Align = "Left" | "Right";
 
-export interface MasterShip {
-  ship_id: number;
-  name: string;
-  yomi: string;
-  stype: number;
-  ctype: number;
-  nationality?: number;
-  sort_id?: number;
-  max_hp: StatInterval;
-  firepower: StatInterval;
-  armor: StatInterval;
-  torpedo: StatInterval;
-  evasion: StatInterval;
-  anti_air: StatInterval;
-  asw: StatInterval;
-  los: StatInterval;
-  luck: StatInterval;
-  torpedo_accuracy?: number;
-  basic_evasion_term?: number;
-  speed: number;
-  range?: number;
-  fuel?: number;
-  ammo?: number;
-  next_id?: number;
-  next_level?: number;
-  slotnum: number;
-  slots: SlotSizeVec;
-  stock: GearState[];
-  speed_group?: SpeedGroup;
-  useful?: boolean;
-}
-
-export type StatInterval = [number | null, number | null];
-
 export interface AttackPower {
   precap: number;
   is_capped: boolean;
@@ -670,6 +595,15 @@ export interface AirSquadronState extends GearVecState, SlotSizeVecState {
   mode?: AirSquadronMode;
 }
 
+export type AirState =
+  | "AirSupremacy"
+  | "AirSuperiority"
+  | "AirParity"
+  | "AirDenial"
+  | "AirIncapability";
+
+export type AirStateRank = "Rank0" | "Rank1" | "Rank2" | "Rank3";
+
 export interface AttackPowerModifier {
   a?: number;
   b?: number;
@@ -683,7 +617,7 @@ export interface SpecialEnemyModifiers {
   m4a1dd_mod: AttackPowerModifier;
   honi_mod: AttackPowerModifier;
   postcap_general_mod: AttackPowerModifier;
-  pt_mod: AttackPowerModifier;
+  pt_mod: AttackPowerModifier | null;
 }
 
 export interface CustomPowerModifiers {
@@ -773,12 +707,58 @@ export type GearCategory =
   | "LandBased"
   | "Misc";
 
-export interface ShipConditions extends ShipPosition {
-  formation?: Formation;
-  amagiri_index?: number | null;
+export interface ShipConditions extends ShipPosition {
+  formation?: Formation;
+  amagiri_index?: number | null;
+}
+
+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;
+  equippability: MasterEquippability;
+}
+
+export interface NationalityDef {
+  id: number;
+  ctypes: number[];
+}
+
+export interface MasterAttrRule<T> {
+  tag: T;
+  name: string;
+  expr: CompiledEvaler;
+}
+
+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 type GearTypeIdArray = [number, number, number, number, number];
+export interface MasterIBonusRule {
+  expr: CompiledEvaler;
+  formula: CompiledEvaler;
+}
 
 export interface MasterGear {
   gear_id: number;
@@ -824,14 +804,48 @@ export interface AttackReport<T> {
   damage: DamageReport | null;
 }
 
-export type AirState =
-  | "AirSupremacy"
-  | "AirSuperiority"
-  | "AirParity"
-  | "AirDenial"
-  | "AirIncapability";
+export interface AttackAnalyzerShipConfig
+  extends ShipConditions,
+    NightFleetConditions {
+  fleet_los_mod?: number | null;
+}
 
-export type AirStateRank = "Rank0" | "Rank1" | "Rank2" | "Rank3";
+export interface ShellingStyle {
+  tag: "ShellingStyle";
+  attack_type: ShellingType;
+  cutin: DayCutinLike | null;
+  power_mod: number;
+  accuracy_mod: number;
+  hits: number;
+}
+
+export interface NightAttackStyle {
+  tag: "NightAttackStyle";
+  attack_type: NightAttackType;
+  cutin: NightCutinLike | null;
+  power_mod: number;
+  accuracy_mod: number;
+  hits: number;
+}
+
+export interface AswAttackStyle {
+  tag: "AswAttackStyle";
+  attack_type: AswAttackType;
+}
+
+export interface TorpedoAttackStyle {
+  tag: "TorpedoAttackStyle";
+  attack_type: TorpedoAttackType;
+}
+
+export type DayPhaseAttackStyle = ShellingStyle | AswAttackStyle;
+
+export type NightPhaseAttackStyle = NightAttackStyle | AswAttackStyle;
+
+export interface SupportShellingStyle {
+  tag: "SupportShellingStyle";
+  attack_type: SupportShellingType;
+}
 
 export interface ShipMeta {
   id: string;
@@ -882,54 +896,6 @@ export type SpecialEnemyType =
   | "AnchorageWaterDemonVacationMode"
   | "DockPrincess";
 
-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;
-  equippability: MasterEquippability;
-}
-
-export interface NationalityDef {
-  id: number;
-  ctypes: number[];
-}
-
-export interface MasterAttrRule<T> {
-  tag: T;
-  name: string;
-  expr: CompiledEvaler;
-}
-
-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 MasterBattleDefinitions {
   formation: NestedFormationDef[];
   anti_air_cutin: AntiAirCutinDef[];
@@ -971,47 +937,31 @@ export interface DayCutinReport extends ActionReport<DayPhaseAttackStyle> {
   observation_term: number | null;
 }
 
-export interface AttackAnalyzerShipConfig
-  extends ShipConditions,
-    NightFleetConditions {
-  fleet_los_mod?: number | null;
-}
-
-export interface ShellingStyle {
-  tag: "ShellingStyle";
-  attack_type: ShellingType;
-  cutin: DayCutinLike | null;
-  power_mod: number;
-  accuracy_mod: number;
-  hits: number;
-}
-
-export interface NightAttackStyle {
-  tag: "NightAttackStyle";
-  attack_type: NightAttackType;
-  cutin: NightCutinLike | null;
-  power_mod: number;
-  accuracy_mod: number;
-  hits: number;
+export interface CompAnalyzerConfig {
+  engagement: Engagement;
+  formation: Formation;
+  anti_air_cutin: number | null;
+  ship_anti_air_resist: number;
+  fleet_anti_air_resist: number;
+  left_night_fleet_conditions: NightFleetConditions;
+  right_night_fleet_conditions: NightFleetConditions;
 }
 
-export interface AswAttackStyle {
-  tag: "AswAttackStyle";
-  attack_type: AswAttackType;
+export interface CompNightAnalysis {
+  night_cutin: CompNightCutinAnalysis;
+  fleet_cutin: FleetCutinReport<NightAttackStyle>[];
 }
 
-export interface TorpedoAttackStyle {
-  tag: "TorpedoAttackStyle";
-  attack_type: TorpedoAttackType;
+export interface CompDayAnalysis {
+  day_cutin: CompDayCutinAnalysis;
+  fleet_cutin: FleetCutinReport<ShellingStyle>[];
 }
 
-export type DayPhaseAttackStyle = ShellingStyle | AswAttackStyle;
-
-export type NightPhaseAttackStyle = NightAttackStyle | AswAttackStyle;
-
-export interface SupportShellingStyle {
-  tag: "SupportShellingStyle";
-  attack_type: SupportShellingType;
+export interface CompAnalysis {
+  day: CompDayAnalysis;
+  night: CompNightAnalysis;
+  contact: ContactAnalysis;
+  anti_air: CompAntiAirAnalysis;
 }
 
 export type Engagement = "GreenT" | "Parallel" | "HeadOn" | "RedT";
@@ -1025,6 +975,55 @@ export interface ShipPosition {
   index?: number;
 }
 
+export type Histogram<K extends keyof any, V> = Partial<Record<K, V>>;
+
+export type GearTypeIdArray = [number, number, number, number, number];
+
+export interface NodeAttackAnalyzerShipConfig extends NightFleetConditions {
+  formation?: Formation;
+}
+
+export interface NodeAttackAnalyzerConfig {
+  air_state?: AirState;
+  engagement?: Engagement;
+  node_state?: NodeState;
+  left?: NodeAttackAnalyzerShipConfig;
+  right?: NodeAttackAnalyzerShipConfig;
+}
+
+export interface NodeAttackAnalysis {
+  left: AttackAnalysis;
+  right: AttackAnalysis;
+  shelling_fleet_cutin: FleetCutinReport<ShellingStyle>[];
+  night_fleet_cutin: FleetCutinReport<NightAttackStyle>[];
+}
+
+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 OrgType =
+  | "Single"
+  | "CarrierTaskForce"
+  | "SurfaceTaskForce"
+  | "TransportEscort"
+  | "EnemySingle"
+  | "EnemyCombined";
+
 /**
  */
 export class AirSquadron {
@@ -1760,6 +1759,20 @@ export class Org {
  */
 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}
    */
@@ -1977,20 +1990,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;