External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-10 21:02:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Some changes to zone object movement and source object handling. Origin source object of ability is now hold in ability to be able to check e.g. zone change counter.

Browse source
This commit is contained in:
LevelX2 2015-02-11 17:51:41 +01:00
parent 4fe5560222
commit b73f34a52e
32 changed files with 396 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Mage/src/mage/abilities/AbilityImpl.java
View file

@ -106,6 +106,7 @@ public abstract class AbilityImpl implements Ability {
protected boolean costModificationActive = true;
protected boolean activated = false;
protected boolean worksFaceDown = false;
protected MageObject sourceObject;
public AbilityImpl(AbilityType abilityType, Zone zone) {
this.id = UUID.randomUUID();
@ -142,6 +143,7 @@ public abstract class AbilityImpl implements Ability {
this.costModificationActive = ability.costModificationActive;
this.worksFaceDown = ability.worksFaceDown;
this.abilityWord = ability.abilityWord;
this.sourceObject = ability.sourceObject;
}
@Override
@ -230,7 +232,7 @@ public abstract class AbilityImpl implements Ability {
// TODO: Because all (non targeted) choices have to be done during resolution
// this has to be removed, if all using effects are changed
MageObject sourceObject = game.getObject(sourceId);
sourceObject = game.getObject(sourceId);
if (sourceObject != null) {
sourceObject.adjustChoices(this, game);
}
@ -1024,6 +1026,19 @@ public abstract class AbilityImpl implements Ability {
this.worksFaceDown = worksFaceDown;
}
@Override
public MageObject getSourceObject(Game game) {
if (sourceObject != null) {
return sourceObject;
} else {
return game.getObject(sourceId);
}
}
@Override
public void setSourceObject(MageObject sourceObject) {
this.sourceObject = sourceObject;
}
}