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

Merge https://github.com/magefree/mage

Browse source
This commit is contained in:
igoudt 2017-09-02 13:03:46 +02:00
commit e2ad4a6654
40 changed files with 1283 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/main/java/mage/MageObjectReference.java
View file

@ -81,9 +81,9 @@ public class MageObjectReference implements Comparable<MageObjectReference>, Ser
if (game.getPlayerList().contains(sourceId)) {
this.zoneChangeCounter = 0;
} else {
logger.error("The provided sourceId is not connected to an object in the game id:" + sourceId);
logger.error("The provided sourceId is not connected to an object in the game id: " + sourceId);
for (StackObject stackObject : game.getStack()) {
logger.error("StackObject: " + stackObject.getId() + " sourceId" + stackObject.getSourceId() + " name" + stackObject.getName());
logger.error("StackObject: " + stackObject.getId() + " sourceId " + stackObject.getSourceId() + " name " + stackObject.getName());
}
mageObject = game.getLastKnownInformation(sourceId, Zone.STACK);
if (mageObject != null) {

5
Mage/src/main/java/mage/abilities/costs/common/ExileSourceCost.java
View file

@ -47,7 +47,7 @@ public class ExileSourceCost extends CostImpl {
private boolean toUniqueExileZone;
public ExileSourceCost() {
this.text = "Exile {this}";
this.text = "exile {this}";
}
/**
@ -57,7 +57,7 @@ public class ExileSourceCost extends CostImpl {
* Deadeye Navigator) can identify the card
*/
public ExileSourceCost(boolean toUniqueExileZone) {
this.text = "Exile {this}";
this.text = "exile {this}";
this.toUniqueExileZone = toUniqueExileZone;
}
@ -76,6 +76,7 @@ public class ExileSourceCost extends CostImpl {
if (toUniqueExileZone) {
exileZoneId = CardUtil.getExileZoneId(game, ability.getSourceId(), ability.getSourceObjectZoneChangeCounter());
exileZoneName = sourceObject.getName();
game.getState().setValue(sourceObject.getId().toString(), ability.getSourceObjectZoneChangeCounter());
}
controller.moveCardToExileWithInfo((Card) sourceObject, exileZoneId, exileZoneName, sourceId, game, game.getState().getZone(sourceObject.getId()), true);
// 117.11. The actions performed when paying a cost may be modified by effects.

2
Mage/src/main/java/mage/abilities/effects/PutTokenOntoBattlefieldCopySourceEffect.java
View file

@ -21,7 +21,7 @@ public class PutTokenOntoBattlefieldCopySourceEffect extends OneShotEffect {
public PutTokenOntoBattlefieldCopySourceEffect(int copies) {
super(Outcome.PutCreatureInPlay);
this.number = copies;
staticText = "put a token onto the battlefield that's a copy of {this}";
staticText = "create a token that's a copy of {this}";
}
public PutTokenOntoBattlefieldCopySourceEffect(final PutTokenOntoBattlefieldCopySourceEffect effect) {

8
Mage/src/main/java/mage/abilities/effects/common/ChooseCreatureTypeEffect.java
View file

@ -27,6 +27,8 @@
*/
package mage.abilities.effects.common;
import java.util.LinkedHashSet;
import java.util.stream.Collectors;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
@ -39,9 +41,6 @@ import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.util.CardUtil;
import java.util.LinkedHashSet;
import java.util.stream.Collectors;
/**
* @author LevelX2
*/
@ -72,6 +71,9 @@ public class ChooseCreatureTypeEffect extends OneShotEffect {
return false;
}
}
if (typeChoice.getChoice() == null) {
return false;
}
if (!game.isSimulation()) {
game.informPlayers(mageObject.getName() + ": " + controller.getLogName() + " has chosen " + typeChoice.getChoice());
}

10
Mage/src/main/java/mage/abilities/effects/common/PutTokenOntoBattlefieldCopyTargetEffect.java
View file

@ -41,6 +41,7 @@ import mage.abilities.keyword.HasteAbility;
import mage.cards.Card;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.SuperType;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.game.permanent.token.EmptyToken;
@ -71,6 +72,7 @@ public class PutTokenOntoBattlefieldCopyTargetEffect extends OneShotEffect {
private boolean becomesArtifact;
private ObjectColor color;
private boolean useLKI = false;
private boolean isntLegendary = false;
public PutTokenOntoBattlefieldCopyTargetEffect(boolean useLKI) {
this();
@ -156,12 +158,17 @@ public class PutTokenOntoBattlefieldCopyTargetEffect extends OneShotEffect {
this.becomesArtifact = effect.becomesArtifact;
this.color = effect.color;
this.useLKI = effect.useLKI;
this.isntLegendary = effect.isntLegendary;
}
public void setBecomesArtifact(boolean becomesArtifact) {
this.becomesArtifact = becomesArtifact;
}
public void setIsntLegendary(boolean isntLegendary) {
this.isntLegendary = isntLegendary;
}
@Override
public boolean apply(Game game, Ability source) {
UUID targetId;
@ -211,6 +218,9 @@ public class PutTokenOntoBattlefieldCopyTargetEffect extends OneShotEffect {
if (becomesArtifact) {
token.addCardType(CardType.ARTIFACT);
}
if (isntLegendary) {
token.getSuperType().remove(SuperType.LEGENDARY);
}
if (additionalCardType != null && !token.getCardType().contains(additionalCardType)) {
token.addCardType(additionalCardType);
}

1
Mage/src/main/java/mage/game/permanent/token/IllusionToken.java
View file

@ -25,7 +25,6 @@
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.game.permanent.token;
import mage.constants.CardType;
import mage.MageInt;

95
Mage/src/main/java/mage/game/permanent/token/JaceCunningCastawayIllusionToken.java Normal file
View file

@ -0,0 +1,95 @@
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com AS IS AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.game.permanent.token;
import mage.constants.CardType;
import mage.MageInt;
import mage.MageObject;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.common.SacrificeSourceEffect;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.stack.Spell;
import mage.target.targetpointer.FixedTarget;
/**
*
* @author TheElk801
*/
public class JaceCunningCastawayIllusionToken extends Token {
public JaceCunningCastawayIllusionToken() {
super("Illusion", "2/2 blue Illusion creature token with \"When this creature becomes the target of a spell, sacrifice it.\"");
cardType.add(CardType.CREATURE);
color.setBlue(true);
subtype.add("Illusion");
power = new MageInt(2);
toughness = new MageInt(2);
this.addAbility(new IllusionTokenTriggeredAbility());
}
}
class IllusionTokenTriggeredAbility extends TriggeredAbilityImpl {
public IllusionTokenTriggeredAbility() {
super(Zone.BATTLEFIELD, new SacrificeSourceEffect(), false);
}
public IllusionTokenTriggeredAbility(final IllusionTokenTriggeredAbility ability) {
super(ability);
}
@Override
public IllusionTokenTriggeredAbility copy() {
return new IllusionTokenTriggeredAbility(this);
}
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.TARGETED;
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
MageObject eventSourceObject = game.getObject(event.getSourceId());
if (eventSourceObject != null && event.getTargetId().equals(this.getSourceId()) && eventSourceObject instanceof Spell) {
getEffects().get(0).setTargetPointer(new FixedTarget(event.getPlayerId()));
return true;
}
return false;
}
@Override
public String getRule() {
return "When this creature becomes the target of a spell, sacrifice it.";
}
}

5
Mage/src/main/java/mage/players/PlayerImpl.java
View file

@ -2959,7 +2959,7 @@ public abstract class PlayerImpl implements Player, Serializable {
}
public UserData getControllingPlayersUserData(Game game) {
if (isGameUnderControl()) {
if (!isGameUnderControl()) {
Player player = game.getPlayer(getTurnControlledBy());
if (player.isHuman()) {
return player.getUserData();
@ -2969,8 +2969,7 @@ public abstract class PlayerImpl implements Player, Serializable {
}
@Override
public void setUserData(UserData userData
) {
public void setUserData(UserData userData) {
this.userData = userData;
getManaPool().setAutoPayment(userData.isManaPoolAutomatic());
getManaPool().setAutoPaymentRestricted(userData.isManaPoolAutomaticRestricted());