fleethub-core 1.8.10 → 1.8.11

package/node/fleethub_core.d.ts

@@ -8,8 +8,6 @@ export function set_panic_hook(): void;
  * @returns {ShipConditions}
  */
 export function parse_ship_conditions(value: ShipConditions): ShipConditions;
-export type Side = "Player" | "Enemy";
-
 export interface ShipPosition {
   org_type?: OrgType;
   fleet_type?: FleetType;
@@ -34,56 +32,35 @@ export interface ShipMeta {
 
 export type Engagement = "GreenT" | "Parallel" | "HeadOn" | "RedT";
 
-export interface BattleDefinitions {
-  formation: Record<Formation, NestedFormationDef>;
-  anti_air_cutin: Record<number, AntiAirCutinDef>;
-  day_cutin: Record<DayCutin, DayCutinDef>;
-  night_cutin: Record<NightCutin, NightCutinDef>;
-}
+export type TorpedoAttackType = null;
 
-export interface NightCutinDef {
-  tag: NightCutin;
-  hits: number;
-  type_factor: number | null;
-  power_mod: number | null;
-  accuracy_mod: number | null;
-}
+export type NightPhaseAttackType =
+  | { t: "Night"; c: NightAttackType }
+  | { t: "Asw"; c: AswAttackType };
 
-export interface DayCutinDef {
-  tag: DayCutin;
-  hits: number;
-  type_factor: number | null;
-  power_mod: number | null;
-  accuracy_mod: number | null;
-}
+export type DayPhaseAttackType =
+  | { t: "Shelling"; c: ShellingType }
+  | { t: "Asw"; c: AswAttackType };
 
-export interface AntiAirCutinDef {
-  id: number;
-  type_factor: number | null;
-  multiplier: number | null;
-  guaranteed: number | null;
-  sequential: boolean | null;
-}
+export type AttackType =
+  | { t: "Asw"; c: AswAttackType }
+  | { t: "Shelling"; c: ShellingType }
+  | { t: "Night"; c: NightAttackType }
+  | { t: "Torpedo" }
+  | { t: "SupportShelling"; c: SupportShellingType };
 
-export type NestedFormationDef =
-  | FormationDef
-  | { top_half: FormationDef; bottom_half: FormationDef };
+export type SupportShellingType = ShellingType;
 
-export interface FormationDef {
-  tag: Formation;
-  protection_rate: number | null;
-  fleet_anti_air_mod: number;
-  shelling: FormationCombatModifiersDef;
-  torpedo: FormationCombatModifiersDef;
-  asw: FormationCombatModifiersDef;
-  night: FormationCombatModifiersDef;
-  support_shelling: FormationCombatModifiersDef;
-}
+export type NightAttackType = "Normal" | "Swordfish" | "Carrier";
 
-export interface FormationCombatModifiersDef {
-  power_mod?: number;
-  accuracy_mod?: number;
-  evasion_mod?: number;
+export type ShellingType = "Normal" | "Carrier";
+
+export type AswAttackType = "DepthCharge" | "Aircraft";
+
+export type FhResult<T> = { Ok: T } | { Err: string };
+
+export interface NodeAttackAnalysis2 {
+  data: AttackAnalysis[];
 }
 
 export type CompiledEvaler = string;
@@ -181,6 +158,24 @@ export interface ActionReport<T> {
   is_active: boolean;
 }
 
+export type GearTypeIdArray = [number, number, number, number, number];
+
+export type SpecialEnemyType =
+  | "None"
+  | "SoftSkinned"
+  | "Pillbox"
+  | "IsolatedIsland"
+  | "SupplyDepot"
+  | "NewSupplyDepot"
+  | "HarbourSummerPrincess"
+  | "PtImp"
+  | "BattleshipSummerPrincess"
+  | "HeavyCruiserSummerPrincess";
+
+export type Align = "Left" | "Right";
+
+export type Side = "Player" | "Enemy";
+
 export type ShipType =
   | "Unknown"
   | "DE"
@@ -216,47 +211,6 @@ export type ShipCategory =
   | "Submarine"
   | "AuxiliaryShip";
 
-export type NightCutinLike = NightCutin | FleetCutin;
-
-export type DayCutinLike = DayCutin | FleetCutin;
-
-export type FleetCutin =
-  | "NelsonTouch"
-  | "NagatoClassCutin"
-  | "ColoradoClassCutin"
-  | "KongouClassCutin"
-  | "Yamato2ShipCutin"
-  | "Yamato3ShipCutin";
-
-export type NightCutin =
-  | "MainTorpRadar"
-  | "TorpLookoutRadar"
-  | "TorpTsloTorp"
-  | "TorpTsloDrum"
-  | "DoubleAttack"
-  | "TorpTorpMain"
-  | "TorpTorpTorp"
-  | "MainMainSec"
-  | "MainMainMain"
-  | "SubTorpTorp"
-  | "SubRadarTorp"
-  | "Cvci1_25"
-  | "Cvci1_20"
-  | "Cvci1_18"
-  | "Photobomber";
-
-export type DayCutin =
-  | "Zuiun"
-  | "AirSea"
-  | "MainMain"
-  | "MainAp"
-  | "MainRadar"
-  | "MainSec"
-  | "DoubleAttack"
-  | "FBA"
-  | "BBA"
-  | "BA";
-
 export interface MasterIBonuses {
   shelling_power: MasterIBonusRule[];
   shelling_accuracy: MasterIBonusRule[];
@@ -305,10 +259,51 @@ export interface MoveShipPayload {
   target: [string | null, string, ShipKey];
 }
 
-export type GearTypeIdArray = [number, number, number, number, number];
-
 export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
 
+export type NightCutinLike = NightCutin | FleetCutin;
+
+export type DayCutinLike = DayCutin | FleetCutin;
+
+export type FleetCutin =
+  | "NelsonTouch"
+  | "NagatoClassCutin"
+  | "ColoradoClassCutin"
+  | "KongouClassCutin"
+  | "Yamato2ShipCutin"
+  | "Yamato3ShipCutin";
+
+export type NightCutin =
+  | "MainTorpRadar"
+  | "TorpLookoutRadar"
+  | "TorpTsloTorp"
+  | "TorpTsloDrum"
+  | "DoubleAttack"
+  | "TorpTorpMain"
+  | "TorpTorpTorp"
+  | "MainMainSec"
+  | "MainMainMain"
+  | "SubTorpTorp"
+  | "SubRadarTorp"
+  | "Cvci1_25"
+  | "Cvci1_20"
+  | "Cvci1_18"
+  | "Photobomber";
+
+export type DayCutin =
+  | "Zuiun"
+  | "AirSea"
+  | "MainMain"
+  | "MainAp"
+  | "MainRadar"
+  | "MainSec"
+  | "DoubleAttack"
+  | "FBA"
+  | "BBA"
+  | "BA";
+
+export type ContactRank = "Rank1" | "Rank2" | "Rank3";
+
 export type AirWaveType = "Jet" | "LandBase" | "Carrier";
 
 export interface SimulatorResult {
@@ -323,21 +318,8 @@ export interface SimulatorResultItem {
   damage_state_map: Record<DamageState, number>;
 }
 
-export type SpecialEnemyType =
-  | "None"
-  | "SoftSkinned"
-  | "Pillbox"
-  | "IsolatedIsland"
-  | "SupplyDepot"
-  | "HarbourSummerPrincess"
-  | "PtImp"
-  | "BattleshipSummerPrincess"
-  | "HeavyCruiserSummerPrincess";
-
 export type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
 
-export type ContactRank = "Rank1" | "Rank2" | "Rank3";
-
 export type GearCategory =
   | "Fighter"
   | "Bomber"
@@ -416,31 +398,6 @@ export type GearType =
 
 export type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
 
-export type TorpedoAttackType = null;
-
-export type NightPhaseAttackType =
-  | { t: "Night"; c: NightAttackType }
-  | { t: "Asw"; c: AswAttackType };
-
-export type DayPhaseAttackType =
-  | { t: "Shelling"; c: ShellingType }
-  | { t: "Asw"; c: AswAttackType };
-
-export type AttackType =
-  | { t: "Asw"; c: AswAttackType }
-  | { t: "Shelling"; c: ShellingType }
-  | { t: "Night"; c: NightAttackType }
-  | { t: "Torpedo" }
-  | { t: "SupportShelling"; c: SupportShellingType };
-
-export type SupportShellingType = ShellingType;
-
-export type NightAttackType = "Normal" | "Swordfish" | "Carrier";
-
-export type ShellingType = "Normal" | "Carrier";
-
-export type AswAttackType = "DepthCharge" | "Aircraft";
-
 export type AirStateRank = "Rank0" | "Rank1" | "Rank2" | "Rank3";
 
 export type AirState =
@@ -450,8 +407,6 @@ export type AirState =
   | "AirDenial"
   | "AirIncapability";
 
-export type FhResult<T> = { Ok: T } | { Err: string };
-
 export interface MasterData extends MasterBattleDefinitions {
   created_at: number;
   gears: MasterGear[];
@@ -545,6 +500,7 @@ export type ShipAttr =
   | "IsolatedIsland"
   | "HarbourSummerPrincess"
   | "SupplyDepot"
+  | "NewSupplyDepot"
   | "PtImp"
   | "BattleshipSummerPrincess"
   | "HeavyCruiserSummerPrincess";
@@ -557,6 +513,65 @@ export type OrgType =
   | "EnemySingle"
   | "EnemyCombined";
 
+export interface BattleDefinitions {
+  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: FormationCombatModifiersDef;
+  torpedo: FormationCombatModifiersDef;
+  asw: FormationCombatModifiersDef;
+  night: FormationCombatModifiersDef;
+  support_shelling: FormationCombatModifiersDef;
+}
+
+export interface FormationCombatModifiersDef {
+  power_mod?: number;
+  accuracy_mod?: number;
+  evasion_mod?: number;
+}
+
+export interface ShipAnalyzerConfig {
+  air_state?: AirState;
+  engagement?: Engagement;
+  left?: AttackAnalyzerShipConfig;
+  right?: AttackAnalyzerShipConfig;
+}
+
 export type GearAttr =
   | "Unknown"
   | "Abyssal"
@@ -597,13 +612,6 @@ export interface SupportShellingSimulatorParams {
   engagement: Engagement;
 }
 
-export interface ShipAnalyzerConfig {
-  air_state?: AirState;
-  engagement?: Engagement;
-  left?: AttackAnalyzerShipConfig;
-  right?: AttackAnalyzerShipConfig;
-}
-
 export interface CompAntiAirAnalysis {
   fleet_adjusted_anti_air: number;
   ships: AntiAirReport[];
@@ -1068,6 +1076,19 @@ export class Analyzer {
     right_comp: Comp,
     right_ship: Ship
   ): NodeAttackAnalysis;
+  /**
+   * @param {NodeAttackAnalyzerConfig} config
+   * @param {Comp} left_comp
+   * @param {Comp} right_comp
+   * @param {string} attacker_id
+   * @returns {NodeAttackAnalysis2 | undefined}
+   */
+  analyze_node_attack2(
+    config: NodeAttackAnalyzerConfig,
+    left_comp: Comp,
+    right_comp: Comp,
+    attacker_id: string
+  ): NodeAttackAnalysis2 | undefined;
   /**
    * @param {Comp} comp
    * @param {CompAnalyzerConfig} config
@@ -1859,6 +1880,10 @@ export class Ship {
    * @returns {boolean}
    */
   is_pt_imp(): boolean;
+  /**
+   * @returns {boolean}
+   */
+  is_attackable_by_torpedo(): boolean;
   /**
    * @param {number} index
    * @returns {number | undefined}

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 = new Uint8Array();
 
@@ -21,6 +17,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'
@@ -82,42 +113,34 @@ function getInt32Memory0() {
     }
     return cachedInt32Memory0;
 }
+/**
+*/
+module.exports.set_panic_hook = function() {
+    wasm.set_panic_hook();
+};
 
-let cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
-
-cachedTextDecoder.decode();
-
-function getStringFromWasm0(ptr, len) {
-    return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
-}
-
-let heap_next = heap.length;
+const u32CvtShim = new Uint32Array(2);
 
-function addHeapObject(obj) {
-    if (heap_next === heap.length) heap.push(heap.length + 1);
-    const idx = heap_next;
-    heap_next = heap[idx];
+const uint64CvtShim = new BigUint64Array(u32CvtShim.buffer);
 
-    heap[idx] = obj;
-    return idx;
-}
+let cachedUint32Memory0 = new Uint32Array();
 
-function dropObject(idx) {
-    if (idx < 36) return;
-    heap[idx] = heap_next;
-    heap_next = idx;
+function getUint32Memory0() {
+    if (cachedUint32Memory0.byteLength === 0) {
+        cachedUint32Memory0 = new Uint32Array(wasm.memory.buffer);
+    }
+    return cachedUint32Memory0;
 }
 
-function takeObject(idx) {
-    const ret = getObject(idx);
-    dropObject(idx);
-    return ret;
+function getArrayJsValueFromWasm0(ptr, len) {
+    const mem = getUint32Memory0();
+    const slice = mem.subarray(ptr / 4, ptr / 4 + len);
+    const result = [];
+    for (let i = 0; i < slice.length; i++) {
+        result.push(takeObject(slice[i]));
+    }
+    return result;
 }
-/**
-*/
-module.exports.set_panic_hook = function() {
-    wasm.set_panic_hook();
-};
 
 let cachedFloat64Memory0 = new Float64Array();
 
@@ -128,6 +151,13 @@ function getFloat64Memory0() {
     return cachedFloat64Memory0;
 }
 
+function _assertClass(instance, klass) {
+    if (!(instance instanceof klass)) {
+        throw new Error(`expected instance of ${klass.name}`);
+    }
+    return instance.ptr;
+}
+
 function isLikeNone(x) {
     return x === undefined || x === null;
 }
@@ -148,39 +178,9 @@ function passArray16ToWasm0(arg, malloc) {
     return ptr;
 }
 
-const u32CvtShim = new Uint32Array(2);
-
-const uint64CvtShim = new BigUint64Array(u32CvtShim.buffer);
-
-let cachedUint32Memory0 = new Uint32Array();
-
-function getUint32Memory0() {
-    if (cachedUint32Memory0.byteLength === 0) {
-        cachedUint32Memory0 = new Uint32Array(wasm.memory.buffer);
-    }
-    return cachedUint32Memory0;
-}
-
-function getArrayJsValueFromWasm0(ptr, len) {
-    const mem = getUint32Memory0();
-    const slice = mem.subarray(ptr / 4, ptr / 4 + len);
-    const result = [];
-    for (let i = 0; i < slice.length; i++) {
-        result.push(takeObject(slice[i]));
-    }
-    return result;
-}
-
 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;
-}
 /**
 * @param {ShipConditions} value
 * @returns {ShipConditions}
@@ -420,6 +420,21 @@ class Analyzer {
         return takeObject(ret);
     }
     /**
+    * @param {NodeAttackAnalyzerConfig} config
+    * @param {Comp} left_comp
+    * @param {Comp} right_comp
+    * @param {string} attacker_id
+    * @returns {NodeAttackAnalysis2 | undefined}
+    */
+    analyze_node_attack2(config, left_comp, right_comp, attacker_id) {
+        _assertClass(left_comp, Comp);
+        _assertClass(right_comp, Comp);
+        const ptr0 = passStringToWasm0(attacker_id, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ret = wasm.analyzer_analyze_node_attack2(this.ptr, addHeapObject(config), left_comp.ptr, right_comp.ptr, ptr0, len0);
+        return takeObject(ret);
+    }
+    /**
     * @param {Comp} comp
     * @param {CompAnalyzerConfig} config
     * @returns {CompAnalysis}
@@ -2683,6 +2698,13 @@ class Ship {
         return ret !== 0;
     }
     /**
+    * @returns {boolean}
+    */
+    is_attackable_by_torpedo() {
+        const ret = wasm.ship_is_attackable_by_torpedo(this.ptr);
+        return ret !== 0;
+    }
+    /**
     * @param {number} index
     * @returns {number | undefined}
     */
@@ -2872,15 +2894,6 @@ class Ship {
 }
 module.exports.Ship = Ship;
 
-module.exports.__wbindgen_json_serialize = function(arg0, arg1) {
-    const obj = getObject(arg1);
-    const ret = JSON.stringify(obj === undefined ? null : obj);
-    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_string_new = function(arg0, arg1) {
     const ret = getStringFromWasm0(arg0, arg1);
     return addHeapObject(ret);
@@ -2890,7 +2903,16 @@ module.exports.__wbindgen_object_drop_ref = function(arg0) {
     takeObject(arg0);
 };
 
-module.exports.__wbg_createEquipmentBonuses_5c51b37ac8d29697 = function(arg0, arg1) {
+module.exports.__wbindgen_json_serialize = function(arg0, arg1) {
+    const obj = getObject(arg1);
+    const ret = JSON.stringify(obj === undefined ? null : obj);
+    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.__wbg_createEquipmentBonuses_90acf8ea4a0803e5 = function(arg0, arg1) {
     const ret = createEquipmentBonuses(takeObject(arg0), takeObject(arg1));
     return addHeapObject(ret);
 };