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

- Moved the updating of attackedThisTurn from the EndOfTurn to the CleanUp phase.

Browse Source 
- Removed the keyword "At the beginning of your end step, sacrifice this creature unless it attacked this turn." and converted Instill Furor.
This commit is contained in:
Sloth
2011-11-17 13:08:59 +00:00
parent cda6c898db
commit e90b844f48
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/cardsfolder/i/instill_furor.txt
View File

@@ -4,7 +4,9 @@ Types:Enchantment Aura
Text:no text Text:no text
K:Enchant creature K:Enchant creature
A:SP$ Attach | Cost$ 1 R | ValidTgts$ Creature | AILogic$ Curse A:SP$ Attach | Cost$ 1 R | ValidTgts$ Creature | AILogic$ Curse
S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ At the beginning of your end step, sacrifice this creature unless it attacked this turn. | Description$ Enchanted creature has "At the beginning of your end step, sacrifice this creature unless it attacked this turn." S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddTrigger$ EOTTrigger | AddSVar$ TrigSac | Description$ Enchanted creature has "At the beginning of your end step, sacrifice this creature unless it attacked this turn."
SVar:EOTTrigger:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ At the beginning of your end step, sacrifice this creature unless it attacked this turn.
SVar:TrigSac:DB$Sacrifice | Defined$ Self | ConditionPresent$ Card.Self+notAttackedThisTurn | ConditionCompare$ GE1
SVar:Rarity:Uncommon SVar:Rarity:Uncommon
SVar:Picture:http://www.wizards.com/global/images/magic/general/instill_furor.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/instill_furor.jpg
SetInfo:RAV|Uncommon|http://magiccards.info/scans/en/rav/134.jpg SetInfo:RAV|Uncommon|http://magiccards.info/scans/en/rav/134.jpg

13
src/main/java/forge/EndOfTurn.java
View File

@@ -254,19 +254,6 @@ public class EndOfTurn implements java.io.Serializable {
execute(at); execute(at);
CardList all2 = AllZoneUtil.getCardsIn(Zone.Battlefield);
for (Card c : all2) {
c.clearMustBlockCards();
if(AllZone.getPhase().isPlayerTurn(AllZone.getComputerPlayer())) {
c.setCreatureAttackedLastComputerTurn(c.getCreatureAttackedThisTurn());
}
if(AllZone.getPhase().isPlayerTurn(AllZone.getHumanPlayer())) {
c.setCreatureAttackedLastHumanTurn(c.getCreatureAttackedThisTurn());
}
c.setCreatureAttackedThisTurn(false);
c.setCreatureBlockedThisTurn(false);
}
} // executeAt() } // executeAt()
/** /**

9
src/main/java/forge/Phase.java
View File

@@ -381,6 +381,15 @@ public class Phase extends MyObservable implements java.io.Serializable {
c.setDealtDmgToHumanThisTurn(false); c.setDealtDmgToHumanThisTurn(false);
c.setDealtDmgToComputerThisTurn(false); c.setDealtDmgToComputerThisTurn(false);
c.setRegeneratedThisTurn(0); c.setRegeneratedThisTurn(0);
c.clearMustBlockCards();
if(AllZone.getPhase().isPlayerTurn(AllZone.getComputerPlayer())) {
c.setCreatureAttackedLastComputerTurn(c.getCreatureAttackedThisTurn());
}
if(AllZone.getPhase().isPlayerTurn(AllZone.getHumanPlayer())) {
c.setCreatureAttackedLastHumanTurn(c.getCreatureAttackedThisTurn());
}
c.setCreatureAttackedThisTurn(false);
c.setCreatureBlockedThisTurn(false);
} }
AllZone.getHumanPlayer().resetPreventNextDamage(); AllZone.getHumanPlayer().resetPreventNextDamage();
AllZone.getComputerPlayer().resetPreventNextDamage(); AllZone.getComputerPlayer().resetPreventNextDamage();