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

- Cleanup in AF ChangeZone.

Browse Source
This commit is contained in:
Sloth
2012-10-12 13:51:58 +00:00
parent 5698f78848
commit c8919b316d
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/cardsfolder/o/oblivion_ring.txt
View File

@@ -4,8 +4,8 @@ Types:Enchantment
Text:no text
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile another target nonland permanent.
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME leaves the battlefield, return the exiled card to the battlefield under its owner's control.
SVar:TrigExile:DB$ChangeZone | Cost$ 0 | TargetMin$ 1 | IsCurse$ True | ValidTgts$ Permanent.nonLand+Other | TgtPrompt$ Choose target nonland permanent other than Oblivion Ring | RememberTargets$ True | ForgetOtherTargets$ True | Origin$ Battlefield | Destination$ Exile
SVar:TrigReturn:DB$ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield
SVar:TrigExile:DB$ ChangeZone | Cost$ 0 | TargetMin$ 1 | IsCurse$ True | ValidTgts$ Permanent.nonLand+Other | TgtPrompt$ Choose target nonland permanent other than Oblivion Ring | RememberTargets$ True | ForgetOtherTargets$ True | Origin$ Battlefield | Destination$ Exile
SVar:TrigReturn:DB$ ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield
SVar:PlayMain1:TRUE
SVar:Rarity:Common
SVar:Picture:http://resources.wizards.com/magic/cards/lrw/en/card139414.jpg

7
src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java
View File

@@ -248,7 +248,6 @@ public final class AbilityFactoryChangeZone {
return true;
}
for (ZoneType z : zone) {
if (z.isHidden()) {
return true;
@@ -2348,11 +2347,7 @@ public final class AbilityFactoryChangeZone {
for (final Card c : list) {
final Card actualCard = AllZoneUtil.getCardState(c);
if (actualCard != null) {
ret.add(actualCard);
} else {
ret.add(c);
}
ret.add(actualCard);
}
return ret;
}