From df4c64070d202a8f6dae24e128304f09338cc288 Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Sun, 12 Sep 2021 10:29:49 +0200 Subject: [PATCH] Fix Fireball --- .../src/main/java/forge/ai/ability/EffectAi.java | 1 - .../src/main/java/forge/game/ability/AbilityKey.java | 1 - .../main/java/forge/game/ability/AbilityUtils.java | 1 - .../game/ability/effects/CountersRemoveEffect.java | 2 -- .../java/forge/game/ability/effects/DigEffect.java | 12 ++++-------- .../game/ability/effects/ReorderZoneEffect.java | 3 +-- .../forge/game/replacement/ReplacementHandler.java | 1 - forge-gui/res/cardsfolder/d/deadly_grub.txt | 2 +- forge-gui/res/cardsfolder/f/fireball.txt | 2 +- .../cardsfolder/k/kozilek_the_great_distortion.txt | 2 +- .../java/forge/gui/control/FControlGamePlayback.java | 2 +- .../main/java/forge/player/HumanCostDecision.java | 3 +-- 12 files changed, 10 insertions(+), 22 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/ability/EffectAi.java b/forge-ai/src/main/java/forge/ai/ability/EffectAi.java index 7b7ee50f573..b2249e45ebc 100644 --- a/forge-ai/src/main/java/forge/ai/ability/EffectAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/EffectAi.java @@ -137,7 +137,6 @@ public class EffectAi extends SpellAbilityAi { } randomReturn = true; } else if (logic.equals("Evasion")) { - if (!phase.isPlayerTurn(ai)) { return false; } diff --git a/forge-game/src/main/java/forge/game/ability/AbilityKey.java b/forge-game/src/main/java/forge/game/ability/AbilityKey.java index f4e4227b0dc..311fec449fd 100644 --- a/forge-game/src/main/java/forge/game/ability/AbilityKey.java +++ b/forge-game/src/main/java/forge/game/ability/AbilityKey.java @@ -155,7 +155,6 @@ public enum AbilityKey { } } return null; - } public static EnumMap newMap() { diff --git a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java index 36ed77f5824..8e8e64736d4 100644 --- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java +++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java @@ -451,7 +451,6 @@ public class AbilityUtils { public static int calculateAmount(final Card card, String amount, final CardTraitBase ability) { return calculateAmount(card, amount, ability, false); } - public static int calculateAmount(final Card card, String amount, final CardTraitBase ability, boolean maxto) { // return empty strings and constants if (StringUtils.isBlank(amount)) { return 0; } diff --git a/forge-game/src/main/java/forge/game/ability/effects/CountersRemoveEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CountersRemoveEffect.java index 239d59f47d7..d349a45d5e0 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/CountersRemoveEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/CountersRemoveEffect.java @@ -175,7 +175,6 @@ public class CountersRemoveEffect extends SpellAbilityEffect { String title = Localizer.getInstance().getMessage("lblSelectRemoveCountersNumberOfTarget", type); cntToRemove = pc.chooseNumber(sa, title, 0, cntToRemove, params); } - } if (cntToRemove > 0) { gameCard.subtractCounter(counterType, cntToRemove); @@ -199,7 +198,6 @@ public class CountersRemoveEffect extends SpellAbilityEffect { } } - protected void removeAnyType(GameEntity entity, int cntToRemove, SpellAbility sa) { boolean rememberRemoved = sa.hasParam("RememberRemoved"); diff --git a/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java index ad67308edc1..52e2896424d 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java @@ -45,8 +45,7 @@ public class DigEffect extends SpellAbilityEffect { if (tgtPlayers.contains(host.getController())) { sb.append("their "); - } - else { + } else { for (final Player p : tgtPlayers) { sb.append(Lang.getInstance().getPossesive(p.getName())).append(" "); } @@ -323,8 +322,7 @@ public class DigEffect extends SpellAbilityEffect { libraryPosition = zone.size(); } c = game.getAction().moveTo(zone, c, libraryPosition, sa); - } - else { + } else { c = game.getAction().moveTo(zone, c, sa); if (destZone1.equals(ZoneType.Battlefield)) { if (sa.hasParam("Tapped")) { @@ -383,8 +381,7 @@ public class DigEffect extends SpellAbilityEffect { Card m; if (destZone2 == ZoneType.Library) { m = game.getAction().moveToLibrary(c, libraryPosition2, sa); - } - else { + } else { m = game.getAction().moveToVariantDeck(c, destZone2, libraryPosition2, sa); } if (m != null && !origin.equals(m.getZone().getZoneType())) { @@ -394,8 +391,7 @@ public class DigEffect extends SpellAbilityEffect { host.addRemembered(m); } } - } - else { + } else { // just move them randomly for (int i = 0; i < rest.size(); i++) { Card c = rest.get(i); diff --git a/forge-game/src/main/java/forge/game/ability/effects/ReorderZoneEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ReorderZoneEffect.java index 0aec8a69275..1b2cb597848 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ReorderZoneEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ReorderZoneEffect.java @@ -34,8 +34,7 @@ public class ReorderZoneEffect extends SpellAbilityEffect { if (shuffle) { Collections.shuffle(list, MyRandom.getRandom()); p.getZone(zone).setCards(list); - } - else { + } else { p.getController().orderMoveToZoneList(list, zone, sa); } } diff --git a/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java b/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java index 1ddcd59b518..dd52d246a09 100644 --- a/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java +++ b/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java @@ -81,7 +81,6 @@ public class ReplacementHandler { //private final List tmpEffects = new ArrayList(); public List getReplacementList(final ReplacementType event, final Map runParams, final ReplacementLayer layer) { - final CardCollection preList = new CardCollection(); boolean checkAgain = false; Card affectedLKI = null; diff --git a/forge-gui/res/cardsfolder/d/deadly_grub.txt b/forge-gui/res/cardsfolder/d/deadly_grub.txt index 8efc35e3a67..be93d56917d 100644 --- a/forge-gui/res/cardsfolder/d/deadly_grub.txt +++ b/forge-gui/res/cardsfolder/d/deadly_grub.txt @@ -4,6 +4,6 @@ Types:Creature Insect PT:3/1 K:Vanishing:3 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+counters_EQ0_TIME | Execute$ TrigToken | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, if it had no time counters on it, create a 6/1 green Insect creature token with shroud. (It can't be the target of spells or abilities.) -SVar:TrigToken:DB$Token | TokenAmount$ 1 | TokenScript$ g_6_1_insect_shroud | TokenOwner$ TriggeredCardController | LegacyImage$ g 6 1 insect shroud plc +SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_6_1_insect_shroud | TokenOwner$ TriggeredCardController | LegacyImage$ g 6 1 insect shroud plc SVar:Picture:http://www.wizards.com/global/images/magic/general/deadly_grub.jpg Oracle:Vanishing 3 (This creature enters the battlefield with three time counters on it. At the beginning of your upkeep, remove a time counter from it. When the last is removed, sacrifice it.)\nWhen Deadly Grub dies, if it had no time counters on it, create a 6/1 green Insect creature token with shroud. (It can't be the target of spells or abilities.) diff --git a/forge-gui/res/cardsfolder/f/fireball.txt b/forge-gui/res/cardsfolder/f/fireball.txt index 06eeb46a331..f5e0805aa95 100644 --- a/forge-gui/res/cardsfolder/f/fireball.txt +++ b/forge-gui/res/cardsfolder/f/fireball.txt @@ -2,7 +2,7 @@ Name:Fireball ManaCost:X R Types:Sorcery A:SP$ DealDamage | Cost$ X R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ X | TargetMin$ 0 | TargetMax$ MaxTargets | DivideEvenly$ RoundedDown | SpellDescription$ This spell costs {1} more to cast for each target beyond the first. -S:Mode$ RaiseCost | ValidCard$ Card.Self | Type$ Spell | Amount$ IncreaseCost | EffectZone$ All | Description$ CARDNAME deals X damage divided evenly, rounded down, among any number of targets. +S:Mode$ RaiseCost | ValidCard$ Card.Self | Type$ Spell | Amount$ IncreaseCost | AffectedAmount$ True | EffectZone$ All | Description$ CARDNAME deals X damage divided evenly, rounded down, among any number of targets. SVar:X:Count$xPaid SVar:MaxTargets:SVar$Maxplayer/Plus.Maxcreatureorplaneswalker SVar:Maxplayer:PlayerCountPlayers$Amount diff --git a/forge-gui/res/cardsfolder/k/kozilek_the_great_distortion.txt b/forge-gui/res/cardsfolder/k/kozilek_the_great_distortion.txt index 216119d18c6..014c7cabdeb 100644 --- a/forge-gui/res/cardsfolder/k/kozilek_the_great_distortion.txt +++ b/forge-gui/res/cardsfolder/k/kozilek_the_great_distortion.txt @@ -3,7 +3,7 @@ ManaCost:8 C C Types:Legendary Creature Eldrazi PT:12/12 T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigDraw | CheckSVar$ Y | SVarCompare$ LT7 | TriggerDescription$ When you cast this spell, if you have fewer than seven cards in hand, draw cards equal to the difference. -SVar:TrigDraw:DB$Draw | Defined$ You | NumCards$ Difference +SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ Difference SVar:Y:Count$InYourHand SVar:Difference:Number$7/Minus.Y K:Menace diff --git a/forge-gui/src/main/java/forge/gui/control/FControlGamePlayback.java b/forge-gui/src/main/java/forge/gui/control/FControlGamePlayback.java index 6ce805877d6..ba348be4225 100644 --- a/forge-gui/src/main/java/forge/gui/control/FControlGamePlayback.java +++ b/forge-gui/src/main/java/forge/gui/control/FControlGamePlayback.java @@ -87,7 +87,7 @@ public class FControlGamePlayback extends IGameEventVisitor.Base { try { final boolean isUiToStop = !humanController.getGui().isUiSetToSkipPhase(ev.playerTurn.getView(), ev.phase); - switch(ev.phase) { + switch (ev.phase) { case COMBAT_END: case COMBAT_DECLARE_ATTACKERS: case COMBAT_DECLARE_BLOCKERS: diff --git a/forge-gui/src/main/java/forge/player/HumanCostDecision.java b/forge-gui/src/main/java/forge/player/HumanCostDecision.java index 053eb2b0dde..88dd939bcfb 100644 --- a/forge-gui/src/main/java/forge/player/HumanCostDecision.java +++ b/forge-gui/src/main/java/forge/player/HumanCostDecision.java @@ -720,8 +720,7 @@ public class HumanCostDecision extends CostDecisionMakerBase { final CardView view = CardView.get(card); return player.getController().confirmPayment(cost, Localizer.getInstance().getMessage("lblReturnCardToHandConfirm", CardTranslation.getTranslatedName(view.getName())), ability) ? PaymentDecision.card(card) : null; } - } - else { + } else { final CardCollectionView validCards = CardLists.getValidCards(ability.getActivatingPlayer().getCardsIn(ZoneType.Battlefield), cost.getType().split(";"), player, source, ability);