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

Merge branch 'master' into 'master'

Browse Source 
RaiseTo param for Trinisphere-likes

See merge request core-developers/forge!3280
This commit is contained in:
Michael Kamensky
2020-10-21 04:03:48 +00:00
parent 16d5adbe4f 29841b18a4
commit a1c1a0e1d7
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -337,15 +337,12 @@ public class CostAdjustment {
return; return;
} }
int value = 0; int value = Integer.parseInt(amount);
if (StringUtils.isNumeric(amount)) {
value = Integer.parseInt(amount); if (staticAbility.hasParam("RaiseTo")) {
} else {
if ("Min3".equals(amount)) {
int cmc = manaCost.getConvertedManaCost(); int cmc = manaCost.getConvertedManaCost();
if (cmc < 3) { if (cmc < value) {
value = 3 - cmc; value = Integer.parseInt(amount) - cmc;
}
} }
} }

2
forge-gui/res/cardsfolder/t/trinisphere.txt
View File

@@ -1,7 +1,7 @@
Name:Trinisphere Name:Trinisphere
ManaCost:3 ManaCost:3
Types:Artifact Types:Artifact
S:Mode$ SetCost | ValidCard$ Card | Type$ Spell | Amount$ Min3 | CheckSVar$ X | SVarCompare$ EQ1 | Description$ As long as CARDNAME is untapped, each spell that would cost less than three mana to cast costs three mana to cast. S:Mode$ SetCost | ValidCard$ Card | Type$ Spell | Amount$ 3 | RaiseTo$ True | CheckSVar$ X | SVarCompare$ EQ1 | Description$ As long as CARDNAME is untapped, each spell that would cost less than three mana to cast costs three mana to cast.
SVar:X:Count$Valid Card.Self+untapped SVar:X:Count$Valid Card.Self+untapped
AI:RemoveDeck:Random AI:RemoveDeck:Random
SVar:NonStackingEffect:True SVar:NonStackingEffect:True