From ce73613f53bcb190d2ebe37c16fdcffca2f948df Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Fri, 8 Apr 2022 20:55:51 +0200 Subject: [PATCH] Fix The Celestus overpowering Angel of Eternal Dawn --- forge-ai/src/main/java/forge/ai/AiBlockController.java | 1 + forge-ai/src/main/java/forge/ai/ComputerUtilMana.java | 2 +- forge-ai/src/main/java/forge/ai/LobbyPlayerAi.java | 6 ++---- forge-ai/src/main/java/forge/ai/PlayerControllerAi.java | 5 ++--- .../src/main/java/forge/game/ability/AbilityFactory.java | 2 +- .../main/java/forge/game/ability/effects/AscendEffect.java | 2 +- .../main/java/forge/game/ability/effects/DayTimeEffect.java | 2 +- forge-game/src/main/java/forge/game/card/Card.java | 2 -- forge-game/src/main/java/forge/game/phase/Untap.java | 2 +- .../src/main/java/forge/game/spellability/SpellAbility.java | 2 -- .../java/forge/game/spellability/SpellAbilityCondition.java | 2 +- .../forge/game/spellability/SpellAbilityRestriction.java | 2 +- 12 files changed, 12 insertions(+), 18 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/AiBlockController.java b/forge-ai/src/main/java/forge/ai/AiBlockController.java index c132dc5c43a..dd489c3f8c3 100644 --- a/forge-ai/src/main/java/forge/ai/AiBlockController.java +++ b/forge-ai/src/main/java/forge/ai/AiBlockController.java @@ -1351,6 +1351,7 @@ public class AiBlockController { boolean modified = false; for (final Card blocker : oldBlockers) { + // TODO check all blocked attackers Cost tax = CombatUtil.getBlockCost(blocker.getGame(), blocker, combat.getAttackersBlockedBy(blocker).get(0)); int taxCMC = tax != null ? tax.getCostMana().getMana().getCMC() : 0; if (myFreeMana < currentBlockTax + taxCMC) { diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilMana.java b/forge-ai/src/main/java/forge/ai/ComputerUtilMana.java index 7854f313a83..13dafd1357f 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtilMana.java +++ b/forge-ai/src/main/java/forge/ai/ComputerUtilMana.java @@ -1571,7 +1571,7 @@ public class ComputerUtilMana { System.out.println("DEBUG_MANA_PAYMENT: sortedManaSources = " + sortedManaSources); } return sortedManaSources; - } // getAvailableManaSources() + } //This method is currently used by AI to estimate mana available private static ListMultimap groupSourcesByManaColor(final Player ai, boolean checkPlayable) { diff --git a/forge-ai/src/main/java/forge/ai/LobbyPlayerAi.java b/forge-ai/src/main/java/forge/ai/LobbyPlayerAi.java index 9d216faca15..9384e15e393 100644 --- a/forge-ai/src/main/java/forge/ai/LobbyPlayerAi.java +++ b/forge-ai/src/main/java/forge/ai/LobbyPlayerAi.java @@ -14,18 +14,17 @@ public class LobbyPlayerAi extends LobbyPlayer implements IGameEntitiesFactory { private boolean rotateProfileEachGame; private boolean allowCheatShuffle; private boolean useSimulation; - + public LobbyPlayerAi(String name, Set options) { super(name); if (options != null && options.contains(AIOption.USE_SIMULATION)) { this.useSimulation = true; } } - + public boolean isAllowCheatShuffle() { return allowCheatShuffle; } - public void setAllowCheatShuffle(boolean allowCheatShuffle) { this.allowCheatShuffle = allowCheatShuffle; } @@ -33,7 +32,6 @@ public class LobbyPlayerAi extends LobbyPlayer implements IGameEntitiesFactory { public void setAiProfile(String profileName) { aiProfile = profileName; } - public String getAiProfile() { return aiProfile; } diff --git a/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java b/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java index 8ea8826d578..ddfc049d9ce 100644 --- a/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java +++ b/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java @@ -3,7 +3,6 @@ package forge.ai; import java.security.InvalidParameterException; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -377,7 +376,7 @@ public class PlayerControllerAi extends PlayerController { } // put the rest on top in random order - Collections.shuffle(toTop, MyRandom.getRandom()); + CardLists.shuffle(toTop); return ImmutablePair.of(toTop, toBottom); } @@ -403,7 +402,7 @@ public class PlayerControllerAi extends PlayerController { } } - Collections.shuffle(toTop, MyRandom.getRandom()); + CardLists.shuffle(toTop); return ImmutablePair.of(toTop, toGraveyard); } diff --git a/forge-game/src/main/java/forge/game/ability/AbilityFactory.java b/forge-game/src/main/java/forge/game/ability/AbilityFactory.java index 4c7d50de2a6..71cc985d233 100644 --- a/forge-game/src/main/java/forge/game/ability/AbilityFactory.java +++ b/forge-game/src/main/java/forge/game/ability/AbilityFactory.java @@ -503,4 +503,4 @@ public final class AbilityFactory { left.appendSubAbility(right); return left; } -} // end class AbilityFactory +} diff --git a/forge-game/src/main/java/forge/game/ability/effects/AscendEffect.java b/forge-game/src/main/java/forge/game/ability/effects/AscendEffect.java index 6d24588cc9c..871d004fd29 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/AscendEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/AscendEffect.java @@ -26,7 +26,7 @@ public class AscendEffect extends SpellAbilityEffect { return sb.toString(); } - + /* * (non-Javadoc) * @see forge.game.ability.SpellAbilityEffect#resolve(forge.game.spellability.SpellAbility) diff --git a/forge-game/src/main/java/forge/game/ability/effects/DayTimeEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DayTimeEffect.java index a7e3074c9a2..e1e713987b9 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DayTimeEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DayTimeEffect.java @@ -31,7 +31,7 @@ public class DayTimeEffect extends SpellAbilityEffect { Boolean oldValue = game.getDayTime(); if (oldValue == null && !cantBeNight) { game.setDayTime(true); // if it was neither it becomes night - } else { + } else if (oldValue == true || !cantBeNight) { game.setDayTime(!oldValue); } } diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java index 09bbd21c6d4..5a7b41c2d98 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -971,7 +971,6 @@ public class Card extends GameEntity implements Comparable, IHasSVars { } delvedCards.add(c); } - public final void clearDelved() { delvedCards = null; } @@ -3212,7 +3211,6 @@ public class Card extends GameEntity implements Comparable, IHasSVars { public boolean cameUnderControlSinceLastUpkeep() { return cameUnderControlSinceLastUpkeep; } - public void setCameUnderControlSinceLastUpkeep(boolean underControlSinceLastUpkeep) { this.cameUnderControlSinceLastUpkeep = underControlSinceLastUpkeep; } diff --git a/forge-game/src/main/java/forge/game/phase/Untap.java b/forge-game/src/main/java/forge/game/phase/Untap.java index e766da85cd7..9290f186800 100644 --- a/forge-game/src/main/java/forge/game/phase/Untap.java +++ b/forge-game/src/main/java/forge/game/phase/Untap.java @@ -300,4 +300,4 @@ public class Untap extends Phase { game.setDayTime(false); } } -} //end class Untap +} diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java index 17a3a23cdc8..6560286585e 100644 --- a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java +++ b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java @@ -2348,7 +2348,6 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit public SpellAbility getOriginalAbility() { return grantorOriginal; } - public void setOriginalAbility(final SpellAbility sa) { grantorOriginal = sa; } @@ -2356,7 +2355,6 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit public StaticAbility getGrantorStatic() { return grantorStatic; } - public void setGrantorStatic(final StaticAbility st) { grantorStatic = st; } diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbilityCondition.java b/forge-game/src/main/java/forge/game/spellability/SpellAbilityCondition.java index e6ecb374d02..62366f1de6d 100644 --- a/forge-game/src/main/java/forge/game/spellability/SpellAbilityCondition.java +++ b/forge-game/src/main/java/forge/game/spellability/SpellAbilityCondition.java @@ -489,4 +489,4 @@ public class SpellAbilityCondition extends SpellAbilityVariables { return true; } -} // end class SpellAbility_Condition +} diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java b/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java index e9f296f5c7e..57ee553aa94 100644 --- a/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java +++ b/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java @@ -622,4 +622,4 @@ public class SpellAbilityRestriction extends SpellAbilityVariables { return true; } // canPlay() -} // end class SpellAbilityRestriction +}