From bff6d43701adaded51f8870e00d822d6f84d50f0 Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Fri, 2 Apr 2021 13:55:36 +0200 Subject: [PATCH] Gorm the Great and support --- .../src/main/java/forge/game/combat/CombatUtil.java | 5 ++++- forge-gui/res/cardsfolder/g/gorm_the_great.txt | 9 +++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 forge-gui/res/cardsfolder/g/gorm_the_great.txt diff --git a/forge-game/src/main/java/forge/game/combat/CombatUtil.java b/forge-game/src/main/java/forge/game/combat/CombatUtil.java index e03eb011077..11b4c2e8dd6 100644 --- a/forge-game/src/main/java/forge/game/combat/CombatUtil.java +++ b/forge-game/src/main/java/forge/game/combat/CombatUtil.java @@ -831,7 +831,9 @@ public class CombatUtil { for (final Card attacker : attackers) { if (attacker.hasStartOfKeyword("All creatures able to block CARDNAME do so.") || (attacker.hasStartOfKeyword("CARDNAME must be blocked if able.") - && combat.getBlockers(attacker).isEmpty())) { + && combat.getBlockers(attacker).isEmpty()) + || (attacker.hasStartOfKeyword("CARDNAME must be blocked by two or more creatures if able.") + && combat.getBlockers(attacker).size() < 2)) { attackersWithLure.add(attacker); } else { for (KeywordInterface inst : attacker.getKeywords()) { @@ -980,6 +982,7 @@ public class CombatUtil { // attacker with lure, the blocker can't block the former if (!attacker.hasKeyword("All creatures able to block CARDNAME do so.") && !(attacker.hasKeyword("CARDNAME must be blocked if able.") && combat.getBlockers(attacker).isEmpty()) + && !(attacker.hasKeyword("CARDNAME must be blocked by two or more creatures if able.") && combat.getBlockers(attacker).size() < 2) && !(blocker.getMustBlockCards() != null && blocker.getMustBlockCards().contains(attacker)) && !mustBeBlockedBy && CombatUtil.mustBlockAnAttacker(blocker, combat)) { diff --git a/forge-gui/res/cardsfolder/g/gorm_the_great.txt b/forge-gui/res/cardsfolder/g/gorm_the_great.txt new file mode 100644 index 00000000000..e79d016baf3 --- /dev/null +++ b/forge-gui/res/cardsfolder/g/gorm_the_great.txt @@ -0,0 +1,9 @@ +Name:Gorm the Great +ManaCost:3 G +Types:Legendary Creature Giant Warrior +PT:2/7 +K:Partner:Virtus the Veiled +K:Vigilance +K:CARDNAME must be blocked if able. +K:CARDNAME must be blocked by two or more creatures if able. +Oracle:Partner with Virtus the Veiled (When this creature enters the battlefield, target player may put Virtus into their hand from their library, then shuffle.)\nVigilance\nGorm the Great must be blocked if able, and Gorm must be blocked by two or more creatures if able.