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

Merge branch 'master' of https://git.cardforge.org/core-developers/forge into apiTypeCaseCrashFix

Browse Source
This commit is contained in:
elliot
2018-03-25 23:20:39 -04:00
parent b40f460c59 c980d1c9d4
commit 45cfc56e2d
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java
View File

@@ -685,7 +685,6 @@ public class DamageDealAi extends DamageAiBase {
final boolean noPrevention = sa.hasParam("NoPrevention"); final boolean noPrevention = sa.hasParam("NoPrevention");
final boolean divided = sa.hasParam("DividedAsYouChoose"); final boolean divided = sa.hasParam("DividedAsYouChoose");
final Player opp = ComputerUtil.getOpponentFor(ai); final Player opp = ComputerUtil.getOpponentFor(ai);
System.out.println("damageChooseRequiredTargets " + ai + " " + sa);
while (sa.getTargets().getNumTargeted() < tgt.getMinTargets(sa.getHostCard(), sa)) { while (sa.getTargets().getNumTargeted() < tgt.getMinTargets(sa.getHostCard(), sa)) {
// TODO: Consider targeting the planeswalker // TODO: Consider targeting the planeswalker

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

@@ -1,6 +1,7 @@
package forge.game.ability.effects; package forge.game.ability.effects;
import forge.game.Game; import forge.game.Game;
import forge.game.GameLogEntryType;
import forge.game.ability.SpellAbilityEffect; import forge.game.ability.SpellAbilityEffect;
import forge.game.card.Card; import forge.game.card.Card;
import forge.game.card.CardFactoryUtil; import forge.game.card.CardFactoryUtil;
@@ -216,7 +217,7 @@ public class CounterEffect extends SpellAbilityEffect {
if (!tgtSA.isAbility()) { if (!tgtSA.isAbility()) {
System.out.println("Send countered spell to " + destination); game.getGameLog().add(GameLogEntryType.ZONE_CHANGE, "Send countered spell to " + destination);
} }
} }

6
forge-gui/res/cardsfolder/s/swift_warden.txt
View File

@@ -3,8 +3,8 @@ ManaCost:1 G G
Types:Creature Merfolk Warrior Types:Creature Merfolk Warrior
PT:3/3 PT:3/3
K:Flash K:Flash
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target Merfolk gains hexproof until end of turn. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target Merfolk you control gains hexproof until end of turn.
SVar:TrigPump:DB$Pump | ValidTgts$ Merfolk | TgtPrompt$ Select target Merfolk | KW$ Hexproof SVar:TrigPump:DB$Pump | ValidTgts$ Merfolk.YouCtrl | TgtPrompt$ Select target Merfolk | KW$ Hexproof
DeckHints:Type$Merfolk DeckHints:Type$Merfolk
SVar:Picture:http://www.wizards.com/global/images/magic/general/swift warden.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/swift warden.jpg
Oracle:Flash\nWhen Swift Warden enters the battlefield, target Merfolk gains hexproof until end of turn. Oracle:Flash\nWhen Swift Warden enters the battlefield, target Merfolk you control gains hexproof until end of turn.