external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'nacatl' into 'master'

Browse Source 
Nacatl War-Pride and support

See merge request core-developers/forge!4572
This commit is contained in:
Michael Kamensky
2021-04-22 16:25:15 +00:00
parent 7a094478f3 18d0bf1c7b
commit 5306510ec1
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-game/src/main/java/forge/game/combat/CombatUtil.java
View File

@@ -840,6 +840,8 @@ public class CombatUtil {
if (attacker.hasStartOfKeyword("All creatures able to block CARDNAME do so.") if (attacker.hasStartOfKeyword("All creatures able to block CARDNAME do so.")
|| (attacker.hasStartOfKeyword("CARDNAME must be blocked if able.") || (attacker.hasStartOfKeyword("CARDNAME must be blocked if able.")
&& combat.getBlockers(attacker).isEmpty()) && combat.getBlockers(attacker).isEmpty())
|| (attacker.hasStartOfKeyword("CARDNAME must be blocked by exactly one creature if able.")
&& combat.getBlockers(attacker).size() != 1)
|| (attacker.hasStartOfKeyword("CARDNAME must be blocked by two or more creatures if able.") || (attacker.hasStartOfKeyword("CARDNAME must be blocked by two or more creatures if able.")
&& combat.getBlockers(attacker).size() < 2)) { && combat.getBlockers(attacker).size() < 2)) {
attackersWithLure.add(attacker); attackersWithLure.add(attacker);
@@ -990,6 +992,7 @@ public class CombatUtil {
// attacker with lure, the blocker can't block the former // attacker with lure, the blocker can't block the former
if (!attacker.hasKeyword("All creatures able to block CARDNAME do so.") 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 if able.") && combat.getBlockers(attacker).isEmpty())
&& !(attacker.hasKeyword("CARDNAME must be blocked by exactly one creature if able.") && combat.getBlockers(attacker).size() != 1)
&& !(attacker.hasKeyword("CARDNAME must be blocked by two or more creatures if able.") && combat.getBlockers(attacker).size() < 2) && !(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)) && !(blocker.getMustBlockCards() != null && blocker.getMustBlockCards().contains(attacker))
&& !mustBeBlockedBy && !mustBeBlockedBy

11
forge-gui/res/cardsfolder/n/nacatl_war_pride.txt Normal file
View File

@@ -0,0 +1,11 @@
Name:Nacatl War-Pride
ManaCost:3 G G G
Types:Creature Cat Warrior
PT:3/3
K:CARDNAME must be blocked by exactly one creature if able.
T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigCopyPermanent | TriggerDescription$ Whenever CARDNAME attacks, create X tokens that are copies of CARDNAME and that are tapped and attacking, where X is the number of creatures defending player controls. Exile the tokens at the beginning of the next end step.
SVar:TrigCopyPermanent:DB$ CopyPermanent | Defined$ TriggeredAttacker | NumCopies$ X | TokenTapped$ True | TokenAttacking$ True | AtEOT$ Exile
SVar:X:Count$Valid Creature.DefenderCtrl
SVar:HasAttackEffect:TRUE
DeckHas:Ability$Token
Oracle:Nacatl War-Pride must be blocked by exactly one creature if able.\nWhenever Nacatl War-Pride attacks, create X tokens that are copies of Nacatl War-Pride and that are tapped and attacking, where X is the number of creatures defending player controls. Exile the tokens at the beginning of the next end step.