fleethub-core 1.11.17 → 1.11.19

package/node/fleethub_core.d.ts

@@ -8,19 +8,31 @@ export function parse_ship_conditions(value: ShipConditions): ShipConditions;
 /**
  */
 export function set_panic_hook(): void;
-export type GearTypeIdArray = [number, number, number, number, number];
+export interface CompAnalyzerConfig {
+  engagement: Engagement;
+  formation: Formation;
+  anti_air_cutin: number | null;
+  ship_anti_air_resist: number;
+  fleet_anti_air_resist: number;
+  left_night_fleet_conditions: NightFleetConditions;
+  right_night_fleet_conditions: NightFleetConditions;
+}
 
-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 CompNightAnalysis {
+  night_cutin: CompNightCutinAnalysis;
+  fleet_cutin: FleetCutinReport<NightAttackStyle>[];
+}
+
+export interface CompDayAnalysis {
+  day_cutin: CompDayCutinAnalysis;
+  fleet_cutin: FleetCutinReport<ShellingStyle>[];
+}
+
+export interface CompAnalysis {
+  day: CompDayAnalysis;
+  night: CompNightAnalysis;
+  contact: ContactAnalysis;
+  anti_air: CompAntiAirAnalysis;
 }
 
 export type AirSquadronMode = "Sortie" | "AirDefense";
@@ -39,10 +51,9 @@ export type AirState =
 
 export type AirStateRank = "Rank0" | "Rank1" | "Rank2" | "Rank3";
 
