fleethub-core 1.7.2 → 1.7.6

package/pkg/fleethub_core.d.ts

@@ -3,104 +3,266 @@
 /**
  */
 export function set_panic_hook(): void;
+declare namespace ShipType {
+  export type Unknown = "Unknown";
+  export type DE = "DE";
+  export type DD = "DD";
+  export type CL = "CL";
+  export type CLT = "CLT";
+  export type CA = "CA";
+  export type CAV = "CAV";
+  export type CVL = "CVL";
+  export type FBB = "FBB";
+  export type BB = "BB";
+  export type BBV = "BBV";
+  export type CV = "CV";
+  export type XBB = "XBB";
+  export type SS = "SS";
+  export type SSV = "SSV";
+  export type AP = "AP";
+  export type AV = "AV";
+  export type LHA = "LHA";
+  export type CVB = "CVB";
+  export type AR = "AR";
+  export type AS = "AS";
+  export type CT = "CT";
+  export type AO = "AO";
+}
+
 export type ShipType =
-  | "Unknown"
-  | "DE"
-  | "DD"
-  | "CL"
-  | "CLT"
-  | "CA"
-  | "CAV"
-  | "CVL"
-  | "FBB"
-  | "BB"
-  | "BBV"
-  | "CV"
-  | "XBB"
-  | "SS"
-  | "SSV"
-  | "AP"
-  | "AV"
-  | "LHA"
-  | "CVB"
-  | "AR"
-  | "AS"
-  | "CT"
-  | "AO";
+  | ShipType.Unknown
+  | ShipType.DE
+  | ShipType.DD
+  | ShipType.CL
+  | ShipType.CLT
+  | ShipType.CA
+  | ShipType.CAV
+  | ShipType.CVL
+  | ShipType.FBB
+  | ShipType.BB
+  | ShipType.BBV
+  | ShipType.CV
+  | ShipType.XBB
+  | ShipType.SS
+  | ShipType.SSV
+  | ShipType.AP
+  | ShipType.AV
+  | ShipType.LHA
+  | ShipType.CVB
+  | ShipType.AR
+  | ShipType.AS
+  | ShipType.CT
+  | ShipType.AO;
+
+declare namespace ShipCategory {
+  export type Battleship = "Battleship";
+  export type AircraftCarrier = "AircraftCarrier";
+  export type HeavyCruiser = "HeavyCruiser";
+  export type LightCruiser = "LightCruiser";
+  export type Destroyer = "Destroyer";
+  export type CoastalDefenseShip = "CoastalDefenseShip";
+  export type Submarine = "Submarine";
+  export type AuxiliaryShip = "AuxiliaryShip";
+}
 
 export type ShipCategory =
-  | "Battleship"
-  | "AircraftCarrier"
-  | "HeavyCruiser"
-  | "LightCruiser"
-  | "Destroyer"
-  | "CoastalDefenseShip"
-  | "Submarine"
-  | "AuxiliaryShip";
+  | ShipCategory.Battleship
+  | ShipCategory.AircraftCarrier
+  | ShipCategory.HeavyCruiser
+  | ShipCategory.LightCruiser
+  | ShipCategory.Destroyer
+  | ShipCategory.CoastalDefenseShip
+  | ShipCategory.Submarine
+  | ShipCategory.AuxiliaryShip;
+
+type __ShellingSpecialAttackDayCutin = DayCutin;
+type __ShellingSpecialAttackFleetCutin = FleetCutin;
+declare namespace ShellingSpecialAttack {
+  export type DayCutin = { DayCutin: __ShellingSpecialAttackDayCutin };
+  export type FleetCutin = { FleetCutin: __ShellingSpecialAttackFleetCutin };
+}
 
 export type ShellingSpecialAttack =
-  | { DayCutin: DayCutin }
-  | { FleetCutin: FleetCutin };
+  | ShellingSpecialAttack.DayCutin
+  | ShellingSpecialAttack.FleetCutin;
+
+declare namespace DayCutin {
+  export type MainMain = "MainMain";
+  export type MainAp = "MainAp";
+  export type MainRadar = "MainRadar";
+  export type MainSec = "MainSec";
+  export type DoubleAttack = "DoubleAttack";
+  export type FBA = "FBA";
+  export type BBA = "BBA";
+  export type BA = "BA";
+  export type Zuiun = "Zuiun";
+  export type AirSea = "AirSea";
+}
 
 export type DayCutin =
-  | "MainMain"
-  | "MainAp"
-  | "MainRadar"
-  | "MainSec"
-  | "DoubleAttack"
-  | "FBA"
-  | "BBA"
-  | "BA"
-  | "Zuiun"
-  | "AirSea";
+  | DayCutin.MainMain
+  | DayCutin.MainAp
+  | DayCutin.MainRadar
+  | DayCutin.MainSec
+  | DayCutin.DoubleAttack
+  | DayCutin.FBA
+  | DayCutin.BBA
+  | DayCutin.BA
+  | DayCutin.Zuiun
+  | DayCutin.AirSea;
+
+declare namespace ShellingAttackType {
+  export type Normal = "Normal";
+  export type Carrier = "Carrier";
+}
+
+export type ShellingAttackType =
+  | ShellingAttackType.Normal
+  | ShellingAttackType.Carrier;
 
