diff --git a/.gitattributes b/.gitattributes index 5270c54573b..9be2c418159 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2725,6 +2725,7 @@ res/cardsfolder/e/emissary_of_hope.txt svneol=native#text/plain res/cardsfolder/e/emmessi_tome.txt svneol=native#text/plain res/cardsfolder/e/emperor_crocodile.txt svneol=native#text/plain res/cardsfolder/e/empress_galina.txt svneol=native#text/plain +res/cardsfolder/e/empty_city_ruse.txt -text res/cardsfolder/e/empty_shrine_kannushi.txt svneol=native#text/plain res/cardsfolder/e/empty_the_catacombs.txt svneol=native#text/plain res/cardsfolder/e/empty_the_warrens.txt svneol=native#text/plain @@ -2969,6 +2970,7 @@ res/cardsfolder/f/false_defeat.txt svneol=native#text/plain res/cardsfolder/f/false_demise.txt svneol=native#text/plain res/cardsfolder/f/false_memories.txt -text res/cardsfolder/f/false_mourning.txt svneol=native#text/plain +res/cardsfolder/f/false_peace.txt -text res/cardsfolder/f/false_prophet.txt svneol=native#text/plain res/cardsfolder/f/false_summoning.txt svneol=native#text/plain res/cardsfolder/f/falter.txt svneol=native#text/plain diff --git a/res/cardsfolder/e/empty_city_ruse.txt b/res/cardsfolder/e/empty_city_ruse.txt new file mode 100644 index 00000000000..733f8e498c1 --- /dev/null +++ b/res/cardsfolder/e/empty_city_ruse.txt @@ -0,0 +1,10 @@ +Name:Empty City Ruse +ManaCost:W +Types:Sorcery +Text:no text +A:SP$ Pump | Cost$ W | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | KW$ Skip all combat phases of your next turn. | Permanent$ True | SpellDescription$ Target opponent skips all combat phases of his or her next turn. +SVar:RemAIDeck:True +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/empty_city_ruse.jpg +SetInfo:PTK|Uncommon|http://magiccards.info/scans/en/p3k/3.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/f/false_peace.txt b/res/cardsfolder/f/false_peace.txt new file mode 100644 index 00000000000..3766aef26f5 --- /dev/null +++ b/res/cardsfolder/f/false_peace.txt @@ -0,0 +1,12 @@ +Name:False Peace +ManaCost:W +Types:Sorcery +Text:no text +A:SP$ Pump | Cost$ W | ValidTgts$ Player | TgtPrompt$ Select target player | KW$ Skip all combat phases of your next turn. | Permanent$ True | SpellDescription$ Target player skips all combat phases of his or her next turn. +SVar:RemAIDeck:True +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/false_peace.jpg +SetInfo:S99|Uncommon|http://magiccards.info/scans/en/st/16.jpg +SetInfo:POR|Common|http://magiccards.info/scans/en/po/176.jpg +Oracle:Target player skips all combat phases of his or her next turn. +End \ No newline at end of file diff --git a/src/main/java/forge/game/phase/PhaseHandler.java b/src/main/java/forge/game/phase/PhaseHandler.java index a7697993003..75917f6afb6 100644 --- a/src/main/java/forge/game/phase/PhaseHandler.java +++ b/src/main/java/forge/game/phase/PhaseHandler.java @@ -454,8 +454,6 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { c.clearBlockedByThisTurn(); c.clearBlockedThisTurn(); } - AllZone.getHumanPlayer().resetPreventNextDamage(); - AllZone.getComputerPlayer().resetPreventNextDamage(); AllZone.getEndOfTurn().executeUntil(); final CardList cHand = AllZone.getComputerPlayer().getCardsIn(ZoneType.Hand); @@ -466,10 +464,12 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { for (final Card c : hHand) { c.setDrawnThisTurn(false); } - AllZone.getHumanPlayer().resetNumDrawnThisTurn(); - AllZone.getComputerPlayer().resetNumDrawnThisTurn(); - AllZone.getHumanPlayer().setAttackedWithCreatureThisTurn(false); - AllZone.getComputerPlayer().setAttackedWithCreatureThisTurn(false); + for (Player player : AllZone.getPlayersInGame()) { + player.resetPreventNextDamage(); + player.resetNumDrawnThisTurn(); + player.setAttackedWithCreatureThisTurn(false); + } + this.getPlayerTurn().removeKeyword("Skip all combat phases of this turn."); break; default: diff --git a/src/main/java/forge/game/phase/PhaseUtil.java b/src/main/java/forge/game/phase/PhaseUtil.java index 405d49adb3b..c8a80ab5eef 100644 --- a/src/main/java/forge/game/phase/PhaseUtil.java +++ b/src/main/java/forge/game/phase/PhaseUtil.java @@ -260,10 +260,17 @@ public class PhaseUtil { if (player.hasKeyword("Skip your next combat phase.")) { return true; } - if (player.hasKeyword("Skip your combat phase.")) { return true; } + if (player.hasKeyword("Skip all combat phases of your next turn.")) { + player.removeKeyword("Skip all combat phases of your next turn."); + player.addKeyword("Skip all combat phases of this turn."); + return true; + } + if (player.hasKeyword("Skip all combat phases of this turn.")) { + return true; + } return false; }