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

TakeInitiativeEffect improve stackDesc and Resolve

Browse Source
This commit is contained in:
Northmoc
2022-05-26 20:23:23 -04:00
parent f34f7810ce
commit ffc24faa5a
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-game/src/main/java/forge/game/ability/effects/TakeInitiativeEffect.java
View File

@@ -2,11 +2,10 @@ package forge.game.ability.effects;
import java.util.List; import java.util.List;
import forge.game.Game;
import forge.game.ability.SpellAbilityEffect; import forge.game.ability.SpellAbilityEffect;
import forge.game.player.Player; import forge.game.player.Player;
import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbility;
import org.apache.commons.lang3.StringUtils; import forge.util.Lang;
public class TakeInitiativeEffect extends SpellAbilityEffect { public class TakeInitiativeEffect extends SpellAbilityEffect {
@@ -16,8 +15,8 @@ public class TakeInitiativeEffect extends SpellAbilityEffect {
final List<Player> tgtPlayers = getTargetPlayers(sa); final List<Player> tgtPlayers = getTargetPlayers(sa);
sb.append(StringUtils.join(tgtPlayers, ", ")); sb.append(Lang.joinHomogenous(tgtPlayers)).append(tgtPlayers.size() == 1 ? " takes" : " take");
sb.append(" takes the initiative."); sb.append(" the initiative.");
return sb.toString(); return sb.toString();
} }
@@ -28,9 +27,8 @@ public class TakeInitiativeEffect extends SpellAbilityEffect {
final String set = sa.getHostCard().getSetCode(); final String set = sa.getHostCard().getSetCode();
for (final Player p : getTargetPlayers(sa)) { for (final Player p : getTargetPlayers(sa)) {
final Game game = p.getGame();
if (!sa.usesTargeting() || p.canBeTargetedBy(sa)) { if (!sa.usesTargeting() || p.canBeTargetedBy(sa)) {
game.getAction().takeInitiative(p, set); p.getGame().getAction().takeInitiative(p, set);
} }
} }
} }