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

- Fixed Unleash not interacting correctly with Corpsejack Menace.

Browse Source
This commit is contained in:
Sloth
2012-10-27 10:57:43 +00:00
parent 27ec54a0a7
commit 0981a6f8c6
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/cardsfolder/r/remote_farm.txt
View File

@@ -2,9 +2,8 @@ Name:Remote Farm
ManaCost:no cost ManaCost:no cost
Types:Land Types:Land
Text:no text Text:no text
K:ETBReplacement:Other:ETBTap K:CARDNAME enters the battlefield tapped.
K:ETBReplacement:Other:ETBCounters K:ETBReplacement:Other:ETBCounters
SVar:ETBTap:DB$ Tap | Defined$ Self | ETB$ True | SpellDescription$ CARDNAME enters the battlefield tapped.
SVar:ETBCounters:DB$ PutCounter | Defined$ Self | CounterType$ DEPLETION | CounterNum$ 2 | SpellDescription$ CARDNAME enters the battlefield with 2 depletion counters on it. SVar:ETBCounters:DB$ PutCounter | Defined$ Self | CounterType$ DEPLETION | CounterNum$ 2 | SpellDescription$ CARDNAME enters the battlefield with 2 depletion counters on it.
A:AB$ Mana | Cost$ T SubCounter<1/DEPLETION> | Produced$ W | Deplete$ DEPLETION | Amount$ 2 | SpellDescription$ Add W W to your mana pool. If there are no depletion counters on CARDNAME, sacrifice it. A:AB$ Mana | Cost$ T SubCounter<1/DEPLETION> | Produced$ W | Deplete$ DEPLETION | Amount$ 2 | SpellDescription$ Add W W to your mana pool. If there are no depletion counters on CARDNAME, sacrifice it.
SVar:RemAIDeck:True SVar:RemAIDeck:True

2
src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java
View File

@@ -757,7 +757,7 @@ public class AbilityFactoryCounters {
final Zone zone = Singletons.getModel().getGame().getZoneOf(tgtCard); final Zone zone = Singletons.getModel().getGame().getZoneOf(tgtCard);
if (zone == null) { if (zone == null) {
// Do nothing, token disappeared // Do nothing, token disappeared
} else if (zone.is(ZoneType.Battlefield)) { } else if (zone.is(ZoneType.Battlefield) || zone.is(ZoneType.Stack)) {
tgtCard.addCounter(Counters.valueOf(type), counterAmount); tgtCard.addCounter(Counters.valueOf(type), counterAmount);
} else { } else {
// adding counters to something like re-suspend cards // adding counters to something like re-suspend cards

6
src/main/java/forge/card/abilityfactory/AbilityFactoryPermanentState.java
View File

@@ -1241,7 +1241,11 @@ public class AbilityFactoryPermanentState {
} }
for (final Card tgtC : tgtCards) { for (final Card tgtC : tgtCards) {
if ((tgtC.isInPlay() || params.containsKey("ETB")) && ((tgt == null) || tgtC.canBeTargetedBy(sa))) { if (tgt != null && !tgtC.canBeTargetedBy(sa)) {
continue;
}
if (params.containsKey("ETB") || tgtC.isInPlay()) {
if (tgtC.isUntapped() && (remTapped)) { if (tgtC.isUntapped() && (remTapped)) {
card.addRemembered(tgtC); card.addRemembered(tgtC);
} }