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

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

Browse Source 
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
parent bc2233cf24 72f75eb797
commit ffbf21c233
3 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-game/src/main/java/forge/game/trigger/TriggerType.java
View File

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

1
forge-game/src/main/java/forge/game/zone/MagicStack.java
View File

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

1
forge-gui/res/cardsfolder/g/grip_of_chaos.txt
View File

@@ -1,6 +1,7 @@
Name:Grip of Chaos Name:Grip of Chaos
ManaCost:4 R R ManaCost:4 R R
Types:Enchantment 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.) 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 SVar:TrigChangeTarget:DB$ ChangeTargets | Defined$ TriggeredSpellAbility | RandomTarget$ True
AI:RemoveDeck:Random AI:RemoveDeck:Random