fleethub-core 1.11.6 → 1.11.7

package/node/fleethub_core.d.ts

@@ -8,12 +8,6 @@ export function set_panic_hook(): void;
  * @returns {ShipConditions}
  */
 export function parse_ship_conditions(value: ShipConditions): ShipConditions;
-export interface SupportShellingSimulatorParams {
-  attacker_formation?: Formation;
-  target_formation?: Formation;
-  engagement: Engagement;
-}
-
 export interface AttackPower {
   precap: number;
   is_capped: boolean;
@@ -189,6 +183,12 @@ export interface OrgState {
 
 export type FleetKey = "f1" | "f2" | "f3" | "f4";
 
+export interface SupportShellingSimulatorParams {
+  attacker_formation?: Formation;
+  target_formation?: Formation;
+  engagement: Engagement;
+}
+
 export interface EquippabilityRule {
   ship: CompiledEvaler;
   keys?: string[];
@@ -200,13 +200,14 @@ export interface MasterEquippability {
   equip_stype: EquipStype[];
   equip_exslot: number[];
   equip_ship: MstEquipShip[];
-  equip_exslot_ship: MstEquipExslotShip[];
+  equip_exslot_ship: Record<number, MstEquipExslotShip>;
   rules: EquippabilityRule[];
 }
 
 export interface MstEquipExslotShip {
-  api_slotitem_id: number;
-  api_ship_ids: number[];
+  api_ctypes: Record<number, number> | null;
+  api_ship_ids: Record<number, number> | null;
+  api_stypes: Record<number, number> | null;
 }
 
 export interface MstEquipShip {
@@ -252,14 +253,6 @@ export interface AttackAnalyzerShipConfig
   fleet_los_mod?: number | null;
 }
 
-export type OrgType =
-  | "Single"
-  | "CarrierTaskForce"
-  | "SurfaceTaskForce"
-  | "TransportEscort"
-  | "EnemySingle"
-  | "EnemyCombined";
-
 export interface MasterShip {
   ship_id: number;
   name: string;
@@ -331,6 +324,14 @@ export interface SupportShellingStyle {
   attack_type: SupportShellingType;
 }
 
+export type OrgType =
+  | "Single"
+  | "CarrierTaskForce"
+  | "SurfaceTaskForce"
+  | "TransportEscort"
+  | "EnemySingle"
+  | "EnemyCombined";
+
 export type GearVecInput = GearInput[];
 
 export interface GearInput {
@@ -538,11 +539,6 @@ export type SpecialEnemyType =
 
 export type SpeedGroup = "A" | "B1" | "B2" | "C";
 
-export interface MoveShipPayload {
-  current: [string, string, ShipKey];
-  target: [string | null, string, ShipKey];
-}
-
 export interface FleetCutinReport<T> {
   cutin: FleetCutin;
   rate: number | null;
@@ -629,6 +625,18 @@ export interface BattleDefinitions {
   historical_bonuses: HistoricalBonusDef[];
 }
 
+export interface FleetState {
+  id?: string;
+  len?: number;
+  s1?: ShipState;
+  s2?: ShipState;
+  s3?: ShipState;
+  s4?: ShipState;
+  s5?: ShipState;
+  s6?: ShipState;
+  s7?: ShipState;
+}
+
 export interface ShipMeta {
   id: string;
   ship_id: number;
@@ -686,6 +694,13 @@ export interface ShipState extends GearVecState, SlotSizeVecState {
 
 export type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
 
+export type SlotSizeVec = (number | null)[];
+
+export interface MoveShipPayload {
+  current: [string, string, ShipKey];
+  target: [string | null, string, ShipKey];
+}
+
 export interface MasterBattleDefinitions {
   formation: NestedFormationDef[];
   anti_air_cutin: AntiAirCutinDef[];
@@ -766,18 +781,6 @@ export interface AntiAirReport {
   anti_air_propellant_barrage_chance: number | null;
 }
 
-export interface FleetState {
-  id?: string;
-  len?: number;
-  s1?: ShipState;
-  s2?: ShipState;
-  s3?: ShipState;
-  s4?: ShipState;
-  s5?: ShipState;
-  s6?: ShipState;
-  s7?: ShipState;
-}
-
 export interface GearState {
   id?: string;
   gear_id: number;
@@ -794,8 +797,6 @@ export interface GearVecState {
   gx?: GearState;
 }
 
-export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
-
 export type ShipCategory =
   | "Battleship"
   | "AircraftCarrier"
@@ -831,8 +832,6 @@ export type ShipType =
   | "CT"
   | "AO";
 
-export type SlotSizeVec = (number | null)[];
-
 export type Histogram<K extends keyof any, V> = Partial<Record<K, V>>;
 
 export type CompiledEvaler = string;
@@ -856,6 +855,8 @@ export interface ActionReport<T> {
 
 export type AirWaveType = "Jet" | "LandBase" | "Carrier";
 
+export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
+
 export type Side = "Player" | "Enemy";
 
 export type Align = "Left" | "Right";
@@ -1088,7 +1089,7 @@ export class Analyzer {
     config: ShipAnalyzerConfig,
     left: Ship,
     right: Ship,
-    attacker_is_left: boolean,
+    attacker_is_left: boolean
   ): AttackAnalysis;
   /**
    * @param {NodeAttackAnalyzerConfig} config
@@ -1103,7 +1104,7 @@ export class Analyzer {
     left_comp: Comp,
     left_ship: Ship,
     right_comp: Comp,
-    right_ship: Ship,
+    right_ship: Ship
   ): NodeAttackAnalysis;
   /**
    * @param {Comp} comp
@@ -1122,7 +1123,7 @@ export class Analyzer {
     player_comp: Comp,
     enemy_comp: Comp,
     config: NodeAttackAnalyzerConfig,
-    times: number,
+    times: number
   ): SimulatorResult;
 }
 /**
@@ -1202,7 +1203,7 @@ export class Comp {
    */
   fighter_power(
     escort_participates: boolean,
-    air_type: AirWaveType,
+    air_type: AirWaveType
   ): number | undefined;
   /**
    * マップ索敵
@@ -1341,7 +1342,7 @@ export class Fleet {
   get_remaining_fuel(
     id: string,
     rate: number,
-    ceil: boolean,
+    ceil: boolean
   ): number | undefined;
   /**
    * @param {string} id
@@ -1352,7 +1353,7 @@ export class Fleet {
   get_remaining_ammo(
     id: string,
     rate: number,
-    ceil: boolean,
+    ceil: boolean
   ): number | undefined;
   /**
    * @returns {number}
@@ -1733,7 +1734,7 @@ export class Org {
   create_move_ship_payload(
     id: string,
     x: number,
-    y: number,
+    y: number
   ): MoveShipPayload | undefined;
   /**
    * @param {FleetKey} key
@@ -1962,7 +1963,7 @@ export class Ship {
   evasion_term(
     formation_mod: number,
     postcap_additive: number,
-    postcap_multiplicative: number,
+    postcap_multiplicative: number
   ): number | undefined;
   /**
    * @param {number} armor_penetration

package/node/fleethub_core.js

@@ -182,17 +182,16 @@ function passArray16ToWasm0(arg, malloc) {
     WASM_VECTOR_LEN = arg.length;
     return ptr;
 }
-
-function getArrayU16FromWasm0(ptr, len) {
-    ptr = ptr >>> 0;
-    return getUint16Memory0().subarray(ptr / 2, ptr / 2 + len);
-}
 /**
 */
 module.exports.set_panic_hook = function() {
     wasm.set_panic_hook();
 };
 
+function getArrayU16FromWasm0(ptr, len) {
+    ptr = ptr >>> 0;
+    return getUint16Memory0().subarray(ptr / 2, ptr / 2 + len);
+}
 /**
 * @param {ShipConditions} value
 * @returns {ShipConditions}
@@ -2933,7 +2932,7 @@ module.exports.__wbindgen_string_new = function(arg0, arg1) {
     return addHeapObject(ret);
 };
 
-module.exports.__wbg_createEquipmentBonuses_db4103b8842cdf39 = function(arg0, arg1) {
+module.exports.__wbg_createEquipmentBonuses_6a1a4721ce4d6ff7 = function(arg0, arg1) {
     const ret = createEquipmentBonuses(takeObject(arg0), takeObject(arg1));
     return addHeapObject(ret);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleethub-core",
-  "version": "1.11.6",
+  "version": "1.11.7",
   "license": "UNLICENSED",
   "exports": {
     "import": "./pkg/fleethub_core.js",

package/pkg/fleethub_core.d.ts

@@ -8,12 +8,6 @@ export function set_panic_hook(): void;
  * @returns {ShipConditions}
  */
 export function parse_ship_conditions(value: ShipConditions): ShipConditions;
-export interface SupportShellingSimulatorParams {
-  attacker_formation?: Formation;
-  target_formation?: Formation;
-  engagement: Engagement;
-}
-
 export interface AttackPower {
   precap: number;
   is_capped: boolean;
@@ -189,6 +183,12 @@ export interface OrgState {
 
 export type FleetKey = "f1" | "f2" | "f3" | "f4";
 
+export interface SupportShellingSimulatorParams {
+  attacker_formation?: Formation;
+  target_formation?: Formation;
+  engagement: Engagement;
+}
+
 export interface EquippabilityRule {
   ship: CompiledEvaler;
   keys?: string[];
@@ -200,13 +200,14 @@ export interface MasterEquippability {
   equip_stype: EquipStype[];
   equip_exslot: number[];
   equip_ship: MstEquipShip[];
-  equip_exslot_ship: MstEquipExslotShip[];
+  equip_exslot_ship: Record<number, MstEquipExslotShip>;
   rules: EquippabilityRule[];
 }
 
 export interface MstEquipExslotShip {
-  api_slotitem_id: number;
-  api_ship_ids: number[];
+  api_ctypes: Record<number, number> | null;
+  api_ship_ids: Record<number, number> | null;
+  api_stypes: Record<number, number> | null;
 }
 
 export interface MstEquipShip {
@@ -252,14 +253,6 @@ export interface AttackAnalyzerShipConfig
   fleet_los_mod?: number | null;
 }
 
-export type OrgType =
-  | "Single"
-  | "CarrierTaskForce"
-  | "SurfaceTaskForce"
-  | "TransportEscort"
-  | "EnemySingle"
-  | "EnemyCombined";
-
 export interface MasterShip {
   ship_id: number;
   name: string;
@@ -331,6 +324,14 @@ export interface SupportShellingStyle {
   attack_type: SupportShellingType;
 }
 
+export type OrgType =
+  | "Single"
+  | "CarrierTaskForce"
+  | "SurfaceTaskForce"
+  | "TransportEscort"
+  | "EnemySingle"
+  | "EnemyCombined";
+
 export type GearVecInput = GearInput[];
 
 export interface GearInput {
@@ -538,11 +539,6 @@ export type SpecialEnemyType =
 
 export type SpeedGroup = "A" | "B1" | "B2" | "C";
 
-export interface MoveShipPayload {
-  current: [string, string, ShipKey];
-  target: [string | null, string, ShipKey];
-}
-
 export interface FleetCutinReport<T> {
   cutin: FleetCutin;
   rate: number | null;
@@ -629,6 +625,18 @@ export interface BattleDefinitions {
   historical_bonuses: HistoricalBonusDef[];
 }
 
+export interface FleetState {
+  id?: string;
+  len?: number;
+  s1?: ShipState;
+  s2?: ShipState;
+  s3?: ShipState;
+  s4?: ShipState;
+  s5?: ShipState;
+  s6?: ShipState;
+  s7?: ShipState;
+}
+
 export interface ShipMeta {
   id: string;
   ship_id: number;
@@ -686,6 +694,13 @@ export interface ShipState extends GearVecState, SlotSizeVecState {
 
 export type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
 
+export type SlotSizeVec = (number | null)[];
+
+export interface MoveShipPayload {
+  current: [string, string, ShipKey];
+  target: [string | null, string, ShipKey];
+}
+
 export interface MasterBattleDefinitions {
   formation: NestedFormationDef[];
   anti_air_cutin: AntiAirCutinDef[];
@@ -766,18 +781,6 @@ export interface AntiAirReport {
   anti_air_propellant_barrage_chance: number | null;
 }
 
-export interface FleetState {
-  id?: string;
-  len?: number;
-  s1?: ShipState;
-  s2?: ShipState;
-  s3?: ShipState;
-  s4?: ShipState;
-  s5?: ShipState;
-  s6?: ShipState;
-  s7?: ShipState;
-}
-
 export interface GearState {
   id?: string;
   gear_id: number;
@@ -794,8 +797,6 @@ export interface GearVecState {
   gx?: GearState;
 }
 
-export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
-
 export type ShipCategory =
   | "Battleship"
   | "AircraftCarrier"
@@ -831,8 +832,6 @@ export type ShipType =
   | "CT"
   | "AO";
 
-export type SlotSizeVec = (number | null)[];
-
 export type Histogram<K extends keyof any, V> = Partial<Record<K, V>>;
 
 export type CompiledEvaler = string;
@@ -856,6 +855,8 @@ export interface ActionReport<T> {
 
 export type AirWaveType = "Jet" | "LandBase" | "Carrier";
 
+export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
+
 export type Side = "Player" | "Enemy";
 
 export type Align = "Left" | "Right";
@@ -1088,7 +1089,7 @@ export class Analyzer {
     config: ShipAnalyzerConfig,
     left: Ship,
     right: Ship,
-    attacker_is_left: boolean,
+    attacker_is_left: boolean
   ): AttackAnalysis;
   /**
    * @param {NodeAttackAnalyzerConfig} config
@@ -1103,7 +1104,7 @@ export class Analyzer {
     left_comp: Comp,
     left_ship: Ship,
     right_comp: Comp,
-    right_ship: Ship,
+    right_ship: Ship
   ): NodeAttackAnalysis;
   /**
    * @param {Comp} comp
@@ -1122,7 +1123,7 @@ export class Analyzer {
     player_comp: Comp,
     enemy_comp: Comp,
     config: NodeAttackAnalyzerConfig,
-    times: number,
+    times: number
   ): SimulatorResult;
 }
 /**
@@ -1202,7 +1203,7 @@ export class Comp {
    */
   fighter_power(
     escort_participates: boolean,
-    air_type: AirWaveType,
+    air_type: AirWaveType
   ): number | undefined;
   /**
    * マップ索敵
@@ -1341,7 +1342,7 @@ export class Fleet {
   get_remaining_fuel(
     id: string,
     rate: number,
-    ceil: boolean,
+    ceil: boolean
   ): number | undefined;
   /**
    * @param {string} id
@@ -1352,7 +1353,7 @@ export class Fleet {
   get_remaining_ammo(
     id: string,
     rate: number,
-    ceil: boolean,
+    ceil: boolean
   ): number | undefined;
   /**
    * @returns {number}
@@ -1733,7 +1734,7 @@ export class Org {
   create_move_ship_payload(
     id: string,
     x: number,
-    y: number,
+    y: number
   ): MoveShipPayload | undefined;
   /**
    * @param {FleetKey} key
@@ -1962,7 +1963,7 @@ export class Ship {
   evasion_term(
     formation_mod: number,
     postcap_additive: number,
-    postcap_multiplicative: number,
+    postcap_multiplicative: number
   ): number | undefined;
   /**
    * @param {number} armor_penetration

package/pkg/fleethub_core_bg.js

@@ -188,17 +188,16 @@ function passArray16ToWasm0(arg, malloc) {
     WASM_VECTOR_LEN = arg.length;
     return ptr;
 }
-
-function getArrayU16FromWasm0(ptr, len) {
-    ptr = ptr >>> 0;
-    return getUint16Memory0().subarray(ptr / 2, ptr / 2 + len);
-}
 /**
 */
 export function set_panic_hook() {
     wasm.set_panic_hook();
 }
 
+function getArrayU16FromWasm0(ptr, len) {
+    ptr = ptr >>> 0;
+    return getUint16Memory0().subarray(ptr / 2, ptr / 2 + len);
+}
 /**
 * @param {ShipConditions} value
 * @returns {ShipConditions}
@@ -2931,7 +2930,7 @@ export function __wbindgen_string_new(arg0, arg1) {
     return addHeapObject(ret);
 };
 
-export function __wbg_createEquipmentBonuses_db4103b8842cdf39(arg0, arg1) {
+export function __wbg_createEquipmentBonuses_6a1a4721ce4d6ff7(arg0, arg1) {
     const ret = createEquipmentBonuses(takeObject(arg0), takeObject(arg1));
     return addHeapObject(ret);
 };