From de3d60e9c5cb832e1069ea540b22255ff1824d02 Mon Sep 17 00:00:00 2001 From: Agetian Date: Tue, 4 Dec 2018 10:27:11 +0300 Subject: [PATCH] - Allow AI priority modification (may be useful for more cards, will update later). --- forge-ai/src/main/java/forge/ai/AiController.java | 3 +++ forge-gui/res/cardsfolder/a/angelic_chorus.txt | 2 ++ forge-gui/res/cardsfolder/p/pandemonium.txt | 2 ++ 3 files changed, 7 insertions(+) diff --git a/forge-ai/src/main/java/forge/ai/AiController.java b/forge-ai/src/main/java/forge/ai/AiController.java index 0228faf5a05..8ac9e40d793 100644 --- a/forge-ai/src/main/java/forge/ai/AiController.java +++ b/forge-ai/src/main/java/forge/ai/AiController.java @@ -881,6 +881,9 @@ public class AiController { if (source.isCreature()) { p += 1; } + if (source.hasSVar("AIPriorityModifier")) { + p += Integer.parseInt(source.getSVar("AIPriorityModifier")); + } // don't play equipments before having any creatures if (source.isEquipment() && noCreatures) { p -= 9; diff --git a/forge-gui/res/cardsfolder/a/angelic_chorus.txt b/forge-gui/res/cardsfolder/a/angelic_chorus.txt index d2cb5ebe1ba..ddf32254ee5 100644 --- a/forge-gui/res/cardsfolder/a/angelic_chorus.txt +++ b/forge-gui/res/cardsfolder/a/angelic_chorus.txt @@ -4,5 +4,7 @@ Types:Enchantment T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever a creature enters the battlefield under your control, you gain life equal to its toughness. SVar:TrigGainLife:DB$GainLife | Defined$ You | LifeAmount$ X | References$ X SVar:X:TriggeredCard$CardToughness +SVar:PlayMain1:TRUE +SVar:AIPriorityModifier:9 SVar:Picture:http://www.wizards.com/global/images/magic/general/angelic_chorus.jpg Oracle:Whenever a creature enters the battlefield under your control, you gain life equal to its toughness. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/p/pandemonium.txt b/forge-gui/res/cardsfolder/p/pandemonium.txt index 4c23ada2711..c653308b53f 100644 --- a/forge-gui/res/cardsfolder/p/pandemonium.txt +++ b/forge-gui/res/cardsfolder/p/pandemonium.txt @@ -4,6 +4,8 @@ Types:Enchantment T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature | TriggerZones$ Battlefield | Execute$ TrigDamage | OptionalDecider$ TriggeredCardController | TriggerDescription$ Whenever a creature enters the battlefield, that creature's controller may have it deal damage equal to its power to any target of their choice. SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ X | References$ X | DamageSource$ TriggeredCard | TargetingPlayer$ TriggeredCardController SVar:X:TriggeredCard$CardPower +SVar:PlayMain1:TRUE +SVar:AIPriorityModifier:9 AI:RemoveDeck:Random SVar:Picture:http://www.wizards.com/global/images/magic/general/pandemonium.jpg Oracle:Whenever a creature enters the battlefield, that creature's controller may have it deal damage equal to its power to any target of their choice.