fleethub-core 1.6.0 → 1.7.0

package/pkg/fleethub_core.d.ts

@@ -3,46 +3,6 @@
 /**
  */
 export function set_panic_hook(): void;
-export interface EBonuses {
-  firepower: number;
-  torpedo: number;
-  anti_air: number;
-  armor: number;
-  evasion: number;
-  asw: number;
-  los: number;
-  bombing: number;
-  accuracy: number;
-  range: number;
-}
-
-export interface ShipInput {
-  ship_id: number;
-  ctype: number;
-  stype: number;
-  yomi: string;
-}
-
-export interface GearInput {
-  gear_id: number;
-  types: GearTypeIdArray;
-  firepower: number;
-  torpedo: number;
-  anti_air: number;
-  armor: number;
-  evasion: number;
-  asw: number;
-  los: number;
-  bombing: number;
-  accuracy: number;
-  range: number;
-  radius: number;
-  stars: number;
-  ace: number;
-}
-
-export type GearVecInput = GearInput[];
-
 export type ShipType =
   | "Unknown"
   | "DE"
@@ -78,46 +38,40 @@ export type ShipCategory =
   | "Submarine"
   | "AuxiliaryShip";
 
-export type AirStateRank = "Rank0" | "Rank1" | "Rank2" | "Rank3";
+export type ShellingSpecialAttack =
+  | { DayCutin: DayCutin }
+  | { FleetCutin: FleetCutin };
 
-export type AirState =
-  | "AirSupremacy"
-  | "AirSuperiority"
-  | "AirParity"
-  | "AirDenial"
-  | "AirIncapability";
+export type DayCutin =
+  | "MainMain"
+  | "MainAp"
+  | "MainRadar"
+  | "MainSec"
+  | "DoubleAttack"
+  | "FBA"
+  | "BBA"
+  | "BA"
+  | "Zuiun"
+  | "AirSea";
 
