Fix #1817 Managrounder

hiddenswitch · Aug 18, 2020 · e6ac40e · e6ac40e
1 parent ca3fc0b
commit e6ac40e
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 33 deletions.
diff --git a/cards/src/main/resources/cards/collectible/peach/Rare/minion_managrounder.json b/cards/src/main/resources/cards/collectible/peach/Rare/minion_managrounder.json
@@ -11,42 +11,33 @@
     "class": "CardCostModifier",
     "value": 3,
     "condition": {
-      "class": "AndCondition",
-      "conditions": [
-        {
-          "class": "OwnedByPlayerCondition",
-          "targetPlayer": "BOTH"
-        },
-        {
-          "class": "ComparisonCondition",
-          "operation": "EQUAL",
-          "value1": {
-            "class": "CardCountValueProvider",
-            "cardFilter": {
-              "class": "AndFilter",
-              "filters": [
-                {
-                  "class": "CardFilter",
-                  "cardType": "SPELL"
-                },
-                {
-                  "class": "AttributeFilter",
-                  "value": {
-                    "class": "CurrentTurnValueProvider"
-                  },
-                  "attribute": "PLAYED_FROM_HAND_OR_DECK",
-                  "operation": "EQUAL"
-                }
-              ]
+      "class": "ComparisonCondition",
+      "operation": "EQUAL",
+      "value1": {
+        "class": "CardCountValueProvider",
+        "cardFilter": {
+          "class": "AndFilter",
+          "filters": [
+            {
+              "class": "CardFilter",
+              "cardType": "SPELL"
             },
-            "cardSource": {
-              "class": "GraveyardCardsSource",
-              "targetPlayer": "SELF"
+            {
+              "class": "AttributeFilter",
+              "value": {
+                "class": "CurrentTurnValueProvider"
+              },
+              "attribute": "PLAYED_FROM_HAND_OR_DECK",
+              "operation": "EQUAL"
             }
-          },
-          "value2": 0
+          ]
+        },
+        "cardSource": {
+          "class": "GraveyardCardsSource",
+          "targetPlayer": "SELF"
         }
-      ]
+      },
+      "value2": 0
     },
     "cardType": "SPELL",
     "targetPlayer": "BOTH"

diff --git a/cards/src/test/java/com/hiddenswitch/spellsource/tests/cards/WitchTests.java b/cards/src/test/java/com/hiddenswitch/spellsource/tests/cards/WitchTests.java
@@ -1,6 +1,7 @@
 package com.hiddenswitch.spellsource.tests.cards;
 
 import net.demilich.metastone.game.cards.Attribute;
+import net.demilich.metastone.game.cards.Card;
 import net.demilich.metastone.game.entities.heroes.HeroClass;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.Execution;
@@ -36,4 +37,23 @@ public void testChooseOneOptionsShowSpellpower() {
 			playCard(context, player, "spell_nine_tail_fury", target);
 		});
 	}
+
+	@Test
+	public void testManagrounder() {
+		runGym((context, player, opponent) -> {
+			playCard(context, player, "minion_managrounder");
+			Card spell = receiveCard(context, player, "spell_fox_fire");
+			Card spell2 = receiveCard(context, player, "spell_fox_fire");
+			assertEquals(4, costOf(context, player, spell));
+			playCard(context, player, spell, opponent.getHero());
+			assertEquals(1, costOf(context, player, spell2));
+			context.endTurn();
+
+			spell = receiveCard(context, opponent, "spell_fox_fire");
+			spell2 = receiveCard(context, opponent, "spell_fox_fire");
+			assertEquals(4, costOf(context, opponent, spell));
+			playCard(context, opponent, spell, player.getHero());
+			assertEquals(1, costOf(context, opponent, spell2));
+		});
+	}
 }
diff --git a/www/src/pages-markdown/whatsnew.md b/www/src/pages-markdown/whatsnew.md
@@ -6,6 +6,7 @@ header: true
 ---
 
 ### Upcoming Changes
+ - The Witch card Managrounder now functions properly. ([1817](https://github.com/hiddenswitch/Spellsource/issues/1817))
  - Parallel Protector now has a happy little dynamic description. ([1795](https://github.com/hiddenswitch/Spellsource/issues/1795))
  - The Ringmaster class has become the Festivalist! The new core set is made up of some previous cards, some reflavorings of previous cards, and some entirely new cards. The rest of the old Ringmaster cards have been uncollectiblified. ([1826](https://github.com/hiddenswitch/Spellsource/issues/1826))
  - Recurring Torrent is changed from: