fleethub-core 1.4.0 → 1.4.3

package/node/fleethub_core.d.ts

@@ -95,6 +95,62 @@ export interface DamageInfo {
   damage_state_map: NumMap<DamageState, number>;
 }
 
+export interface BattleConfig {
+  formation: Record<Formation, NestedFormationDef>;
+  anti_air_cutin: Record<number, AntiAirCutinDef>;
+  day_cutin: Record<DayCutin, DayCutinDef>;
+  night_cutin: Record<NightCutin, NightCutinDef>;
+}
+
+export interface NightCutinDef {
+  tag: NightCutin;
+  hits: number;
+  type_factor: number | null;
+  power_mod: number | null;
+  accuracy_mod: number | null;
+}
+
+export interface DayCutinDef {
+  tag: DayCutin;
+  hits: number;
+  type_factor: number | null;
+  power_mod: number | null;
+  accuracy_mod: number | null;
+}
+
+export interface AntiAirCutinDef {
+  id: number;
+  type_factor: number | null;
+  multiplier: number | null;
+  guaranteed: number | null;
+  sequential: boolean | null;
+}
+
+export type NestedFormationDef =
+  | FormationDef
+  | { top_half: FormationDef; bottom_half: FormationDef };
+
+export interface FormationDef {
+  tag: Formation;
+  protection_rate: number | null;
+  fleet_anti_air_mod: number;
+  shelling: FormationWarfareDef;
+  torpedo: FormationWarfareDef;
+  asw: FormationWarfareDef;
+  night: FormationWarfareDef;
+  shelling_support: FormationWarfareDef;
+}
+
+export interface FormationWarfareDef {
+  power_mod: number | null;
+  accuracy_mod: number | null;
+  evasion_mod: number | null;
+}
+
+export type AirWaveType = "Jet" | "LandBase" | "Carrier";
+
+export type AswAttackType = "DepthCharge" | "Aircraft";
+
 export type OrgType =
   | "Single"
   | "CarrierTaskForce"
@@ -477,7 +533,7 @@ export type GearAttr =
   | "SurfaceRadar"
   | "AirRadar"
   | "DepthChargeProjector"
-  | "AdditionalDepthCharge"
+  | "SynergisticDepthCharge"
   | "AntiSubMortar"
   | "AntiSubWeapon"
   | "AntiSubAircraft"
@@ -557,8 +613,112 @@ export interface ShipAntiAirInfo {
   anti_air_propellant_barrage_chance: number | null;
 }
 
+export type ShipStateMap = Record<ShipKey, ShipState>;
+
+export type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
+
+export interface OrgState {
+  id?: string;
+  f1?: FleetState;
+  f2?: FleetState;
+  f3?: FleetState;
+  f4?: FleetState;
+  a1?: AirSquadronState;
+  a2?: AirSquadronState;
+  a3?: AirSquadronState;
+  hq_level?: number;
+  org_type?: OrgType;
+  sortie?: string;
+  route_sup?: string;
+  boss_sup?: string;
+}
+
+export interface AirSquadronState {
+  id?: string;
+  mode?: AirSquadronMode;
+  g1?: GearState;
+  g2?: GearState;
+  g3?: GearState;
+  g4?: GearState;
+  g5?: GearState;
+  gx?: GearState;
+  ss1?: number;
+  ss2?: number;
+  ss3?: number;
+  ss4?: number;
+  ss5?: number;
+}
+
+export type AirSquadronMode = "Sortie" | "AirDefense";
+
+export interface FleetState {
+  id?: string;
+  len?: number;
+  s1?: ShipState;
+  s2?: ShipState;
+  s3?: ShipState;
+  s4?: ShipState;
+  s5?: ShipState;
+  s6?: ShipState;
+  s7?: ShipState;
+}
+
+export interface ShipState {
+  id?: string;
+  ship_id: number;
+  level?: number;
+  current_hp?: number;
+  morale?: number;
+  ammo?: number;
+  fuel?: number;
+  max_hp_mod?: number;
+  firepower_mod?: number;
+  torpedo_mod?: number;
+  armor_mod?: number;
+  anti_air_mod?: number;
+  evasion_mod?: number;
+  asw_mod?: number;
+  los_mod?: number;
+  luck_mod?: number;
+  g1?: GearState;
+  g2?: GearState;
+  g3?: GearState;
+  g4?: GearState;
+  g5?: GearState;
+  gx?: GearState;
+  ss1?: number;
+  ss2?: number;
+  ss3?: number;
+  ss4?: number;
+  ss5?: number;
+  overrides?: ShipOverrides;
+}
+
+export interface ShipOverrides {
+  naked_max_hp?: number;
+  naked_luck?: number;
+  naked_evasion?: number;
+  naked_asw?: number;
+  naked_los?: number;
+}
+
+export interface GearState {
+  id?: string;
+  gear_id: number;
+  exp?: number;
+  stars?: number;
+}
+
 export type Side = "Player" | "Enemy";
 
+export type NightBattleAttackType =
+  | { t: "NightAttack"; c: NightAttackType }
+  | { t: "Asw"; c: AswAttackType };
+
+export type DayBattleAttackType =
+  | { t: "Shelling"; c: ShellingAttackType }
+  | { t: "Asw"; c: AswAttackType };
+
 export type NightAttackType = "Normal" | "ArkRoyal" | "Carrier";
 
 export type NightSpecialAttack =
@@ -622,14 +782,6 @@ export interface HitRateParams {
   hit_percentage_bonus: number;
 }
 
