From 226754d80fe8ca6cea05a807077292dd9c68c6d9 Mon Sep 17 00:00:00 2001 From: Hanmac Date: Fri, 17 Aug 2018 15:31:33 +0200 Subject: [PATCH] Poisonous use : --- forge-game/src/main/java/forge/game/card/Card.java | 3 ++- forge-game/src/main/java/forge/game/card/CardFactoryUtil.java | 4 ++-- forge-gui/res/cardsfolder/s/snake_cult_initiation.txt | 2 +- forge-gui/res/cardsfolder/v/virulent_sliver.txt | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java index 259295a4b9a..60f59314411 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -1607,6 +1607,7 @@ public class Card extends GameEntity implements Comparable { || keyword.startsWith("Fabricate") || keyword.startsWith("Soulshift") || keyword.startsWith("Bushido") || keyword.startsWith("Crew") || keyword.startsWith("Tribute") || keyword.startsWith("Absorb") || keyword.startsWith("Graft") || keyword.startsWith("Fading") || keyword.startsWith("Vanishing") + || keyword.startsWith ("Poisonous") || keyword.startsWith("Renown") || keyword.startsWith("Annihilator") || keyword.startsWith("Devour")) { final String[] k = keyword.split(":"); sbLong.append(k[0] + " " + k[1] + " (" + inst.getReminderText() + ")"); @@ -1626,7 +1627,7 @@ public class Card extends GameEntity implements Comparable { || keyword.equals("Horsemanship") || keyword.equals("Infect")|| keyword.equals("Persist") || keyword.equals("Phasing") || keyword.equals("Shadow")|| keyword.equals("Skulk") || keyword.equals("Undying") || keyword.equals("Wither") - || keyword.startsWith ("Afflict") || keyword.startsWith ("Poisonous") + || keyword.startsWith ("Afflict") || keyword.startsWith ("Rampage") || keyword.startsWith("Cascade")) { if (sb.length() != 0) { sb.append("\r\n"); diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java index 06826a50141..666b47924c8 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -2768,10 +2768,10 @@ public class CardFactoryUtil { trigger.setOverridingAbility(AbilityFactory.getAbility(effect, card)); inst.addTrigger(trigger); } else if (keyword.startsWith("Poisonous")) { - final String[] k = keyword.split(" "); + final String[] k = keyword.split(":"); final String n = k[1]; final String trigStr = "Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Secondary$ True" - + " | TriggerZones$ Battlefield | TriggerDescription$ " + keyword + " (" + inst.getReminderText() + ")"; + + " | TriggerZones$ Battlefield | TriggerDescription$ Poisonous " + n + " (" + inst.getReminderText() + ")"; final Trigger parsedTrigger = TriggerHandler.parseTrigger(trigStr.toString(), card, intrinsic); diff --git a/forge-gui/res/cardsfolder/s/snake_cult_initiation.txt b/forge-gui/res/cardsfolder/s/snake_cult_initiation.txt index 63e8cff32dc..37d839b720c 100644 --- a/forge-gui/res/cardsfolder/s/snake_cult_initiation.txt +++ b/forge-gui/res/cardsfolder/s/snake_cult_initiation.txt @@ -3,6 +3,6 @@ ManaCost:3 B Types:Enchantment Aura K:Enchant creature A:SP$ Attach | Cost$ 3 B | ValidTgts$ Creature | AITgts$ Card.powerGE1 | AILogic$ Pump -S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Poisonous 3 | Description$ Enchanted creature has poisonous 3. (Whenever it deals combat damage to a player, that player gets three poison counters. A player with ten or more poison counters loses the game.) +S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Poisonous:3 | Description$ Enchanted creature has poisonous 3. (Whenever it deals combat damage to a player, that player gets three poison counters. A player with ten or more poison counters loses the game.) SVar:Picture:http://www.wizards.com/global/images/magic/general/snake_cult_initiation.jpg Oracle:Enchant creature\nEnchanted creature has poisonous 3. (Whenever it deals combat damage to a player, that player gets three poison counters. A player with ten or more poison counters loses the game.) diff --git a/forge-gui/res/cardsfolder/v/virulent_sliver.txt b/forge-gui/res/cardsfolder/v/virulent_sliver.txt index 4d6b7e72c75..80752846f7c 100644 --- a/forge-gui/res/cardsfolder/v/virulent_sliver.txt +++ b/forge-gui/res/cardsfolder/v/virulent_sliver.txt @@ -2,7 +2,7 @@ Name:Virulent Sliver ManaCost:G Types:Creature Sliver PT:1/1 -S:Mode$ Continuous | Affected$ Creature.Sliver | AddKeyword$ Poisonous 1 | Description$ All Sliver creatures have poisonous 1. (Whenever a Sliver deals combat damage to a player, that player gets a poison counter. A player with ten or more poison counters loses the game.) +S:Mode$ Continuous | Affected$ Creature.Sliver | AddKeyword$ Poisonous:1 | Description$ All Sliver creatures have poisonous 1. (Whenever a Sliver deals combat damage to a player, that player gets a poison counter. A player with ten or more poison counters loses the game.) SVar:PlayMain1:TRUE SVar:Picture:http://www.wizards.com/global/images/magic/general/virulent_sliver.jpg Oracle:All Sliver creatures have poisonous 1. (Whenever a Sliver deals combat damage to a player, that player gets a poison counter. A player with ten or more poison counters loses the game.)