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

- Added Empty City Ruse and False Peace.

Browse Source
This commit is contained in:
Sloth
2012-05-03 11:42:58 +00:00
parent 7b1a0aa5b4
commit 53e237283f
5 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@@ -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

10
res/cardsfolder/e/empty_city_ruse.txt Normal file
View File

@@ -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

12
res/cardsfolder/f/false_peace.txt Normal file
View File

@@ -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

12
src/main/java/forge/game/phase/PhaseHandler.java
View File

@@ -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:

9
src/main/java/forge/game/phase/PhaseUtil.java
View File

@@ -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;
}