From 830d0afba2c1998ce6cccd6eb18c5fb96a8ece99 Mon Sep 17 00:00:00 2001
From: TRT <>
Date: Mon, 9 Jan 2023 08:22:29 +0100
Subject: [PATCH] Clean up

---
 forge-ai/src/main/java/forge/ai/ComputerUtilCard.java  | 3 +++
 forge-ai/src/main/java/forge/ai/CreatureEvaluator.java | 8 +++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
index fb2b0eddda3..4ea030507c0 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
@@ -2053,6 +2053,9 @@ public class ComputerUtilCard {
     }
 
     public static CardCollection dedupeCards(CardCollection cc) {
+        if (cc.size() <= 1) {
+            return cc;
+        }
         CardCollection deduped = new CardCollection();
         for (Card c : cc) {
             boolean unique = true;
diff --git a/forge-ai/src/main/java/forge/ai/CreatureEvaluator.java b/forge-ai/src/main/java/forge/ai/CreatureEvaluator.java
index 6fa75e8fcab..aac52cdaa9d 100644
--- a/forge-ai/src/main/java/forge/ai/CreatureEvaluator.java
+++ b/forge-ai/src/main/java/forge/ai/CreatureEvaluator.java
@@ -114,13 +114,11 @@ public class CreatureEvaluator implements Function<Card, Integer> {
                 value += addValue(power * 15, "infect");
             }
             else if (c.hasKeyword(Keyword.WITHER)) {
-                value += addValue(power * 10, "Wither");
+                value += addValue(power * 10, "wither");
             }
-            else if (c.hasKeyword(Keyword.TOXIC)) {
-                value += addValue(power * 10, "Toxic");
-            }
-            value += addValue(c.getKeywordMagnitude(Keyword.RAMPAGE), "rampage");
+            value += addValue(c.getKeywordMagnitude(Keyword.TOXIC) * 5, "toxic");
             value += addValue(c.getKeywordMagnitude(Keyword.AFFLICT) * 5, "afflict");
+            value += addValue(c.getKeywordMagnitude(Keyword.RAMPAGE), "rampage");
         }
 
         value += addValue(c.getKeywordMagnitude(Keyword.ANNIHILATOR) * 50, "eldrazi");