fleethub-core 1.8.0 → 1.8.3

package/pkg/fleethub_core.d.ts

@@ -19,6 +19,30 @@ export interface ShipConditions extends ShipPosition {
   formation?: Formation;
 }
 
+declare namespace Role {
+  export type Main = "Main";
+  export type Escort = "Escort";
+}
+
+export type Role = Role.Main | Role.Escort;
+
+declare namespace OrgType {
+  export type Single = "Single";
+  export type CarrierTaskForce = "CarrierTaskForce";
+  export type SurfaceTaskForce = "SurfaceTaskForce";
+  export type TransportEscort = "TransportEscort";
+  export type EnemySingle = "EnemySingle";
+  export type EnemyCombined = "EnemyCombined";
+}
+
+export type OrgType =
+  | OrgType.Single
+  | OrgType.CarrierTaskForce
+  | OrgType.SurfaceTaskForce
+  | OrgType.TransportEscort
+  | OrgType.EnemySingle
+  | OrgType.EnemyCombined;
+
 export interface BattleDefinitions {
   formation: Record<Formation, NestedFormationDef>;
   anti_air_cutin: Record<number, AntiAirCutinDef>;
@@ -236,33 +260,11 @@ export interface SimulatorResult {
 
 export interface SimulatorResultItem {
   id: string;
-  role: Role;
+  fleet_type: FleetType;
   index: number;
   damage_state_map: Record<DamageState, number>;
 }
 
-declare namespace DamageState {
-  export type Normal = "Normal";
-  export type Shouha = "Shouha";
-  export type Chuuha = "Chuuha";
-  export type Taiha = "Taiha";
-  export type Sunk = "Sunk";
-}
-
-export type DamageState =
-  | DamageState.Normal
-  | DamageState.Shouha
-  | DamageState.Chuuha
-  | DamageState.Taiha
-  | DamageState.Sunk;
-
-export interface ShipPosition {
-  org_type?: OrgType;
-  role?: Role;
-  fleet_len?: number;
-  index?: number;
-}
-
 declare namespace GearCategory {
   export type Fighter = "Fighter";
   export type Bomber = "Bomber";
@@ -352,6 +354,7 @@ declare namespace GearType {
   export type JetRecon = "JetRecon";
   export type LargeRadar2 = "LargeRadar2";
   export type CbRecon2 = "CbRecon2";
+  export type SecondaryGun2 = "SecondaryGun2";
 }
 
 export type GearType =
@@ -413,20 +416,51 @@ export type GearType =
   | GearType.JetTorpedoBomber
   | GearType.JetRecon
   | GearType.LargeRadar2
-  | GearType.CbRecon2;
+  | GearType.CbRecon2
+  | GearType.SecondaryGun2;
 
-declare namespace FleetType {
-  export type Main = "Main";
-  export type Escort = "Escort";
-  export type RouteSup = "RouteSup";
-  export type BossSup = "BossSup";
+declare namespace DamageState {
+  export type Normal = "Normal";
+  export type Shouha = "Shouha";
+  export type Chuuha = "Chuuha";
+  export type Taiha = "Taiha";
+  export type Sunk = "Sunk";
 }
 
-export type FleetType =
-  | FleetType.Main
-  | FleetType.Escort
-  | FleetType.RouteSup
-  | FleetType.BossSup;
+export type DamageState =
+  | DamageState.Normal
+  | DamageState.Shouha
+  | DamageState.Chuuha
+  | DamageState.Taiha
+  | DamageState.Sunk;
+
+declare namespace AirStateRank {
+  export type Rank0 = "Rank0";
+  export type Rank1 = "Rank1";
+  export type Rank2 = "Rank2";
+  export type Rank3 = "Rank3";
+}
+
+export type AirStateRank =
+  | AirStateRank.Rank0
+  | AirStateRank.Rank1
+  | AirStateRank.Rank2
+  | AirStateRank.Rank3;
+
+declare namespace AirState {
+  export type AirSupremacy = "AirSupremacy";
+  export type AirSuperiority = "AirSuperiority";
+  export type AirParity = "AirParity";
+  export type AirDenial = "AirDenial";
+  export type AirIncapability = "AirIncapability";
+}
+
+export type AirState =
+  | AirState.AirSupremacy
+  | AirState.AirSuperiority
+  | AirState.AirParity
+  | AirState.AirDenial
+  | AirState.AirIncapability;
 
 export interface NodeAttackAnalyzerShipConfig extends NightFleetConditions {
   formation?: Formation;
@@ -444,6 +478,13 @@ export interface NodeAttackAnalysis {
   right: AttackAnalysis;
 }
 
+export interface ShipPosition {
+  org_type?: OrgType;
+  fleet_type?: FleetType;
+  fleet_len?: number;
+  index?: number;
+}
+
 export interface CompMeta {
   fleets: Record<FleetType, FleetMeta>;
 }
@@ -545,34 +586,6 @@ declare namespace AswAttackType {
 
 export type AswAttackType = AswAttackType.DepthCharge | AswAttackType.Aircraft;
 
-declare namespace AirStateRank {
-  export type Rank0 = "Rank0";
-  export type Rank1 = "Rank1";
-  export type Rank2 = "Rank2";
-  export type Rank3 = "Rank3";
-}
-
-export type AirStateRank =
-  | AirStateRank.Rank0
-  | AirStateRank.Rank1
-  | AirStateRank.Rank2
-  | AirStateRank.Rank3;
-
-declare namespace AirState {
-  export type AirSupremacy = "AirSupremacy";
-  export type AirSuperiority = "AirSuperiority";
-  export type AirParity = "AirParity";
-  export type AirDenial = "AirDenial";
-  export type AirIncapability = "AirIncapability";
-}
-
-export type AirState =
-  | AirState.AirSupremacy
-  | AirState.AirSuperiority
-  | AirState.AirParity
-  | AirState.AirDenial
-  | AirState.AirIncapability;
-
 export interface MasterData {
   gears: MasterGear[];
   gear_attrs: MasterAttrRule<GearAttr>[];
@@ -599,107 +612,6 @@ export interface MasterAttrRule<T> {
   expr: string;
 }
 
-export interface AttackAnalyzerConfig {
-  air_state?: AirState;
-  engagement?: Engagement;
-  attacker?: AttackAnalyzerShipConfig;
-  target?: AttackAnalyzerShipConfig;
-}
-
-export interface AttackAnalyzerShipConfig
-  extends ShipConditions,
-    NightFleetConditions {
-  fleet_los_mod?: number | null;
-}
-
-declare namespace ShipAttr {
-  export type Unknown = "Unknown";
-  export type Abyssal = "Abyssal";
-  export type NightCarrier = "NightCarrier";
-  export type Installation = "Installation";
-  export type RoyalNavy = "RoyalNavy";
-  export type Kai2 = "Kai2";
-  export type TurbineSpeedBonus = "TurbineSpeedBonus";
-  export type Pillbox = "Pillbox";
-  export type IsolatedIsland = "IsolatedIsland";
-  export type HarbourSummerPrincess = "HarbourSummerPrincess";
-  export type SupplyDepot = "SupplyDepot";
-  export type PtImp = "PtImp";
-  export type BattleshipSummerPrincess = "BattleshipSummerPrincess";
-  export type HeavyCruiserSummerPrincess = "HeavyCruiserSummerPrincess";
-}
-
-export type ShipAttr =
-  | ShipAttr.Unknown
-  | ShipAttr.Abyssal
-  | ShipAttr.NightCarrier
-  | ShipAttr.Installation
-  | ShipAttr.RoyalNavy
-  | ShipAttr.Kai2
-  | ShipAttr.TurbineSpeedBonus
-  | ShipAttr.Pillbox
-  | ShipAttr.IsolatedIsland
-  | ShipAttr.HarbourSummerPrincess
-  | ShipAttr.SupplyDepot
-  | ShipAttr.PtImp
-  | ShipAttr.BattleshipSummerPrincess
-  | ShipAttr.HeavyCruiserSummerPrincess;
-
-declare namespace OrgType {
-  export type Single = "Single";
-  export type CarrierTaskForce = "CarrierTaskForce";
-  export type SurfaceTaskForce = "SurfaceTaskForce";
-  export type TransportEscort = "TransportEscort";
-  export type EnemySingle = "EnemySingle";
-  export type EnemyCombined = "EnemyCombined";
-}
-
-export type OrgType =
-  | OrgType.Single
-  | OrgType.CarrierTaskForce
-  | OrgType.SurfaceTaskForce
-  | OrgType.TransportEscort
-  | OrgType.EnemySingle
-  | OrgType.EnemyCombined;
-
-export interface ShipEnvironment {
-  org_type?: OrgType;
-  role?: Role;
-  index?: number;
-  fleet_len?: number;
-  formation?: Formation;
-  fleet_los_mod?: number | null;
-  night_conditions?: NightFleetConditions;
-}
-
-export interface NightFleetConditions {
-  night_contact_rank?: ContactRank | null;
-  starshell_index?: number | null;
-  searchlight_index?: number | null;
-  activates_large_searchlight?: boolean;
-}
-
-export interface NightConditions {
-  player?: NightFleetConditions;
-  enemy?: NightFleetConditions;
-}
-
-export interface BattleConditions {
-  org_type: OrgType;
-  role: Role;
-  ship_index: number;
-  fleet_len: number;
-  formation: Formation;
-  fleet_los_mod: number | null;
-  night_conditions: NightFleetConditions;
-}
-
-export interface SupportShellingSimulatorParams {
-  attacker_formation?: Formation;
-  target_formation?: Formation;
-  engagement: Engagement;
-}
-
 export interface EBonuses {
   firepower: number;
   torpedo: number;
@@ -740,12 +652,44 @@ export interface GearInput {
 
 export type GearVecInput = GearInput[];
 
-declare namespace Role {
-  export type Main = "Main";
-  export type Escort = "Escort";
+declare namespace ShipAttr {
+  export type Unknown = "Unknown";
+  export type Abyssal = "Abyssal";
+  export type NightCarrier = "NightCarrier";
+  export type Installation = "Installation";
+  export type RoyalNavy = "RoyalNavy";
+  export type Kai2 = "Kai2";
+  export type TurbineSpeedBonus = "TurbineSpeedBonus";
+  export type Pillbox = "Pillbox";
+  export type IsolatedIsland = "IsolatedIsland";
+  export type HarbourSummerPrincess = "HarbourSummerPrincess";
+  export type SupplyDepot = "SupplyDepot";
+  export type PtImp = "PtImp";
+  export type BattleshipSummerPrincess = "BattleshipSummerPrincess";
+  export type HeavyCruiserSummerPrincess = "HeavyCruiserSummerPrincess";
 }
 
-export type Role = Role.Main | Role.Escort;
+export type ShipAttr =
+  | ShipAttr.Unknown
+  | ShipAttr.Abyssal
+  | ShipAttr.NightCarrier
+  | ShipAttr.Installation
+  | ShipAttr.RoyalNavy
+  | ShipAttr.Kai2
+  | ShipAttr.TurbineSpeedBonus
+  | ShipAttr.Pillbox
+  | ShipAttr.IsolatedIsland
+  | ShipAttr.HarbourSummerPrincess
+  | ShipAttr.SupplyDepot
+  | ShipAttr.PtImp
+  | ShipAttr.BattleshipSummerPrincess
+  | ShipAttr.HeavyCruiserSummerPrincess;
+
+export interface SupportShellingSimulatorParams {
+  attacker_formation?: Formation;
+  target_formation?: Formation;
+  engagement: Engagement;
+}
 
 declare namespace GearAttr {
   export type Unknown = "Unknown";
@@ -927,6 +871,12 @@ export interface DamageReport {
   damage_state_density: Histogram<DamageState, number>;
 }
 
+export interface AttackAnalyzerShipConfig
+  extends ShipConditions,
+    NightFleetConditions {
+  fleet_los_mod?: number | null;
+}
+
 export interface CompAntiAirAnalysis {
   fleet_adjusted_anti_air: number;
   ships: AntiAirReport[];
@@ -986,6 +936,19 @@ export type SingleFormation =
   | SingleFormation.LineAbreast
   | SingleFormation.Vanguard;
 
+declare namespace FleetType {
+  export type Main = "Main";
+  export type Escort = "Escort";
+  export type RouteSup = "RouteSup";
+  export type BossSup = "BossSup";
+}
+
+export type FleetType =
+  | FleetType.Main
+  | FleetType.Escort
+  | FleetType.RouteSup
+  | FleetType.BossSup;
+
 export interface CustomPowerModifiers {
   precap_mod?: AttackPowerModifier;
   postcap_mod?: AttackPowerModifier;
@@ -1125,6 +1088,28 @@ export interface AttackAnalysis {
   support_shelling: ActionReport<SupportShellingStyle>;
 }
 
+export interface NightFleetConditions {
+  night_contact_rank?: ContactRank | null;
+  starshell_index?: number | null;
+  searchlight_index?: number | null;
+  activates_large_searchlight?: boolean;
+}
+
+export interface NightConditions {
+  player?: NightFleetConditions;
+  enemy?: NightFleetConditions;
+}
+
+export interface BattleConditions {
+  org_type: OrgType;
+  role: Role;
+  ship_index: number;
+  fleet_len: number;
+  formation: Formation;
+  fleet_los_mod: number | null;
+  night_conditions: NightFleetConditions;
+}
+
 export interface MasterShip {
   ship_id: number;
   name: string;
@@ -1158,6 +1143,31 @@ export interface MasterShip {
 
 export type StatInterval = [number | null, number | null];
 
+export interface MasterGear {
+  gear_id: number;
+  name: string;
+  types: GearTypeIdArray;
+  special_type?: number;
+  max_hp?: number;
+  firepower?: number;
+  armor?: number;
+  torpedo?: number;
+  anti_air?: number;
+  speed?: number;
+  bombing?: number;
+  asw?: number;
+  los?: number;
+  luck?: number;
+  accuracy?: number;
+  evasion?: number;
+  range?: number;
+  radius?: number;
+  cost?: number;
+  improvable?: boolean;
+  ship_anti_air_resist?: number;
+  fleet_anti_air_resist?: number;
+}
+
 export interface CompAnalyzerConfig {
   engagement: Engagement;
   formation: Formation;
@@ -1320,31 +1330,6 @@ export type SpeedGroup =
 
 export type SlotSizeVec = (number | null)[];
 
-export interface MasterGear {
-  gear_id: number;
-  name: string;
-  types: GearTypeIdArray;
-  special_type?: number;
-  max_hp?: number;
-  firepower?: number;
-  armor?: number;
-  torpedo?: number;
-  anti_air?: number;
-  speed?: number;
-  bombing?: number;
-  asw?: number;
-  los?: number;
-  luck?: number;
-  accuracy?: number;
-  evasion?: number;
-  range?: number;
-  radius?: number;
-  cost?: number;
-  improvable?: boolean;
-  ship_anti_air_resist?: number;
-  fleet_anti_air_resist?: number;
-}
-
 export interface ActionReport<T> {
   data: Record<string, AttackReport<T>>;
   damage_state_density: Histogram<DamageState, number> | null;
@@ -1502,17 +1487,6 @@ export class AirSquadron {
  */
 export class Analyzer {
   free(): void;
-  /**
-   * @param {AttackAnalyzerConfig} config
-   * @param {Ship} attacker
-   * @param {Ship} target
-   * @returns {AttackAnalysis}
-   */
-  analyze_attack(
-    config: AttackAnalyzerConfig,
-    attacker: Ship,
-    target: Ship
-  ): AttackAnalysis;
   /**
    * @param {ShipAnalyzerConfig} config
    * @param {Ship} left
@@ -1520,7 +1494,7 @@ export class Analyzer {
    * @param {boolean} attacker_is_left
    * @returns {AttackAnalysis}
    */
-  analyze_attack_by_ship_analyzer(
+  analyze_ship_attack(
     config: ShipAnalyzerConfig,
     left: Ship,
     right: Ship,
@@ -2026,7 +2000,7 @@ export class Gear {
   readonly ship_anti_air_resist: number;
   /**
    */
-  readonly special_type_id: number;
+  readonly special_type: number;
   /**
    */
   readonly speed: number;

package/pkg/fleethub_core_bg.js

@@ -123,6 +123,21 @@ export function parse_ship_conditions(value) {
     return takeObject(ret);
 }
 
+const u32CvtShim = new Uint32Array(2);
+
+const uint64CvtShim = new BigUint64Array(u32CvtShim.buffer);
+
+function getArrayU8FromWasm0(ptr, len) {
+    return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len);
+}
+
+function passArray8ToWasm0(arg, malloc) {
+    const ptr = malloc(arg.length * 1);
+    getUint8Memory0().set(arg, ptr / 1);
+    WASM_VECTOR_LEN = arg.length;
+    return ptr;
+}
+
 function _assertClass(instance, klass) {
     if (!(instance instanceof klass)) {
         throw new Error(`expected instance of ${klass.name}`);
@@ -130,10 +145,6 @@ function _assertClass(instance, klass) {
     return instance.ptr;
 }
 
-const u32CvtShim = new Uint32Array(2);
-
-const uint64CvtShim = new BigUint64Array(u32CvtShim.buffer);
-
 let cachedFloat64Memory0 = new Float64Array();
 
 function getFloat64Memory0() {
@@ -143,17 +154,6 @@ function getFloat64Memory0() {
     return cachedFloat64Memory0;
 }
 
-function getArrayU8FromWasm0(ptr, len) {
-    return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len);
-}
-
-function passArray8ToWasm0(arg, malloc) {
-    const ptr = malloc(arg.length * 1);
-    getUint8Memory0().set(arg, ptr / 1);
-    WASM_VECTOR_LEN = arg.length;
-    return ptr;
-}
-
 function isLikeNone(x) {
     return x === undefined || x === null;
 }
@@ -391,28 +391,16 @@ export class Analyzer {
         wasm.__wbg_analyzer_free(ptr);
     }
     /**
-    * @param {AttackAnalyzerConfig} config
-    * @param {Ship} attacker
-    * @param {Ship} target
-    * @returns {AttackAnalysis}
-    */
-    analyze_attack(config, attacker, target) {
-        _assertClass(attacker, Ship);
-        _assertClass(target, Ship);
-        const ret = wasm.analyzer_analyze_attack(this.ptr, addHeapObject(config), attacker.ptr, target.ptr);
-        return takeObject(ret);
-    }
-    /**
     * @param {ShipAnalyzerConfig} config
     * @param {Ship} left
     * @param {Ship} right
     * @param {boolean} attacker_is_left
     * @returns {AttackAnalysis}
     */
-    analyze_attack_by_ship_analyzer(config, left, right, attacker_is_left) {
+    analyze_ship_attack(config, left, right, attacker_is_left) {
         _assertClass(left, Ship);
         _assertClass(right, Ship);
-        const ret = wasm.analyzer_analyze_attack_by_ship_analyzer(this.ptr, addHeapObject(config), left.ptr, right.ptr, attacker_is_left);
+        const ret = wasm.analyzer_analyze_ship_attack(this.ptr, addHeapObject(config), left.ptr, right.ptr, attacker_is_left);
         return takeObject(ret);
     }
     /**
@@ -1451,8 +1439,8 @@ export class Gear {
     /**
     * @returns {number}
     */
-    get special_type_id() {
-        const ret = wasm.gear_special_type_id(this.ptr);
+    get special_type() {
+        const ret = wasm.gear_special_type(this.ptr);
         return ret;
     }
     /**
@@ -3141,7 +3129,7 @@ export function __wbindgen_string_new(arg0, arg1) {
     return addHeapObject(ret);
 };
 
-export function __wbg_createEquipmentBonuses_6bfec5b900d74071(arg0, arg1) {
+export function __wbg_createEquipmentBonuses_d215617bb16aa6f4(arg0, arg1) {
     const ret = createEquipmentBonuses(takeObject(arg0), takeObject(arg1));
     return addHeapObject(ret);
 };