From ae50a6ff5d1aec1ff09910e114cc418d84533cd4 Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Sat, 4 Sep 2021 19:42:43 +0200 Subject: [PATCH] Clean up --- .../java/forge/game/ability/effects/ChangeZoneAllEffect.java | 1 - .../main/java/forge/game/ability/effects/LifeGainEffect.java | 3 +-- forge-gui/res/cardsfolder/b/brushland.txt | 2 +- forge-gui/res/cardsfolder/c/city_of_brass.txt | 2 +- forge-gui/res/cardsfolder/s/skyshroud_forest.txt | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java index b53383ed315..396a33268ee 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java @@ -166,7 +166,6 @@ public class ChangeZoneAllEffect extends SpellAbilityEffect { Map moveParams = Maps.newEnumMap(AbilityKey.class); if (destination == ZoneType.Battlefield) { - if (sa.hasAdditionalAbility("AnimateSubAbility")) { // need LKI before Animate does apply moveParams.put(AbilityKey.CardLKI, CardUtil.getLKICopy(c)); diff --git a/forge-game/src/main/java/forge/game/ability/effects/LifeGainEffect.java b/forge-game/src/main/java/forge/game/ability/effects/LifeGainEffect.java index 457a92f8b74..16a78793898 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/LifeGainEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/LifeGainEffect.java @@ -1,6 +1,5 @@ package forge.game.ability.effects; - import java.util.List; import forge.game.ability.AbilityUtils; @@ -40,7 +39,7 @@ public class LifeGainEffect extends SpellAbilityEffect { final int lifeAmount = AbilityUtils.calculateAmount(sa.getHostCard(), sa.getParam("LifeAmount"), sa); List tgtPlayers = getDefinedPlayersOrTargeted(sa); - if( tgtPlayers.isEmpty() ) { + if (tgtPlayers.isEmpty()) { tgtPlayers.add(sa.getActivatingPlayer()); } diff --git a/forge-gui/res/cardsfolder/b/brushland.txt b/forge-gui/res/cardsfolder/b/brushland.txt index 634ea28bee5..f69444e99bf 100644 --- a/forge-gui/res/cardsfolder/b/brushland.txt +++ b/forge-gui/res/cardsfolder/b/brushland.txt @@ -4,6 +4,6 @@ Types:Land A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}. A:AB$ Mana | Cost$ T | Produced$ W | SubAbility$ DBPain | SpellDescription$ Add {W}. CARDNAME deals 1 damage to you. A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBPain | SpellDescription$ Add {G}. CARDNAME deals 1 damage to you. -SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You +SVar:DBPain:DB$ DealDamage | NumDmg$ 1 | Defined$ You SVar:Picture:http://www.wizards.com/global/images/magic/general/brushland.jpg Oracle:{T}: Add {C}.\n{T}: Add {G} or {W}. Brushland deals 1 damage to you. diff --git a/forge-gui/res/cardsfolder/c/city_of_brass.txt b/forge-gui/res/cardsfolder/c/city_of_brass.txt index d98f99d64b0..a3b6851720f 100644 --- a/forge-gui/res/cardsfolder/c/city_of_brass.txt +++ b/forge-gui/res/cardsfolder/c/city_of_brass.txt @@ -3,6 +3,6 @@ ManaCost:no cost Types:Land A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color. T:Mode$ Taps | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME becomes tapped, it deals 1 damage to you. -SVar:TrigDamage:DB$DealDamage | Defined$ You | NumDmg$ 1 +SVar:TrigDamage:DB$ DealDamage | Defined$ You | NumDmg$ 1 SVar:Picture:http://www.wizards.com/global/images/magic/general/city_of_brass.jpg Oracle:Whenever City of Brass becomes tapped, it deals 1 damage to you.\n{T}: Add one mana of any color. diff --git a/forge-gui/res/cardsfolder/s/skyshroud_forest.txt b/forge-gui/res/cardsfolder/s/skyshroud_forest.txt index 6a7b52c22e8..f7d693eda75 100644 --- a/forge-gui/res/cardsfolder/s/skyshroud_forest.txt +++ b/forge-gui/res/cardsfolder/s/skyshroud_forest.txt @@ -5,6 +5,6 @@ A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}. A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBPain | SpellDescription$ Add {U}. CARDNAME deals 1 damage to you. A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBPain | SpellDescription$ Add {G}. CARDNAME deals 1 damage to you. K:CARDNAME enters the battlefield tapped. -SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You +SVar:DBPain:DB$ DealDamage | NumDmg$ 1 | Defined$ You SVar:Picture:http://www.wizards.com/global/images/magic/general/skyshroud_forest.jpg Oracle:Skyshroud Forest enters the battlefield tapped.\n{T}: Add {C}.\n{T}: Add {G} or {U}. Skyshroud Forest deals 1 damage to you.