-export type NightBattleAttackType =
-  | { t: "NightAttack"; c: NightAttackType }
-  | { t: "Asw"; c: AswAttackType };
-
-export type DayBattleAttackType =
-  | { t: "Shelling"; c: ShellingAttackType }
-  | { t: "Asw"; c: AswAttackType };
-
 export interface WarfareInfo {
   day: AttackInfo<DayBattleAttackType, DayCutin | null> | null;
   closing_torpedo: AttackInfo<null, null> | null;
@@ -656,93 +808,6 @@ export interface WarfareAnalyzerShipEnvironment {
   custom_mods: CustomModifiers;
 }
 
-export type ShipStateMap = Record<ShipKey, ShipState>;
-
-export type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
-
-export interface OrgState {
-  id?: string;
-  f1?: FleetState;
-  f2?: FleetState;
-  f3?: FleetState;
-  f4?: FleetState;
-  a1?: AirSquadronState;
-  a2?: AirSquadronState;
-  a3?: AirSquadronState;
-  hq_level?: number;
-  org_type?: OrgType;
-  sortie?: string;
-  route_sup?: string;
-  boss_sup?: string;
-}
-
-export interface AirSquadronState {
-  id?: string;
-  mode?: AirSquadronMode;
-  g1?: GearState;
-  g2?: GearState;
-  g3?: GearState;
-  g4?: GearState;
-  g5?: GearState;
-  gx?: GearState;
-  ss1?: number;
-  ss2?: number;
-  ss3?: number;
-  ss4?: number;
-  ss5?: number;
-}
-
-export type AirSquadronMode = "Sortie" | "AirDefense";
-
-export interface FleetState {
-  id?: string;
-  len?: number;
-  s1?: ShipState;
-  s2?: ShipState;
-  s3?: ShipState;
-  s4?: ShipState;
-  s5?: ShipState;
-  s6?: ShipState;
-  s7?: ShipState;
-}
-
-export interface ShipState {
-  id?: string;
-  ship_id: number;
-  level?: number;
-  current_hp?: number;
-  morale?: number;
-  ammo?: number;
-  fuel?: number;
-  max_hp_mod?: number;
-  firepower_mod?: number;
-  torpedo_mod?: number;
-  armor_mod?: number;
-  anti_air_mod?: number;
-  evasion_mod?: number;
-  asw_mod?: number;
-  los_mod?: number;
-  luck_mod?: number;
-  g1?: GearState;
-  g2?: GearState;
-  g3?: GearState;
-  g4?: GearState;
-  g5?: GearState;
-  gx?: GearState;
-  ss1?: number;
-  ss2?: number;
-  ss3?: number;
-  ss4?: number;
-  ss5?: number;
-}
-
-export interface GearState {
-  id?: string;
-  gear_id: number;
-  exp?: number;
-  stars?: number;
-}
-
 export type GearTypeIdArray = [number, number, number, number, number];
 
 export type SlotSizeVec = (number | null)[];
@@ -807,62 +872,6 @@ export interface NightContactChance {
   total: number;
 }
 
-export interface BattleConfig {
-  formation: Record<Formation, NestedFormationDef>;
-  anti_air_cutin: Record<number, AntiAirCutinDef>;
-  day_cutin: Record<DayCutin, DayCutinDef>;
-  night_cutin: Record<NightCutin, NightCutinDef>;
-}
-
-export interface NightCutinDef {
-  tag: NightCutin;
-  hits: number;
-  chance_denom: number | null;
-  power_mod: number | null;
-  accuracy_mod: number | null;
-}
-
-export interface DayCutinDef {
-  tag: DayCutin;
-  hits: number;
-  chance_denom: number | null;
-  power_mod: number | null;
-  accuracy_mod: number | null;
-}
-
-export interface AntiAirCutinDef {
-  id: number;
-  chance_numer: number | null;
-  multiplier: number | null;
-  guaranteed: number | null;
-  sequential: boolean | null;
-}
-
-export type NestedFormationDef =
-  | FormationDef
-  | { top_half: FormationDef; bottom_half: FormationDef };
-
-export interface FormationDef {
-  tag: Formation;
-  protection_rate: number | null;
-  fleet_anti_air_mod: number;
-  shelling: FormationWarfareDef;
-  torpedo: FormationWarfareDef;
-  asw: FormationWarfareDef;
-  night: FormationWarfareDef;
-  shelling_support: FormationWarfareDef;
-}
-
-export interface FormationWarfareDef {
-  power_mod: number | null;
-  accuracy_mod: number | null;
-  evasion_mod: number | null;
-}
-
-export type AirWaveType = "Jet" | "LandBase" | "Carrier";
-
-export type AswAttackType = "DepthCharge" | "Aircraft";
-
 /**
  */
 export class AirSquadron {

package/node/fleethub_core.js

@@ -116,21 +116,6 @@ const u32CvtShim = new Uint32Array(2);
 
 const uint64CvtShim = new BigUint64Array(u32CvtShim.buffer);
 
-function _assertClass(instance, klass) {
-    if (!(instance instanceof klass)) {
-        throw new Error(`expected instance of ${klass.name}`);
-    }
-    return instance.ptr;
-}
-
-let cachegetFloat64Memory0 = null;
-function getFloat64Memory0() {
-    if (cachegetFloat64Memory0 === null || cachegetFloat64Memory0.buffer !== wasm.memory.buffer) {
-        cachegetFloat64Memory0 = new Float64Array(wasm.memory.buffer);
-    }
-    return cachegetFloat64Memory0;
-}
-
 function isLikeNone(x) {
     return x === undefined || x === null;
 }
@@ -153,6 +138,14 @@ function getArrayJsValueFromWasm0(ptr, len) {
     return result;
 }
 
+let cachegetFloat64Memory0 = null;
+function getFloat64Memory0() {
+    if (cachegetFloat64Memory0 === null || cachegetFloat64Memory0.buffer !== wasm.memory.buffer) {
+        cachegetFloat64Memory0 = new Float64Array(wasm.memory.buffer);
+    }
+    return cachegetFloat64Memory0;
+}
+
 let cachegetUint16Memory0 = null;
 function getUint16Memory0() {
     if (cachegetUint16Memory0 === null || cachegetUint16Memory0.buffer !== wasm.memory.buffer) {
@@ -165,6 +158,13 @@ function getArrayU16FromWasm0(ptr, len) {
     return getUint16Memory0().subarray(ptr / 2, ptr / 2 + len);
 }
 
+function _assertClass(instance, klass) {
+    if (!(instance instanceof klass)) {
+        throw new Error(`expected instance of ${klass.name}`);
+    }
+    return instance.ptr;
+}
+
 function passArray16ToWasm0(arg, malloc) {
     const ptr = malloc(arg.length * 2);
     getUint16Memory0().set(arg, ptr / 2);
@@ -3239,7 +3239,7 @@ module.exports.__wbindgen_object_drop_ref = function(arg0) {
     takeObject(arg0);
 };
 
-module.exports.__wbg_createEquipmentBonuses_273b5cec732de9f9 = function(arg0, arg1) {
+module.exports.__wbg_createEquipmentBonuses_7e1c98f5e473fb02 = function(arg0, arg1) {
     const ret = createEquipmentBonuses(takeObject(arg0), takeObject(arg1));
     return addHeapObject(ret);
 };

package/node/fleethub_core_bg.wasm.d.ts

@@ -1,101 +1,6 @@
 /* tslint:disable */
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
-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;
-export function __wbg_get_ship_xxh3(a: number, b: number): void;
-export function __wbg_set_ship_xxh3(a: number, b: number, c: number): void;
-export function __wbg_get_ship_ship_id(a: number): number;
-export function __wbg_set_ship_ship_id(a: number, b: number): void;
-export function __wbg_get_ship_level(a: number): number;
-export function __wbg_set_ship_level(a: number, b: number): void;
-export function __wbg_get_ship_current_hp(a: number): number;
-export function __wbg_set_ship_current_hp(a: number, b: number): void;
-export function __wbg_get_ship_morale(a: number): number;
-export function __wbg_set_ship_morale(a: number, b: number): void;
-export function __wbg_get_ship_ammo(a: number): number;
-export function __wbg_set_ship_ammo(a: number, b: number): void;
-export function __wbg_get_ship_fuel(a: number): number;
-export function __wbg_set_ship_fuel(a: number, b: number): void;
-export function __wbg_get_ship_ship_type(a: number): number;
-export function __wbg_set_ship_ship_type(a: number, b: number): void;
-export function __wbg_get_ship_ctype(a: number): number;
-export function __wbg_set_ship_ctype(a: number, b: number): void;
-export function __wbg_get_ship_slots(a: number): number;
-export function __wbg_set_ship_slots(a: number, b: number): void;
-export function ship_naked_firepower(a: number): number;
-export function ship_naked_torpedo(a: number): number;
-export function ship_naked_armor(a: number): number;
-export function ship_naked_anti_air(a: number): number;
-export function ship_naked_evasion(a: number): number;
-export function ship_naked_asw(a: number): number;
-export function ship_naked_los(a: number): number;
-export function ship_firepower(a: number): number;
-export function ship_torpedo(a: number): number;
-export function ship_armor(a: number): number;
-export function ship_anti_air(a: number): number;
-export function ship_evasion(a: number): number;
-export function ship_asw(a: number): number;
-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_meta(a: number): number;
-export function ship_name(a: number, b: number): void;
-export function ship_yomi(a: number, b: number): void;
-export function ship_stype(a: number): number;
-export function ship_sort_id(a: number): number;
-export function ship_remodel_rank(a: number): number;
-export function ship_slotnum(a: number): number;
-export function ship_next_id(a: number): number;
-export function ship_useful(a: number): number;
-export function ship_damage_state(a: number): number;
-export function ship_morale_state(a: number): number;
-export function ship_category(a: number): number;
-export function ship_has_attr(a: number, b: number): number;
-export function ship_gear_keys(a: number): number;
-export function ship_get_gear(a: number, b: number, c: number): number;
-export function ship_get_damage_bound(a: number, b: number): number;
-export function ship_get_remaining_fuel(a: number, b: number, c: number): number;
-export function ship_get_remaining_ammo(a: number, b: number, c: number): number;
-export function ship_has_unknown_stat(a: number, b: number, c: number): number;
-export function ship_get_naked_stat(a: number, b: number, c: number): number;
-export function ship_get_stat_interval_left(a: number, b: number, c: number): number;
-export function ship_get_stat_interval_right(a: number, b: number, c: number): number;
-export function ship_get_gear_stat(a: number, b: number, c: number): number;
-export function ship_get_ebonus(a: number, b: number, c: number): number;
-export function ship_get_stat_mod(a: number, b: number, c: number): number;
-export function ship_is_abyssal(a: number): number;
-export function ship_is_submarine(a: number): number;
-export function ship_can_equip(a: number, b: number, c: number, d: number): number;
-export function ship_max_hp(a: number): number;
-export function ship_max_ammo(a: number): number;
-export function ship_max_fuel(a: number): number;
-export function ship_naked_range(a: number): number;
-export function ship_naked_speed(a: number): number;
-export function ship_luck(a: number): number;
-export function ship_range(a: number): number;
-export function ship_speed(a: number): number;
-export function ship_accuracy(a: number): number;
-export function ship_torpedo_accuracy_mod(a: number): number;
-export function ship_is_installation(a: number): number;
-export function ship_get_slot_size(a: number, b: number): number;
-export function ship_get_max_slot_size(a: number, b: number): number;
-export function ship_remaining_ammo_mod(a: number): number;
-export function ship_remaining_fuel_mod(a: number): number;
-export function ship_fighter_power(a: number, b: number, c: number): void;
-export function ship_fleet_los_factor(a: number, b: number): void;
-export function ship_fleet_anti_air_mod(a: number): number;
-export function ship_cruiser_fit_bonus(a: number): number;
-export function ship_fit_gun_bonus(a: number, b: number): number;
-export function ship_basic_accuracy_term(a: number, b: number): void;
-export function ship_basic_evasion_term(a: number, b: number): void;
-export function ship_evasion_term(a: number, b: number, c: number, d: number, e: number): void;
-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_take_damage(a: number, b: number): void;
 export function __wbg_org_free(a: number): void;
 export function __wbg_get_org_id(a: number, b: number): void;
 export function __wbg_set_org_id(a: number, b: number, c: number): void;
@@ -337,6 +242,101 @@ export function gear_expedition_bonus(a: number): number;
 export function gear_can_be_deployed_to_land_base(a: number): number;
 export function gear_has_proficiency(a: number): number;
 export function set_panic_hook(): 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;
+export function __wbg_get_ship_xxh3(a: number, b: number): void;
+export function __wbg_set_ship_xxh3(a: number, b: number, c: number): void;
+export function __wbg_get_ship_ship_id(a: number): number;
+export function __wbg_set_ship_ship_id(a: number, b: number): void;
+export function __wbg_get_ship_level(a: number): number;
+export function __wbg_set_ship_level(a: number, b: number): void;
+export function __wbg_get_ship_current_hp(a: number): number;
+export function __wbg_set_ship_current_hp(a: number, b: number): void;
+export function __wbg_get_ship_morale(a: number): number;
+export function __wbg_set_ship_morale(a: number, b: number): void;
+export function __wbg_get_ship_ammo(a: number): number;
+export function __wbg_set_ship_ammo(a: number, b: number): void;
+export function __wbg_get_ship_fuel(a: number): number;
+export function __wbg_set_ship_fuel(a: number, b: number): void;
+export function __wbg_get_ship_ship_type(a: number): number;
+export function __wbg_set_ship_ship_type(a: number, b: number): void;
+export function __wbg_get_ship_ctype(a: number): number;
+export function __wbg_set_ship_ctype(a: number, b: number): void;
+export function __wbg_get_ship_slots(a: number): number;
+export function __wbg_set_ship_slots(a: number, b: number): void;
+export function ship_naked_firepower(a: number): number;
+export function ship_naked_torpedo(a: number): number;
+export function ship_naked_armor(a: number): number;
+export function ship_naked_anti_air(a: number): number;
+export function ship_naked_evasion(a: number): number;
+export function ship_naked_asw(a: number): number;
+export function ship_naked_los(a: number): number;
+export function ship_firepower(a: number): number;
+export function ship_torpedo(a: number): number;
+export function ship_armor(a: number): number;
+export function ship_anti_air(a: number): number;
+export function ship_evasion(a: number): number;
+export function ship_asw(a: number): number;
+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_meta(a: number): number;
+export function ship_name(a: number, b: number): void;
+export function ship_yomi(a: number, b: number): void;
+export function ship_stype(a: number): number;
+export function ship_sort_id(a: number): number;
+export function ship_remodel_rank(a: number): number;
+export function ship_slotnum(a: number): number;
+export function ship_next_id(a: number): number;
+export function ship_useful(a: number): number;
+export function ship_damage_state(a: number): number;
+export function ship_morale_state(a: number): number;
+export function ship_category(a: number): number;
+export function ship_has_attr(a: number, b: number): number;
+export function ship_gear_keys(a: number): number;
+export function ship_get_gear(a: number, b: number, c: number): number;
+export function ship_get_damage_bound(a: number, b: number): number;
+export function ship_get_remaining_fuel(a: number, b: number, c: number): number;
+export function ship_get_remaining_ammo(a: number, b: number, c: number): number;
+export function ship_has_unknown_stat(a: number, b: number, c: number): number;
+export function ship_get_naked_stat(a: number, b: number, c: number): number;
+export function ship_get_stat_interval_left(a: number, b: number, c: number): number;
+export function ship_get_stat_interval_right(a: number, b: number, c: number): number;
+export function ship_get_gear_stat(a: number, b: number, c: number): number;
+export function ship_get_ebonus(a: number, b: number, c: number): number;
+export function ship_get_stat_mod(a: number, b: number, c: number): number;
+export function ship_is_abyssal(a: number): number;
+export function ship_is_submarine(a: number): number;
+export function ship_can_equip(a: number, b: number, c: number, d: number): number;
+export function ship_max_hp(a: number): number;
+export function ship_max_ammo(a: number): number;
+export function ship_max_fuel(a: number): number;
+export function ship_naked_range(a: number): number;
+export function ship_naked_speed(a: number): number;
+export function ship_luck(a: number): number;
+export function ship_range(a: number): number;
+export function ship_speed(a: number): number;
+export function ship_accuracy(a: number): number;
+export function ship_torpedo_accuracy_mod(a: number): number;
+export function ship_is_installation(a: number): number;
+export function ship_get_slot_size(a: number, b: number): number;
+export function ship_get_max_slot_size(a: number, b: number): number;
+export function ship_remaining_ammo_mod(a: number): number;
+export function ship_remaining_fuel_mod(a: number): number;
+export function ship_fighter_power(a: number, b: number, c: number): void;
+export function ship_fleet_los_factor(a: number, b: number): void;
+export function ship_fleet_anti_air_mod(a: number): number;
+export function ship_cruiser_fit_bonus(a: number): number;
+export function ship_fit_gun_bonus(a: number, b: number): number;
+export function ship_basic_accuracy_term(a: number, b: number): void;
+export function ship_basic_evasion_term(a: number, b: number): void;
+export function ship_evasion_term(a: number, b: number, c: number, d: number, e: number): void;
+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_take_damage(a: number, b: number): void;
 export function __wbindgen_malloc(a: number): number;
 export function __wbindgen_realloc(a: number, b: number, c: number): number;
 export function __wbindgen_add_to_stack_pointer(a: number): number;

package/package.json

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

package/pkg/fleethub_core.d.ts

@@ -95,6 +95,62 @@ export interface DamageInfo {
   damage_state_map: NumMap<DamageState, number>;
 }
 
+export interface BattleConfig {
+  formation: Record<Formation, NestedFormationDef>;
+  anti_air_cutin: Record<number, AntiAirCutinDef>;
+  day_cutin: Record<DayCutin, DayCutinDef>;
+  night_cutin: Record<NightCutin, NightCutinDef>;
+}
+
+export interface NightCutinDef {
+  tag: NightCutin;
+  hits: number;
+  type_factor: number | null;
+  power_mod: number | null;
+  accuracy_mod: number | null;
+}
+
+export interface DayCutinDef {
+  tag: DayCutin;
+  hits: number;
+  type_factor: number | null;
+  power_mod: number | null;
+  accuracy_mod: number | null;
+}
+
+export interface AntiAirCutinDef {
+  id: number;
+  type_factor: number | null;
+  multiplier: number | null;
+  guaranteed: number | null;
+  sequential: boolean | null;
+}
+
+export type NestedFormationDef =
+  | FormationDef
+  | { top_half: FormationDef; bottom_half: FormationDef };
+
+export interface FormationDef {
+  tag: Formation;
+  protection_rate: number | null;
+  fleet_anti_air_mod: number;
+  shelling: FormationWarfareDef;
+  torpedo: FormationWarfareDef;
+  asw: FormationWarfareDef;
+  night: FormationWarfareDef;
+  shelling_support: FormationWarfareDef;
+}
+
+export interface FormationWarfareDef {
+  power_mod: number | null;
+  accuracy_mod: number | null;
+  evasion_mod: number | null;
+}
+
+export type AirWaveType = "Jet" | "LandBase" | "Carrier";
+
+export type AswAttackType = "DepthCharge" | "Aircraft";
+
 export type OrgType =
   | "Single"
   | "CarrierTaskForce"
@@ -477,7 +533,7 @@ export type GearAttr =
   | "SurfaceRadar"
   | "AirRadar"
   | "DepthChargeProjector"
-  | "AdditionalDepthCharge"
+  | "SynergisticDepthCharge"
   | "AntiSubMortar"
   | "AntiSubWeapon"
   | "AntiSubAircraft"
@@ -557,8 +613,112 @@ export interface ShipAntiAirInfo {
   anti_air_propellant_barrage_chance: number | null;
 }
 
+export type ShipStateMap = Record<ShipKey, ShipState>;
+
+export type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
+
+export interface OrgState {
+  id?: string;
+  f1?: FleetState;
+  f2?: FleetState;
+  f3?: FleetState;
+  f4?: FleetState;
+  a1?: AirSquadronState;
+  a2?: AirSquadronState;
+  a3?: AirSquadronState;
+  hq_level?: number;
+  org_type?: OrgType;
+  sortie?: string;
+  route_sup?: string;
+  boss_sup?: string;
+}
+
+export interface AirSquadronState {
+  id?: string;
+  mode?: AirSquadronMode;
+  g1?: GearState;
+  g2?: GearState;
+  g3?: GearState;
+  g4?: GearState;
+  g5?: GearState;
+  gx?: GearState;
+  ss1?: number;
+  ss2?: number;
+  ss3?: number;
+  ss4?: number;
+  ss5?: number;
+}
+
+export type AirSquadronMode = "Sortie" | "AirDefense";
+
+export interface FleetState {
+  id?: string;
+  len?: number;
+  s1?: ShipState;
+  s2?: ShipState;
+  s3?: ShipState;
+  s4?: ShipState;
+  s5?: ShipState;
+  s6?: ShipState;
+  s7?: ShipState;
+}
+
+export interface ShipState {
+  id?: string;
+  ship_id: number;
+  level?: number;
+  current_hp?: number;
+  morale?: number;
+  ammo?: number;
+  fuel?: number;
+  max_hp_mod?: number;
+  firepower_mod?: number;
+  torpedo_mod?: number;
+  armor_mod?: number;
+  anti_air_mod?: number;
+  evasion_mod?: number;
+  asw_mod?: number;
+  los_mod?: number;
+  luck_mod?: number;
+  g1?: GearState;
+  g2?: GearState;
+  g3?: GearState;
+  g4?: GearState;
+  g5?: GearState;
+  gx?: GearState;
+  ss1?: number;
+  ss2?: number;
+  ss3?: number;
+  ss4?: number;
+  ss5?: number;
+  overrides?: ShipOverrides;
+}
+
+export interface ShipOverrides {
+  naked_max_hp?: number;
+  naked_luck?: number;
+  naked_evasion?: number;
+  naked_asw?: number;
+  naked_los?: number;
+}
+
+export interface GearState {
+  id?: string;
+  gear_id: number;
+  exp?: number;
+  stars?: number;
+}
+
 export type Side = "Player" | "Enemy";
 
+export type NightBattleAttackType =
+  | { t: "NightAttack"; c: NightAttackType }
+  | { t: "Asw"; c: AswAttackType };
+
+export type DayBattleAttackType =
+  | { t: "Shelling"; c: ShellingAttackType }
+  | { t: "Asw"; c: AswAttackType };
+
 export type NightAttackType = "Normal" | "ArkRoyal" | "Carrier";
 
 export type NightSpecialAttack =
@@ -622,14 +782,6 @@ export interface HitRateParams {
   hit_percentage_bonus: number;
 }
 
-export type NightBattleAttackType =
-  | { t: "NightAttack"; c: NightAttackType }
-  | { t: "Asw"; c: AswAttackType };
-
-export type DayBattleAttackType =
-  | { t: "Shelling"; c: ShellingAttackType }
-  | { t: "Asw"; c: AswAttackType };
-
 export interface WarfareInfo {
   day: AttackInfo<DayBattleAttackType, DayCutin | null> | null;
   closing_torpedo: AttackInfo<null, null> | null;
@@ -656,93 +808,6 @@ export interface WarfareAnalyzerShipEnvironment {
   custom_mods: CustomModifiers;
 }
 
-export type ShipStateMap = Record<ShipKey, ShipState>;
-
-export type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
-
-export interface OrgState {
-  id?: string;
-  f1?: FleetState;
-  f2?: FleetState;
-  f3?: FleetState;
-  f4?: FleetState;
-  a1?: AirSquadronState;
-  a2?: AirSquadronState;
-  a3?: AirSquadronState;
-  hq_level?: number;
-  org_type?: OrgType;
-  sortie?: string;
-  route_sup?: string;
-  boss_sup?: string;
-}
-
-export interface AirSquadronState {
-  id?: string;
-  mode?: AirSquadronMode;
-  g1?: GearState;
-  g2?: GearState;
-  g3?: GearState;
-  g4?: GearState;
-  g5?: GearState;
-  gx?: GearState;
-  ss1?: number;
-  ss2?: number;
-  ss3?: number;
-  ss4?: number;
-  ss5?: number;
-}
-
-export type AirSquadronMode = "Sortie" | "AirDefense";
-
-export interface FleetState {
-  id?: string;
-  len?: number;
-  s1?: ShipState;
-  s2?: ShipState;
-  s3?: ShipState;
-  s4?: ShipState;
-  s5?: ShipState;
-  s6?: ShipState;
-  s7?: ShipState;
-}
-
-export interface ShipState {
-  id?: string;
-  ship_id: number;
-  level?: number;
-  current_hp?: number;
-  morale?: number;
-  ammo?: number;
-  fuel?: number;
-  max_hp_mod?: number;
-  firepower_mod?: number;
-  torpedo_mod?: number;
-  armor_mod?: number;
-  anti_air_mod?: number;
-  evasion_mod?: number;
-  asw_mod?: number;
-  los_mod?: number;
-  luck_mod?: number;
-  g1?: GearState;
-  g2?: GearState;
-  g3?: GearState;
-  g4?: GearState;
-  g5?: GearState;
-  gx?: GearState;
-  ss1?: number;
-  ss2?: number;
-  ss3?: number;
-  ss4?: number;
-  ss5?: number;
-}
-
-export interface GearState {
-  id?: string;
-  gear_id: number;
-  exp?: number;
-  stars?: number;
-}
-
 export type GearTypeIdArray = [number, number, number, number, number];
 
 export type SlotSizeVec = (number | null)[];
@@ -807,62 +872,6 @@ export interface NightContactChance {
   total: number;
 }
 
-export interface BattleConfig {
-  formation: Record<Formation, NestedFormationDef>;
-  anti_air_cutin: Record<number, AntiAirCutinDef>;
-  day_cutin: Record<DayCutin, DayCutinDef>;
-  night_cutin: Record<NightCutin, NightCutinDef>;
-}
-
-export interface NightCutinDef {
-  tag: NightCutin;
-  hits: number;
-  chance_denom: number | null;
-  power_mod: number | null;
-  accuracy_mod: number | null;
-}
-
-export interface DayCutinDef {
-  tag: DayCutin;
-  hits: number;
-  chance_denom: number | null;
-  power_mod: number | null;
-  accuracy_mod: number | null;
-}
-
-export interface AntiAirCutinDef {
-  id: number;
-  chance_numer: number | null;
-  multiplier: number | null;
-  guaranteed: number | null;
-  sequential: boolean | null;
-}
-
-export type NestedFormationDef =
-  | FormationDef
-  | { top_half: FormationDef; bottom_half: FormationDef };
-
-export interface FormationDef {
-  tag: Formation;
-  protection_rate: number | null;
-  fleet_anti_air_mod: number;
-  shelling: FormationWarfareDef;
-  torpedo: FormationWarfareDef;
-  asw: FormationWarfareDef;
-  night: FormationWarfareDef;
-  shelling_support: FormationWarfareDef;
-}
-
-export interface FormationWarfareDef {
-  power_mod: number | null;
-  accuracy_mod: number | null;
-  evasion_mod: number | null;
-}
-
-export type AirWaveType = "Jet" | "LandBase" | "Carrier";
-
-export type AswAttackType = "DepthCharge" | "Aircraft";
-
 /**
  */
 export class AirSquadron {

package/pkg/fleethub_core_bg.js

@@ -117,21 +117,6 @@ const u32CvtShim = new Uint32Array(2);
 
 const uint64CvtShim = new BigUint64Array(u32CvtShim.buffer);
 
-function _assertClass(instance, klass) {
-    if (!(instance instanceof klass)) {
-        throw new Error(`expected instance of ${klass.name}`);
-    }
-    return instance.ptr;
-}
-
-let cachegetFloat64Memory0 = null;
-function getFloat64Memory0() {
-    if (cachegetFloat64Memory0 === null || cachegetFloat64Memory0.buffer !== wasm.memory.buffer) {
-        cachegetFloat64Memory0 = new Float64Array(wasm.memory.buffer);
-    }
-    return cachegetFloat64Memory0;
-}
-
 function isLikeNone(x) {
     return x === undefined || x === null;
 }
@@ -154,6 +139,14 @@ function getArrayJsValueFromWasm0(ptr, len) {
     return result;
 }
 
+let cachegetFloat64Memory0 = null;
+function getFloat64Memory0() {
+    if (cachegetFloat64Memory0 === null || cachegetFloat64Memory0.buffer !== wasm.memory.buffer) {
+        cachegetFloat64Memory0 = new Float64Array(wasm.memory.buffer);
+    }
+    return cachegetFloat64Memory0;
+}
+
 let cachegetUint16Memory0 = null;
 function getUint16Memory0() {
     if (cachegetUint16Memory0 === null || cachegetUint16Memory0.buffer !== wasm.memory.buffer) {
@@ -166,6 +159,13 @@ function getArrayU16FromWasm0(ptr, len) {
     return getUint16Memory0().subarray(ptr / 2, ptr / 2 + len);
 }
 
+function _assertClass(instance, klass) {
+    if (!(instance instanceof klass)) {
+        throw new Error(`expected instance of ${klass.name}`);
+    }
+    return instance.ptr;
+}
+
 function passArray16ToWasm0(arg, malloc) {
     const ptr = malloc(arg.length * 2);
     getUint16Memory0().set(arg, ptr / 2);
@@ -3231,7 +3231,7 @@ export function __wbindgen_object_drop_ref(arg0) {
     takeObject(arg0);
 };
 
-export function __wbg_createEquipmentBonuses_273b5cec732de9f9(arg0, arg1) {
+export function __wbg_createEquipmentBonuses_7e1c98f5e473fb02(arg0, arg1) {
     const ret = createEquipmentBonuses(takeObject(arg0), takeObject(arg1));
     return addHeapObject(ret);
 };

package/pkg/fleethub_core_bg.wasm.d.ts

@@ -1,101 +1,6 @@
 /* tslint:disable */
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
-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;
-export function __wbg_get_ship_xxh3(a: number, b: number): void;
-export function __wbg_set_ship_xxh3(a: number, b: number, c: number): void;
-export function __wbg_get_ship_ship_id(a: number): number;
-export function __wbg_set_ship_ship_id(a: number, b: number): void;
-export function __wbg_get_ship_level(a: number): number;
-export function __wbg_set_ship_level(a: number, b: number): void;
-export function __wbg_get_ship_current_hp(a: number): number;
-export function __wbg_set_ship_current_hp(a: number, b: number): void;
-export function __wbg_get_ship_morale(a: number): number;
-export function __wbg_set_ship_morale(a: number, b: number): void;
-export function __wbg_get_ship_ammo(a: number): number;
-export function __wbg_set_ship_ammo(a: number, b: number): void;
-export function __wbg_get_ship_fuel(a: number): number;
-export function __wbg_set_ship_fuel(a: number, b: number): void;
-export function __wbg_get_ship_ship_type(a: number): number;
-export function __wbg_set_ship_ship_type(a: number, b: number): void;
-export function __wbg_get_ship_ctype(a: number): number;
-export function __wbg_set_ship_ctype(a: number, b: number): void;
-export function __wbg_get_ship_slots(a: number): number;
-export function __wbg_set_ship_slots(a: number, b: number): void;
-export function ship_naked_firepower(a: number): number;
-export function ship_naked_torpedo(a: number): number;
-export function ship_naked_armor(a: number): number;
-export function ship_naked_anti_air(a: number): number;
-export function ship_naked_evasion(a: number): number;
-export function ship_naked_asw(a: number): number;
-export function ship_naked_los(a: number): number;
-export function ship_firepower(a: number): number;
-export function ship_torpedo(a: number): number;
-export function ship_armor(a: number): number;
-export function ship_anti_air(a: number): number;
-export function ship_evasion(a: number): number;
-export function ship_asw(a: number): number;
-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_meta(a: number): number;
-export function ship_name(a: number, b: number): void;
-export function ship_yomi(a: number, b: number): void;
-export function ship_stype(a: number): number;
-export function ship_sort_id(a: number): number;
-export function ship_remodel_rank(a: number): number;
-export function ship_slotnum(a: number): number;
-export function ship_next_id(a: number): number;
-export function ship_useful(a: number): number;
-export function ship_damage_state(a: number): number;
-export function ship_morale_state(a: number): number;
-export function ship_category(a: number): number;
-export function ship_has_attr(a: number, b: number): number;
-export function ship_gear_keys(a: number): number;
-export function ship_get_gear(a: number, b: number, c: number): number;
-export function ship_get_damage_bound(a: number, b: number): number;
-export function ship_get_remaining_fuel(a: number, b: number, c: number): number;
-export function ship_get_remaining_ammo(a: number, b: number, c: number): number;
-export function ship_has_unknown_stat(a: number, b: number, c: number): number;
-export function ship_get_naked_stat(a: number, b: number, c: number): number;
-export function ship_get_stat_interval_left(a: number, b: number, c: number): number;
-export function ship_get_stat_interval_right(a: number, b: number, c: number): number;
-export function ship_get_gear_stat(a: number, b: number, c: number): number;
-export function ship_get_ebonus(a: number, b: number, c: number): number;
-export function ship_get_stat_mod(a: number, b: number, c: number): number;
-export function ship_is_abyssal(a: number): number;
-export function ship_is_submarine(a: number): number;
-export function ship_can_equip(a: number, b: number, c: number, d: number): number;
-export function ship_max_hp(a: number): number;
-export function ship_max_ammo(a: number): number;
-export function ship_max_fuel(a: number): number;
-export function ship_naked_range(a: number): number;
-export function ship_naked_speed(a: number): number;
-export function ship_luck(a: number): number;
-export function ship_range(a: number): number;
-export function ship_speed(a: number): number;
-export function ship_accuracy(a: number): number;
-export function ship_torpedo_accuracy_mod(a: number): number;
-export function ship_is_installation(a: number): number;
-export function ship_get_slot_size(a: number, b: number): number;
-export function ship_get_max_slot_size(a: number, b: number): number;
-export function ship_remaining_ammo_mod(a: number): number;
-export function ship_remaining_fuel_mod(a: number): number;
-export function ship_fighter_power(a: number, b: number, c: number): void;
-export function ship_fleet_los_factor(a: number, b: number): void;
-export function ship_fleet_anti_air_mod(a: number): number;
-export function ship_cruiser_fit_bonus(a: number): number;
-export function ship_fit_gun_bonus(a: number, b: number): number;
-export function ship_basic_accuracy_term(a: number, b: number): void;
-export function ship_basic_evasion_term(a: number, b: number): void;
-export function ship_evasion_term(a: number, b: number, c: number, d: number, e: number): void;
-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_take_damage(a: number, b: number): void;
 export function __wbg_org_free(a: number): void;
 export function __wbg_get_org_id(a: number, b: number): void;
 export function __wbg_set_org_id(a: number, b: number, c: number): void;
@@ -337,6 +242,101 @@ export function gear_expedition_bonus(a: number): number;
 export function gear_can_be_deployed_to_land_base(a: number): number;
 export function gear_has_proficiency(a: number): number;
 export function set_panic_hook(): 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;
+export function __wbg_get_ship_xxh3(a: number, b: number): void;
+export function __wbg_set_ship_xxh3(a: number, b: number, c: number): void;
+export function __wbg_get_ship_ship_id(a: number): number;
+export function __wbg_set_ship_ship_id(a: number, b: number): void;
+export function __wbg_get_ship_level(a: number): number;
+export function __wbg_set_ship_level(a: number, b: number): void;
+export function __wbg_get_ship_current_hp(a: number): number;
+export function __wbg_set_ship_current_hp(a: number, b: number): void;
+export function __wbg_get_ship_morale(a: number): number;
+export function __wbg_set_ship_morale(a: number, b: number): void;
+export function __wbg_get_ship_ammo(a: number): number;
+export function __wbg_set_ship_ammo(a: number, b: number): void;
+export function __wbg_get_ship_fuel(a: number): number;
+export function __wbg_set_ship_fuel(a: number, b: number): void;
+export function __wbg_get_ship_ship_type(a: number): number;
+export function __wbg_set_ship_ship_type(a: number, b: number): void;
+export function __wbg_get_ship_ctype(a: number): number;
+export function __wbg_set_ship_ctype(a: number, b: number): void;
+export function __wbg_get_ship_slots(a: number): number;
+export function __wbg_set_ship_slots(a: number, b: number): void;
+export function ship_naked_firepower(a: number): number;
+export function ship_naked_torpedo(a: number): number;
+export function ship_naked_armor(a: number): number;
+export function ship_naked_anti_air(a: number): number;
+export function ship_naked_evasion(a: number): number;
+export function ship_naked_asw(a: number): number;
+export function ship_naked_los(a: number): number;
+export function ship_firepower(a: number): number;
+export function ship_torpedo(a: number): number;
+export function ship_armor(a: number): number;
+export function ship_anti_air(a: number): number;
+export function ship_evasion(a: number): number;
+export function ship_asw(a: number): number;
+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_meta(a: number): number;
+export function ship_name(a: number, b: number): void;
+export function ship_yomi(a: number, b: number): void;
+export function ship_stype(a: number): number;
+export function ship_sort_id(a: number): number;
+export function ship_remodel_rank(a: number): number;
+export function ship_slotnum(a: number): number;
+export function ship_next_id(a: number): number;
+export function ship_useful(a: number): number;
+export function ship_damage_state(a: number): number;
+export function ship_morale_state(a: number): number;
+export function ship_category(a: number): number;
+export function ship_has_attr(a: number, b: number): number;
+export function ship_gear_keys(a: number): number;
+export function ship_get_gear(a: number, b: number, c: number): number;
+export function ship_get_damage_bound(a: number, b: number): number;
+export function ship_get_remaining_fuel(a: number, b: number, c: number): number;
+export function ship_get_remaining_ammo(a: number, b: number, c: number): number;
+export function ship_has_unknown_stat(a: number, b: number, c: number): number;
+export function ship_get_naked_stat(a: number, b: number, c: number): number;
+export function ship_get_stat_interval_left(a: number, b: number, c: number): number;
+export function ship_get_stat_interval_right(a: number, b: number, c: number): number;
+export function ship_get_gear_stat(a: number, b: number, c: number): number;
+export function ship_get_ebonus(a: number, b: number, c: number): number;
+export function ship_get_stat_mod(a: number, b: number, c: number): number;
+export function ship_is_abyssal(a: number): number;
+export function ship_is_submarine(a: number): number;
+export function ship_can_equip(a: number, b: number, c: number, d: number): number;
+export function ship_max_hp(a: number): number;
+export function ship_max_ammo(a: number): number;
+export function ship_max_fuel(a: number): number;
+export function ship_naked_range(a: number): number;
+export function ship_naked_speed(a: number): number;
+export function ship_luck(a: number): number;
+export function ship_range(a: number): number;
+export function ship_speed(a: number): number;
+export function ship_accuracy(a: number): number;
+export function ship_torpedo_accuracy_mod(a: number): number;
+export function ship_is_installation(a: number): number;
+export function ship_get_slot_size(a: number, b: number): number;
+export function ship_get_max_slot_size(a: number, b: number): number;
+export function ship_remaining_ammo_mod(a: number): number;
+export function ship_remaining_fuel_mod(a: number): number;
+export function ship_fighter_power(a: number, b: number, c: number): void;
+export function ship_fleet_los_factor(a: number, b: number): void;
+export function ship_fleet_anti_air_mod(a: number): number;
+export function ship_cruiser_fit_bonus(a: number): number;
+export function ship_fit_gun_bonus(a: number, b: number): number;
+export function ship_basic_accuracy_term(a: number, b: number): void;
+export function ship_basic_evasion_term(a: number, b: number): void;
+export function ship_evasion_term(a: number, b: number, c: number, d: number, e: number): void;
+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_take_damage(a: number, b: number): void;
 export function __wbindgen_malloc(a: number): number;
 export function __wbindgen_realloc(a: number, b: number, c: number): number;
 export function __wbindgen_add_to_stack_pointer(a: number): number;