From 725436f7c2d76717efd97763ecd3fe97c28c24b3 Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Sun, 15 Jul 2012 14:41:36 +0000
Subject: [PATCH] - Removed some randomness relics from CanPlayAI functions.

---
 .../forge/card/abilityfactory/AbilityFactoryAttach.java   | 2 +-
 .../card/abilityfactory/AbilityFactoryZoneAffecting.java  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryAttach.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryAttach.java
index 595e5390234..e0c31afd612 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryAttach.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryAttach.java
@@ -470,7 +470,7 @@ public class AbilityFactoryAttach {
         // TODO If Not Mandatory, make sure the card is "good enough"
         if (c.isCreature()) {
             final int eval = CardFactoryUtil.evaluateCreature(c);
-            if ((eval < 160) && ((eval < 130) || (AllZone.getComputerPlayer().getLife() > 5))) {
+            if (eval < 130) {
                 return null;
             }
         }
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java
index 19294db957c..bdb9c9fb866 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java
@@ -340,15 +340,15 @@ public class AbilityFactoryZoneAffecting {
 
         double chance = .4; // 40 percent chance of drawing with instant speed
                             // stuff
+        final Random r = MyRandom.getRandom();
+        boolean randomReturn = r.nextFloat() <= Math.pow(chance, sa.getActivationsThisTurn() + 1);
         if (AbilityFactory.isSorcerySpeed(sa)) {
-            chance = .667; // 66.7% chance for sorcery speed
+            randomReturn = true;
         }
         if ((Singletons.getModel().getGameState().getPhaseHandler().is(PhaseType.END_OF_TURN)
                 && Singletons.getModel().getGameState().getPhaseHandler().isNextTurn(AllZone.getComputerPlayer()))) {
-            chance = .9; // 90% for end of opponents turn
+            randomReturn = true;
         }
-        final Random r = MyRandom.getRandom();
-        boolean randomReturn = r.nextFloat() <= Math.pow(chance, sa.getActivationsThisTurn() + 1);
 
         if (AbilityFactory.playReusable(sa)) {
             randomReturn = true;