From 7be473f99df4929aea71e574280e3657b20835f2 Mon Sep 17 00:00:00 2001 From: Luke Way Date: Thu, 8 Mar 2018 11:01:13 -0500 Subject: [PATCH 1/6] Convert sysout to game log --- .../main/java/forge/game/ability/effects/CounterEffect.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/CounterEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CounterEffect.java index 89769e39a0e..098468c97b2 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/CounterEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/CounterEffect.java @@ -1,6 +1,7 @@ package forge.game.ability.effects; import forge.game.Game; +import forge.game.GameLogEntryType; import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardFactoryUtil; @@ -216,7 +217,7 @@ public class CounterEffect extends SpellAbilityEffect { if (!tgtSA.isAbility()) { - System.out.println("Send countered spell to " + destination); + game.getGameLog().add(GameLogEntryType.ZONE_CHANGE, "Send countered spell to " + destination); } } From ab39d632fd1199cb0a0ca7353fee909fdc046c41 Mon Sep 17 00:00:00 2001 From: Luke Way Date: Mon, 12 Mar 2018 13:10:03 -0400 Subject: [PATCH 2/6] Convert sysout to game log --- forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java b/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java index ceb75951703..93fe07916fd 100644 --- a/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java @@ -5,6 +5,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import forge.ai.*; import forge.game.Game; +import forge.game.GameLogEntryType; import forge.game.GameObject; import forge.game.ability.AbilityUtils; import forge.game.card.*; @@ -685,7 +686,7 @@ public class DamageDealAi extends DamageAiBase { final boolean noPrevention = sa.hasParam("NoPrevention"); final boolean divided = sa.hasParam("DividedAsYouChoose"); final Player opp = ComputerUtil.getOpponentFor(ai); - System.out.println("damageChooseRequiredTargets " + ai + " " + sa); + ai.getGame().getGameLog().add(GameLogEntryType.DAMAGE, "Choosing required targets: " + ai + " " + sa); while (sa.getTargets().getNumTargeted() < tgt.getMinTargets(sa.getHostCard(), sa)) { // TODO: Consider targeting the planeswalker From 572ecef291d435429dcf8b819d93ed7e2fe403af Mon Sep 17 00:00:00 2001 From: Luke Way Date: Mon, 12 Mar 2018 21:06:05 -0400 Subject: [PATCH 3/6] Tabs to spaces --- .../src/main/java/forge/game/ability/effects/CounterEffect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/CounterEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CounterEffect.java index 098468c97b2..9970a9001e7 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/CounterEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/CounterEffect.java @@ -217,7 +217,7 @@ public class CounterEffect extends SpellAbilityEffect { if (!tgtSA.isAbility()) { - game.getGameLog().add(GameLogEntryType.ZONE_CHANGE, "Send countered spell to " + destination); + game.getGameLog().add(GameLogEntryType.ZONE_CHANGE, "Send countered spell to " + destination); } } From 393eb5479491bb1c83ce849c8c1eec8b03f82393 Mon Sep 17 00:00:00 2001 From: Luke Way Date: Sun, 25 Mar 2018 09:03:38 -0400 Subject: [PATCH 4/6] Removed debug statement entirely --- forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java | 1 - 1 file changed, 1 deletion(-) diff --git a/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java b/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java index 93fe07916fd..4c8c1635843 100644 --- a/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java @@ -686,7 +686,6 @@ public class DamageDealAi extends DamageAiBase { final boolean noPrevention = sa.hasParam("NoPrevention"); final boolean divided = sa.hasParam("DividedAsYouChoose"); final Player opp = ComputerUtil.getOpponentFor(ai); - ai.getGame().getGameLog().add(GameLogEntryType.DAMAGE, "Choosing required targets: " + ai + " " + sa); while (sa.getTargets().getNumTargeted() < tgt.getMinTargets(sa.getHostCard(), sa)) { // TODO: Consider targeting the planeswalker From b917d242ea59fcd8c5bc15f40cf4259fd5f353cd Mon Sep 17 00:00:00 2001 From: Luke Way Date: Sun, 25 Mar 2018 09:04:39 -0400 Subject: [PATCH 5/6] Removed import --- forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java | 1 - 1 file changed, 1 deletion(-) diff --git a/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java b/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java index 4c8c1635843..9aaf676ebb6 100644 --- a/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java @@ -5,7 +5,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import forge.ai.*; import forge.game.Game; -import forge.game.GameLogEntryType; import forge.game.GameObject; import forge.game.ability.AbilityUtils; import forge.game.card.*; From a0626b7166bcbe08bd6d91f79545438a05af6f93 Mon Sep 17 00:00:00 2001 From: Misha Colbourne Date: Sun, 25 Mar 2018 22:12:46 +0000 Subject: [PATCH 6/6] Update swift_warden.txt --- forge-gui/res/cardsfolder/s/swift_warden.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/forge-gui/res/cardsfolder/s/swift_warden.txt b/forge-gui/res/cardsfolder/s/swift_warden.txt index 132f1ee25e1..f9610493e07 100644 --- a/forge-gui/res/cardsfolder/s/swift_warden.txt +++ b/forge-gui/res/cardsfolder/s/swift_warden.txt @@ -3,8 +3,8 @@ ManaCost:1 G G Types:Creature Merfolk Warrior PT:3/3 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. -SVar:TrigPump:DB$Pump | ValidTgts$ Merfolk | TgtPrompt$ Select target Merfolk | KW$ Hexproof +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.YouCtrl | TgtPrompt$ Select target Merfolk | KW$ Hexproof DeckHints:Type$Merfolk 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.