refactor WhileKeyword

Northmoc · Nov 22, 2023 · 20bcd8f · 20bcd8f
1 parent 83e9766
commit 20bcd8f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 20 deletions.
diff --git a/forge-game/src/main/java/forge/game/trigger/Trigger.java b/forge-game/src/main/java/forge/game/trigger/Trigger.java
@@ -623,4 +623,11 @@ public void setOverridingAbility(SpellAbility overridingAbility0) {
         super.setOverridingAbility(overridingAbility0);
         overridingAbility0.setTrigger(this);
     }
+
+    boolean whileKeywordCheck(final String keyword, final SpellAbility sa) {
+        if (sa == null || sa.getHostCard() == null) return false;
+        if (keyword.equals("Craft")) {
+            return sa.isAbility() && sa.isCraft();
+        } else return sa.isSpell() && sa.getHostCard().hasStartOfUnHiddenKeyword(keyword);
+    }
 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerExiled.java b/forge-game/src/main/java/forge/game/trigger/TriggerExiled.java
@@ -89,11 +89,7 @@ public final boolean performTest(final Map<AbilityKey, Object> runParams) {
             if (currentPayment != null) {
                 sa = currentPayment.getPayment().getAbility();
 
-                if (sa != null && sa.getHostCard() != null) {
-                    if ((sa.isSpell() || sa.isAbility()) && sa.getHostCard().hasStartOfUnHiddenKeyword(keyword)) {
-                        withKeyword = true;
-                    }
-                }
+                if (whileKeywordCheck(keyword, sa)) withKeyword = true;
             }
 
             if (!withKeyword) {
@@ -102,18 +98,14 @@ public final boolean performTest(final Map<AbilityKey, Object> runParams) {
                 for (IndividualCostPaymentInstance individual : stack) {
                     sa = individual.getPayment().getAbility();
 
-                    if (sa == null || sa.getHostCard() == null)
-                        continue;
-
-                    if ((sa.isSpell() || sa.isAbility()) && sa.getHostCard().hasStartOfUnHiddenKeyword(keyword)) {
+                    if (whileKeywordCheck(keyword, sa))  {
                         withKeyword = true;
                         break;
                     }
                 }
             }
 
-            if (!withKeyword)
-                return false;
+            if (!withKeyword) return false;
         }
 
         return true;

diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerSacrificed.java b/forge-game/src/main/java/forge/game/trigger/TriggerSacrificed.java
@@ -77,11 +77,7 @@ public final boolean performTest(final Map<AbilityKey, Object> runParams) {
             if (currentPayment != null) {
                 sa = currentPayment.getPayment().getAbility();
 
-                if (sa != null && sa.getHostCard() != null) {
-                    if (sa.isSpell() && sa.getHostCard().hasStartOfUnHiddenKeyword(keyword)) {
-                        withKeyword = true;
-                    }
-                }
+                if (whileKeywordCheck(keyword, sa)) withKeyword = true;
             }
 
             if (!withKeyword) {
@@ -91,10 +87,7 @@ public final boolean performTest(final Map<AbilityKey, Object> runParams) {
                 for (IndividualCostPaymentInstance individual : stack) {
                     sa = individual.getPayment().getAbility();
 
-                    if (sa == null || sa.getHostCard() == null)
-                        continue;
-
-                    if (sa.isSpell() && sa.getHostCard().hasStartOfUnHiddenKeyword(keyword)) {
+                    if (whileKeywordCheck(keyword, sa))  {
                         withKeyword = true;
                         break;
                     }