Integrate unfinished server-rs refactor worklists

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

@@ -2,3 +2,84 @@
 //!
 //! 后续迁移 `BattleState` 与行动结算规则时，只保留单聚合内部状态变化；
 //! 背包奖励、成长记账和任务联动由应用服务或 SpacetimeDB 事务 adapter 编排。
+
+use serde::{Deserialize, Serialize};
+#[cfg(feature = "spacetime-types")]
+use spacetimedb::SpacetimeType;
+
+/// 战斗状态 ID 的稳定前缀，由领域层统一持有，避免应用层重复拼接规则。
+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;
+/// 切磋模式保底生命值，避免非生死战把玩家扣到 0。
+pub const SPAR_MIN_HP: i32 = 1;
+
+/// 旧版战斗动作 function id 白名单，仍由结算规则用于识别攻击类动作。
+pub(crate) 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",
+        }
+    }
+}

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,