-export interface ShellingSupportSimulatorParams {
-  attacker_formation: Formation;
-  target_formation: Formation;
-  engagement: Engagement;
-  custom_mods: CustomModifiers;
+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;
+}
+
+declare namespace SpecialEnemyType {
+  export type None = "None";
+  export type SoftSkinned = "SoftSkinned";
+  export type Pillbox = "Pillbox";
+  export type IsolatedIsland = "IsolatedIsland";
+  export type SupplyDepot = "SupplyDepot";
+  export type HarbourSummerPrincess = "HarbourSummerPrincess";
+  export type PtImp = "PtImp";
+  export type BattleshipSummerPrincess = "BattleshipSummerPrincess";
+  export type HeavyCruiserSummerPrincess = "HeavyCruiserSummerPrincess";
+}
 
-export type AswAttackType = "DepthCharge" | "Aircraft";
+export type SpecialEnemyType =
+  | SpecialEnemyType.None
+  | SpecialEnemyType.SoftSkinned
+  | SpecialEnemyType.Pillbox
+  | SpecialEnemyType.IsolatedIsland
+  | SpecialEnemyType.SupplyDepot
+  | SpecialEnemyType.HarbourSummerPrincess
+  | SpecialEnemyType.PtImp
+  | SpecialEnemyType.BattleshipSummerPrincess
+  | SpecialEnemyType.HeavyCruiserSummerPrincess;
+
+declare namespace MoraleState {
+  export type Sparkle = "Sparkle";
+  export type Normal = "Normal";
+  export type Orange = "Orange";
+  export type Red = "Red";
+}
+
+export type MoraleState =
+  | MoraleState.Sparkle
+  | MoraleState.Normal
+  | MoraleState.Orange
+  | MoraleState.Red;
+
+declare namespace DamageState {
+  export type Normal = "Normal";
+  export type Shouha = "Shouha";
+  export type Chuuha = "Chuuha";
+  export type Taiha = "Taiha";
+  export type Sunk = "Sunk";
+}
+
+export type DamageState =
+  | DamageState.Normal
+  | DamageState.Shouha
+  | DamageState.Chuuha
+  | DamageState.Taiha
+  | DamageState.Sunk;
+
+declare namespace SpeedGroup {
+  export type A = "A";
+  export type B1 = "B1";
+  export type B2 = "B2";
+  export type C = "C";
+}
+
+export type SpeedGroup =
+  | SpeedGroup.A
+  | SpeedGroup.B1
+  | SpeedGroup.B2
+  | SpeedGroup.C;
+
+declare namespace AswAttackType {
+  export type DepthCharge = "DepthCharge";
+  export type Aircraft = "Aircraft";
+}
+
+export type AswAttackType = AswAttackType.DepthCharge | AswAttackType.Aircraft;
+
+declare namespace OrgType {
+  export type Single = "Single";
+  export type CarrierTaskForce = "CarrierTaskForce";
+  export type SurfaceTaskForce = "SurfaceTaskForce";
+  export type TransportEscort = "TransportEscort";
+  export type EnemySingle = "EnemySingle";
+  export type EnemyCombined = "EnemyCombined";
+}
 
 export type OrgType =
-  | "Single"
-  | "CarrierTaskForce"
-  | "SurfaceTaskForce"
-  | "TransportEscort"
-  | "EnemySingle"
-  | "EnemyCombined";
+  | OrgType.Single
+  | OrgType.CarrierTaskForce
+  | OrgType.SurfaceTaskForce
+  | OrgType.TransportEscort
+  | OrgType.EnemySingle
+  | OrgType.EnemyCombined;
+
+declare namespace FleetCutin {
+  export type NelsonTouch = "NelsonTouch";
+  export type NagatoCutin = "NagatoCutin";
+  export type ColoradoCutin = "ColoradoCutin";
+  export type KongouCutin = "KongouCutin";
+  export type Yamato2ShipCutin = "Yamato2ShipCutin";
+  export type Yamato3ShipCutin = "Yamato3ShipCutin";
+}
 
 export type FleetCutin =
-  | "NelsonTouch"
-  | "NagatoCutin"
-  | "ColoradoCutin"
-  | "KongouCutin"
-  | "Yamato2ShipCutin"
-  | "Yamato3ShipCutin";
+  | FleetCutin.NelsonTouch
+  | FleetCutin.NagatoCutin
+  | FleetCutin.ColoradoCutin
+  | FleetCutin.KongouCutin
+  | FleetCutin.Yamato2ShipCutin
+  | FleetCutin.Yamato3ShipCutin;
 
