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

Changed "CARDNAME can block an additional creature." to CARDNAME can block an additional creature each combat."

Browse Source 
Notes: Possible weird interactions when giving a multiblock creature an additional block eg. Equipping a Night Market Guard with echo circlet. Further study required.
This commit is contained in:
Indigo Dragon
2017-09-24 12:33:45 +00:00
parent 07886140fb
commit bab2b9f528
32 changed files with 43 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-ai/src/main/java/forge/ai/AiAttackController.java
View File

@@ -479,7 +479,7 @@ public class AiAttackController {
for (Card blocker : this.blockers) {
if (blocker.hasKeyword("CARDNAME can block any number of creatures.")
|| blocker.hasKeyword("CARDNAME can block an additional ninety-nine creatures.")) {
|| blocker.hasKeyword("CARDNAME can block an additional ninety-nine creatures each combat.")) {
for (Card attacker : this.attackers) {
if (CombatUtil.canBlock(attacker, blocker)) {
remainingAttackers.remove(attacker);
@@ -495,7 +495,7 @@ public class AiAttackController {
if (remainingAttackers.isEmpty() || maxBlockersAfterCrew == 0) {
break;
}
if (blocker.hasKeyword("CARDNAME can block an additional creature.")) {
if (blocker.hasKeyword("CARDNAME can block an additional creature each combat.")) {
blockedAttackers.add(remainingAttackers.get(0));
remainingAttackers.remove(0);
maxBlockersAfterCrew--;

4
forge-ai/src/main/java/forge/ai/ability/AttachAi.java
View File

@@ -1275,9 +1275,9 @@ public class AttachAi extends SpellAbilityAi {
if (card.hasKeyword("Flying") || !CombatUtil.canBlock(card, true)) {
return false;
}
} else if (keyword.endsWith("CARDNAME can block an additional creature.")) {
} else if (keyword.endsWith("CARDNAME can block an additional creature each combat.")) {
if (!CombatUtil.canBlock(card, true) || card.hasKeyword("CARDNAME can block any number of creatures.")
|| card.hasKeyword("CARDNAME can block an additional ninety-nine creatures.")) {
|| card.hasKeyword("CARDNAME can block an additional ninety-nine creatures each combat.")) {
return false;
}
} else if (keyword.equals("CARDNAME can attack as though it didn't have defender.")) {

2
forge-ai/src/main/java/forge/ai/ability/PumpAiBase.java
View File

@@ -384,7 +384,7 @@ public abstract class PumpAiBase extends SpellAbilityAi {
|| !CombatUtil.canBlock(card)) {
return false;
}
} else if (keyword.endsWith("CARDNAME can block an additional creature.")) {
} else if (keyword.endsWith("CARDNAME can block an additional creature each combat.")) {
if (ph.isPlayerTurn(ai)
|| !ph.getPhase().equals(PhaseType.COMBAT_DECLARE_ATTACKERS)) {
return false;