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 'mid_7' into 'master'

Browse Source 
MID - 8 Sep

See merge request core-developers/forge!5309
This commit is contained in:
Michael Kamensky
2021-09-09 04:02:51 +00:00
parent 93a85b06ff cd6b7963c4
commit 8c49535c6e
4 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/card/CounterEnumType.java
View File

@@ -263,6 +263,8 @@ public enum CounterEnumType {
QUEST("QUEST", 251, 189, 0),
RITUAL("RITUAL", 155, 17, 30),
RUST("RUST", 255, 181, 116),
SCREAM("SCREM", 0, 220, 255),

2
forge-game/src/main/java/forge/game/cost/CostPayLife.java
View File

@@ -57,7 +57,7 @@ public class CostPayLife extends CostPart {
if (desc != null) {
sb.append(desc);
} else {
sb.append(this.getAmount()).append(" Life");
sb.append(this.getAmount()).append(" life");
}
return sb.toString();
}

14
forge-gui/res/cardsfolder/upcoming/geistflame_reservoir.txt Normal file
View File

@@ -0,0 +1,14 @@
Name:Geistflame Reservoir
ManaCost:2 R
Types:Artifact
T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigCharge | TriggerDescription$ Whenever you cast an instant or sorcery spell, put a charge counter on CARDNAME.
SVar:TrigCharge:DB$ PutCounter | Defined$ Self | CounterType$ CHARGE | CounterNum$ 1
A:AB$ DealDamage | Cost$ 1 R T SubCounter<X/CHARGE> | NumDmg$ X | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | SpellDescription$ It deals that much damage to any target.
SVar:X:Count$xPaid
A:AB$ Dig | Cost$ 1 R T | Defined$ You | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect | AILogic$ ExileAndPlayUntilEOT | StackDescription$ SpellDescription | SpellDescription$ Exile the top card of your library. You may play that card this turn.
SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ Play | SubAbility$ DBCleanup | ExileOnMoved$ Exile
SVar:Play:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play this card this turn.
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
DeckHas:Ability$Counters
DeckHints:Type$Instant|Sorcery
Oracle:Whenever you cast an instant or sorcery spell, put a charge counter on Geistflame Reservoir.\n{1}{R}, {T}, Remove any number of charge counters from Geistflame Reservoir: It deals that much damage to any target.\n{1}{R}, {T}: Exile the top card of your library. You may play that card this turn.

23
forge-gui/res/cardsfolder/upcoming/heirloom_mirror_inherited_fiend.txt Normal file
View File

@@ -0,0 +1,23 @@
Name:Heirloom Mirror
ManaCost:1 B
Types:Artifact
A:AB$ Draw | Cost$ 1 T PayLife<1> Discard<1/Card/card> | NumCards$ 1 | SubAbility$ DBMill | SorcerySpeed$ True | StackDescription$ SpellDescription | SpellDescription$ Draw a card, then mill a card.
SVar:DBMill:DB$ Mill | NumCards$ 1 | Defined$ You | SubAbility$ DBPutCounter1 | StackDescription$ None
SVar:DBPutCounter1:DB$ PutCounter | CounterType$ RITUAL | CounterNum$ 1 | SubAbility$ DBTransform | StackDescription$ SpellDescription | SpellDescription$ Put a ritual counter on CARDNAME.
SVar:DBTransform:DB$ SetState | Defined$ Self | Mode$ Transform | ConditionDefined$ Self | ConditionPresent$ Card.counters_GE3_RITUAL | StackDescription$ SpellDescription | SpellDescription$ Then if it has 3 or more ritual counters on it, transform it. Activate only as a sorcery.
AlternateMode:DoubleFaced
DeckHas:Ability$Discard & Ability$Mill & Ability$Counters
Oracle:{1}, {T}, Pay 1 life, Discard a card: Draw a card, then mill a card. Put a ritual counter on Heirloom Mirror. Then if it has 3 or more ritual counters on it, transform it. Activate only as a sorcery.
ALTERNATE
Name:Inherited Fiend
ManaCost:no cost
Colors:black
Types:Creature Demon
PT:4/4
K:Flying
A:AB$ ChangeZone | Cost$ 2 B | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Creature | TgtPrompt$ Select target creature card from a graveyard | SubAbility$ DBPutCounter | StackDescription$ Exile {c:Targeted} from the graveyard. | SpellDescription$ Exile target creature card from a graveyard.
SVar:DBPutCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 1 | StackDescription$ SpellDescription | SpellDescription$ Put a +1/+1 counter on CARDNAME.
DeckHas:Ability$Graveyard & Ability$Counters
Oracle:Flying\n{2}{B}: Exile target creature card from a graveyard. Put a +1/+1 counter on Inherited Fiend.