fleethub-core 1.11.5 → 1.11.7

package/node/fleethub_core.d.ts

@@ -1,13 +1,13 @@
 /* tslint:disable */
 /* eslint-disable */
+/**
+ */
+export function set_panic_hook(): void;
 /**
  * @param {ShipConditions} value
  * @returns {ShipConditions}
  */
 export function parse_ship_conditions(value: ShipConditions): ShipConditions;
-/**
- */
-export function set_panic_hook(): void;
 export interface AttackPower {
   precap: number;
   is_capped: boolean;
@@ -33,66 +33,27 @@ export interface AttackPowerParams {
   custom_mods: CustomPowerModifiers;
 }
 
-export interface NodeAttackAnalyzerShipConfig extends NightFleetConditions {
-  formation?: Formation;
-}
-
-export interface NodeAttackAnalyzerConfig {
-  air_state?: AirState;
-  engagement?: Engagement;
-  node_state?: NodeState;
-  left?: NodeAttackAnalyzerShipConfig;
-  right?: NodeAttackAnalyzerShipConfig;
-}
-
-export interface NodeAttackAnalysis {
-  left: AttackAnalysis;
-  right: AttackAnalysis;
-  shelling_fleet_cutin: FleetCutinReport<ShellingStyle>[];
-  night_fleet_cutin: FleetCutinReport<NightAttackStyle>[];
-}
-
-export interface AttackAnalyzerShipConfig
-  extends ShipConditions,
-    NightFleetConditions {
-  fleet_los_mod?: number | null;
-}
-
-export interface ShellingStyle {
-  tag: "ShellingStyle";
-  attack_type: ShellingType;
-  cutin: DayCutinLike | null;
-  power_mod: number;
-  accuracy_mod: number;
-  hits: number;
-}
-
-export interface NightAttackStyle {
-  tag: "NightAttackStyle";
-  attack_type: NightAttackType;
-  cutin: NightCutinLike | null;
-  power_mod: number;
-  accuracy_mod: number;
-  hits: number;
+export interface NightContactChance {
+  rank1: number;
+  rank2: number;
+  rank3: number;
 }
 
-export interface AswAttackStyle {
-  tag: "AswAttackStyle";
-  attack_type: AswAttackType;
+export interface CompNightCutinAnalysis {
+  night_contact_chance: NightContactChance;
+  ships: ShipNightCutinAnalysis[];
 }
 
-export interface TorpedoAttackStyle {
-  tag: "TorpedoAttackStyle";
-  attack_type: TorpedoAttackType;
+export interface ShipNightCutinAnalysis {
+  ship_id: number;
+  index: number;
+  normal: NightCutinActionReport;
+  chuuha: NightCutinActionReport;
 }
 
-export type DayPhaseAttackStyle = ShellingStyle | AswAttackStyle;
-
-export type NightPhaseAttackStyle = NightAttackStyle | AswAttackStyle;
-
-export interface SupportShellingStyle {
-  tag: "SupportShellingStyle";
-  attack_type: SupportShellingType;
+export interface NightCutinActionReport
+  extends ActionReport<NightPhaseAttackStyle> {
+  cutin_term: number | null;
 }
 
 export type FleetType = "Main" | "Escort" | "RouteSup" | "BossSup";
@@ -222,75 +183,75 @@ export interface OrgState {
 
 export type FleetKey = "f1" | "f2" | "f3" | "f4";
 
-export interface CompDayCutinAnalysis {
-  rank3_air_state: AirState;
-  rank2_air_state: AirState;
-  main_fleet_los_mod: number | null;
-  escort_fleet_los_mod: number | null;
-  ships: ShipDayCutinAnalysis[];
+export interface SupportShellingSimulatorParams {
+  attacker_formation?: Formation;
+  target_formation?: Formation;
+  engagement: Engagement;
 }
 
-export interface ShipDayCutinAnalysis {
-  ship_id: number;
-  role: Role;
-  index: number;
-  rank3: DayCutinReport;
-  rank2: DayCutinReport;
+export interface EquippabilityRule {
+  ship: CompiledEvaler;
+  keys?: string[];
+  include?: string;
+  exclude?: string;
 }
 
-export interface DayCutinReport extends ActionReport<DayPhaseAttackStyle> {
-  observation_term: number | null;
+export interface MasterEquippability {
+  equip_stype: EquipStype[];
+  equip_exslot: number[];
+  equip_ship: MstEquipShip[];
+  equip_exslot_ship: Record<number, MstEquipExslotShip>;
+  rules: EquippabilityRule[];
 }
 
-export interface ShipMeta {
-  id: string;
-  ship_id: number;
+export interface MstEquipExslotShip {
+  api_ctypes: Record<number, number> | null;
+  api_ship_ids: Record<number, number> | null;
+  api_stypes: Record<number, number> | null;
 }
 
-export interface FleetMeta {
-  id: string;
-  len: number;
-  ships: [string, ShipMeta | null][];
+export interface MstEquipShip {
+  api_ship_id: number;
+  api_equip_type: number[];
 }
 
-export interface CompMeta {
-  fleets: Record<FleetType, FleetMeta>;
+export interface EquipStype {
+  id: number;
+  equip_type: number[];
 }
 
-export type NodeId = string;
+export interface CompAnalyzerConfig {
+  engagement: Engagement;
+  formation: Formation;
+  anti_air_cutin: number | null;
+  ship_anti_air_resist: number;
+  fleet_anti_air_resist: number;
+  left_night_fleet_conditions: NightFleetConditions;
+  right_night_fleet_conditions: NightFleetConditions;
+}
 
-export interface NodeState {
-  map?: number;
-  node?: NodeId;
-  phase?: number;
-  debuff?: boolean;
-  disable_historical_mod?: boolean;
+export interface CompNightAnalysis {
+  night_cutin: CompNightCutinAnalysis;
+  fleet_cutin: FleetCutinReport<NightAttackStyle>[];
 }
 
-export type OrgType =
-  | "Single"
-  | "CarrierTaskForce"
-  | "SurfaceTaskForce"
-  | "TransportEscort"
-  | "EnemySingle"
-  | "EnemyCombined";
+export interface CompDayAnalysis {
+  day_cutin: CompDayCutinAnalysis;
+  fleet_cutin: FleetCutinReport<ShellingStyle>[];
+}
 
-export type SlotSizeVec = (number | null)[];
+export interface CompAnalysis {
+  day: CompDayAnalysis;
+  night: CompNightAnalysis;
+  contact: ContactAnalysis;
+  anti_air: CompAntiAirAnalysis;
+}
 
-export type SpecialEnemyType =
-  | "None"
-  | "SoftSkinned"
-  | "Pillbox"
-  | "IsolatedIsland"
-  | "SupplyDepot"
-  | "NewSupplyDepot"
-  | "HarbourSummerPrincess"
-  | "PtImp"
-  | "BattleshipSummerPrincess"
-  | "HeavyCruiserSummerPrincess"
-  | "FrenchBattleshipPrincess"
-  | "AnchorageWaterDemonVacationMode"
-  | "DockPrincess";
+export interface AttackAnalyzerShipConfig
+  extends ShipConditions,
+    NightFleetConditions {
+  fleet_los_mod?: number | null;
+}
 
 export interface MasterShip {
   ship_id: number;
@@ -326,34 +287,50 @@ export interface MasterShip {
 
 export type StatInterval = [number | null, number | null];
 
-export interface FleetCutinReport<T> {
-  cutin: FleetCutin;
-  rate: number | null;
-  formation: Formation;
-  attacks: FleetCutinAttackReport<T>[];
+export interface ShellingStyle {
+  tag: "ShellingStyle";
+  attack_type: ShellingType;
+  cutin: DayCutinLike | null;
+  power_mod: number;
+  accuracy_mod: number;
+  hits: number;
 }
 
-export interface FleetCutinAttackReport<T> extends AttackReport<T> {
-  index: number;
-  ship_id: number;
+export interface NightAttackStyle {
+  tag: "NightAttackStyle";
+  attack_type: NightAttackType;
+  cutin: NightCutinLike | null;
   power_mod: number;
+  accuracy_mod: number;
+  hits: number;
 }
 
-export type SingleFormation =
-  | "LineAhead"
-  | "DoubleLine"
-  | "Diamond"
-  | "Echelon"
-  | "LineAbreast"
-  | "Vanguard";
+export interface AswAttackStyle {
+  tag: "AswAttackStyle";
+  attack_type: AswAttackType;
+}
 
-export type CombinedFormation =
-  | "Cruising1"
-  | "Cruising2"
-  | "Cruising3"
-  | "Cruising4";
+export interface TorpedoAttackStyle {
+  tag: "TorpedoAttackStyle";
+  attack_type: TorpedoAttackType;
+}
 
-export type Formation = SingleFormation | CombinedFormation;
+export type DayPhaseAttackStyle = ShellingStyle | AswAttackStyle;
+
+export type NightPhaseAttackStyle = NightAttackStyle | AswAttackStyle;
+
+export interface SupportShellingStyle {
+  tag: "SupportShellingStyle";
+  attack_type: SupportShellingType;
+}
+
+export type OrgType =
+  | "Single"
+  | "CarrierTaskForce"
+  | "SurfaceTaskForce"
+  | "TransportEscort"
+  | "EnemySingle"
+  | "EnemyCombined";
 
 export type GearVecInput = GearInput[];
 
@@ -395,6 +372,8 @@ export interface EBonuses {
   range: number;
 }
 
+export type FhResult<T> = { Ok: T } | { Err: string };
+
 export interface MasterGear {
   gear_id: number;
   name: string;
@@ -421,34 +400,43 @@ export interface MasterGear {
   historical_aircraft_group?: number;
 }
 
-export interface EquippabilityRule {
-  ship: CompiledEvaler;
-  keys?: string[];
-  include?: string;
-  exclude?: string;
-}
-
-export interface MasterEquippability {
-  equip_stype: EquipStype[];
-  equip_exslot: number[];
-  equip_ship: MstEquipShip[];
-  equip_exslot_ship: MstEquipExslotShip[];
-  rules: EquippabilityRule[];
+export interface NodeAttackAnalyzerShipConfig extends NightFleetConditions {
+  formation?: Formation;
 }
 
-export interface MstEquipExslotShip {
-  api_slotitem_id: number;
-  api_ship_ids: number[];
+export interface NodeAttackAnalyzerConfig {
+  air_state?: AirState;
+  engagement?: Engagement;
+  node_state?: NodeState;
+  left?: NodeAttackAnalyzerShipConfig;
+  right?: NodeAttackAnalyzerShipConfig;
 }
 
-export interface MstEquipShip {
-  api_ship_id: number;
-  api_equip_type: number[];
+export interface NodeAttackAnalysis {
+  left: AttackAnalysis;
+  right: AttackAnalysis;
+  shelling_fleet_cutin: FleetCutinReport<ShellingStyle>[];
+  night_fleet_cutin: FleetCutinReport<NightAttackStyle>[];
 }
 
-export interface EquipStype {
-  id: number;
-  equip_type: number[];
+export interface CompDayCutinAnalysis {
+  rank3_air_state: AirState;
+  rank2_air_state: AirState;
+  main_fleet_los_mod: number | null;
+  escort_fleet_los_mod: number | null;
+  ships: ShipDayCutinAnalysis[];
+}
+
+export interface ShipDayCutinAnalysis {
+  ship_id: number;
+  role: Role;
+  index: number;
+  rank3: DayCutinReport;
+  rank2: DayCutinReport;
+}
+
+export interface DayCutinReport extends ActionReport<DayPhaseAttackStyle> {
+  observation_term: number | null;
 }
 
 export interface BattleConditions {
@@ -518,23 +506,50 @@ export type DayCutinLike = DayCutin | FleetCutin;
 
 export type NightCutinLike = NightCutin | FleetCutin;
 
-export interface MoveShipPayload {
-  current: [string, string, ShipKey];
-  target: [string | null, string, ShipKey];
-}
+export type SingleFormation =
+  | "LineAhead"
+  | "DoubleLine"
+  | "Diamond"
+  | "Echelon"
+  | "LineAbreast"
+  | "Vanguard";
 
-export interface ContactAnalysis {
-  single: DayContactChance[] | null;
-  combined: DayContactChance[] | null;
+export type CombinedFormation =
+  | "Cruising1"
+  | "Cruising2"
+  | "Cruising3"
+  | "Cruising4";
+
+export type Formation = SingleFormation | CombinedFormation;
+
+export type SpecialEnemyType =
+  | "None"
+  | "SoftSkinned"
+  | "Pillbox"
+  | "IsolatedIsland"
+  | "SupplyDepot"
+  | "NewSupplyDepot"
+  | "HarbourSummerPrincess"
+  | "PtImp"
+  | "BattleshipSummerPrincess"
+  | "HeavyCruiserSummerPrincess"
+  | "FrenchBattleshipPrincess"
+  | "AnchorageWaterDemonVacationMode"
+  | "DockPrincess";
+
+export type SpeedGroup = "A" | "B1" | "B2" | "C";
+
+export interface FleetCutinReport<T> {
+  cutin: FleetCutin;
+  rate: number | null;
+  formation: Formation;
+  attacks: FleetCutinAttackReport<T>[];
 }
 
-export interface DayContactChance {
-  air_state: AirState;
-  trigger_rate: number;
-  rank3: number;
-  rank2: number;
-  rank1: number;
-  total: number;
+export interface FleetCutinAttackReport<T> extends AttackReport<T> {
+  index: number;
+  ship_id: number;
+  power_mod: number;
 }
 
 export interface FormationCombatModifiersDef {
@@ -622,6 +637,31 @@ export interface FleetState {
   s7?: ShipState;
 }
 
+export interface ShipMeta {
+  id: string;
+  ship_id: number;
+}
+
+export interface FleetMeta {
+  id: string;
+  len: number;
+  ships: [string, ShipMeta | null][];
+}
+
+export interface CompMeta {
+  fleets: Record<FleetType, FleetMeta>;
+}
+
+export type NodeId = string;
+
+export interface NodeState {
+  map?: number;
+  node?: NodeId;
+  phase?: number;
+  debuff?: boolean;
+  disable_historical_mod?: boolean;
+}
+
 export interface SlotSizeVecState {
   ss1?: number;
   ss2?: number;
@@ -654,9 +694,20 @@ export interface ShipState extends GearVecState, SlotSizeVecState {
 
 export type ShipKey = "s1" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7";
 
-export type SpeedGroup = "A" | "B1" | "B2" | "C";
+export type SlotSizeVec = (number | null)[];
 
-export type Histogram<K extends keyof any, V> = Partial<Record<K, V>>;
+export interface MoveShipPayload {
+  current: [string, string, ShipKey];
+  target: [string | null, string, ShipKey];
+}
+
+export interface MasterBattleDefinitions {
+  formation: NestedFormationDef[];
+  anti_air_cutin: AntiAirCutinDef[];
+  day_cutin: DayCutinDef[];
+  night_cutin: NightCutinDef[];
+  historical_bonuses?: HistoricalBonusDef[];
+}
 
 export interface HitRate {
   normal: number;
@@ -686,15 +737,18 @@ export interface DamageReport {
   damage_state_density: Histogram<DamageState, number>;
 }
 
-export interface AttackReport<T> {
-  style: T;
-  proc_rate: number | null;
-  attack_power: AttackPower | null;
-  attack_power_params: AttackPowerParams | null;
-  hits: number;
-  hit_rate: HitRate | null;
-  hit_rate_params: HitRateParams | null;
-  damage: DamageReport | null;
+export interface ContactAnalysis {
+  single: DayContactChance[] | null;
+  combined: DayContactChance[] | null;
+}
+
+export interface DayContactChance {
+  air_state: AirState;
+  trigger_rate: number;
+  rank3: number;
+  rank2: number;
+  rank1: number;
+  total: number;
 }
 
 export interface AttackAnalysis {
@@ -743,8 +797,6 @@ export interface GearVecState {
   gx?: GearState;
 }
 
-export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
-
 export type ShipCategory =
   | "Battleship"
   | "AircraftCarrier"
@@ -780,19 +832,19 @@ export type ShipType =
   | "CT"
   | "AO";
 
-export type GearTypeIdArray = [number, number, number, number, number];
+export type Histogram<K extends keyof any, V> = Partial<Record<K, V>>;
 
-export interface SupportShellingSimulatorParams {
-  attacker_formation?: Formation;
-  target_formation?: Formation;
-  engagement: Engagement;
-}
+export type CompiledEvaler = string;
 
-export interface ShipAnalyzerConfig {
-  air_state?: AirState;
-  engagement?: Engagement;
-  left?: AttackAnalyzerShipConfig;
-  right?: AttackAnalyzerShipConfig;
+export interface AttackReport<T> {
+  style: T;
+  proc_rate: number | null;
+  attack_power: AttackPower | null;
+  attack_power_params: AttackPowerParams | null;
+  hits: number;
+  hit_rate: HitRate | null;
+  hit_rate_params: HitRateParams | null;
+  damage: DamageReport | null;
 }
 
 export interface ActionReport<T> {
@@ -803,58 +855,12 @@ export interface ActionReport<T> {
 
 export type AirWaveType = "Jet" | "LandBase" | "Carrier";
 
-export type AirSquadronMode = "Sortie" | "AirDefense";
-
-export interface AirSquadronState extends GearVecState, SlotSizeVecState {
-  id?: string;
-  mode?: AirSquadronMode;
-}
-
-export type AswAttackType = "DepthCharge" | "Aerial";
-
-export type ShellingType = "Normal" | "Aerial";
-
-export type NightAttackType = "Normal" | "Swordfish" | "Aerial";
-
-export type SupportShellingType = ShellingType;
-
-export type AttackType =
-  | { t: "Asw"; c: AswAttackType }
-  | { t: "Shelling"; c: ShellingType }
-  | { t: "Night"; c: NightAttackType }
-  | { t: "Torpedo" }
-  | { t: "SupportShelling"; c: SupportShellingType };
-
-export type DayPhaseAttackType =
-  | { t: "Shelling"; c: ShellingType }
-  | { t: "Asw"; c: AswAttackType };
-
-export type NightPhaseAttackType =
-  | { t: "Night"; c: NightAttackType }
-  | { t: "Asw"; c: AswAttackType };
-
-export type TorpedoAttackType = null;
-
-export type Role = "Main" | "Escort";
+export type MoraleState = "Sparkle" | "Normal" | "Orange" | "Red";
 
 export type Side = "Player" | "Enemy";
 
 export type Align = "Left" | "Right";
 
-export type CompiledEvaler = string;
-
-export interface SimulatorResult {
-  items: SimulatorResultItem[];
-  sunk_vec: [number, number, number][];
-}
-
-export interface SimulatorResultItem {
-  id: string;
-  fleet_type: FleetType;
-  index: number;
-  damage_state_map: Record<DamageState, number>;
-}
-
 export interface MasterData extends MasterBattleDefinitions {
   created_at: number;
   gears: MasterGear[];
@@ -876,48 +882,38 @@ export interface MasterAttrRule<T> {
   expr: CompiledEvaler;
 }
 
-export interface MasterBattleDefinitions {
-  formation: NestedFormationDef[];
-  anti_air_cutin: AntiAirCutinDef[];
-  day_cutin: DayCutinDef[];
-  night_cutin: NightCutinDef[];
-  historical_bonuses?: HistoricalBonusDef[];
-}
-
-export interface NightContactChance {
-  rank1: number;
-  rank2: number;
-  rank3: number;
-}
-
-export interface CompNightCutinAnalysis {
-  night_contact_chance: NightContactChance;
-  ships: ShipNightCutinAnalysis[];
+export interface MasterIBonuses {
+  shelling_power: MasterIBonusRule[];
+  shelling_accuracy: MasterIBonusRule[];
+  shelling_aerial_power: MasterIBonusRule[];
+  torpedo_power: MasterIBonusRule[];
+  torpedo_accuracy: MasterIBonusRule[];
+  torpedo_evasion: MasterIBonusRule[];
+  asw_power: MasterIBonusRule[];
+  asw_accuracy: MasterIBonusRule[];
+  night_power: MasterIBonusRule[];
+  night_aerial_power: MasterIBonusRule[];
+  night_accuracy: MasterIBonusRule[];
+  defense_power: MasterIBonusRule[];
+  contact_selection: MasterIBonusRule[];
+  fighter_power: MasterIBonusRule[];
+  ship_anti_air: MasterIBonusRule[];
+  fleet_anti_air: MasterIBonusRule[];
+  elos: MasterIBonusRule[];
 }
 
-export interface ShipNightCutinAnalysis {
-  ship_id: number;
-  index: number;
-  normal: NightCutinActionReport;
-  chuuha: NightCutinActionReport;
+export interface MasterIBonusRule {
+  expr: CompiledEvaler;
+  formula: CompiledEvaler;
 }
 
-export interface NightCutinActionReport
-  extends ActionReport<NightPhaseAttackStyle> {
-  cutin_term: number | null;
+export interface ShipPosition {
+  org_type?: OrgType;
+  fleet_type?: FleetType;
+  fleet_len?: number;
+  index?: number;
 }
 
-export type AirState =
-  | "AirSupremacy"
-  | "AirSuperiority"
-  | "AirParity"
-  | "AirDenial"
-  | "AirIncapability";
-
-export type AirStateRank = "Rank0" | "Rank1" | "Rank2" | "Rank3";
-
-export type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
-
 export type ShipAttr =
   | "Unknown"
   | "NightCarrier"
@@ -943,59 +939,42 @@ export interface ShipConditions extends ShipPosition {
   amagiri_index?: number | null;
 }
 
-export type FhResult<T> = { Ok: T } | { Err: string };
+export type GearTypeIdArray = [number, number, number, number, number];
 
-export interface MasterIBonuses {
-  shelling_power: MasterIBonusRule[];
-  shelling_accuracy: MasterIBonusRule[];
-  shelling_aerial_power: MasterIBonusRule[];
-  torpedo_power: MasterIBonusRule[];
-  torpedo_accuracy: MasterIBonusRule[];
-  torpedo_evasion: MasterIBonusRule[];
-  asw_power: MasterIBonusRule[];
-  asw_accuracy: MasterIBonusRule[];
-  night_power: MasterIBonusRule[];
-  night_aerial_power: MasterIBonusRule[];
-  night_accuracy: MasterIBonusRule[];
-  defense_power: MasterIBonusRule[];
-  contact_selection: MasterIBonusRule[];
-  fighter_power: MasterIBonusRule[];
-  ship_anti_air: MasterIBonusRule[];
-  fleet_anti_air: MasterIBonusRule[];
-  elos: MasterIBonusRule[];
+export interface SimulatorResult {
+  items: SimulatorResultItem[];
+  sunk_vec: [number, number, number][];
 }
 
-export interface MasterIBonusRule {
-  expr: CompiledEvaler;
-  formula: CompiledEvaler;
+export interface SimulatorResultItem {
+  id: string;
+  fleet_type: FleetType;
+  index: number;
+  damage_state_map: Record<DamageState, number>;
 }
 
-export interface CompAnalyzerConfig {
-  engagement: Engagement;
-  formation: Formation;
-  anti_air_cutin: number | null;
-  ship_anti_air_resist: number;
-  fleet_anti_air_resist: number;
-  left_night_fleet_conditions: NightFleetConditions;
-  right_night_fleet_conditions: NightFleetConditions;
+export interface ShipAnalyzerConfig {
+  air_state?: AirState;
+  engagement?: Engagement;
+  left?: AttackAnalyzerShipConfig;
+  right?: AttackAnalyzerShipConfig;
 }
 
-export interface CompNightAnalysis {
-  night_cutin: CompNightCutinAnalysis;
-  fleet_cutin: FleetCutinReport<NightAttackStyle>[];
-}
+export type AirSquadronMode = "Sortie" | "AirDefense";
 
-export interface CompDayAnalysis {
-  day_cutin: CompDayCutinAnalysis;
-  fleet_cutin: FleetCutinReport<ShellingStyle>[];
+export interface AirSquadronState extends GearVecState, SlotSizeVecState {
+  id?: string;
+  mode?: AirSquadronMode;
 }
 
-export interface CompAnalysis {
-  day: CompDayAnalysis;
-  night: CompNightAnalysis;
-  contact: ContactAnalysis;
-  anti_air: CompAntiAirAnalysis;
-}
+export type AirState =
+  | "AirSupremacy"
+  | "AirSuperiority"
+  | "AirParity"
+  | "AirDenial"
+  | "AirIncapability";
+
+export type AirStateRank = "Rank0" | "Rank1" | "Rank2" | "Rank3";
 
 export interface AttackPowerModifier {
   a?: number;
@@ -1020,16 +999,38 @@ export interface CustomPowerModifiers {
   historical_mod?: AttackPowerModifier;
 }
 
+export type AswAttackType = "DepthCharge" | "Aerial";
+
+export type ShellingType = "Normal" | "Aerial";
+
+export type NightAttackType = "Normal" | "Swordfish" | "Aerial";
+
+export type SupportShellingType = ShellingType;
+
+export type AttackType =
+  | { t: "Asw"; c: AswAttackType }
+  | { t: "Shelling"; c: ShellingType }
+  | { t: "Night"; c: NightAttackType }
+  | { t: "Torpedo" }
+  | { t: "SupportShelling"; c: SupportShellingType };
+
+export type DayPhaseAttackType =
+  | { t: "Shelling"; c: ShellingType }
+  | { t: "Asw"; c: AswAttackType };
+
+export type NightPhaseAttackType =
+  | { t: "Night"; c: NightAttackType }
+  | { t: "Asw"; c: AswAttackType };
+
+export type TorpedoAttackType = null;
+
 export type ContactRank = "Rank1" | "Rank2" | "Rank3";
 
+export type DamageState = "Normal" | "Shouha" | "Chuuha" | "Taiha" | "Sunk";
+
 export type Engagement = "GreenT" | "Parallel" | "HeadOn" | "RedT";
 
-export interface ShipPosition {
-  org_type?: OrgType;
-  fleet_type?: FleetType;
-  fleet_len?: number;
-  index?: number;
-}
+export type Role = "Main" | "Escort";
 
 /**
  */