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

- Added Ashcloud Phoenix

Browse Source
This commit is contained in:
swordshine
2014-09-23 11:21:15 +00:00
parent 6e35fee7ba
commit edf8c58754
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@@ -1902,6 +1902,7 @@ forge-gui/res/cardsfolder/a/ascending_aven.txt svneol=native#text/plain
forge-gui/res/cardsfolder/a/asceticism.txt svneol=native#text/plain
forge-gui/res/cardsfolder/a/ash_zealot.txt -text
forge-gui/res/cardsfolder/a/ashas_favor.txt svneol=native#text/plain
forge-gui/res/cardsfolder/a/ashcloud_phoenix.txt -text
forge-gui/res/cardsfolder/a/ashcoat_bear.txt svneol=native#text/plain
forge-gui/res/cardsfolder/a/ashen_firebeast.txt svneol=native#text/plain
forge-gui/res/cardsfolder/a/ashen_ghoul.txt svneol=native#text/plain

5
forge-ai/src/main/java/forge/ai/ability/PumpAiBase.java
View File

@@ -3,17 +3,12 @@ package forge.ai.ability;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.collect.Iterables;
import forge.ai.AiCardMemory;
import forge.ai.AiController;
import forge.ai.ComputerUtil;
import forge.ai.ComputerUtilCard;
import forge.ai.ComputerUtilCombat;
import forge.ai.PlayerControllerAi;
import forge.ai.SpellAbilityAi;
import forge.card.MagicColor;
import forge.game.Game;
import forge.game.ability.ApiType;
import forge.game.card.Card;
import forge.game.card.CardFactory;
import forge.game.card.CardLists;

2
forge-game/src/main/java/forge/game/phase/EndOfTurn.java
View File

@@ -52,7 +52,7 @@ public class EndOfTurn extends Phase {
public final void executeAt() {
// reset mustAttackEntity for me
game.getPhaseHandler().getPlayerTurn().setMustAttackEntity(null);
// TODO: convert this to a delayed trigger
Player activePlayer = game.getPhaseHandler().getPlayerTurn();
if (activePlayer.hasKeyword("At the beginning of this turn's end step, you lose the game.")) {
final Card source = new Card(game.nextCardId());

12
forge-gui/res/cardsfolder/a/ashcloud_phoenix.txt Normal file
View File

@@ -0,0 +1,12 @@
Name:Ashcloud Phoenix
ManaCost:2 R R
Types:Creature Phoenix
PT:4/1
K:Flying
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | TriggerController$ TriggeredCardController | Execute$ TrigReturn | TriggerDescription$ When CARDNAME dies, return it to the battlefield face down.
SVar:TrigReturn:DB$ ChangeZone | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Battlefield | FaceDown$ True
K:Morph:4 R R
T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigDmg | TriggerZones$ Battlefield | TriggerDescription$ When CARDNAME is turned face up, it deals 2 damage to each player.
SVar:TrigDmg:DB$ DealDamage | Defined$ Player | NumDmg$ 2
SVar:Picture:http://www.wizards.com/global/images/magic/general/ashcloud_phoenix.jpg
Oracle:Flying\nWhen Ashcloud Phoenix dies, return it to the battlefield face down.\nMorph {4}{R}{R} (You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)\nWhen Ashcloud Phoenix is turned face up, it deals 2 damage to each player.