fleethub-core 1.7.0 → 1.7.1

package/node/fleethub_core.d.ts

@@ -65,6 +65,8 @@ export type ShellingAttackType = "Normal" | "Carrier";
 
 export type AirWaveType = "Jet" | "LandBase" | "Carrier";
 
+export type AswAttackType = "DepthCharge" | "Aircraft";
+
 export type OrgType =
   | "Single"
   | "CarrierTaskForce"
@@ -73,6 +75,14 @@ export type OrgType =
   | "EnemySingle"
   | "EnemyCombined";
 
+export type FleetCutin =
+  | "NelsonTouch"
+  | "NagatoCutin"
+  | "ColoradoCutin"
+  | "KongouCutin"
+  | "Yamato2ShipCutin"
+  | "Yamato3ShipCutin";
+
 export interface WarfareContext {
   attacker_env: WarfareShipEnvironment;
   target_env: WarfareShipEnvironment;
@@ -90,6 +100,8 @@ export interface WarfareShipEnvironment {
   fleet_los_mod: number | null;
 }
 
+export type Role = "Main" | "Escort";
+
 export interface CompMeta {
   fleets: Record<FleetType, FleetMeta>;
 }
@@ -151,10 +163,6 @@ export interface AttackPowerModifier {
   b: number;
 }
 
-export type NumMap<K, V> = Partial<Record<K, V>>;
-
-export type Role = "Main" | "Escort";
-
 export interface MasterData {
   gears: MasterGear[];
   gear_attrs: MasterAttrRule<GearAttr>[];
@@ -181,6 +189,30 @@ export interface MasterAttrRule<T> {
   expr: string;
 }
 
+export interface CompDayCutinRateInfo {
+  main: FleetDayCutinRateInfo;
+  escort: FleetDayCutinRateInfo | null;
+}
+
+export interface FleetDayCutinRateInfo {
+  fleet_los_mod: number | null;
+  ships: ShipDayCutinRateInfo[];
+}
+
+export interface ShipDayCutinRateInfo {
+  ship_id: number;
+  air_supremacy: DayCutinRateInfo;
+  air_superiority: DayCutinRateInfo;
+}
+
+export interface DayCutinRateInfo {
+  observation_term: number | null;
+  rates: [DayCutin | null, number | null][];
+  total_cutin_rate: number | null;
+}
+
+export type NumMap<K, V> = Partial<Record<K, V>>;
+
 export type GearCategory =
   | "Fighter"
   | "Bomber"
@@ -258,28 +290,6 @@ export type GearType =
 
 export type Engagement = "GreenT" | "Parallel" | "HeadOn" | "RedT";
 
-export interface CompDayCutinRateInfo {
-  main: FleetDayCutinRateInfo;
-  escort: FleetDayCutinRateInfo | null;
-}
-
-export interface FleetDayCutinRateInfo {
-  fleet_los_mod: number | null;
-  ships: ShipDayCutinRateInfo[];
-}
-
-export interface ShipDayCutinRateInfo {
-  ship_id: number;
-  air_supremacy: DayCutinRateInfo;
-  air_superiority: DayCutinRateInfo;
-}
-
-export interface DayCutinRateInfo {
-  observation_term: number | null;
-  rates: [DayCutin | null, number | null][];
-  total_cutin_rate: number | null;
-}
-
 export interface EBonuses {
   firepower: number;
   torpedo: number;
@@ -320,22 +330,6 @@ export interface GearInput {
 
 export type GearVecInput = GearInput[];
 
-export type ShipAttr =
-  | "Unknown"
-  | "Abyssal"
-  | "NightCarrier"
-  | "Installation"
-  | "RoyalNavy"
-  | "Kai2"
-  | "TurbineSpeedBonus"
-  | "Pillbox"
-  | "IsolatedIsland"
-  | "HarbourSummerPrincess"
-  | "SupplyDepot"
-  | "PtImp"
-  | "BattleshipSummerPrincess"
-  | "HeavyCruiserSummerPrincess";
-
 export type AirStateRank = "Rank0" | "Rank1" | "Rank2" | "Rank3";
 
 export type AirState =
@@ -407,36 +401,21 @@ export interface DamageInfo {
   damage_state_map: NumMap<DamageState, number>;
 }
 
-export type GearAttr =
+export type ShipAttr =
   | "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";
+  | "NightCarrier"
+  | "Installation"
+  | "RoyalNavy"
+  | "Kai2"
+  | "TurbineSpeedBonus"
+  | "Pillbox"
+  | "IsolatedIsland"
+  | "HarbourSummerPrincess"
+  | "SupplyDepot"
+  | "PtImp"
+  | "BattleshipSummerPrincess"
+  | "HeavyCruiserSummerPrincess";
 
 export type Formation = SingleFormation | CombinedFormation;
 
@@ -488,28 +467,36 @@ export interface AirstrikeContactChance {
 
 export type SlotSizeVec = (number | null)[];
 
-export type NightAttackType = "Normal" | "ArkRoyal" | "Carrier";
-
-export type NightSpecialAttack =
-  | { NightCutin: NightCutin }
-  | { FleetCutin: FleetCutin };
-
-export type NightCutin =
-  | "MainTorpRadar"
-  | "TorpLookoutRadar"
-  | "TorpTsloTorp"
-  | "TorpTsloDrum"
-  | "DoubleAttack"
-  | "TorpTorpMain"
-  | "TorpTorpTorp"
-  | "MainMainSec"
-  | "MainMainMain"
-  | "SubTorpTorp"
-  | "SubRadarTorp"
-  | "Cvci1_25"
-  | "Cvci1_20"
-  | "Cvci1_18"
-  | "Photobomber";
+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;
@@ -695,38 +682,28 @@ export interface GearState {
   stars?: number;
 }
 
-export interface MasterShip {
-  ship_id: number;
-  name: string;
-  yomi: string;
-  stype: number;
-  ctype: number;
-  sort_id?: number;
-  max_hp: StatInterval;
-  firepower: StatInterval;
-  armor: StatInterval;
-  torpedo: StatInterval;
-  evasion: StatInterval;
-  anti_air: StatInterval;
-  asw: StatInterval;
-  los: StatInterval;
-  luck: StatInterval;
-  torpedo_accuracy?: number;
-  basic_evasion_term?: number;
-  speed: number;
-  range?: number;
-  fuel?: number;
-  ammo?: number;
-  next_id?: number;
-  next_level?: number;
-  slotnum: number;
-  slots: SlotSizeVec;
-  stock: GearState[];
-  speed_group?: SpeedGroup;
-  useful?: boolean;
-}
+export type NightAttackType = "Normal" | "ArkRoyal" | "Carrier";
 
-export type StatInterval = [number | null, number | null];
+export type NightSpecialAttack =
+  | { NightCutin: NightCutin }
+  | { FleetCutin: FleetCutin };
+
+export type NightCutin =
+  | "MainTorpRadar"
+  | "TorpLookoutRadar"
+  | "TorpTsloTorp"
+  | "TorpTsloDrum"
+  | "DoubleAttack"
+  | "TorpTorpMain"
+  | "TorpTorpTorp"
+  | "MainMainSec"
+  | "MainMainMain"
+  | "SubTorpTorp"
+  | "SubRadarTorp"
+  | "Cvci1_25"
+  | "Cvci1_20"
+  | "Cvci1_18"
+  | "Photobomber";
 
 export interface WarfareInfo {
   day: AttackInfo<DayBattleAttackType, DayCutin | null> | null;
@@ -754,10 +731,6 @@ export interface WarfareAnalyzerShipEnvironment {
   custom_mods: CustomModifiers;
 }
 
-export type GearTypeIdArray = [number, number, number, number, number];
-
-export type Side = "Player" | "Enemy";
-
 export interface BattleConfig {
   formation: Record<Formation, NestedFormationDef>;
   anti_air_cutin: Record<number, AntiAirCutinDef>;
@@ -810,6 +783,43 @@ export interface FormationWarfareDef {
   evasion_mod: number | null;
 }
 
+export interface MasterShip {
+  ship_id: number;
+  name: string;
+  yomi: string;
+  stype: number;
+  ctype: number;
+  sort_id?: number;
+  max_hp: StatInterval;
+  firepower: StatInterval;
+  armor: StatInterval;
+  torpedo: StatInterval;
+  evasion: StatInterval;
+  anti_air: StatInterval;
+  asw: StatInterval;
+  los: StatInterval;
+  luck: StatInterval;
+  torpedo_accuracy?: number;
+  basic_evasion_term?: number;
+  speed: number;
+  range?: number;
+  fuel?: number;
+  ammo?: number;
+  next_id?: number;
+  next_level?: number;
+  slotnum: number;
+  slots: SlotSizeVec;
+  stock: GearState[];
+  speed_group?: SpeedGroup;
+  useful?: boolean;
+}
+
+export type StatInterval = [number | null, number | null];
+
+export type GearTypeIdArray = [number, number, number, number, number];
+
+export type Side = "Player" | "Enemy";
+
 export type SpecialEnemyType =
   | "None"
   | "SoftSkinned"
@@ -827,12 +837,6 @@ export type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
 
 export type SpeedGroup = "A" | "B1" | "B2" | "C";
 
-export type FleetCutin =
-  | "NelsonTouch"
-  | "NagatoCutin"
-  | "ColoradoCutin"
-  | "KongouCutin";
-
 export type ContactRank = "Rank1" | "Rank2" | "Rank3";
 
 export interface SimulatorResult {
@@ -847,8 +851,6 @@ export interface SimulatorResultItem {
   damage_state_map: Record<DamageState, number>;
 }
 
-export type AswAttackType = "DepthCharge" | "Aircraft";
-
 export interface FleetNightCutinRateInfo {
   night_contact_chance: NightContactChance;
   ships: ShipNightCutinRateInfo[];
@@ -1269,6 +1271,10 @@ export class Gear {
    * @returns {GearCategory}
    */
   category(): GearCategory;
+  /**
+   * @returns {boolean}
+   */
+  is_high_angle_mount(): boolean;
   /**
    * @returns {boolean}
    */
@@ -1853,6 +1859,11 @@ export class Ship {
    * @returns {number | undefined}
    */
   elos(node_divaricated_factor: number): number | undefined;
+  /**
+   * 確殺攻撃力
+   * @returns {number | undefined}
+   */
+  ohko_power(): number | undefined;
   /**
    * @param {number} value
    */
@@ -1896,6 +1907,10 @@ export class Ship {
   /**
    */
   id: string;
+  /**
+   * @returns {number}
+   */
+  readonly innate_torpedo_accuracy: number;
   /**
    */
   level: number;
@@ -1999,10 +2014,6 @@ export class Ship {
    * @returns {number | undefined}
    */
   readonly torpedo: number | undefined;
-  /**
-   * @returns {number}
-   */
-  readonly torpedo_accuracy_mod: number;
   /**
    * @returns {boolean}
    */

package/node/fleethub_core.js

@@ -2,11 +2,15 @@ let imports = {};
 imports['__wbindgen_placeholder__'] = module.exports;
 let wasm;
 const { createEquipmentBonuses } = require(`equipment-bonus`);
-const { TextDecoder, TextEncoder } = require(`util`);
+const { TextEncoder, TextDecoder } = require(`util`);
 
-let cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
+const heap = new Array(32).fill(undefined);
 
-cachedTextDecoder.decode();
+heap.push(undefined, null, true, false);
+
+function getObject(idx) { return heap[idx]; }
+
+let WASM_VECTOR_LEN = 0;
 
 let cachegetUint8Memory0 = null;
 function getUint8Memory0() {
@@ -16,41 +20,6 @@ function getUint8Memory0() {
     return cachegetUint8Memory0;
 }
 
-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'
@@ -112,6 +81,37 @@ function getInt32Memory0() {
     return cachegetInt32Memory0;
 }
 
+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);
@@ -926,7 +926,7 @@ class Fleet {
     get xxh3() {
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.__wbg_get_fleet_xxh3(retptr, this.ptr);
+            wasm.__wbg_get_airsquadron_xxh3(retptr, this.ptr);
             var r0 = getInt32Memory0()[retptr / 4 + 0];
             var r1 = getInt32Memory0()[retptr / 4 + 1];
             u32CvtShim[0] = r0;
@@ -944,7 +944,7 @@ class Fleet {
         uint64CvtShim[0] = arg0;
         const low0 = u32CvtShim[0];
         const high0 = u32CvtShim[1];
-        wasm.__wbg_set_fleet_xxh3(this.ptr, low0, high0);
+        wasm.__wbg_set_airsquadron_xxh3(this.ptr, low0, high0);
     }
     /**
     */
@@ -1633,6 +1633,13 @@ class Gear {
     /**
     * @returns {boolean}
     */
+    is_high_angle_mount() {
+        const ret = wasm.gear_is_high_angle_mount(this.ptr);
+        return ret !== 0;
+    }
+    /**
+    * @returns {boolean}
+    */
     is_carrier_shelling_plane() {
         const ret = wasm.gear_is_carrier_shelling_plane(this.ptr);
         return ret !== 0;
@@ -3061,8 +3068,8 @@ class Ship {
     /**
     * @returns {number}
     */
-    get torpedo_accuracy_mod() {
-        const ret = wasm.ship_torpedo_accuracy_mod(this.ptr);
+    get innate_torpedo_accuracy() {
+        const ret = wasm.ship_innate_torpedo_accuracy(this.ptr);
         return ret;
     }
     /**
@@ -3236,6 +3243,21 @@ class Ship {
         }
     }
     /**
+    * 確殺攻撃力
+    * @returns {number | undefined}
+    */
+    ohko_power() {
+        try {
+            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+            wasm.ship_ohko_power(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 {number} value
     */
     take_damage(value) {
@@ -3244,15 +3266,6 @@ class Ship {
 }
 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);
@@ -3262,7 +3275,16 @@ module.exports.__wbindgen_json_serialize = function(arg0, arg1) {
     getInt32Memory0()[arg0 / 4 + 0] = ptr0;
 };
 
-module.exports.__wbg_createEquipmentBonuses_6cd0de83fb0e4aaa = function(arg0, arg1) {
+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_2a069c9b82b680dc = function(arg0, arg1) {
     const ret = createEquipmentBonuses(takeObject(arg0), takeObject(arg1));
     return addHeapObject(ret);
 };
@@ -3298,7 +3320,15 @@ module.exports.__wbg_error_09919627ac0992f5 = function(arg0, arg1) {
     }
 };
 
-module.exports.__wbg_process_70251ed1291754d5 = function(arg0) {
+module.exports.__wbg_randomFillSync_91e2b39becca6147 = function() { return handleError(function (arg0, arg1, arg2) {
+    getObject(arg0).randomFillSync(getArrayU8FromWasm0(arg1, arg2));
+}, arguments) };
+
+module.exports.__wbg_getRandomValues_b14734aa289bc356 = function() { return handleError(function (arg0, arg1) {
+    getObject(arg0).getRandomValues(getObject(arg1));
+}, arguments) };
+
+module.exports.__wbg_process_e56fd54cf6319b6c = function(arg0) {
     const ret = getObject(arg0).process;
     return addHeapObject(ret);
 };
@@ -3309,12 +3339,12 @@ module.exports.__wbindgen_is_object = function(arg0) {
     return ret;
 };
 
-module.exports.__wbg_versions_b23f2588cdb2ddbb = function(arg0) {
+module.exports.__wbg_versions_77e21455908dad33 = function(arg0) {
     const ret = getObject(arg0).versions;
     return addHeapObject(ret);
 };
 
-module.exports.__wbg_node_61b8c9a82499895d = function(arg0) {
+module.exports.__wbg_node_0dd25d832e4785d5 = function(arg0) {
     const ret = getObject(arg0).node;
     return addHeapObject(ret);
 };
@@ -3324,34 +3354,26 @@ module.exports.__wbindgen_is_string = function(arg0) {
     return ret;
 };
 
-module.exports.__wbg_static_accessor_NODE_MODULE_33b45247c55045b0 = function() {
+module.exports.__wbg_static_accessor_NODE_MODULE_26b231378c1be7dd = function() {
     const ret = module;
     return addHeapObject(ret);
 };
 
-module.exports.__wbg_require_2a93bc09fee45aca = function() { return handleError(function (arg0, arg1, arg2) {
+module.exports.__wbg_require_0db1598d9ccecb30 = function() { return handleError(function (arg0, arg1, arg2) {
     const ret = getObject(arg0).require(getStringFromWasm0(arg1, arg2));
     return addHeapObject(ret);
 }, arguments) };
 
-module.exports.__wbg_crypto_2f56257a38275dbd = function(arg0) {
+module.exports.__wbg_crypto_b95d7173266618a9 = function(arg0) {
     const ret = getObject(arg0).crypto;
     return addHeapObject(ret);
 };
 
-module.exports.__wbg_msCrypto_d07655bf62361f21 = function(arg0) {
+module.exports.__wbg_msCrypto_5a86d77a66230f81 = function(arg0) {
     const ret = getObject(arg0).msCrypto;
     return addHeapObject(ret);
 };
 
-module.exports.__wbg_getRandomValues_fb6b088efb6bead2 = function() { return handleError(function (arg0, arg1) {
-    getObject(arg0).getRandomValues(getObject(arg1));
-}, arguments) };
-
-module.exports.__wbg_randomFillSync_654a7797990fb8db = function() { return handleError(function (arg0, arg1, arg2) {
-    getObject(arg0).randomFillSync(getArrayU8FromWasm0(arg1, arg2));
-}, arguments) };
-
 module.exports.__wbg_new_94fb1279cf6afea5 = function() {
     const ret = new Array();
     return addHeapObject(ret);