external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'goadStatic' into 'master'

Browse Source 
StaticAbility: add flag for static Goad

See merge request core-developers/forge!2018
This commit is contained in:
swordshine
2019-08-10 08:44:44 +00:00
parent d744a50e2d fd0c79968d
commit 587535cc4a
4 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/StaticEffect.java
View File

@@ -1002,6 +1002,10 @@ public class StaticEffect {
affectedCard.removeTextChangeState(getTimestamp()); affectedCard.removeTextChangeState(getTimestamp());
} }
if (params.containsKey("Goad")) {
affectedCard.removeGoad(getTimestamp());
}
affectedCard.updateAbilityTextForView(); // only update keywords and text for view to avoid flickering affectedCard.updateAbilityTextForView(); // only update keywords and text for view to avoid flickering
} }
return affectedCards; return affectedCards;

2
forge-game/src/main/java/forge/game/staticability/StaticAbility.java
View File

@@ -166,7 +166,7 @@ public class StaticAbility extends CardTraitBase implements Comparable<StaticAbi
layers.add(StaticAbilityLayer.RULES); layers.add(StaticAbilityLayer.RULES);
} }
if (hasParam("IgnoreEffectCost")) { if (hasParam("IgnoreEffectCost") || hasParam("Goad")) {
layers.add(StaticAbilityLayer.RULES); layers.add(StaticAbilityLayer.RULES);
} }

4
forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
View File

@@ -727,6 +727,10 @@ public final class StaticAbilityContinuous {
} }
} }
if (layer == StaticAbilityLayer.RULES && params.containsKey("Goad")) {
affectedCard.addGoad(se.getTimestamp(), hostCard.getController());
}
if (mayLookAt != null) { if (mayLookAt != null) {
for (Player p : mayLookAt) { for (Player p : mayLookAt) {
affectedCard.setMayLookAt(p, true); affectedCard.setMayLookAt(p, true);

6
forge-gui/res/cardsfolder/upcoming/bloodthirsty_blade.txt Normal file
View File

@@ -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.