External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 13:02:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Some updated to Psychic Battle handling.

Browse source
This commit is contained in:
LevelX2 2018-04-30 08:06:23 +02:00
parent ec96f8a18e
commit dc91d6ff81
4 changed files with 17 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Mage/src/main/java/mage/game/stack/Spell.java
View file

@ -149,6 +149,7 @@ public class Spell extends StackObjImpl implements Card {
this.resolving = spell.resolving;
this.doneActivatingManaAbilities = spell.doneActivatingManaAbilities;
this.targetChanged = spell.targetChanged;
}
public boolean activate(Game game, boolean noMana) {

1
Mage/src/main/java/mage/game/stack/StackAbility.java
View file

@ -89,6 +89,7 @@ public class StackAbility extends StackObjImpl implements Ability {
this.name = stackAbility.name;
this.expansionSetCode = stackAbility.expansionSetCode;
this.targetAdjustment = stackAbility.targetAdjustment;
this.targetChanged = stackAbility.targetChanged;
}
@Override

20
Mage/src/main/java/mage/game/stack/StackObjImpl.java
View file

@ -5,6 +5,8 @@
*/
package mage.game.stack;
import java.util.Set;
import java.util.UUID;
import mage.MageObject;
import mage.abilities.Abilities;
import mage.abilities.AbilitiesImpl;
@ -19,16 +21,13 @@ import mage.players.Player;
import mage.target.Target;
import mage.target.TargetAmount;
import java.util.Set;
import java.util.UUID;
/**
*
* @author LevelX2
*/
public abstract class StackObjImpl implements StackObject {
private boolean targetChanged; // for Psychic Battle
protected boolean targetChanged; // for Psychic Battle
/**
* Choose new targets for a stack Object
@ -74,12 +73,11 @@ public abstract class StackObjImpl implements StackObject {
* the change is legal.
*
* Example: Arc Trail is a sorcery that reads "Arc Trail deals 2 damage to
* any target and 1 damage to another target creature or
* player." The current targets of Arc Trail are Runeclaw Bear and Llanowar
* Elves, in that order. You cast Redirect, an instant that reads "You may
* choose new targets for target spell," targeting Arc Trail. You can change
* the first target to Llanowar Elves and change the second target to
* Runeclaw Bear.
* any target and 1 damage to another target creature or player." The
* current targets of Arc Trail are Runeclaw Bear and Llanowar Elves, in
* that order. You cast Redirect, an instant that reads "You may choose new
* targets for target spell," targeting Arc Trail. You can change the first
* target to Llanowar Elves and change the second target to Runeclaw Bear.
*
* 114.7. Modal spells and abilities may have different targeting
* requirements for each mode. An effect that allows a player to change the