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

Merge branch 'master' into 'master'

Browse Source 
- Minor cleanup.

See merge request core-developers/forge!230
This commit is contained in:
Michael Kamensky
2018-02-18 08:59:38 +00:00
parent 13ace49230 b7601fded3
commit 2e70eb6718
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-ai/src/main/java/forge/ai/ability/DestroyAi.java
View File

@@ -81,13 +81,9 @@ public class DestroyAi extends SpellAbilityAi {
} }
} }
if (("Pactivator".equals(logic)) && (havepact)) { if (("Pactivator".equals(logic)) && (havepact)) {
if ( if ((!ai.getGame().getPhaseHandler().isPlayerTurn(ai))
(!ai.getGame().getPhaseHandler().isPlayerTurn(ai)) && && ((ai.getGame().getPhaseHandler().is(PhaseType.END_OF_TURN)) || (ai.getGame().getPhaseHandler().is(PhaseType.COMBAT_DECLARE_BLOCKERS)))
((ai.getGame().getPhaseHandler().is(PhaseType.END_OF_TURN)) && (ai.getOpponents().get(0).getCreaturesInPlay().size() > 0)) {
|| (ai.getGame().getPhaseHandler().is(PhaseType.COMBAT_DECLARE_BLOCKERS)))
&&
(ai.getOpponents().get(0).getCreaturesInPlay().size() > 0)
) {
ai.getController().chooseTargetsFor(sa); ai.getController().chooseTargetsFor(sa);
return true; return true;
} }

2
forge-gui/res/cardsfolder/s/spirit_mirror.txt
View File

@@ -3,7 +3,7 @@ ManaCost:2 W W
Types:Enchantment Types:Enchantment
T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | IsPresent$ Reflection.token | PresentCompare$ EQ0 | Execute$ TrigToken | TriggerDescription$ At the beginning of your upkeep, if there are no Reflection tokens on the battlefield, create a 2/2 white Reflection creature token. T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | IsPresent$ Reflection.token | PresentCompare$ EQ0 | Execute$ TrigToken | TriggerDescription$ At the beginning of your upkeep, if there are no Reflection tokens on the battlefield, create a 2/2 white Reflection creature token.
SVar:TrigToken:DB$Token | TokenAmount$ 1 | TokenName$ Reflection | TokenTypes$ Creature,Reflection | TokenOwner$ You | TokenColors$ White | TokenPower$ 2 | TokenToughness$ 2 | TokenSVars$ ReflectionSac SVar:TrigToken:DB$Token | TokenAmount$ 1 | TokenName$ Reflection | TokenTypes$ Creature,Reflection | TokenOwner$ You | TokenColors$ White | TokenPower$ 2 | TokenToughness$ 2 | TokenSVars$ ReflectionSac
A:AB$ Destroy | Cost$ 0 | ValidTgts$ Reflection | TgtPrompt$ Select target Reflection | AILogic$ Pactivator| SpellDescription$ Destroy target Reflection. A:AB$ Destroy | Cost$ 0 | ValidTgts$ Reflection | TgtPrompt$ Select target Reflection | AILogic$ Pactivator | SpellDescription$ Destroy target Reflection.
SVar:ReflectionSac:SVar:SacMe:2 SVar:ReflectionSac:SVar:SacMe:2
SVar:Picture:http://www.wizards.com/global/images/magic/general/spirit_mirror.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/spirit_mirror.jpg
Oracle:At the beginning of your upkeep, if there are no Reflection tokens on the battlefield, create a 2/2 white Reflection creature token.\n{0}: Destroy target Reflection. Oracle:At the beginning of your upkeep, if there are no Reflection tokens on the battlefield, create a 2/2 white Reflection creature token.\n{0}: Destroy target Reflection.