Merge branch 'grip-of-chaos' into 'master'

Try to fix Grip of Chaos

See merge request core-developers/forge!1535
This commit is contained in:
swordshine
2019-08-23 02:56:00 +00:00
3 changed files with 3 additions and 0 deletions

View File

@@ -83,6 +83,7 @@ public enum TriggerType {
SetInMotion(TriggerSetInMotion.class),
Shuffled(TriggerShuffled.class),
SpellAbilityCast(TriggerSpellAbilityCast.class),
SpellAbilityCopy(TriggerSpellAbilityCopy.class),
SpellCast(TriggerSpellAbilityCast.class),
SpellCopy(TriggerSpellAbilityCopy.class),
Surveil(TriggerSurveil.class),

View File

@@ -334,6 +334,7 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
if (sp.isSpell()) {
game.getTriggerHandler().runTrigger(TriggerType.SpellCopy, runParams, false);
}
game.getTriggerHandler().runTrigger(TriggerType.SpellAbilityCopy, runParams, false);
}
// Run BecomesTarget triggers

View File

@@ -1,6 +1,7 @@
Name:Grip of Chaos
ManaCost:4 R R
Types:Enchantment
T:Mode$ SpellAbilityCopy | IsSingleTarget$ True | TriggerZones$ Battlefield | Execute$ TrigChangeTarget | TriggerDescription$ Whenever a spell or ability is put onto the stack, if it has a single target, reselect its target at random. (Select from among all legal targets.)
T:Mode$ SpellAbilityCast | IsSingleTarget$ True | TriggerZones$ Battlefield | Execute$ TrigChangeTarget | TriggerDescription$ Whenever a spell or ability is put onto the stack, if it has a single target, reselect its target at random. (Select from among all legal targets.)
SVar:TrigChangeTarget:DB$ ChangeTargets | Defined$ TriggeredSpellAbility | RandomTarget$ True
AI:RemoveDeck:Random