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

Merge branch 'assorted-fixes' into 'master'

Browse Source 
Fixed CardState#copyFrom copying non-intrinsic abilities, minor card fix (Nissa, Steward of Elements)

See merge request core-developers/forge!148
This commit is contained in:
Hans Mackowiak
2018-01-26 14:13:22 +00:00
parent d48c93938f 81366a1e14
commit a048ab3327
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/card/CardState.java
View File

@@ -384,17 +384,21 @@ public class CardState extends GameObject {
manaAbilities.clear(); manaAbilities.clear();
for (SpellAbility sa : source.manaAbilities) { for (SpellAbility sa : source.manaAbilities) {
if (sa.isIntrinsic()) {
SpellAbility saCopy = sa.copy(); SpellAbility saCopy = sa.copy();
saCopy.setHostCard(card); // update HostCard saCopy.setHostCard(card); // update HostCard
manaAbilities.add(saCopy); manaAbilities.add(saCopy);
} }
}
nonManaAbilities.clear(); nonManaAbilities.clear();
for (SpellAbility sa : source.nonManaAbilities) { for (SpellAbility sa : source.nonManaAbilities) {
if (sa.isIntrinsic()) {
SpellAbility saCopy = sa.copy(); SpellAbility saCopy = sa.copy();
saCopy.setHostCard(card); // update HostCard saCopy.setHostCard(card); // update HostCard
nonManaAbilities.add(saCopy); nonManaAbilities.add(saCopy);
} }
}
setIntrinsicKeywords(source.intrinsicKeywords.getValues()); setIntrinsicKeywords(source.intrinsicKeywords.getValues());
setImageKey(source.getImageKey()); setImageKey(source.getImageKey());

2
forge-gui/res/cardsfolder/n/nissa_steward_of_elements.txt
View File

@@ -5,7 +5,7 @@ Loyalty:0
K:etbCounter:LOYALTY:X K:etbCounter:LOYALTY:X
SVar:X:Count$xPaid SVar:X:Count$xPaid
A:AB$ Scry | Cost$ AddCounter<2/LOYALTY> | Planeswalker$ True | ScryNum$ 2 | SpellDescription$ Scry 2. A:AB$ Scry | Cost$ AddCounter<2/LOYALTY> | Planeswalker$ True | ScryNum$ 2 | SpellDescription$ Scry 2.
A:AB$ Dig | Cost$ AddCounter<0/LOYALTY> | Planeswalker$ True | DigNum$ 1 | ChangeNum$ 1 | Optional$ True | ChangeValid$ Land,Creature.cmcLEY | ForceRevealToController$ True | PromptToSkipOptionalAbility$ True | OptionalAbilityPrompt$ Would you like to put the permanent onto the battlefield? | DestinationZone$ Battlefield | LibraryPosition2$ 0 | SpellDescription$ Look at the top card of your library. If it's a land card or a creature card with converted mana cost less than or equal to the number of loyalty counters on Nissa, Steward of Elements, you may put that card onto the battlefield. A:AB$ Dig | Cost$ AddCounter<0/LOYALTY> | Planeswalker$ True | DigNum$ 1 | ChangeNum$ 1 | Optional$ True | ChangeValid$ Land,Creature.cmcLEY | ForceRevealToController$ True | PromptToSkipOptionalAbility$ True | References$ Y | AILogic$ AlwaysConfirm | OptionalAbilityPrompt$ Would you like to put the permanent onto the battlefield? | DestinationZone$ Battlefield | LibraryPosition2$ 0 | SpellDescription$ Look at the top card of your library. If it's a land card or a creature card with converted mana cost less than or equal to the number of loyalty counters on Nissa, Steward of Elements, you may put that card onto the battlefield.
A:AB$ Untap | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidTgts$ Land.YouCtrl | TargetMin$ 0 | TargetMax$ 2 | RememberTargets$ True | SubAbility$ Animate | SpellDescription$ Untap up to two target lands you control. They become 5/5 Elemental creatures with flying and haste until end of turn. They're still lands. A:AB$ Untap | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidTgts$ Land.YouCtrl | TargetMin$ 0 | TargetMax$ 2 | RememberTargets$ True | SubAbility$ Animate | SpellDescription$ Untap up to two target lands you control. They become 5/5 Elemental creatures with flying and haste until end of turn. They're still lands.
SVar:Animate:DB$ Animate | Defined$ Remembered | Power$ 5 | Toughness$ 5 | Types$ Creature,Elemental | Keywords$ Flying & Haste SVar:Animate:DB$ Animate | Defined$ Remembered | Power$ 5 | Toughness$ 5 | Types$ Creature,Elemental | Keywords$ Flying & Haste
SVar:Y:Count$CardCounters.LOYALTY SVar:Y:Count$CardCounters.LOYALTY