From 6949ce45fcefc8db9c42faa973cfe7cf4fe43eee Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Tue, 2 Nov 2021 14:23:14 -0400
Subject: [PATCH] allow for -AffectedX and other variations

---
 forge-ai/src/main/java/forge/ai/ComputerUtilCard.java     | 4 ++--
 .../forge/game/staticability/StaticAbilityContinuous.java | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
index 7b478efb21d..4aca406531a 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
@@ -1746,12 +1746,12 @@ public class ComputerUtilCard {
                 int att = 0;
                 if (stAb.hasParam("AddPower")) {
                     String addP = stAb.getParam("AddPower");
-                    att = AbilityUtils.calculateAmount(addP.startsWith("Affected") ? vCard : c, addP, stAb, true);
+                    att = AbilityUtils.calculateAmount(addP.contains("Affected") ? vCard : c, addP, stAb, true);
                 }
                 int def = 0;
                 if (stAb.hasParam("AddToughness")) {
                     String addT = stAb.getParam("AddToughness");
-                    def = AbilityUtils.calculateAmount(addT.startsWith("Affected") ? vCard : c, addT, stAb, true);
+                    def = AbilityUtils.calculateAmount(addT.contains("Affected") ? vCard : c, addT, stAb, true);
                 }
                 vCard.addPTBoost(att, def, c.getTimestamp(), stAb.getId());
             }
diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
index 7c8dcccbb74..fe90397e869 100644
--- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
+++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
@@ -684,10 +684,10 @@ public final class StaticAbilityContinuous {
             if (layer == StaticAbilityLayer.SETPT) {
                 if ((setPower != null) || (setToughness != null)) {
                     // non CharacteristicDefining
-                    if (setP.startsWith("Affected")) {
+                    if (setP.contains("Affected")) {
                         setPower = AbilityUtils.calculateAmount(affectedCard, setP, stAb, true);
                     }
-                    if (setT.startsWith("Affected")) {
+                    if (setT.contains("Affected")) {
                         setToughness = AbilityUtils.calculateAmount(affectedCard, setT, stAb, true);
                     }
                     affectedCard.addNewPT(setPower, setToughness,
@@ -697,10 +697,10 @@ public final class StaticAbilityContinuous {
 
             // add P/T bonus
             if (layer == StaticAbilityLayer.MODIFYPT) {
-                if (addP.startsWith("Affected")) {
+                if (addP.contains("Affected")) {
                     powerBonus = AbilityUtils.calculateAmount(affectedCard, addP, stAb, true);
                 }
-                if (addT.startsWith("Affected")) {
+                if (addT.contains("Affected")) {
                     toughnessBonus = AbilityUtils.calculateAmount(affectedCard, addT, stAb, true);
                 }
                 affectedCard.addPTBoost(powerBonus, toughnessBonus, se.getTimestamp(), stAb.getId());