diff --git a/main.tscn b/main.tscn index e0e520e..46481fe 100644 --- a/main.tscn +++ b/main.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" path="res://main.gd" id="1_e0ud3"] [ext_resource type="Script" path="res://server_discovery.gd" id="2_hed18"] -[ext_resource type="PackedScene" uid="uid://l2ehohbd1xhk" path="res://demo_game.tscn" id="3_2ln6b"] +[ext_resource type="PackedScene" uid="uid://bgc0u117jqyr1" path="res://demo_game.tscn" id="3_2ln6b"] [node name="Main" type="Control"] layout_mode = 3 diff --git a/tcg/match/match_manager.gd b/tcg/match/match_manager.gd index 6ec765d..647f4ce 100644 --- a/tcg/match/match_manager.gd +++ b/tcg/match/match_manager.gd @@ -117,11 +117,11 @@ func resolve(action_by_player_id: Dictionary) -> PhaseTransition: if _player_has_active_support_card(pair.from, "all_out_attack"): var rps = [pair.from.monster.card.rock, pair.from.monster.card.paper, pair.from.monster.card.scissors] computed_damage = rps.reduce(func (a, b): return a + b, 0) - pair.from.health_delta -= rps.min() + pair.from.monster.health_delta -= rps.min() if _player_has_active_support_card(pair.from, "sword_mastery"): computed_damage += 20 if _player_has_active_support_card(pair.from, "lifesteal"): - pair.from.health_delta += computed_damage + pair.from.monster.health_delta += computed_damage pair.to.monster.health_delta -= computed_damage phase = Match.Phase.SUPPORT_2