external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 10:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'afflictFix' into 'master'

Browse Source 
Afflict use :

See merge request core-developers/forge!866
This commit is contained in:
Michael Kamensky
2018-08-17 15:49:52 +00:00
parent bf3ce5b68a 553a794642
commit 8627ecb165
12 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -1607,7 +1607,7 @@ public class Card extends GameEntity implements Comparable<Card> {
|| keyword.startsWith("Fabricate") || keyword.startsWith("Soulshift") || keyword.startsWith("Bushido") || keyword.startsWith("Fabricate") || keyword.startsWith("Soulshift") || keyword.startsWith("Bushido")
|| keyword.startsWith("Crew") || keyword.startsWith("Tribute") || keyword.startsWith("Absorb") || keyword.startsWith("Crew") || keyword.startsWith("Tribute") || keyword.startsWith("Absorb")
|| keyword.startsWith("Graft") || keyword.startsWith("Fading") || keyword.startsWith("Vanishing") || keyword.startsWith("Graft") || keyword.startsWith("Fading") || keyword.startsWith("Vanishing")
|| keyword.startsWith ("Poisonous") || keyword.startsWith ("Afflict") || keyword.startsWith ("Poisonous")
|| keyword.startsWith("Renown") || keyword.startsWith("Annihilator") || keyword.startsWith("Devour")) { || keyword.startsWith("Renown") || keyword.startsWith("Annihilator") || keyword.startsWith("Devour")) {
final String[] k = keyword.split(":"); final String[] k = keyword.split(":");
sbLong.append(k[0] + " " + k[1] + " (" + inst.getReminderText() + ")"); sbLong.append(k[0] + " " + k[1] + " (" + inst.getReminderText() + ")");
@@ -1627,7 +1627,6 @@ public class Card extends GameEntity implements Comparable<Card> {
|| keyword.equals("Horsemanship") || keyword.equals("Infect")|| keyword.equals("Persist") || keyword.equals("Horsemanship") || keyword.equals("Infect")|| keyword.equals("Persist")
|| keyword.equals("Phasing") || keyword.equals("Shadow")|| keyword.equals("Skulk") || keyword.equals("Phasing") || keyword.equals("Shadow")|| keyword.equals("Skulk")
|| keyword.equals("Undying") || keyword.equals("Wither") || keyword.equals("Undying") || keyword.equals("Wither")
|| keyword.startsWith ("Afflict")
|| keyword.startsWith ("Rampage") || keyword.startsWith("Cascade")) { || keyword.startsWith ("Rampage") || keyword.startsWith("Cascade")) {
if (sb.length() != 0) { if (sb.length() != 0) {
sb.append("\r\n"); sb.append("\r\n");

2
forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
View File

@@ -2109,7 +2109,7 @@ public class CardFactoryUtil {
String keyword = inst.getOriginal(); String keyword = inst.getOriginal();
if (keyword.startsWith("Afflict")) { if (keyword.startsWith("Afflict")) {
final String[] k = keyword.split(" "); final String[] k = keyword.split(":");
final String n = k[1]; final String n = k[1];
final String trigStr = "Mode$ AttackerBlocked | ValidCard$ Card.Self | TriggerZones$ Battlefield " + final String trigStr = "Mode$ AttackerBlocked | ValidCard$ Card.Self | TriggerZones$ Battlefield " +

2
forge-gui/res/cardsfolder/a/ammit_eternal.txt
View File

@@ -2,7 +2,7 @@ Name:Ammit Eternal
ManaCost:2 B ManaCost:2 B
Types:Creature Zombie Crocodile Demon Types:Creature Zombie Crocodile Demon
PT:5/5 PT:5/5
K:Afflict 3 K:Afflict:3
T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever an opponent casts a spell, put a -1/-1 counter on CARDNAME. T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever an opponent casts a spell, put a -1/-1 counter on CARDNAME.
T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigRemoveCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, remove all -1/-1 counters from it. T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigRemoveCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, remove all -1/-1 counters from it.
SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ M1M1 | CounterNum$ 1 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ M1M1 | CounterNum$ 1

2
forge-gui/res/cardsfolder/d/dagger_of_the_worthy.txt
View File

@@ -1,7 +1,7 @@
Name:Dagger of the Worthy Name:Dagger of the Worthy
ManaCost:2 ManaCost:2
Types:Artifact Equipment Types:Artifact Equipment
S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddKeyword$ Afflict 1 | Description$ Equipped creature gets +2/+0 and has afflict 1. (Whenever it becomes blocked, defending player loses 1 life.) S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddKeyword$ Afflict:1 | Description$ Equipped creature gets +2/+0 and has afflict 1. (Whenever it becomes blocked, defending player loses 1 life.)
K:Equip:2 K:Equip:2
SVar:Picture:http://www.wizards.com/global/images/magic/general/dagger_of_the_worthy.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/dagger_of_the_worthy.jpg
Oracle:Equipped creature gets +2/+0 and has afflict 1. (Whenever it becomes blocked, defending player loses 1 life.)\nEquip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.) Oracle:Equipped creature gets +2/+0 and has afflict 1. (Whenever it becomes blocked, defending player loses 1 life.)\nEquip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)

2
forge-gui/res/cardsfolder/e/eternal_of_harsh_truths.txt
View File

@@ -2,7 +2,7 @@ Name:Eternal of Harsh Truths
ManaCost:2 U ManaCost:2 U
Types:Creature Zombie Cleric Types:Creature Zombie Cleric
PT:1/3 PT:1/3
K:Afflict 2 K:Afflict:2
T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, draw a card. T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, draw a card.
SVar:TrigDraw:DB$Draw | Defined$ You | NumCards$ 1 SVar:TrigDraw:DB$Draw | Defined$ You | NumCards$ 1
SVar:Picture:http://www.wizards.com/global/images/magic/general/eternal_of_harsh_truths.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/eternal_of_harsh_truths.jpg

2
forge-gui/res/cardsfolder/f/frontline_devastator.txt
View File

@@ -2,7 +2,7 @@ Name:Frontline Devastator
ManaCost:3 R ManaCost:3 R
Types:Creature Zombie Minotaur Warrior Types:Creature Zombie Minotaur Warrior
PT:3/3 PT:3/3
K:Afflict 2 K:Afflict:2
A:AB$ Pump | Cost$ 1 R | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn. A:AB$ Pump | Cost$ 1 R | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
SVar:Picture:http://www.wizards.com/global/images/magic/general/frontline_devastator.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/frontline_devastator.jpg
Oracle:Afflict 2 (Whenever this creature becomes blocked, defending player loses 2 life.)\n{1}{R}: Frontline Devastator gets +1/+0 until end of turn. Oracle:Afflict 2 (Whenever this creature becomes blocked, defending player loses 2 life.)\n{1}{R}: Frontline Devastator gets +1/+0 until end of turn.

2
forge-gui/res/cardsfolder/k/khenra_eternal.txt
View File

@@ -2,6 +2,6 @@ Name:Khenra Eternal
ManaCost:1 B ManaCost:1 B
Types:Creature Zombie Jackal Warrior Types:Creature Zombie Jackal Warrior
PT:2/2 PT:2/2
K:Afflict 1 K:Afflict:1
SVar:Picture:http://www.wizards.com/global/images/magic/general/khenra_eternal.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/khenra_eternal.jpg
Oracle:Afflict 1 (Whenever this creature becomes blocked, defending player loses 1 life.) Oracle:Afflict 1 (Whenever this creature becomes blocked, defending player loses 1 life.)

2
forge-gui/res/cardsfolder/m/manticore_eternal.txt
View File

@@ -2,7 +2,7 @@ Name:Manticore Eternal
ManaCost:3 R R ManaCost:3 R R
Types:Creature Zombie Manticore Types:Creature Zombie Manticore
PT:5/4 PT:5/4
K:Afflict 3 K:Afflict:3
K:CARDNAME attacks each combat if able. K:CARDNAME attacks each combat if able.
SVar:Picture:http://www.wizards.com/global/images/magic/general/manticore_eternal.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/manticore_eternal.jpg
Oracle:Afflict 3 (Whenever this creature becomes blocked, defending player loses 3 life.)\nManticore Eternal attacks each combat if able. Oracle:Afflict 3 (Whenever this creature becomes blocked, defending player loses 3 life.)\nManticore Eternal attacks each combat if able.

2
forge-gui/res/cardsfolder/m/merciless_eternal.txt
View File

@@ -2,7 +2,7 @@ Name:Merciless Eternal
ManaCost:2 B ManaCost:2 B
Types:Creature Zombie Cleric Types:Creature Zombie Cleric
PT:2/2 PT:2/2
K:Afflict 2 K:Afflict:2
A:AB$ Pump | Cost$ 2 B Discard<1/Card> | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ CARDNAME gets +2/+2 until end of turn. A:AB$ Pump | Cost$ 2 B Discard<1/Card> | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ CARDNAME gets +2/+2 until end of turn.
SVar:Picture:http://www.wizards.com/global/images/magic/general/merciless_eternal.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/merciless_eternal.jpg
Oracle:Afflict 2 (Whenever this creature becomes blocked, defending player loses 2 life.)\n{2}{B}, Discard a card: Merciless Eternal gets +2/+2 until end of turn. Oracle:Afflict 2 (Whenever this creature becomes blocked, defending player loses 2 life.)\n{2}{B}, Discard a card: Merciless Eternal gets +2/+2 until end of turn.

2
forge-gui/res/cardsfolder/n/neheb_the_eternal.txt
View File

@@ -2,7 +2,7 @@ Name:Neheb, the Eternal
ManaCost:3 R R ManaCost:3 R R
Types:Legendary Creature Zombie Minotaur Warrior Types:Legendary Creature Zombie Minotaur Warrior
PT:4/6 PT:4/6
K:Afflict 3 K:Afflict:3
T:Mode$ Phase | Phase$ Main2 | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigMana | TriggerDescription$ At the beginning of your postcombat main phase, add {R} for each 1 life your opponents have lost this turn. T:Mode$ Phase | Phase$ Main2 | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigMana | TriggerDescription$ At the beginning of your postcombat main phase, add {R} for each 1 life your opponents have lost this turn.
SVar:TrigMana:DB$Mana | Produced$ R | Amount$ X | References$ X SVar:TrigMana:DB$Mana | Produced$ R | Amount$ X | References$ X
SVar:X:Count$LifeOppsLostThisTurn SVar:X:Count$LifeOppsLostThisTurn

2
forge-gui/res/cardsfolder/s/spellweaver_eternal.txt
View File

@@ -3,6 +3,6 @@ ManaCost:1 U
Types:Creature Zombie Naga Wizard Types:Creature Zombie Naga Wizard
PT:2/1 PT:2/1
K:Prowess K:Prowess
K:Afflict 2 K:Afflict:2
SVar:Picture:http://www.wizards.com/global/images/magic/general/spellweaver_eternal.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/spellweaver_eternal.jpg
Oracle:Prowess (Whenever you cast a noncreature spell, this creature gets +1/+1 until end of turn.)\nAfflict 2 (Whenever this creature becomes blocked, defending player loses 2 life.) Oracle:Prowess (Whenever you cast a noncreature spell, this creature gets +1/+1 until end of turn.)\nAfflict 2 (Whenever this creature becomes blocked, defending player loses 2 life.)

2
forge-gui/res/cardsfolder/w/wildfire_eternal.txt
View File

@@ -2,7 +2,7 @@ Name:Wildfire Eternal
ManaCost:3 R ManaCost:3 R
Types:Creature Zombie Jackal Cleric Types:Creature Zombie Jackal Cleric
PT:1/4 PT:1/4
K:Afflict 4 K:Afflict:4
T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPlay | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, you may cast an instant or sorcery card from your hand without paying its mana cost. T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPlay | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, you may cast an instant or sorcery card from your hand without paying its mana cost.
SVar:TrigPlay:DB$ Play | ValidZone$ Hand | Valid$ Instant.YouOwn,Sorcery.YouOwn | Controller$ You | WithoutManaCost$ True | Optional$ True | Amount$ 1 SVar:TrigPlay:DB$ Play | ValidZone$ Hand | Valid$ Instant.YouOwn,Sorcery.YouOwn | Controller$ You | WithoutManaCost$ True | Optional$ True | Amount$ 1
SVar:Picture:http://www.wizards.com/global/images/magic/general/wildfire_eternal.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/wildfire_eternal.jpg