- Converted Stasis to Keyword

- Simplify Yosei a touch

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

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();

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.")) {
+        if (p.hasKeyword("Skip the untap step of this turn.") || 
-            return true;
+                p.hasKeyword("Skip your untap step.")) {
-        }
-
-        if (Singletons.getModel().getGame().isCardInPlay("Sands of Time")
-                || Singletons.getModel().getGame().isCardInPlay("Stasis")) {
-            return true;
-        }
-
-        if (p.skipNextUntap()) {
-            p.setSkipNextUntap(false);
             return true;
         }
 

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