fleethub-core 0.8.1 → 0.9.2

package/bindings.d.ts

@@ -348,15 +348,15 @@ export type DayCutin =
 export type NightAttackType = "Normal" | "ArkRoyal" | "Carrier";
 
 export type NightCutin =
+  | "MainTorpRadar"
+  | "TorpLookoutRadar"
+  | "TorpTsloTorp"
+  | "TorpTsloDrum"
   | "DoubleAttack"
   | "TorpTorpMain"
   | "TorpTorpTorp"
   | "MainMainSec"
   | "MainMainMain"
-  | "MainTorpRadar"
-  | "TorpLookoutRadar"
-  | "TorpTsloTorp"
-  | "TorpTsloDrum"
   | "SubTorpTorp"
   | "SubRadarTorp"
   | "Cvci1_25"
@@ -585,7 +585,7 @@ export interface MasterShip {
   next_id?: number;
   next_level?: number;
   slotnum: number;
-  slots: Array;
+  slots: Array<number | null>;
   stock: Array<GearState>;
   speed_group?: SpeedGroup;
   useful?: boolean;
@@ -647,34 +647,39 @@ export interface MasterData {
   config: BattleConfig;
 }
 
-export interface AttackPowerModifiers {
-  a5: number;
-  b5: number;
-  a6: number;
-  b6: number;
-  a7: number;
-  b7: number;
-  a11: number;
-  b11: number;
-  a12: number;
-  b12: number;
-  a13: number;
-  b13: number;
-  a13_2: number;
-  b13_2: number;
-  a14: number;
-  b14: number;
+export interface AttackPowerModifier {
+  a: number;
+  b: number;
+}
+
+export interface SpecialEnemyModifiers {
+  precap_general_mod: AttackPowerModifier;
+  stype_mod: AttackPowerModifier;
+  landing_craft_synergy_mod: AttackPowerModifier;
+  toku_daihatsu_tank_mod: AttackPowerModifier;
+  m4a1dd_mod: AttackPowerModifier;
+  honi_mod: AttackPowerModifier;
+  postcap_general_mod: AttackPowerModifier;
+  pt_mod: AttackPowerModifier;
+}
+
+export interface CustomModifiers {
+  precap_mod: AttackPowerModifier;
+  postcap_mod: AttackPowerModifier;
 }
 
 export interface AttackPowerParams {
   basic: number;
   cap: number;
-  mods: AttackPowerModifiers;
+  precap_mod: AttackPowerModifier;
+  postcap_mod: AttackPowerModifier;
   ap_shell_mod: number | null;
   carrier_power: number | null;
   proficiency_critical_mod: number | null;
   armor_penetration: number;
   remaining_ammo_mod: number;
+  special_enemy_mods: SpecialEnemyModifiers;
+  custom_mods: CustomModifiers;
 }
 
 export interface AttackPower {
@@ -716,7 +721,7 @@ export interface WarfareContext {
   target_env: WarfareShipEnvironment;
   engagement: Engagement;
   air_state: AirState;
-  external_power_mods: AttackPowerModifiers;
+  custom_mods: CustomModifiers;
 }
 
 export interface NightSituation {
@@ -856,7 +861,7 @@ export interface WarfareAnalyzerShipEnvironment {
   formation: Formation;
   fleet_los_mod: number | null;
   night_situation: NightSituation;
-  external_power_mods: AttackPowerModifiers;
+  custom_mods: CustomModifiers;
 }
 
 export interface WarfareAnalyzerContext {
@@ -896,7 +901,7 @@ export interface ShellingSupportSimulatorParams {
   attacker_formation: Formation;
   target_formation: Formation;
   engagement: Engagement;
-  external_power_mods: AttackPowerModifiers;
+  custom_mods: CustomModifiers;
 }
 
 export interface SimulatorResultItem {

package/node/fleethub_core.d.ts

@@ -1,14 +1,14 @@
 /* tslint:disable */
 /* eslint-disable */
 /**
+*/
+export function set_panic_hook(): void;
+/**
 * @param {Gear} gear
 * @returns {boolean}
 */
 export function air_squadron_can_equip(gear: Gear): boolean;
 /**
-*/
-export function set_panic_hook(): void;
-/**
 * @param {bindings.OrgType} org_type
 * @returns {boolean}
 */
@@ -87,12 +87,12 @@ export class Analyzer {
 /**
 * @param {Comp} comp
 * @param {bindings.Formation} formation
-* @param {number | undefined} adjusted_anti_air_resist
-* @param {number | undefined} fleet_anti_air_resist
+* @param {number} adjusted_anti_air_resist
+* @param {number} fleet_anti_air_resist
 * @param {number | undefined} aaci
 * @returns {bindings.CompAntiAirInfo}
 */
-  analyze_anti_air(comp: Comp, formation: bindings.Formation, adjusted_anti_air_resist?: number, fleet_anti_air_resist?: number, aaci?: number): bindings.CompAntiAirInfo;
+  analyze_anti_air(comp: Comp, formation: bindings.Formation, adjusted_anti_air_resist: number, fleet_anti_air_resist: number, aaci?: number): bindings.CompAntiAirInfo;
 /**
 * @param {Comp} comp
 * @returns {bindings.CompDayCutinRateInfo}
@@ -178,11 +178,11 @@ export class Comp {
   fleet_anti_air(formation_mod: number): number;
 /**
 * 制空値
-* @param {boolean} anti_combined
-* @param {boolean} anti_lbas
+* @param {boolean} escort_participates
+* @param {boolean} recon_participates
 * @returns {number | undefined}
 */
-  fighter_power(anti_combined: boolean, anti_lbas: boolean): number | undefined;
+  fighter_power(escort_participates: boolean, recon_participates: boolean): number | undefined;
 /**
 * マップ索敵
 * @param {number} node_divaricated_factor
@@ -329,10 +329,10 @@ export class Fleet {
 */
   get_ship(key: string): Ship | undefined;
 /**
-* @param {boolean} anti_lbas
+* @param {boolean} recon_participates
 * @returns {number | undefined}
 */
-  fighter_power(anti_lbas: boolean): number | undefined;
+  fighter_power(recon_participates: boolean): number | undefined;
 /**
 * マップ索敵
 * @param {number} hq_level
@@ -429,10 +429,6 @@ export class Gear {
 */
   calc_contact_trigger_factor(slot_size: number): number;
 /**
-* @returns {boolean}
-*/
-  is_contact_selection_plane(): boolean;
-/**
 * @param {bindings.AirStateRank} rank
 * @returns {number}
 */
@@ -905,10 +901,10 @@ export class Ship {
 */
   remaining_fuel_mod(): number;
 /**
-* @param {boolean} anti_lbas
+* @param {boolean} recon_participates
 * @returns {number | undefined}
 */
-  fighter_power(anti_lbas: boolean): number | undefined;
+  fighter_power(recon_participates: boolean): number | undefined;
 /**
 * @returns {number | undefined}
 */

package/node/fleethub_core.js

@@ -175,11 +175,35 @@ function debugString(val) {
     // TODO we could test for more things here, like `Set`s and `Map`s.
     return className;
 }
+/**
+*/
+module.exports.set_panic_hook = function() {
+    wasm.set_panic_hook();
+};
 
 const u32CvtShim = new Uint32Array(2);
 
 const uint64CvtShim = new BigUint64Array(u32CvtShim.buffer);
 
+function isLikeNone(x) {
+    return x === undefined || x === null;
+}
+
+let cachegetUint16Memory0 = null;
+function getUint16Memory0() {
+    if (cachegetUint16Memory0 === null || cachegetUint16Memory0.buffer !== wasm.memory.buffer) {
+        cachegetUint16Memory0 = new Uint16Array(wasm.memory.buffer);
+    }
+    return cachegetUint16Memory0;
+}
+
+function passArray16ToWasm0(arg, malloc) {
+    const ptr = malloc(arg.length * 2);
+    getUint16Memory0().set(arg, ptr / 2);
+    WASM_VECTOR_LEN = arg.length;
+    return ptr;
+}
+
 function _assertClass(instance, klass) {
     if (!(instance instanceof klass)) {
         throw new Error(`expected instance of ${klass.name}`);
@@ -208,10 +232,6 @@ module.exports.air_squadron_can_equip = function(gear) {
     return ret !== 0;
 };
 
-function isLikeNone(x) {
-    return x === undefined || x === null;
-}
-
 let cachegetUint32Memory0 = null;
 function getUint32Memory0() {
     if (cachegetUint32Memory0 === null || cachegetUint32Memory0.buffer !== wasm.memory.buffer) {
@@ -230,26 +250,6 @@ function getArrayJsValueFromWasm0(ptr, len) {
     return result;
 }
 /**
-*/
-module.exports.set_panic_hook = function() {
-    wasm.set_panic_hook();
-};
-
-let cachegetUint16Memory0 = null;
-function getUint16Memory0() {
-    if (cachegetUint16Memory0 === null || cachegetUint16Memory0.buffer !== wasm.memory.buffer) {
-        cachegetUint16Memory0 = new Uint16Array(wasm.memory.buffer);
-    }
-    return cachegetUint16Memory0;
-}
-
-function passArray16ToWasm0(arg, malloc) {
-    const ptr = malloc(arg.length * 2);
-    getUint16Memory0().set(arg, ptr / 2);
-    WASM_VECTOR_LEN = arg.length;
-    return ptr;
-}
-/**
 * @param {bindings.OrgType} org_type
 * @returns {boolean}
 */
@@ -487,14 +487,14 @@ class Analyzer {
     /**
     * @param {Comp} comp
     * @param {bindings.Formation} formation
-    * @param {number | undefined} adjusted_anti_air_resist
-    * @param {number | undefined} fleet_anti_air_resist
+    * @param {number} adjusted_anti_air_resist
+    * @param {number} fleet_anti_air_resist
     * @param {number | undefined} aaci
     * @returns {bindings.CompAntiAirInfo}
     */
     analyze_anti_air(comp, formation, adjusted_anti_air_resist, fleet_anti_air_resist, aaci) {
         _assertClass(comp, Comp);
-        var ret = wasm.analyzer_analyze_anti_air(this.ptr, comp.ptr, addHeapObject(formation), !isLikeNone(adjusted_anti_air_resist), isLikeNone(adjusted_anti_air_resist) ? 0 : adjusted_anti_air_resist, !isLikeNone(fleet_anti_air_resist), isLikeNone(fleet_anti_air_resist) ? 0 : fleet_anti_air_resist, isLikeNone(aaci) ? 0xFFFFFF : aaci);
+        var ret = wasm.analyzer_analyze_anti_air(this.ptr, comp.ptr, addHeapObject(formation), adjusted_anti_air_resist, fleet_anti_air_resist, isLikeNone(aaci) ? 0xFFFFFF : aaci);
         return takeObject(ret);
     }
     /**
@@ -777,14 +777,14 @@ class Comp {
     }
     /**
     * 制空値
-    * @param {boolean} anti_combined
-    * @param {boolean} anti_lbas
+    * @param {boolean} escort_participates
+    * @param {boolean} recon_participates
     * @returns {number | undefined}
     */
-    fighter_power(anti_combined, anti_lbas) {
+    fighter_power(escort_participates, recon_participates) {
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.comp_fighter_power(retptr, this.ptr, anti_combined, anti_lbas);
+            wasm.comp_fighter_power(retptr, this.ptr, escort_participates, recon_participates);
             var r0 = getInt32Memory0()[retptr / 4 + 0];
             var r1 = getInt32Memory0()[retptr / 4 + 1];
             return r0 === 0 ? undefined : r1;
@@ -1183,13 +1183,13 @@ class Fleet {
         }
     }
     /**
-    * @param {boolean} anti_lbas
+    * @param {boolean} recon_participates
     * @returns {number | undefined}
     */
-    fighter_power(anti_lbas) {
+    fighter_power(recon_participates) {
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.fleet_fighter_power(retptr, this.ptr, anti_lbas);
+            wasm.fleet_fighter_power(retptr, this.ptr, recon_participates);
             var r0 = getInt32Memory0()[retptr / 4 + 0];
             var r1 = getInt32Memory0()[retptr / 4 + 1];
             return r0 === 0 ? undefined : r1;
@@ -1768,13 +1768,6 @@ class Gear {
         return ret;
     }
     /**
-    * @returns {boolean}
-    */
-    is_contact_selection_plane() {
-        var ret = wasm.gear_is_contact_selection_plane(this.ptr);
-        return ret !== 0;
-    }
-    /**
     * @param {bindings.AirStateRank} rank
     * @returns {number}
     */
@@ -3141,13 +3134,13 @@ class Ship {
         return ret;
     }
     /**
-    * @param {boolean} anti_lbas
+    * @param {boolean} recon_participates
     * @returns {number | undefined}
     */
-    fighter_power(anti_lbas) {
+    fighter_power(recon_participates) {
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.ship_fighter_power(retptr, this.ptr, anti_lbas);
+            wasm.ship_fighter_power(retptr, this.ptr, recon_participates);
             var r0 = getInt32Memory0()[retptr / 4 + 0];
             var r1 = getInt32Memory0()[retptr / 4 + 1];
             return r0 === 0 ? undefined : r1;
@@ -3346,15 +3339,15 @@ module.exports.__wbg_error_09919627ac0992f5 = function(arg0, arg1) {
     }
 };
 
-module.exports.__wbg_randomFillSync_59fcc2add91fe7b3 = function() { return handleError(function (arg0, arg1, arg2) {
+module.exports.__wbg_randomFillSync_378e02b85af41ab6 = function() { return handleError(function (arg0, arg1, arg2) {
     getObject(arg0).randomFillSync(getArrayU8FromWasm0(arg1, arg2));
 }, arguments) };
 
-module.exports.__wbg_getRandomValues_3e46aa268da0fed1 = function() { return handleError(function (arg0, arg1) {
+module.exports.__wbg_getRandomValues_99bbe8a65f4aef87 = function() { return handleError(function (arg0, arg1) {
     getObject(arg0).getRandomValues(getObject(arg1));
 }, arguments) };
 
-module.exports.__wbg_process_f2b73829dbd321da = function(arg0) {
+module.exports.__wbg_process_5729605ce9d34ea8 = function(arg0) {
     var ret = getObject(arg0).process;
     return addHeapObject(ret);
 };
@@ -3365,12 +3358,12 @@ module.exports.__wbindgen_is_object = function(arg0) {
     return ret;
 };
 
-module.exports.__wbg_versions_cd82f79c98672a9f = function(arg0) {
+module.exports.__wbg_versions_531e16e1a776ee97 = function(arg0) {
     var ret = getObject(arg0).versions;
     return addHeapObject(ret);
 };
 
-module.exports.__wbg_node_ee3f6da4130bd35f = function(arg0) {
+module.exports.__wbg_node_18b58a160b60d170 = function(arg0) {
     var ret = getObject(arg0).node;
     return addHeapObject(ret);
 };
@@ -3380,17 +3373,22 @@ module.exports.__wbindgen_is_string = function(arg0) {
     return ret;
 };
 
-module.exports.__wbg_modulerequire_0a83c0c31d12d2c7 = function() { return handleError(function (arg0, arg1) {
-    var ret = module.require(getStringFromWasm0(arg0, arg1));
+module.exports.__wbg_static_accessor_NODE_MODULE_bdc5ca9096c68aeb = function() {
+    var ret = module;
+    return addHeapObject(ret);
+};
+
+module.exports.__wbg_require_edfaedd93e302925 = function() { return handleError(function (arg0, arg1, arg2) {
+    var ret = getObject(arg0).require(getStringFromWasm0(arg1, arg2));
     return addHeapObject(ret);
 }, arguments) };
 
-module.exports.__wbg_crypto_9e3521ed42436d35 = function(arg0) {
+module.exports.__wbg_crypto_2bc4d5b05161de5b = function(arg0) {
     var ret = getObject(arg0).crypto;
     return addHeapObject(ret);
 };
 
-module.exports.__wbg_msCrypto_c429c3f8f7a70bb5 = function(arg0) {
+module.exports.__wbg_msCrypto_d003eebe62c636a9 = function(arg0) {
     var ret = getObject(arg0).msCrypto;
     return addHeapObject(ret);
 };

package/node/fleethub_core_bg.wasm.d.ts

@@ -106,7 +106,6 @@ export function gear_calc_interception_power(a: number, b: number): number;
 export function gear_fleet_anti_air(a: number): number;
 export function gear_adjusted_anti_air(a: number): number;
 export function gear_calc_contact_trigger_factor(a: number, b: number): number;
-export function gear_is_contact_selection_plane(a: number): number;
 export function gear_contact_selection_rate(a: number, b: number): number;
 export function gear_night_contact_rate(a: number, b: number): number;
 export function gear_is_night_plane(a: number): number;
@@ -116,6 +115,19 @@ export function gear_is_abyssal(a: number): number;
 export function gear_is_abyssal_cuttlefish_torpedo(a: number): number;
 export function gear_is_abyssal_patrolling_attack_hawk(a: number): number;
 export function gear_expedition_bonus(a: number): number;
+export function __wbg_fhcore_free(a: number): void;
+export function fhcore_new(a: number, b: number, c: number): void;
+export function fhcore_create_gear(a: number, b: number): number;
+export function fhcore_create_ship(a: number, b: number): number;
+export function fhcore_create_air_squadron(a: number, b: number): number;
+export function fhcore_create_fleet(a: number, b: number): number;
+export function fhcore_create_org(a: number, b: number): number;
+export function fhcore_create_ship_by_id(a: number, b: number): number;
+export function fhcore_create_comp_by_map_enemy(a: number, b: number, c: number, d: number, e: number): number;
+export function fhcore_create_default_ship(a: number): number;
+export function fhcore_create_analyzer(a: number): number;
+export function fhcore_simulate_shelling_support(a: number, b: number, c: number, d: number, e: number, f: number): void;
+export function set_panic_hook(): 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;
@@ -210,21 +222,6 @@ export function ship_get_possible_anti_air_cutin_ids(a: number, b: number): void
 export function ship_transport_point(a: number): number;
 export function ship_elos(a: number, b: number, c: number): void;
 export function ship_take_damage(a: number, b: number): void;
-export function __wbg_airsquadron_free(a: number): void;
-export function __wbg_get_airsquadron_id(a: number, b: number): void;
-export function __wbg_set_airsquadron_id(a: number, b: number, c: number): void;
-export function __wbg_get_airsquadron_xxh3(a: number, b: number): void;
-export function __wbg_set_airsquadron_xxh3(a: number, b: number, c: number): void;
-export function __wbg_get_airsquadron_mode(a: number): number;
-export function __wbg_set_airsquadron_mode(a: number, b: number): void;
-export function air_squadron_can_equip(a: number): number;
-export function airsquadron_get_gear(a: number, b: number, c: number): number;
-export function airsquadron_can_equip(a: number, b: number): number;
-export function airsquadron_get_slot_size(a: number, b: number, c: number): void;
-export function airsquadron_get_max_slot_size(a: number, b: number, c: number): void;
-export function airsquadron_fighter_power(a: number): number;
-export function airsquadron_interception_power(a: number): number;
-export function airsquadron_radius(a: number): number;
 export function __wbg_comp_free(a: number): void;
 export function __wbg_get_comp_org_type(a: number): number;
 export function __wbg_set_comp_org_type(a: number, b: number): void;
@@ -251,6 +248,21 @@ export function comp_fleet_anti_air(a: number, b: number): number;
 export function comp_fighter_power(a: number, b: number, c: number, d: number): void;
 export function comp_elos(a: number, b: number, c: number): void;
 export function comp_transport_point(a: number): number;
+export function __wbg_airsquadron_free(a: number): void;
+export function __wbg_get_airsquadron_id(a: number, b: number): void;
+export function __wbg_set_airsquadron_id(a: number, b: number, c: number): void;
+export function __wbg_get_airsquadron_xxh3(a: number, b: number): void;
+export function __wbg_set_airsquadron_xxh3(a: number, b: number, c: number): void;
+export function __wbg_get_airsquadron_mode(a: number): number;
+export function __wbg_set_airsquadron_mode(a: number, b: number): void;
+export function air_squadron_can_equip(a: number): number;
+export function airsquadron_get_gear(a: number, b: number, c: number): number;
+export function airsquadron_can_equip(a: number, b: number): number;
+export function airsquadron_get_slot_size(a: number, b: number, c: number): void;
+export function airsquadron_get_max_slot_size(a: number, b: number, c: number): void;
+export function airsquadron_fighter_power(a: number): number;
+export function airsquadron_interception_power(a: number): number;
+export function airsquadron_radius(a: number): number;
 export function __wbg_fleet_free(a: number): void;
 export function __wbg_get_fleet_id(a: number, b: number): void;
 export function __wbg_set_fleet_id(a: number, b: number, c: number): void;
@@ -275,23 +287,17 @@ export function fleet_aviation_detection_score(a: number, b: number): void;
 export function fleet_expedition_bonus(a: number): number;
 export function fleet_sum_ship_stat_by(a: number, b: number, c: number, d: number): void;
 export function fleet_reset_battle_state(a: number): void;
-export function __wbg_fhcore_free(a: number): void;
-export function fhcore_new(a: number, b: number, c: number): void;
-export function fhcore_create_gear(a: number, b: number): number;
-export function fhcore_create_ship(a: number, b: number): number;
-export function fhcore_create_air_squadron(a: number, b: number): number;
-export function fhcore_create_fleet(a: number, b: number): number;
-export function fhcore_create_org(a: number, b: number): number;
-export function fhcore_create_ship_by_id(a: number, b: number): number;
-export function fhcore_create_comp_by_map_enemy(a: number, b: number, c: number, d: number, e: number): number;
-export function fhcore_create_default_ship(a: number): number;
-export function fhcore_create_analyzer(a: number): number;
-export function fhcore_simulate_shelling_support(a: number, b: number, c: number, d: number, e: number, f: number): void;
-export function set_panic_hook(): void;
 export function org_type_is_single(a: number): number;
 export function org_type_default_formation(a: number): number;
 export function org_type_is_player(a: number): number;
 export function org_type_side(a: number): number;
+export function __wbg_analyzer_free(a: number): void;
+export function analyzer_analyze_anti_air(a: number, b: number, c: number, d: number, e: number, f: number): number;
+export function analyzer_analyze_day_cutin(a: number, b: number): number;
+export function analyzer_analyze_night_cutin(a: number, b: number, c: number, d: number): number;
+export function analyzer_analyze_contact_chance(a: number, b: number): number;
+export function analyzer_analyze_warfare(a: number, b: number, c: number, d: number): number;
+export function analyzer_analyze_fleet_cutin(a: number, b: number, c: number): number;
 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;
@@ -330,13 +336,6 @@ export function org_interception_power(a: number): number;
 export function org_high_altitude_interception_power(a: number): number;
 export function org_create_warfare_ship_environment(a: number, b: number, c: number): number;
 export function org_default(): number;
-export function __wbg_analyzer_free(a: number): void;
-export function analyzer_analyze_anti_air(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number): number;
-export function analyzer_analyze_day_cutin(a: number, b: number): number;
-export function analyzer_analyze_night_cutin(a: number, b: number, c: number, d: number): number;
-export function analyzer_analyze_contact_chance(a: number, b: number): number;
-export function analyzer_analyze_warfare(a: number, b: number, c: number, d: number): number;
-export function analyzer_analyze_fleet_cutin(a: number, b: number, c: number): number;
 export function __wbindgen_malloc(a: number): number;
 export function __wbindgen_realloc(a: number, b: number, c: number): number;
 export function __wbindgen_add_to_stack_pointer(a: number): number;

package/package.json

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

package/pkg/fleethub_core.d.ts

@@ -1,14 +1,14 @@
 /* tslint:disable */
 /* eslint-disable */
 /**
+*/
+export function set_panic_hook(): void;
+/**
 * @param {Gear} gear
 * @returns {boolean}
 */
 export function air_squadron_can_equip(gear: Gear): boolean;
 /**
-*/
-export function set_panic_hook(): void;
-/**
 * @param {bindings.OrgType} org_type
 * @returns {boolean}
 */
@@ -87,12 +87,12 @@ export class Analyzer {
 /**
 * @param {Comp} comp
 * @param {bindings.Formation} formation
-* @param {number | undefined} adjusted_anti_air_resist
-* @param {number | undefined} fleet_anti_air_resist
+* @param {number} adjusted_anti_air_resist
+* @param {number} fleet_anti_air_resist
 * @param {number | undefined} aaci
 * @returns {bindings.CompAntiAirInfo}
 */
-  analyze_anti_air(comp: Comp, formation: bindings.Formation, adjusted_anti_air_resist?: number, fleet_anti_air_resist?: number, aaci?: number): bindings.CompAntiAirInfo;
+  analyze_anti_air(comp: Comp, formation: bindings.Formation, adjusted_anti_air_resist: number, fleet_anti_air_resist: number, aaci?: number): bindings.CompAntiAirInfo;
 /**
 * @param {Comp} comp
 * @returns {bindings.CompDayCutinRateInfo}
@@ -178,11 +178,11 @@ export class Comp {
   fleet_anti_air(formation_mod: number): number;
 /**
 * 制空値
-* @param {boolean} anti_combined
-* @param {boolean} anti_lbas
+* @param {boolean} escort_participates
+* @param {boolean} recon_participates
 * @returns {number | undefined}
 */
-  fighter_power(anti_combined: boolean, anti_lbas: boolean): number | undefined;
+  fighter_power(escort_participates: boolean, recon_participates: boolean): number | undefined;
 /**
 * マップ索敵
 * @param {number} node_divaricated_factor
@@ -329,10 +329,10 @@ export class Fleet {
 */
   get_ship(key: string): Ship | undefined;
 /**
-* @param {boolean} anti_lbas
+* @param {boolean} recon_participates
 * @returns {number | undefined}
 */
-  fighter_power(anti_lbas: boolean): number | undefined;
+  fighter_power(recon_participates: boolean): number | undefined;
 /**
 * マップ索敵
 * @param {number} hq_level
@@ -429,10 +429,6 @@ export class Gear {
 */
   calc_contact_trigger_factor(slot_size: number): number;
 /**
-* @returns {boolean}
-*/
-  is_contact_selection_plane(): boolean;
-/**
 * @param {bindings.AirStateRank} rank
 * @returns {number}
 */
@@ -905,10 +901,10 @@ export class Ship {
 */
   remaining_fuel_mod(): number;
 /**
-* @param {boolean} anti_lbas
+* @param {boolean} recon_participates
 * @returns {number | undefined}
 */
-  fighter_power(anti_lbas: boolean): number | undefined;
+  fighter_power(recon_participates: boolean): number | undefined;
 /**
 * @returns {number | undefined}
 */

package/pkg/fleethub_core_bg.js

@@ -176,11 +176,35 @@ function debugString(val) {
     // TODO we could test for more things here, like `Set`s and `Map`s.
     return className;
 }
+/**
+*/
+export function set_panic_hook() {
+    wasm.set_panic_hook();
+}
 
 const u32CvtShim = new Uint32Array(2);
 
 const uint64CvtShim = new BigUint64Array(u32CvtShim.buffer);
 
+function isLikeNone(x) {
+    return x === undefined || x === null;
+}
+
+let cachegetUint16Memory0 = null;
+function getUint16Memory0() {
+    if (cachegetUint16Memory0 === null || cachegetUint16Memory0.buffer !== wasm.memory.buffer) {
+        cachegetUint16Memory0 = new Uint16Array(wasm.memory.buffer);
+    }
+    return cachegetUint16Memory0;
+}
+
+function passArray16ToWasm0(arg, malloc) {
+    const ptr = malloc(arg.length * 2);
+    getUint16Memory0().set(arg, ptr / 2);
+    WASM_VECTOR_LEN = arg.length;
+    return ptr;
+}
+
 function _assertClass(instance, klass) {
     if (!(instance instanceof klass)) {
         throw new Error(`expected instance of ${klass.name}`);
@@ -209,10 +233,6 @@ export function air_squadron_can_equip(gear) {
     return ret !== 0;
 }
 
-function isLikeNone(x) {
-    return x === undefined || x === null;
-}
-
 let cachegetUint32Memory0 = null;
 function getUint32Memory0() {
     if (cachegetUint32Memory0 === null || cachegetUint32Memory0.buffer !== wasm.memory.buffer) {
@@ -231,26 +251,6 @@ function getArrayJsValueFromWasm0(ptr, len) {
     return result;
 }
 /**
-*/
-export function set_panic_hook() {
-    wasm.set_panic_hook();
-}
-
-let cachegetUint16Memory0 = null;
-function getUint16Memory0() {
-    if (cachegetUint16Memory0 === null || cachegetUint16Memory0.buffer !== wasm.memory.buffer) {
-        cachegetUint16Memory0 = new Uint16Array(wasm.memory.buffer);
-    }
-    return cachegetUint16Memory0;
-}
-
-function passArray16ToWasm0(arg, malloc) {
-    const ptr = malloc(arg.length * 2);
-    getUint16Memory0().set(arg, ptr / 2);
-    WASM_VECTOR_LEN = arg.length;
-    return ptr;
-}
-/**
 * @param {bindings.OrgType} org_type
 * @returns {boolean}
 */
@@ -487,14 +487,14 @@ export class Analyzer {
     /**
     * @param {Comp} comp
     * @param {bindings.Formation} formation
-    * @param {number | undefined} adjusted_anti_air_resist
-    * @param {number | undefined} fleet_anti_air_resist
+    * @param {number} adjusted_anti_air_resist
+    * @param {number} fleet_anti_air_resist
     * @param {number | undefined} aaci
     * @returns {bindings.CompAntiAirInfo}
     */
     analyze_anti_air(comp, formation, adjusted_anti_air_resist, fleet_anti_air_resist, aaci) {
         _assertClass(comp, Comp);
-        var ret = wasm.analyzer_analyze_anti_air(this.ptr, comp.ptr, addHeapObject(formation), !isLikeNone(adjusted_anti_air_resist), isLikeNone(adjusted_anti_air_resist) ? 0 : adjusted_anti_air_resist, !isLikeNone(fleet_anti_air_resist), isLikeNone(fleet_anti_air_resist) ? 0 : fleet_anti_air_resist, isLikeNone(aaci) ? 0xFFFFFF : aaci);
+        var ret = wasm.analyzer_analyze_anti_air(this.ptr, comp.ptr, addHeapObject(formation), adjusted_anti_air_resist, fleet_anti_air_resist, isLikeNone(aaci) ? 0xFFFFFF : aaci);
         return takeObject(ret);
     }
     /**
@@ -776,14 +776,14 @@ export class Comp {
     }
     /**
     * 制空値
-    * @param {boolean} anti_combined
-    * @param {boolean} anti_lbas
+    * @param {boolean} escort_participates
+    * @param {boolean} recon_participates
     * @returns {number | undefined}
     */
-    fighter_power(anti_combined, anti_lbas) {
+    fighter_power(escort_participates, recon_participates) {
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.comp_fighter_power(retptr, this.ptr, anti_combined, anti_lbas);
+            wasm.comp_fighter_power(retptr, this.ptr, escort_participates, recon_participates);
             var r0 = getInt32Memory0()[retptr / 4 + 0];
             var r1 = getInt32Memory0()[retptr / 4 + 1];
             return r0 === 0 ? undefined : r1;
@@ -1180,13 +1180,13 @@ export class Fleet {
         }
     }
     /**
-    * @param {boolean} anti_lbas
+    * @param {boolean} recon_participates
     * @returns {number | undefined}
     */
-    fighter_power(anti_lbas) {
+    fighter_power(recon_participates) {
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.fleet_fighter_power(retptr, this.ptr, anti_lbas);
+            wasm.fleet_fighter_power(retptr, this.ptr, recon_participates);
             var r0 = getInt32Memory0()[retptr / 4 + 0];
             var r1 = getInt32Memory0()[retptr / 4 + 1];
             return r0 === 0 ? undefined : r1;
@@ -1764,13 +1764,6 @@ export class Gear {
         return ret;
     }
     /**
-    * @returns {boolean}
-    */
-    is_contact_selection_plane() {
-        var ret = wasm.gear_is_contact_selection_plane(this.ptr);
-        return ret !== 0;
-    }
-    /**
     * @param {bindings.AirStateRank} rank
     * @returns {number}
     */
@@ -3134,13 +3127,13 @@ export class Ship {
         return ret;
     }
     /**
-    * @param {boolean} anti_lbas
+    * @param {boolean} recon_participates
     * @returns {number | undefined}
     */
-    fighter_power(anti_lbas) {
+    fighter_power(recon_participates) {
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.ship_fighter_power(retptr, this.ptr, anti_lbas);
+            wasm.ship_fighter_power(retptr, this.ptr, recon_participates);
             var r0 = getInt32Memory0()[retptr / 4 + 0];
             var r1 = getInt32Memory0()[retptr / 4 + 1];
             return r0 === 0 ? undefined : r1;
@@ -3338,15 +3331,15 @@ export function __wbg_error_09919627ac0992f5(arg0, arg1) {
     }
 };
 
-export function __wbg_randomFillSync_59fcc2add91fe7b3() { return handleError(function (arg0, arg1, arg2) {
+export function __wbg_randomFillSync_378e02b85af41ab6() { return handleError(function (arg0, arg1, arg2) {
     getObject(arg0).randomFillSync(getArrayU8FromWasm0(arg1, arg2));
 }, arguments) };
 
-export function __wbg_getRandomValues_3e46aa268da0fed1() { return handleError(function (arg0, arg1) {
+export function __wbg_getRandomValues_99bbe8a65f4aef87() { return handleError(function (arg0, arg1) {
     getObject(arg0).getRandomValues(getObject(arg1));
 }, arguments) };
 
-export function __wbg_process_f2b73829dbd321da(arg0) {
+export function __wbg_process_5729605ce9d34ea8(arg0) {
     var ret = getObject(arg0).process;
     return addHeapObject(ret);
 };
@@ -3357,12 +3350,12 @@ export function __wbindgen_is_object(arg0) {
     return ret;
 };
 
-export function __wbg_versions_cd82f79c98672a9f(arg0) {
+export function __wbg_versions_531e16e1a776ee97(arg0) {
     var ret = getObject(arg0).versions;
     return addHeapObject(ret);
 };
 
-export function __wbg_node_ee3f6da4130bd35f(arg0) {
+export function __wbg_node_18b58a160b60d170(arg0) {
     var ret = getObject(arg0).node;
     return addHeapObject(ret);
 };
@@ -3372,17 +3365,22 @@ export function __wbindgen_is_string(arg0) {
     return ret;
 };
 
-export function __wbg_modulerequire_0a83c0c31d12d2c7() { return handleError(function (arg0, arg1) {
-    var ret = module.require(getStringFromWasm0(arg0, arg1));
+export function __wbg_static_accessor_NODE_MODULE_bdc5ca9096c68aeb() {
+    var ret = module;
+    return addHeapObject(ret);
+};
+
+export function __wbg_require_edfaedd93e302925() { return handleError(function (arg0, arg1, arg2) {
+    var ret = getObject(arg0).require(getStringFromWasm0(arg1, arg2));
     return addHeapObject(ret);
 }, arguments) };
 
-export function __wbg_crypto_9e3521ed42436d35(arg0) {
+export function __wbg_crypto_2bc4d5b05161de5b(arg0) {
     var ret = getObject(arg0).crypto;
     return addHeapObject(ret);
 };
 
-export function __wbg_msCrypto_c429c3f8f7a70bb5(arg0) {
+export function __wbg_msCrypto_d003eebe62c636a9(arg0) {
     var ret = getObject(arg0).msCrypto;
     return addHeapObject(ret);
 };

package/pkg/fleethub_core_bg.wasm.d.ts

@@ -106,7 +106,6 @@ export function gear_calc_interception_power(a: number, b: number): number;
 export function gear_fleet_anti_air(a: number): number;
 export function gear_adjusted_anti_air(a: number): number;
 export function gear_calc_contact_trigger_factor(a: number, b: number): number;
-export function gear_is_contact_selection_plane(a: number): number;
 export function gear_contact_selection_rate(a: number, b: number): number;
 export function gear_night_contact_rate(a: number, b: number): number;
 export function gear_is_night_plane(a: number): number;
@@ -116,6 +115,19 @@ export function gear_is_abyssal(a: number): number;
 export function gear_is_abyssal_cuttlefish_torpedo(a: number): number;
 export function gear_is_abyssal_patrolling_attack_hawk(a: number): number;
 export function gear_expedition_bonus(a: number): number;
+export function __wbg_fhcore_free(a: number): void;
+export function fhcore_new(a: number, b: number, c: number): void;
+export function fhcore_create_gear(a: number, b: number): number;
+export function fhcore_create_ship(a: number, b: number): number;
+export function fhcore_create_air_squadron(a: number, b: number): number;
+export function fhcore_create_fleet(a: number, b: number): number;
+export function fhcore_create_org(a: number, b: number): number;
+export function fhcore_create_ship_by_id(a: number, b: number): number;
+export function fhcore_create_comp_by_map_enemy(a: number, b: number, c: number, d: number, e: number): number;
+export function fhcore_create_default_ship(a: number): number;
+export function fhcore_create_analyzer(a: number): number;
+export function fhcore_simulate_shelling_support(a: number, b: number, c: number, d: number, e: number, f: number): void;
+export function set_panic_hook(): 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;
@@ -210,21 +222,6 @@ export function ship_get_possible_anti_air_cutin_ids(a: number, b: number): void
 export function ship_transport_point(a: number): number;
 export function ship_elos(a: number, b: number, c: number): void;
 export function ship_take_damage(a: number, b: number): void;
-export function __wbg_airsquadron_free(a: number): void;
-export function __wbg_get_airsquadron_id(a: number, b: number): void;
-export function __wbg_set_airsquadron_id(a: number, b: number, c: number): void;
-export function __wbg_get_airsquadron_xxh3(a: number, b: number): void;
-export function __wbg_set_airsquadron_xxh3(a: number, b: number, c: number): void;
-export function __wbg_get_airsquadron_mode(a: number): number;
-export function __wbg_set_airsquadron_mode(a: number, b: number): void;
-export function air_squadron_can_equip(a: number): number;
-export function airsquadron_get_gear(a: number, b: number, c: number): number;
-export function airsquadron_can_equip(a: number, b: number): number;
-export function airsquadron_get_slot_size(a: number, b: number, c: number): void;
-export function airsquadron_get_max_slot_size(a: number, b: number, c: number): void;
-export function airsquadron_fighter_power(a: number): number;
-export function airsquadron_interception_power(a: number): number;
-export function airsquadron_radius(a: number): number;
 export function __wbg_comp_free(a: number): void;
 export function __wbg_get_comp_org_type(a: number): number;
 export function __wbg_set_comp_org_type(a: number, b: number): void;
@@ -251,6 +248,21 @@ export function comp_fleet_anti_air(a: number, b: number): number;
 export function comp_fighter_power(a: number, b: number, c: number, d: number): void;
 export function comp_elos(a: number, b: number, c: number): void;
 export function comp_transport_point(a: number): number;
+export function __wbg_airsquadron_free(a: number): void;
+export function __wbg_get_airsquadron_id(a: number, b: number): void;
+export function __wbg_set_airsquadron_id(a: number, b: number, c: number): void;
+export function __wbg_get_airsquadron_xxh3(a: number, b: number): void;
+export function __wbg_set_airsquadron_xxh3(a: number, b: number, c: number): void;
+export function __wbg_get_airsquadron_mode(a: number): number;
+export function __wbg_set_airsquadron_mode(a: number, b: number): void;
+export function air_squadron_can_equip(a: number): number;
+export function airsquadron_get_gear(a: number, b: number, c: number): number;
+export function airsquadron_can_equip(a: number, b: number): number;
+export function airsquadron_get_slot_size(a: number, b: number, c: number): void;
+export function airsquadron_get_max_slot_size(a: number, b: number, c: number): void;
+export function airsquadron_fighter_power(a: number): number;
+export function airsquadron_interception_power(a: number): number;
+export function airsquadron_radius(a: number): number;
 export function __wbg_fleet_free(a: number): void;
 export function __wbg_get_fleet_id(a: number, b: number): void;
 export function __wbg_set_fleet_id(a: number, b: number, c: number): void;
@@ -275,23 +287,17 @@ export function fleet_aviation_detection_score(a: number, b: number): void;
 export function fleet_expedition_bonus(a: number): number;
 export function fleet_sum_ship_stat_by(a: number, b: number, c: number, d: number): void;
 export function fleet_reset_battle_state(a: number): void;
-export function __wbg_fhcore_free(a: number): void;
-export function fhcore_new(a: number, b: number, c: number): void;
-export function fhcore_create_gear(a: number, b: number): number;
-export function fhcore_create_ship(a: number, b: number): number;
-export function fhcore_create_air_squadron(a: number, b: number): number;
-export function fhcore_create_fleet(a: number, b: number): number;
-export function fhcore_create_org(a: number, b: number): number;
-export function fhcore_create_ship_by_id(a: number, b: number): number;
-export function fhcore_create_comp_by_map_enemy(a: number, b: number, c: number, d: number, e: number): number;
-export function fhcore_create_default_ship(a: number): number;
-export function fhcore_create_analyzer(a: number): number;
-export function fhcore_simulate_shelling_support(a: number, b: number, c: number, d: number, e: number, f: number): void;
-export function set_panic_hook(): void;
 export function org_type_is_single(a: number): number;
 export function org_type_default_formation(a: number): number;
 export function org_type_is_player(a: number): number;
 export function org_type_side(a: number): number;
+export function __wbg_analyzer_free(a: number): void;
+export function analyzer_analyze_anti_air(a: number, b: number, c: number, d: number, e: number, f: number): number;
+export function analyzer_analyze_day_cutin(a: number, b: number): number;
+export function analyzer_analyze_night_cutin(a: number, b: number, c: number, d: number): number;
+export function analyzer_analyze_contact_chance(a: number, b: number): number;
+export function analyzer_analyze_warfare(a: number, b: number, c: number, d: number): number;
+export function analyzer_analyze_fleet_cutin(a: number, b: number, c: number): number;
 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;
@@ -330,13 +336,6 @@ export function org_interception_power(a: number): number;
 export function org_high_altitude_interception_power(a: number): number;
 export function org_create_warfare_ship_environment(a: number, b: number, c: number): number;
 export function org_default(): number;
-export function __wbg_analyzer_free(a: number): void;
-export function analyzer_analyze_anti_air(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number): number;
-export function analyzer_analyze_day_cutin(a: number, b: number): number;
-export function analyzer_analyze_night_cutin(a: number, b: number, c: number, d: number): number;
-export function analyzer_analyze_contact_chance(a: number, b: number): number;
-export function analyzer_analyze_warfare(a: number, b: number, c: number, d: number): number;
-export function analyzer_analyze_fleet_cutin(a: number, b: number, c: number): number;
 export function __wbindgen_malloc(a: number): number;
 export function __wbindgen_realloc(a: number, b: number, c: number): number;
 export function __wbindgen_add_to_stack_pointer(a: number): number;