Integrate unfinished server-rs refactor worklists

server-rs/crates/module-combat/src/lib.rs

@@ -4,8 +4,11 @@ mod domain;
 mod errors;
 mod events;
 
+pub use domain::*;
+
 use std::{error::Error, fmt};
 
+use crate::domain::LEGACY_ATTACK_FUNCTION_IDS;
 use module_runtime_item::{
     RuntimeItemRewardItemSnapshot, TreasureFieldError, normalize_reward_item_snapshot,
 };
@@ -14,74 +17,6 @@ use shared_kernel::{build_prefixed_seed_id, normalize_required_string};
 #[cfg(feature = "spacetime-types")]
 use spacetimedb::SpacetimeType;
 
-pub const BATTLE_STATE_ID_PREFIX: &str = "battle_";
-pub const INITIAL_BATTLE_VERSION: u32 = 1;
-pub const BASIC_FIGHT_COUNTER_RATIO: f32 = 0.14;
-pub const MIN_FIGHT_COUNTER_DAMAGE: i32 = 4;
-pub const SPAR_MIN_HP: i32 = 1;
-
-const LEGACY_ATTACK_FUNCTION_IDS: [&str; 5] = [
-    "battle_all_in_crush",
-    "battle_guard_break",
-    "battle_probe_pressure",
-    "battle_feint_step",
-    "battle_finisher_window",
-];
-
-#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub enum BattleMode {
-    Fight,
-    Spar,
-}
-
-impl BattleMode {
-    pub fn as_str(&self) -> &'static str {
-        match self {
-            Self::Fight => "fight",
-            Self::Spar => "spar",
-        }
-    }
-}
-
-#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub enum BattleStatus {
-    Ongoing,
-    Resolved,
-    Aborted,
-}
-
-impl BattleStatus {
-    pub fn as_str(&self) -> &'static str {
-        match self {
-            Self::Ongoing => "ongoing",
-            Self::Resolved => "resolved",
-            Self::Aborted => "aborted",
-        }
-    }
-}
-
-#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub enum CombatOutcome {
-    Ongoing,
-    Victory,
-    SparComplete,
-    Escaped,
-}
-
-impl CombatOutcome {
-    pub fn as_str(&self) -> &'static str {
-        match self {
-            Self::Ongoing => "ongoing",
-            Self::Victory => "victory",
-            Self::SparComplete => "spar_complete",
-            Self::Escaped => "escaped",
-        }
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum CombatFieldError {
     MissingBattleStateId,