Remove all powers on a Splitting monster on their turn

xaved88 · Oct 15, 2024 · 414ea63 · 414ea63
1 parent 532f530
commit 414ea63
Show file tree

Hide file tree

Showing 5 changed files with 1,209 additions and 5 deletions.
diff --git a/rs/calculator/battle_state.py b/rs/calculator/battle_state.py
@@ -655,6 +655,11 @@ def end_turn(self):
             if not monster.powers.get(PowerId.BARRICADE, 0):
                 monster.block = 0
 
+            if monster.powers.get(PowerId.SPLIT, 0) and monster.current_hp <= monster.max_hp / 2:
+                monster.damage = 0
+                monster.hits = 0
+                monster.powers = {}
+
             poison = monster.powers.get(PowerId.POISON, 0)
             if poison > 0:
                 monster.powers[PowerId.POISON] -= 1

diff --git a/rs/calculator/targets.py b/rs/calculator/targets.py
@@ -168,10 +168,6 @@ def inflict_damage(self, source, base_damage: int, hits: int, blockable: bool =
                 self.block += block_to_add
                 block_to_add -= 1
 
-        if self.powers.get(PowerId.SPLIT) and self.current_hp <= self.max_hp / 2:
-            self.damage = 0
-            self.hits = 0
-            del self.powers[PowerId.SPLIT]
         if self.powers.get(PowerId.SHIFTING):
             self.add_powers({PowerId.STRENGTH: -health_damage_dealt}, source.relics, source.powers)
         return times_block_triggered

diff --git a/tests/ai/common/handlers/test_battle_handler.py b/tests/ai/common/handlers/test_battle_handler.py
@@ -419,3 +419,6 @@ def test_play_less_to_avoid_awkward_time_warp(self):
         self.execute_handler_tests(
             'battles/specific_comparator_cases/big_fight/time_eater_play_less_to_avoid_inconvenient_time_warp.json',
             ['end'])
+
+    def test_prefer_straight_damage_over_vulnerable_when_splitting(self):
+        self.execute_handler_tests('battles/general/split_terror_vs_strike.json', ['play 2 0'])
diff --git a/tests/calculator/test_calculator_powers.py b/tests/calculator/test_calculator_powers.py
@@ -487,10 +487,22 @@ def test_split_removes_enemy_attack(self):
         state.monsters[0].hits = 2
         state.monsters[0].current_hp = 46
         state.monsters[0].max_hp = 80
-        state.monsters[0].powers = {PowerId.SPLIT: 1}
+        state.monsters[0].powers[PowerId.SPLIT] = 1
+        play = self.when_playing_the_first_card(state)
+        play.end_turn()
+        self.see_enemy_does_not_have_power(play, PowerId.SPLIT)
+        self.see_player_lost_hp(play, 0)
+
+    def test_split_removes_enemy_powers(self):
+        state = self.given_state(CardId.STRIKE_R)
+        state.monsters[0].current_hp = 46
+        state.monsters[0].max_hp = 80
+        state.monsters[0].powers[PowerId.SPLIT] = 1
+        state.monsters[0].powers[PowerId.VULNERABLE] = 3
         play = self.when_playing_the_first_card(state)
         play.end_turn()
         self.see_enemy_does_not_have_power(play, PowerId.SPLIT)
+        self.see_enemy_does_not_have_power(play, PowerId.VULNERABLE)
         self.see_player_lost_hp(play, 0)
 
     def test_not_quite_split_does_nothing(self):