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

More visitors for keywords and merge duplicate keyword amount methods.

Browse Source
This commit is contained in:
Myrd
2014-12-31 03:57:16 +00:00
parent 35a1daf116
commit c2904fa2aa
6 changed files with 26 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -857,7 +857,7 @@ public class AiAttackController {
public final static int countExaltedBonus(final Player player) {
int bonus = 0;
for (Card c : player.getCardsIn(ZoneType.Battlefield)) {
bonus += c.getKeywordAmount("Exalted");
bonus += c.getAmountOfKeyword("Exalted");
}
return bonus;

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

@@ -1140,7 +1140,7 @@ public class ComputerUtilCombat {
//check Exalted only for the first attacker
if (combat != null && combat.getAttackers().isEmpty()) {
for (Card card : attacker.getController().getCardsIn(ZoneType.Battlefield)) {
power += card.getKeywordAmount("Exalted");
power += card.getAmountOfKeyword("Exalted");
}
}
@@ -1323,7 +1323,7 @@ public class ComputerUtilCombat {
//check Exalted only for the first attacker
if (combat != null && combat.getAttackers().isEmpty()) {
for (Card card : attacker.getController().getCardsIn(ZoneType.Battlefield)) {
toughness += card.getKeywordAmount("Exalted");
toughness += card.getAmountOfKeyword("Exalted");
}
}

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

@@ -362,8 +362,8 @@ public abstract class PumpAiBase extends SpellAbilityAi {
|| !ph.getPhase().equals(PhaseType.COMBAT_DECLARE_ATTACKERS)) {
return false;
}
int canBlockNum = 1 + card.getKeywordAmount("CARDNAME can block an additional creature.") +
card.getKeywordAmount("CARDNAME can block an additional ninety-nine creatures.") * 99;
int canBlockNum = 1 + card.getAmountOfKeyword("CARDNAME can block an additional creature.") +
card.getAmountOfKeyword("CARDNAME can block an additional ninety-nine creatures.") * 99;
int possibleBlockNum = 0;
for (Card attacker : game.getCombat().getAttackers()) {
if (CombatUtil.canBlock(attacker, card)) {