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

Revert order of Eaten by Spiders and Murderous Spoils.

Browse Source
This commit is contained in:
elcnesh
2014-07-06 14:01:32 +00:00
parent fdcb39245a
commit 7dc244fb46
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-game/src/main/java/forge/game/ability/effects/DestroyEffect.java
View File

@@ -72,7 +72,8 @@ public class DestroyEffect extends SpellAbilityEffect {
final Game game = card.getGame();
final boolean remDestroyed = sa.hasParam("RememberDestroyed");
if (remDestroyed) {
final boolean remAttached = sa.hasParam("RememberAttached");
if (remDestroyed || remAttached) {
card.clearRemembered();
}
@@ -95,6 +96,11 @@ public class DestroyEffect extends SpellAbilityEffect {
if (tgtC.isInPlay() && ((tgt == null) || tgtC.canBeTargetedBy(sa))) {
boolean destroyed = false;
final Card lki = CardUtil.getLKICopy(tgtC);
if (remAttached) {
card.getRemembered().addAll(tgtC.getEnchantedBy());
card.getRemembered().addAll(tgtC.getEquippedBy());
card.getRemembered().addAll(tgtC.getFortifiedBy());
}
if (sac) {
destroyed = game.getAction().sacrifice(tgtC, sa) != null;
} else if (noRegen) {

5
forge-gui/res/cardsfolder/e/eaten_by_spiders.txt
View File

@@ -1,7 +1,8 @@
Name:Eaten by Spiders
ManaCost:2 G
Types:Instant
A:SP$ DestroyAll | Cost$ 2 G | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target creature with flying | ValidCards$ Targeted.Equipment+Attached | SubAbility$ Destroy | SpellDescription$ Destroy target creature with flying and all Equipment attached to that creature.
SVar:Destroy:DB$ Destroy | Defined$ Targeted
A:SP$ Destroy | Cost$ 2 G | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target creature with flying | RememberAttached$ True | SubAbility$ ChompEquip | SpellDescription$ Destroy target creature with flying and all Equipment attached to that creature.
SVar:ChompEquip:DB$ DestroyAll | ValidCards$ Remembered.Equipment | SpellDescription$ Destroy all Equipment attached to that creature. | SubAbility$ Cleanup
SVar:Cleanup:DB$ Cleanup | ClearRemembered$ True
SVar:Picture:http://www.wizards.com/global/images/magic/general/eaten_by_spiders.jpg
Oracle:Destroy target creature with flying and all Equipment attached to that creature.

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

@@ -1,7 +1,8 @@
Name:Murderous Spoils
ManaCost:5 B
Types:Instant
A:SP$ GainControl | Cost$ 5 B | ValidTgts$ Creature.nonBlack | AllValid$ Targeted.Equipment+Attached | TgtPrompt$ Select target non-black creature | SubAbility$ Destroy | NoRegen$ True | SpellDescription$ Destroy target nonblack creature. It can't be regenerated. You gain control of all Equipment that was attached to it. (This effect lasts indefinitely.)
SVar:Destroy:DB$ Destroy | Defined$ Targeted | NoRegen$ True
A:SP$ Destroy | Cost$ 5 B | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target non-black creature | SubAbility$ StealEquip | NoRegen$ True | RememberAttached$ True | SpellDescription$ Destroy target nonblack creature. It can't be regenerated. You gain control of all Equipment that was attached to it. (This effect lasts indefinitely.)
SVar:StealEquip:DB$ GainControl | AllValid$ Remembered.Equipment | SubAbility$ Cleanup
SVar:Cleanup:DB$ Cleanup | ClearRemembered$ True
SVar:Picture:http://www.wizards.com/global/images/magic/general/murderous_spoils.jpg
Oracle:Destroy target nonblack creature. It can't be regenerated. You gain control of all Equipment that was attached to it. (This effect lasts indefinitely.)