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

CostDraw merging

Browse Source
This commit is contained in:
tool4EvEr
2022-04-06 11:40:05 +02:00
parent e5eb263f2f
commit cb097e642c
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-game/src/main/java/forge/game/cost/Cost.java
View File

@@ -890,9 +890,9 @@ public class Cost implements Serializable {
} else {
costParts.add(0, new CostPartMana(oldManaCost.toManaCost(), r));
}
} else if (part instanceof CostDiscard || part instanceof CostTapType ||
} else if (part instanceof CostDiscard || part instanceof CostDraw ||
part instanceof CostAddMana || part instanceof CostPayLife
|| part instanceof CostPutCounter) {
|| part instanceof CostPutCounter || part instanceof CostTapType) {
boolean alreadyAdded = false;
for (final CostPart other : costParts) {
if ((other.getClass().equals(part.getClass()) || (part instanceof CostPutCounter && ((CostPutCounter)part).getCounter().is(CounterEnumType.LOYALTY))) &&
@@ -916,6 +916,8 @@ public class Cost implements Serializable {
}
} else if (part instanceof CostDiscard) {
costParts.add(new CostDiscard(amount, part.getType(), part.getTypeDescription()));
} else if (part instanceof CostDraw) {
costParts.add(new CostDraw(amount, part.getType()));
} else if (part instanceof CostTapType) {
CostTapType tappart = (CostTapType)part;
costParts.add(new CostTapType(amount, part.getType(), part.getTypeDescription(), !tappart.canTapSource));

5
forge-gui/res/cardsfolder/m/master_of_waves.txt
View File

@@ -8,8 +8,7 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ u_1_0_elemental | TokenOwner$ You | LegacyImage$ u 1 0 elemental ths
SVar:X:Count$Devotion.Blue
SVar:PlayMain1:TRUE
# TODO doesn't work because the YouCtrl part can't be checked
SVar:AIEvaluationModifier:SVar$AIElemPTBonus/Plus.AIElemTokenGenBonus
SVar:AIElemPTBonus:Count$Valid Elemental.YouCtrl/Times.25
SVar:AIElemTokenGenBonus:Count$Valid Elemental.token+YouCtrl/Times.15
SVar:AIElemPTBonus:PlayerCountPropertyYou$Valid Elemental.YouCtrl/Times.25
SVar:AIElemTokenGenBonus:PlayerCountPropertyYou$Valid Elemental.token+YouCtrl/Times.15
Oracle:Protection from red\nElemental creatures you control get +1/+1.\nWhen Master of Waves enters the battlefield, create a number of 1/0 blue Elemental creature tokens equal to your devotion to blue. (Each {U} in the mana costs of permanents you control counts toward your devotion to blue.)

2
forge-gui/res/cardsfolder/r/rayami_first_of_the_fallen.txt
View File

@@ -2,7 +2,7 @@ Name:Rayami, First of the Fallen
ManaCost:1 B G U
Types:Legendary Creature Vampire
PT:5/4
R:Event$ Moved | ActiveZones$ Battlefield | Origin$ Battlefield | Destination$ Graveyard | ValidLKI$ Creature.nonToken | ReplaceWith$ Exile | Description$ If a nontoken creature would die, exile that card with a blood counter on it instead.
R:Event$ Moved | ActiveZones$ Battlefield | Origin$ Battlefield | Destination$ Graveyard | CheckSelfLKIZone$ True | ValidLKI$ Creature.nonToken | ReplaceWith$ Exile | Description$ If a nontoken creature would die, exile that card with a blood counter on it instead.
SVar:Exile:DB$ ChangeZone | Defined$ ReplacedCard | Origin$ Battlefield | Destination$ Exile | WithCountersType$ BLOOD | WithCountersAmount$ 1
S:Mode$ Continuous | EffectZone$ Battlefield | Affected$ Card.Self | CharacteristicDefining$ True | SharedKeywordsZone$ Exile | SharedRestrictions$ Creature.counters_GE1_BLOOD | AddKeyword$ Flying & First Strike & Double Strike & Deathtouch & Haste & Hexproof & Indestructible & Lifelink & Menace & Protection & Reach & Trample & Vigilance | Description$ As long as an exiled creature card with a blood counter on it has flying, CARDNAME has flying. The same is true for first strike, double strike, deathtouch, haste, hexproof, indestructible, lifelink, menace, protection, reach, trample, and vigilance.
Oracle:If a nontoken creature would die, exile that card with a blood counter on it instead.\nAs long as an exiled creature card with a blood counter on it has flying, Rayami, First of the Fallen has flying. The same is true for first strike, double strike, deathtouch, haste, hexproof, indestructible, lifelink, menace, protection, reach, trample, and vigilance.