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

Merge branch 'emblazoned_golem' into 'master'

Browse Source 
Add Emblazoned Golem

See merge request core-developers/forge!4467
This commit is contained in:
Michael Kamensky
2021-04-12 04:17:33 +00:00
parent 54fd4787fd a8ad7f540b
commit 76a1da2d0f
6 changed files with 88 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-gui/src/main/java/forge/player/HumanPlay.java
View File

@@ -708,13 +708,17 @@ public class HumanPlay {
ManaCostBeingPaid toPay = new ManaCostBeingPaid(realCost, mc.getRestiction());
String xInCard = source.getSVar("X");
String xColor = ability.getParam("XColor");
if (source.hasKeyword("Spend only colored mana on X. No more than one mana of each color may be spent this way.")) {
xColor = "WUBRGX";
}
if (mc.getAmountOfX() > 0 && !"Count$xPaid".equals(xInCard)) { // announce X will overwrite whatever was in card script
int xPaid = AbilityUtils.calculateAmount(source, "X", ability);
toPay.setXManaCostPaid(xPaid, ability.getParam("XColor"));
toPay.setXManaCostPaid(xPaid, xColor);
ability.setXManaCostPaid(xPaid);
}
else if (ability.getXManaCostPaid() != null) { //ensure pre-announced X value retained
toPay.setXManaCostPaid(ability.getXManaCostPaid(), ability.getParam("XColor"));
toPay.setXManaCostPaid(ability.getXManaCostPaid(), xColor);
}
int timesMultikicked = source.getKickerMagnitude();

3
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -396,6 +396,9 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
canChooseZero = false;
}
}
if (ability.getHostCard().hasKeyword("Spend only colored mana on X. No more than one mana of each color may be spent this way.")) {
max = 5;
}
}
final int min = canChooseZero ? 0 : 1;