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

Merge pull request #1040 from Northmoc/carnelian

Browse Source 
CLB: Carnelian Orb of Dragonkind and support
This commit is contained in:
Anthony Calosa
2022-07-06 18:06:09 +08:00
committed by GitHub
parent 51dd0ef84a 508b6b4e90
commit 42c59b773b
6 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java
View File

@@ -93,7 +93,7 @@ public class AbilityManaPart implements java.io.Serializable {
this.manaRestrictions = params.getOrDefault("RestrictValid", "");
this.cannotCounterSpell = params.get("AddsNoCounter");
this.addsKeywords = params.get("AddsKeywords");
this.addsKeywordsType = params.get("AddsKeywordsType");
this.addsKeywordsType = params.get("AddsKeywordsValid");
this.addsKeywordsUntil = params.get("AddsKeywordsUntil");
this.addsCounters = params.get("AddsCounters");
this.triggersWhenSpent = params.get("TriggersWhenSpent");

3
forge-game/src/main/java/forge/game/spellability/SpellAbility.java
View File

@@ -638,7 +638,8 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
if (isSpell() && host != null) {
if (mana.addsKeywords(this) && mana.addsKeywordsType()
&& host.getType().hasStringType(mana.getManaAbility().getAddsKeywordsType())) {
&& this.isValid(mana.getManaAbility().getAddsKeywordsType(),
mana.getSourceCard().getController(), mana.getSourceCard(), null)) {
final long timestamp = host.getGame().getNextTimestamp();
final List<String> kws = Arrays.asList(mana.getAddedKeywords().split(" & "));
host.addChangedCardKeywords(kws, null, false, timestamp, 0);

2
forge-gui/res/cardsfolder/d/domri_chaos_bringer.txt
View File

@@ -2,7 +2,7 @@ Name:Domri, Chaos Bringer
ManaCost:2 R G
Types:Legendary Planeswalker Domri
Loyalty:5
A:AB$ Mana | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Produced$ Combo R G | Amount$ 1 | AddsKeywords$ Riot | AddsKeywordsType$ Creature | SpellDescription$ Add {R} or {G}. If that mana is spent on a creature spell, it gains riot. (It enters the battlefield with your choice of a +1/+1 counter or haste.)
A:AB$ Mana | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Produced$ Combo R G | Amount$ 1 | AddsKeywords$ Riot | AddsKeywordsValid$ Spell.Creature | SpellDescription$ Add {R} or {G}. If that mana is spent on a creature spell, it gains riot. (It enters the battlefield with your choice of a +1/+1 counter or haste.)
A:AB$ Dig | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | ForceRevealToController$ True | DigNum$ 4 | ChangeNum$ 2 | Optional$ True | ChangeValid$ Creature | RestRandomOrder$ True | SpellDescription$ Look at the top four cards of your library. You may reveal up to two creature cards from among them and put them into your hand. Put the rest on the bottom of your library in a random order.
A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem - Domri, Chaos Bringer | Image$ emblem_domri_chaos_bringer | Triggers$ EffPhase | Duration$ Permanent | SpellDescription$ You get an emblem with "At the beginning of each end step, create a 4/4 red and green Beast creature token with trample."
SVar:EffPhase:Mode$ Phase | Phase$ End of Turn | Execute$ EmblemTrigToken | TriggerDescription$ At the beginning of each end step, create a 4/4 red and green Beast creature token with trample.

2
forge-gui/res/cardsfolder/g/generator_servant.txt
View File

@@ -2,6 +2,6 @@ Name:Generator Servant
ManaCost:1 R
Types:Creature Elemental
PT:2/1
A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ C | Amount$ 2 | AddsKeywords$ Haste | AddsKeywordsType$ Creature | AddsKeywordsUntil$ UntilEOT | SpellDescription$ Add {C}{C}. If that mana is spent on a creature spell, it gains haste until end of turn.
A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ C | Amount$ 2 | AddsKeywords$ Haste | AddsKeywordsValid$ Spell.Creature | AddsKeywordsUntil$ UntilEOT | SpellDescription$ Add {C}{C}. If that mana is spent on a creature spell, it gains haste until end of turn.
AI:RemoveDeck:All
Oracle:{T}, Sacrifice Generator Servant: Add {C}{C}. If that mana is spent on a creature spell, it gains haste until end of turn. (That creature can attack and {T} as soon as it comes under your control.)

2
forge-gui/res/cardsfolder/h/hall_of_the_bandit_lord.txt
View File

@@ -2,5 +2,5 @@ Name:Hall of the Bandit Lord
ManaCost:no cost
Types:Legendary Land
K:CARDNAME enters the battlefield tapped.
A:AB$ Mana | Cost$ T PayLife<3> | Produced$ C | AddsKeywords$ Haste | AddsKeywordsType$ Creature | SpellDescription$ Add {C}. If that mana is spent on a creature spell, it gains haste.
A:AB$ Mana | Cost$ T PayLife<3> | Produced$ C | AddsKeywords$ Haste | AddsKeywordsValid$ Spell.Creature | SpellDescription$ Add {C}. If that mana is spent on a creature spell, it gains haste.
Oracle:Hall of the Bandit Lord enters the battlefield tapped.\n{T}, Pay 3 life: Add {C}. If that mana is spent on a creature spell, it gains haste.

6
forge-gui/res/cardsfolder/upcoming/carnelian_orb_of_dragonkind.txt Normal file
View File

@@ -0,0 +1,6 @@
Name:Carnelian Orb of Dragonkind
ManaCost:2 R
Types:Artifact
A:AB$ Mana | Cost$ T | Produced$ R | AddsKeywords$ Haste | AddsKeywordsValid$ Spell.Dragon+Creature | AddsKeywordsUntil$ UntilEOT | SpellDescription$ Add {R}. If that mana is spent on a Dragon creature spell, it gains haste until end of turn.
DeckHints:Type$Dragon
Oracle:{T}: Add {R}. If that mana is spent on a Dragon creature spell, it gains haste until end of turn.