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

Clean up

Browse Source
This commit is contained in:
tool4EvEr
2021-07-04 20:07:44 +02:00
parent af04a994bb
commit db3accfa50
3 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-game/src/main/java/forge/game/ability/AbilityUtils.java
View File

@@ -2569,7 +2569,6 @@ public class AbilityUtils {
// Count$ThisTurnCast <Valid> // Count$ThisTurnCast <Valid>
// Count$LastTurnCast <Valid> // Count$LastTurnCast <Valid>
if (sq[0].startsWith("ThisTurnCast") || sq[0].startsWith("LastTurnCast")) { if (sq[0].startsWith("ThisTurnCast") || sq[0].startsWith("LastTurnCast")) {
final String[] workingCopy = l[0].split("_"); final String[] workingCopy = l[0].split("_");
final String validFilter = workingCopy[1]; final String validFilter = workingCopy[1];

15
forge-game/src/main/java/forge/game/cost/CostAdjustment.java
View File

@@ -97,7 +97,6 @@ public class CostAdjustment {
private static void applyRaise(final Cost cost, final SpellAbility sa, final StaticAbility st) { private static void applyRaise(final Cost cost, final SpellAbility sa, final StaticAbility st) {
final Card hostCard = st.getHostCard(); final Card hostCard = st.getHostCard();
final Card card = sa.getHostCard();
if (!checkRequirement(sa, st)) { if (!checkRequirement(sa, st)) {
return; return;
@@ -138,7 +137,7 @@ public class CostAdjustment {
count = Integer.parseInt(amount); count = Integer.parseInt(amount);
} else { } else {
if (st.hasParam("AffectedAmount")) { if (st.hasParam("AffectedAmount")) {
count = AbilityUtils.calculateAmount(card, st.hasSVar(amount) ? st.getSVar(amount) : amount, sa); count = AbilityUtils.calculateAmount(hostCard, st.hasSVar(amount) ? st.getSVar(amount) : amount, sa);
} else { } else {
count = AbilityUtils.calculateAmount(hostCard, amount, st); count = AbilityUtils.calculateAmount(hostCard, amount, st);
} }
@@ -296,12 +295,10 @@ public class CostAdjustment {
final CardCollectionView toSacList = sa.getHostCard().getController().getController().choosePermanentsToSacrifice(sa, 0, 1, canOffer, offeringType); final CardCollectionView toSacList = sa.getHostCard().getController().getController().choosePermanentsToSacrifice(sa, 0, 1, canOffer, offeringType);
if (!toSacList.isEmpty()) { if (toSacList.isEmpty()) {
toSac = toSacList.getFirst();
}
else {
return; return;
} }
toSac = toSacList.getFirst();
cost.subtractManaCost(toSac.getManaCost()); cost.subtractManaCost(toSac.getManaCost());
@@ -315,12 +312,10 @@ public class CostAdjustment {
final CardCollectionView toSacList = sa.getHostCard().getController().getController().choosePermanentsToSacrifice(sa, 0, 1, canEmerge, "Creature"); final CardCollectionView toSacList = sa.getHostCard().getController().getController().choosePermanentsToSacrifice(sa, 0, 1, canEmerge, "Creature");
if (!toSacList.isEmpty()) { if (toSacList.isEmpty()) {
toSac = toSacList.getFirst();
}
else {
return; return;
} }
toSac = toSacList.getFirst();
cost.decreaseGenericMana(toSac.getCMC()); cost.decreaseGenericMana(toSac.getCMC());

1
forge-game/src/main/java/forge/game/phase/Untap.java
View File

@@ -87,7 +87,6 @@ public class Untap extends Phase {
* @return a boolean. * @return a boolean.
*/ */
public static boolean canUntap(final Card c) { public static boolean canUntap(final Card c) {
if (c.hasKeyword("CARDNAME doesn't untap during your untap step.") if (c.hasKeyword("CARDNAME doesn't untap during your untap step.")
|| c.hasKeyword("This card doesn't untap during your next untap step.") || c.hasKeyword("This card doesn't untap during your next untap step.")
|| c.hasKeyword("This card doesn't untap during your next two untap steps.") || c.hasKeyword("This card doesn't untap during your next two untap steps.")