From fd0c79968db652e036c6353aa4533623fc58efe3 Mon Sep 17 00:00:00 2001
From: Hans Mackowiak <hanmac@gmx.de>
Date: Sat, 10 Aug 2019 08:44:44 +0000
Subject: [PATCH] StaticAbility: add flag for static Goad

---
 forge-game/src/main/java/forge/game/StaticEffect.java       | 4 ++++
 .../main/java/forge/game/staticability/StaticAbility.java   | 2 +-
 .../forge/game/staticability/StaticAbilityContinuous.java   | 4 ++++
 forge-gui/res/cardsfolder/upcoming/bloodthirsty_blade.txt   | 6 ++++++
 4 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/bloodthirsty_blade.txt

diff --git a/forge-game/src/main/java/forge/game/StaticEffect.java b/forge-game/src/main/java/forge/game/StaticEffect.java
index 0429f08b24f..9f4be831e8f 100644
--- a/forge-game/src/main/java/forge/game/StaticEffect.java
+++ b/forge-game/src/main/java/forge/game/StaticEffect.java
@@ -1002,6 +1002,10 @@ public class StaticEffect {
                 affectedCard.removeTextChangeState(getTimestamp());
             }
 
+            if (params.containsKey("Goad")) {
+                affectedCard.removeGoad(getTimestamp());
+            }
+
             affectedCard.updateAbilityTextForView(); // only update keywords and text for view to avoid flickering
         }
         return affectedCards;
diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbility.java b/forge-game/src/main/java/forge/game/staticability/StaticAbility.java
index c9b65c667b5..0c01ab230e9 100644
--- a/forge-game/src/main/java/forge/game/staticability/StaticAbility.java
+++ b/forge-game/src/main/java/forge/game/staticability/StaticAbility.java
@@ -166,7 +166,7 @@ public class StaticAbility extends CardTraitBase implements Comparable<StaticAbi
             layers.add(StaticAbilityLayer.RULES);
         }
 
-        if (hasParam("IgnoreEffectCost")) {
+        if (hasParam("IgnoreEffectCost") || hasParam("Goad")) {
             layers.add(StaticAbilityLayer.RULES);
         }
 
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 c73f494b7ae..3d53912f961 100644
--- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
+++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
@@ -727,6 +727,10 @@ public final class StaticAbilityContinuous {
                 }
             }
 
+            if (layer == StaticAbilityLayer.RULES && params.containsKey("Goad")) {
+                affectedCard.addGoad(se.getTimestamp(), hostCard.getController());
+            }
+
             if (mayLookAt != null) {
                 for (Player p : mayLookAt) {
                     affectedCard.setMayLookAt(p, true);
diff --git a/forge-gui/res/cardsfolder/upcoming/bloodthirsty_blade.txt b/forge-gui/res/cardsfolder/upcoming/bloodthirsty_blade.txt
new file mode 100644
index 00000000000..318f94afc3e
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/bloodthirsty_blade.txt
@@ -0,0 +1,6 @@
+Name:Bloodthirsty Blade
+ManaCost:2
+Types:Artifact Equipment
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | Goad$ True | Description$ Equipped creature gets +2/+0 and is goaded. (It attacks each combat if able and attacks a player other than you if able.)
+A:AB$ Attach | Cost$ 1 | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | IsCurse$ True | SorcerySpeed$ True | SpellDescription$ Attach CARDNAME to target creature an opponent controls. Activate this ability only any time you could cast a sorcery.
+Oracle:Equipped creature gets +2/+0 and is goaded. (It attacks each combat if able and attacks a player other than you if able.)\n{1}: Attach Bloodthirsty Blade to target creature an opponent controls. Active this ability only any time you could cast a sorcery.