-export interface ShipConditions extends ShipPosition {
-  formation?: Formation;
-  amagiri_index?: number | null;
-}
+export type Engagement = "GreenT" | "Parallel" | "HeadOn" | "RedT";
+
+export type Role = "Main" | "Escort";
 
 export interface SupportShellingSimulatorParams {
   attacker_formation?: Formation;
@@ -51,8 +62,6 @@ export interface SupportShellingSimulatorParams {
   node_state: NodeState;
 }
 
-export type FhResult<T> = { Ok: T } | { Err: string };
-
 export interface MasterIBonuses {
   shelling_power: MasterIBonusRule[];
   shelling_accuracy: MasterIBonusRule[];
@@ -89,6 +98,7 @@ export interface AttackPower {
 }
 
 export interface AttackPowerParams {
+  is_cutin: boolean;
   basic: number;
   cap: number;
   precap_mod: AttackPowerModifier;
@@ -98,38 +108,12 @@ export interface AttackPowerParams {
   proficiency_critical_mod: number;
   armor_penetration: number;
   remaining_ammo_mod: number;
+  balloon_mod: number;
   special_enemy_mods: SpecialEnemyModifiers;
   historical_mod: AttackPowerModifier;
   custom_mods: CustomPowerModifiers;
 }
 
-export interface CompAnalyzerConfig {
-  engagement: Engagement;
-  formation: Formation;
-  anti_air_cutin: number | null;
-  ship_anti_air_resist: number;
-  fleet_anti_air_resist: number;
-  left_night_fleet_conditions: NightFleetConditions;
-  right_night_fleet_conditions: NightFleetConditions;
-}
-
-export interface CompNightAnalysis {
-  night_cutin: CompNightCutinAnalysis;
-  fleet_cutin: FleetCutinReport<NightAttackStyle>[];
-}
-
-export interface CompDayAnalysis {
-  day_cutin: CompDayCutinAnalysis;
-  fleet_cutin: FleetCutinReport<ShellingStyle>[];
-}
-
-export interface CompAnalysis {
-  day: CompDayAnalysis;
-  night: CompNightAnalysis;
-  contact: ContactAnalysis;
-  anti_air: CompAntiAirAnalysis;
-}
-
 export interface ActionReport<T> {
   data: Record<string, AttackReport<T>>;
   damage_state_density: Histogram<DamageState, number> | null;
@@ -187,8 +171,6 @@ export type ContactRank = "Rank1" | "Rank2" | "Rank3";
 
 export type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
 
-export type Engagement = "GreenT" | "Parallel" | "HeadOn" | "RedT";
-
 export interface FleetState {
   id?: string;
   len?: number;
@@ -216,6 +198,13 @@ export interface CompMeta {
   fleets: Record<FleetType, FleetMeta>;
 }
 
+export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
+
+export interface ShipConditions extends ShipPosition {
+  formation?: Formation;
+  amagiri_index?: number | null;
+}
+
 export type SpecialEnemyType =
   | "None"
   | "SoftSkinned"
@@ -232,6 +221,8 @@ export type SpecialEnemyType =
   | "DockPrincess"
   | "SummerAircraftCarrierDemon";
 
+export type FhResult<T> = { Ok: T } | { Err: string };
+
 export interface MasterData extends MasterBattleDefinitions {
   created_at: number;
   gears: MasterGear[];
@@ -253,37 +244,6 @@ export interface MasterAttrRule<T> {
   expr: CompiledEvaler;
 }
 
-export interface EquippabilityRule {
-  ship: CompiledEvaler;
-  keys?: string[];
-  include?: string;
-  exclude?: string;
-}
-
-export interface MasterEquippability {
-  equip_stype: EquipStype[];
-  equip_exslot: number[];
-  equip_ship: MstEquipShip[];
-  equip_exslot_ship: Record<number, MstEquipExslotShip>;
-  rules: EquippabilityRule[];
-}
-
-export interface MstEquipExslotShip {
-  api_ctypes: Record<number, number> | null;
-  api_ship_ids: Record<number, number> | null;
-  api_stypes: Record<number, number> | null;
-}
-
-export interface MstEquipShip {
-  api_ship_id: number;
-  api_equip_type: number[];
-}
-
-export interface EquipStype {
-  id: number;
-  equip_type: number[];
-}
-
 export interface MasterBattleDefinitions {
   formation: NestedFormationDef[];
   anti_air_cutin: AntiAirCutinDef[];
@@ -335,7 +295,12 @@ export interface DayCutinReport extends ActionReport<DayPhaseAttackStyle> {
   observation_term: number | null;
 }
 
-export type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
+export interface AttackAnalyzerShipConfig
+  extends ShipConditions,
+    NightFleetConditions {
+  balloons?: number;
+  fleet_los_mod?: number | null;
+}
 
 export type SingleFormation =
   | "LineAhead"
@@ -384,8 +349,6 @@ export type GearAttr =
   | "SemiNightPlane"
   | "HighAltitudeInterceptor";
 
-export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
-
 export interface OrgState {
   id?: string;
   f1?: FleetState;
@@ -412,55 +375,55 @@ export type OrgType =
   | "EnemySingle"
   | "EnemyCombined";
 
-export type Role = "Main" | "Escort";
+export interface EquippabilityRule {
+  ship: CompiledEvaler;
+  keys?: string[];
+  include?: string;
+  exclude?: string;
+}
 
-export type Histogram<K extends keyof any, V> = Partial<Record<K, V>>;
+export interface MasterEquippability {
+  equip_stype: EquipStype[];
+  equip_exslot: number[];
+  equip_ship: MstEquipShip[];
+  equip_exslot_ship: Record<number, MstEquipExslotShip>;
+  rules: EquippabilityRule[];
+}
 
-export interface SimulatorResult {
-  items: SimulatorResultItem[];
-  sunk_vec: [number, number, number][];
+export interface MstEquipExslotShip {
+  api_ctypes: Record<number, number> | null;
+  api_ship_ids: Record<number, number> | null;
+  api_stypes: Record<number, number> | null;
 }
 
-export interface SimulatorResultItem {
-  id: string;
-  fleet_type: FleetType;
-  index: number;
-  damage_state_map: Record<DamageState, number>;
+export interface MstEquipShip {
+  api_ship_id: number;
+  api_equip_type: 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 EquipStype {
+  id: number;
+  equip_type: number[];
 }
 
-export interface AttackAnalyzerShipConfig
-  extends ShipConditions,
-    NightFleetConditions {
-  fleet_los_mod?: number | null;
+export interface NodeAttackAnalyzerShipConfig extends NightFleetConditions {
+  formation?: Formation;
+  balloons?: number;
 }
 
-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 FormationCombatModifiersDef {
@@ -536,6 +499,8 @@ export interface BattleDefinitions {
   historical_bonuses: HistoricalBonusDef[];
 }
 
+export type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
+
 export interface ShipPosition {
   org_type?: OrgType;
   fleet_type?: FleetType;
@@ -543,6 +508,49 @@ 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 NodeId = string;
+
+export interface NodeState {
+  map?: number;
+  node?: NodeId;
+  phase?: number;
+  debuff?: boolean;
+  disable_historical_mod?: boolean;
+  landing_battle?: boolean;
+}
+
+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 HitRate {
@@ -567,37 +575,33 @@ export interface ShipAnalyzerConfig {
   right?: AttackAnalyzerShipConfig;
 }
 
-export interface NodeAttackAnalyzerShipConfig extends NightFleetConditions {
-  formation?: Formation;
-}
-
-export interface NodeAttackAnalyzerConfig {
-  air_state?: AirState;
-  engagement?: Engagement;
-  node_state?: NodeState;
-  left?: NodeAttackAnalyzerShipConfig;
-  right?: NodeAttackAnalyzerShipConfig;
-}
-
-export interface NodeAttackAnalysis {
-  left: AttackAnalysis;
-  right: AttackAnalysis;
-  shelling_fleet_cutin: FleetCutinReport<ShellingStyle>[];
-  night_fleet_cutin: FleetCutinReport<NightAttackStyle>[];
+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 ContactAnalysis {
-  single: DayContactChance[] | null;
-  combined: DayContactChance[] | null;
+export interface CompAntiAirAnalysis {
+  fleet_adjusted_anti_air: number;
+  ships: AntiAirReport[];
+  anti_air_cutin_chance: [number, number][];
 }
 
-export interface DayContactChance {
-  air_state: AirState;
-  trigger_rate: number;
-  rank3: number;
-  rank2: number;
-  rank1: number;
-  total: number;
+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 type AirWaveType = "Jet" | "LandBase" | "Carrier";
@@ -627,20 +631,6 @@ export type NightPhaseAttackType =
 
 export type TorpedoAttackType = null;
 
-export type NodeId = string;
-
-export interface NodeState {
-  map?: number;
-  node?: NodeId;
-  phase?: number;
-  debuff?: boolean;
-  disable_historical_mod?: boolean;
-}
-
-export type Side = "Player" | "Enemy";
-
-export type Align = "Left" | "Right";
-
 export interface MoveShipPayload {
   current: [string, string, ShipKey];
   target: [string | null, string, ShipKey];
@@ -986,6 +976,8 @@ export type ShipType =
   | "CT"
   | "AO";
 
+export type GearTypeIdArray = [number, number, number, number, number];
+
 export type GearVecInput = GearInput[];
 
 export interface GearInput {
@@ -1039,6 +1031,19 @@ export interface FleetCutinAttackReport<T> extends AttackReport<T> {
   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>;
+}
+
 /**
  */
 export class AirSquadron {
@@ -1234,6 +1239,10 @@ export class Comp {
    * @returns {number | undefined}
    */
   fleet_los_mod(fleet_type: FleetType): number | undefined;
+  /**
+   * @returns {number}
+   */
+  balloons(): number;
   /**
    */
   boss_sup?: Fleet;
@@ -1286,6 +1295,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}
@@ -1526,6 +1540,10 @@ export class Gear {
    * @returns {boolean}
    */
   can_be_deployed_to_land_base(): boolean;
+  /**
+   * @returns {boolean}
+   */
+  is_balloon(): boolean;
   /**
    */
   readonly accuracy: number;

package/node/fleethub_core.js

@@ -769,6 +769,13 @@ class Comp {
             wasm.__wbindgen_add_to_stack_pointer(16);
         }
     }
+    /**
+    * @returns {number}
+    */
+    balloons() {
+        const ret = wasm.comp_balloons(this.__wbg_ptr);
+        return ret >>> 0;
+    }
 }
 module.exports.Comp = Comp;
 
@@ -856,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) {
@@ -1674,6 +1689,13 @@ class Gear {
         const ret = wasm.gear_can_be_deployed_to_land_base(this.__wbg_ptr);
         return ret !== 0;
     }
+    /**
+    * @returns {boolean}
+    */
+    is_balloon() {
+        const ret = wasm.gear_is_balloon(this.__wbg_ptr);
+        return ret !== 0;
+    }
 }
 module.exports.Gear = Gear;
 
@@ -2949,7 +2971,7 @@ module.exports.__wbg_ship_new = function(arg0) {
     return addHeapObject(ret);
 };
 
-module.exports.__wbg_createEquipmentBonuses_f047a201d43cb33d = function(arg0, arg1) {
+module.exports.__wbg_createEquipmentBonuses_9b9d0a315ee50a1e = function(arg0, arg1) {
     const ret = createEquipmentBonuses(takeObject(arg0), takeObject(arg1));
     return addHeapObject(ret);
 };

package/node/fleethub_core_bg.wasm.d.ts

@@ -128,6 +128,37 @@ 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_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;
+export function __wbg_get_comp_main(a: number): number;
+export function __wbg_set_comp_main(a: number, b: number): void;
+export function __wbg_get_comp_escort(a: number): number;
+export function __wbg_set_comp_escort(a: number, b: number): void;
+export function __wbg_get_comp_route_sup(a: number): number;
+export function __wbg_set_comp_route_sup(a: number, b: number): void;
+export function __wbg_get_comp_boss_sup(a: number): number;
+export function __wbg_set_comp_boss_sup(a: number, b: number): void;
+export function comp_side(a: number): number;
+export function comp_is_combined(a: number): number;
+export function comp_is_player(a: number): number;
+export function comp_is_enemy(a: number): number;
+export function comp_has_ship_eid(a: number, b: number, c: number): number;
+export function comp_first_ship_id(a: number, b: number): void;
+export function comp_has_route_sup(a: number): number;
+export function comp_meta(a: number): number;
+export function comp_get_fleet_id(a: number, b: number, c: number): void;
+export function comp_get_ship_with_clone(a: number, b: number, c: number): number;
+export function comp_get_ship_entity_id(a: number, b: number, c: number, d: number): void;
+export function comp_get_ship_by_eid_with_clone(a: number, b: number, c: number): number;
+export function comp_default_formation(a: number): number;
+export function comp_adjusted_anti_air(a: number, b: number): number;
+export function comp_fighter_power(a: number, b: number, c: number, d: number): void;
+export function comp_elos(a: number, b: number, c: number): void;
+export function comp_transport_point(a: number): number;
+export function comp_get_ship_conditions(a: number, b: number, c: number): number;
+export function comp_fleet_los_mod(a: number, b: number, c: number): void;
+export function comp_balloons(a: number): number;
 export function __wbg_gear_free(a: number): void;
 export function __wbg_get_gear_id(a: number, b: number): void;
 export function __wbg_set_gear_id(a: number, b: number, c: number): void;
@@ -189,37 +220,8 @@ export function gear_is_abyssal_cuttlefish_torpedo(a: number): number;
 export function gear_is_abyssal_patrolling_attack_hawk(a: number): number;
 export function gear_expedition_bonus(a: number): number;
 export function gear_can_be_deployed_to_land_base(a: number): number;
+export function gear_is_balloon(a: number): number;
 export function gear_has_proficiency(a: number): number;
-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;
-export function __wbg_get_comp_main(a: number): number;
-export function __wbg_set_comp_main(a: number, b: number): void;
-export function __wbg_get_comp_escort(a: number): number;
-export function __wbg_set_comp_escort(a: number, b: number): void;
-export function __wbg_get_comp_route_sup(a: number): number;
-export function __wbg_set_comp_route_sup(a: number, b: number): void;
-export function __wbg_get_comp_boss_sup(a: number): number;
-export function __wbg_set_comp_boss_sup(a: number, b: number): void;
-export function comp_side(a: number): number;
-export function comp_is_combined(a: number): number;
-export function comp_is_player(a: number): number;
-export function comp_is_enemy(a: number): number;
-export function comp_has_ship_eid(a: number, b: number, c: number): number;
-export function comp_first_ship_id(a: number, b: number): void;
-export function comp_has_route_sup(a: number): number;
-export function comp_meta(a: number): number;
-export function comp_get_fleet_id(a: number, b: number, c: number): void;
-export function comp_get_ship_with_clone(a: number, b: number, c: number): number;
-export function comp_get_ship_entity_id(a: number, b: number, c: number, d: number): void;
-export function comp_get_ship_by_eid_with_clone(a: number, b: number, c: number): number;
-export function comp_default_formation(a: number): number;
-export function comp_adjusted_anti_air(a: number, b: number): number;
-export function comp_fighter_power(a: number, b: number, c: number, d: number): void;
-export function comp_elos(a: number, b: number, c: number): void;
-export function comp_transport_point(a: number): number;
-export function comp_get_ship_conditions(a: number, b: number, c: number): number;
-export function comp_fleet_los_mod(a: number, b: number, c: number): void;
 export function set_panic_hook(): void;
 export function ship_state_day_gunfit_accuracy(a: number, b: number): void;
 export function ship_state_night_gunfit_accuracy(a: number, b: number): void;
@@ -265,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.17",
+  "version": "1.11.19",
   "license": "UNLICENSED",
   "exports": {
     "import": "./pkg/fleethub_core.js",

package/pkg/fleethub_core.d.ts

@@ -8,19 +8,31 @@ export function parse_ship_conditions(value: ShipConditions): ShipConditions;
 /**
  */
 export function set_panic_hook(): void;
-export type GearTypeIdArray = [number, number, number, number, number];
+export interface CompAnalyzerConfig {
+  engagement: Engagement;
+  formation: Formation;
+  anti_air_cutin: number | null;
+  ship_anti_air_resist: number;
+  fleet_anti_air_resist: number;
+  left_night_fleet_conditions: NightFleetConditions;
+  right_night_fleet_conditions: NightFleetConditions;
+}
 
-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 CompNightAnalysis {
+  night_cutin: CompNightCutinAnalysis;
+  fleet_cutin: FleetCutinReport<NightAttackStyle>[];
+}
+
+export interface CompDayAnalysis {
+  day_cutin: CompDayCutinAnalysis;
+  fleet_cutin: FleetCutinReport<ShellingStyle>[];
+}
+
+export interface CompAnalysis {
+  day: CompDayAnalysis;
+  night: CompNightAnalysis;
+  contact: ContactAnalysis;
+  anti_air: CompAntiAirAnalysis;
 }
 
 export type AirSquadronMode = "Sortie" | "AirDefense";
@@ -39,10 +51,9 @@ export type AirState =
 
 export type AirStateRank = "Rank0" | "Rank1" | "Rank2" | "Rank3";
 
-export interface ShipConditions extends ShipPosition {
-  formation?: Formation;
-  amagiri_index?: number | null;
-}
+export type Engagement = "GreenT" | "Parallel" | "HeadOn" | "RedT";
+
+export type Role = "Main" | "Escort";
 
 export interface SupportShellingSimulatorParams {
   attacker_formation?: Formation;
@@ -51,8 +62,6 @@ export interface SupportShellingSimulatorParams {
   node_state: NodeState;
 }
 
-export type FhResult<T> = { Ok: T } | { Err: string };
-
 export interface MasterIBonuses {
   shelling_power: MasterIBonusRule[];
   shelling_accuracy: MasterIBonusRule[];
@@ -89,6 +98,7 @@ export interface AttackPower {
 }
 
 export interface AttackPowerParams {
+  is_cutin: boolean;
   basic: number;
   cap: number;
   precap_mod: AttackPowerModifier;
@@ -98,38 +108,12 @@ export interface AttackPowerParams {
   proficiency_critical_mod: number;
   armor_penetration: number;
   remaining_ammo_mod: number;
+  balloon_mod: number;
   special_enemy_mods: SpecialEnemyModifiers;
   historical_mod: AttackPowerModifier;
   custom_mods: CustomPowerModifiers;
 }
 
-export interface CompAnalyzerConfig {
-  engagement: Engagement;
-  formation: Formation;
-  anti_air_cutin: number | null;
-  ship_anti_air_resist: number;
-  fleet_anti_air_resist: number;
-  left_night_fleet_conditions: NightFleetConditions;
-  right_night_fleet_conditions: NightFleetConditions;
-}
-
-export interface CompNightAnalysis {
-  night_cutin: CompNightCutinAnalysis;
-  fleet_cutin: FleetCutinReport<NightAttackStyle>[];
-}
-
-export interface CompDayAnalysis {
-  day_cutin: CompDayCutinAnalysis;
-  fleet_cutin: FleetCutinReport<ShellingStyle>[];
-}
-
-export interface CompAnalysis {
-  day: CompDayAnalysis;
-  night: CompNightAnalysis;
-  contact: ContactAnalysis;
-  anti_air: CompAntiAirAnalysis;
-}
-
 export interface ActionReport<T> {
   data: Record<string, AttackReport<T>>;
   damage_state_density: Histogram<DamageState, number> | null;
@@ -187,8 +171,6 @@ export type ContactRank = "Rank1" | "Rank2" | "Rank3";
 
 export type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
 
-export type Engagement = "GreenT" | "Parallel" | "HeadOn" | "RedT";
-
 export interface FleetState {
   id?: string;
   len?: number;
@@ -216,6 +198,13 @@ export interface CompMeta {
   fleets: Record<FleetType, FleetMeta>;
 }
 
+export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
+
+export interface ShipConditions extends ShipPosition {
+  formation?: Formation;
+  amagiri_index?: number | null;
+}
+
 export type SpecialEnemyType =
   | "None"
   | "SoftSkinned"
@@ -232,6 +221,8 @@ export type SpecialEnemyType =
   | "DockPrincess"
   | "SummerAircraftCarrierDemon";
 
+export type FhResult<T> = { Ok: T } | { Err: string };
+
 export interface MasterData extends MasterBattleDefinitions {
   created_at: number;
   gears: MasterGear[];
@@ -253,37 +244,6 @@ export interface MasterAttrRule<T> {
   expr: CompiledEvaler;
 }
 
-export interface EquippabilityRule {
-  ship: CompiledEvaler;
-  keys?: string[];
-  include?: string;
-  exclude?: string;
-}
-
-export interface MasterEquippability {
-  equip_stype: EquipStype[];
-  equip_exslot: number[];
-  equip_ship: MstEquipShip[];
-  equip_exslot_ship: Record<number, MstEquipExslotShip>;
-  rules: EquippabilityRule[];
-}
-
-export interface MstEquipExslotShip {
-  api_ctypes: Record<number, number> | null;
-  api_ship_ids: Record<number, number> | null;
-  api_stypes: Record<number, number> | null;
-}
-
-export interface MstEquipShip {
-  api_ship_id: number;
-  api_equip_type: number[];
-}
-
-export interface EquipStype {
-  id: number;
-  equip_type: number[];
-}
-
 export interface MasterBattleDefinitions {
   formation: NestedFormationDef[];
   anti_air_cutin: AntiAirCutinDef[];
@@ -335,7 +295,12 @@ export interface DayCutinReport extends ActionReport<DayPhaseAttackStyle> {
   observation_term: number | null;
 }
 
-export type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
+export interface AttackAnalyzerShipConfig
+  extends ShipConditions,
+    NightFleetConditions {
+  balloons?: number;
+  fleet_los_mod?: number | null;
+}
 
 export type SingleFormation =
   | "LineAhead"
@@ -384,8 +349,6 @@ export type GearAttr =
   | "SemiNightPlane"
   | "HighAltitudeInterceptor";
 
-export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
-
 export interface OrgState {
   id?: string;
   f1?: FleetState;
@@ -412,55 +375,55 @@ export type OrgType =
   | "EnemySingle"
   | "EnemyCombined";
 
-export type Role = "Main" | "Escort";
+export interface EquippabilityRule {
+  ship: CompiledEvaler;
+  keys?: string[];
+  include?: string;
+  exclude?: string;
+}
 
-export type Histogram<K extends keyof any, V> = Partial<Record<K, V>>;
+export interface MasterEquippability {
+  equip_stype: EquipStype[];
+  equip_exslot: number[];
+  equip_ship: MstEquipShip[];
+  equip_exslot_ship: Record<number, MstEquipExslotShip>;
+  rules: EquippabilityRule[];
+}
 
-export interface SimulatorResult {
-  items: SimulatorResultItem[];
-  sunk_vec: [number, number, number][];
+export interface MstEquipExslotShip {
+  api_ctypes: Record<number, number> | null;
+  api_ship_ids: Record<number, number> | null;
+  api_stypes: Record<number, number> | null;
 }
 
-export interface SimulatorResultItem {
-  id: string;
-  fleet_type: FleetType;
-  index: number;
-  damage_state_map: Record<DamageState, number>;
+export interface MstEquipShip {
+  api_ship_id: number;
+  api_equip_type: 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 EquipStype {
+  id: number;
+  equip_type: number[];
 }
 
-export interface AttackAnalyzerShipConfig
-  extends ShipConditions,
-    NightFleetConditions {
-  fleet_los_mod?: number | null;
+export interface NodeAttackAnalyzerShipConfig extends NightFleetConditions {
+  formation?: Formation;
+  balloons?: number;
 }
 
-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 FormationCombatModifiersDef {
@@ -536,6 +499,8 @@ export interface BattleDefinitions {
   historical_bonuses: HistoricalBonusDef[];
 }
 
+export type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
+
 export interface ShipPosition {
   org_type?: OrgType;
   fleet_type?: FleetType;
@@ -543,6 +508,49 @@ 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 NodeId = string;
+
+export interface NodeState {
+  map?: number;
+  node?: NodeId;
+  phase?: number;
+  debuff?: boolean;
+  disable_historical_mod?: boolean;
+  landing_battle?: boolean;
+}
+
+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 HitRate {
@@ -567,37 +575,33 @@ export interface ShipAnalyzerConfig {
   right?: AttackAnalyzerShipConfig;
 }
 
-export interface NodeAttackAnalyzerShipConfig extends NightFleetConditions {
-  formation?: Formation;
-}
-
-export interface NodeAttackAnalyzerConfig {
-  air_state?: AirState;
-  engagement?: Engagement;
-  node_state?: NodeState;
-  left?: NodeAttackAnalyzerShipConfig;
-  right?: NodeAttackAnalyzerShipConfig;
-}
-
-export interface NodeAttackAnalysis {
-  left: AttackAnalysis;
-  right: AttackAnalysis;
-  shelling_fleet_cutin: FleetCutinReport<ShellingStyle>[];
-  night_fleet_cutin: FleetCutinReport<NightAttackStyle>[];
+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 ContactAnalysis {
-  single: DayContactChance[] | null;
-  combined: DayContactChance[] | null;
+export interface CompAntiAirAnalysis {
+  fleet_adjusted_anti_air: number;
+  ships: AntiAirReport[];
+  anti_air_cutin_chance: [number, number][];
 }
 
-export interface DayContactChance {
-  air_state: AirState;
-  trigger_rate: number;
-  rank3: number;
-  rank2: number;
-  rank1: number;
-  total: number;
+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 type AirWaveType = "Jet" | "LandBase" | "Carrier";
@@ -627,20 +631,6 @@ export type NightPhaseAttackType =
 
 export type TorpedoAttackType = null;
 
-export type NodeId = string;
-
-export interface NodeState {
-  map?: number;
-  node?: NodeId;
-  phase?: number;
-  debuff?: boolean;
-  disable_historical_mod?: boolean;
-}
-
-export type Side = "Player" | "Enemy";
-
-export type Align = "Left" | "Right";
-
 export interface MoveShipPayload {
   current: [string, string, ShipKey];
   target: [string | null, string, ShipKey];
@@ -986,6 +976,8 @@ export type ShipType =
   | "CT"
   | "AO";
 
+export type GearTypeIdArray = [number, number, number, number, number];
+
 export type GearVecInput = GearInput[];
 
 export interface GearInput {
@@ -1039,6 +1031,19 @@ export interface FleetCutinAttackReport<T> extends AttackReport<T> {
   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>;
+}
+
 /**
  */
 export class AirSquadron {
@@ -1234,6 +1239,10 @@ export class Comp {
    * @returns {number | undefined}
    */
   fleet_los_mod(fleet_type: FleetType): number | undefined;
+  /**
+   * @returns {number}
+   */
+  balloons(): number;
   /**
    */
   boss_sup?: Fleet;
@@ -1286,6 +1295,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}
@@ -1526,6 +1540,10 @@ export class Gear {
    * @returns {boolean}
    */
   can_be_deployed_to_land_base(): boolean;
+  /**
+   * @returns {boolean}
+   */
+  is_balloon(): boolean;
   /**
    */
   readonly accuracy: number;

package/pkg/fleethub_core_bg.js

@@ -773,6 +773,13 @@ export class Comp {
             wasm.__wbindgen_add_to_stack_pointer(16);
         }
     }
+    /**
+    * @returns {number}
+    */
+    balloons() {
+        const ret = wasm.comp_balloons(this.__wbg_ptr);
+        return ret >>> 0;
+    }
 }
 
 const FhCoreFinalization = new FinalizationRegistry(ptr => wasm.__wbg_fhcore_free(ptr >>> 0));
@@ -859,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) {
@@ -1675,6 +1690,13 @@ export class Gear {
         const ret = wasm.gear_can_be_deployed_to_land_base(this.__wbg_ptr);
         return ret !== 0;
     }
+    /**
+    * @returns {boolean}
+    */
+    is_balloon() {
+        const ret = wasm.gear_is_balloon(this.__wbg_ptr);
+        return ret !== 0;
+    }
 }
 
 const OrgFinalization = new FinalizationRegistry(ptr => wasm.__wbg_org_free(ptr >>> 0));
@@ -2947,7 +2969,7 @@ export function __wbg_ship_new(arg0) {
     return addHeapObject(ret);
 };
 
-export function __wbg_createEquipmentBonuses_f047a201d43cb33d(arg0, arg1) {
+export function __wbg_createEquipmentBonuses_9b9d0a315ee50a1e(arg0, arg1) {
     const ret = createEquipmentBonuses(takeObject(arg0), takeObject(arg1));
     return addHeapObject(ret);
 };

package/pkg/fleethub_core_bg.wasm.d.ts

@@ -128,6 +128,37 @@ 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_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;
+export function __wbg_get_comp_main(a: number): number;
+export function __wbg_set_comp_main(a: number, b: number): void;
+export function __wbg_get_comp_escort(a: number): number;
+export function __wbg_set_comp_escort(a: number, b: number): void;
+export function __wbg_get_comp_route_sup(a: number): number;
+export function __wbg_set_comp_route_sup(a: number, b: number): void;
+export function __wbg_get_comp_boss_sup(a: number): number;
+export function __wbg_set_comp_boss_sup(a: number, b: number): void;
+export function comp_side(a: number): number;
+export function comp_is_combined(a: number): number;
+export function comp_is_player(a: number): number;
+export function comp_is_enemy(a: number): number;
+export function comp_has_ship_eid(a: number, b: number, c: number): number;
+export function comp_first_ship_id(a: number, b: number): void;
+export function comp_has_route_sup(a: number): number;
+export function comp_meta(a: number): number;
+export function comp_get_fleet_id(a: number, b: number, c: number): void;
+export function comp_get_ship_with_clone(a: number, b: number, c: number): number;
+export function comp_get_ship_entity_id(a: number, b: number, c: number, d: number): void;
+export function comp_get_ship_by_eid_with_clone(a: number, b: number, c: number): number;
+export function comp_default_formation(a: number): number;
+export function comp_adjusted_anti_air(a: number, b: number): number;
+export function comp_fighter_power(a: number, b: number, c: number, d: number): void;
+export function comp_elos(a: number, b: number, c: number): void;
+export function comp_transport_point(a: number): number;
+export function comp_get_ship_conditions(a: number, b: number, c: number): number;
+export function comp_fleet_los_mod(a: number, b: number, c: number): void;
+export function comp_balloons(a: number): number;
 export function __wbg_gear_free(a: number): void;
 export function __wbg_get_gear_id(a: number, b: number): void;
 export function __wbg_set_gear_id(a: number, b: number, c: number): void;
@@ -189,37 +220,8 @@ export function gear_is_abyssal_cuttlefish_torpedo(a: number): number;
 export function gear_is_abyssal_patrolling_attack_hawk(a: number): number;
 export function gear_expedition_bonus(a: number): number;
 export function gear_can_be_deployed_to_land_base(a: number): number;
+export function gear_is_balloon(a: number): number;
 export function gear_has_proficiency(a: number): number;
-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;
-export function __wbg_get_comp_main(a: number): number;
-export function __wbg_set_comp_main(a: number, b: number): void;
-export function __wbg_get_comp_escort(a: number): number;
-export function __wbg_set_comp_escort(a: number, b: number): void;
-export function __wbg_get_comp_route_sup(a: number): number;
-export function __wbg_set_comp_route_sup(a: number, b: number): void;
-export function __wbg_get_comp_boss_sup(a: number): number;
-export function __wbg_set_comp_boss_sup(a: number, b: number): void;
-export function comp_side(a: number): number;
-export function comp_is_combined(a: number): number;
-export function comp_is_player(a: number): number;
-export function comp_is_enemy(a: number): number;
-export function comp_has_ship_eid(a: number, b: number, c: number): number;
-export function comp_first_ship_id(a: number, b: number): void;
-export function comp_has_route_sup(a: number): number;
-export function comp_meta(a: number): number;
-export function comp_get_fleet_id(a: number, b: number, c: number): void;
-export function comp_get_ship_with_clone(a: number, b: number, c: number): number;
-export function comp_get_ship_entity_id(a: number, b: number, c: number, d: number): void;
-export function comp_get_ship_by_eid_with_clone(a: number, b: number, c: number): number;
-export function comp_default_formation(a: number): number;
-export function comp_adjusted_anti_air(a: number, b: number): number;
-export function comp_fighter_power(a: number, b: number, c: number, d: number): void;
-export function comp_elos(a: number, b: number, c: number): void;
-export function comp_transport_point(a: number): number;
-export function comp_get_ship_conditions(a: number, b: number, c: number): number;
-export function comp_fleet_los_mod(a: number, b: number, c: number): void;
 export function set_panic_hook(): void;
 export function ship_state_day_gunfit_accuracy(a: number, b: number): void;
 export function ship_state_night_gunfit_accuracy(a: number, b: number): void;
@@ -265,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;