fleethub-core 1.11.8 → 1.11.11

package/node/fleethub_core.d.ts

@@ -8,11 +8,6 @@ export function parse_ship_conditions(value: ShipConditions): ShipConditions;
 /**
  */
 export function set_panic_hook(): void;
-export interface MoveShipPayload {
-  current: [string, string, ShipKey];
-  target: [string | null, string, ShipKey];
-}
-
 export type GearTypeIdArray = [number, number, number, number, number];
 
 export type GearVecInput = GearInput[];
@@ -55,6 +50,38 @@ export interface EBonuses {
   range: number;
 }
 
+export interface NodeAttackAnalyzerShipConfig extends NightFleetConditions {
+  formation?: Formation;
+}
+
+export interface NodeAttackAnalyzerConfig {
+  air_state?: AirState;
+  engagement?: Engagement;
+  node_state?: NodeState;
+  left?: NodeAttackAnalyzerShipConfig;
+  right?: NodeAttackAnalyzerShipConfig;
+}
+
+export interface NodeAttackAnalysis {
+  left: AttackAnalysis;
+  right: AttackAnalysis;
+  shelling_fleet_cutin: FleetCutinReport<ShellingStyle>[];
+  night_fleet_cutin: FleetCutinReport<NightAttackStyle>[];
+}
+
+export interface DamageReport {
+  miss_damage_min: number;
+  miss_damage_max: number;
+  normal_damage_min: number;
+  normal_damage_max: number;
+  critical_damage_min: number;
+  critical_damage_max: number;
+  normal_scratch_rate: number;
+  critical_scratch_rate: number;
+  damage_density: Histogram<number, number>;
+  damage_state_density: Histogram<DamageState, number>;
+}
+
 export interface CompAntiAirAnalysis {
   fleet_adjusted_anti_air: number;
   ships: AntiAirReport[];
@@ -121,37 +148,103 @@ export interface CompMeta {
 
 export type Role = "Main" | "Escort";
 
-export interface NodeAttackAnalyzerShipConfig extends NightFleetConditions {
-  formation?: Formation;
+export interface MoveShipPayload {
+  current: [string, string, ShipKey];
+  target: [string | null, string, ShipKey];
 }
 
-export interface NodeAttackAnalyzerConfig {
-  air_state?: AirState;
-  engagement?: Engagement;
-  node_state?: NodeState;
-  left?: NodeAttackAnalyzerShipConfig;
-  right?: NodeAttackAnalyzerShipConfig;
+export interface SlotSizeVecState {
+  ss1?: number;
+  ss2?: number;
+  ss3?: number;
+  ss4?: number;
+  ss5?: number;
 }
 
-export interface NodeAttackAnalysis {
-  left: AttackAnalysis;
-  right: AttackAnalysis;
-  shelling_fleet_cutin: FleetCutinReport<ShellingStyle>[];
-  night_fleet_cutin: FleetCutinReport<NightAttackStyle>[];
+export interface ShipState extends GearVecState, SlotSizeVecState {
+  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;
+  day_gunfit_accuracy?: number;
+  night_gunfit_accuracy?: number;
+  custom_power_mods?: CustomPowerModifiers;
 }
 
-export interface DamageReport {
-  miss_damage_min: number;
-  miss_damage_max: number;
-  normal_damage_min: number;
-  normal_damage_max: number;
-  critical_damage_min: number;
-  critical_damage_max: number;
-  normal_scratch_rate: number;
-  critical_scratch_rate: number;
-  damage_density: Histogram<number, number>;
-  damage_state_density: Histogram<DamageState, number>;
-}
+export type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
+
+export type DayCutin =
+  | "Zuiun"
+  | "AirSea"
+  | "MainMain"
+  | "MainAp"
+  | "MainRadar"
+  | "MainSec"
+  | "DoubleAttack"
+  | "FBA"
+  | "BBA"
+  | "BA";
+
+export type NightCutin =
+  | "MainTorpRadar"
+  | "TorpLookoutRadar"
+  | "TorpTsloTorp"
+  | "TorpTsloDrum"
+  | "NightZuiun2Radar"
+  | "NightZuiun2"
+  | "NightZuiunRadar"
+  | "NightZuiun"
+  | "DoubleAttack"
+  | "TorpTorpMain"
+  | "TorpTorpTorp"
+  | "MainMainSec"
+  | "MainMainMain"
+  | "SubTorpTorp"
+  | "SubRadarTorp"
+  | "Cvci1_25"
+  | "Cvci1_20"
+  | "Cvci1_18"
+  | "Photobomber";
+
+export type FleetCutin =
+  | "NelsonTouch"
+  | "NagatoClassCutin"
+  | "ColoradoClassCutin"
+  | "KongouClassCutin"
+  | "Yamato2ShipCutin"
+  | "Yamato3ShipCutin";
+
+export type DayCutinLike = DayCutin | FleetCutin;
+
+export type NightCutinLike = NightCutin | FleetCutin;
+
+export type SingleFormation =
+  | "LineAhead"
+  | "DoubleLine"
+  | "Diamond"
+  | "Echelon"
+  | "LineAbreast"
+  | "Vanguard";
+
+export type CombinedFormation =
+  | "Cruising1"
+  | "Cruising2"
+  | "Cruising3"
+  | "Cruising4";
+
+export type Formation = SingleFormation | CombinedFormation;
 
 export type GearType =
   | "Unknown"
@@ -229,85 +322,8 @@ export type GearCategory =
   | "LandBased"
   | "Misc";
 
-export interface SlotSizeVecState {
-  ss1?: number;
-  ss2?: number;
-  ss3?: number;
-  ss4?: number;
-  ss5?: number;
-}
-
-export interface ShipState extends GearVecState, SlotSizeVecState {
-  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;
-  day_gunfit_accuracy?: number;
-  night_gunfit_accuracy?: number;
-  custom_power_mods?: CustomPowerModifiers;
-}
-
-export type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
-
 export type SpeedGroup = "A" | "B1" | "B2" | "C";
 
-export type DayCutin =
-  | "Zuiun"
-  | "AirSea"
-  | "MainMain"
-  | "MainAp"
-  | "MainRadar"
-  | "MainSec"
-  | "DoubleAttack"
-  | "FBA"
-  | "BBA"
-  | "BA";
-
-export type NightCutin =
-  | "MainTorpRadar"
-  | "TorpLookoutRadar"
-  | "TorpTsloTorp"
-  | "TorpTsloDrum"
-  | "NightZuiun2Radar"
-  | "NightZuiun2"
-  | "NightZuiunRadar"
-  | "NightZuiun"
-  | "DoubleAttack"
-  | "TorpTorpMain"
-  | "TorpTorpTorp"
-  | "MainMainSec"
-  | "MainMainMain"
-  | "SubTorpTorp"
-  | "SubRadarTorp"
-  | "Cvci1_25"
-  | "Cvci1_20"
-  | "Cvci1_18"
-  | "Photobomber";
-
-export type FleetCutin =
-  | "NelsonTouch"
-  | "NagatoClassCutin"
-  | "ColoradoClassCutin"
-  | "KongouClassCutin"
-  | "Yamato2ShipCutin"
-  | "Yamato3ShipCutin";
-
-export type DayCutinLike = DayCutin | FleetCutin;
-
-export type NightCutinLike = NightCutin | FleetCutin;
-
 export interface SupportShellingSimulatorParams {
   attacker_formation?: Formation;
   target_formation?: Formation;
@@ -415,22 +431,6 @@ export interface AttackAnalysis {
   support_shelling: ActionReport<SupportShellingStyle>;
 }
 
-export type SingleFormation =
-  | "LineAhead"
-  | "DoubleLine"
-  | "Diamond"
-  | "Echelon"
-  | "LineAbreast"
-  | "Vanguard";
-
-export type CombinedFormation =
-  | "Cruising1"
-  | "Cruising2"
-  | "Cruising3"
-  | "Cruising4";
-
-export type Formation = SingleFormation | CombinedFormation;
-
 export interface GearState {
   id?: string;
   gear_id: number;
@@ -841,8 +841,6 @@ export interface ShipPosition {
   index?: number;
 }
 
-export type Histogram<K extends keyof any, V> = Partial<Record<K, V>>;
-
 export interface MasterIBonuses {
   shelling_power: MasterIBonusRule[];
   shelling_accuracy: MasterIBonusRule[];
@@ -888,26 +886,6 @@ export interface FleetCutinAttackReport<T> extends AttackReport<T> {
   power_mod: number;
 }
 
-export interface CompDayCutinAnalysis {
-  rank3_air_state: AirState;
-  rank2_air_state: AirState;
-  main_fleet_los_mod: number | null;
-  escort_fleet_los_mod: number | null;
-  ships: ShipDayCutinAnalysis[];
-}
-
-export interface ShipDayCutinAnalysis {
-  ship_id: number;
-  role: Role;
-  index: number;
-  rank3: DayCutinReport;
-  rank2: DayCutinReport;
-}
-
-export interface DayCutinReport extends ActionReport<DayPhaseAttackStyle> {
-  observation_term: number | null;
-}
-
 export interface AttackReport<T> {
   style: T;
   proc_rate: number | null;
@@ -958,6 +936,8 @@ export interface SupportShellingStyle {
 
 export type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
 
+export type Histogram<K extends keyof any, V> = Partial<Record<K, V>>;
+
 export interface EquippabilityRule {
   ship: CompiledEvaler;
   keys?: string[];
@@ -989,6 +969,26 @@ export interface EquipStype {
   equip_type: number[];
 }
 
+export interface CompDayCutinAnalysis {
+  rank3_air_state: AirState;
+  rank2_air_state: AirState;
+  main_fleet_los_mod: number | null;
+  escort_fleet_los_mod: number | null;
+  ships: ShipDayCutinAnalysis[];
+}
+
+export interface ShipDayCutinAnalysis {
+  ship_id: number;
+  role: Role;
+  index: number;
+  rank3: DayCutinReport;
+  rank2: DayCutinReport;
+}
+
+export interface DayCutinReport extends ActionReport<DayPhaseAttackStyle> {
+  observation_term: number | null;
+}
+
 export interface CompAnalyzerConfig {
   engagement: Engagement;
   formation: Formation;
@@ -1769,6 +1769,20 @@ export class Org {
  */
 export class Ship {
   free(): 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;
   /**
    * @returns {Ship}
    */
@@ -1986,20 +2000,6 @@ export class Ship {
    * @returns {number | undefined}
    */
   ohko_power(): number | undefined;
-  /**
-   * @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

@@ -4,28 +4,12 @@ let wasm;
 const { createEquipmentBonuses } = require(`equipment-bonus`);
 const { TextDecoder, TextEncoder } = require(`util`);
 
-let cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
-
-cachedTextDecoder.decode();
-
-let cachedUint8Memory0 = null;
-
-function getUint8Memory0() {
-    if (cachedUint8Memory0 === null || cachedUint8Memory0.byteLength === 0) {
-        cachedUint8Memory0 = new Uint8Array(wasm.memory.buffer);
-    }
-    return cachedUint8Memory0;
-}
-
-function getStringFromWasm0(ptr, len) {
-    ptr = ptr >>> 0;
-    return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
-}
-
 const heap = new Array(128).fill(undefined);
 
 heap.push(undefined, null, true, false);
 
+function getObject(idx) { return heap[idx]; }
+
 let heap_next = heap.length;
 
 function addHeapObject(obj) {
@@ -37,8 +21,6 @@ function addHeapObject(obj) {
     return idx;
 }
 
-function getObject(idx) { return heap[idx]; }
-
 function dropObject(idx) {
     if (idx < 132) return;
     heap[idx] = heap_next;
@@ -51,6 +33,24 @@ function takeObject(idx) {
     return ret;
 }
 
+let cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
+
+cachedTextDecoder.decode();
+
+let cachedUint8Memory0 = null;
+
+function getUint8Memory0() {
+    if (cachedUint8Memory0 === null || cachedUint8Memory0.byteLength === 0) {
+        cachedUint8Memory0 = new Uint8Array(wasm.memory.buffer);
+    }
+    return cachedUint8Memory0;
+}
+
+function getStringFromWasm0(ptr, len) {
+    ptr = ptr >>> 0;
+    return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
+}
+
 let WASM_VECTOR_LEN = 0;
 
 let cachedTextEncoder = new TextEncoder('utf-8');
@@ -119,6 +119,34 @@ function getInt32Memory0() {
     return cachedInt32Memory0;
 }
 
+let cachedFloat64Memory0 = null;
+
+function getFloat64Memory0() {
+    if (cachedFloat64Memory0 === null || cachedFloat64Memory0.byteLength === 0) {
+        cachedFloat64Memory0 = new Float64Array(wasm.memory.buffer);
+    }
+    return cachedFloat64Memory0;
+}
+
+function _assertClass(instance, klass) {
+    if (!(instance instanceof klass)) {
+        throw new Error(`expected instance of ${klass.name}`);
+    }
+    return instance.ptr;
+}
+
+function getArrayU8FromWasm0(ptr, len) {
+    ptr = ptr >>> 0;
+    return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len);
+}
+
+function passArray8ToWasm0(arg, malloc) {
+    const ptr = malloc(arg.length * 1, 1) >>> 0;
+    getUint8Memory0().set(arg, ptr / 1);
+    WASM_VECTOR_LEN = arg.length;
+    return ptr;
+}
+
 let cachedUint32Memory0 = null;
 
 function getUint32Memory0() {
@@ -153,30 +181,9 @@ function getArrayU16FromWasm0(ptr, len) {
     return getUint16Memory0().subarray(ptr / 2, ptr / 2 + len);
 }
 
-function _assertClass(instance, klass) {
-    if (!(instance instanceof klass)) {
-        throw new Error(`expected instance of ${klass.name}`);
-    }
-    return instance.ptr;
-}
-
-let cachedFloat64Memory0 = null;
-
-function getFloat64Memory0() {
-    if (cachedFloat64Memory0 === null || cachedFloat64Memory0.byteLength === 0) {
-        cachedFloat64Memory0 = new Float64Array(wasm.memory.buffer);
-    }
-    return cachedFloat64Memory0;
-}
-
-function getArrayU8FromWasm0(ptr, len) {
-    ptr = ptr >>> 0;
-    return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len);
-}
-
-function passArray8ToWasm0(arg, malloc) {
-    const ptr = malloc(arg.length * 1, 1) >>> 0;
-    getUint8Memory0().set(arg, ptr / 1);
+function passArray16ToWasm0(arg, malloc) {
+    const ptr = malloc(arg.length * 2, 2) >>> 0;
+    getUint16Memory0().set(arg, ptr / 2);
     WASM_VECTOR_LEN = arg.length;
     return ptr;
 }
@@ -189,12 +196,6 @@ module.exports.parse_ship_conditions = function(value) {
     return takeObject(ret);
 };
 
-function passArray16ToWasm0(arg, malloc) {
-    const ptr = malloc(arg.length * 2, 2) >>> 0;
-    getUint16Memory0().set(arg, ptr / 2);
-    WASM_VECTOR_LEN = arg.length;
-    return ptr;
-}
 /**
 */
 module.exports.set_panic_hook = function() {
@@ -1725,7 +1726,7 @@ class Org {
     * @returns {bigint}
     */
     get hash() {
-        const ret = wasm.__wbg_get_org_hash(this.__wbg_ptr);
+        const ret = wasm.__wbg_get_gear_hash(this.__wbg_ptr);
         return BigInt.asUintN(64, ret);
     }
     /**
@@ -2091,6 +2092,43 @@ class Ship {
         wasm.__wbg_ship_free(ptr);
     }
     /**
+    * @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.__wbg_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.__wbg_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.__wbg_ptr, is_night);
+        return ret;
+    }
+    /**
     * @returns {string}
     */
     get id() {
@@ -2878,48 +2916,11 @@ class Ship {
             wasm.__wbindgen_add_to_stack_pointer(16);
         }
     }
-    /**
-    * @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.__wbg_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.__wbg_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.__wbg_ptr, is_night);
-        return ret;
-    }
 }
 module.exports.Ship = Ship;
 
-module.exports.__wbindgen_string_new = function(arg0, arg1) {
-    const ret = getStringFromWasm0(arg0, arg1);
+module.exports.__wbg_createEquipmentBonuses_9be552907b7467d1 = function(arg0, arg1) {
+    const ret = createEquipmentBonuses(takeObject(arg0), takeObject(arg1));
     return addHeapObject(ret);
 };
 
@@ -2932,8 +2933,8 @@ module.exports.__wbindgen_object_drop_ref = function(arg0) {
     takeObject(arg0);
 };
 
-module.exports.__wbg_createEquipmentBonuses_38964076584ae2ca = function(arg0, arg1) {
-    const ret = createEquipmentBonuses(takeObject(arg0), takeObject(arg1));
+module.exports.__wbindgen_string_new = function(arg0, arg1) {
+    const ret = getStringFromWasm0(arg0, arg1);
     return addHeapObject(ret);
 };