-export interface WarfareContext {
-  attacker_env: WarfareShipEnvironment;
-  target_env: WarfareShipEnvironment;
-  engagement: Engagement;
-  air_state: AirState;
-  custom_mods: CustomModifiers;
+declare namespace AirWaveType {
+  export type Jet = "Jet";
+  export type LandBase = "LandBase";
+  export type Carrier = "Carrier";
 }
 
-export interface WarfareShipEnvironment {
-  org_type: OrgType;
-  role: Role;
-  ship_index: number;
-  fleet_len: number;
-  formation: Formation;
-  fleet_los_mod: number | null;
+export type AirWaveType =
+  | AirWaveType.Jet
+  | AirWaveType.LandBase
+  | AirWaveType.Carrier;
+
+export type NumMap<K, V> = Partial<Record<K, V>>;
+
+declare namespace Role {
+  export type Main = "Main";
+  export type Escort = "Escort";
 }
 
-export type Role = "Main" | "Escort";
+export type Role = Role.Main | Role.Escort;
 
 export interface CompMeta {
   fleets: Record<FleetType, FleetMeta>;
@@ -117,52 +279,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>[];
@@ -189,6 +305,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;
@@ -211,84 +343,170 @@ export interface DayCutinRateInfo {
   total_cutin_rate: number | null;
 }
 
-export type NumMap<K, V> = Partial<Record<K, V>>;
+declare namespace GearCategory {
+  export type Fighter = "Fighter";
+  export type Bomber = "Bomber";
+  export type Recon = "Recon";
+  export type MainGun = "MainGun";
+  export type Secondary = "Secondary";
+  export type Torpedo = "Torpedo";
+  export type AntiSub = "AntiSub";
+  export type Radar = "Radar";
+  export type Landing = "Landing";
+  export type Ration = "Ration";
+  export type LandBased = "LandBased";
+  export type Misc = "Misc";
+}
 
 export type GearCategory =
-  | "Fighter"
-  | "Bomber"
-  | "Recon"
-  | "MainGun"
-  | "Secondary"
-  | "Torpedo"
-  | "AntiSub"
-  | "Radar"
-  | "Landing"
-  | "Ration"
-  | "LandBased"
-  | "Misc";
+  | GearCategory.Fighter
+  | GearCategory.Bomber
+  | GearCategory.Recon
+  | GearCategory.MainGun
+  | GearCategory.Secondary
+  | GearCategory.Torpedo
+  | GearCategory.AntiSub
+  | GearCategory.Radar
+  | GearCategory.Landing
+  | GearCategory.Ration
+  | GearCategory.LandBased
+  | GearCategory.Misc;
+
+declare namespace GearType {
+  export type Unknown = "Unknown";
+  export type SmallMainGun = "SmallMainGun";
+  export type MediumMainGun = "MediumMainGun";
+  export type LargeMainGun = "LargeMainGun";
+  export type SecondaryGun = "SecondaryGun";
+  export type Torpedo = "Torpedo";
+  export type CbFighter = "CbFighter";
+  export type CbDiveBomber = "CbDiveBomber";
+  export type CbTorpedoBomber = "CbTorpedoBomber";
+  export type CbRecon = "CbRecon";
+  export type ReconSeaplane = "ReconSeaplane";
+  export type SeaplaneBomber = "SeaplaneBomber";
+  export type SmallRadar = "SmallRadar";
+  export type LargeRadar = "LargeRadar";
+  export type Sonar = "Sonar";
+  export type DepthCharge = "DepthCharge";
+  export type ExtraArmor = "ExtraArmor";
+  export type Engine = "Engine";
+  export type AntiAirShell = "AntiAirShell";
+  export type ApShell = "ApShell";
+  export type VtFuze = "VtFuze";
+  export type AntiAirGun = "AntiAirGun";
+  export type MidgetSubmarine = "MidgetSubmarine";
+  export type EmergencyRepair = "EmergencyRepair";
+  export type LandingCraft = "LandingCraft";
+  export type Rotorcraft = "Rotorcraft";
+  export type AntiSubPatrolAircraft = "AntiSubPatrolAircraft";
+  export type MediumArmor = "MediumArmor";
+  export type LargeArmor = "LargeArmor";
+  export type Searchlight = "Searchlight";
+  export type SupplyContainer = "SupplyContainer";
+  export type ShipRepairFacility = "ShipRepairFacility";
+  export type SubmarineTorpedo = "SubmarineTorpedo";
+  export type Starshell = "Starshell";
+  export type CommandFacility = "CommandFacility";
+  export type AviationPersonnel = "AviationPersonnel";
+  export type AntiAirFireDirector = "AntiAirFireDirector";
+  export type AntiGroundEquipment = "AntiGroundEquipment";
+  export type LargeMainGun2 = "LargeMainGun2";
+  export type ShipPersonnel = "ShipPersonnel";
+  export type LargeSonar = "LargeSonar";
+  export type LargeFlyingBoat = "LargeFlyingBoat";
+  export type LargeSearchlight = "LargeSearchlight";
+  export type CombatRation = "CombatRation";
+  export type Supplies = "Supplies";
+  export type SeaplaneFighter = "SeaplaneFighter";
+  export type AmphibiousTank = "AmphibiousTank";
+  export type LbAttacker = "LbAttacker";
+  export type LbFighter = "LbFighter";
+  export type LbRecon = "LbRecon";
+  export type TransportationMaterial = "TransportationMaterial";
+  export type SubmarineEquipment = "SubmarineEquipment";
+  export type LargeLbAircraft = "LargeLbAircraft";
+  export type JetFighter = "JetFighter";
+  export type JetFighterBomber = "JetFighterBomber";
+  export type JetTorpedoBomber = "JetTorpedoBomber";
+  export type JetRecon = "JetRecon";
+  export type LargeRadar2 = "LargeRadar2";
+  export type CbRecon2 = "CbRecon2";
+}
 
 export type GearType =
-  | "Unknown"
-  | "SmallMainGun"
-  | "MediumMainGun"
-  | "LargeMainGun"
-  | "SecondaryGun"
-  | "Torpedo"
-  | "CbFighter"
-  | "CbDiveBomber"
-  | "CbTorpedoBomber"
-  | "CbRecon"
-  | "ReconSeaplane"
-  | "SeaplaneBomber"
-  | "SmallRadar"
-  | "LargeRadar"
-  | "Sonar"
-  | "DepthCharge"
-  | "ExtraArmor"
-  | "Engine"
-  | "AntiAirShell"
-  | "ApShell"
-  | "VtFuze"
-  | "AntiAirGun"
-  | "MidgetSubmarine"
-  | "EmergencyRepair"
-  | "LandingCraft"
-  | "Rotorcraft"
-  | "AntiSubPatrolAircraft"
-  | "MediumArmor"
-  | "LargeArmor"
-  | "Searchlight"
-  | "SupplyContainer"
-  | "ShipRepairFacility"
-  | "SubmarineTorpedo"
-  | "Starshell"
-  | "CommandFacility"
-  | "AviationPersonnel"
-  | "AntiAirFireDirector"
-  | "AntiGroundEquipment"
-  | "LargeMainGun2"
-  | "ShipPersonnel"
-  | "LargeSonar"
-  | "LargeFlyingBoat"
-  | "LargeSearchlight"
-  | "CombatRation"
-  | "Supplies"
-  | "SeaplaneFighter"
-  | "AmphibiousTank"
-  | "LbAttacker"
-  | "LbFighter"
-  | "LbRecon"
-  | "TransportationMaterial"
-  | "SubmarineEquipment"
-  | "LargeLbAircraft"
-  | "JetFighter"
-  | "JetFighterBomber"
-  | "JetTorpedoBomber"
-  | "JetRecon"
-  | "LargeRadar2"
-  | "CbRecon2";
-
-export type Engagement = "GreenT" | "Parallel" | "HeadOn" | "RedT";
+  | GearType.Unknown
+  | GearType.SmallMainGun
+  | GearType.MediumMainGun
+  | GearType.LargeMainGun
+  | GearType.SecondaryGun
+  | GearType.Torpedo
+  | GearType.CbFighter
+  | GearType.CbDiveBomber
+  | GearType.CbTorpedoBomber
+  | GearType.CbRecon
+  | GearType.ReconSeaplane
+  | GearType.SeaplaneBomber
+  | GearType.SmallRadar
+  | GearType.LargeRadar
+  | GearType.Sonar
+  | GearType.DepthCharge
+  | GearType.ExtraArmor
+  | GearType.Engine
+  | GearType.AntiAirShell
+  | GearType.ApShell
+  | GearType.VtFuze
+  | GearType.AntiAirGun
+  | GearType.MidgetSubmarine
+  | GearType.EmergencyRepair
+  | GearType.LandingCraft
+  | GearType.Rotorcraft
+  | GearType.AntiSubPatrolAircraft
+  | GearType.MediumArmor
+  | GearType.LargeArmor
+  | GearType.Searchlight
+  | GearType.SupplyContainer
+  | GearType.ShipRepairFacility
+  | GearType.SubmarineTorpedo
+  | GearType.Starshell
+  | GearType.CommandFacility
+  | GearType.AviationPersonnel
+  | GearType.AntiAirFireDirector
+  | GearType.AntiGroundEquipment
+  | GearType.LargeMainGun2
+  | GearType.ShipPersonnel
+  | GearType.LargeSonar
+  | GearType.LargeFlyingBoat
+  | GearType.LargeSearchlight
+  | GearType.CombatRation
+  | GearType.Supplies
+  | GearType.SeaplaneFighter
+  | GearType.AmphibiousTank
+  | GearType.LbAttacker
+  | GearType.LbFighter
+  | GearType.LbRecon
+  | GearType.TransportationMaterial
+  | GearType.SubmarineEquipment
+  | GearType.LargeLbAircraft
+  | GearType.JetFighter
+  | GearType.JetFighterBomber
+  | GearType.JetTorpedoBomber
+  | GearType.JetRecon
+  | GearType.LargeRadar2
+  | GearType.CbRecon2;
+
+declare namespace Engagement {
+  export type GreenT = "GreenT";
+  export type Parallel = "Parallel";
+  export type HeadOn = "HeadOn";
+  export type RedT = "RedT";
+}
+
+export type Engagement =
+  | Engagement.GreenT
+  | Engagement.Parallel
+  | Engagement.HeadOn
+  | Engagement.RedT;
 
 export interface EBonuses {
   firepower: number;
@@ -330,14 +548,39 @@ export interface GearInput {
 
 export type GearVecInput = GearInput[];
 
-export type AirStateRank = "Rank0" | "Rank1" | "Rank2" | "Rank3";
+declare namespace AirStateRank {
+  export type Rank0 = "Rank0";
+  export type Rank1 = "Rank1";
+  export type Rank2 = "Rank2";
+  export type Rank3 = "Rank3";
+}
+
+export type AirStateRank =
+  | AirStateRank.Rank0
+  | AirStateRank.Rank1
+  | AirStateRank.Rank2
+  | AirStateRank.Rank3;
+
+declare namespace AirState {
+  export type AirSupremacy = "AirSupremacy";
+  export type AirSuperiority = "AirSuperiority";
+  export type AirParity = "AirParity";
+  export type AirDenial = "AirDenial";
+  export type AirIncapability = "AirIncapability";
+}
 
 export type AirState =
-  | "AirSupremacy"
-  | "AirSuperiority"
-  | "AirParity"
-  | "AirDenial"
-  | "AirIncapability";
+  | AirState.AirSupremacy
+  | AirState.AirSuperiority
+  | AirState.AirParity
+  | AirState.AirDenial
+  | AirState.AirIncapability;
+
+export interface ShellingSupportSimulatorParams {
+  attacker_formation: Formation;
+  target_formation: Formation;
+  engagement: Engagement;
+}
 
 export interface MasterIBonuses {
   shelling_power: MasterIBonusRule[];
@@ -369,25 +612,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;
@@ -401,39 +625,134 @@ export interface DamageInfo {
   damage_state_map: NumMap<DamageState, number>;
 }
 
+declare namespace ShipAttr {
+  export type Unknown = "Unknown";
+  export type Abyssal = "Abyssal";
+  export type NightCarrier = "NightCarrier";
+  export type Installation = "Installation";
+  export type RoyalNavy = "RoyalNavy";
+  export type Kai2 = "Kai2";
+  export type TurbineSpeedBonus = "TurbineSpeedBonus";
+  export type Pillbox = "Pillbox";
+  export type IsolatedIsland = "IsolatedIsland";
+  export type HarbourSummerPrincess = "HarbourSummerPrincess";
+  export type SupplyDepot = "SupplyDepot";
+  export type PtImp = "PtImp";
+  export type BattleshipSummerPrincess = "BattleshipSummerPrincess";
+  export type HeavyCruiserSummerPrincess = "HeavyCruiserSummerPrincess";
+}
+
 export type ShipAttr =
-  | "Unknown"
-  | "Abyssal"
-  | "NightCarrier"
-  | "Installation"
-  | "RoyalNavy"
-  | "Kai2"
-  | "TurbineSpeedBonus"
-  | "Pillbox"
-  | "IsolatedIsland"
-  | "HarbourSummerPrincess"
-  | "SupplyDepot"
-  | "PtImp"
-  | "BattleshipSummerPrincess"
-  | "HeavyCruiserSummerPrincess";
-
-export type Formation = SingleFormation | CombinedFormation;
+  | ShipAttr.Unknown
+  | ShipAttr.Abyssal
+  | ShipAttr.NightCarrier
+  | ShipAttr.Installation
+  | ShipAttr.RoyalNavy
+  | ShipAttr.Kai2
+  | ShipAttr.TurbineSpeedBonus
+  | ShipAttr.Pillbox
+  | ShipAttr.IsolatedIsland
+  | ShipAttr.HarbourSummerPrincess
+  | ShipAttr.SupplyDepot
+  | ShipAttr.PtImp
+  | ShipAttr.BattleshipSummerPrincess
+  | ShipAttr.HeavyCruiserSummerPrincess;
+
+type __FormationCombinedFormation = CombinedFormation;
+type __FormationSingleFormation = SingleFormation;
+declare namespace Formation {
+  export type Single = __FormationSingleFormation;
+  export type Combined = __FormationCombinedFormation;
+}
+
+export type Formation = Formation.Single | Formation.Combined;
+
+declare namespace CombinedFormation {
+  export type Cruising1 = "Cruising1";
+  export type Cruising2 = "Cruising2";
+  export type Cruising3 = "Cruising3";
+  export type Cruising4 = "Cruising4";
+}
 
 export type CombinedFormation =
-  | "Cruising1"
-  | "Cruising2"
-  | "Cruising3"
-  | "Cruising4";
+  | CombinedFormation.Cruising1
+  | CombinedFormation.Cruising2
+  | CombinedFormation.Cruising3
+  | CombinedFormation.Cruising4;
+
+declare namespace SingleFormation {
+  export type LineAhead = "LineAhead";
+  export type DoubleLine = "DoubleLine";
+  export type Diamond = "Diamond";
+  export type Echelon = "Echelon";
+  export type LineAbreast = "LineAbreast";
+  export type Vanguard = "Vanguard";
+}
 
 export type SingleFormation =
-  | "LineAhead"
-  | "DoubleLine"
-  | "Diamond"
-  | "Echelon"
-  | "LineAbreast"
-  | "Vanguard";
+  | SingleFormation.LineAhead
+  | SingleFormation.DoubleLine
+  | SingleFormation.Diamond
+  | SingleFormation.Echelon
+  | SingleFormation.LineAbreast
+  | SingleFormation.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 type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
+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;
@@ -467,62 +786,89 @@ export interface AirstrikeContactChance {
 
 export type SlotSizeVec = (number | null)[];
 
-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 interface MasterGear {
-  gear_id: number;
-  name: string;
-  types: GearTypeIdArray;
-  special_type?: number;
-  max_hp?: number;
-  firepower?: number;
-  armor?: number;
-  torpedo?: number;
-  anti_air?: number;
-  speed?: number;
-  bombing?: number;
-  asw?: number;
-  los?: number;
-  luck?: number;
-  accuracy?: number;
-  evasion?: number;
-  range?: number;
-  radius?: number;
-  cost?: number;
-  improvable?: boolean;
-  ship_anti_air_resistance?: number;
-  fleet_anti_air_resistance?: number;
+declare namespace Side {
+  export type Player = "Player";
+  export type Enemy = "Enemy";
+}
+
+export type Side = Side.Player | Side.Enemy;
+
+declare namespace GearAttr {
+  export type Unknown = "Unknown";
+  export type Abyssal = "Abyssal";
+  export type HighAngleMount = "HighAngleMount";
+  export type NightFighter = "NightFighter";
+  export type NightAttacker = "NightAttacker";
+  export type HeavyBomber = "HeavyBomber";
+  export type MainGun = "MainGun";
+  export type Radar = "Radar";
+  export type SurfaceRadar = "SurfaceRadar";
+  export type AirRadar = "AirRadar";
+  export type DepthChargeProjector = "DepthChargeProjector";
+  export type SynergisticDepthCharge = "SynergisticDepthCharge";
+  export type AntiSubMortar = "AntiSubMortar";
+  export type AntiSubWeapon = "AntiSubWeapon";
+  export type AntiSubAircraft = "AntiSubAircraft";
+  export type LateModelBowTorpedo = "LateModelBowTorpedo";
+  export type Seaplane = "Seaplane";
+  export type CbAircraft = "CbAircraft";
+  export type LbAircraft = "LbAircraft";
+  export type JetAircraft = "JetAircraft";
+  export type Fighter = "Fighter";
+  export type Recon = "Recon";
+  export type ObservationSeaplane = "ObservationSeaplane";
+  export type CbFighterBomber = "CbFighterBomber";
+  export type AntiInstDiveBomber = "AntiInstDiveBomber";
+  export type NightRecon = "NightRecon";
+  export type CbSwordfish = "CbSwordfish";
+  export type SemiNightPlane = "SemiNightPlane";
+  export type HighAltitudeInterceptor = "HighAltitudeInterceptor";
 }
 
+export type GearAttr =
+  | GearAttr.Unknown
+  | GearAttr.Abyssal
+  | GearAttr.HighAngleMount
+  | GearAttr.NightFighter
+  | GearAttr.NightAttacker
+  | GearAttr.HeavyBomber
+  | GearAttr.MainGun
+  | GearAttr.Radar
+  | GearAttr.SurfaceRadar
+  | GearAttr.AirRadar
+  | GearAttr.DepthChargeProjector
+  | GearAttr.SynergisticDepthCharge
+  | GearAttr.AntiSubMortar
+  | GearAttr.AntiSubWeapon
+  | GearAttr.AntiSubAircraft
+  | GearAttr.LateModelBowTorpedo
+  | GearAttr.Seaplane
+  | GearAttr.CbAircraft
+  | GearAttr.LbAircraft
+  | GearAttr.JetAircraft
+  | GearAttr.Fighter
+  | GearAttr.Recon
+  | GearAttr.ObservationSeaplane
+  | GearAttr.CbFighterBomber
+  | GearAttr.AntiInstDiveBomber
+  | GearAttr.NightRecon
+  | GearAttr.CbSwordfish
+  | GearAttr.SemiNightPlane
+  | GearAttr.HighAltitudeInterceptor;
+
+declare namespace FleetType {
+  export type Main = "Main";
+  export type Escort = "Escort";
+  export type RouteSup = "RouteSup";
+  export type BossSup = "BossSup";
+}
+
+export type FleetType =
+  | FleetType.Main
+  | FleetType.Escort
+  | FleetType.RouteSup
+  | FleetType.BossSup;
+
 export interface MasterEquippable {
   equip_stype: EquipStype[];
   equip_exslot: number[];
@@ -545,28 +891,33 @@ export interface EquipStype {
   equip_type: number[];
 }
 
-export interface HitRate {
-  total: number;
-  normal: number;
-  critical: number;
-}
-
-export interface HitRateParams {
-  accuracy_term: number;
-  evasion_term: number;
-  target_morale_mod: number;
-  critical_rate_constant: number;
-  critical_percentage_bonus: number;
-  hit_percentage_bonus: number;
+type __NightBattleAttackTypeAswAttackType = AswAttackType;
+type __NightBattleAttackTypeNightAttackType = NightAttackType;
+declare namespace NightBattleAttackType {
+  export type NightAttack = {
+    t: "NightAttack";
+    c: __NightBattleAttackTypeNightAttackType;
+  };
+  export type Asw = { t: "Asw"; c: __NightBattleAttackTypeAswAttackType };
 }
 
 export type NightBattleAttackType =
-  | { t: "NightAttack"; c: NightAttackType }
-  | { t: "Asw"; c: AswAttackType };
+  | NightBattleAttackType.NightAttack
+  | NightBattleAttackType.Asw;
+
+type __DayBattleAttackTypeAswAttackType = AswAttackType;
+type __DayBattleAttackTypeShellingAttackType = ShellingAttackType;
+declare namespace DayBattleAttackType {
+  export type Shelling = {
+    t: "Shelling";
+    c: __DayBattleAttackTypeShellingAttackType;
+  };
+  export type Asw = { t: "Asw"; c: __DayBattleAttackTypeAswAttackType };
+}
 
 export type DayBattleAttackType =
-  | { t: "Shelling"; c: ShellingAttackType }
-  | { t: "Asw"; c: AswAttackType };
+  | DayBattleAttackType.Shelling
+  | DayBattleAttackType.Asw;
 
 export interface AttackInfo<AttackType, Cutin> {
   attack_type: AttackType;
@@ -591,7 +942,24 @@ export interface AttackStats {
 
 export type ShipStateMap = Record<ShipKey, ShipState>;
 
-export type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
+declare namespace ShipKey {
+  export type s1 = "s1";
+  export type s2 = "s2";
+  export type s3 = "s3";
+  export type s4 = "s4";
+  export type s5 = "s5";
+  export type s6 = "s6";
+  export type s7 = "s7";
+}
+
+export type ShipKey =
+  | ShipKey.s1
+  | ShipKey.s2
+  | ShipKey.s3
+  | ShipKey.s4
+  | ShipKey.s5
+  | ShipKey.s6
+  | ShipKey.s7;
 
 export interface OrgState {
   id?: string;
@@ -609,23 +977,19 @@ export interface OrgState {
   boss_sup?: string;
 }
 
-export interface AirSquadronState {
+export interface AirSquadronState extends GearVecState, SlotSizeVecState {
   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";
+declare namespace AirSquadronMode {
+  export type Sortie = "Sortie";
+  export type AirDefense = "AirDefense";
+}
+
+export type AirSquadronMode =
+  | AirSquadronMode.Sortie
+  | AirSquadronMode.AirDefense;
 
 export interface FleetState {
   id?: string;
@@ -656,6 +1020,9 @@ export interface ShipState extends GearVecState, SlotSizeVecState {
   asw_mod?: number;
   los_mod?: number;
   luck_mod?: number;
+  day_gunfit_accuracy?: number;
+  night_gunfit_accuracy?: number;
+  custom_power_mods?: CustomPowerModifiers;
 }
 
 export interface SlotSizeVecState {
@@ -682,55 +1049,103 @@ export interface GearState {
   stars?: number;
 }
 
-export type NightAttackType = "Normal" | "ArkRoyal" | "Carrier";
+export interface MasterGear {
+  gear_id: number;
+  name: string;
+  types: GearTypeIdArray;
+  special_type?: number;
+  max_hp?: number;
+  firepower?: number;
+  armor?: number;
+  torpedo?: number;
+  anti_air?: number;
+  speed?: number;
+  bombing?: number;
+  asw?: number;
+  los?: number;
+  luck?: number;
+  accuracy?: number;
+  evasion?: number;
+  range?: number;
+  radius?: number;
+  cost?: number;
+  improvable?: boolean;
+  ship_anti_air_resistance?: number;
+  fleet_anti_air_resistance?: number;
+}
 
-export type NightSpecialAttack =
-  | { NightCutin: NightCutin }
-  | { FleetCutin: FleetCutin };
+export interface HitRate {
+  total: number;
+  normal: number;
+  critical: number;
+}
 
-export type NightCutin =
-  | "MainTorpRadar"
-  | "TorpLookoutRadar"
-  | "TorpTsloTorp"
-  | "TorpTsloDrum"
-  | "DoubleAttack"
-  | "TorpTorpMain"
-  | "TorpTorpTorp"
-  | "MainMainSec"
-  | "MainMainMain"
-  | "SubTorpTorp"
-  | "SubRadarTorp"
-  | "Cvci1_25"
-  | "Cvci1_20"
-  | "Cvci1_18"
-  | "Photobomber";
+export interface HitRateParams {
+  accuracy_term: number;
+  evasion_term: number;
+  target_morale_mod: number;
+  critical_rate_constant: number;
+  critical_percentage_bonus: number;
+  hit_percentage_bonus: number;
+}
 
-export interface WarfareInfo {
-  day: AttackInfo<DayBattleAttackType, DayCutin | null> | null;
-  closing_torpedo: AttackInfo<null, null> | null;
-  night: AttackInfo<NightBattleAttackType, NightCutin | null> | null;
-  shelling_support: AttackInfo<null, null> | null;
-  opening_asw: AttackInfo<null, null> | null;
+declare namespace NightAttackType {
+  export type Normal = "Normal";
+  export type ArkRoyal = "ArkRoyal";
+  export type Carrier = "Carrier";
 }
 
-export interface WarfareAnalyzerContext {
-  attacker_env: WarfareAnalyzerShipEnvironment;
-  target_env: WarfareAnalyzerShipEnvironment;
-  engagement: Engagement;
-  air_state: AirState;
+export type NightAttackType =
+  | NightAttackType.Normal
+  | NightAttackType.ArkRoyal
+  | NightAttackType.Carrier;
+
+type __NightSpecialAttackFleetCutin = FleetCutin;
+type __NightSpecialAttackNightCutin = NightCutin;
+declare namespace NightSpecialAttack {
+  export type NightCutin = { NightCutin: __NightSpecialAttackNightCutin };
+  export type FleetCutin = { FleetCutin: __NightSpecialAttackFleetCutin };
 }
 
-export interface WarfareAnalyzerShipEnvironment {
-  org_type: OrgType;
-  role: Role;
-  ship_index: number;
-  fleet_len: number;
-  formation: Formation;
-  fleet_los_mod: number | null;
-  night_situation: NightSituation;
-  custom_mods: CustomModifiers;
+export type NightSpecialAttack =
+  | NightSpecialAttack.NightCutin
+  | NightSpecialAttack.FleetCutin;
+
+declare namespace NightCutin {
+  export type MainTorpRadar = "MainTorpRadar";
+  export type TorpLookoutRadar = "TorpLookoutRadar";
+  export type TorpTsloTorp = "TorpTsloTorp";
+  export type TorpTsloDrum = "TorpTsloDrum";
+  export type DoubleAttack = "DoubleAttack";
+  export type TorpTorpMain = "TorpTorpMain";
+  export type TorpTorpTorp = "TorpTorpTorp";
+  export type MainMainSec = "MainMainSec";
+  export type MainMainMain = "MainMainMain";
+  export type SubTorpTorp = "SubTorpTorp";
+  export type SubRadarTorp = "SubRadarTorp";
+  export type Cvci1_25 = "Cvci1_25";
+  export type Cvci1_20 = "Cvci1_20";
+  export type Cvci1_18 = "Cvci1_18";
+  export type Photobomber = "Photobomber";
 }
 
+export type NightCutin =
+  | NightCutin.MainTorpRadar
+  | NightCutin.TorpLookoutRadar
+  | NightCutin.TorpTsloTorp
+  | NightCutin.TorpTsloDrum
+  | NightCutin.DoubleAttack
+  | NightCutin.TorpTorpMain
+  | NightCutin.TorpTorpTorp
+  | NightCutin.MainMainSec
+  | NightCutin.MainMainMain
+  | NightCutin.SubTorpTorp
+  | NightCutin.SubRadarTorp
+  | NightCutin.Cvci1_25
+  | NightCutin.Cvci1_20
+  | NightCutin.Cvci1_18
+  | NightCutin.Photobomber;
+
 export interface BattleConfig {
   formation: Record<Formation, NestedFormationDef>;
   anti_air_cutin: Record<number, AntiAirCutinDef>;
@@ -762,9 +1177,18 @@ export interface AntiAirCutinDef {
   sequential: boolean | null;
 }
 
+type __NestedFormationDefFormationDef = FormationDef;
+declare namespace NestedFormationDef {
+  export type Normal = __NestedFormationDefFormationDef;
+  export type Vanguard = {
+    top_half: __NestedFormationDefFormationDef;
+    bottom_half: __NestedFormationDefFormationDef;
+  };
+}
+
 export type NestedFormationDef =
-  | FormationDef
-  | { top_half: FormationDef; bottom_half: FormationDef };
+  | NestedFormationDef.Normal
+  | NestedFormationDef.Vanguard;
 
 export interface FormationDef {
   tag: Formation;
@@ -818,26 +1242,16 @@ export type StatInterval = [number | null, number | null];
 
 export type GearTypeIdArray = [number, number, number, number, number];
 
-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";
+declare namespace ContactRank {
+  export type Rank1 = "Rank1";
+  export type Rank2 = "Rank2";
+  export type Rank3 = "Rank3";
+}
 
-export type ContactRank = "Rank1" | "Rank2" | "Rank3";
+export type ContactRank =
+  | ContactRank.Rank1
+  | ContactRank.Rank2
+  | ContactRank.Rank3;
 
 export interface SimulatorResult {
   items: SimulatorResultItem[];
@@ -851,6 +1265,31 @@ export interface SimulatorResultItem {
   damage_state_map: Record<DamageState, number>;
 }
 
+export interface WarfareInfo {
+  day: AttackInfo<DayBattleAttackType, DayCutin | null> | null;
+  closing_torpedo: AttackInfo<null, null> | null;
+  night: AttackInfo<NightBattleAttackType, NightCutin | null> | null;
+  shelling_support: AttackInfo<null, null> | null;
+  opening_asw: AttackInfo<null, null> | null;
+}
+
+export interface WarfareAnalyzerContext {
+  attacker_env: WarfareAnalyzerShipEnvironment;
+  target_env: WarfareAnalyzerShipEnvironment;
+  engagement: Engagement;
+  air_state: AirState;
+}
+
+export interface WarfareAnalyzerShipEnvironment {
+  org_type: OrgType;
+  role: Role;
+  ship_index: number;
+  fleet_len: number;
+  formation: Formation;
+  fleet_los_mod: number | null;
+  night_situation: NightSituation;
+}
+
 export interface FleetNightCutinRateInfo {
   night_contact_chance: NightContactChance;
   ships: ShipNightCutinRateInfo[];
@@ -1675,6 +2114,10 @@ export class Ship {
    * @returns {ShipState}
    */
   state(): ShipState;
+  /**
+   * @returns {CustomPowerModifiers}
+   */
+  custom_power_mods(): CustomPowerModifiers;
   /**
    * @returns {ShipMeta}
    */
@@ -1814,11 +2257,6 @@ export class Ship {
    * @returns {number}
    */
   cruiser_fit_bonus(): number;
-  /**
-   * @param {boolean} is_night
-   * @returns {number}
-   */
-  fit_gun_bonus(is_night: boolean): number;
   /**
    * @returns {number | undefined}
    */
@@ -1861,6 +2299,20 @@ export class Ship {
    * @param {number} value
    */
   take_damage(value: number): void;
+  /**
+   * @returns {number | undefined}
+   */
+  state_day_gunfit_accuracy(): number | undefined;
+  /**
+   * @returns {number | undefined}
+   */
+  state_night_gunfit_accuracy(): number | undefined;
+  /**
+   * フィット砲補正
+   * @param {boolean} is_night
+   * @returns {number}
+   */
+  gunfit_accuracy(is_night: boolean): number;
   /**
    */
   readonly accuracy: number;