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

Some fixes (#5320)

Browse Source 
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.60>
This commit is contained in:
tool4ever
2024-05-30 07:32:08 +02:00
committed by GitHub
parent 60b4c998ba
commit 2ddcaab59d
12 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-game/src/main/java/forge/game/ability/effects/CountersPutAllEffect.java
View File

@@ -122,7 +122,6 @@ public class CountersPutAllEffect extends SpellAbilityEffect {
if (sa.hasParam("RememberCards")) { // remembers whether counters actually placed or not
host.addRemembered(table.columnKeySet());
}
}
}

6
forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java
View File

@@ -90,7 +90,7 @@ public class CountersPutEffect extends SpellAbilityEffect {
}
// skip the StringBuilder if no targets are chosen ("up to" scenario)
if (sa.usesTargeting()) {
final List<Card> targetCards = SpellAbilityEffect.getTargetCards(sa);
final List<Card> targetCards = getTargetCards(sa);
if (targetCards.size() == 0) {
return stringBuilder.toString();
}
@@ -132,7 +132,7 @@ public class CountersPutEffect extends SpellAbilityEffect {
}
// if use targeting we show all targets and corresponding counters
} else if (sa.usesTargeting()) {
final List<Card> targetCards = SpellAbilityEffect.getTargetCards(sa);
final List<Card> targetCards = getTargetCards(sa);
for (int i = 0; i < targetCards.size(); i++) {
Card targetCard = targetCards.get(i);
stringBuilder.append(targetCard);
@@ -151,7 +151,7 @@ public class CountersPutEffect extends SpellAbilityEffect {
String what = sa.getParamOrDefault("ChoicesDesc", sa.getParam("Choices"));
stringBuilder.append(Lang.nounWithNumeralExceptOne(n, what));
} else {
final List<Card> targetCards = SpellAbilityEffect.getTargetCards(sa);
final List<Card> targetCards = getTargetCards(sa);
final Iterator<Card> it = targetCards.iterator();
while (it.hasNext()) {
final Card targetCard = it.next();

2
forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
View File

@@ -2469,7 +2469,7 @@ public class CardFactoryUtil {
String repeffstr = "Event$ Destroy | ActiveZones$ Battlefield | ValidCard$ Card.EnchantedBy | Secondary$ True"
+ " | Description$ Umbra armor (" + inst.getReminderText() + ")";
String abprevDamage = "DB$ DealDamage | Defined$ ReplacedCard | Remove$ All ";
String abprevDamage = "DB$ DealDamage | Defined$ ReplacedCard | Remove$ All";
String abdestroy = "DB$ Destroy | Defined$ Self";
SpellAbility sa = AbilityFactory.getAbility(abprevDamage, card);