fleethub-core 1.8.2 → 1.8.3

package/node/fleethub_core.d.ts

@@ -8,10 +8,41 @@ export function parse_ship_conditions(value: ShipConditions): ShipConditions;
 /**
  */
 export function set_panic_hook(): void;
+declare namespace Side {
+  export type Player = "Player";
+  export type Enemy = "Enemy";
+}
+
+export type Side = Side.Player | Side.Enemy;
+
 export interface ShipConditions extends ShipPosition {
   formation?: Formation;
 }
 
+declare namespace Role {
+  export type Main = "Main";
+  export type Escort = "Escort";
+}
+
+export type Role = Role.Main | Role.Escort;
+
+declare namespace OrgType {
+  export type Single = "Single";
+  export type CarrierTaskForce = "CarrierTaskForce";
+  export type SurfaceTaskForce = "SurfaceTaskForce";
+  export type TransportEscort = "TransportEscort";
+  export type EnemySingle = "EnemySingle";
+  export type EnemyCombined = "EnemyCombined";
+}
+
+export type OrgType =
+  | OrgType.Single
+  | OrgType.CarrierTaskForce
+  | OrgType.SurfaceTaskForce
+  | OrgType.TransportEscort
+  | OrgType.EnemySingle
+  | OrgType.EnemyCombined;
+
 export interface BattleDefinitions {
   formation: Record<Formation, NestedFormationDef>;
   anti_air_cutin: Record<number, AntiAirCutinDef>;
@@ -73,12 +104,6 @@ export interface FormationCombatModifiersDef {
   evasion_mod?: number;
 }
 
-export interface SupportShellingSimulatorParams {
-  attacker_formation?: Formation;
-  target_formation?: Formation;
-  engagement: Engagement;
-}
-
 export interface ShipAnalyzerConfig {
   air_state?: AirState;
   engagement?: Engagement;
@@ -240,21 +265,6 @@ export interface SimulatorResultItem {
   damage_state_map: Record<DamageState, number>;
 }
 
-declare namespace DamageState {
-  export type Normal = "Normal";
-  export type Shouha = "Shouha";
-  export type Chuuha = "Chuuha";
-  export type Taiha = "Taiha";
-  export type Sunk = "Sunk";
-}
-
-export type DamageState =
-  | DamageState.Normal
-  | DamageState.Shouha
-  | DamageState.Chuuha
-  | DamageState.Taiha
-  | DamageState.Sunk;
-
 declare namespace GearCategory {
   export type Fighter = "Fighter";
   export type Bomber = "Bomber";
@@ -409,6 +419,21 @@ export type GearType =
   | GearType.CbRecon2
   | GearType.SecondaryGun2;
 
+declare namespace DamageState {
+  export type Normal = "Normal";
+  export type Shouha = "Shouha";
+  export type Chuuha = "Chuuha";
+  export type Taiha = "Taiha";
+  export type Sunk = "Sunk";
+}
+
+export type DamageState =
+  | DamageState.Normal
+  | DamageState.Shouha
+  | DamageState.Chuuha
+  | DamageState.Taiha
+  | DamageState.Sunk;
+
 declare namespace AirStateRank {
   export type Rank0 = "Rank0";
   export type Rank1 = "Rank1";
@@ -437,19 +462,21 @@ export type AirState =
   | AirState.AirDenial
   | AirState.AirIncapability;
 
-declare namespace Side {
-  export type Player = "Player";
-  export type Enemy = "Enemy";
+export interface NodeAttackAnalyzerShipConfig extends NightFleetConditions {
+  formation?: Formation;
 }
 
-export type Side = Side.Player | Side.Enemy;
-
-declare namespace Role {
-  export type Main = "Main";
-  export type Escort = "Escort";
+export interface NodeAttackAnalyzerConfig {
+  air_state?: AirState;
+  engagement?: Engagement;
+  left?: NodeAttackAnalyzerShipConfig;
+  right?: NodeAttackAnalyzerShipConfig;
 }
 
-export type Role = Role.Main | Role.Escort;
+export interface NodeAttackAnalysis {
+  left: AttackAnalysis;
+  right: AttackAnalysis;
+}
 
 export interface ShipPosition {
   org_type?: OrgType;
@@ -585,35 +612,6 @@ export interface MasterAttrRule<T> {
   expr: string;
 }
 
-export interface NodeAttackAnalyzerShipConfig extends NightFleetConditions {
-  formation?: Formation;
-}
-
-export interface NodeAttackAnalyzerConfig {
-  air_state?: AirState;
-  engagement?: Engagement;
-  left?: NodeAttackAnalyzerShipConfig;
-  right?: NodeAttackAnalyzerShipConfig;
-}
-
-export interface NodeAttackAnalysis {
-  left: AttackAnalysis;
-  right: AttackAnalysis;
-}
-
-export interface AttackAnalyzerConfig {
-  air_state?: AirState;
-  engagement?: Engagement;
-  attacker?: AttackAnalyzerShipConfig;
-  target?: AttackAnalyzerShipConfig;
-}
-
-export interface AttackAnalyzerShipConfig
-  extends ShipConditions,
-    NightFleetConditions {
-  fleet_los_mod?: number | null;
-}
-
 export interface EBonuses {
   firepower: number;
   torpedo: number;
@@ -687,23 +685,12 @@ export type ShipAttr =
   | ShipAttr.BattleshipSummerPrincess
   | ShipAttr.HeavyCruiserSummerPrincess;
 
-declare namespace OrgType {
-  export type Single = "Single";
-  export type CarrierTaskForce = "CarrierTaskForce";
-  export type SurfaceTaskForce = "SurfaceTaskForce";
-  export type TransportEscort = "TransportEscort";
-  export type EnemySingle = "EnemySingle";
-  export type EnemyCombined = "EnemyCombined";
+export interface SupportShellingSimulatorParams {
+  attacker_formation?: Formation;
+  target_formation?: Formation;
+  engagement: Engagement;
 }
 
-export type OrgType =
-  | OrgType.Single
-  | OrgType.CarrierTaskForce
-  | OrgType.SurfaceTaskForce
-  | OrgType.TransportEscort
-  | OrgType.EnemySingle
-  | OrgType.EnemyCombined;
-
 declare namespace GearAttr {
   export type Unknown = "Unknown";
   export type Abyssal = "Abyssal";
@@ -884,6 +871,12 @@ export interface DamageReport {
   damage_state_density: Histogram<DamageState, number>;
 }
 
+export interface AttackAnalyzerShipConfig
+  extends ShipConditions,
+    NightFleetConditions {
+  fleet_los_mod?: number | null;
+}
+
 export interface CompAntiAirAnalysis {
   fleet_adjusted_anti_air: number;
   ships: AntiAirReport[];
@@ -1095,6 +1088,28 @@ export interface AttackAnalysis {
   support_shelling: ActionReport<SupportShellingStyle>;
 }
 
+export interface NightFleetConditions {
+  night_contact_rank?: ContactRank | null;
+  starshell_index?: number | null;
+  searchlight_index?: number | null;
+  activates_large_searchlight?: boolean;
+}
+
+export interface NightConditions {
+  player?: NightFleetConditions;
+  enemy?: NightFleetConditions;
+}
+
+export interface BattleConditions {
+  org_type: OrgType;
+  role: Role;
+  ship_index: number;
+  fleet_len: number;
+  formation: Formation;
+  fleet_los_mod: number | null;
+  night_conditions: NightFleetConditions;
+}
+
 export interface MasterShip {
   ship_id: number;
   name: string;
@@ -1128,6 +1143,31 @@ export interface MasterShip {
 
 export type StatInterval = [number | null, 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_resist?: number;
+  fleet_anti_air_resist?: number;
+}
+
 export interface CompAnalyzerConfig {
   engagement: Engagement;
   formation: Formation;
@@ -1290,53 +1330,6 @@ export type SpeedGroup =
 
 export type SlotSizeVec = (number | null)[];
 
-export interface NightFleetConditions {
-  night_contact_rank?: ContactRank | null;
-  starshell_index?: number | null;
-  searchlight_index?: number | null;
-  activates_large_searchlight?: boolean;
-}
-
-export interface NightConditions {
-  player?: NightFleetConditions;
-  enemy?: NightFleetConditions;
-}
-
-export interface BattleConditions {
-  org_type: OrgType;
-  role: Role;
-  ship_index: number;
-  fleet_len: number;
-  formation: Formation;
-  fleet_los_mod: number | null;
-  night_conditions: NightFleetConditions;
-}
-
-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_resist?: number;
-  fleet_anti_air_resist?: number;
-}
-
 export interface ActionReport<T> {
   data: Record<string, AttackReport<T>>;
   damage_state_density: Histogram<DamageState, number> | null;
@@ -1494,17 +1487,6 @@ export class AirSquadron {
  */
 export class Analyzer {
   free(): void;
-  /**
-   * @param {AttackAnalyzerConfig} config
-   * @param {Ship} attacker
-   * @param {Ship} target
-   * @returns {AttackAnalysis}
-   */
-  analyze_attack(
-    config: AttackAnalyzerConfig,
-    attacker: Ship,
-    target: Ship
-  ): AttackAnalysis;
   /**
    * @param {ShipAnalyzerConfig} config
    * @param {Ship} left
@@ -1512,7 +1494,7 @@ export class Analyzer {
    * @param {boolean} attacker_is_left
    * @returns {AttackAnalysis}
    */
-  analyze_attack_by_ship_analyzer(
+  analyze_ship_attack(
     config: ShipAnalyzerConfig,
     left: Ship,
     right: Ship,

package/node/fleethub_core.js

@@ -122,6 +122,21 @@ module.exports.parse_ship_conditions = function(value) {
     return takeObject(ret);
 };
 
+const u32CvtShim = new Uint32Array(2);
+
+const uint64CvtShim = new BigUint64Array(u32CvtShim.buffer);
+
+function getArrayU8FromWasm0(ptr, len) {
+    return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len);
+}
+
+function passArray8ToWasm0(arg, malloc) {
+    const ptr = malloc(arg.length * 1);
+    getUint8Memory0().set(arg, ptr / 1);
+    WASM_VECTOR_LEN = arg.length;
+    return ptr;
+}
+
 function _assertClass(instance, klass) {
     if (!(instance instanceof klass)) {
         throw new Error(`expected instance of ${klass.name}`);
@@ -129,10 +144,6 @@ function _assertClass(instance, klass) {
     return instance.ptr;
 }
 
-const u32CvtShim = new Uint32Array(2);
-
-const uint64CvtShim = new BigUint64Array(u32CvtShim.buffer);
-
 let cachedFloat64Memory0 = new Float64Array();
 
 function getFloat64Memory0() {
@@ -142,17 +153,6 @@ function getFloat64Memory0() {
     return cachedFloat64Memory0;
 }
 
-function getArrayU8FromWasm0(ptr, len) {
-    return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len);
-}
-
-function passArray8ToWasm0(arg, malloc) {
-    const ptr = malloc(arg.length * 1);
-    getUint8Memory0().set(arg, ptr / 1);
-    WASM_VECTOR_LEN = arg.length;
-    return ptr;
-}
-
 function isLikeNone(x) {
     return x === undefined || x === null;
 }
@@ -391,28 +391,16 @@ class Analyzer {
         wasm.__wbg_analyzer_free(ptr);
     }
     /**
-    * @param {AttackAnalyzerConfig} config
-    * @param {Ship} attacker
-    * @param {Ship} target
-    * @returns {AttackAnalysis}
-    */
-    analyze_attack(config, attacker, target) {
-        _assertClass(attacker, Ship);
-        _assertClass(target, Ship);
-        const ret = wasm.analyzer_analyze_attack(this.ptr, addHeapObject(config), attacker.ptr, target.ptr);
-        return takeObject(ret);
-    }
-    /**
     * @param {ShipAnalyzerConfig} config
     * @param {Ship} left
     * @param {Ship} right
     * @param {boolean} attacker_is_left
     * @returns {AttackAnalysis}
     */
-    analyze_attack_by_ship_analyzer(config, left, right, attacker_is_left) {
+    analyze_ship_attack(config, left, right, attacker_is_left) {
         _assertClass(left, Ship);
         _assertClass(right, Ship);
-        const ret = wasm.analyzer_analyze_attack_by_ship_analyzer(this.ptr, addHeapObject(config), left.ptr, right.ptr, attacker_is_left);
+        const ret = wasm.analyzer_analyze_ship_attack(this.ptr, addHeapObject(config), left.ptr, right.ptr, attacker_is_left);
         return takeObject(ret);
     }
     /**
@@ -3149,7 +3137,7 @@ module.exports.__wbindgen_string_new = function(arg0, arg1) {
     return addHeapObject(ret);
 };
 
-module.exports.__wbg_createEquipmentBonuses_4dfd93761a82c393 = function(arg0, arg1) {
+module.exports.__wbg_createEquipmentBonuses_d215617bb16aa6f4 = function(arg0, arg1) {
     const ret = createEquipmentBonuses(takeObject(arg0), takeObject(arg1));
     return addHeapObject(ret);
 };

package/node/fleethub_core_bg.wasm.d.ts

@@ -2,99 +2,6 @@
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
 export function parse_ship_conditions(a: number): number;
-export function __wbg_analyzer_free(a: number): void;
-export function analyzer_analyze_attack(a: number, b: number, c: number, d: number): number;
-export function analyzer_analyze_attack_by_ship_analyzer(a: number, b: number, c: number, d: number, e: number): number;
-export function analyzer_analyze_node_attack(a: number, b: number, c: number, d: number, e: number, f: number): number;
-export function analyzer_analyze_comp(a: number, b: number, c: number): number;
-export function analyzer_simulate_support_shelling(a: number, b: number, c: number, d: number, e: number, f: number): void;
-export function __wbg_ship_free(a: number): void;
-export function __wbg_get_ship_id(a: number, b: number): void;
-export function __wbg_set_ship_id(a: number, b: number, c: number): void;
-export function __wbg_get_ship_hash(a: number, b: number): void;
-export function __wbg_get_ship_ship_id(a: number): number;
-export function __wbg_get_ship_level(a: number): number;
-export function __wbg_get_ship_current_hp(a: number): number;
-export function __wbg_get_ship_morale(a: number): number;
-export function __wbg_get_ship_ammo(a: number): number;
-export function __wbg_get_ship_fuel(a: number): number;
-export function __wbg_get_ship_ship_type(a: number): number;
-export function __wbg_get_ship_ctype(a: number): number;
-export function __wbg_get_ship_slots(a: number): number;
-export function __wbg_set_ship_slots(a: number, b: number): void;
-export function ship_naked_firepower(a: number): number;
-export function ship_naked_torpedo(a: number): number;
-export function ship_naked_armor(a: number): number;
-export function ship_naked_anti_air(a: number): number;
-export function ship_naked_evasion(a: number): number;
-export function ship_naked_asw(a: number): number;
-export function ship_naked_los(a: number): number;
-export function ship_firepower(a: number): number;
-export function ship_torpedo(a: number): number;
-export function ship_armor(a: number): number;
-export function ship_anti_air(a: number): number;
-export function ship_evasion(a: number): number;
-export function ship_asw(a: number): number;
-export function ship_los(a: number): number;
-export function ship_default(): number;
-export function ship_eq_id(a: number, b: number, c: number): number;
-export function ship_state(a: number): number;
-export function ship_custom_power_mods(a: number): number;
-export function ship_meta(a: number): number;
-export function ship_name(a: number, b: number): void;
-export function ship_yomi(a: number, b: number): void;
-export function ship_stype(a: number): number;
-export function ship_sort_id(a: number): number;
-export function ship_remodel_rank(a: number): number;
-export function ship_slotnum(a: number): number;
-export function ship_next_id(a: number): number;
-export function ship_useful(a: number): number;
-export function ship_damage_state(a: number): number;
-export function ship_morale_state(a: number): number;
-export function ship_category(a: number): number;
-export function ship_has_attr(a: number, b: number): number;
-export function ship_gear_keys(a: number): number;
-export function ship_get_gear(a: number, b: number, c: number): number;
-export function ship_get_damage_bound(a: number, b: number): number;
-export function ship_get_remaining_fuel(a: number, b: number, c: number): number;
-export function ship_get_remaining_ammo(a: number, b: number, c: number): number;
-export function ship_has_unknown_stat(a: number, b: number, c: number): number;
-export function ship_get_naked_stat(a: number, b: number, c: number): number;
-export function ship_get_stat_interval_left(a: number, b: number, c: number): number;
-export function ship_get_stat_interval_right(a: number, b: number, c: number): number;
-export function ship_get_gear_stat(a: number, b: number, c: number): number;
-export function ship_get_ebonus(a: number, b: number, c: number): number;
-export function ship_get_stat_mod(a: number, b: number, c: number): number;
-export function ship_is_abyssal(a: number): number;
-export function ship_is_submarine(a: number): number;
-export function ship_can_equip(a: number, b: number, c: number, d: number): number;
-export function ship_max_hp(a: number): number;
-export function ship_max_ammo(a: number): number;
-export function ship_max_fuel(a: number): number;
-export function ship_naked_range(a: number): number;
-export function ship_naked_speed(a: number): number;
-export function ship_luck(a: number): number;
-export function ship_range(a: number): number;
-export function ship_speed(a: number): number;
-export function ship_accuracy(a: number): number;
-export function ship_innate_torpedo_accuracy(a: number): number;
-export function ship_is_installation(a: number): number;
-export function ship_get_slot_size(a: number, b: number): number;
-export function ship_get_max_slot_size(a: number, b: number): number;
-export function ship_remaining_ammo_mod(a: number): number;
-export function ship_remaining_fuel_mod(a: number): number;
-export function ship_fighter_power(a: number, b: number, c: number): void;
-export function ship_fleet_los_factor(a: number, b: number): void;
-export function ship_ship_adjusted_anti_air(a: number, b: number, c: number): void;
-export function ship_fleet_anti_air_mod(a: number): number;
-export function ship_cruiser_fit_bonus(a: number): number;
-export function ship_basic_accuracy_term(a: number, b: number): void;
-export function ship_basic_evasion_term(a: number, b: number): void;
-export function ship_evasion_term(a: number, b: number, c: number, d: number, e: number): void;
-export function ship_basic_defense_power(a: number, b: number, c: number): void;
-export function ship_transport_point(a: number): number;
-export function ship_elos(a: number, b: number, c: number): void;
-export function ship_ohko_power(a: number, b: number): void;
 export function __wbg_ibonuses_free(a: number): void;
 export function __wbg_get_ibonuses_shelling_power(a: number): number;
 export function __wbg_set_ibonuses_shelling_power(a: number, b: number): void;
@@ -190,6 +97,93 @@ export function gear_is_abyssal_patrolling_attack_hawk(a: number): number;
 export function gear_expedition_bonus(a: number): number;
 export function gear_can_be_deployed_to_land_base(a: number): number;
 export function gear_has_proficiency(a: number): number;
+export function __wbg_ship_free(a: number): void;
+export function __wbg_get_ship_id(a: number, b: number): void;
+export function __wbg_set_ship_id(a: number, b: number, c: number): void;
+export function __wbg_get_ship_hash(a: number, b: number): void;
+export function __wbg_get_ship_ship_id(a: number): number;
+export function __wbg_get_ship_level(a: number): number;
+export function __wbg_get_ship_current_hp(a: number): number;
+export function __wbg_get_ship_morale(a: number): number;
+export function __wbg_get_ship_ammo(a: number): number;
+export function __wbg_get_ship_fuel(a: number): number;
+export function __wbg_get_ship_ship_type(a: number): number;
+export function __wbg_get_ship_ctype(a: number): number;
+export function __wbg_get_ship_slots(a: number): number;
+export function __wbg_set_ship_slots(a: number, b: number): void;
+export function ship_naked_firepower(a: number): number;
+export function ship_naked_torpedo(a: number): number;
+export function ship_naked_armor(a: number): number;
+export function ship_naked_anti_air(a: number): number;
+export function ship_naked_evasion(a: number): number;
+export function ship_naked_asw(a: number): number;
+export function ship_naked_los(a: number): number;
+export function ship_firepower(a: number): number;
+export function ship_torpedo(a: number): number;
+export function ship_armor(a: number): number;
+export function ship_anti_air(a: number): number;
+export function ship_evasion(a: number): number;
+export function ship_asw(a: number): number;
+export function ship_los(a: number): number;
+export function ship_default(): number;
+export function ship_eq_id(a: number, b: number, c: number): number;
+export function ship_state(a: number): number;
+export function ship_custom_power_mods(a: number): number;
+export function ship_meta(a: number): number;
+export function ship_name(a: number, b: number): void;
+export function ship_yomi(a: number, b: number): void;
+export function ship_stype(a: number): number;
+export function ship_sort_id(a: number): number;
+export function ship_remodel_rank(a: number): number;
+export function ship_slotnum(a: number): number;
+export function ship_next_id(a: number): number;
+export function ship_useful(a: number): number;
+export function ship_damage_state(a: number): number;
+export function ship_morale_state(a: number): number;
+export function ship_category(a: number): number;
+export function ship_has_attr(a: number, b: number): number;
+export function ship_gear_keys(a: number): number;
+export function ship_get_gear(a: number, b: number, c: number): number;
+export function ship_get_damage_bound(a: number, b: number): number;
+export function ship_get_remaining_fuel(a: number, b: number, c: number): number;
+export function ship_get_remaining_ammo(a: number, b: number, c: number): number;
+export function ship_has_unknown_stat(a: number, b: number, c: number): number;
+export function ship_get_naked_stat(a: number, b: number, c: number): number;
+export function ship_get_stat_interval_left(a: number, b: number, c: number): number;
+export function ship_get_stat_interval_right(a: number, b: number, c: number): number;
+export function ship_get_gear_stat(a: number, b: number, c: number): number;
+export function ship_get_ebonus(a: number, b: number, c: number): number;
+export function ship_get_stat_mod(a: number, b: number, c: number): number;
+export function ship_is_abyssal(a: number): number;
+export function ship_is_submarine(a: number): number;
+export function ship_can_equip(a: number, b: number, c: number, d: number): number;
+export function ship_max_hp(a: number): number;
+export function ship_max_ammo(a: number): number;
+export function ship_max_fuel(a: number): number;
+export function ship_naked_range(a: number): number;
+export function ship_naked_speed(a: number): number;
+export function ship_luck(a: number): number;
+export function ship_range(a: number): number;
+export function ship_speed(a: number): number;
+export function ship_accuracy(a: number): number;
+export function ship_innate_torpedo_accuracy(a: number): number;
+export function ship_is_installation(a: number): number;
+export function ship_get_slot_size(a: number, b: number): number;
+export function ship_get_max_slot_size(a: number, b: number): number;
+export function ship_remaining_ammo_mod(a: number): number;
+export function ship_remaining_fuel_mod(a: number): number;
+export function ship_fighter_power(a: number, b: number, c: number): void;
+export function ship_fleet_los_factor(a: number, b: number): void;
+export function ship_ship_adjusted_anti_air(a: number, b: number, c: number): void;
+export function ship_fleet_anti_air_mod(a: number): number;
+export function ship_cruiser_fit_bonus(a: number): number;
+export function ship_basic_accuracy_term(a: number, b: number): void;
+export function ship_basic_evasion_term(a: number, b: number): void;
+export function ship_evasion_term(a: number, b: number, c: number, d: number, e: number): void;
+export function ship_basic_defense_power(a: number, b: number, c: number): void;
+export function ship_transport_point(a: number): number;
+export function ship_elos(a: number, b: number, c: number): void;
+export function ship_ohko_power(a: number, b: number): void;
 export function __wbg_comp_free(a: number): void;
 export function __wbg_get_comp_org_type(a: number): number;
 export function __wbg_get_comp_hq_level(a: number): number;
@@ -217,6 +211,11 @@ export function comp_fighter_power(a: number, b: number, c: number, d: number):
 export function comp_elos(a: number, b: number, c: number): void;
 export function comp_transport_point(a: number): number;
 export function comp_get_ship_conditions(a: number, b: number, c: number): number;
+export function __wbg_analyzer_free(a: number): void;
+export function analyzer_analyze_ship_attack(a: number, b: number, c: number, d: number, e: number): number;
+export function analyzer_analyze_node_attack(a: number, b: number, c: number, d: number, e: number, f: number): number;
+export function analyzer_analyze_comp(a: number, b: number, c: number): number;
+export function analyzer_simulate_support_shelling(a: number, b: number, c: number, d: number, e: number, f: number): void;
 export function __wbg_org_free(a: number): void;
 export function __wbg_get_org_id(a: number, b: number): void;
 export function __wbg_set_org_id(a: number, b: number, c: number): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleethub-core",
-  "version": "1.8.2",
+  "version": "1.8.3",
   "license": "UNLICENSED",
   "sideEffects": false,
   "exports": {

package/pkg/fleethub_core.d.ts

@@ -8,10 +8,41 @@ export function parse_ship_conditions(value: ShipConditions): ShipConditions;
 /**
  */
 export function set_panic_hook(): void;
+declare namespace Side {
+  export type Player = "Player";
+  export type Enemy = "Enemy";
+}
+
+export type Side = Side.Player | Side.Enemy;
+
 export interface ShipConditions extends ShipPosition {
   formation?: Formation;
 }
 
+declare namespace Role {
+  export type Main = "Main";
+  export type Escort = "Escort";
+}
+
+export type Role = Role.Main | Role.Escort;
+
+declare namespace OrgType {
+  export type Single = "Single";
+  export type CarrierTaskForce = "CarrierTaskForce";
+  export type SurfaceTaskForce = "SurfaceTaskForce";
+  export type TransportEscort = "TransportEscort";
+  export type EnemySingle = "EnemySingle";
+  export type EnemyCombined = "EnemyCombined";
+}
+
+export type OrgType =
+  | OrgType.Single
+  | OrgType.CarrierTaskForce
+  | OrgType.SurfaceTaskForce
+  | OrgType.TransportEscort
+  | OrgType.EnemySingle
+  | OrgType.EnemyCombined;
+
 export interface BattleDefinitions {
   formation: Record<Formation, NestedFormationDef>;
   anti_air_cutin: Record<number, AntiAirCutinDef>;
@@ -73,12 +104,6 @@ export interface FormationCombatModifiersDef {
   evasion_mod?: number;
 }
 
-export interface SupportShellingSimulatorParams {
-  attacker_formation?: Formation;
-  target_formation?: Formation;
-  engagement: Engagement;
-}
-
 export interface ShipAnalyzerConfig {
   air_state?: AirState;
   engagement?: Engagement;
@@ -240,21 +265,6 @@ export interface SimulatorResultItem {
   damage_state_map: Record<DamageState, number>;
 }
 
-declare namespace DamageState {
-  export type Normal = "Normal";
-  export type Shouha = "Shouha";
-  export type Chuuha = "Chuuha";
-  export type Taiha = "Taiha";
-  export type Sunk = "Sunk";
-}
-
-export type DamageState =
-  | DamageState.Normal
-  | DamageState.Shouha
-  | DamageState.Chuuha
-  | DamageState.Taiha
-  | DamageState.Sunk;
-
 declare namespace GearCategory {
   export type Fighter = "Fighter";
   export type Bomber = "Bomber";
@@ -409,6 +419,21 @@ export type GearType =
   | GearType.CbRecon2
   | GearType.SecondaryGun2;
 
+declare namespace DamageState {
+  export type Normal = "Normal";
+  export type Shouha = "Shouha";
+  export type Chuuha = "Chuuha";
+  export type Taiha = "Taiha";
+  export type Sunk = "Sunk";
+}
+
+export type DamageState =
+  | DamageState.Normal
+  | DamageState.Shouha
+  | DamageState.Chuuha
+  | DamageState.Taiha
+  | DamageState.Sunk;
+
 declare namespace AirStateRank {
   export type Rank0 = "Rank0";
   export type Rank1 = "Rank1";
@@ -437,19 +462,21 @@ export type AirState =
   | AirState.AirDenial
   | AirState.AirIncapability;
 
-declare namespace Side {
-  export type Player = "Player";
-  export type Enemy = "Enemy";
+export interface NodeAttackAnalyzerShipConfig extends NightFleetConditions {
+  formation?: Formation;
 }
 
-export type Side = Side.Player | Side.Enemy;
-
-declare namespace Role {
-  export type Main = "Main";
-  export type Escort = "Escort";
+export interface NodeAttackAnalyzerConfig {
+  air_state?: AirState;
+  engagement?: Engagement;
+  left?: NodeAttackAnalyzerShipConfig;
+  right?: NodeAttackAnalyzerShipConfig;
 }
 
-export type Role = Role.Main | Role.Escort;
+export interface NodeAttackAnalysis {
+  left: AttackAnalysis;
+  right: AttackAnalysis;
+}
 
 export interface ShipPosition {
   org_type?: OrgType;
@@ -585,35 +612,6 @@ export interface MasterAttrRule<T> {
   expr: string;
 }
 
-export interface NodeAttackAnalyzerShipConfig extends NightFleetConditions {
-  formation?: Formation;
-}
-
-export interface NodeAttackAnalyzerConfig {
-  air_state?: AirState;
-  engagement?: Engagement;
-  left?: NodeAttackAnalyzerShipConfig;
-  right?: NodeAttackAnalyzerShipConfig;
-}
-
-export interface NodeAttackAnalysis {
-  left: AttackAnalysis;
-  right: AttackAnalysis;
-}
-
-export interface AttackAnalyzerConfig {
-  air_state?: AirState;
-  engagement?: Engagement;
-  attacker?: AttackAnalyzerShipConfig;
-  target?: AttackAnalyzerShipConfig;
-}
-
-export interface AttackAnalyzerShipConfig
-  extends ShipConditions,
-    NightFleetConditions {
-  fleet_los_mod?: number | null;
-}
-
 export interface EBonuses {
   firepower: number;
   torpedo: number;
@@ -687,23 +685,12 @@ export type ShipAttr =
   | ShipAttr.BattleshipSummerPrincess
   | ShipAttr.HeavyCruiserSummerPrincess;
 
-declare namespace OrgType {
-  export type Single = "Single";
-  export type CarrierTaskForce = "CarrierTaskForce";
-  export type SurfaceTaskForce = "SurfaceTaskForce";
-  export type TransportEscort = "TransportEscort";
-  export type EnemySingle = "EnemySingle";
-  export type EnemyCombined = "EnemyCombined";
+export interface SupportShellingSimulatorParams {
+  attacker_formation?: Formation;
+  target_formation?: Formation;
+  engagement: Engagement;
 }
 
-export type OrgType =
-  | OrgType.Single
-  | OrgType.CarrierTaskForce
-  | OrgType.SurfaceTaskForce
-  | OrgType.TransportEscort
-  | OrgType.EnemySingle
-  | OrgType.EnemyCombined;
-
 declare namespace GearAttr {
   export type Unknown = "Unknown";
   export type Abyssal = "Abyssal";
@@ -884,6 +871,12 @@ export interface DamageReport {
   damage_state_density: Histogram<DamageState, number>;
 }
 
+export interface AttackAnalyzerShipConfig
+  extends ShipConditions,
+    NightFleetConditions {
+  fleet_los_mod?: number | null;
+}
+
 export interface CompAntiAirAnalysis {
   fleet_adjusted_anti_air: number;
   ships: AntiAirReport[];
@@ -1095,6 +1088,28 @@ export interface AttackAnalysis {
   support_shelling: ActionReport<SupportShellingStyle>;
 }
 
+export interface NightFleetConditions {
+  night_contact_rank?: ContactRank | null;
+  starshell_index?: number | null;
+  searchlight_index?: number | null;
+  activates_large_searchlight?: boolean;
+}
+
+export interface NightConditions {
+  player?: NightFleetConditions;
+  enemy?: NightFleetConditions;
+}
+
+export interface BattleConditions {
+  org_type: OrgType;
+  role: Role;
+  ship_index: number;
+  fleet_len: number;
+  formation: Formation;
+  fleet_los_mod: number | null;
+  night_conditions: NightFleetConditions;
+}
+
 export interface MasterShip {
   ship_id: number;
   name: string;
@@ -1128,6 +1143,31 @@ export interface MasterShip {
 
 export type StatInterval = [number | null, 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_resist?: number;
+  fleet_anti_air_resist?: number;
+}
+
 export interface CompAnalyzerConfig {
   engagement: Engagement;
   formation: Formation;
@@ -1290,53 +1330,6 @@ export type SpeedGroup =
 
 export type SlotSizeVec = (number | null)[];
 
-export interface NightFleetConditions {
-  night_contact_rank?: ContactRank | null;
-  starshell_index?: number | null;
-  searchlight_index?: number | null;
-  activates_large_searchlight?: boolean;
-}
-
-export interface NightConditions {
-  player?: NightFleetConditions;
-  enemy?: NightFleetConditions;
-}
-
-export interface BattleConditions {
-  org_type: OrgType;
-  role: Role;
-  ship_index: number;
-  fleet_len: number;
-  formation: Formation;
-  fleet_los_mod: number | null;
-  night_conditions: NightFleetConditions;
-}
-
-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_resist?: number;
-  fleet_anti_air_resist?: number;
-}
-
 export interface ActionReport<T> {
   data: Record<string, AttackReport<T>>;
   damage_state_density: Histogram<DamageState, number> | null;
@@ -1494,17 +1487,6 @@ export class AirSquadron {
  */
 export class Analyzer {
   free(): void;
-  /**
-   * @param {AttackAnalyzerConfig} config
-   * @param {Ship} attacker
-   * @param {Ship} target
-   * @returns {AttackAnalysis}
-   */
-  analyze_attack(
-    config: AttackAnalyzerConfig,
-    attacker: Ship,
-    target: Ship
-  ): AttackAnalysis;
   /**
    * @param {ShipAnalyzerConfig} config
    * @param {Ship} left
@@ -1512,7 +1494,7 @@ export class Analyzer {
    * @param {boolean} attacker_is_left
    * @returns {AttackAnalysis}
    */
-  analyze_attack_by_ship_analyzer(
+  analyze_ship_attack(
     config: ShipAnalyzerConfig,
     left: Ship,
     right: Ship,

package/pkg/fleethub_core_bg.js

@@ -123,6 +123,21 @@ export function parse_ship_conditions(value) {
     return takeObject(ret);
 }
 
+const u32CvtShim = new Uint32Array(2);
+
+const uint64CvtShim = new BigUint64Array(u32CvtShim.buffer);
+
+function getArrayU8FromWasm0(ptr, len) {
+    return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len);
+}
+
+function passArray8ToWasm0(arg, malloc) {
+    const ptr = malloc(arg.length * 1);
+    getUint8Memory0().set(arg, ptr / 1);
+    WASM_VECTOR_LEN = arg.length;
+    return ptr;
+}
+
 function _assertClass(instance, klass) {
     if (!(instance instanceof klass)) {
         throw new Error(`expected instance of ${klass.name}`);
@@ -130,10 +145,6 @@ function _assertClass(instance, klass) {
     return instance.ptr;
 }
 
-const u32CvtShim = new Uint32Array(2);
-
-const uint64CvtShim = new BigUint64Array(u32CvtShim.buffer);
-
 let cachedFloat64Memory0 = new Float64Array();
 
 function getFloat64Memory0() {
@@ -143,17 +154,6 @@ function getFloat64Memory0() {
     return cachedFloat64Memory0;
 }
 
-function getArrayU8FromWasm0(ptr, len) {
-    return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len);
-}
-
-function passArray8ToWasm0(arg, malloc) {
-    const ptr = malloc(arg.length * 1);
-    getUint8Memory0().set(arg, ptr / 1);
-    WASM_VECTOR_LEN = arg.length;
-    return ptr;
-}
-
 function isLikeNone(x) {
     return x === undefined || x === null;
 }
@@ -391,28 +391,16 @@ export class Analyzer {
         wasm.__wbg_analyzer_free(ptr);
     }
     /**
-    * @param {AttackAnalyzerConfig} config
-    * @param {Ship} attacker
-    * @param {Ship} target
-    * @returns {AttackAnalysis}
-    */
-    analyze_attack(config, attacker, target) {
-        _assertClass(attacker, Ship);
-        _assertClass(target, Ship);
-        const ret = wasm.analyzer_analyze_attack(this.ptr, addHeapObject(config), attacker.ptr, target.ptr);
-        return takeObject(ret);
-    }
-    /**
     * @param {ShipAnalyzerConfig} config
     * @param {Ship} left
     * @param {Ship} right
     * @param {boolean} attacker_is_left
     * @returns {AttackAnalysis}
     */
-    analyze_attack_by_ship_analyzer(config, left, right, attacker_is_left) {
+    analyze_ship_attack(config, left, right, attacker_is_left) {
         _assertClass(left, Ship);
         _assertClass(right, Ship);
-        const ret = wasm.analyzer_analyze_attack_by_ship_analyzer(this.ptr, addHeapObject(config), left.ptr, right.ptr, attacker_is_left);
+        const ret = wasm.analyzer_analyze_ship_attack(this.ptr, addHeapObject(config), left.ptr, right.ptr, attacker_is_left);
         return takeObject(ret);
     }
     /**
@@ -3141,7 +3129,7 @@ export function __wbindgen_string_new(arg0, arg1) {
     return addHeapObject(ret);
 };
 
-export function __wbg_createEquipmentBonuses_4dfd93761a82c393(arg0, arg1) {
+export function __wbg_createEquipmentBonuses_d215617bb16aa6f4(arg0, arg1) {
     const ret = createEquipmentBonuses(takeObject(arg0), takeObject(arg1));
     return addHeapObject(ret);
 };

package/pkg/fleethub_core_bg.wasm.d.ts

@@ -2,99 +2,6 @@
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
 export function parse_ship_conditions(a: number): number;
-export function __wbg_analyzer_free(a: number): void;
-export function analyzer_analyze_attack(a: number, b: number, c: number, d: number): number;
-export function analyzer_analyze_attack_by_ship_analyzer(a: number, b: number, c: number, d: number, e: number): number;
-export function analyzer_analyze_node_attack(a: number, b: number, c: number, d: number, e: number, f: number): number;
-export function analyzer_analyze_comp(a: number, b: number, c: number): number;
-export function analyzer_simulate_support_shelling(a: number, b: number, c: number, d: number, e: number, f: number): void;
-export function __wbg_ship_free(a: number): void;
-export function __wbg_get_ship_id(a: number, b: number): void;
-export function __wbg_set_ship_id(a: number, b: number, c: number): void;
-export function __wbg_get_ship_hash(a: number, b: number): void;
-export function __wbg_get_ship_ship_id(a: number): number;
-export function __wbg_get_ship_level(a: number): number;
-export function __wbg_get_ship_current_hp(a: number): number;
-export function __wbg_get_ship_morale(a: number): number;
-export function __wbg_get_ship_ammo(a: number): number;
-export function __wbg_get_ship_fuel(a: number): number;
-export function __wbg_get_ship_ship_type(a: number): number;
-export function __wbg_get_ship_ctype(a: number): number;
-export function __wbg_get_ship_slots(a: number): number;
-export function __wbg_set_ship_slots(a: number, b: number): void;
-export function ship_naked_firepower(a: number): number;
-export function ship_naked_torpedo(a: number): number;
-export function ship_naked_armor(a: number): number;
-export function ship_naked_anti_air(a: number): number;
-export function ship_naked_evasion(a: number): number;
-export function ship_naked_asw(a: number): number;
-export function ship_naked_los(a: number): number;
-export function ship_firepower(a: number): number;
-export function ship_torpedo(a: number): number;
-export function ship_armor(a: number): number;
-export function ship_anti_air(a: number): number;
-export function ship_evasion(a: number): number;
-export function ship_asw(a: number): number;
-export function ship_los(a: number): number;
-export function ship_default(): number;
-export function ship_eq_id(a: number, b: number, c: number): number;
-export function ship_state(a: number): number;
-export function ship_custom_power_mods(a: number): number;
-export function ship_meta(a: number): number;
-export function ship_name(a: number, b: number): void;
-export function ship_yomi(a: number, b: number): void;
-export function ship_stype(a: number): number;
-export function ship_sort_id(a: number): number;
-export function ship_remodel_rank(a: number): number;
-export function ship_slotnum(a: number): number;
-export function ship_next_id(a: number): number;
-export function ship_useful(a: number): number;
-export function ship_damage_state(a: number): number;
-export function ship_morale_state(a: number): number;
-export function ship_category(a: number): number;
-export function ship_has_attr(a: number, b: number): number;
-export function ship_gear_keys(a: number): number;
-export function ship_get_gear(a: number, b: number, c: number): number;
-export function ship_get_damage_bound(a: number, b: number): number;
-export function ship_get_remaining_fuel(a: number, b: number, c: number): number;
-export function ship_get_remaining_ammo(a: number, b: number, c: number): number;
-export function ship_has_unknown_stat(a: number, b: number, c: number): number;
-export function ship_get_naked_stat(a: number, b: number, c: number): number;
-export function ship_get_stat_interval_left(a: number, b: number, c: number): number;
-export function ship_get_stat_interval_right(a: number, b: number, c: number): number;
-export function ship_get_gear_stat(a: number, b: number, c: number): number;
-export function ship_get_ebonus(a: number, b: number, c: number): number;
-export function ship_get_stat_mod(a: number, b: number, c: number): number;
-export function ship_is_abyssal(a: number): number;
-export function ship_is_submarine(a: number): number;
-export function ship_can_equip(a: number, b: number, c: number, d: number): number;
-export function ship_max_hp(a: number): number;
-export function ship_max_ammo(a: number): number;
-export function ship_max_fuel(a: number): number;
-export function ship_naked_range(a: number): number;
-export function ship_naked_speed(a: number): number;
-export function ship_luck(a: number): number;
-export function ship_range(a: number): number;
-export function ship_speed(a: number): number;
-export function ship_accuracy(a: number): number;
-export function ship_innate_torpedo_accuracy(a: number): number;
-export function ship_is_installation(a: number): number;
-export function ship_get_slot_size(a: number, b: number): number;
-export function ship_get_max_slot_size(a: number, b: number): number;
-export function ship_remaining_ammo_mod(a: number): number;
-export function ship_remaining_fuel_mod(a: number): number;
-export function ship_fighter_power(a: number, b: number, c: number): void;
-export function ship_fleet_los_factor(a: number, b: number): void;
-export function ship_ship_adjusted_anti_air(a: number, b: number, c: number): void;
-export function ship_fleet_anti_air_mod(a: number): number;
-export function ship_cruiser_fit_bonus(a: number): number;
-export function ship_basic_accuracy_term(a: number, b: number): void;
-export function ship_basic_evasion_term(a: number, b: number): void;
-export function ship_evasion_term(a: number, b: number, c: number, d: number, e: number): void;
-export function ship_basic_defense_power(a: number, b: number, c: number): void;
-export function ship_transport_point(a: number): number;
-export function ship_elos(a: number, b: number, c: number): void;
-export function ship_ohko_power(a: number, b: number): void;
 export function __wbg_ibonuses_free(a: number): void;
 export function __wbg_get_ibonuses_shelling_power(a: number): number;
 export function __wbg_set_ibonuses_shelling_power(a: number, b: number): void;
@@ -190,6 +97,93 @@ export function gear_is_abyssal_patrolling_attack_hawk(a: number): number;
 export function gear_expedition_bonus(a: number): number;
 export function gear_can_be_deployed_to_land_base(a: number): number;
 export function gear_has_proficiency(a: number): number;
+export function __wbg_ship_free(a: number): void;
+export function __wbg_get_ship_id(a: number, b: number): void;
+export function __wbg_set_ship_id(a: number, b: number, c: number): void;
+export function __wbg_get_ship_hash(a: number, b: number): void;
+export function __wbg_get_ship_ship_id(a: number): number;
+export function __wbg_get_ship_level(a: number): number;
+export function __wbg_get_ship_current_hp(a: number): number;
+export function __wbg_get_ship_morale(a: number): number;
+export function __wbg_get_ship_ammo(a: number): number;
+export function __wbg_get_ship_fuel(a: number): number;
+export function __wbg_get_ship_ship_type(a: number): number;
+export function __wbg_get_ship_ctype(a: number): number;
+export function __wbg_get_ship_slots(a: number): number;
+export function __wbg_set_ship_slots(a: number, b: number): void;
+export function ship_naked_firepower(a: number): number;
+export function ship_naked_torpedo(a: number): number;
+export function ship_naked_armor(a: number): number;
+export function ship_naked_anti_air(a: number): number;
+export function ship_naked_evasion(a: number): number;
+export function ship_naked_asw(a: number): number;
+export function ship_naked_los(a: number): number;
+export function ship_firepower(a: number): number;
+export function ship_torpedo(a: number): number;
+export function ship_armor(a: number): number;
+export function ship_anti_air(a: number): number;
+export function ship_evasion(a: number): number;
+export function ship_asw(a: number): number;
+export function ship_los(a: number): number;
+export function ship_default(): number;
+export function ship_eq_id(a: number, b: number, c: number): number;
+export function ship_state(a: number): number;
+export function ship_custom_power_mods(a: number): number;
+export function ship_meta(a: number): number;
+export function ship_name(a: number, b: number): void;
+export function ship_yomi(a: number, b: number): void;
+export function ship_stype(a: number): number;
+export function ship_sort_id(a: number): number;
+export function ship_remodel_rank(a: number): number;
+export function ship_slotnum(a: number): number;
+export function ship_next_id(a: number): number;
+export function ship_useful(a: number): number;
+export function ship_damage_state(a: number): number;
+export function ship_morale_state(a: number): number;
+export function ship_category(a: number): number;
+export function ship_has_attr(a: number, b: number): number;
+export function ship_gear_keys(a: number): number;
+export function ship_get_gear(a: number, b: number, c: number): number;
+export function ship_get_damage_bound(a: number, b: number): number;
+export function ship_get_remaining_fuel(a: number, b: number, c: number): number;
+export function ship_get_remaining_ammo(a: number, b: number, c: number): number;
+export function ship_has_unknown_stat(a: number, b: number, c: number): number;
+export function ship_get_naked_stat(a: number, b: number, c: number): number;
+export function ship_get_stat_interval_left(a: number, b: number, c: number): number;
+export function ship_get_stat_interval_right(a: number, b: number, c: number): number;
+export function ship_get_gear_stat(a: number, b: number, c: number): number;
+export function ship_get_ebonus(a: number, b: number, c: number): number;
+export function ship_get_stat_mod(a: number, b: number, c: number): number;
+export function ship_is_abyssal(a: number): number;
+export function ship_is_submarine(a: number): number;
+export function ship_can_equip(a: number, b: number, c: number, d: number): number;
+export function ship_max_hp(a: number): number;
+export function ship_max_ammo(a: number): number;
+export function ship_max_fuel(a: number): number;
+export function ship_naked_range(a: number): number;
+export function ship_naked_speed(a: number): number;
+export function ship_luck(a: number): number;
+export function ship_range(a: number): number;
+export function ship_speed(a: number): number;
+export function ship_accuracy(a: number): number;
+export function ship_innate_torpedo_accuracy(a: number): number;
+export function ship_is_installation(a: number): number;
+export function ship_get_slot_size(a: number, b: number): number;
+export function ship_get_max_slot_size(a: number, b: number): number;
+export function ship_remaining_ammo_mod(a: number): number;
+export function ship_remaining_fuel_mod(a: number): number;
+export function ship_fighter_power(a: number, b: number, c: number): void;
+export function ship_fleet_los_factor(a: number, b: number): void;
+export function ship_ship_adjusted_anti_air(a: number, b: number, c: number): void;
+export function ship_fleet_anti_air_mod(a: number): number;
+export function ship_cruiser_fit_bonus(a: number): number;
+export function ship_basic_accuracy_term(a: number, b: number): void;
+export function ship_basic_evasion_term(a: number, b: number): void;
+export function ship_evasion_term(a: number, b: number, c: number, d: number, e: number): void;
+export function ship_basic_defense_power(a: number, b: number, c: number): void;
+export function ship_transport_point(a: number): number;
+export function ship_elos(a: number, b: number, c: number): void;
+export function ship_ohko_power(a: number, b: number): void;
 export function __wbg_comp_free(a: number): void;
 export function __wbg_get_comp_org_type(a: number): number;
 export function __wbg_get_comp_hq_level(a: number): number;
@@ -217,6 +211,11 @@ export function comp_fighter_power(a: number, b: number, c: number, d: number):
 export function comp_elos(a: number, b: number, c: number): void;
 export function comp_transport_point(a: number): number;
 export function comp_get_ship_conditions(a: number, b: number, c: number): number;
+export function __wbg_analyzer_free(a: number): void;
+export function analyzer_analyze_ship_attack(a: number, b: number, c: number, d: number, e: number): number;
+export function analyzer_analyze_node_attack(a: number, b: number, c: number, d: number, e: number, f: number): number;
+export function analyzer_analyze_comp(a: number, b: number, c: number): number;
+export function analyzer_simulate_support_shelling(a: number, b: number, c: number, d: number, e: number, f: number): void;
 export function __wbg_org_free(a: number): void;
 export function __wbg_get_org_id(a: number, b: number): void;
 export function __wbg_set_org_id(a: number, b: number, c: number): void;