fleethub-core 1.7.3 → 1.7.5

package/node/fleethub_core.d.ts

@@ -54,16 +54,43 @@ export type DayCutin =
   | "Zuiun"
   | "AirSea";
 
-export interface ShellingSupportSimulatorParams {
-  attacker_formation: Formation;
-  target_formation: Formation;
-  engagement: Engagement;
-  custom_mods: CustomModifiers;
+export type ShellingAttackType = "Normal" | "Carrier";
+
+export interface FleetCutinAnalysis {
+  shelling: FleetCutinInfo[];
+  night: FleetCutinInfo[];
 }
 
-export type ShellingAttackType = "Normal" | "Carrier";
+export interface FleetCutinInfo {
+  cutin: FleetCutin;
+  rate: number | null;
+  formation: Formation;
+  items: FleetCutinInfoItem[];
+}
 
-export type AirWaveType = "Jet" | "LandBase" | "Carrier";
+export interface FleetCutinInfoItem {
+  ship_id: number;
+  cutin: FleetCutin;
+  fleet_cutin_mod: number;
+  stats: AttackStats;
+}
+
+export type SpecialEnemyType =
+  | "None"
+  | "SoftSkinned"
+  | "Pillbox"
+  | "IsolatedIsland"
+  | "SupplyDepot"
+  | "HarbourSummerPrincess"
+  | "PtImp"
+  | "BattleshipSummerPrincess"
+  | "HeavyCruiserSummerPrincess";
+
+export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
+
+export type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
+
+export type SpeedGroup = "A" | "B1" | "B2" | "C";
 
 export type AswAttackType = "DepthCharge" | "Aircraft";
 
@@ -83,22 +110,11 @@ export type FleetCutin =
   | "Yamato2ShipCutin"
   | "Yamato3ShipCutin";
 
-export interface WarfareContext {
-  attacker_env: WarfareShipEnvironment;
-  target_env: WarfareShipEnvironment;
-  engagement: Engagement;
-  air_state: AirState;
-  custom_mods: CustomModifiers;
-}
+export type AirWaveType = "Jet" | "LandBase" | "Carrier";
 
-export interface WarfareShipEnvironment {
-  org_type: OrgType;
-  role: Role;
-  ship_index: number;
-  fleet_len: number;
-  formation: Formation;
-  fleet_los_mod: number | null;
-}
+export type NumMap<K, V> = Partial<Record<K, V>>;
+
+export type Role = "Main" | "Escort";
 
 export interface CompMeta {
   fleets: Record<FleetType, FleetMeta>;
@@ -115,52 +131,6 @@ export interface ShipMeta {
   ship_id: number;
 }
 
-export interface AttackPower {
-  precap: number;
-  is_capped: boolean;
-  capped: number;
-  normal: number;
-  critical: number;
-  armor_penetration: number;
-  remaining_ammo_mod: number;
-}
-
-export interface AttackPowerParams {
-  basic: number;
-  cap: number;
-  precap_mod: AttackPowerModifier;
-  postcap_mod: AttackPowerModifier;
-  ap_shell_mod: number | null;
-  carrier_power: number | null;
-  proficiency_critical_mod: number | null;
-  armor_penetration: number;
-  remaining_ammo_mod: number;
-  special_enemy_mods: SpecialEnemyModifiers;
-  custom_mods: CustomModifiers;
-}
-
-export interface CustomModifiers {
-  precap_mod?: AttackPowerModifier;
-  postcap_mod?: AttackPowerModifier;
-  basic_power_mod?: AttackPowerModifier;
-}
-
-export interface SpecialEnemyModifiers {
-  precap_general_mod: AttackPowerModifier;
-  stype_mod: AttackPowerModifier;
-  landing_craft_synergy_mod: AttackPowerModifier;
-  toku_daihatsu_tank_mod: AttackPowerModifier;
-  m4a1dd_mod: AttackPowerModifier;
-  honi_mod: AttackPowerModifier;
-  postcap_general_mod: AttackPowerModifier;
-  pt_mod: AttackPowerModifier;
-}
-
-export interface AttackPowerModifier {
-  a: number;
-  b: number;
-}
-
 export interface MasterData {
   gears: MasterGear[];
   gear_attrs: MasterAttrRule<GearAttr>[];
@@ -187,6 +157,22 @@ export interface MasterAttrRule<T> {
   expr: string;
 }
 
+export interface WarfareContext {
+  attacker_env: WarfareShipEnvironment;
+  target_env: WarfareShipEnvironment;
+  engagement: Engagement;
+  air_state: AirState;
+}
+
+export interface WarfareShipEnvironment {
+  org_type: OrgType;
+  role: Role;
+  ship_index: number;
+  fleet_len: number;
+  formation: Formation;
+  fleet_los_mod: number | null;
+}
+
 export interface CompDayCutinRateInfo {
   main: FleetDayCutinRateInfo;
   escort: FleetDayCutinRateInfo | null;
@@ -209,10 +195,6 @@ export interface DayCutinRateInfo {
   total_cutin_rate: number | null;
 }
 
-export type NumMap<K, V> = Partial<Record<K, V>>;
-
-export type Role = "Main" | "Escort";
-
 export type GearCategory =
   | "Fighter"
   | "Bomber"
@@ -339,6 +321,12 @@ export type AirState =
   | "AirDenial"
   | "AirIncapability";
 
+export interface ShellingSupportSimulatorParams {
+  attacker_formation: Formation;
+  target_formation: Formation;
+  engagement: Engagement;
+}
+
 export interface MasterIBonuses {
   shelling_power: MasterIBonusRule[];
   carrier_shelling_power: MasterIBonusRule[];
@@ -369,25 +357,6 @@ export interface NightSituation {
   searchlight: boolean;
 }
 
-export interface FleetCutinAnalysis {
-  shelling: FleetCutinInfo[];
-  night: FleetCutinInfo[];
-}
-
-export interface FleetCutinInfo {
-  cutin: FleetCutin;
-  rate: number | null;
-  formation: Formation;
-  items: FleetCutinInfoItem[];
-}
-
-export interface FleetCutinInfoItem {
-  ship_id: number;
-  cutin: FleetCutin;
-  fleet_cutin_mod: number;
-  stats: AttackStats;
-}
-
 export interface DamageInfo {
   miss_damage_min: number;
   miss_damage_max: number;
@@ -417,37 +386,6 @@ export type ShipAttr =
   | "BattleshipSummerPrincess"
   | "HeavyCruiserSummerPrincess";
 
-export type GearAttr =
-  | "Unknown"
-  | "Abyssal"
-  | "HighAngleMount"
-  | "NightFighter"
-  | "NightAttacker"
-  | "HeavyBomber"
-  | "MainGun"
-  | "Radar"
-  | "SurfaceRadar"
-  | "AirRadar"
-  | "DepthChargeProjector"
-  | "SynergisticDepthCharge"
-  | "AntiSubMortar"
-  | "AntiSubWeapon"
-  | "AntiSubAircraft"
-  | "LateModelBowTorpedo"
-  | "Seaplane"
-  | "CbAircraft"
-  | "LbAircraft"
-  | "JetAircraft"
-  | "Fighter"
-  | "Recon"
-  | "ObservationSeaplane"
-  | "CbFighterBomber"
-  | "AntiInstDiveBomber"
-  | "NightRecon"
-  | "CbSwordfish"
-  | "SemiNightPlane"
-  | "HighAltitudeInterceptor";
-
 export type Formation = SingleFormation | CombinedFormation;
 
 export type CombinedFormation =
@@ -464,6 +402,63 @@ export type SingleFormation =
   | "LineAbreast"
   | "Vanguard";
 
+export interface CustomPowerModifiers {
+  precap_mod?: AttackPowerModifier;
+  postcap_mod?: AttackPowerModifier;
+  basic_power_mod?: AttackPowerModifier;
+}
+
+export interface SpecialEnemyModifiers {
+  precap_general_mod: AttackPowerModifier;
+  stype_mod: AttackPowerModifier;
+  landing_craft_synergy_mod: AttackPowerModifier;
+  toku_daihatsu_tank_mod: AttackPowerModifier;
+  m4a1dd_mod: AttackPowerModifier;
+  honi_mod: AttackPowerModifier;
+  postcap_general_mod: AttackPowerModifier;
+  pt_mod: AttackPowerModifier;
+}
+
+export interface AttackPowerModifier {
+  a?: number;
+  b?: number;
+}
+
+export interface AttackPower {
+  precap: number;
+  is_capped: boolean;
+  capped: number;
+  normal: number;
+  critical: number;
+  armor_penetration: number;
+  remaining_ammo_mod: number;
+}
+
+export interface AttackPowerParams {
+  basic: number;
+  cap: number;
+  precap_mod: AttackPowerModifier;
+  postcap_mod: AttackPowerModifier;
+  ap_shell_mod: number | null;
+  carrier_power: number | null;
+  proficiency_critical_mod: number | null;
+  armor_penetration: number;
+  remaining_ammo_mod: number;
+  special_enemy_mods: SpecialEnemyModifiers;
+  custom_mods: CustomPowerModifiers;
+}
+
+export interface SpecialEnemyModifiers {
+  precap_general_mod: AttackPowerModifier;
+  stype_mod: AttackPowerModifier;
+  landing_craft_synergy_mod: AttackPowerModifier;
+  toku_daihatsu_tank_mod: AttackPowerModifier;
+  m4a1dd_mod: AttackPowerModifier;
+  honi_mod: AttackPowerModifier;
+  postcap_general_mod: AttackPowerModifier;
+  pt_mod: AttackPowerModifier;
+}
+
 export interface CompAntiAirInfo {
   fleet_adjusted_anti_air: number;
   ships: ShipAntiAirInfo[];
@@ -494,6 +489,41 @@ export interface AirstrikeContactChance {
   total: number;
 }
 
+export type SlotSizeVec = (number | null)[];
+
+export type Side = "Player" | "Enemy";
+
+export type GearAttr =
+  | "Unknown"
+  | "Abyssal"
+  | "HighAngleMount"
+  | "NightFighter"
+  | "NightAttacker"
+  | "HeavyBomber"
+  | "MainGun"
+  | "Radar"
+  | "SurfaceRadar"
+  | "AirRadar"
+  | "DepthChargeProjector"
+  | "SynergisticDepthCharge"
+  | "AntiSubMortar"
+  | "AntiSubWeapon"
+  | "AntiSubAircraft"
+  | "LateModelBowTorpedo"
+  | "Seaplane"
+  | "CbAircraft"
+  | "LbAircraft"
+  | "JetAircraft"
+  | "Fighter"
+  | "Recon"
+  | "ObservationSeaplane"
+  | "CbFighterBomber"
+  | "AntiInstDiveBomber"
+  | "NightRecon"
+  | "CbSwordfish"
+  | "SemiNightPlane"
+  | "HighAltitudeInterceptor";
+
 export type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
 
 export interface MasterEquippable {
@@ -605,6 +635,7 @@ export interface ShipState extends GearVecState, SlotSizeVecState {
   luck_mod?: number;
   day_gunfit_accuracy?: number;
   night_gunfit_accuracy?: number;
+  custom_power_mods?: CustomPowerModifiers;
 }
 
 export interface SlotSizeVecState {
@@ -631,29 +662,6 @@ export interface GearState {
   stars?: number;
 }
 
-export type NightAttackType = "Normal" | "ArkRoyal" | "Carrier";
-
-export type NightSpecialAttack =
-  | { NightCutin: NightCutin }
-  | { FleetCutin: FleetCutin };
-
-export type NightCutin =
-  | "MainTorpRadar"
-  | "TorpLookoutRadar"
-  | "TorpTsloTorp"
-  | "TorpTsloDrum"
-  | "DoubleAttack"
-  | "TorpTorpMain"
-  | "TorpTorpTorp"
-  | "MainMainSec"
-  | "MainMainMain"
-  | "SubTorpTorp"
-  | "SubRadarTorp"
-  | "Cvci1_25"
-  | "Cvci1_20"
-  | "Cvci1_18"
-  | "Photobomber";
-
 export interface MasterGear {
   gear_id: number;
   name: string;
@@ -694,6 +702,29 @@ export interface HitRateParams {
   hit_percentage_bonus: number;
 }
 
+export type NightAttackType = "Normal" | "ArkRoyal" | "Carrier";
+
+export type NightSpecialAttack =
+  | { NightCutin: NightCutin }
+  | { FleetCutin: FleetCutin };
+
+export type NightCutin =
+  | "MainTorpRadar"
+  | "TorpLookoutRadar"
+  | "TorpTsloTorp"
+  | "TorpTsloDrum"
+  | "DoubleAttack"
+  | "TorpTorpMain"
+  | "TorpTorpTorp"
+  | "MainMainSec"
+  | "MainMainMain"
+  | "SubTorpTorp"
+  | "SubRadarTorp"
+  | "Cvci1_25"
+  | "Cvci1_20"
+  | "Cvci1_18"
+  | "Photobomber";
+
 export interface BattleConfig {
   formation: Record<Formation, NestedFormationDef>;
   anti_air_cutin: Record<number, AntiAirCutinDef>;
@@ -779,6 +810,22 @@ export interface MasterShip {
 
 export type StatInterval = [number | null, number | null];
 
+export type GearTypeIdArray = [number, number, number, number, number];
+
+export type ContactRank = "Rank1" | "Rank2" | "Rank3";
+
+export interface SimulatorResult {
+  items: SimulatorResultItem[];
+  sunk_vec: [number, number, number][];
+}
+
+export interface SimulatorResultItem {
+  id: string;
+  role: Role;
+  index: number;
+  damage_state_map: Record<DamageState, number>;
+}
+
 export interface WarfareInfo {
   day: AttackInfo<DayBattleAttackType, DayCutin | null> | null;
   closing_torpedo: AttackInfo<null, null> | null;
@@ -802,44 +849,6 @@ export interface WarfareAnalyzerShipEnvironment {
   formation: Formation;
   fleet_los_mod: number | null;
   night_situation: NightSituation;
-  custom_mods: CustomModifiers;
-}
-
-export type GearTypeIdArray = [number, number, number, number, number];
-
-export type SlotSizeVec = (number | null)[];
-
-export type Side = "Player" | "Enemy";
-
-export type SpecialEnemyType =
-  | "None"
-  | "SoftSkinned"
-  | "Pillbox"
-  | "IsolatedIsland"
-  | "SupplyDepot"
-  | "HarbourSummerPrincess"
-  | "PtImp"
-  | "BattleshipSummerPrincess"
-  | "HeavyCruiserSummerPrincess";
-
-export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
-
-export type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
-
-export type SpeedGroup = "A" | "B1" | "B2" | "C";
-
-export type ContactRank = "Rank1" | "Rank2" | "Rank3";
-
-export interface SimulatorResult {
-  items: SimulatorResultItem[];
-  sunk_vec: [number, number, number][];
-}
-
-export interface SimulatorResultItem {
-  id: string;
-  role: Role;
-  index: number;
-  damage_state_map: Record<DamageState, number>;
 }
 
 export interface FleetNightCutinRateInfo {
@@ -1666,6 +1675,10 @@ export class Ship {
    * @returns {ShipState}
    */
   state(): ShipState;
+  /**
+   * @returns {CustomPowerModifiers}
+   */
+  custom_power_mods(): CustomPowerModifiers;
   /**
    * @returns {ShipMeta}
    */

package/node/fleethub_core.js

@@ -164,6 +164,11 @@ function getUint16Memory0() {
 function getArrayU16FromWasm0(ptr, len) {
     return getUint16Memory0().subarray(ptr / 2, ptr / 2 + len);
 }
+/**
+*/
+module.exports.set_panic_hook = function() {
+    wasm.set_panic_hook();
+};
 
 function passArray16ToWasm0(arg, malloc) {
     const ptr = malloc(arg.length * 2);
@@ -171,11 +176,6 @@ function passArray16ToWasm0(arg, malloc) {
     WASM_VECTOR_LEN = arg.length;
     return ptr;
 }
-/**
-*/
-module.exports.set_panic_hook = function() {
-    wasm.set_panic_hook();
-};
 
 function getArrayU8FromWasm0(ptr, len) {
     return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len);
@@ -2662,6 +2662,13 @@ class Ship {
         return takeObject(ret);
     }
     /**
+    * @returns {CustomPowerModifiers}
+    */
+    custom_power_mods() {
+        const ret = wasm.ship_custom_power_mods(this.ptr);
+        return takeObject(ret);
+    }
+    /**
     * @returns {ShipMeta}
     */
     meta() {
@@ -3202,13 +3209,13 @@ module.exports.__wbindgen_json_serialize = function(arg0, arg1) {
     getInt32Memory0()[arg0 / 4 + 0] = ptr0;
 };
 
-module.exports.__wbg_createEquipmentBonuses_a27fec520ac90d68 = function(arg0, arg1) {
-    const ret = createEquipmentBonuses(takeObject(arg0), takeObject(arg1));
+module.exports.__wbg_ship_new = function(arg0) {
+    const ret = Ship.__wrap(arg0);
     return addHeapObject(ret);
 };
 
-module.exports.__wbg_ship_new = function(arg0) {
-    const ret = Ship.__wrap(arg0);
+module.exports.__wbg_createEquipmentBonuses_d9b8540538a6cce0 = function(arg0, arg1) {
+    const ret = createEquipmentBonuses(takeObject(arg0), takeObject(arg1));
     return addHeapObject(ret);
 };
 
@@ -3238,14 +3245,6 @@ module.exports.__wbg_error_09919627ac0992f5 = function(arg0, arg1) {
     }
 };
 
-module.exports.__wbg_randomFillSync_91e2b39becca6147 = function() { return handleError(function (arg0, arg1, arg2) {
-    getObject(arg0).randomFillSync(getArrayU8FromWasm0(arg1, arg2));
-}, arguments) };
-
-module.exports.__wbg_getRandomValues_b14734aa289bc356 = function() { return handleError(function (arg0, arg1) {
-    getObject(arg0).getRandomValues(getObject(arg1));
-}, arguments) };
-
 module.exports.__wbg_process_e56fd54cf6319b6c = function(arg0) {
     const ret = getObject(arg0).process;
     return addHeapObject(ret);
@@ -3292,6 +3291,14 @@ module.exports.__wbg_msCrypto_5a86d77a66230f81 = function(arg0) {
     return addHeapObject(ret);
 };
 
+module.exports.__wbg_getRandomValues_b14734aa289bc356 = function() { return handleError(function (arg0, arg1) {
+    getObject(arg0).getRandomValues(getObject(arg1));
+}, arguments) };
+
+module.exports.__wbg_randomFillSync_91e2b39becca6147 = function() { return handleError(function (arg0, arg1, arg2) {
+    getObject(arg0).randomFillSync(getArrayU8FromWasm0(arg1, arg2));
+}, arguments) };
+
 module.exports.__wbg_new_2ab697f1555e0dbc = function() {
     const ret = new Array();
     return addHeapObject(ret);

package/node/fleethub_core_bg.wasm.d.ts

@@ -41,6 +41,7 @@ export function ship_los(a: number): number;
 export function ship_default(): number;
 export function ship_eq_id(a: number, b: number, c: number): number;
 export function ship_state(a: number): number;
+export function ship_custom_power_mods(a: number): number;
 export function ship_meta(a: number): number;
 export function ship_name(a: number, b: number): void;
 export function ship_yomi(a: number, b: number): void;
@@ -220,10 +221,10 @@ export function fhcore_create_comp_by_map_enemy(a: number, b: number, c: number,
 export function fhcore_create_default_ship(a: number): number;
 export function fhcore_create_analyzer(a: number): number;
 export function fhcore_simulate_shelling_support(a: number, b: number, c: number, d: number, e: number, f: 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;
 export function ship_gunfit_accuracy(a: number, b: number): number;
-export function set_panic_hook(): void;
 export function __wbg_ibonuses_free(a: number): void;
 export function __wbg_get_ibonuses_shelling_power(a: number): number;
 export function __wbg_set_ibonuses_shelling_power(a: number, b: number): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleethub-core",
-  "version": "1.7.3",
+  "version": "1.7.5",
   "license": "UNLICENSED",
   "sideEffects": false,
   "exports": {

package/pkg/fleethub_core.d.ts

@@ -54,16 +54,43 @@ export type DayCutin =
   | "Zuiun"
   | "AirSea";
 
-export interface ShellingSupportSimulatorParams {
-  attacker_formation: Formation;
-  target_formation: Formation;
-  engagement: Engagement;
-  custom_mods: CustomModifiers;
+export type ShellingAttackType = "Normal" | "Carrier";
+
+export interface FleetCutinAnalysis {
+  shelling: FleetCutinInfo[];
+  night: FleetCutinInfo[];
 }
 
-export type ShellingAttackType = "Normal" | "Carrier";
+export interface FleetCutinInfo {
+  cutin: FleetCutin;
+  rate: number | null;
+  formation: Formation;
+  items: FleetCutinInfoItem[];
+}
 
-export type AirWaveType = "Jet" | "LandBase" | "Carrier";
+export interface FleetCutinInfoItem {
+  ship_id: number;
+  cutin: FleetCutin;
+  fleet_cutin_mod: number;
+  stats: AttackStats;
+}
+
+export type SpecialEnemyType =
+  | "None"
+  | "SoftSkinned"
+  | "Pillbox"
+  | "IsolatedIsland"
+  | "SupplyDepot"
+  | "HarbourSummerPrincess"
+  | "PtImp"
+  | "BattleshipSummerPrincess"
+  | "HeavyCruiserSummerPrincess";
+
+export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
+
+export type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
+
+export type SpeedGroup = "A" | "B1" | "B2" | "C";
 
 export type AswAttackType = "DepthCharge" | "Aircraft";
 
@@ -83,22 +110,11 @@ export type FleetCutin =
   | "Yamato2ShipCutin"
   | "Yamato3ShipCutin";
 
-export interface WarfareContext {
-  attacker_env: WarfareShipEnvironment;
-  target_env: WarfareShipEnvironment;
-  engagement: Engagement;
-  air_state: AirState;
-  custom_mods: CustomModifiers;
-}
+export type AirWaveType = "Jet" | "LandBase" | "Carrier";
 
-export interface WarfareShipEnvironment {
-  org_type: OrgType;
-  role: Role;
-  ship_index: number;
-  fleet_len: number;
-  formation: Formation;
-  fleet_los_mod: number | null;
-}
+export type NumMap<K, V> = Partial<Record<K, V>>;
+
+export type Role = "Main" | "Escort";
 
 export interface CompMeta {
   fleets: Record<FleetType, FleetMeta>;
@@ -115,52 +131,6 @@ export interface ShipMeta {
   ship_id: number;
 }
 
-export interface AttackPower {
-  precap: number;
-  is_capped: boolean;
-  capped: number;
-  normal: number;
-  critical: number;
-  armor_penetration: number;
-  remaining_ammo_mod: number;
-}
-
-export interface AttackPowerParams {
-  basic: number;
-  cap: number;
-  precap_mod: AttackPowerModifier;
-  postcap_mod: AttackPowerModifier;
-  ap_shell_mod: number | null;
-  carrier_power: number | null;
-  proficiency_critical_mod: number | null;
-  armor_penetration: number;
-  remaining_ammo_mod: number;
-  special_enemy_mods: SpecialEnemyModifiers;
-  custom_mods: CustomModifiers;
-}
-
-export interface CustomModifiers {
-  precap_mod?: AttackPowerModifier;
-  postcap_mod?: AttackPowerModifier;
-  basic_power_mod?: AttackPowerModifier;
-}
-
-export interface SpecialEnemyModifiers {
-  precap_general_mod: AttackPowerModifier;
-  stype_mod: AttackPowerModifier;
-  landing_craft_synergy_mod: AttackPowerModifier;
-  toku_daihatsu_tank_mod: AttackPowerModifier;
-  m4a1dd_mod: AttackPowerModifier;
-  honi_mod: AttackPowerModifier;
-  postcap_general_mod: AttackPowerModifier;
-  pt_mod: AttackPowerModifier;
-}
-
-export interface AttackPowerModifier {
-  a: number;
-  b: number;
-}
-
 export interface MasterData {
   gears: MasterGear[];
   gear_attrs: MasterAttrRule<GearAttr>[];
@@ -187,6 +157,22 @@ export interface MasterAttrRule<T> {
   expr: string;
 }
 
+export interface WarfareContext {
+  attacker_env: WarfareShipEnvironment;
+  target_env: WarfareShipEnvironment;
+  engagement: Engagement;
+  air_state: AirState;
+}
+
+export interface WarfareShipEnvironment {
+  org_type: OrgType;
+  role: Role;
+  ship_index: number;
+  fleet_len: number;
+  formation: Formation;
+  fleet_los_mod: number | null;
+}
+
 export interface CompDayCutinRateInfo {
   main: FleetDayCutinRateInfo;
   escort: FleetDayCutinRateInfo | null;
@@ -209,10 +195,6 @@ export interface DayCutinRateInfo {
   total_cutin_rate: number | null;
 }
 
-export type NumMap<K, V> = Partial<Record<K, V>>;
-
-export type Role = "Main" | "Escort";
-
 export type GearCategory =
   | "Fighter"
   | "Bomber"
@@ -339,6 +321,12 @@ export type AirState =
   | "AirDenial"
   | "AirIncapability";
 
+export interface ShellingSupportSimulatorParams {
+  attacker_formation: Formation;
+  target_formation: Formation;
+  engagement: Engagement;
+}
+
 export interface MasterIBonuses {
   shelling_power: MasterIBonusRule[];
   carrier_shelling_power: MasterIBonusRule[];
@@ -369,25 +357,6 @@ export interface NightSituation {
   searchlight: boolean;
 }
 
-export interface FleetCutinAnalysis {
-  shelling: FleetCutinInfo[];
-  night: FleetCutinInfo[];
-}
-
-export interface FleetCutinInfo {
-  cutin: FleetCutin;
-  rate: number | null;
-  formation: Formation;
-  items: FleetCutinInfoItem[];
-}
-
-export interface FleetCutinInfoItem {
-  ship_id: number;
-  cutin: FleetCutin;
-  fleet_cutin_mod: number;
-  stats: AttackStats;
-}
-
 export interface DamageInfo {
   miss_damage_min: number;
   miss_damage_max: number;
@@ -417,37 +386,6 @@ export type ShipAttr =
   | "BattleshipSummerPrincess"
   | "HeavyCruiserSummerPrincess";
 
-export type GearAttr =
-  | "Unknown"
-  | "Abyssal"
-  | "HighAngleMount"
-  | "NightFighter"
-  | "NightAttacker"
-  | "HeavyBomber"
-  | "MainGun"
-  | "Radar"
-  | "SurfaceRadar"
-  | "AirRadar"
-  | "DepthChargeProjector"
-  | "SynergisticDepthCharge"
-  | "AntiSubMortar"
-  | "AntiSubWeapon"
-  | "AntiSubAircraft"
-  | "LateModelBowTorpedo"
-  | "Seaplane"
-  | "CbAircraft"
-  | "LbAircraft"
-  | "JetAircraft"
-  | "Fighter"
-  | "Recon"
-  | "ObservationSeaplane"
-  | "CbFighterBomber"
-  | "AntiInstDiveBomber"
-  | "NightRecon"
-  | "CbSwordfish"
-  | "SemiNightPlane"
-  | "HighAltitudeInterceptor";
-
 export type Formation = SingleFormation | CombinedFormation;
 
 export type CombinedFormation =
@@ -464,6 +402,63 @@ export type SingleFormation =
   | "LineAbreast"
   | "Vanguard";
 
+export interface CustomPowerModifiers {
+  precap_mod?: AttackPowerModifier;
+  postcap_mod?: AttackPowerModifier;
+  basic_power_mod?: AttackPowerModifier;
+}
+
+export interface SpecialEnemyModifiers {
+  precap_general_mod: AttackPowerModifier;
+  stype_mod: AttackPowerModifier;
+  landing_craft_synergy_mod: AttackPowerModifier;
+  toku_daihatsu_tank_mod: AttackPowerModifier;
+  m4a1dd_mod: AttackPowerModifier;
+  honi_mod: AttackPowerModifier;
+  postcap_general_mod: AttackPowerModifier;
+  pt_mod: AttackPowerModifier;
+}
+
+export interface AttackPowerModifier {
+  a?: number;
+  b?: number;
+}
+
+export interface AttackPower {
+  precap: number;
+  is_capped: boolean;
+  capped: number;
+  normal: number;
+  critical: number;
+  armor_penetration: number;
+  remaining_ammo_mod: number;
+}
+
+export interface AttackPowerParams {
+  basic: number;
+  cap: number;
+  precap_mod: AttackPowerModifier;
+  postcap_mod: AttackPowerModifier;
+  ap_shell_mod: number | null;
+  carrier_power: number | null;
+  proficiency_critical_mod: number | null;
+  armor_penetration: number;
+  remaining_ammo_mod: number;
+  special_enemy_mods: SpecialEnemyModifiers;
+  custom_mods: CustomPowerModifiers;
+}
+
+export interface SpecialEnemyModifiers {
+  precap_general_mod: AttackPowerModifier;
+  stype_mod: AttackPowerModifier;
+  landing_craft_synergy_mod: AttackPowerModifier;
+  toku_daihatsu_tank_mod: AttackPowerModifier;
+  m4a1dd_mod: AttackPowerModifier;
+  honi_mod: AttackPowerModifier;
+  postcap_general_mod: AttackPowerModifier;
+  pt_mod: AttackPowerModifier;
+}
+
 export interface CompAntiAirInfo {
   fleet_adjusted_anti_air: number;
   ships: ShipAntiAirInfo[];
@@ -494,6 +489,41 @@ export interface AirstrikeContactChance {
   total: number;
 }
 
+export type SlotSizeVec = (number | null)[];
+
+export type Side = "Player" | "Enemy";
+
+export type GearAttr =
+  | "Unknown"
+  | "Abyssal"
+  | "HighAngleMount"
+  | "NightFighter"
+  | "NightAttacker"
+  | "HeavyBomber"
+  | "MainGun"
+  | "Radar"
+  | "SurfaceRadar"
+  | "AirRadar"
+  | "DepthChargeProjector"
+  | "SynergisticDepthCharge"
+  | "AntiSubMortar"
+  | "AntiSubWeapon"
+  | "AntiSubAircraft"
+  | "LateModelBowTorpedo"
+  | "Seaplane"
+  | "CbAircraft"
+  | "LbAircraft"
+  | "JetAircraft"
+  | "Fighter"
+  | "Recon"
+  | "ObservationSeaplane"
+  | "CbFighterBomber"
+  | "AntiInstDiveBomber"
+  | "NightRecon"
+  | "CbSwordfish"
+  | "SemiNightPlane"
+  | "HighAltitudeInterceptor";
+
 export type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
 
 export interface MasterEquippable {
@@ -605,6 +635,7 @@ export interface ShipState extends GearVecState, SlotSizeVecState {
   luck_mod?: number;
   day_gunfit_accuracy?: number;
   night_gunfit_accuracy?: number;
+  custom_power_mods?: CustomPowerModifiers;
 }
 
 export interface SlotSizeVecState {
@@ -631,29 +662,6 @@ export interface GearState {
   stars?: number;
 }
 
-export type NightAttackType = "Normal" | "ArkRoyal" | "Carrier";
-
-export type NightSpecialAttack =
-  | { NightCutin: NightCutin }
-  | { FleetCutin: FleetCutin };
-
-export type NightCutin =
-  | "MainTorpRadar"
-  | "TorpLookoutRadar"
-  | "TorpTsloTorp"
-  | "TorpTsloDrum"
-  | "DoubleAttack"
-  | "TorpTorpMain"
-  | "TorpTorpTorp"
-  | "MainMainSec"
-  | "MainMainMain"
-  | "SubTorpTorp"
-  | "SubRadarTorp"
-  | "Cvci1_25"
-  | "Cvci1_20"
-  | "Cvci1_18"
-  | "Photobomber";
-
 export interface MasterGear {
   gear_id: number;
   name: string;
@@ -694,6 +702,29 @@ export interface HitRateParams {
   hit_percentage_bonus: number;
 }
 
+export type NightAttackType = "Normal" | "ArkRoyal" | "Carrier";
+
+export type NightSpecialAttack =
+  | { NightCutin: NightCutin }
+  | { FleetCutin: FleetCutin };
+
+export type NightCutin =
+  | "MainTorpRadar"
+  | "TorpLookoutRadar"
+  | "TorpTsloTorp"
+  | "TorpTsloDrum"
+  | "DoubleAttack"
+  | "TorpTorpMain"
+  | "TorpTorpTorp"
+  | "MainMainSec"
+  | "MainMainMain"
+  | "SubTorpTorp"
+  | "SubRadarTorp"
+  | "Cvci1_25"
+  | "Cvci1_20"
+  | "Cvci1_18"
+  | "Photobomber";
+
 export interface BattleConfig {
   formation: Record<Formation, NestedFormationDef>;
   anti_air_cutin: Record<number, AntiAirCutinDef>;
@@ -779,6 +810,22 @@ export interface MasterShip {
 
 export type StatInterval = [number | null, number | null];
 
+export type GearTypeIdArray = [number, number, number, number, number];
+
+export type ContactRank = "Rank1" | "Rank2" | "Rank3";
+
+export interface SimulatorResult {
+  items: SimulatorResultItem[];
+  sunk_vec: [number, number, number][];
+}
+
+export interface SimulatorResultItem {
+  id: string;
+  role: Role;
+  index: number;
+  damage_state_map: Record<DamageState, number>;
+}
+
 export interface WarfareInfo {
   day: AttackInfo<DayBattleAttackType, DayCutin | null> | null;
   closing_torpedo: AttackInfo<null, null> | null;
@@ -802,44 +849,6 @@ export interface WarfareAnalyzerShipEnvironment {
   formation: Formation;
   fleet_los_mod: number | null;
   night_situation: NightSituation;
-  custom_mods: CustomModifiers;
-}
-
-export type GearTypeIdArray = [number, number, number, number, number];
-
-export type SlotSizeVec = (number | null)[];
-
-export type Side = "Player" | "Enemy";
-
-export type SpecialEnemyType =
-  | "None"
-  | "SoftSkinned"
-  | "Pillbox"
-  | "IsolatedIsland"
-  | "SupplyDepot"
-  | "HarbourSummerPrincess"
-  | "PtImp"
-  | "BattleshipSummerPrincess"
-  | "HeavyCruiserSummerPrincess";
-
-export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
-
-export type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
-
-export type SpeedGroup = "A" | "B1" | "B2" | "C";
-
-export type ContactRank = "Rank1" | "Rank2" | "Rank3";
-
-export interface SimulatorResult {
-  items: SimulatorResultItem[];
-  sunk_vec: [number, number, number][];
-}
-
-export interface SimulatorResultItem {
-  id: string;
-  role: Role;
-  index: number;
-  damage_state_map: Record<DamageState, number>;
 }
 
 export interface FleetNightCutinRateInfo {
@@ -1666,6 +1675,10 @@ export class Ship {
    * @returns {ShipState}
    */
   state(): ShipState;
+  /**
+   * @returns {CustomPowerModifiers}
+   */
+  custom_power_mods(): CustomPowerModifiers;
   /**
    * @returns {ShipMeta}
    */

package/pkg/fleethub_core_bg.js

@@ -165,6 +165,11 @@ function getUint16Memory0() {
 function getArrayU16FromWasm0(ptr, len) {
     return getUint16Memory0().subarray(ptr / 2, ptr / 2 + len);
 }
+/**
+*/
+export function set_panic_hook() {
+    wasm.set_panic_hook();
+}
 
 function passArray16ToWasm0(arg, malloc) {
     const ptr = malloc(arg.length * 2);
@@ -172,11 +177,6 @@ function passArray16ToWasm0(arg, malloc) {
     WASM_VECTOR_LEN = arg.length;
     return ptr;
 }
-/**
-*/
-export function set_panic_hook() {
-    wasm.set_panic_hook();
-}
 
 function getArrayU8FromWasm0(ptr, len) {
     return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len);
@@ -2655,6 +2655,13 @@ export class Ship {
         return takeObject(ret);
     }
     /**
+    * @returns {CustomPowerModifiers}
+    */
+    custom_power_mods() {
+        const ret = wasm.ship_custom_power_mods(this.ptr);
+        return takeObject(ret);
+    }
+    /**
     * @returns {ShipMeta}
     */
     meta() {
@@ -3194,13 +3201,13 @@ export function __wbindgen_json_serialize(arg0, arg1) {
     getInt32Memory0()[arg0 / 4 + 0] = ptr0;
 };
 
-export function __wbg_createEquipmentBonuses_a27fec520ac90d68(arg0, arg1) {
-    const ret = createEquipmentBonuses(takeObject(arg0), takeObject(arg1));
+export function __wbg_ship_new(arg0) {
+    const ret = Ship.__wrap(arg0);
     return addHeapObject(ret);
 };
 
-export function __wbg_ship_new(arg0) {
-    const ret = Ship.__wrap(arg0);
+export function __wbg_createEquipmentBonuses_d9b8540538a6cce0(arg0, arg1) {
+    const ret = createEquipmentBonuses(takeObject(arg0), takeObject(arg1));
     return addHeapObject(ret);
 };
 
@@ -3230,14 +3237,6 @@ export function __wbg_error_09919627ac0992f5(arg0, arg1) {
     }
 };
 
-export function __wbg_randomFillSync_91e2b39becca6147() { return handleError(function (arg0, arg1, arg2) {
-    getObject(arg0).randomFillSync(getArrayU8FromWasm0(arg1, arg2));
-}, arguments) };
-
-export function __wbg_getRandomValues_b14734aa289bc356() { return handleError(function (arg0, arg1) {
-    getObject(arg0).getRandomValues(getObject(arg1));
-}, arguments) };
-
 export function __wbg_process_e56fd54cf6319b6c(arg0) {
     const ret = getObject(arg0).process;
     return addHeapObject(ret);
@@ -3284,6 +3283,14 @@ export function __wbg_msCrypto_5a86d77a66230f81(arg0) {
     return addHeapObject(ret);
 };
 
+export function __wbg_getRandomValues_b14734aa289bc356() { return handleError(function (arg0, arg1) {
+    getObject(arg0).getRandomValues(getObject(arg1));
+}, arguments) };
+
+export function __wbg_randomFillSync_91e2b39becca6147() { return handleError(function (arg0, arg1, arg2) {
+    getObject(arg0).randomFillSync(getArrayU8FromWasm0(arg1, arg2));
+}, arguments) };
+
 export function __wbg_new_2ab697f1555e0dbc() {
     const ret = new Array();
     return addHeapObject(ret);

package/pkg/fleethub_core_bg.wasm.d.ts

@@ -41,6 +41,7 @@ export function ship_los(a: number): number;
 export function ship_default(): number;
 export function ship_eq_id(a: number, b: number, c: number): number;
 export function ship_state(a: number): number;
+export function ship_custom_power_mods(a: number): number;
 export function ship_meta(a: number): number;
 export function ship_name(a: number, b: number): void;
 export function ship_yomi(a: number, b: number): void;
@@ -220,10 +221,10 @@ export function fhcore_create_comp_by_map_enemy(a: number, b: number, c: number,
 export function fhcore_create_default_ship(a: number): number;
 export function fhcore_create_analyzer(a: number): number;
 export function fhcore_simulate_shelling_support(a: number, b: number, c: number, d: number, e: number, f: 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;
 export function ship_gunfit_accuracy(a: number, b: number): number;
-export function set_panic_hook(): void;
 export function __wbg_ibonuses_free(a: number): void;
 export function __wbg_get_ibonuses_shelling_power(a: number): number;
 export function __wbg_set_ibonuses_shelling_power(a: number, b: number): void;