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

Some fixes

Browse Source
This commit is contained in:
tool4EvEr
2024-01-27 23:52:55 +01:00
committed by Chris H
parent b0f4d7d9d5
commit 8e54d17abb
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java
View File

@@ -33,7 +33,7 @@ public class CharmEffect extends SpellAbilityEffect {
List<AbilitySub> toRemove = Lists.newArrayList();
for (AbilitySub ch : choices) {
// 603.3c If one of the modes would be illegal, that mode can't be chosen.
if ((ch.usesTargeting() && ch.isTrigger() && ch.getMinTargets() > 0 &&
if ((ch.usesTargeting() && ch.getMinTargets() > 0 &&
ch.getTargetRestrictions().getNumCandidates(ch, true) == 0) ||
(restriction != null && restriction.contains(ch.getDescription()))) {
toRemove.add(ch);

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

@@ -147,7 +147,7 @@ public class CountersPutEffect extends SpellAbilityEffect {
}
} else if (sa.hasParam("Choices")) {
int n = AbilityUtils.calculateAmount(card, sa.getParamOrDefault("ChoiceAmount", "1"), sa);
String what = (sa.getParamOrDefault("ChoicesDesc", sa.getParam("Choices")));
String what = sa.getParamOrDefault("ChoicesDesc", sa.getParam("Choices"));
stringBuilder.append(Lang.nounWithNumeralExceptOne(n, what));
} else {
final List<Card> targetCards = SpellAbilityEffect.getTargetCards(sa);

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

@@ -3028,7 +3028,7 @@ public class CardFactoryUtil {
// because it doesn't work other wise
c.setForetoldCostByEffect(true);
}
String sb = TextUtil.concatWithSpace(getActivatingPlayer().toString(),"has foretold.");
String sb = TextUtil.concatWithSpace(getActivatingPlayer().toString(), "has foretold.");
game.getGameLog().add(GameLogEntryType.STACK_RESOLVE, sb);
game.fireEvent(new GameEventCardForetold(getActivatingPlayer()));
}