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

AbilityUtils: make calculateAmount with Triggered use getDefinedCards which does handle Trigger before

Browse Source 
CardUtil: need to set CopiedPermanent for LKICopy
Scrap Trawler: use TriggeredCardLKICopy which might be more correct
This commit is contained in:
Hanmac
2017-01-21 14:52:05 +00:00
parent 7beb11ad09
commit ca45bf3da5
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-game/src/main/java/forge/game/ability/AbilityUtils.java
View File

@@ -663,8 +663,7 @@ public class AbilityUtils {
} }
} }
else if (calcX[0].startsWith("Triggered")) { else if (calcX[0].startsWith("Triggered")) {
final SpellAbility root = sa.getRootAbility(); list = getDefinedCards(card, calcX[0], sa);
list = new CardCollection((Card) root.getTriggeringObject(calcX[0].substring(9)));
} }
else if (calcX[0].startsWith("TriggerCount")) { else if (calcX[0].startsWith("TriggerCount")) {
// TriggerCount is similar to a regular Count, but just // TriggerCount is similar to a regular Count, but just

1
forge-game/src/main/java/forge/game/card/CardUtil.java
View File

@@ -303,6 +303,7 @@ public final class CardUtil {
newCopy.setFortifiedBy(in.getFortifiedBy(false)); newCopy.setFortifiedBy(in.getFortifiedBy(false));
newCopy.setClones(in.getClones()); newCopy.setClones(in.getClones());
newCopy.setHaunting(in.getHaunting()); newCopy.setHaunting(in.getHaunting());
newCopy.setCopiedPermanent(in.getCopiedPermanent());
for (final Card haunter : in.getHauntedBy()) { for (final Card haunter : in.getHauntedBy()) {
newCopy.addHauntedBy(haunter, false); newCopy.addHauntedBy(haunter, false);
} }

4
forge-gui/res/cardsfolder/s/scrap_trawler.txt
View File

@@ -4,7 +4,7 @@ Types:Artifact Creature Construct
PT:3/2 PT:3/2
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigReturnArti | TriggerDescription$ Whenever CARDNAME or another artifact you control is put into a graveyard from the battlefield, return to your hand target artifact card in your graveyard with lesser converted mana cost. T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigReturnArti | TriggerDescription$ Whenever CARDNAME or another artifact you control is put into a graveyard from the battlefield, return to your hand target artifact card in your graveyard with lesser converted mana cost.
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Artifact.Other+YouCtrl | TriggerZones$ Battlefield | Secondary$ True | Execute$ TrigReturnArti | TriggerDescription$ Whenever CARDNAME or another artifact you control is put into a graveyard from the battlefield, return to your hand target artifact card in your graveyard with lesser converted mana cost. T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Artifact.Other+YouCtrl | TriggerZones$ Battlefield | Secondary$ True | Execute$ TrigReturnArti | TriggerDescription$ Whenever CARDNAME or another artifact you control is put into a graveyard from the battlefield, return to your hand target artifact card in your graveyard with lesser converted mana cost.
SVar:TrigReturnArti:DB$ ChangeZone | ValidTgts$ Artifact.cmcLTX+YouCtrl | Origin$ Graveyard | Destination$ Hand | References$ X SVar:TrigReturnArti:DB$ ChangeZone | ValidTgts$ Artifact.cmcLTX+YouCtrl | TgtPrompt$ Select target artifact with less converted mana cost | Origin$ Graveyard | Destination$ Hand | References$ X
SVar:X:TriggeredCard$CardManaCost SVar:X:TriggeredCardLKICopy$CardManaCost
SVar:Picture:http://www.wizards.com/global/images/magic/general/scrap_trawler.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/scrap_trawler.jpg
Oracle:Whenever Scrap Trawler or another artifact you control is put into a graveyard from the battlefield, return to your hand target artifact card in your graveyard with lesser converted mana cost. Oracle:Whenever Scrap Trawler or another artifact you control is put into a graveyard from the battlefield, return to your hand target artifact card in your graveyard with lesser converted mana cost.