Skip to content

Show commander tax in perpetual mana cost overlay #10258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MostCromulent wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Show commander tax in perpetual mana cost overlay #10258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions forge-game/src/main/java/forge/game/card/Card.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6929,6 +6929,9 @@ public void setZone(Zone zone) {
if (currentZone == zone) { return; }
currentZone = zone;
view.updateZone(this);
if (isCommander()) {
updateManaCostForView();
}
}

public boolean isInZone(final ZoneType zone) {
Expand Down
20 changes: 19 additions & 1 deletion forge-game/src/main/java/forge/game/card/CardState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import forge.game.staticability.StaticAbility;
import forge.game.staticability.StaticAbilityMode;
import forge.game.trigger.Trigger;
import forge.game.zone.ZoneType;
import forge.util.CardTranslation;
import forge.util.ITranslatable;
import forge.util.IterableUtil;
Expand Down Expand Up @@ -273,7 +274,24 @@ public void calculatePerpetualAdjustedManaCost() {
}

public ManaCost getPerpetualAdjustedManaCost() {
return perpetualAdjustedManaCost == null ? getManaCost() : perpetualAdjustedManaCost;
ManaCost base = perpetualAdjustedManaCost == null ? getManaCost() : perpetualAdjustedManaCost;

// Layer commander tax on top of perpetual adjustments when in command zone
Card card = getCard();
if (card != null && card.isCommander() && card.getZone() != null
&& card.getZone().is(ZoneType.Command)) {
Player owner = card.getOwner();
if (owner != null) {
int tax = owner.getCommanderCast(card) * 2;
if (tax > 0) {
int newGeneric = base.getGenericCost() + tax;
String shards = base.getShortString().replaceFirst("" + base.getGenericCost(), "").trim();
String costStr = newGeneric + (shards.isEmpty() ? "" : " " + shards);
return new ManaCost(costStr);
}
}
}
return base;
}

public final ColorSet getColor() {
Expand Down
Loading