Merge branch 'main' of https://git.legonzaur.fr/heronfief/cards-json

2024-08-06 19:16:37 +02:00
parent 6c23a71c32 cc48d11ea1
commit 09c81b9ede
2 changed files with 6 additions and 2 deletions
@@ -89,7 +89,11 @@
                    "effect_type": "suicide",
                    "sub_effects": [
                        {
+<<<<<<< HEAD
                            "effect": "damage_player_champions",
+=======
+                            "effect": "damage_all_champions",
+>>>>>>> cc48d11ea159396c60cca27a91e8c1c85db2319e
                            "amount": 4
                        }
                    ]
@@ -163,8 +163,8 @@
                {
                    "effect": "gold",
                    "amount": 3,
-                    "effect_type": "faction_combo",
-                    "effect_type": "stunned_champion"
+                    "effect_type": "faction_and_stunned",
+                    "nik": "stunned_champion"
                }
            ]
        },