fleethub-core 1.3.3 → 1.4.2

package/node/fleethub_core.d.ts

@@ -3,9 +3,7 @@
 /**
  */
 export function set_panic_hook(): void;
-export interface EBonusFnGearInput {
-  gear_id: number;
-  types: GearTypeIdArray;
+export interface EBonuses {
   firepower: number;
   torpedo: number;
   anti_air: number;
@@ -16,19 +14,18 @@ export interface EBonusFnGearInput {
   bombing: number;
   accuracy: number;
   range: number;
-  radius: number;
-  stars: number;
-  ace: number;
 }
 
-export interface EBonusFnShipInput {
+export interface ShipInput {
   ship_id: number;
   ctype: number;
   stype: number;
   yomi: string;
 }
 
-export interface EBonuses {
+export interface GearInput {
+  gear_id: number;
+  types: GearTypeIdArray;
   firepower: number;
   torpedo: number;
   anti_air: number;
@@ -39,8 +36,13 @@ export interface EBonuses {
   bombing: number;
   accuracy: number;
   range: number;
+  radius: number;
+  stars: number;
+  ace: number;
 }
 
+export type GearVecInput = GearInput[];
+
 export type AirStateRank = "Rank0" | "Rank1" | "Rank2" | "Rank3";
 
 export type AirState =
@@ -93,6 +95,62 @@ export interface DamageInfo {
   damage_state_map: NumMap<DamageState, number>;
 }
 
+export interface BattleConfig {
+  formation: Record<Formation, NestedFormationDef>;
+  anti_air_cutin: Record<number, AntiAirCutinDef>;
+  day_cutin: Record<DayCutin, DayCutinDef>;
+  night_cutin: Record<NightCutin, NightCutinDef>;
+}
+
+export interface NightCutinDef {
+  tag: NightCutin;
+  hits: number;
+  type_factor: number | null;
+  power_mod: number | null;
+  accuracy_mod: number | null;
+}
+
+export interface DayCutinDef {
+  tag: DayCutin;
+  hits: number;
+  type_factor: number | null;
+  power_mod: number | null;
+  accuracy_mod: number | null;
+}
+
+export interface AntiAirCutinDef {
+  id: number;
+  type_factor: number | null;
+  multiplier: number | null;
+  guaranteed: number | null;
+  sequential: boolean | null;
+}
+
+export type NestedFormationDef =
+  | FormationDef
+  | { top_half: FormationDef; bottom_half: FormationDef };
+
+export interface FormationDef {
+  tag: Formation;
+  protection_rate: number | null;
+  fleet_anti_air_mod: number;
+  shelling: FormationWarfareDef;
+  torpedo: FormationWarfareDef;
+  asw: FormationWarfareDef;
+  night: FormationWarfareDef;
+  shelling_support: FormationWarfareDef;
+}
+
+export interface FormationWarfareDef {
+  power_mod: number | null;
+  accuracy_mod: number | null;
+  evasion_mod: number | null;
+}
+
+export type AirWaveType = "Jet" | "LandBase" | "Carrier";
+
+export type AswAttackType = "DepthCharge" | "Aircraft";
+
 export type OrgType =
   | "Single"
   | "CarrierTaskForce"
@@ -475,7 +533,7 @@ export type GearAttr =
   | "SurfaceRadar"
   | "AirRadar"
   | "DepthChargeProjector"
-  | "AdditionalDepthCharge"
+  | "SynergisticDepthCharge"
   | "AntiSubMortar"
   | "AntiSubWeapon"
   | "AntiSubAircraft"
@@ -555,8 +613,112 @@ export interface ShipAntiAirInfo {
   anti_air_propellant_barrage_chance: number | null;
 }
 
+export type ShipStateMap = Record<ShipKey, ShipState>;
+
+export type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
+
+export interface OrgState {
+  id?: string;
+  f1?: FleetState;
+  f2?: FleetState;
+  f3?: FleetState;
+  f4?: FleetState;
+  a1?: AirSquadronState;
+  a2?: AirSquadronState;
+  a3?: AirSquadronState;
+  hq_level?: number;
+  org_type?: OrgType;
+  sortie?: string;
+  route_sup?: string;
+  boss_sup?: string;
+}
+
+export interface AirSquadronState {
+  id?: string;
+  mode?: AirSquadronMode;
+  g1?: GearState;
+  g2?: GearState;
+  g3?: GearState;
+  g4?: GearState;
+  g5?: GearState;
+  gx?: GearState;
+  ss1?: number;
+  ss2?: number;
+  ss3?: number;
+  ss4?: number;
+  ss5?: number;
+}
+
+export type AirSquadronMode = "Sortie" | "AirDefense";
+
+export interface FleetState {
+  id?: string;
+  len?: number;
+  s1?: ShipState;
+  s2?: ShipState;
+  s3?: ShipState;
+  s4?: ShipState;
+  s5?: ShipState;
+  s6?: ShipState;
+  s7?: ShipState;
+}
+
+export interface ShipState {
+  id?: string;
+  ship_id: number;
+  level?: number;
+  current_hp?: number;
+  morale?: number;
+  ammo?: number;
+  fuel?: number;
+  max_hp_mod?: number;
+  firepower_mod?: number;
+  torpedo_mod?: number;
+  armor_mod?: number;
+  anti_air_mod?: number;
+  evasion_mod?: number;
+  asw_mod?: number;
+  los_mod?: number;
+  luck_mod?: number;
+  g1?: GearState;
+  g2?: GearState;
+  g3?: GearState;
+  g4?: GearState;
+  g5?: GearState;
+  gx?: GearState;
+  ss1?: number;
+  ss2?: number;
+  ss3?: number;
+  ss4?: number;
+  ss5?: number;
+  overrides?: ShipOverrides;
+}
+
+export interface ShipOverrides {
+  naked_max_hp?: number;
+  naked_luck?: number;
+  naked_evasion?: number;
+  naked_asw?: number;
+  naked_los?: number;
+}
+
+export interface GearState {
+  id?: string;
+  gear_id: number;
+  exp?: number;
+  stars?: number;
+}
+
 export type Side = "Player" | "Enemy";
 
+export type NightBattleAttackType =
+  | { t: "NightAttack"; c: NightAttackType }
+  | { t: "Asw"; c: AswAttackType };
+
+export type DayBattleAttackType =
+  | { t: "Shelling"; c: ShellingAttackType }
+  | { t: "Asw"; c: AswAttackType };
+
 export type NightAttackType = "Normal" | "ArkRoyal" | "Carrier";
 
 export type NightSpecialAttack =
@@ -620,14 +782,6 @@ export interface HitRateParams {
   hit_percentage_bonus: number;
 }
 
-export type NightBattleAttackType =
-  | { t: "NightAttack"; c: NightAttackType }
-  | { t: "Asw"; c: AswAttackType };
-
-export type DayBattleAttackType =
-  | { t: "Shelling"; c: ShellingAttackType }
-  | { t: "Asw"; c: AswAttackType };
-
 export interface WarfareInfo {
   day: AttackInfo<DayBattleAttackType, DayCutin | null> | null;
   closing_torpedo: AttackInfo<null, null> | null;
@@ -654,93 +808,6 @@ export interface WarfareAnalyzerShipEnvironment {
   custom_mods: CustomModifiers;
 }
 
-export type ShipStateMap = Record<ShipKey, ShipState>;
-
-export type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
-
-export interface OrgState {
-  id?: string;
-  f1?: FleetState;
-  f2?: FleetState;
-  f3?: FleetState;
-  f4?: FleetState;
-  a1?: AirSquadronState;
-  a2?: AirSquadronState;
-  a3?: AirSquadronState;
-  hq_level?: number;
-  org_type?: OrgType;
-  sortie?: string;
-  route_sup?: string;
-  boss_sup?: string;
-}
-
-export interface AirSquadronState {
-  id?: string;
-  mode?: AirSquadronMode;
-  g1?: GearState;
-  g2?: GearState;
-  g3?: GearState;
-  g4?: GearState;
-  g5?: GearState;
-  gx?: GearState;
-  ss1?: number;
-  ss2?: number;
-  ss3?: number;
-  ss4?: number;
-  ss5?: number;
-}
-
-export type AirSquadronMode = "Sortie" | "AirDefense";
-
-export interface FleetState {
-  id?: string;
-  len?: number;
-  s1?: ShipState;
-  s2?: ShipState;
-  s3?: ShipState;
-  s4?: ShipState;
-  s5?: ShipState;
-  s6?: ShipState;
-  s7?: ShipState;
-}
-
-export interface ShipState {
-  id?: string;
-  ship_id: number;
-  level?: number;
-  current_hp?: number;
-  morale?: number;
-  ammo?: number;
-  fuel?: number;
-  max_hp_mod?: number;
-  firepower_mod?: number;
-  torpedo_mod?: number;
-  armor_mod?: number;
-  anti_air_mod?: number;
-  evasion_mod?: number;
-  asw_mod?: number;
-  los_mod?: number;
-  luck_mod?: number;
-  g1?: GearState;
-  g2?: GearState;
-  g3?: GearState;
-  g4?: GearState;
-  g5?: GearState;
-  gx?: GearState;
-  ss1?: number;
-  ss2?: number;
-  ss3?: number;
-  ss4?: number;
-  ss5?: number;
-}
-
-export interface GearState {
-  id?: string;
-  gear_id: number;
-  exp?: number;
-  stars?: number;
-}
-
 export type GearTypeIdArray = [number, number, number, number, number];
 
 export type SlotSizeVec = (number | null)[];
@@ -805,62 +872,6 @@ export interface NightContactChance {
   total: number;
 }
 
-export interface BattleConfig {
-  formation: Record<Formation, NestedFormationDef>;
-  anti_air_cutin: Record<number, AntiAirCutinDef>;
-  day_cutin: Record<DayCutin, DayCutinDef>;
-  night_cutin: Record<NightCutin, NightCutinDef>;
-}
-
-export interface NightCutinDef {
-  tag: NightCutin;
-  hits: number;
-  chance_denom: number | null;
-  power_mod: number | null;
-  accuracy_mod: number | null;
-}
-
-export interface DayCutinDef {
-  tag: DayCutin;
-  hits: number;
-  chance_denom: number | null;
-  power_mod: number | null;
-  accuracy_mod: number | null;
-}
-
-export interface AntiAirCutinDef {
-  id: number;
-  chance_numer: number | null;
-  multiplier: number | null;
-  guaranteed: number | null;
-  sequential: boolean | null;
-}
-
-export type NestedFormationDef =
-  | FormationDef
-  | { top_half: FormationDef; bottom_half: FormationDef };
-
-export interface FormationDef {
-  tag: Formation;
-  protection_rate: number | null;
-  fleet_anti_air_mod: number;
-  shelling: FormationWarfareDef;
-  torpedo: FormationWarfareDef;
-  asw: FormationWarfareDef;
-  night: FormationWarfareDef;
-  shelling_support: FormationWarfareDef;
-}
-
-export interface FormationWarfareDef {
-  power_mod: number | null;
-  accuracy_mod: number | null;
-  evasion_mod: number | null;
-}
-
-export type AirWaveType = "Jet" | "LandBase" | "Carrier";
-
-export type AswAttackType = "DepthCharge" | "Aircraft";
-
 /**
  */
 export class AirSquadron {
@@ -1072,9 +1083,8 @@ export class FhCore {
   free(): void;
   /**
    * @param {MasterData} js_master
-   * @param {Function} js_fn
    */
-  constructor(js_master: MasterData, js_fn: Function);
+  constructor(js_master: MasterData);
   /**
    * @param {GearState | undefined} input
    * @returns {Gear | undefined}
@@ -1105,6 +1115,10 @@ export class FhCore {
    * @returns {Ship | undefined}
    */
   create_ship_by_id(ship_id: number): Ship | undefined;
+  /**
+   * @returns {Ship[]}
+   */
+  create_all_ships(): Ship[];
   /**
    * @param {Uint16Array} main
    * @param {Uint16Array | undefined} escort
@@ -1977,6 +1991,10 @@ export class Ship {
    * @returns {number | undefined}
    */
   readonly torpedo: number | undefined;
+  /**
+   * @returns {number}
+   */
+  readonly torpedo_accuracy_mod: number;
   /**
    * @returns {boolean}
    */

package/node/fleethub_core.js

@@ -1,6 +1,7 @@
 let imports = {};
 imports['__wbindgen_placeholder__'] = module.exports;
 let wasm;
+const { createEquipmentBonuses } = require(`equipment-bonus`);
 const { TextEncoder, TextDecoder } = require(`util`);
 
 const heap = new Array(32).fill(undefined);
@@ -111,90 +112,10 @@ function addHeapObject(obj) {
     return idx;
 }
 
-function debugString(val) {
-    // primitive types
-    const type = typeof val;
-    if (type == 'number' || type == 'boolean' || val == null) {
-        return  `${val}`;
-    }
-    if (type == 'string') {
-        return `"${val}"`;
-    }
-    if (type == 'symbol') {
-        const description = val.description;
-        if (description == null) {
-            return 'Symbol';
-        } else {
-            return `Symbol(${description})`;
-        }
-    }
-    if (type == 'function') {
-        const name = val.name;
-        if (typeof name == 'string' && name.length > 0) {
-            return `Function(${name})`;
-        } else {
-            return 'Function';
-        }
-    }
-    // objects
-    if (Array.isArray(val)) {
-        const length = val.length;
-        let debug = '[';
-        if (length > 0) {
-            debug += debugString(val[0]);
-        }
-        for(let i = 1; i < length; i++) {
-            debug += ', ' + debugString(val[i]);
-        }
-        debug += ']';
-        return debug;
-    }
-    // Test for built-in
-    const builtInMatches = /\[object ([^\]]+)\]/.exec(toString.call(val));
-    let className;
-    if (builtInMatches.length > 1) {
-        className = builtInMatches[1];
-    } else {
-        // Failed to match the standard '[object ClassName]'
-        return toString.call(val);
-    }
-    if (className == 'Object') {
-        // we're a user defined class or Object
-        // JSON.stringify avoids problems with cycles, and is generally much
-        // easier than looping through ownProperties of `val`.
-        try {
-            return 'Object(' + JSON.stringify(val) + ')';
-        } catch (_) {
-            return 'Object';
-        }
-    }
-    // errors
-    if (val instanceof Error) {
-        return `${val.name}: ${val.message}\n${val.stack}`;
-    }
-    // TODO we could test for more things here, like `Set`s and `Map`s.
-    return className;
-}
-
 const u32CvtShim = new Uint32Array(2);
 
 const uint64CvtShim = new BigUint64Array(u32CvtShim.buffer);
 
-function _assertClass(instance, klass) {
-    if (!(instance instanceof klass)) {
-        throw new Error(`expected instance of ${klass.name}`);
-    }
-    return instance.ptr;
-}
-
-let cachegetFloat64Memory0 = null;
-function getFloat64Memory0() {
-    if (cachegetFloat64Memory0 === null || cachegetFloat64Memory0.buffer !== wasm.memory.buffer) {
-        cachegetFloat64Memory0 = new Float64Array(wasm.memory.buffer);
-    }
-    return cachegetFloat64Memory0;
-}
-
 function isLikeNone(x) {
     return x === undefined || x === null;
 }
@@ -217,6 +138,14 @@ function getArrayJsValueFromWasm0(ptr, len) {
     return result;
 }
 
+let cachegetFloat64Memory0 = null;
+function getFloat64Memory0() {
+    if (cachegetFloat64Memory0 === null || cachegetFloat64Memory0.buffer !== wasm.memory.buffer) {
+        cachegetFloat64Memory0 = new Float64Array(wasm.memory.buffer);
+    }
+    return cachegetFloat64Memory0;
+}
+
 let cachegetUint16Memory0 = null;
 function getUint16Memory0() {
     if (cachegetUint16Memory0 === null || cachegetUint16Memory0.buffer !== wasm.memory.buffer) {
@@ -228,11 +157,13 @@ 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 _assertClass(instance, klass) {
+    if (!(instance instanceof klass)) {
+        throw new Error(`expected instance of ${klass.name}`);
+    }
+    return instance.ptr;
+}
 
 function passArray16ToWasm0(arg, malloc) {
     const ptr = malloc(arg.length * 2);
@@ -251,6 +182,11 @@ function passArray8ToWasm0(arg, malloc) {
     WASM_VECTOR_LEN = arg.length;
     return ptr;
 }
+/**
+*/
+module.exports.set_panic_hook = function() {
+    wasm.set_panic_hook();
+};
 
 function handleError(f, args) {
     try {
@@ -815,12 +751,11 @@ class FhCore {
     }
     /**
     * @param {MasterData} js_master
-    * @param {Function} js_fn
     */
-    constructor(js_master, js_fn) {
+    constructor(js_master) {
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.fhcore_new(retptr, addHeapObject(js_master), addHeapObject(js_fn));
+            wasm.fhcore_new(retptr, addHeapObject(js_master));
             var r0 = getInt32Memory0()[retptr / 4 + 0];
             var r1 = getInt32Memory0()[retptr / 4 + 1];
             var r2 = getInt32Memory0()[retptr / 4 + 2];
@@ -881,6 +816,13 @@ class FhCore {
         return ret === 0 ? undefined : Ship.__wrap(ret);
     }
     /**
+    * @returns {Ship[]}
+    */
+    create_all_ships() {
+        const ret = wasm.fhcore_create_all_ships(this.ptr);
+        return takeObject(ret);
+    }
+    /**
     * @param {Uint16Array} main
     * @param {Uint16Array | undefined} escort
     * @returns {Comp}
@@ -3103,6 +3045,13 @@ class Ship {
         return ret;
     }
     /**
+    * @returns {number}
+    */
+    get torpedo_accuracy_mod() {
+        const ret = wasm.ship_torpedo_accuracy_mod(this.ptr);
+        return ret;
+    }
+    /**
     * @returns {boolean}
     */
     is_installation() {
@@ -3281,10 +3230,20 @@ class Ship {
 }
 module.exports.Ship = Ship;
 
+module.exports.__wbg_ship_new = function(arg0) {
+    const ret = Ship.__wrap(arg0);
+    return addHeapObject(ret);
+};
+
 module.exports.__wbindgen_object_drop_ref = function(arg0) {
     takeObject(arg0);
 };
 
+module.exports.__wbg_createEquipmentBonuses_824ede8c43fa78b2 = function(arg0, arg1) {
+    const ret = createEquipmentBonuses(takeObject(arg0), takeObject(arg1));
+    return addHeapObject(ret);
+};
+
 module.exports.__wbindgen_json_serialize = function(arg0, arg1) {
     const obj = getObject(arg1);
     const ret = JSON.stringify(obj === undefined ? null : obj);
@@ -3379,6 +3338,11 @@ module.exports.__wbg_msCrypto_d07655bf62361f21 = function(arg0) {
     return addHeapObject(ret);
 };
 
+module.exports.__wbg_new_94fb1279cf6afea5 = function() {
+    const ret = new Array();
+    return addHeapObject(ret);
+};
+
 module.exports.__wbg_newnoargs_e23b458e372830de = function(arg0, arg1) {
     const ret = new Function(getStringFromWasm0(arg0, arg1));
     return addHeapObject(ret);
@@ -3394,10 +3358,10 @@ module.exports.__wbindgen_object_clone_ref = function(arg0) {
     return addHeapObject(ret);
 };
 
-module.exports.__wbg_call_a19d3173f3e1d3c5 = function() { return handleError(function (arg0, arg1, arg2, arg3) {
-    const ret = getObject(arg0).call(getObject(arg1), getObject(arg2), getObject(arg3));
-    return addHeapObject(ret);
-}, arguments) };
+module.exports.__wbg_push_40c6a90f1805aa90 = function(arg0, arg1) {
+    const ret = getObject(arg0).push(getObject(arg1));
+    return ret;
+};
 
 module.exports.__wbg_self_99737b4dcdf6f0d8 = function() { return handleError(function () {
     const ret = self.self;
@@ -3453,14 +3417,6 @@ module.exports.__wbg_subarray_da527dbd24eafb6b = function(arg0, arg1, arg2) {
     return addHeapObject(ret);
 };
 
-module.exports.__wbindgen_debug_string = function(arg0, arg1) {
-    const ret = debugString(getObject(arg1));
-    const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    const len0 = WASM_VECTOR_LEN;
-    getInt32Memory0()[arg0 / 4 + 1] = len0;
-    getInt32Memory0()[arg0 / 4 + 0] = ptr0;
-};
-
 module.exports.__wbindgen_throw = function(arg0, arg1) {
     throw new Error(getStringFromWasm0(arg0, arg1));
 };