external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +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

8
forge-game/src/main/java/forge/game/card/CardView.java
View File

@@ -585,9 +585,9 @@ public class CardView extends GameEntityView {
final StringBuilder ab = new StringBuilder();
ab.append("CARDNAME can block an additional ");
ab.append(blockAdditional);
ab.append(" creatures.");
nonAbilityText = nonAbilityText.replaceFirst("CARDNAME can block an additional creature.", ab.toString());
nonAbilityText = nonAbilityText.replaceAll("CARDNAME can block an additional creature.", "");
ab.append(" creatures each combat.");
nonAbilityText = nonAbilityText.replaceFirst("CARDNAME can block an additional creature each combat.", ab.toString());
nonAbilityText = nonAbilityText.replaceAll("CARDNAME can block an additional creature each combat.", "");
nonAbilityText = nonAbilityText.replaceAll("\r\n\r\n\r\n", "");
}
if (!nonAbilityText.isEmpty()) {
@@ -982,7 +982,7 @@ public class CardView extends GameEntityView {
set(TrackableProperty.HasInfect, c.hasKeyword("Infect", state));
set(TrackableProperty.HasStorm, c.hasKeyword("Storm", state));
set(TrackableProperty.HasTrample, c.hasKeyword("Trample", state));
set(TrackableProperty.BlockAdditional, c.getAmountOfKeyword("CARDNAME can block an additional creature.", state));
set(TrackableProperty.BlockAdditional, c.getAmountOfKeyword("CARDNAME can block an additional creature each combat.", state));
updateAbilityText(c, state);
}

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

@@ -445,7 +445,7 @@ public class CombatUtil {
public static int numberOfAdditionalCreaturesCanBlock(final Card blocker) {
// If Wizards makes a few more of these, we should really just make a generic version
return blocker.getAmountOfKeyword("CARDNAME can block an additional creature.") +
return blocker.getAmountOfKeyword("CARDNAME can block an additional creature each combat.") +
blocker.getAmountOfKeyword("CARDNAME can block an additional ninety-nine creatures.") * 99 +
blocker.getAmountOfKeyword("CARDNAME can block an additional seven creatures each combat.") * 7;
}