- Added Giant Turtle.

.gitattributes

@@ -3237,6 +3237,7 @@ res/cardsfolder/g/giant_spider.txt svneol=native#text/plain
 res/cardsfolder/g/giant_strength.txt svneol=native#text/plain
 res/cardsfolder/g/giant_tortoise.txt svneol=native#text/plain
 res/cardsfolder/g/giant_trap_door_spider.txt svneol=native#text/plain
+res/cardsfolder/g/giant_turtle.txt -text
 res/cardsfolder/g/giant_warthog.txt svneol=native#text/plain
 res/cardsfolder/g/giants_ire.txt svneol=native#text/plain
 res/cardsfolder/g/gibbering_descent.txt svneol=native#text/plain

res/cardsfolder/g/giant_turtle.txt

@@ -0,0 +1,11 @@
+Name:Giant Turtle
+ManaCost:1 G G
+Types:Creature Turtle
+Text:no text
+PT:2/4
+S:Mode$ Continuous | Affected$ Card.Self+attackedLastTurn | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. | Description$ CARDNAME can't attack if it attacked during your last turn.
+SVar:Rarity:Common
+SVar:Picture:http://serv1.tcgimages.eu/img/cards/Portal_Second_Age/giant_turtle.jpg
+SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/102.jpg
+Oracle:Giant Turtle can't attack if it attacked during your last turn.
+End

src/main/java/forge/Card.java

@@ -320,7 +320,8 @@ public class Card extends GameEntity implements Comparable<Card> {
     private boolean spellWithChoices = false;
     private boolean spellCopyingCard = false;
     private boolean creatureAttackedThisTurn = false;
-    private boolean creatureAttackedLastTurn = false;
+    private boolean creatureAttackedLastHumanTurn = false;
+    private boolean creatureAttackedLastComputerTurn = false;
     private boolean creatureAttackedThisCombat = false;
     private boolean creatureBlockedThisCombat = false;
     private boolean creatureBlockedThisTurn = false;
@@ -877,8 +878,8 @@ public class Card extends GameEntity implements Comparable<Card> {
      * @param b
      *            a boolean.
      */
-    public final void setCreatureAttackedLastTurn(final boolean b) {
-        this.creatureAttackedLastTurn = b;
+    public final void setCreatureAttackedLastHumanTurn(final boolean b) {
+        this.creatureAttackedLastHumanTurn = b;
     }
 
     /**
@@ -888,8 +889,31 @@ public class Card extends GameEntity implements Comparable<Card> {
      * 
      * @return a boolean.
      */
-    public final boolean getCreatureAttackedLastTurn() {
-        return this.creatureAttackedLastTurn;
+    public final boolean getCreatureAttackedLastHumanTurn() {
+        return this.creatureAttackedLastHumanTurn;
+    }
+    
+    /**
+     * <p>
+     * Setter for the field <code>creatureAttackedLastTurn</code>.
+     * </p>
+     * 
+     * @param b
+     *            a boolean.
+     */
+    public final void setCreatureAttackedLastComputerTurn(final boolean b) {
+        this.creatureAttackedLastComputerTurn = b;
+    }
+
+    /**
+     * <p>
+     * Getter for the field <code>creatureAttackedLastTurn</code>.
+     * </p>
+     * 
+     * @return a boolean.
+     */
+    public final boolean getCreatureAttackedLastComputerTurn() {
+        return this.creatureAttackedLastComputerTurn;
     }
 
     /**
@@ -6690,7 +6714,10 @@ public class Card extends GameEntity implements Comparable<Card> {
                 return false;
             }
         } else if (property.startsWith("attackedLastTurn")) {
-            if (!getCreatureAttackedLastTurn()) {
+            if (getController().isComputer() && !getCreatureAttackedLastComputerTurn()) {
+                return false;
+            }
+            if (getController().isHuman() && !getCreatureAttackedLastHumanTurn()) {
                 return false;
             }
         } else if (property.startsWith("blockedThisTurn")) {
@@ -6702,7 +6729,10 @@ public class Card extends GameEntity implements Comparable<Card> {
                 return false;
             }
         } else if (property.startsWith("notAttackedLastTurn")) {
-            if (getCreatureAttackedLastTurn()) {
+            if (getController().isComputer() && getCreatureAttackedLastComputerTurn()) {
+                return false;
+            }
+            if (getController().isHuman() && getCreatureAttackedLastHumanTurn()) {
                 return false;
             }
         } else if (property.startsWith("notBlockedThisTurn")) {

src/main/java/forge/EndOfTurn.java

@@ -257,7 +257,12 @@ public class EndOfTurn implements java.io.Serializable {
         CardList all2 = AllZoneUtil.getCardsIn(Zone.Battlefield);
         for (Card c : all2) {
             c.clearMustBlockCards();
-            c.setCreatureAttackedLastTurn(c.getCreatureAttackedThisTurn());
+            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);
         }