-export interface FleetCutinAnalysis {
-  shelling: FleetCutinInfo[];
-  night: FleetCutinInfo[];
+export interface ShellingSupportSimulatorParams {
+  attacker_formation: Formation;
+  target_formation: Formation;
+  engagement: Engagement;
+  custom_mods: CustomModifiers;
 }
 
-export interface FleetCutinInfo {
-  cutin: FleetCutin;
-  rate: number | null;
-  formation: Formation;
-  items: FleetCutinInfoItem[];
-}
+export type ShellingAttackType = "Normal" | "Carrier";
 
-export interface FleetCutinInfoItem {
-  ship_id: number;
-  cutin: FleetCutin;
-  fleet_cutin_mod: number;
-  stats: AttackStats;
-}
+export type AirWaveType = "Jet" | "LandBase" | "Carrier";
 
-export interface DamageInfo {
-  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_map: NumMap<number, number>;
-  damage_state_map: NumMap<DamageState, number>;
-}
+export type OrgType =
+  | "Single"
+  | "CarrierTaskForce"
+  | "SurfaceTaskForce"
+  | "TransportEscort"
+  | "EnemySingle"
+  | "EnemyCombined";
 
 export interface WarfareContext {
   attacker_env: WarfareShipEnvironment;
@@ -136,14 +90,6 @@ export interface WarfareShipEnvironment {
   fleet_los_mod: number | null;
 }
 
-export type OrgType =
-  | "Single"
-  | "CarrierTaskForce"
-  | "SurfaceTaskForce"
-  | "TransportEscort"
-  | "EnemySingle"
-  | "EnemyCombined";
-
 export interface CompMeta {
   fleets: Record<FleetType, FleetMeta>;
 }
@@ -159,32 +105,6 @@ export interface ShipMeta {
   ship_id: number;
 }
 
-export interface MasterData {
-  gears: MasterGear[];
-  gear_attrs: MasterAttrRule<GearAttr>[];
-  ships: MasterShip[];
-  ship_attrs: MasterAttrRule<ShipAttr>[];
-  ibonuses: MasterIBonuses;
-  equippable: MasterEquippable;
-  formation: NestedFormationDef[];
-  anti_air_cutin: AntiAirCutinDef[];
-  day_cutin: DayCutinDef[];
-  night_cutin: NightCutinDef[];
-}
-
-export interface MasterConfig {
-  formation: NestedFormationDef[];
-  anti_air_cutin: AntiAirCutinDef[];
-  day_cutin: DayCutinDef[];
-  night_cutin: NightCutinDef[];
-}
-
-export interface MasterAttrRule<T> {
-  tag: T;
-  name: string;
-  expr: string;
-}
-
 export interface AttackPower {
   precap: number;
   is_capped: boolean;
@@ -210,8 +130,9 @@ export interface AttackPowerParams {
 }
 
 export interface CustomModifiers {
-  precap_mod: AttackPowerModifier;
-  postcap_mod: AttackPowerModifier;
+  precap_mod?: AttackPowerModifier;
+  postcap_mod?: AttackPowerModifier;
+  basic_power_mod?: AttackPowerModifier;
 }
 
 export interface SpecialEnemyModifiers {
@@ -232,23 +153,33 @@ export interface AttackPowerModifier {
 
 export type NumMap<K, V> = Partial<Record<K, V>>;
 
-export type ShellingSpecialAttack =
-  | { DayCutin: DayCutin }
-  | { FleetCutin: FleetCutin };
+export type Role = "Main" | "Escort";
 
-export type DayCutin =
-  | "MainMain"
-  | "MainAp"
-  | "MainRadar"
-  | "MainSec"
-  | "DoubleAttack"
-  | "FBA"
-  | "BBA"
-  | "BA"
-  | "Zuiun"
-  | "AirSea";
+export interface MasterData {
+  gears: MasterGear[];
+  gear_attrs: MasterAttrRule<GearAttr>[];
+  ships: MasterShip[];
+  ship_attrs: MasterAttrRule<ShipAttr>[];
+  ibonuses: MasterIBonuses;
+  equippable: MasterEquippable;
+  formation: NestedFormationDef[];
+  anti_air_cutin: AntiAirCutinDef[];
+  day_cutin: DayCutinDef[];
+  night_cutin: NightCutinDef[];
+}
 
-export type Role = "Main" | "Escort";
+export interface MasterConfig {
+  formation: NestedFormationDef[];
+  anti_air_cutin: AntiAirCutinDef[];
+  day_cutin: DayCutinDef[];
+  night_cutin: NightCutinDef[];
+}
+
+export interface MasterAttrRule<T> {
+  tag: T;
+  name: string;
+  expr: string;
+}
 
 export type GearCategory =
   | "Fighter"
@@ -327,13 +258,6 @@ export type GearType =
 
 export type Engagement = "GreenT" | "Parallel" | "HeadOn" | "RedT";
 
-export interface ShellingSupportSimulatorParams {
-  attacker_formation: Formation;
-  target_formation: Formation;
-  engagement: Engagement;
-  custom_mods: CustomModifiers;
-}
-
 export interface CompDayCutinRateInfo {
   main: FleetDayCutinRateInfo;
   escort: FleetDayCutinRateInfo | null;
@@ -356,6 +280,46 @@ export interface DayCutinRateInfo {
   total_cutin_rate: number | null;
 }
 
+export interface EBonuses {
+  firepower: number;
+  torpedo: number;
+  anti_air: number;
+  armor: number;
+  evasion: number;
+  asw: number;
+  los: number;
+  bombing: number;
+  accuracy: number;
+  range: number;
+}
+
+export interface ShipInput {
+  ship_id: number;
+  ctype: number;
+  stype: number;
+  yomi: string;
+}
+
+export interface GearInput {
+  gear_id: number;
+  types: GearTypeIdArray;
+  firepower: number;
+  torpedo: number;
+  anti_air: number;
+  armor: number;
+  evasion: number;
+  asw: number;
+  los: number;
+  bombing: number;
+  accuracy: number;
+  range: number;
+  radius: number;
+  stars: number;
+  ace: number;
+}
+
+export type GearVecInput = GearInput[];
+
 export type ShipAttr =
   | "Unknown"
   | "Abyssal"
@@ -372,6 +336,15 @@ export type ShipAttr =
   | "BattleshipSummerPrincess"
   | "HeavyCruiserSummerPrincess";
 
+export type AirStateRank = "Rank0" | "Rank1" | "Rank2" | "Rank3";
+
+export type AirState =
+  | "AirSupremacy"
+  | "AirSuperiority"
+  | "AirParity"
+  | "AirDenial"
+  | "AirIncapability";
+
 export interface MasterIBonuses {
   shelling_power: MasterIBonusRule[];
   carrier_shelling_power: MasterIBonusRule[];
@@ -396,30 +369,46 @@ export interface MasterIBonusRule {
   formula: CompiledEvaler;
 }
 
-export type ShellingAttackType = "Normal" | "Carrier";
-
 export interface NightSituation {
   night_contact_rank: ContactRank | null;
   starshell: boolean;
   searchlight: boolean;
 }
 
-export interface CompContactChanceInfo {
-  single: AirstrikeContactChance[] | null;
-  combined: AirstrikeContactChance[] | null;
+export interface FleetCutinAnalysis {
+  shelling: FleetCutinInfo[];
+  night: FleetCutinInfo[];
 }
 
-export interface AirstrikeContactChance {
-  air_state: AirState;
-  trigger_rate: number;
-  rank3: number;
-  rank2: number;
-  rank1: number;
-  total: number;
+export interface FleetCutinInfo {
+  cutin: FleetCutin;
+  rate: number | null;
+  formation: Formation;
+  items: FleetCutinInfoItem[];
 }
 
-export type GearAttr =
-  | "Unknown"
+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;
+  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_map: NumMap<number, number>;
+  damage_state_map: NumMap<DamageState, number>;
+}
+
+export type GearAttr =
+  | "Unknown"
   | "Abyssal"
   | "HighAngleMount"
   | "NightFighter"
@@ -467,6 +456,131 @@ export type SingleFormation =
 
 export type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
 
+export interface CompAntiAirInfo {
+  fleet_adjusted_anti_air: number;
+  ships: ShipAntiAirInfo[];
+  anti_air_cutin_chance: [number, number][];
+}
+
+export interface ShipAntiAirInfo {
+  ship_id: 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 CompContactChanceInfo {
+  single: AirstrikeContactChance[] | null;
+  combined: AirstrikeContactChance[] | null;
+}
+
+export interface AirstrikeContactChance {
+  air_state: AirState;
+  trigger_rate: number;
+  rank3: number;
+  rank2: number;
+  rank1: number;
+  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 interface MasterEquippable {
+  equip_stype: EquipStype[];
+  equip_exslot: number[];
+  equip_ship: MstEquipShip[];
+  equip_exslot_ship: MstEquipExslotShip[];
+}
+
+export interface MstEquipExslotShip {
+  api_slotitem_id: number;
+  api_ship_ids: number[];
+}
+
+export interface MstEquipShip {
+  api_ship_id: number;
+  api_equip_type: number[];
+}
+
+export interface EquipStype {
+  id: number;
+  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 };
+
+export type DayBattleAttackType =
+  | { t: "Shelling"; c: ShellingAttackType }
+  | { t: "Asw"; c: AswAttackType };
+
 export interface AttackInfo<AttackType, Cutin> {
   attack_type: AttackType;
   items: AttackInfoItem<Cutin>[];
@@ -488,22 +602,6 @@ export interface AttackStats {
   damage: DamageInfo | null;
 }
 
-export interface CompAntiAirInfo {
-  fleet_adjusted_anti_air: number;
-  ships: ShipAntiAirInfo[];
-  anti_air_cutin_chance: [number, number][];
-}
-
-export interface ShipAntiAirInfo {
-  ship_id: 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 ShipStateMap = Record<ShipKey, ShipState>;
 
 export type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
@@ -554,7 +652,7 @@ export interface FleetState {
   s7?: ShipState;
 }
 
-export interface ShipState {
+export interface ShipState extends GearVecState, SlotSizeVecState {
   id?: string;
   ship_id: number;
   level?: number;
@@ -571,26 +669,23 @@ export interface ShipState {
   asw_mod?: number;
   los_mod?: number;
   luck_mod?: number;
-  g1?: GearState;
-  g2?: GearState;
-  g3?: GearState;
-  g4?: GearState;
-  g5?: GearState;
-  gx?: GearState;
+}
+
+export interface SlotSizeVecState {
   ss1?: number;
   ss2?: number;
   ss3?: number;
   ss4?: number;
   ss5?: number;
-  overrides?: ShipOverrides;
 }
 
-export interface ShipOverrides {
-  naked_max_hp?: number;
-  naked_luck?: number;
-  naked_evasion?: number;
-  naked_asw?: number;
-  naked_los?: number;
+export interface GearVecState {
+  g1?: GearState;
+  g2?: GearState;
+  g3?: GearState;
+  g4?: GearState;
+  g5?: GearState;
+  gx?: GearState;
 }
 
 export interface GearState {
@@ -600,155 +695,6 @@ export interface GearState {
   stars?: number;
 }
 
-export interface MasterEquippable {
-  equip_stype: EquipStype[];
-  equip_exslot: number[];
-  equip_ship: MstEquipShip[];
-  equip_exslot_ship: MstEquipExslotShip[];
-}
-
-export interface MstEquipExslotShip {
-  api_slotitem_id: number;
-  api_ship_ids: number[];
-}
-
-export interface MstEquipShip {
-  api_ship_id: number;
-  api_equip_type: number[];
-}
-
-export interface EquipStype {
-  id: number;
-  equip_type: number[];
-}
-
-export type NightBattleAttackType =
-  | { t: "NightAttack"; c: NightAttackType }
-  | { t: "Asw"; c: AswAttackType };
-
-export type DayBattleAttackType =
-  | { t: "Shelling"; c: ShellingAttackType }
-  | { t: "Asw"; c: AswAttackType };
-
-export type SlotSizeVec = (number | null)[];
-
-export type Side = "Player" | "Enemy";
-
-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 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 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 MasterShip {
   ship_id: number;
   name: string;
@@ -766,6 +712,7 @@ export interface MasterShip {
   los: StatInterval;
   luck: StatInterval;
   torpedo_accuracy?: number;
+  basic_evasion_term?: number;
   speed: number;
   range?: number;
   fuel?: number;
@@ -807,30 +754,61 @@ export interface WarfareAnalyzerShipEnvironment {
   custom_mods: CustomModifiers;
 }
 
-export interface FleetNightCutinRateInfo {
-  night_contact_chance: NightContactChance;
-  ships: ShipNightCutinRateInfo[];
+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 ShipNightCutinRateInfo {
-  ship_id: number;
-  normal: NightCutinRateInfo;
-  chuuha: NightCutinRateInfo;
+export interface NightCutinDef {
+  tag: NightCutin;
+  hits: number;
+  type_factor: number | null;
+  power_mod: number | null;
+  accuracy_mod: number | null;
 }
 
-export interface NightCutinRateInfo {
-  cutin_term: number | null;
-  rates: [NightCutin | null, number | null][];
+export interface DayCutinDef {
+  tag: DayCutin;
+  hits: number;
+  type_factor: number | null;
+  power_mod: number | null;
+  accuracy_mod: number | null;
 }
 
-export interface NightContactChance {
-  rank1: number;
-  rank2: number;
-  rank3: number;
-  total: number;
+export interface AntiAirCutinDef {
+  id: number;
+  type_factor: number | null;
+  multiplier: number | null;
+  guaranteed: number | null;
+  sequential: boolean | null;
 }
 
-export type GearTypeIdArray = [number, number, number, number, number];
+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 type SpecialEnemyType =
   | "None"
@@ -857,8 +835,6 @@ export type FleetCutin =
 
 export type ContactRank = "Rank1" | "Rank2" | "Rank3";
 
-export type AirWaveType = "Jet" | "LandBase" | "Carrier";
-
 export interface SimulatorResult {
   items: SimulatorResultItem[];
   sunk_vec: [number, number, number][];
@@ -873,6 +849,29 @@ export interface SimulatorResultItem {
 
 export type AswAttackType = "DepthCharge" | "Aircraft";
 
+export interface FleetNightCutinRateInfo {
+  night_contact_chance: NightContactChance;
+  ships: ShipNightCutinRateInfo[];
+}
+
+export interface ShipNightCutinRateInfo {
+  ship_id: number;
+  normal: NightCutinRateInfo;
+  chuuha: NightCutinRateInfo;
+}
+
+export interface NightCutinRateInfo {
+  cutin_term: number | null;
+  rates: [NightCutin | null, number | null][];
+}
+
+export interface NightContactChance {
+  rank1: number;
+  rank2: number;
+  rank3: number;
+  total: number;
+}
+
 /**
  */
 export class AirSquadron {