fleethub-core 1.3.1 → 1.3.2

package/pkg/fleethub_core.d.ts

@@ -1,30 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-/**
- * @param {Gear} gear
- * @returns {boolean}
- */
-export function air_squadron_can_equip(gear: Gear): boolean;
-/**
- * @param {OrgType} org_type
- * @returns {boolean}
- */
-export function org_type_is_single(org_type: OrgType): boolean;
-/**
- * @param {OrgType} org_type
- * @returns {Formation}
- */
-export function org_type_default_formation(org_type: OrgType): Formation;
-/**
- * @param {OrgType} org_type
- * @returns {boolean}
- */
-export function org_type_is_player(org_type: OrgType): boolean;
-/**
- * @param {OrgType} org_type
- * @returns {Side}
- */
-export function org_type_side(org_type: OrgType): Side;
 /**
  */
 export function set_panic_hook(): void;
@@ -63,6 +38,18 @@ export type DamageInfo = {
   damage_state_map: NumMap<DamageState, number>;
 };
 
+export type NumMap<K, V> = Partial<Record<K, V>>;
+
+export type OrgType =
+  | "Single"
+  | "CarrierTaskForce"
+  | "SurfaceTaskForce"
+  | "TransportEscort"
+  | "EnemySingle"
+  | "EnemyCombined";
+
+export type ContactRank = "Rank1" | "Rank2" | "Rank3";
+
 export type AirWaveType = "Jet" | "LandBase" | "Carrier";
 
 export type SimulatorResult = {
@@ -77,60 +64,6 @@ export type SimulatorResultItem = {
   damage_state_map: Record<DamageState, number>;
 };
 
-export type FleetNightCutinRateInfo = {
-  night_contact_chance: NightContactChance;
-  ships: ShipNightCutinRateInfo[];
-};
-
-export type ShipNightCutinRateInfo = {
-  ship_id: number;
-  normal: NightCutinRateInfo;
-  chuuha: NightCutinRateInfo;
-};
-
-export type NightCutinRateInfo = {
-  cutin_term: number | null;
-  rates: [NightCutin | null, number | null][];
-};
-
-export type NightContactChance = {
-  rank1: number;
-  rank2: number;
-  rank3: number;
-  total: number;
-};
-
-export type NumMap<K, V> = Partial<Record<K, V>>;
-
-export type CompMeta = { fleets: Record<FleetType, FleetMeta> };
-
-export type FleetMeta = {
-  id: string;
-  len: number;
-  ships: [string, ShipMeta | null][];
-};
-
-export type ShipMeta = { id: string; ship_id: number };
-
-export type ContactRank = "Rank1" | "Rank2" | "Rank3";
-
-export type WarfareContext = {
-  attacker_env: WarfareShipEnvironment;
-  target_env: WarfareShipEnvironment;
-  engagement: Engagement;
-  air_state: AirState;
-  custom_mods: CustomModifiers;
-};
-
-export type WarfareShipEnvironment = {
-  org_type: OrgType;
-  role: Role;
-  ship_index: number;
-  fleet_len: number;
-  formation: Formation;
-  fleet_los_mod: number | null;
-};
-
 export type AswAttackType = "DepthCharge" | "Aircraft";
 
 export type MasterData = {
@@ -204,7 +137,7 @@ export type MasterIBonuses = {
   defense_power: MasterIBonusRule[];
   contact_selection: MasterIBonusRule[];
   fighter_power: MasterIBonusRule[];
-  adjusted_anti_air: MasterIBonusRule[];
+  ship_anti_air: MasterIBonusRule[];
   fleet_anti_air: MasterIBonusRule[];
   elos: MasterIBonusRule[];
 };
@@ -236,7 +169,7 @@ export type MasterGear = {
   radius?: number;
   cost?: number;
   improvable?: boolean;
-  adjusted_anti_air_resistance?: number;
+  ship_anti_air_resistance?: number;
   fleet_anti_air_resistance?: number;
 };
 
@@ -332,6 +265,18 @@ export type ShipAttr =
   | "BattleshipSummerPrincess"
   | "HeavyCruiserSummerPrincess";
 
+export type Role = "Main" | "Escort";
+
+export type CompMeta = { fleets: Record<FleetType, FleetMeta> };
+
+export type FleetMeta = {
+  id: string;
+  len: number;
+  ships: [string, ShipMeta | null][];
+};
+
+export type ShipMeta = { id: string; ship_id: number };
+
 export type GearAttr =
   | "Abyssal"
   | "HighAngleMount"
@@ -362,6 +307,23 @@ export type GearAttr =
   | "SemiNightPlane"
   | "HighAltitudeInterceptor";
 
+export type WarfareContext = {
+  attacker_env: WarfareShipEnvironment;
+  target_env: WarfareShipEnvironment;
+  engagement: Engagement;
+  air_state: AirState;
+  custom_mods: CustomModifiers;
+};
+
+export type WarfareShipEnvironment = {
+  org_type: OrgType;
+  role: Role;
+  ship_index: number;
+  fleet_len: number;
+  formation: Formation;
+  fleet_los_mod: number | null;
+};
+
 export type ShipType =
   | "Unknown"
   | "DE"
@@ -517,107 +479,28 @@ export type SpecialEnemyModifiers = {
 
 export type AttackPowerModifier = { a: number; b: number };
 
-export type GearState = {
-  id?: string;
-  gear_id: number;
-  exp?: number;
-  stars?: number;
-};
-
-export type ShipState = {
-  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;
-  g1?: GearState;
-  g2?: GearState;
-  g3?: GearState;
-  g4?: GearState;
-  g5?: GearState;
-  gx?: GearState;
-  ss1?: number;
-  ss2?: number;
-  ss3?: number;
-  ss4?: number;
-  ss5?: number;
-};
+export type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
 
-export type FleetState = {
-  id?: string;
-  len?: number;
-  s1?: ShipState;
-  s2?: ShipState;
-  s3?: ShipState;
-  s4?: ShipState;
-  s5?: ShipState;
-  s6?: ShipState;
-  s7?: ShipState;
+export type FleetCutinAnalysis = {
+  shelling: FleetCutinInfo[];
+  night: FleetCutinInfo[];
 };
 
-export type AirSquadronMode = "Sortie" | "AirDefense";
-
-export type AirSquadronState = {
-  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 FleetCutinInfo = {
+  cutin: FleetCutin;
+  formation: Formation;
+  items: FleetCutinInfoItem[];
 };
 
-export type Side = "Player" | "Enemy";
-
-export type OrgType =
-  | "Single"
-  | "CarrierTaskForce"
-  | "SurfaceTaskForce"
-  | "TransportEscort"
-  | "EnemySingle"
-  | "EnemyCombined";
-
-export type Role = "Main" | "Escort";
-
-export type 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 type FleetCutinInfoItem = {
+  ship_id: number;
+  cutin: FleetCutin;
+  fleet_cutin_mod: number;
+  stats: AttackStats;
 };
 
-export type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
-
-export type ShipStateMap = Record<ShipKey, ShipState>;
-
 export type CompAntiAirInfo = {
-  fleet_anti_air: number;
+  fleet_adjusted_anti_air: number;
   ships: ShipAntiAirInfo[];
   anti_air_cutin_chance: [number, number][];
 };
@@ -627,11 +510,28 @@ export type ShipAntiAirInfo = {
   adjusted_anti_air: number | null;
   proportional_shotdown_rate: number | null;
   fixed_shotdown_number: number | null;
-  minimum_bonus: number | null;
+  guaranteed: number | null;
   anti_air_cutin_chance: [number, number][];
   anti_air_propellant_barrage_chance: number | null;
 };
 
+export type CompContactChanceInfo = {
+  single: AirstrikeContactChance[] | null;
+  combined: AirstrikeContactChance[] | null;
+};
+
+export type AirstrikeContactChance = {
+  air_state: AirState;
+  trigger_rate: number;
+  rank3: number;
+  rank2: number;
+  rank1: number;
+  total: number;
+};
+
+import * as bindings from "../bindings";
+export * from "../bindings";
+
 export type Formation = SingleFormation | CombinedFormation;
 
 export type CombinedFormation =
@@ -648,8 +548,6 @@ export type SingleFormation =
   | "LineAbreast"
   | "Vanguard";
 
-export type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
-
 export type ShellingAttackType = "Normal" | "Carrier";
 
 export type NightBattleAttackType =
@@ -660,24 +558,6 @@ export type DayBattleAttackType =
   | { t: "Shelling"; c: ShellingAttackType }
   | { t: "Asw"; c: AswAttackType };
 
-export type FleetCutinAnalysis = {
-  shelling: FleetCutinInfo[];
-  night: FleetCutinInfo[];
-};
-
-export type FleetCutinInfo = {
-  cutin: FleetCutin;
-  formation: Formation;
-  items: FleetCutinInfoItem[];
-};
-
-export type FleetCutinInfoItem = {
-  ship_id: number;
-  cutin: FleetCutin;
-  fleet_cutin_mod: number;
-  stats: AttackStats;
-};
-
 export type AttackInfo<AttackType, Cutin> = {
   attack_type: AttackType;
   items: AttackInfoItem<Cutin>[];
@@ -699,47 +579,94 @@ export type AttackStats = {
   damage: DamageInfo | null;
 };
 
-export type CompContactChanceInfo = {
-  single: AirstrikeContactChance[] | null;
-  combined: AirstrikeContactChance[] | null;
-};
+export type SlotSizeVec = (number | null)[];
 
-export type AirstrikeContactChance = {
-  air_state: AirState;
-  trigger_rate: number;
-  rank3: number;
-  rank2: number;
-  rank1: number;
-  total: number;
+export type ShipStateMap = Record<ShipKey, ShipState>;
+
+export type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
+
+export type 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;
 };
 
-import * as bindings from "../bindings";
-export * from "../bindings";
+export type AirSquadronState = {
+  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 SlotSizeVec = (number | null)[];
+export type AirSquadronMode = "Sortie" | "AirDefense";
 
-export type NightAttackType = "Normal" | "ArkRoyal" | "Carrier";
+export type FleetState = {
+  id?: string;
+  len?: number;
+  s1?: ShipState;
+  s2?: ShipState;
+  s3?: ShipState;
+  s4?: ShipState;
+  s5?: ShipState;
+  s6?: ShipState;
+  s7?: ShipState;
+};
 
-export type NightSpecialAttack =
-  | { NightCutin: NightCutin }
-  | { FleetCutin: FleetCutin };
+export type ShipState = {
+  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;
+  g1?: GearState;
+  g2?: GearState;
+  g3?: GearState;
+  g4?: GearState;
+  g5?: GearState;
+  gx?: GearState;
+  ss1?: number;
+  ss2?: number;
+  ss3?: number;
+  ss4?: number;
+  ss5?: number;
+};
 
-export type NightCutin =
-  | "MainTorpRadar"
-  | "TorpLookoutRadar"
-  | "TorpTsloTorp"
-  | "TorpTsloDrum"
-  | "DoubleAttack"
-  | "TorpTorpMain"
-  | "TorpTorpTorp"
-  | "MainMainSec"
-  | "MainMainMain"
-  | "SubTorpTorp"
-  | "SubRadarTorp"
-  | "Cvci1_25"
-  | "Cvci1_20"
-  | "Cvci1_18"
-  | "Photobomber";
+export type GearState = {
+  id?: string;
+  gear_id: number;
+  exp?: number;
+  stars?: number;
+};
 
 export type HitRate = { total: number; normal: number; critical: number };
 
@@ -778,6 +705,8 @@ export type WarfareAnalyzerShipEnvironment = {
   custom_mods: CustomModifiers;
 };
 
+export type Side = "Player" | "Enemy";
+
 export type SpecialEnemyType =
   | "None"
   | "SoftSkinned"
@@ -795,6 +724,29 @@ export type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
 
 export type SpeedGroup = "A" | "B1" | "B2" | "C";
 
+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 type FleetCutin =
   | "NelsonTouch"
   | "NagatoCutin"
@@ -828,7 +780,7 @@ export type AntiAirCutinDef = {
   id: number;
   chance_numer: number | null;
   multiplier: number | null;
-  minimum_bonus: number | null;
+  guaranteed: number | null;
   sequential: boolean | null;
 };
 
@@ -853,6 +805,29 @@ export type FormationWarfareDef = {
   evasion_mod: number | null;
 };
 
+export type FleetNightCutinRateInfo = {
+  night_contact_chance: NightContactChance;
+  ships: ShipNightCutinRateInfo[];
+};
+
+export type ShipNightCutinRateInfo = {
+  ship_id: number;
+  normal: NightCutinRateInfo;
+  chuuha: NightCutinRateInfo;
+};
+
+export type NightCutinRateInfo = {
+  cutin_term: number | null;
+  rates: [NightCutin | null, number | null][];
+};
+
+export type NightContactChance = {
+  rank1: number;
+  rank2: number;
+  rank3: number;
+  total: number;
+};
+
 /**
  */
 export class AirSquadron {
@@ -862,11 +837,6 @@ export class AirSquadron {
    * @returns {Gear | undefined}
    */
   get_gear(key: string): Gear | undefined;
-  /**
-   * @param {Gear} gear
-   * @returns {boolean}
-   */
-  can_equip(gear: Gear): boolean;
   /**
    * @param {number} index
    * @returns {number}
@@ -907,7 +877,7 @@ export class Analyzer {
   /**
    * @param {Comp} comp
    * @param {Formation} formation
-   * @param {number} adjusted_anti_air_resist
+   * @param {number} ship_anti_air_resist
    * @param {number} fleet_anti_air_resist
    * @param {number | undefined} aaci
    * @returns {CompAntiAirInfo}
@@ -915,7 +885,7 @@ export class Analyzer {
   analyze_anti_air(
     comp: Comp,
     formation: Formation,
-    adjusted_anti_air_resist: number,
+    ship_anti_air_resist: number,
     fleet_anti_air_resist: number,
     aaci?: number
   ): CompAntiAirInfo;
@@ -1009,11 +979,11 @@ export class Comp {
    */
   default_formation(): Formation;
   /**
-   * 艦隊対空値
+   * 艦隊防空値
    * @param {number} formation_mod
    * @returns {number}
    */
-  fleet_anti_air(formation_mod: number): number;
+  adjusted_anti_air(formation_mod: number): number;
   /**
    * 制空値
    * @param {boolean} escort_participates
@@ -1281,11 +1251,11 @@ export class Gear {
   /**
    * @returns {number}
    */
-  fleet_anti_air(): number;
+  fleet_anti_air_mod(): number;
   /**
    * @returns {number}
    */
-  adjusted_anti_air(): number;
+  ship_anti_air_mod(): number;
   /**
    * @param {number} slot_size
    * @returns {number}
@@ -1331,6 +1301,10 @@ export class Gear {
    * @returns {number}
    */
   expedition_bonus(): number;
+  /**
+   * @returns {boolean}
+   */
+  can_be_deployed_to_land_base(): boolean;
   /**
    */
   accuracy: number;
@@ -1338,9 +1312,6 @@ export class Gear {
    * @returns {number}
    */
   readonly ace: number;
-  /**
-   */
-  adjusted_anti_air_resistance: number;
   /**
    */
   anti_air: number;
@@ -1417,6 +1388,9 @@ export class Gear {
   /**
    */
   range: number;
+  /**
+   */
+  ship_anti_air_resistance: number;
   /**
    * @returns {number}
    */
@@ -1441,9 +1415,6 @@ export class Gear {
  */
 export class IBonuses {
   free(): void;
-  /**
-   */
-  adjusted_anti_air: number;
   /**
    */
   asw_accuracy: number;
@@ -1480,6 +1451,9 @@ export class IBonuses {
   /**
    */
   shelling_power: number;
+  /**
+   */
+  ship_anti_air: number;
   /**
    */
   torpedo_accuracy: number;
@@ -1781,7 +1755,7 @@ export class Ship {
   /**
    * @returns {number}
    */
-  fleet_anti_air(): number;
+  fleet_anti_air_mod(): number;
   /**
    * @returns {number}
    */