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

- Fixed UntapUpto

Browse Source
This commit is contained in:
swordshine
2014-05-20 06:07:07 +00:00
parent 5a0031e4cc
commit 66ee308ef9
6 changed files with 4 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@@ -14899,8 +14899,6 @@ forge-gui/res/cardsfolder/w/wurmskin_forger.txt svneol=native#text/plain
forge-gui/res/cardsfolder/w/wurmweaver_coil.txt svneol=native#text/plain
forge-gui/res/cardsfolder/w/wydwen_the_biting_gale.txt svneol=native#text/plain
forge-gui/res/cardsfolder/w/wyluli_wolf.txt svneol=native#text/plain
forge-gui/res/cardsfolder/x/drakestown_forgotten.txt -text
forge-gui/res/cardsfolder/x/scourge_of_the_throne.txt -text
forge-gui/res/cardsfolder/x/xantcha.txt -text
forge-gui/res/cardsfolder/x/xanthic_statue.txt svneol=native#text/plain
forge-gui/res/cardsfolder/x/xantid_swarm.txt -text

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

@@ -74,7 +74,8 @@ public class UntapEffect extends SpellAbilityEffect {
final List<Player> definedPlayers = AbilityUtils.getDefinedPlayers(sa.getHostCard(), sa.getParam("Defined"), sa);
for (final Player p : definedPlayers) {
List<Card> list = CardLists.getType(p.getCardsIn(ZoneType.Battlefield), valid);
List<Card> list = CardLists.getValidCards(p.getGame().getCardsIn(ZoneType.Battlefield),
valid, sa.getActivatingPlayer(), sa.getHostCard());
list = CardLists.filter(list, Presets.TAPPED);
List<Card> selected = p.getController().chooseCardsForEffect(list, sa, "Select cards to untap", 0, num, true);

2
forge-gui/res/cardsfolder/h/hokori_dust_drinker.txt
View File

@@ -4,7 +4,7 @@ Types:Legendary Creature Spirit
PT:2/2
S:Mode$ Continuous | Affected$ Land | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Lands don't untap during their controller's untap steps.
T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | TriggerZones$ Battlefield | IsPresent$ Card.Self | Execute$ TrigUntap | TriggerDescription$ At the beginning of each player's upkeep, that player untaps a land he or she controls.
SVar:TrigUntap:AB$ Untap | Cost$ 0 | UntapUpTo$ True | UntapType$ Land | Amount$ 1 | Defined$ TriggeredPlayer
SVar:TrigUntap:AB$ Untap | Cost$ 0 | UntapUpTo$ True | UntapType$ Land.ActivePlayerCtrl | Amount$ 1 | Defined$ TriggeredPlayer
SVar:RemRandomDeck:True
SVar:Picture:http://www.wizards.com/global/images/magic/general/hokori_dust_drinker.jpg
Oracle:Lands don't untap during their controllers' untap steps.\nAt the beginning of each player's upkeep, that player untaps a land he or she controls.

2
forge-gui/res/cardsfolder/r/rising_waters.txt
View File

@@ -3,7 +3,7 @@ ManaCost:3 U
Types:Enchantment
S:Mode$ Continuous | Affected$ Land | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Lands don't untap during their controller's untap steps.
T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | TriggerZones$ Battlefield | IsPresent$ Card.Self | Execute$ TrigUntap | TriggerDescription$ At the beginning of each player's upkeep, that player untaps a land he or she controls.
SVar:TrigUntap:AB$ Untap | Cost$ 0 | UntapUpTo$ True | UntapType$ Land | Amount$ 1 | Defined$ TriggeredPlayer
SVar:TrigUntap:AB$ Untap | Cost$ 0 | UntapUpTo$ True | UntapType$ Land.ActivePlayerCtrl | Amount$ 1 | Defined$ TriggeredPlayer
SVar:RemRandomDeck:True
SVar:Picture:http://www.wizards.com/global/images/magic/general/rising_waters.jpg
Oracle:Lands don't untap during their controllers' untap steps.\nAt the beginning of each player's upkeep, that player untaps a land he or she controls.

12
forge-gui/res/cardsfolder/x/drakestown_forgotten.txt
View File

@@ -1,12 +0,0 @@
Name:Drakestown Forgotten
ManaCost:4 B
Types:Creature Zombie
PT:0/0
K:etbCounter:P1P1:X:no Condition:CARDNAME enters the battlefield with X +1/+1 counters on it, where X is the number of creature cards in all graveyards.
SVar:X:Count$TypeInAllYards.Creature
SVar:NeedsToPlayVar:X GE4
A:AB$ Pump | Cost$ 2 B SubCounter<1/P1P1> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | SpellDescription$ Target creature gets -1/-1 until end of turn.
SVar:Picture:http://www.wizards.com/global/images/magic/general/drakestown_forgotten.jpg

10
forge-gui/res/cardsfolder/x/scourge_of_the_throne.txt
View File

@@ -1,10 +0,0 @@
Name:Scourge of the Throne
ManaCost:4 R R
Types:Creature Dragon
PT:5/5
K:Flying
K:Dethrone
T:Mode$ Attacks | ValidCard$ Creature.Self | TriggerZones$ Battlefield | Execute$ TrigUntap | FirstAttack$ True | Condition$ AttackedPlayerWithMostLife | TriggerDescription$ Whenever CARDNAME attacks for the first time each turn, if it's attacking the player with the most life or tied for most life, untap all attacking creatures. After this phase, there is an additional combat phase.
SVar:TrigUntap:AB$ UntapAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | SubAbility$ DBAddCombat
SVar:DBAddCombat:DB$ AddPhase | ExtraPhase$ BeginCombat | AfterPhase$ EndCombat
SVar:Picture:http://www.wizards.com/global/images/magic/general/scourge_of_the_throne.jpg