feat(rules): support '+' sum operator in condition parsing

Allow expressions like 'CL + DD >= 1' in enemy_rules conditions.
Multiple ship types joined by '+' are summed before comparison.

Bump version to 2.1.4.

Author: huan-yp

autowsgr/__init__.py

@@ -1,3 +1,3 @@
 """AutoWSGR — 战舰少女R 自动化框架 (v2)"""
 
-__version__ = '2.1.3'
+__version__ = '2.1.4'

autowsgr/combat/rules.py

@@ -136,7 +136,11 @@ def __post_init__(self) -> None:
 
     def evaluate(self, context: dict[str, int | float]) -> bool:
         """在给定上下文中评估此条件。"""
-        actual = context.get(self.field, 0)
+        if '+' in self.field:
+            parts = [p.strip() for p in self.field.split('+')]
+            actual = sum(context.get(p, 0) for p in parts)
+        else:
+            actual = context.get(self.field, 0)
         return _OPERATORS[self.op](actual, self.value)
 
 
@@ -275,8 +279,10 @@ def evaluate_formation(self, enemy_formation: str) -> RuleAction:
 # 旧格式解析
 # ═══════════════════════════════════════════════════════════════════════════════
 
-# 匹配 "BB >= 2" 形式的条件片段
-_CONDITION_PIECE_RE = re.compile(r'([A-Z]{2,4})\s*(>=|<=|>|<|==|!=)\s*(\d+(?:\.\d+)?)')
+# 匹配 "BB >= 2" 或 "CL + DD >= 1" 形式的条件片段
+_CONDITION_PIECE_RE = re.compile(
+    r'([A-Z]{2,4}(?:\s*\+\s*[A-Z]{2,4})*)\s*(>=|<=|>|<|==|!=)\s*(\d+(?:\.\d+)?)'
+)
 
 
 def _parse_legacy_condition(condition_str: str) -> list[Condition]:
@@ -287,15 +293,19 @@ def _parse_legacy_condition(condition_str: str) -> list[Condition]:
 
     用 ``and`` 连接的条件被拆分为独立的 ``Condition`` （AND 语义）。
     不支持 ``or`` — 用多条规则替代。
+
+    支持 ``+`` 运算符将多个舰种求和，如 ``CL + DD >= 1``。
     """
     matches = _CONDITION_PIECE_RE.findall(condition_str)
     if not matches:
         raise ValueError(f"无法解析规则条件: '{condition_str}'")
 
     conditions: list[Condition] = []
-    for field_name, op, value_str in matches:
+    for field_expr, op, value_str in matches:
         value = float(value_str) if '.' in value_str else int(value_str)
-        conditions.append(Condition(field=field_name, op=op, value=value))
+        # 规范化字段表达式：去除空格，如 'CL + DD' -> 'CL+DD'
+        field_key = '+'.join(p.strip() for p in field_expr.split('+'))
+        conditions.append(Condition(field=field_key, op=op, value=value))
     return conditions
 
 

docs/spelling_wordlist.txt

@@ -1 +1,2 @@
 equipments
+nd

testing/combat/test_combat.py

@@ -227,11 +227,51 @@ def test_complex(self):
         assert conditions[1].field == 'DD'
         assert conditions[1].op == '<='
 
+    def test_sum_expression(self):
+        conditions = _parse_legacy_condition('(CL + DD >= 1)')
+        assert len(conditions) == 1
+        assert conditions[0].field == 'CL+DD'
+        assert conditions[0].op == '>='
+        assert conditions[0].value == 1
+
+    def test_sum_expression_triple(self):
+        conditions = _parse_legacy_condition('(CL + DD + CA >= 3)')
+        assert len(conditions) == 1
+        assert conditions[0].field == 'CL+DD+CA'
+        assert conditions[0].op == '>='
+        assert conditions[0].value == 3
+
+    def test_sum_compound_and(self):
+        conditions = _parse_legacy_condition('(CL + DD >= 1) and (BB >= 2)')
+        assert len(conditions) == 2
+        assert conditions[0].field == 'CL+DD'
+        assert conditions[1].field == 'BB'
+
     def test_invalid_raises(self):
         with pytest.raises(ValueError, match='无法解析'):
             _parse_legacy_condition('hello world')
 
 
+class TestConditionSumEvaluation:
+    """Condition '+' sum evaluation tests."""
+
+    def test_sum_basic(self):
+        c = Condition(field='CL+DD', op='>=', value=2)
+        assert c.evaluate({'CL': 1, 'DD': 1})
+        assert c.evaluate({'CL': 2, 'DD': 0})
+        assert not c.evaluate({'CL': 0, 'DD': 1})
+
+    def test_sum_missing_fields(self):
+        c = Condition(field='CL+DD', op='>=', value=1)
+        assert c.evaluate({'CL': 1})
+        assert not c.evaluate({'BB': 5})
+
+    def test_sum_legacy_roundtrip(self):
+        engine = RuleEngine.from_legacy_rules([['(CL + DD >= 2) and (BB > 0)', 'retreat']])
+        assert engine.evaluate({'CL': 1, 'DD': 1, 'BB': 1}).result == RuleResult.RETREAT
+        assert engine.evaluate({'CL': 0, 'DD': 0, 'BB': 3}).result == RuleResult.NO_ACTION
+
+
 # ═══════════════════════════════════════════════════════════════════════════════
 # history.py 测试
 # ═══════════════════════════════════════════════════════════════════════════════