fleethub-core 1.11.18 → 1.11.20

package/node/fleethub_core.d.ts

@@ -8,21 +8,6 @@ export function parse_ship_conditions(value: ShipConditions): ShipConditions;
 /**
  */
 export function set_panic_hook(): void;
-export type GearTypeIdArray = [number, number, number, number, number];
-
-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 CompAnalyzerConfig {
   engagement: Engagement;
   formation: Formation;
@@ -184,6 +169,8 @@ export interface NightFleetConditions {
 
 export type ContactRank = "Rank1" | "Rank2" | "Rank3";
 
+export type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
+
 export interface FleetState {
   id?: string;
   len?: number;
@@ -218,6 +205,22 @@ export interface ShipConditions extends ShipPosition {
   amagiri_index?: number | null;
 }
 
+export type SpecialEnemyType =
+  | "None"
+  | "SoftSkinned"
+  | "Pillbox"
+  | "IsolatedIsland"
+  | "SupplyDepot"
+  | "NewSupplyDepot"
+  | "HarbourSummerPrincess"
+  | "PtImp"
+  | "BattleshipSummerPrincess"
+  | "HeavyCruiserSummerPrincess"
+  | "FrenchBattleshipPrincess"
+  | "AnchorageWaterDemonVacationMode"
+  | "DockPrincess"
+  | "SummerAircraftCarrierDemon";
+
 export type FhResult<T> = { Ok: T } | { Err: string };
 
 export interface MasterData extends MasterBattleDefinitions {
@@ -403,24 +406,33 @@ export interface EquipStype {
   equip_type: number[];
 }
 
-export interface NodeAttackAnalyzerShipConfig extends NightFleetConditions {
-  formation?: Formation;
-  balloons?: number;
+export interface AttackReport<T> {
+  style: T;
+  proc_rate: number | null;
+  attack_power: AttackPower | null;
+  attack_power_params: AttackPowerParams | null;
+  hits: number;
+  hit_rate: HitRate | null;
+  hit_rate_params: HitRateParams | null;
+  damage: DamageReport | null;
 }
 
-export interface NodeAttackAnalyzerConfig {
-  air_state?: AirState;
-  engagement?: Engagement;
-  node_state?: NodeState;
-  left?: NodeAttackAnalyzerShipConfig;
-  right?: NodeAttackAnalyzerShipConfig;
+export interface CompAntiAirAnalysis {
+  fleet_adjusted_anti_air: number;
+  ships: AntiAirReport[];
+  anti_air_cutin_chance: [number, number][];
 }
 
-export interface NodeAttackAnalysis {
-  left: AttackAnalysis;
-  right: AttackAnalysis;
-  shelling_fleet_cutin: FleetCutinReport<ShellingStyle>[];
-  night_fleet_cutin: FleetCutinReport<NightAttackStyle>[];
+export interface AntiAirReport {
+  ship_id: number;
+  role: Role;
+  index: number;
+  adjusted_anti_air: number | null;
+  proportional_shotdown_rate: number | null;
+  fixed_shotdown_number: number | null;
+  guaranteed: number | null;
+  anti_air_cutin_chance: [number, number][];
+  anti_air_propellant_barrage_chance: number | null;
 }
 
 export interface FormationCombatModifiersDef {
@@ -505,31 +517,7 @@ export interface ShipPosition {
   index?: number;
 }
 
-export interface SimulatorResult {
-  items: SimulatorResultItem[];
-  sunk_vec: [number, number, number][];
-}
-
-export interface SimulatorResultItem {
-  id: string;
-  fleet_type: FleetType;
-  index: number;
-  damage_state_map: Record<DamageState, number>;
-}
-
-export interface ContactAnalysis {
-  single: DayContactChance[] | null;
-  combined: DayContactChance[] | null;
-}
-
-export interface DayContactChance {
-  air_state: AirState;
-  trigger_rate: number;
-  rank3: number;
-  rank2: number;
-  rank1: number;
-  total: number;
-}
+export type Histogram<K extends keyof any, V> = Partial<Record<K, V>>;
 
 export type NodeId = string;
 
@@ -546,10 +534,20 @@ export type Side = "Player" | "Enemy";
 
 export type Align = "Left" | "Right";
 
-export type Histogram<K extends keyof any, V> = Partial<Record<K, V>>;
-
 export type CompiledEvaler = string;
 
+export interface SimulatorResult {
+  items: SimulatorResultItem[];
+  sunk_vec: [number, number, number][];
+}
+
+export interface SimulatorResultItem {
+  id: string;
+  fleet_type: FleetType;
+  index: number;
+  damage_state_map: Record<DamageState, number>;
+}
+
 export interface HitRate {
   normal: number;
   critical: number;
@@ -572,33 +570,37 @@ export interface ShipAnalyzerConfig {
   right?: AttackAnalyzerShipConfig;
 }
 
-export interface AttackReport<T> {
-  style: T;
-  proc_rate: number | null;
-  attack_power: AttackPower | null;
-  attack_power_params: AttackPowerParams | null;
-  hits: number;
-  hit_rate: HitRate | null;
-  hit_rate_params: HitRateParams | null;
-  damage: DamageReport | null;
+export interface NodeAttackAnalyzerShipConfig extends NightFleetConditions {
+  formation?: Formation;
 }
 
-export interface CompAntiAirAnalysis {
-  fleet_adjusted_anti_air: number;
-  ships: AntiAirReport[];
-  anti_air_cutin_chance: [number, number][];
+export interface NodeAttackAnalyzerConfig {
+  air_state?: AirState;
+  engagement?: Engagement;
+  node_state?: NodeState;
+  left?: NodeAttackAnalyzerShipConfig;
+  right?: NodeAttackAnalyzerShipConfig;
 }
 
-export interface AntiAirReport {
-  ship_id: number;
-  role: Role;
-  index: number;
-  adjusted_anti_air: number | null;
-  proportional_shotdown_rate: number | null;
-  fixed_shotdown_number: number | null;
-  guaranteed: number | null;
-  anti_air_cutin_chance: [number, number][];
-  anti_air_propellant_barrage_chance: number | null;
+export interface NodeAttackAnalysis {
+  left: AttackAnalysis;
+  right: AttackAnalysis;
+  shelling_fleet_cutin: FleetCutinReport<ShellingStyle>[];
+  night_fleet_cutin: FleetCutinReport<NightAttackStyle>[];
+}
+
+export interface ContactAnalysis {
+  single: DayContactChance[] | null;
+  combined: DayContactChance[] | null;
+}
+
+export interface DayContactChance {
+  air_state: AirState;
+  trigger_rate: number;
+  rank3: number;
+  rank2: number;
+  rank1: number;
+  total: number;
 }
 
 export type AirWaveType = "Jet" | "LandBase" | "Carrier";
@@ -732,46 +734,6 @@ export type SlotSizeVec = (number | null)[];
 
 export type SpeedGroup = "A" | "B1" | "B2" | "C";
 
-export type GearVecInput = GearInput[];
-
-export interface GearInput {
-  gear_id: number;
-  types: GearTypeIdArray;
-  firepower: number;
-  torpedo: number;
-  anti_air: number;
-  armor: number;
-  evasion: number;
-  asw: number;
-  los: number;
-  bombing: number;
-  accuracy: number;
-  range: number;
-  radius: number;
-  stars: number;
-  ace: number;
-}
-
-export interface ShipInput {
-  ship_id: number;
-  ctype: number;
-  stype: number;
-  yomi: string;
-}
-
-export interface EBonuses {
-  firepower: number;
-  torpedo: number;
-  anti_air: number;
-  armor: number;
-  evasion: number;
-  asw: number;
-  los: number;
-  bombing: number;
-  accuracy: number;
-  range: number;
-}
-
 export interface MasterShip {
   ship_id: number;
   name: string;
@@ -806,17 +768,16 @@ export interface MasterShip {
 
 export type StatInterval = [number | null, number | null];
 
-export interface FleetCutinReport<T> {
-  cutin: FleetCutin;
-  rate: number | null;
-  formation: Formation;
-  attacks: FleetCutinAttackReport<T>[];
-}
-
-export interface FleetCutinAttackReport<T> extends AttackReport<T> {
-  index: number;
-  ship_id: number;
-  power_mod: number;
+export interface AttackAnalysis {
+  attacker_is_player: boolean;
+  attacker_ship_id: number;
+  target_ship_id: number;
+  historical_params: HistoricalParams;
+  day: ActionReport<DayPhaseAttackStyle>;
+  night: ActionReport<NightPhaseAttackStyle>;
+  closing_torpedo: ActionReport<TorpedoAttackStyle>;
+  opening_asw: ActionReport<AswAttackStyle>;
+  support_shelling: ActionReport<SupportShellingStyle>;
 }
 
 export type DayCutin =
@@ -958,6 +919,27 @@ export type GearCategory =
   | "LandBased"
   | "Misc";
 
+export type ShipAttr =
+  | "Unknown"
+  | "NightCarrier"
+  | "Installation"
+  | "RoyalNavy"
+  | "Kai2"
+  | "TurbineSpeedBonus"
+  | "NewModelBoilerSpeedBonus"
+  | "Pillbox"
+  | "IsolatedIsland"
+  | "HarbourSummerPrincess"
+  | "SupplyDepot"
+  | "NewSupplyDepot"
+  | "PtImp"
+  | "BattleshipSummerPrincess"
+  | "HeavyCruiserSummerPrincess"
+  | "AnchorageWaterDemonVacationMode"
+  | "FrenchBattleshipPrincess"
+  | "DockPrincess"
+  | "SummerAircraftCarrierDemon";
+
 export type ShipCategory =
   | "Battleship"
   | "AircraftCarrier"
@@ -993,56 +975,73 @@ export type ShipType =
   | "CT"
   | "AO";
 
-export interface AttackAnalysis {
-  attacker_is_player: boolean;
-  attacker_ship_id: number;
-  target_ship_id: number;
-  historical_params: HistoricalParams;
-  day: ActionReport<DayPhaseAttackStyle>;
-  night: ActionReport<NightPhaseAttackStyle>;
-  closing_torpedo: ActionReport<TorpedoAttackStyle>;
-  opening_asw: ActionReport<AswAttackStyle>;
-  support_shelling: ActionReport<SupportShellingStyle>;
+export type GearTypeIdArray = [number, number, number, number, number];
+
+export type GearVecInput = GearInput[];
+
+export interface GearInput {
+  gear_id: number;
+  types: GearTypeIdArray;
+  firepower: number;
+  torpedo: number;
+  anti_air: number;
+  armor: number;
+  evasion: number;
+  asw: number;
+  los: number;
+  bombing: number;
+  accuracy: number;
+  range: number;
+  radius: number;
+  stars: number;
+  ace: number;
 }
 
-export type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
+export interface ShipInput {
+  ship_id: number;
+  ctype: number;
+  stype: number;
+  yomi: string;
+}
 
-export type ShipAttr =
-  | "Unknown"
-  | "NightCarrier"
-  | "Installation"
-  | "RoyalNavy"
-  | "Kai2"
-  | "TurbineSpeedBonus"
-  | "NewModelBoilerSpeedBonus"
-  | "Pillbox"
-  | "IsolatedIsland"
-  | "HarbourSummerPrincess"
-  | "SupplyDepot"
-  | "NewSupplyDepot"
-  | "PtImp"
-  | "BattleshipSummerPrincess"
-  | "HeavyCruiserSummerPrincess"
-  | "AnchorageWaterDemonVacationMode"
-  | "FrenchBattleshipPrincess"
-  | "DockPrincess"
-  | "SummerAircraftCarrierDemon";
+export interface EBonuses {
+  firepower: number;
+  torpedo: number;
+  anti_air: number;
+  armor: number;
+  evasion: number;
+  asw: number;
+  los: number;
+  bombing: number;
+  accuracy: number;
+  range: number;
+}
 
-export type SpecialEnemyType =
-  | "None"
-  | "SoftSkinned"
-  | "Pillbox"
-  | "IsolatedIsland"
-  | "SupplyDepot"
-  | "NewSupplyDepot"
-  | "HarbourSummerPrincess"
-  | "PtImp"
-  | "BattleshipSummerPrincess"
-  | "HeavyCruiserSummerPrincess"
-  | "FrenchBattleshipPrincess"
-  | "AnchorageWaterDemonVacationMode"
-  | "DockPrincess"
-  | "SummerAircraftCarrierDemon";
+export interface FleetCutinReport<T> {
+  cutin: FleetCutin;
+  rate: number | null;
+  formation: Formation;
+  attacks: FleetCutinAttackReport<T>[];
+}
+
+export interface FleetCutinAttackReport<T> extends AttackReport<T> {
+  index: number;
+  ship_id: number;
+  power_mod: number;
+}
+
+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>;
+}
 
 /**
  */
@@ -1295,6 +1294,11 @@ export class FhCore {
    * @returns {Org | undefined}
    */
   create_org(input?: OrgState): Org | undefined;
+  /**
+   * @param {number} ship_id
+   * @returns {ShipState | undefined}
+   */
+  create_ship_state_by_id(ship_id: number): ShipState | undefined;
   /**
    * @param {number} ship_id
    * @returns {Ship | undefined}

package/node/fleethub_core.js

@@ -139,13 +139,6 @@ function getArrayJsValueFromWasm0(ptr, len) {
     return result;
 }
 
-function _assertClass(instance, klass) {
-    if (!(instance instanceof klass)) {
-        throw new Error(`expected instance of ${klass.name}`);
-    }
-    return instance.ptr;
-}
-
 let cachedFloat64Memory0 = null;
 
 function getFloat64Memory0() {
@@ -154,6 +147,13 @@ function getFloat64Memory0() {
     }
     return cachedFloat64Memory0;
 }
+
+function _assertClass(instance, klass) {
+    if (!(instance instanceof klass)) {
+        throw new Error(`expected instance of ${klass.name}`);
+    }
+    return instance.ptr;
+}
 /**
 * @param {ShipConditions} value
 * @returns {ShipConditions}
@@ -863,6 +863,14 @@ class FhCore {
     }
     /**
     * @param {number} ship_id
+    * @returns {ShipState | undefined}
+    */
+    create_ship_state_by_id(ship_id) {
+        const ret = wasm.fhcore_create_ship_state_by_id(this.__wbg_ptr, ship_id);
+        return takeObject(ret);
+    }
+    /**
+    * @param {number} ship_id
     * @returns {Ship | undefined}
     */
     create_ship_by_id(ship_id) {
@@ -2953,17 +2961,17 @@ module.exports.__wbindgen_string_new = function(arg0, arg1) {
     return addHeapObject(ret);
 };
 
-module.exports.__wbindgen_is_undefined = function(arg0) {
-    const ret = getObject(arg0) === undefined;
-    return ret;
-};
-
 module.exports.__wbg_ship_new = function(arg0) {
     const ret = Ship.__wrap(arg0);
     return addHeapObject(ret);
 };
 
-module.exports.__wbg_createEquipmentBonuses_03da72c9fa1a8001 = function(arg0, arg1) {
+module.exports.__wbindgen_is_undefined = function(arg0) {
+    const ret = getObject(arg0) === undefined;
+    return ret;
+};
+
+module.exports.__wbg_createEquipmentBonuses_144c688a77d7a9b3 = function(arg0, arg1) {
     const ret = createEquipmentBonuses(takeObject(arg0), takeObject(arg1));
     return addHeapObject(ret);
 };

package/node/fleethub_core_bg.wasm.d.ts

@@ -1,19 +1,28 @@
 /* tslint:disable */
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
-export function __wbg_airsquadron_free(a: number): void;
-export function __wbg_get_airsquadron_id(a: number, b: number): void;
-export function __wbg_set_airsquadron_id(a: number, b: number, c: number): void;
-export function __wbg_get_airsquadron_hash(a: number): number;
-export function __wbg_set_airsquadron_hash(a: number, b: number): void;
-export function __wbg_get_airsquadron_mode(a: number): number;
-export function __wbg_set_airsquadron_mode(a: number, b: number): void;
-export function airsquadron_get_gear(a: number, b: number, c: number): number;
-export function airsquadron_get_slot_size(a: number, b: number, c: number): void;
-export function airsquadron_get_max_slot_size(a: number, b: number, c: number): void;
-export function airsquadron_fighter_power(a: number): number;
-export function airsquadron_interception_power(a: number): number;
-export function airsquadron_radius(a: number): number;
+export function __wbg_fleet_free(a: number): void;
+export function __wbg_get_fleet_id(a: number, b: number): void;
+export function __wbg_set_fleet_id(a: number, b: number, c: number): void;
+export function __wbg_get_fleet_hash(a: number): number;
+export function __wbg_get_fleet_len(a: number): number;
+export function fleet_meta(a: number): number;
+export function fleet_ship_keys(a: number, b: number): void;
+export function fleet_ship_ids(a: number, b: number): void;
+export function fleet_get_gear_ids_by_improvable(a: number, b: number): void;
+export function fleet_get_gear_ids_by_proficiency(a: number, b: number): void;
+export function fleet_get_damage_bound(a: number, b: number, c: number, d: number): number;
+export function fleet_get_remaining_fuel(a: number, b: number, c: number, d: number, e: number): number;
+export function fleet_get_remaining_ammo(a: number, b: number, c: number, d: number, e: number): number;
+export function fleet_count_ships(a: number): number;
+export function fleet_get_ship(a: number, b: number): number;
+export function fleet_fleet_los_mod(a: number, b: number): void;
+export function fleet_fighter_power(a: number, b: number, c: number): void;
+export function fleet_elos(a: number, b: number, c: number, d: number): void;
+export function fleet_aviation_detection_score(a: number, b: number): void;
+export function fleet_expedition_bonus(a: number): number;
+export function fleet_sum_ship_stat_by(a: number, b: number, c: number, d: number): void;
+export function fleet_reset_battle_state(a: number): void;
 export function __wbg_ship_free(a: number): void;
 export function __wbg_get_ship_id(a: number, b: number): void;
 export function __wbg_set_ship_id(a: number, b: number, c: number): void;
@@ -105,29 +114,20 @@ export function ship_basic_defense_power(a: number, b: number, c: number): void;
 export function ship_transport_point(a: number): number;
 export function ship_elos(a: number, b: number, c: number): void;
 export function ship_ohko_power(a: number, b: number): void;
+export function __wbg_airsquadron_free(a: number): void;
+export function __wbg_get_airsquadron_id(a: number, b: number): void;
+export function __wbg_set_airsquadron_id(a: number, b: number, c: number): void;
+export function __wbg_get_airsquadron_hash(a: number): number;
+export function __wbg_set_airsquadron_hash(a: number, b: number): void;
+export function __wbg_get_airsquadron_mode(a: number): number;
+export function __wbg_set_airsquadron_mode(a: number, b: number): void;
+export function airsquadron_get_gear(a: number, b: number, c: number): number;
+export function airsquadron_get_slot_size(a: number, b: number, c: number): void;
+export function airsquadron_get_max_slot_size(a: number, b: number, c: number): void;
+export function airsquadron_fighter_power(a: number): number;
+export function airsquadron_interception_power(a: number): number;
+export function airsquadron_radius(a: number): number;
 export function parse_ship_conditions(a: number): number;
-export function __wbg_fleet_free(a: number): void;
-export function __wbg_get_fleet_id(a: number, b: number): void;
-export function __wbg_set_fleet_id(a: number, b: number, c: number): void;
-export function __wbg_get_fleet_hash(a: number): number;
-export function __wbg_get_fleet_len(a: number): number;
-export function fleet_meta(a: number): number;
-export function fleet_ship_keys(a: number, b: number): void;
-export function fleet_ship_ids(a: number, b: number): void;
-export function fleet_get_gear_ids_by_improvable(a: number, b: number): void;
-export function fleet_get_gear_ids_by_proficiency(a: number, b: number): void;
-export function fleet_get_damage_bound(a: number, b: number, c: number, d: number): number;
-export function fleet_get_remaining_fuel(a: number, b: number, c: number, d: number, e: number): number;
-export function fleet_get_remaining_ammo(a: number, b: number, c: number, d: number, e: number): number;
-export function fleet_count_ships(a: number): number;
-export function fleet_get_ship(a: number, b: number): number;
-export function fleet_fleet_los_mod(a: number, b: number): void;
-export function fleet_fighter_power(a: number, b: number, c: number): void;
-export function fleet_elos(a: number, b: number, c: number, d: number): void;
-export function fleet_aviation_detection_score(a: number, b: number): void;
-export function fleet_expedition_bonus(a: number): number;
-export function fleet_sum_ship_stat_by(a: number, b: number, c: number, d: number): void;
-export function fleet_reset_battle_state(a: number): void;
 export function __wbg_comp_free(a: number): void;
 export function __wbg_get_comp_org_type(a: number): number;
 export function __wbg_get_comp_hq_level(a: number): number;
@@ -267,6 +267,7 @@ export function fhcore_create_ship(a: number, b: number): number;
 export function fhcore_create_air_squadron(a: number, b: number): number;
 export function fhcore_create_fleet(a: number, b: number): number;
 export function fhcore_create_org(a: number, b: number): number;
+export function fhcore_create_ship_state_by_id(a: number, b: number): number;
 export function fhcore_create_ship_by_id(a: number, b: number): number;
 export function fhcore_create_all_ships(a: number): number;
 export function fhcore_create_comp_by_map_enemy(a: number, b: number, c: number, d: number, e: number): number;

package/package.json

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

package/pkg/fleethub_core.d.ts

@@ -8,21 +8,6 @@ export function parse_ship_conditions(value: ShipConditions): ShipConditions;
 /**
  */
 export function set_panic_hook(): void;
-export type GearTypeIdArray = [number, number, number, number, number];
-
-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 CompAnalyzerConfig {
   engagement: Engagement;
   formation: Formation;
@@ -184,6 +169,8 @@ export interface NightFleetConditions {
 
 export type ContactRank = "Rank1" | "Rank2" | "Rank3";
 
+export type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
+
 export interface FleetState {
   id?: string;
   len?: number;
@@ -218,6 +205,22 @@ export interface ShipConditions extends ShipPosition {
   amagiri_index?: number | null;
 }
 
+export type SpecialEnemyType =
+  | "None"
+  | "SoftSkinned"
+  | "Pillbox"
+  | "IsolatedIsland"
+  | "SupplyDepot"
+  | "NewSupplyDepot"
+  | "HarbourSummerPrincess"
+  | "PtImp"
+  | "BattleshipSummerPrincess"
+  | "HeavyCruiserSummerPrincess"
+  | "FrenchBattleshipPrincess"
+  | "AnchorageWaterDemonVacationMode"
+  | "DockPrincess"
+  | "SummerAircraftCarrierDemon";
+
 export type FhResult<T> = { Ok: T } | { Err: string };
 
 export interface MasterData extends MasterBattleDefinitions {
@@ -403,24 +406,33 @@ export interface EquipStype {
   equip_type: number[];
 }
 
-export interface NodeAttackAnalyzerShipConfig extends NightFleetConditions {
-  formation?: Formation;
-  balloons?: number;
+export interface AttackReport<T> {
+  style: T;
+  proc_rate: number | null;
+  attack_power: AttackPower | null;
+  attack_power_params: AttackPowerParams | null;
+  hits: number;
+  hit_rate: HitRate | null;
+  hit_rate_params: HitRateParams | null;
+  damage: DamageReport | null;
 }
 
-export interface NodeAttackAnalyzerConfig {
-  air_state?: AirState;
-  engagement?: Engagement;
-  node_state?: NodeState;
-  left?: NodeAttackAnalyzerShipConfig;
-  right?: NodeAttackAnalyzerShipConfig;
+export interface CompAntiAirAnalysis {
+  fleet_adjusted_anti_air: number;
+  ships: AntiAirReport[];
+  anti_air_cutin_chance: [number, number][];
 }
 
-export interface NodeAttackAnalysis {
-  left: AttackAnalysis;
-  right: AttackAnalysis;
-  shelling_fleet_cutin: FleetCutinReport<ShellingStyle>[];
-  night_fleet_cutin: FleetCutinReport<NightAttackStyle>[];
+export interface AntiAirReport {
+  ship_id: number;
+  role: Role;
+  index: number;
+  adjusted_anti_air: number | null;
+  proportional_shotdown_rate: number | null;
+  fixed_shotdown_number: number | null;
+  guaranteed: number | null;
+  anti_air_cutin_chance: [number, number][];
+  anti_air_propellant_barrage_chance: number | null;
 }
 
 export interface FormationCombatModifiersDef {
@@ -505,31 +517,7 @@ export interface ShipPosition {
   index?: number;
 }
 
-export interface SimulatorResult {
-  items: SimulatorResultItem[];
-  sunk_vec: [number, number, number][];
-}
-
-export interface SimulatorResultItem {
-  id: string;
-  fleet_type: FleetType;
-  index: number;
-  damage_state_map: Record<DamageState, number>;
-}
-
-export interface ContactAnalysis {
-  single: DayContactChance[] | null;
-  combined: DayContactChance[] | null;
-}
-
-export interface DayContactChance {
-  air_state: AirState;
-  trigger_rate: number;
-  rank3: number;
-  rank2: number;
-  rank1: number;
-  total: number;
-}
+export type Histogram<K extends keyof any, V> = Partial<Record<K, V>>;
 
 export type NodeId = string;
 
@@ -546,10 +534,20 @@ export type Side = "Player" | "Enemy";
 
 export type Align = "Left" | "Right";
 
-export type Histogram<K extends keyof any, V> = Partial<Record<K, V>>;
-
 export type CompiledEvaler = string;
 
+export interface SimulatorResult {
+  items: SimulatorResultItem[];
+  sunk_vec: [number, number, number][];
+}
+
+export interface SimulatorResultItem {
+  id: string;
+  fleet_type: FleetType;
+  index: number;
+  damage_state_map: Record<DamageState, number>;
+}
+
 export interface HitRate {
   normal: number;
   critical: number;
@@ -572,33 +570,37 @@ export interface ShipAnalyzerConfig {
   right?: AttackAnalyzerShipConfig;
 }
 
-export interface AttackReport<T> {
-  style: T;
-  proc_rate: number | null;
-  attack_power: AttackPower | null;
-  attack_power_params: AttackPowerParams | null;
-  hits: number;
-  hit_rate: HitRate | null;
-  hit_rate_params: HitRateParams | null;
-  damage: DamageReport | null;
+export interface NodeAttackAnalyzerShipConfig extends NightFleetConditions {
+  formation?: Formation;
 }
 
-export interface CompAntiAirAnalysis {
-  fleet_adjusted_anti_air: number;
-  ships: AntiAirReport[];
-  anti_air_cutin_chance: [number, number][];
+export interface NodeAttackAnalyzerConfig {
+  air_state?: AirState;
+  engagement?: Engagement;
+  node_state?: NodeState;
+  left?: NodeAttackAnalyzerShipConfig;
+  right?: NodeAttackAnalyzerShipConfig;
 }
 
-export interface AntiAirReport {
-  ship_id: number;
-  role: Role;
-  index: number;
-  adjusted_anti_air: number | null;
-  proportional_shotdown_rate: number | null;
-  fixed_shotdown_number: number | null;
-  guaranteed: number | null;
-  anti_air_cutin_chance: [number, number][];
-  anti_air_propellant_barrage_chance: number | null;
+export interface NodeAttackAnalysis {
+  left: AttackAnalysis;
+  right: AttackAnalysis;
+  shelling_fleet_cutin: FleetCutinReport<ShellingStyle>[];
+  night_fleet_cutin: FleetCutinReport<NightAttackStyle>[];
+}
+
+export interface ContactAnalysis {
+  single: DayContactChance[] | null;
+  combined: DayContactChance[] | null;
+}
+
+export interface DayContactChance {
+  air_state: AirState;
+  trigger_rate: number;
+  rank3: number;
+  rank2: number;
+  rank1: number;
+  total: number;
 }
 
 export type AirWaveType = "Jet" | "LandBase" | "Carrier";
@@ -732,46 +734,6 @@ export type SlotSizeVec = (number | null)[];
 
 export type SpeedGroup = "A" | "B1" | "B2" | "C";
 
-export type GearVecInput = GearInput[];
-
-export interface GearInput {
-  gear_id: number;
-  types: GearTypeIdArray;
-  firepower: number;
-  torpedo: number;
-  anti_air: number;
-  armor: number;
-  evasion: number;
-  asw: number;
-  los: number;
-  bombing: number;
-  accuracy: number;
-  range: number;
-  radius: number;
-  stars: number;
-  ace: number;
-}
-
-export interface ShipInput {
-  ship_id: number;
-  ctype: number;
-  stype: number;
-  yomi: string;
-}
-
-export interface EBonuses {
-  firepower: number;
-  torpedo: number;
-  anti_air: number;
-  armor: number;
-  evasion: number;
-  asw: number;
-  los: number;
-  bombing: number;
-  accuracy: number;
-  range: number;
-}
-
 export interface MasterShip {
   ship_id: number;
   name: string;
@@ -806,17 +768,16 @@ export interface MasterShip {
 
 export type StatInterval = [number | null, number | null];
 
-export interface FleetCutinReport<T> {
-  cutin: FleetCutin;
-  rate: number | null;
-  formation: Formation;
-  attacks: FleetCutinAttackReport<T>[];
-}
-
-export interface FleetCutinAttackReport<T> extends AttackReport<T> {
-  index: number;
-  ship_id: number;
-  power_mod: number;
+export interface AttackAnalysis {
+  attacker_is_player: boolean;
+  attacker_ship_id: number;
+  target_ship_id: number;
+  historical_params: HistoricalParams;
+  day: ActionReport<DayPhaseAttackStyle>;
+  night: ActionReport<NightPhaseAttackStyle>;
+  closing_torpedo: ActionReport<TorpedoAttackStyle>;
+  opening_asw: ActionReport<AswAttackStyle>;
+  support_shelling: ActionReport<SupportShellingStyle>;
 }
 
 export type DayCutin =
@@ -958,6 +919,27 @@ export type GearCategory =
   | "LandBased"
   | "Misc";
 
+export type ShipAttr =
+  | "Unknown"
+  | "NightCarrier"
+  | "Installation"
+  | "RoyalNavy"
+  | "Kai2"
+  | "TurbineSpeedBonus"
+  | "NewModelBoilerSpeedBonus"
+  | "Pillbox"
+  | "IsolatedIsland"
+  | "HarbourSummerPrincess"
+  | "SupplyDepot"
+  | "NewSupplyDepot"
+  | "PtImp"
+  | "BattleshipSummerPrincess"
+  | "HeavyCruiserSummerPrincess"
+  | "AnchorageWaterDemonVacationMode"
+  | "FrenchBattleshipPrincess"
+  | "DockPrincess"
+  | "SummerAircraftCarrierDemon";
+
 export type ShipCategory =
   | "Battleship"
   | "AircraftCarrier"
@@ -993,56 +975,73 @@ export type ShipType =
   | "CT"
   | "AO";
 
-export interface AttackAnalysis {
-  attacker_is_player: boolean;
-  attacker_ship_id: number;
-  target_ship_id: number;
-  historical_params: HistoricalParams;
-  day: ActionReport<DayPhaseAttackStyle>;
-  night: ActionReport<NightPhaseAttackStyle>;
-  closing_torpedo: ActionReport<TorpedoAttackStyle>;
-  opening_asw: ActionReport<AswAttackStyle>;
-  support_shelling: ActionReport<SupportShellingStyle>;
+export type GearTypeIdArray = [number, number, number, number, number];
+
+export type GearVecInput = GearInput[];
+
+export interface GearInput {
+  gear_id: number;
+  types: GearTypeIdArray;
+  firepower: number;
+  torpedo: number;
+  anti_air: number;
+  armor: number;
+  evasion: number;
+  asw: number;
+  los: number;
+  bombing: number;
+  accuracy: number;
+  range: number;
+  radius: number;
+  stars: number;
+  ace: number;
 }
 
-export type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
+export interface ShipInput {
+  ship_id: number;
+  ctype: number;
+  stype: number;
+  yomi: string;
+}
 
-export type ShipAttr =
-  | "Unknown"
-  | "NightCarrier"
-  | "Installation"
-  | "RoyalNavy"
-  | "Kai2"
-  | "TurbineSpeedBonus"
-  | "NewModelBoilerSpeedBonus"
-  | "Pillbox"
-  | "IsolatedIsland"
-  | "HarbourSummerPrincess"
-  | "SupplyDepot"
-  | "NewSupplyDepot"
-  | "PtImp"
-  | "BattleshipSummerPrincess"
-  | "HeavyCruiserSummerPrincess"
-  | "AnchorageWaterDemonVacationMode"
-  | "FrenchBattleshipPrincess"
-  | "DockPrincess"
-  | "SummerAircraftCarrierDemon";
+export interface EBonuses {
+  firepower: number;
+  torpedo: number;
+  anti_air: number;
+  armor: number;
+  evasion: number;
+  asw: number;
+  los: number;
+  bombing: number;
+  accuracy: number;
+  range: number;
+}
 
-export type SpecialEnemyType =
-  | "None"
-  | "SoftSkinned"
-  | "Pillbox"
-  | "IsolatedIsland"
-  | "SupplyDepot"
-  | "NewSupplyDepot"
-  | "HarbourSummerPrincess"
-  | "PtImp"
-  | "BattleshipSummerPrincess"
-  | "HeavyCruiserSummerPrincess"
-  | "FrenchBattleshipPrincess"
-  | "AnchorageWaterDemonVacationMode"
-  | "DockPrincess"
-  | "SummerAircraftCarrierDemon";
+export interface FleetCutinReport<T> {
+  cutin: FleetCutin;
+  rate: number | null;
+  formation: Formation;
+  attacks: FleetCutinAttackReport<T>[];
+}
+
+export interface FleetCutinAttackReport<T> extends AttackReport<T> {
+  index: number;
+  ship_id: number;
+  power_mod: number;
+}
+
+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>;
+}
 
 /**
  */
@@ -1295,6 +1294,11 @@ export class FhCore {
    * @returns {Org | undefined}
    */
   create_org(input?: OrgState): Org | undefined;
+  /**
+   * @param {number} ship_id
+   * @returns {ShipState | undefined}
+   */
+  create_ship_state_by_id(ship_id: number): ShipState | undefined;
   /**
    * @param {number} ship_id
    * @returns {Ship | undefined}

package/pkg/fleethub_core_bg.js

@@ -145,13 +145,6 @@ function getArrayJsValueFromWasm0(ptr, len) {
     return result;
 }
 
-function _assertClass(instance, klass) {
-    if (!(instance instanceof klass)) {
-        throw new Error(`expected instance of ${klass.name}`);
-    }
-    return instance.ptr;
-}
-
 let cachedFloat64Memory0 = null;
 
 function getFloat64Memory0() {
@@ -160,6 +153,13 @@ function getFloat64Memory0() {
     }
     return cachedFloat64Memory0;
 }
+
+function _assertClass(instance, klass) {
+    if (!(instance instanceof klass)) {
+        throw new Error(`expected instance of ${klass.name}`);
+    }
+    return instance.ptr;
+}
 /**
 * @param {ShipConditions} value
 * @returns {ShipConditions}
@@ -866,6 +866,14 @@ export class FhCore {
     }
     /**
     * @param {number} ship_id
+    * @returns {ShipState | undefined}
+    */
+    create_ship_state_by_id(ship_id) {
+        const ret = wasm.fhcore_create_ship_state_by_id(this.__wbg_ptr, ship_id);
+        return takeObject(ret);
+    }
+    /**
+    * @param {number} ship_id
     * @returns {Ship | undefined}
     */
     create_ship_by_id(ship_id) {
@@ -2951,17 +2959,17 @@ export function __wbindgen_string_new(arg0, arg1) {
     return addHeapObject(ret);
 };
 
-export function __wbindgen_is_undefined(arg0) {
-    const ret = getObject(arg0) === undefined;
-    return ret;
-};
-
 export function __wbg_ship_new(arg0) {
     const ret = Ship.__wrap(arg0);
     return addHeapObject(ret);
 };
 
-export function __wbg_createEquipmentBonuses_03da72c9fa1a8001(arg0, arg1) {
+export function __wbindgen_is_undefined(arg0) {
+    const ret = getObject(arg0) === undefined;
+    return ret;
+};
+
+export function __wbg_createEquipmentBonuses_144c688a77d7a9b3(arg0, arg1) {
     const ret = createEquipmentBonuses(takeObject(arg0), takeObject(arg1));
     return addHeapObject(ret);
 };

package/pkg/fleethub_core_bg.wasm.d.ts

@@ -1,19 +1,28 @@
 /* tslint:disable */
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
-export function __wbg_airsquadron_free(a: number): void;
-export function __wbg_get_airsquadron_id(a: number, b: number): void;
-export function __wbg_set_airsquadron_id(a: number, b: number, c: number): void;
-export function __wbg_get_airsquadron_hash(a: number): number;
-export function __wbg_set_airsquadron_hash(a: number, b: number): void;
-export function __wbg_get_airsquadron_mode(a: number): number;
-export function __wbg_set_airsquadron_mode(a: number, b: number): void;
-export function airsquadron_get_gear(a: number, b: number, c: number): number;
-export function airsquadron_get_slot_size(a: number, b: number, c: number): void;
-export function airsquadron_get_max_slot_size(a: number, b: number, c: number): void;
-export function airsquadron_fighter_power(a: number): number;
-export function airsquadron_interception_power(a: number): number;
-export function airsquadron_radius(a: number): number;
+export function __wbg_fleet_free(a: number): void;
+export function __wbg_get_fleet_id(a: number, b: number): void;
+export function __wbg_set_fleet_id(a: number, b: number, c: number): void;
+export function __wbg_get_fleet_hash(a: number): number;
+export function __wbg_get_fleet_len(a: number): number;
+export function fleet_meta(a: number): number;
+export function fleet_ship_keys(a: number, b: number): void;
+export function fleet_ship_ids(a: number, b: number): void;
+export function fleet_get_gear_ids_by_improvable(a: number, b: number): void;
+export function fleet_get_gear_ids_by_proficiency(a: number, b: number): void;
+export function fleet_get_damage_bound(a: number, b: number, c: number, d: number): number;
+export function fleet_get_remaining_fuel(a: number, b: number, c: number, d: number, e: number): number;
+export function fleet_get_remaining_ammo(a: number, b: number, c: number, d: number, e: number): number;
+export function fleet_count_ships(a: number): number;
+export function fleet_get_ship(a: number, b: number): number;
+export function fleet_fleet_los_mod(a: number, b: number): void;
+export function fleet_fighter_power(a: number, b: number, c: number): void;
+export function fleet_elos(a: number, b: number, c: number, d: number): void;
+export function fleet_aviation_detection_score(a: number, b: number): void;
+export function fleet_expedition_bonus(a: number): number;
+export function fleet_sum_ship_stat_by(a: number, b: number, c: number, d: number): void;
+export function fleet_reset_battle_state(a: number): void;
 export function __wbg_ship_free(a: number): void;
 export function __wbg_get_ship_id(a: number, b: number): void;
 export function __wbg_set_ship_id(a: number, b: number, c: number): void;
@@ -105,29 +114,20 @@ export function ship_basic_defense_power(a: number, b: number, c: number): void;
 export function ship_transport_point(a: number): number;
 export function ship_elos(a: number, b: number, c: number): void;
 export function ship_ohko_power(a: number, b: number): void;
+export function __wbg_airsquadron_free(a: number): void;
+export function __wbg_get_airsquadron_id(a: number, b: number): void;
+export function __wbg_set_airsquadron_id(a: number, b: number, c: number): void;
+export function __wbg_get_airsquadron_hash(a: number): number;
+export function __wbg_set_airsquadron_hash(a: number, b: number): void;
+export function __wbg_get_airsquadron_mode(a: number): number;
+export function __wbg_set_airsquadron_mode(a: number, b: number): void;
+export function airsquadron_get_gear(a: number, b: number, c: number): number;
+export function airsquadron_get_slot_size(a: number, b: number, c: number): void;
+export function airsquadron_get_max_slot_size(a: number, b: number, c: number): void;
+export function airsquadron_fighter_power(a: number): number;
+export function airsquadron_interception_power(a: number): number;
+export function airsquadron_radius(a: number): number;
 export function parse_ship_conditions(a: number): number;
-export function __wbg_fleet_free(a: number): void;
-export function __wbg_get_fleet_id(a: number, b: number): void;
-export function __wbg_set_fleet_id(a: number, b: number, c: number): void;
-export function __wbg_get_fleet_hash(a: number): number;
-export function __wbg_get_fleet_len(a: number): number;
-export function fleet_meta(a: number): number;
-export function fleet_ship_keys(a: number, b: number): void;
-export function fleet_ship_ids(a: number, b: number): void;
-export function fleet_get_gear_ids_by_improvable(a: number, b: number): void;
-export function fleet_get_gear_ids_by_proficiency(a: number, b: number): void;
-export function fleet_get_damage_bound(a: number, b: number, c: number, d: number): number;
-export function fleet_get_remaining_fuel(a: number, b: number, c: number, d: number, e: number): number;
-export function fleet_get_remaining_ammo(a: number, b: number, c: number, d: number, e: number): number;
-export function fleet_count_ships(a: number): number;
-export function fleet_get_ship(a: number, b: number): number;
-export function fleet_fleet_los_mod(a: number, b: number): void;
-export function fleet_fighter_power(a: number, b: number, c: number): void;
-export function fleet_elos(a: number, b: number, c: number, d: number): void;
-export function fleet_aviation_detection_score(a: number, b: number): void;
-export function fleet_expedition_bonus(a: number): number;
-export function fleet_sum_ship_stat_by(a: number, b: number, c: number, d: number): void;
-export function fleet_reset_battle_state(a: number): void;
 export function __wbg_comp_free(a: number): void;
 export function __wbg_get_comp_org_type(a: number): number;
 export function __wbg_get_comp_hq_level(a: number): number;
@@ -267,6 +267,7 @@ export function fhcore_create_ship(a: number, b: number): number;
 export function fhcore_create_air_squadron(a: number, b: number): number;
 export function fhcore_create_fleet(a: number, b: number): number;
 export function fhcore_create_org(a: number, b: number): number;
+export function fhcore_create_ship_state_by_id(a: number, b: number): number;
 export function fhcore_create_ship_by_id(a: number, b: number): number;
 export function fhcore_create_all_ships(a: number): number;
 export function fhcore_create_comp_by_map_enemy(a: number, b: number, c: number, d: number, e: number): number;