github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 11:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2014-05-07 18:14:02 +02:00
commit b6e085f834
6 changed files with 128 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
Mage.Sets/src/mage/sets/knightsvsdragons/HengeGuardian.java Normal file
View file

@ -0,0 +1,52 @@
/*
* 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.sets.knightsvsdragons;
import java.util.UUID;
/**
*
* @author Loki
*/
public class HengeGuardian extends mage.sets.mercadianmasques.HengeGuardian {
public HengeGuardian(UUID ownerId) {
super(ownerId);
this.cardNumber = 55;
this.expansionSetCode = "DDG";
}
public HengeGuardian(final HengeGuardian card) {
super(card);
}
@Override
public HengeGuardian copy() {
return new HengeGuardian(this);
}
}

69
Mage.Sets/src/mage/sets/mercadianmasques/HengeGuardian.java Normal file
View file

@ -0,0 +1,69 @@
/*
* 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.sets.mercadianmasques;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.common.continious.GainAbilitySourceEffect;
import mage.abilities.keyword.TrampleAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
import mage.constants.Zone;
/**
*
* @author Loki
*/
public class HengeGuardian extends CardImpl<HengeGuardian> {
public HengeGuardian(UUID ownerId) {
super(ownerId, 297, "Henge Guardian", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{5}");
this.expansionSetCode = "MMQ";
this.subtype.add("Dragon");
this.subtype.add("Wurm");
this.power = new MageInt(3);
this.toughness = new MageInt(4);
// {2}: Henge Guardian gains trample until end of turn.
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{2}")));
}
public HengeGuardian(final HengeGuardian card) {
super(card);
}
@Override
public HengeGuardian copy() {
return new HengeGuardian(this);
}
}

2
Mage.Sets/src/mage/sets/visions/VampiricTutor.java
View file

@ -48,7 +48,7 @@ public class VampiricTutor extends CardImpl<VampiricTutor> {
this.color.setBlack(true);
// Search your library for a card, then shuffle your library and put that card on top of it. You lose 2 life.
this.getSpellAbility().addEffect(new SearchLibraryPutOnLibraryEffect(new TargetCardInLibrary()));
this.getSpellAbility().addEffect(new SearchLibraryPutOnLibraryEffect(new TargetCardInLibrary(), false, true));
this.getSpellAbility().addEffect(new LoseLifeSourceControllerEffect(2));
}

2
Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/UndyingTest.java
View file

@ -69,7 +69,7 @@ public class UndyingTest extends CardTestPlayerBase {
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Last Gasp", "Elite Vanguard");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Undying Evil", "Elite Vanguard");
setStopAt(1, PhaseStep.BEGIN_COMBAT);
setStopAt(1, PhaseStep.END_COMBAT);
execute();
assertPermanentCount(playerA, "Elite Vanguard", 1);

7
Mage/src/mage/abilities/TriggeredAbilities.java
View file

@ -49,7 +49,7 @@ import mage.game.permanent.PermanentCard;
*/
public class TriggeredAbilities extends HashMap<String, TriggeredAbility> {
private Map<String, List<UUID>> sources = new HashMap<String, List<UUID>>();
private final Map<String, List<UUID>> sources = new HashMap<>();
public TriggeredAbilities() {}
@ -122,7 +122,7 @@ public class TriggeredAbilities extends HashMap<String, TriggeredAbility> {
*/
public void add(TriggeredAbility ability, UUID sourceId, MageObject attachedTo) {
this.add(ability, attachedTo);
List<UUID> uuidList = new LinkedList<UUID>();
List<UUID> uuidList = new LinkedList<>();
uuidList.add(sourceId);
// if the object that gained the ability moves zone, also then the triggered ability must be removed
uuidList.add(attachedTo.getId());
@ -145,9 +145,10 @@ public class TriggeredAbilities extends HashMap<String, TriggeredAbility> {
* Removes gained abilities by sourceId
*
* @param sourceId
* @return
*/
public List<String> removeGainedAbilitiesForSource(UUID sourceId) {
List<String> keysToRemove = new ArrayList<String>();
List<String> keysToRemove = new ArrayList<>();
for (Map.Entry<String, List<UUID>> entry : sources.entrySet()) {
if (entry.getValue().contains(sourceId)) {

1
Mage/src/mage/game/permanent/PermanentCard.java
View file

@ -163,6 +163,7 @@ public class PermanentCard extends PermanentImpl<PermanentCard> {
game.setZone(objectId, event.getToZone());
game.addSimultaneousEvent(event);
if (event.getFromZone().equals(Zone.BATTLEFIELD)) {
game.getState().handleSimultaneousEvent(game);
game.resetForSourceId(getId());
game.applyEffects(); // LevelX2: needed to execute isInactive for of custom duration copy effect if source returns directly (e.g. cloudshifted clone)
}