From a4e9da67b467e7cd44fbff271348f7d0f7dea2a9 Mon Sep 17 00:00:00 2001
From: Sol <zenchristo@gmail.com>
Date: Sat, 20 Oct 2012 14:03:52 +0000
Subject: [PATCH] - Converted Stasis to Keyword - Simplify Yosei a touch

---
 res/cardsfolder/s/stasis.txt                  |  3 ++-
 .../cardfactory/CardFactoryCreatures.java     |  2 +-
 src/main/java/forge/game/phase/PhaseUtil.java | 13 ++--------
 src/main/java/forge/game/player/Player.java   | 26 -------------------
 4 files changed, 5 insertions(+), 39 deletions(-)

diff --git a/res/cardsfolder/s/stasis.txt b/res/cardsfolder/s/stasis.txt
index c88f5c336dc..febfb98e2f3 100644
--- a/res/cardsfolder/s/stasis.txt
+++ b/res/cardsfolder/s/stasis.txt
@@ -1,7 +1,8 @@
 Name:Stasis
 ManaCost:1 U
 Types:Enchantment
-Text:Players skip their untap steps.
+Text:no text
+S:Mode$ Continuous | Affected$ Player | AddKeyword$ Skip your untap step. | Description$ Players skip their untap steps.
 K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay U
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
diff --git a/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java b/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java
index d89500fcce1..73bc41b4d1f 100644
--- a/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java
+++ b/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java
@@ -886,7 +886,7 @@ public class CardFactoryCreatures {
             public void resolve() {
                 final Player p = this.getTargetPlayer();
                 if (p.canBeTargetedBy(this)) {
-                    p.setSkipNextUntap(true);
+                    p.addKeyword("Skip your next untap step.");
                     for (final Card c : targetPerms) {
                         if (c.isInPlay() && c.canBeTargetedBy(this)) {
                             c.tap();
diff --git a/src/main/java/forge/game/phase/PhaseUtil.java b/src/main/java/forge/game/phase/PhaseUtil.java
index d7a0a3d0f9b..e3bf3be732c 100644
--- a/src/main/java/forge/game/phase/PhaseUtil.java
+++ b/src/main/java/forge/game/phase/PhaseUtil.java
@@ -60,17 +60,8 @@ public class PhaseUtil {
             p.removeKeyword("Skip your next untap step.");
             return true;
         }
-        if (p.hasKeyword("Skip the untap step of this turn.")) {
-            return true;
-        }
-
-        if (Singletons.getModel().getGame().isCardInPlay("Sands of Time")
-                || Singletons.getModel().getGame().isCardInPlay("Stasis")) {
-            return true;
-        }
-
-        if (p.skipNextUntap()) {
-            p.setSkipNextUntap(false);
+        if (p.hasKeyword("Skip the untap step of this turn.") || 
+                p.hasKeyword("Skip your untap step.")) {
             return true;
         }
 
diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java
index 2e121d8c4b1..306ae263efb 100644
--- a/src/main/java/forge/game/player/Player.java
+++ b/src/main/java/forge/game/player/Player.java
@@ -87,9 +87,6 @@ public abstract class Player extends GameEntity implements Comparable<Player> {
     /** The num power surge lands. */
     private int numPowerSurgeLands;
 
-    /** The skip next untap. */
-    private boolean skipNextUntap = false;
-
     /** The prowl. */
     private ArrayList<String> prowl = new ArrayList<String>();
 
@@ -1947,29 +1944,6 @@ public abstract class Player extends GameEntity implements Comparable<Player> {
         return old;
     }
 
-    /**
-     * <p>
-     * skipNextUntap.
-     * </p>
-     * 
-     * @return a boolean.
-     */
-    public final boolean skipNextUntap() {
-        return this.skipNextUntap;
-    }
-
-    /**
-     * <p>
-     * Setter for the field <code>skipNextUntap</code>.
-     * </p>
-     * 
-     * @param b
-     *            a boolean.
-     */
-    public final void setSkipNextUntap(final boolean b) {
-        this.skipNextUntap = b;
-    }
-
     /**
      * <p>
      * Getter for the field <code>slowtripList</code>.