fleethub-core 1.7.2 → 1.7.3

package/node/fleethub_core.d.ts

@@ -100,8 +100,6 @@ export interface WarfareShipEnvironment {
   fleet_los_mod: number | null;
 }
 
-export type Role = "Main" | "Escort";
-
 export interface CompMeta {
   fleets: Record<FleetType, FleetMeta>;
 }
@@ -213,6 +211,8 @@ export interface DayCutinRateInfo {
 
 export type NumMap<K, V> = Partial<Record<K, V>>;
 
+export type Role = "Main" | "Escort";
+
 export type GearCategory =
   | "Fighter"
   | "Bomber"
@@ -417,6 +417,37 @@ export type ShipAttr =
   | "BattleshipSummerPrincess"
   | "HeavyCruiserSummerPrincess";
 
+export type GearAttr =
+  | "Unknown"
+  | "Abyssal"
+  | "HighAngleMount"
+  | "NightFighter"
+  | "NightAttacker"
+  | "HeavyBomber"
+  | "MainGun"
+  | "Radar"
+  | "SurfaceRadar"
+  | "AirRadar"
+  | "DepthChargeProjector"
+  | "SynergisticDepthCharge"
+  | "AntiSubMortar"
+  | "AntiSubWeapon"
+  | "AntiSubAircraft"
+  | "LateModelBowTorpedo"
+  | "Seaplane"
+  | "CbAircraft"
+  | "LbAircraft"
+  | "JetAircraft"
+  | "Fighter"
+  | "Recon"
+  | "ObservationSeaplane"
+  | "CbFighterBomber"
+  | "AntiInstDiveBomber"
+  | "NightRecon"
+  | "CbSwordfish"
+  | "SemiNightPlane"
+  | "HighAltitudeInterceptor";
+
 export type Formation = SingleFormation | CombinedFormation;
 
 export type CombinedFormation =
@@ -433,8 +464,6 @@ export type SingleFormation =
   | "LineAbreast"
   | "Vanguard";
 
-export type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
-
 export interface CompAntiAirInfo {
   fleet_adjusted_anti_air: number;
   ships: ShipAntiAirInfo[];
@@ -465,63 +494,7 @@ export interface AirstrikeContactChance {
   total: number;
 }
 
-export type SlotSizeVec = (number | null)[];
-
-export type GearAttr =
-  | "Unknown"
-  | "Abyssal"
-  | "HighAngleMount"
-  | "NightFighter"
-  | "NightAttacker"
-  | "HeavyBomber"
-  | "MainGun"
-  | "Radar"
-  | "SurfaceRadar"
-  | "AirRadar"
-  | "DepthChargeProjector"
-  | "SynergisticDepthCharge"
-  | "AntiSubMortar"
-  | "AntiSubWeapon"
-  | "AntiSubAircraft"
-  | "LateModelBowTorpedo"
-  | "Seaplane"
-  | "CbAircraft"
-  | "LbAircraft"
-  | "JetAircraft"
-  | "Fighter"
-  | "Recon"
-  | "ObservationSeaplane"
-  | "CbFighterBomber"
-  | "AntiInstDiveBomber"
-  | "NightRecon"
-  | "CbSwordfish"
-  | "SemiNightPlane"
-  | "HighAltitudeInterceptor";
-
-export interface MasterGear {
-  gear_id: number;
-  name: string;
-  types: GearTypeIdArray;
-  special_type?: number;
-  max_hp?: number;
-  firepower?: number;
-  armor?: number;
-  torpedo?: number;
-  anti_air?: number;
-  speed?: number;
-  bombing?: number;
-  asw?: number;
-  los?: number;
-  luck?: number;
-  accuracy?: number;
-  evasion?: number;
-  range?: number;
-  radius?: number;
-  cost?: number;
-  improvable?: boolean;
-  ship_anti_air_resistance?: number;
-  fleet_anti_air_resistance?: number;
-}
+export type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
 
 export interface MasterEquippable {
   equip_stype: EquipStype[];
@@ -545,21 +518,6 @@ export interface EquipStype {
   equip_type: number[];
 }
 
-export interface HitRate {
-  total: number;
-  normal: number;
-  critical: number;
-}
-
-export interface HitRateParams {
-  accuracy_term: number;
-  evasion_term: number;
-  target_morale_mod: number;
-  critical_rate_constant: number;
-  critical_percentage_bonus: number;
-  hit_percentage_bonus: number;
-}
-
 export type NightBattleAttackType =
   | { t: "NightAttack"; c: NightAttackType }
   | { t: "Asw"; c: AswAttackType };
@@ -609,20 +567,9 @@ export interface OrgState {
   boss_sup?: string;
 }
 
-export interface AirSquadronState {
+export interface AirSquadronState extends GearVecState, SlotSizeVecState {
   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 AirSquadronMode = "Sortie" | "AirDefense";
@@ -656,6 +603,8 @@ export interface ShipState extends GearVecState, SlotSizeVecState {
   asw_mod?: number;
   los_mod?: number;
   luck_mod?: number;
+  day_gunfit_accuracy?: number;
+  night_gunfit_accuracy?: number;
 }
 
 export interface SlotSizeVecState {
@@ -705,30 +654,44 @@ export type NightCutin =
   | "Cvci1_18"
   | "Photobomber";
 
-export interface WarfareInfo {
-  day: AttackInfo<DayBattleAttackType, DayCutin | null> | null;
-  closing_torpedo: AttackInfo<null, null> | null;
-  night: AttackInfo<NightBattleAttackType, NightCutin | null> | null;
-  shelling_support: AttackInfo<null, null> | null;
-  opening_asw: AttackInfo<null, null> | null;
+export interface MasterGear {
+  gear_id: number;
+  name: string;
+  types: GearTypeIdArray;
+  special_type?: number;
+  max_hp?: number;
+  firepower?: number;
+  armor?: number;
+  torpedo?: number;
+  anti_air?: number;
+  speed?: number;
+  bombing?: number;
+  asw?: number;
+  los?: number;
+  luck?: number;
+  accuracy?: number;
+  evasion?: number;
+  range?: number;
+  radius?: number;
+  cost?: number;
+  improvable?: boolean;
+  ship_anti_air_resistance?: number;
+  fleet_anti_air_resistance?: number;
 }
 
-export interface WarfareAnalyzerContext {
-  attacker_env: WarfareAnalyzerShipEnvironment;
-  target_env: WarfareAnalyzerShipEnvironment;
-  engagement: Engagement;
-  air_state: AirState;
+export interface HitRate {
+  total: number;
+  normal: number;
+  critical: number;
 }
 
-export interface WarfareAnalyzerShipEnvironment {
-  org_type: OrgType;
-  role: Role;
-  ship_index: number;
-  fleet_len: number;
-  formation: Formation;
-  fleet_los_mod: number | null;
-  night_situation: NightSituation;
-  custom_mods: CustomModifiers;
+export interface HitRateParams {
+  accuracy_term: number;
+  evasion_term: number;
+  target_morale_mod: number;
+  critical_rate_constant: number;
+  critical_percentage_bonus: number;
+  hit_percentage_bonus: number;
 }
 
 export interface BattleConfig {
@@ -816,8 +779,36 @@ export interface MasterShip {
 
 export type StatInterval = [number | null, number | null];
 
+export interface WarfareInfo {
+  day: AttackInfo<DayBattleAttackType, DayCutin | null> | null;
+  closing_torpedo: AttackInfo<null, null> | null;
+  night: AttackInfo<NightBattleAttackType, NightCutin | null> | null;
+  shelling_support: AttackInfo<null, null> | null;
+  opening_asw: AttackInfo<null, null> | null;
+}
+
+export interface WarfareAnalyzerContext {
+  attacker_env: WarfareAnalyzerShipEnvironment;
+  target_env: WarfareAnalyzerShipEnvironment;
+  engagement: Engagement;
+  air_state: AirState;
+}
+
+export interface WarfareAnalyzerShipEnvironment {
+  org_type: OrgType;
+  role: Role;
+  ship_index: number;
+  fleet_len: number;
+  formation: Formation;
+  fleet_los_mod: number | null;
+  night_situation: NightSituation;
+  custom_mods: CustomModifiers;
+}
+
 export type GearTypeIdArray = [number, number, number, number, number];
 
+export type SlotSizeVec = (number | null)[];
+
 export type Side = "Player" | "Enemy";
 
 export type SpecialEnemyType =
@@ -1814,11 +1805,6 @@ export class Ship {
    * @returns {number}
    */
   cruiser_fit_bonus(): number;
-  /**
-   * @param {boolean} is_night
-   * @returns {number}
-   */
-  fit_gun_bonus(is_night: boolean): number;
   /**
    * @returns {number | undefined}
    */
@@ -1861,6 +1847,20 @@ export class Ship {
    * @param {number} value
    */
   take_damage(value: number): void;
+  /**
+   * @returns {number | undefined}
+   */
+  state_day_gunfit_accuracy(): number | undefined;
+  /**
+   * @returns {number | undefined}
+   */
+  state_night_gunfit_accuracy(): number | undefined;
+  /**
+   * フィット砲補正
+   * @param {boolean} is_night
+   * @returns {number}
+   */
+  gunfit_accuracy(is_night: boolean): number;
   /**
    */
   readonly accuracy: number;

package/node/fleethub_core.js

@@ -2,15 +2,11 @@ let imports = {};
 imports['__wbindgen_placeholder__'] = module.exports;
 let wasm;
 const { createEquipmentBonuses } = require(`equipment-bonus`);
-const { TextEncoder, TextDecoder } = require(`util`);
+const { TextDecoder, TextEncoder } = require(`util`);
 
-const heap = new Array(32).fill(undefined);
-
-heap.push(undefined, null, true, false);
-
-function getObject(idx) { return heap[idx]; }
+let cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
 
-let WASM_VECTOR_LEN = 0;
+cachedTextDecoder.decode();
 
 let cachedUint8Memory0;
 function getUint8Memory0() {
@@ -20,6 +16,41 @@ function getUint8Memory0() {
     return cachedUint8Memory0;
 }
 
+function getStringFromWasm0(ptr, len) {
+    return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
+}
+
+const heap = new Array(32).fill(undefined);
+
+heap.push(undefined, null, true, false);
+
+let heap_next = heap.length;
+
+function addHeapObject(obj) {
+    if (heap_next === heap.length) heap.push(heap.length + 1);
+    const idx = heap_next;
+    heap_next = heap[idx];
+
+    heap[idx] = obj;
+    return idx;
+}
+
+function getObject(idx) { return heap[idx]; }
+
+function dropObject(idx) {
+    if (idx < 36) return;
+    heap[idx] = heap_next;
+    heap_next = idx;
+}
+
+function takeObject(idx) {
+    const ret = getObject(idx);
+    dropObject(idx);
+    return ret;
+}
+
+let WASM_VECTOR_LEN = 0;
+
 let cachedTextEncoder = new TextEncoder('utf-8');
 
 const encodeString = (typeof cachedTextEncoder.encodeInto === 'function'
@@ -81,37 +112,6 @@ function getInt32Memory0() {
     return cachedInt32Memory0;
 }
 
-let heap_next = heap.length;
-
-function dropObject(idx) {
-    if (idx < 36) return;
-    heap[idx] = heap_next;
-    heap_next = idx;
-}
-
-function takeObject(idx) {
-    const ret = getObject(idx);
-    dropObject(idx);
-    return ret;
-}
-
-let cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
-
-cachedTextDecoder.decode();
-
-function getStringFromWasm0(ptr, len) {
-    return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
-}
-
-function addHeapObject(obj) {
-    if (heap_next === heap.length) heap.push(heap.length + 1);
-    const idx = heap_next;
-    heap_next = heap[idx];
-
-    heap[idx] = obj;
-    return idx;
-}
-
 const u32CvtShim = new Uint32Array(2);
 
 const uint64CvtShim = new BigUint64Array(u32CvtShim.buffer);
@@ -164,11 +164,6 @@ function getUint16Memory0() {
 function getArrayU16FromWasm0(ptr, len) {
     return getUint16Memory0().subarray(ptr / 2, ptr / 2 + len);
 }
-/**
-*/
-module.exports.set_panic_hook = function() {
-    wasm.set_panic_hook();
-};
 
 function passArray16ToWasm0(arg, malloc) {
     const ptr = malloc(arg.length * 2);
@@ -176,6 +171,11 @@ function passArray16ToWasm0(arg, malloc) {
     WASM_VECTOR_LEN = arg.length;
     return ptr;
 }
+/**
+*/
+module.exports.set_panic_hook = function() {
+    wasm.set_panic_hook();
+};
 
 function getArrayU8FromWasm0(ptr, len) {
     return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len);
@@ -916,7 +916,7 @@ class Fleet {
     get xxh3() {
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.__wbg_get_airsquadron_xxh3(retptr, this.ptr);
+            wasm.__wbg_get_fleet_xxh3(retptr, this.ptr);
             var r0 = getInt32Memory0()[retptr / 4 + 0];
             var r1 = getInt32Memory0()[retptr / 4 + 1];
             u32CvtShim[0] = r0;
@@ -933,7 +933,7 @@ class Fleet {
         uint64CvtShim[0] = arg0;
         const low0 = u32CvtShim[0];
         const high0 = u32CvtShim[1];
-        wasm.__wbg_set_airsquadron_xxh3(this.ptr, low0, high0);
+        wasm.__wbg_set_fleet_xxh3(this.ptr, low0, high0);
     }
     /**
     */
@@ -3042,14 +3042,6 @@ class Ship {
         return ret;
     }
     /**
-    * @param {boolean} is_night
-    * @returns {number}
-    */
-    fit_gun_bonus(is_night) {
-        const ret = wasm.ship_fit_gun_bonus(this.ptr, is_night);
-        return ret;
-    }
-    /**
     * @returns {number | undefined}
     */
     basic_accuracy_term() {
@@ -3152,9 +3144,55 @@ class Ship {
     take_damage(value) {
         wasm.ship_take_damage(this.ptr, value);
     }
+    /**
+    * @returns {number | undefined}
+    */
+    state_day_gunfit_accuracy() {
+        try {
+            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+            wasm.ship_state_day_gunfit_accuracy(retptr, this.ptr);
+            var r0 = getInt32Memory0()[retptr / 4 + 0];
+            var r2 = getFloat64Memory0()[retptr / 8 + 1];
+            return r0 === 0 ? undefined : r2;
+        } finally {
+            wasm.__wbindgen_add_to_stack_pointer(16);
+        }
+    }
+    /**
+    * @returns {number | undefined}
+    */
+    state_night_gunfit_accuracy() {
+        try {
+            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+            wasm.ship_state_night_gunfit_accuracy(retptr, this.ptr);
+            var r0 = getInt32Memory0()[retptr / 4 + 0];
+            var r2 = getFloat64Memory0()[retptr / 8 + 1];
+            return r0 === 0 ? undefined : r2;
+        } finally {
+            wasm.__wbindgen_add_to_stack_pointer(16);
+        }
+    }
+    /**
+    * フィット砲補正
+    * @param {boolean} is_night
+    * @returns {number}
+    */
+    gunfit_accuracy(is_night) {
+        const ret = wasm.ship_gunfit_accuracy(this.ptr, is_night);
+        return ret;
+    }
 }
 module.exports.Ship = Ship;
 
+module.exports.__wbindgen_string_new = function(arg0, arg1) {
+    const ret = getStringFromWasm0(arg0, arg1);
+    return addHeapObject(ret);
+};
+
+module.exports.__wbindgen_object_drop_ref = function(arg0) {
+    takeObject(arg0);
+};
+
 module.exports.__wbindgen_json_serialize = function(arg0, arg1) {
     const obj = getObject(arg1);
     const ret = JSON.stringify(obj === undefined ? null : obj);
@@ -3164,16 +3202,7 @@ module.exports.__wbindgen_json_serialize = function(arg0, arg1) {
     getInt32Memory0()[arg0 / 4 + 0] = ptr0;
 };
 
-module.exports.__wbindgen_object_drop_ref = function(arg0) {
-    takeObject(arg0);
-};
-
-module.exports.__wbindgen_string_new = function(arg0, arg1) {
-    const ret = getStringFromWasm0(arg0, arg1);
-    return addHeapObject(ret);
-};
-
-module.exports.__wbg_createEquipmentBonuses_184e78e66b9cdc65 = function(arg0, arg1) {
+module.exports.__wbg_createEquipmentBonuses_a27fec520ac90d68 = function(arg0, arg1) {
     const ret = createEquipmentBonuses(takeObject(arg0), takeObject(arg1));
     return addHeapObject(ret);
 };

package/node/fleethub_core_bg.wasm.d.ts

@@ -88,7 +88,6 @@ 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_fleet_anti_air_mod(a: number): number;
 export function ship_cruiser_fit_bonus(a: number): number;
-export function ship_fit_gun_bonus(a: number, b: 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;
@@ -187,6 +186,8 @@ 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;
+export function __wbg_get_fleet_xxh3(a: number, b: number): void;
+export function __wbg_set_fleet_xxh3(a: number, b: number, c: number): void;
 export function __wbg_get_fleet_len(a: number): number;
 export function __wbg_set_fleet_len(a: number, b: number): void;
 export function fleet_meta(a: number): number;
@@ -206,8 +207,6 @@ 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_get_fleet_xxh3(a: number, b: number): void;
-export function __wbg_set_fleet_xxh3(a: number, b: number, c: number): void;
 export function __wbg_fhcore_free(a: number): void;
 export function fhcore_new(a: number, b: number): void;
 export function fhcore_create_gear(a: number, b: number): number;
@@ -221,6 +220,9 @@ export function fhcore_create_comp_by_map_enemy(a: number, b: number, c: 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 ship_state_day_gunfit_accuracy(a: number, b: number): void;
+export function ship_state_night_gunfit_accuracy(a: number, b: number): void;
+export function ship_gunfit_accuracy(a: number, b: number): number;
 export function set_panic_hook(): void;
 export function __wbg_ibonuses_free(a: number): void;
 export function __wbg_get_ibonuses_shelling_power(a: number): number;

package/package.json

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

package/pkg/fleethub_core.d.ts

@@ -100,8 +100,6 @@ export interface WarfareShipEnvironment {
   fleet_los_mod: number | null;
 }
 
-export type Role = "Main" | "Escort";
-
 export interface CompMeta {
   fleets: Record<FleetType, FleetMeta>;
 }
@@ -213,6 +211,8 @@ export interface DayCutinRateInfo {
 
 export type NumMap<K, V> = Partial<Record<K, V>>;
 
+export type Role = "Main" | "Escort";
+
 export type GearCategory =
   | "Fighter"
   | "Bomber"
@@ -417,6 +417,37 @@ export type ShipAttr =
   | "BattleshipSummerPrincess"
   | "HeavyCruiserSummerPrincess";
 
+export type GearAttr =
+  | "Unknown"
+  | "Abyssal"
+  | "HighAngleMount"
+  | "NightFighter"
+  | "NightAttacker"
+  | "HeavyBomber"
+  | "MainGun"
+  | "Radar"
+  | "SurfaceRadar"
+  | "AirRadar"
+  | "DepthChargeProjector"
+  | "SynergisticDepthCharge"
+  | "AntiSubMortar"
+  | "AntiSubWeapon"
+  | "AntiSubAircraft"
+  | "LateModelBowTorpedo"
+  | "Seaplane"
+  | "CbAircraft"
+  | "LbAircraft"
+  | "JetAircraft"
+  | "Fighter"
+  | "Recon"
+  | "ObservationSeaplane"
+  | "CbFighterBomber"
+  | "AntiInstDiveBomber"
+  | "NightRecon"
+  | "CbSwordfish"
+  | "SemiNightPlane"
+  | "HighAltitudeInterceptor";
+
 export type Formation = SingleFormation | CombinedFormation;
 
 export type CombinedFormation =
@@ -433,8 +464,6 @@ export type SingleFormation =
   | "LineAbreast"
   | "Vanguard";
 
-export type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
-
 export interface CompAntiAirInfo {
   fleet_adjusted_anti_air: number;
   ships: ShipAntiAirInfo[];
@@ -465,63 +494,7 @@ export interface AirstrikeContactChance {
   total: number;
 }
 
-export type SlotSizeVec = (number | null)[];
-
-export type GearAttr =
-  | "Unknown"
-  | "Abyssal"
-  | "HighAngleMount"
-  | "NightFighter"
-  | "NightAttacker"
-  | "HeavyBomber"
-  | "MainGun"
-  | "Radar"
-  | "SurfaceRadar"
-  | "AirRadar"
-  | "DepthChargeProjector"
-  | "SynergisticDepthCharge"
-  | "AntiSubMortar"
-  | "AntiSubWeapon"
-  | "AntiSubAircraft"
-  | "LateModelBowTorpedo"
-  | "Seaplane"
-  | "CbAircraft"
-  | "LbAircraft"
-  | "JetAircraft"
-  | "Fighter"
-  | "Recon"
-  | "ObservationSeaplane"
-  | "CbFighterBomber"
-  | "AntiInstDiveBomber"
-  | "NightRecon"
-  | "CbSwordfish"
-  | "SemiNightPlane"
-  | "HighAltitudeInterceptor";
-
-export interface MasterGear {
-  gear_id: number;
-  name: string;
-  types: GearTypeIdArray;
-  special_type?: number;
-  max_hp?: number;
-  firepower?: number;
-  armor?: number;
-  torpedo?: number;
-  anti_air?: number;
-  speed?: number;
-  bombing?: number;
-  asw?: number;
-  los?: number;
-  luck?: number;
-  accuracy?: number;
-  evasion?: number;
-  range?: number;
-  radius?: number;
-  cost?: number;
-  improvable?: boolean;
-  ship_anti_air_resistance?: number;
-  fleet_anti_air_resistance?: number;
-}
+export type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
 
 export interface MasterEquippable {
   equip_stype: EquipStype[];
@@ -545,21 +518,6 @@ export interface EquipStype {
   equip_type: number[];
 }
 
-export interface HitRate {
-  total: number;
-  normal: number;
-  critical: number;
-}
-
-export interface HitRateParams {
-  accuracy_term: number;
-  evasion_term: number;
-  target_morale_mod: number;
-  critical_rate_constant: number;
-  critical_percentage_bonus: number;
-  hit_percentage_bonus: number;
-}
-
 export type NightBattleAttackType =
   | { t: "NightAttack"; c: NightAttackType }
   | { t: "Asw"; c: AswAttackType };
@@ -609,20 +567,9 @@ export interface OrgState {
   boss_sup?: string;
 }
 
-export interface AirSquadronState {
+export interface AirSquadronState extends GearVecState, SlotSizeVecState {
   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 AirSquadronMode = "Sortie" | "AirDefense";
@@ -656,6 +603,8 @@ export interface ShipState extends GearVecState, SlotSizeVecState {
   asw_mod?: number;
   los_mod?: number;
   luck_mod?: number;
+  day_gunfit_accuracy?: number;
+  night_gunfit_accuracy?: number;
 }
 
 export interface SlotSizeVecState {
@@ -705,30 +654,44 @@ export type NightCutin =
   | "Cvci1_18"
   | "Photobomber";
 
-export interface WarfareInfo {
-  day: AttackInfo<DayBattleAttackType, DayCutin | null> | null;
-  closing_torpedo: AttackInfo<null, null> | null;
-  night: AttackInfo<NightBattleAttackType, NightCutin | null> | null;
-  shelling_support: AttackInfo<null, null> | null;
-  opening_asw: AttackInfo<null, null> | null;
+export interface MasterGear {
+  gear_id: number;
+  name: string;
+  types: GearTypeIdArray;
+  special_type?: number;
+  max_hp?: number;
+  firepower?: number;
+  armor?: number;
+  torpedo?: number;
+  anti_air?: number;
+  speed?: number;
+  bombing?: number;
+  asw?: number;
+  los?: number;
+  luck?: number;
+  accuracy?: number;
+  evasion?: number;
+  range?: number;
+  radius?: number;
+  cost?: number;
+  improvable?: boolean;
+  ship_anti_air_resistance?: number;
+  fleet_anti_air_resistance?: number;
 }
 
-export interface WarfareAnalyzerContext {
-  attacker_env: WarfareAnalyzerShipEnvironment;
-  target_env: WarfareAnalyzerShipEnvironment;
-  engagement: Engagement;
-  air_state: AirState;
+export interface HitRate {
+  total: number;
+  normal: number;
+  critical: number;
 }
 
-export interface WarfareAnalyzerShipEnvironment {
-  org_type: OrgType;
-  role: Role;
-  ship_index: number;
-  fleet_len: number;
-  formation: Formation;
-  fleet_los_mod: number | null;
-  night_situation: NightSituation;
-  custom_mods: CustomModifiers;
+export interface HitRateParams {
+  accuracy_term: number;
+  evasion_term: number;
+  target_morale_mod: number;
+  critical_rate_constant: number;
+  critical_percentage_bonus: number;
+  hit_percentage_bonus: number;
 }
 
 export interface BattleConfig {
@@ -816,8 +779,36 @@ export interface MasterShip {
 
 export type StatInterval = [number | null, number | null];
 
+export interface WarfareInfo {
+  day: AttackInfo<DayBattleAttackType, DayCutin | null> | null;
+  closing_torpedo: AttackInfo<null, null> | null;
+  night: AttackInfo<NightBattleAttackType, NightCutin | null> | null;
+  shelling_support: AttackInfo<null, null> | null;
+  opening_asw: AttackInfo<null, null> | null;
+}
+
+export interface WarfareAnalyzerContext {
+  attacker_env: WarfareAnalyzerShipEnvironment;
+  target_env: WarfareAnalyzerShipEnvironment;
+  engagement: Engagement;
+  air_state: AirState;
+}
+
+export interface WarfareAnalyzerShipEnvironment {
+  org_type: OrgType;
+  role: Role;
+  ship_index: number;
+  fleet_len: number;
+  formation: Formation;
+  fleet_los_mod: number | null;
+  night_situation: NightSituation;
+  custom_mods: CustomModifiers;
+}
+
 export type GearTypeIdArray = [number, number, number, number, number];
 
+export type SlotSizeVec = (number | null)[];
+
 export type Side = "Player" | "Enemy";
 
 export type SpecialEnemyType =
@@ -1814,11 +1805,6 @@ export class Ship {
    * @returns {number}
    */
   cruiser_fit_bonus(): number;
-  /**
-   * @param {boolean} is_night
-   * @returns {number}
-   */
-  fit_gun_bonus(is_night: boolean): number;
   /**
    * @returns {number | undefined}
    */
@@ -1861,6 +1847,20 @@ export class Ship {
    * @param {number} value
    */
   take_damage(value: number): void;
+  /**
+   * @returns {number | undefined}
+   */
+  state_day_gunfit_accuracy(): number | undefined;
+  /**
+   * @returns {number | undefined}
+   */
+  state_night_gunfit_accuracy(): number | undefined;
+  /**
+   * フィット砲補正
+   * @param {boolean} is_night
+   * @returns {number}
+   */
+  gunfit_accuracy(is_night: boolean): number;
   /**
    */
   readonly accuracy: number;

package/pkg/fleethub_core_bg.js

@@ -1,13 +1,11 @@
 import { createEquipmentBonuses } from 'equipment-bonus';
 import * as wasm from './fleethub_core_bg.wasm';
 
-const heap = new Array(32).fill(undefined);
-
-heap.push(undefined, null, true, false);
+const lTextDecoder = typeof TextDecoder === 'undefined' ? (0, module.require)('util').TextDecoder : TextDecoder;
 
-function getObject(idx) { return heap[idx]; }
+let cachedTextDecoder = new lTextDecoder('utf-8', { ignoreBOM: true, fatal: true });
 
-let WASM_VECTOR_LEN = 0;
+cachedTextDecoder.decode();
 
 let cachedUint8Memory0;
 function getUint8Memory0() {
@@ -17,6 +15,41 @@ function getUint8Memory0() {
     return cachedUint8Memory0;
 }
 
+function getStringFromWasm0(ptr, len) {
+    return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
+}
+
+const heap = new Array(32).fill(undefined);
+
+heap.push(undefined, null, true, false);
+
+let heap_next = heap.length;
+
+function addHeapObject(obj) {
+    if (heap_next === heap.length) heap.push(heap.length + 1);
+    const idx = heap_next;
+    heap_next = heap[idx];
+
+    heap[idx] = obj;
+    return idx;
+}
+
+function getObject(idx) { return heap[idx]; }
+
+function dropObject(idx) {
+    if (idx < 36) return;
+    heap[idx] = heap_next;
+    heap_next = idx;
+}
+
+function takeObject(idx) {
+    const ret = getObject(idx);
+    dropObject(idx);
+    return ret;
+}
+
+let WASM_VECTOR_LEN = 0;
+
 const lTextEncoder = typeof TextEncoder === 'undefined' ? (0, module.require)('util').TextEncoder : TextEncoder;
 
 let cachedTextEncoder = new lTextEncoder('utf-8');
@@ -80,39 +113,6 @@ function getInt32Memory0() {
     return cachedInt32Memory0;
 }
 
-let heap_next = heap.length;
-
-function dropObject(idx) {
-    if (idx < 36) return;
-    heap[idx] = heap_next;
-    heap_next = idx;
-}
-
-function takeObject(idx) {
-    const ret = getObject(idx);
-    dropObject(idx);
-    return ret;
-}
-
-const lTextDecoder = typeof TextDecoder === 'undefined' ? (0, module.require)('util').TextDecoder : TextDecoder;
-
-let cachedTextDecoder = new lTextDecoder('utf-8', { ignoreBOM: true, fatal: true });
-
-cachedTextDecoder.decode();
-
-function getStringFromWasm0(ptr, len) {
-    return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
-}
-
-function addHeapObject(obj) {
-    if (heap_next === heap.length) heap.push(heap.length + 1);
-    const idx = heap_next;
-    heap_next = heap[idx];
-
-    heap[idx] = obj;
-    return idx;
-}
-
 const u32CvtShim = new Uint32Array(2);
 
 const uint64CvtShim = new BigUint64Array(u32CvtShim.buffer);
@@ -165,11 +165,6 @@ function getUint16Memory0() {
 function getArrayU16FromWasm0(ptr, len) {
     return getUint16Memory0().subarray(ptr / 2, ptr / 2 + len);
 }
-/**
-*/
-export function set_panic_hook() {
-    wasm.set_panic_hook();
-}
 
 function passArray16ToWasm0(arg, malloc) {
     const ptr = malloc(arg.length * 2);
@@ -177,6 +172,11 @@ function passArray16ToWasm0(arg, malloc) {
     WASM_VECTOR_LEN = arg.length;
     return ptr;
 }
+/**
+*/
+export function set_panic_hook() {
+    wasm.set_panic_hook();
+}
 
 function getArrayU8FromWasm0(ptr, len) {
     return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len);
@@ -913,7 +913,7 @@ export class Fleet {
     get xxh3() {
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.__wbg_get_airsquadron_xxh3(retptr, this.ptr);
+            wasm.__wbg_get_fleet_xxh3(retptr, this.ptr);
             var r0 = getInt32Memory0()[retptr / 4 + 0];
             var r1 = getInt32Memory0()[retptr / 4 + 1];
             u32CvtShim[0] = r0;
@@ -930,7 +930,7 @@ export class Fleet {
         uint64CvtShim[0] = arg0;
         const low0 = u32CvtShim[0];
         const high0 = u32CvtShim[1];
-        wasm.__wbg_set_airsquadron_xxh3(this.ptr, low0, high0);
+        wasm.__wbg_set_fleet_xxh3(this.ptr, low0, high0);
     }
     /**
     */
@@ -3035,14 +3035,6 @@ export class Ship {
         return ret;
     }
     /**
-    * @param {boolean} is_night
-    * @returns {number}
-    */
-    fit_gun_bonus(is_night) {
-        const ret = wasm.ship_fit_gun_bonus(this.ptr, is_night);
-        return ret;
-    }
-    /**
     * @returns {number | undefined}
     */
     basic_accuracy_term() {
@@ -3145,8 +3137,54 @@ export class Ship {
     take_damage(value) {
         wasm.ship_take_damage(this.ptr, value);
     }
+    /**
+    * @returns {number | undefined}
+    */
+    state_day_gunfit_accuracy() {
+        try {
+            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+            wasm.ship_state_day_gunfit_accuracy(retptr, this.ptr);
+            var r0 = getInt32Memory0()[retptr / 4 + 0];
+            var r2 = getFloat64Memory0()[retptr / 8 + 1];
+            return r0 === 0 ? undefined : r2;
+        } finally {
+            wasm.__wbindgen_add_to_stack_pointer(16);
+        }
+    }
+    /**
+    * @returns {number | undefined}
+    */
+    state_night_gunfit_accuracy() {
+        try {
+            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+            wasm.ship_state_night_gunfit_accuracy(retptr, this.ptr);
+            var r0 = getInt32Memory0()[retptr / 4 + 0];
+            var r2 = getFloat64Memory0()[retptr / 8 + 1];
+            return r0 === 0 ? undefined : r2;
+        } finally {
+            wasm.__wbindgen_add_to_stack_pointer(16);
+        }
+    }
+    /**
+    * フィット砲補正
+    * @param {boolean} is_night
+    * @returns {number}
+    */
+    gunfit_accuracy(is_night) {
+        const ret = wasm.ship_gunfit_accuracy(this.ptr, is_night);
+        return ret;
+    }
 }
 
+export function __wbindgen_string_new(arg0, arg1) {
+    const ret = getStringFromWasm0(arg0, arg1);
+    return addHeapObject(ret);
+};
+
+export function __wbindgen_object_drop_ref(arg0) {
+    takeObject(arg0);
+};
+
 export function __wbindgen_json_serialize(arg0, arg1) {
     const obj = getObject(arg1);
     const ret = JSON.stringify(obj === undefined ? null : obj);
@@ -3156,16 +3194,7 @@ export function __wbindgen_json_serialize(arg0, arg1) {
     getInt32Memory0()[arg0 / 4 + 0] = ptr0;
 };
 
-export function __wbindgen_object_drop_ref(arg0) {
-    takeObject(arg0);
-};
-
-export function __wbindgen_string_new(arg0, arg1) {
-    const ret = getStringFromWasm0(arg0, arg1);
-    return addHeapObject(ret);
-};
-
-export function __wbg_createEquipmentBonuses_184e78e66b9cdc65(arg0, arg1) {
+export function __wbg_createEquipmentBonuses_a27fec520ac90d68(arg0, arg1) {
     const ret = createEquipmentBonuses(takeObject(arg0), takeObject(arg1));
     return addHeapObject(ret);
 };

package/pkg/fleethub_core_bg.wasm.d.ts

@@ -88,7 +88,6 @@ 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_fleet_anti_air_mod(a: number): number;
 export function ship_cruiser_fit_bonus(a: number): number;
-export function ship_fit_gun_bonus(a: number, b: 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;
@@ -187,6 +186,8 @@ 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;
+export function __wbg_get_fleet_xxh3(a: number, b: number): void;
+export function __wbg_set_fleet_xxh3(a: number, b: number, c: number): void;
 export function __wbg_get_fleet_len(a: number): number;
 export function __wbg_set_fleet_len(a: number, b: number): void;
 export function fleet_meta(a: number): number;
@@ -206,8 +207,6 @@ 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_get_fleet_xxh3(a: number, b: number): void;
-export function __wbg_set_fleet_xxh3(a: number, b: number, c: number): void;
 export function __wbg_fhcore_free(a: number): void;
 export function fhcore_new(a: number, b: number): void;
 export function fhcore_create_gear(a: number, b: number): number;
@@ -221,6 +220,9 @@ export function fhcore_create_comp_by_map_enemy(a: number, b: number, c: 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 ship_state_day_gunfit_accuracy(a: number, b: number): void;
+export function ship_state_night_gunfit_accuracy(a: number, b: number): void;
+export function ship_gunfit_accuracy(a: number, b: number): number;
 export function set_panic_hook(): void;
 export function __wbg_ibonuses_free(a: number): void;
 export function __wbg_get_ibonuses_shelling_power(a: number): number;