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

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2017-03-11 18:19:28 +01:00
commit 105ef6e571
52 changed files with 118 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/AltMtgOnlTokensImageSource.java
View file

@ -56,7 +56,7 @@ public class AltMtgOnlTokensImageSource implements CardImageSource {
}
@Override
public Float getAverageSize() {
public float getAverageSize() {
return 26.7f;
}
@ -163,7 +163,7 @@ public class AltMtgOnlTokensImageSource implements CardImageSource {
}
@Override
public Integer getTotalImages() {
public int getTotalImages() {
if (copyUrlToImage == null) {
setupLinks();
}
@ -174,7 +174,7 @@ public class AltMtgOnlTokensImageSource implements CardImageSource {
}
@Override
public Boolean isTokenSource() {
public boolean isTokenSource() {
return true;
}

6
Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/CardImageSource.java
View file

@ -13,8 +13,8 @@ public interface CardImageSource {
String getNextHttpImageUrl();
String getFileForHttpImage(String httpImageUrl);
String getSourceName();
Float getAverageSize();
Integer getTotalImages();
Boolean isTokenSource();
float getAverageSize();
int getTotalImages();
boolean isTokenSource();
void doPause(String httpImageUrl);
}

6
Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GrabbagImageSource.java
View file

@ -55,7 +55,7 @@ public class GrabbagImageSource implements CardImageSource {
}
@Override
public Float getAverageSize() {
public float getAverageSize() {
return 26.7f;
}
@ -1670,7 +1670,7 @@ public class GrabbagImageSource implements CardImageSource {
}
@Override
public Integer getTotalImages() {
public int getTotalImages() {
if (copyUrlToImage == null) {
setupLinks();
}
@ -1681,7 +1681,7 @@ public class GrabbagImageSource implements CardImageSource {
}
@Override
public Boolean isTokenSource() {
public boolean isTokenSource() {
return false;
}

6
Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java
View file

@ -213,17 +213,17 @@ public class MagicCardsImageSource implements CardImageSource {
}
@Override
public Float getAverageSize() {
public float getAverageSize() {
return 70.0f;
}
@Override
public Integer getTotalImages() {
public int getTotalImages() {
return -1;
}
@Override
public Boolean isTokenSource() {
public boolean isTokenSource() {
return true;
}

6
Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagidexImageSource.java
View file

@ -84,17 +84,17 @@ public class MagidexImageSource implements CardImageSource {
}
@Override
public Float getAverageSize() {
public float getAverageSize() {
return 62.0f;
}
@Override
public Integer getTotalImages() {
public int getTotalImages() {
return -1;
}
@Override
public Boolean isTokenSource() {
public boolean isTokenSource() {
return false;
}

6
Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MtgImageSource.java
View file

@ -102,17 +102,17 @@ public class MtgImageSource implements CardImageSource {
}
@Override
public Float getAverageSize() {
public float getAverageSize() {
return 70.0f;
}
@Override
public Integer getTotalImages() {
public int getTotalImages() {
return -1;
}
@Override
public Boolean isTokenSource() {
public boolean isTokenSource() {
return false;
}

6
Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MtgOnlTokensImageSource.java
View file

@ -56,7 +56,7 @@ public class MtgOnlTokensImageSource implements CardImageSource {
}
@Override
public Float getAverageSize() {
public float getAverageSize() {
return 26.7f;
}
@ -366,7 +366,7 @@ public class MtgOnlTokensImageSource implements CardImageSource {
}
@Override
public Integer getTotalImages() {
public int getTotalImages() {
if (copyUrlToImage == null) {
setupLinks();
}
@ -377,7 +377,7 @@ public class MtgOnlTokensImageSource implements CardImageSource {
}
@Override
public Boolean isTokenSource() {
public boolean isTokenSource() {
return true;
}

6
Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MythicspoilerComSource.java
View file

@ -225,7 +225,7 @@ public class MythicspoilerComSource implements CardImageSource {
}
@Override
public Float getAverageSize() {
public float getAverageSize() {
return 50.0f;
}
@ -240,12 +240,12 @@ public class MythicspoilerComSource implements CardImageSource {
}
@Override
public Integer getTotalImages() {
public int getTotalImages() {
return -1;
}
@Override
public Boolean isTokenSource() {
public boolean isTokenSource() {
return false;
}

6
Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/TokensMtgImageSource.java
View file

@ -67,7 +67,7 @@ public class TokensMtgImageSource implements CardImageSource {
}
@Override
public Float getAverageSize() {
public float getAverageSize() {
return 26.7f;
}
@ -291,12 +291,12 @@ public class TokensMtgImageSource implements CardImageSource {
}
@Override
public Integer getTotalImages() {
public int getTotalImages() {
return -1;
}
@Override
public Boolean isTokenSource() {
public boolean isTokenSource() {
return true;
}

16
Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java
View file

@ -354,7 +354,7 @@ public class WizardCardsImageSource implements CardImageSource {
return doc;
}
private Map<String, String> getLandVariations(Integer multiverseId, String cardName) throws IOException, NumberFormatException {
private Map<String, String> getLandVariations(int multiverseId, String cardName) throws IOException, NumberFormatException {
String urlLandDocument = "http://gatherer.wizards.com/Pages/Card/Details.aspx?multiverseid=" + multiverseId;
Document landDoc = getDocument(urlLandDocument);
Elements variations = landDoc.select("a.variationlink");
@ -373,11 +373,11 @@ public class WizardCardsImageSource implements CardImageSource {
return links;
}
private static String generateLink(Integer landMultiverseId) {
private static String generateLink(int landMultiverseId) {
return "/Handlers/Image.ashx?multiverseid=" +landMultiverseId + "&type=card";
}
private Integer getLocalizedMultiverseId(String preferedLanguage, Integer multiverseId) throws IOException {
private int getLocalizedMultiverseId(String preferedLanguage, Integer multiverseId) throws IOException {
if (preferedLanguage.equals("en")) {
return multiverseId;
}
@ -474,18 +474,18 @@ public class WizardCardsImageSource implements CardImageSource {
}
@Override
public Float getAverageSize() {
public float getAverageSize() {
return 60.0f;
}
private final class GetImageLinkTask implements Runnable {
private final Integer multiverseId;
private final int multiverseId;
private final String cardName;
private final String preferedLanguage;
private final ConcurrentHashMap setLinks;
public GetImageLinkTask(Integer multiverseId, String cardName, String preferedLanguage, ConcurrentHashMap setLinks) {
public GetImageLinkTask(int multiverseId, String cardName, String preferedLanguage, ConcurrentHashMap setLinks) {
this.multiverseId = multiverseId;
this.cardName = cardName;
this.preferedLanguage = preferedLanguage;
@ -509,12 +509,12 @@ public class WizardCardsImageSource implements CardImageSource {
}
@Override
public Integer getTotalImages() {
public int getTotalImages() {
return -1;
}
@Override
public Boolean isTokenSource() {
public boolean isTokenSource() {
return false;
}

2
Mage.Sets/src/mage/cards/a/AkoumFirebird.java
View file

@ -88,7 +88,7 @@ class AkoumFirebirdLandfallAbility extends TriggeredAbilityImpl {
this(Zone.GRAVEYARD, effect, optional);
}
public AkoumFirebirdLandfallAbility (Zone zone, Effect effect, Boolean optional ) {
public AkoumFirebirdLandfallAbility (Zone zone, Effect effect, boolean optional ) {
super(zone, effect, optional);
}

4
Mage.Sets/src/mage/cards/a/ArtisanOfForms.java
View file

@ -78,7 +78,7 @@ public class ArtisanOfForms extends CardImpl {
class ArtisanOfFormsApplyToPermanent extends ApplyToPermanent {
@Override
public Boolean apply(Game game, MageObject mageObject) {
public boolean apply(Game game, MageObject mageObject) {
Effect effect = new CopyPermanentEffect(new ArtisanOfFormsApplyToPermanent());
effect.setText("have {this} become a copy of target creature and gain this ability");
mageObject.getAbilities().add(new HeroicAbility(effect, true));
@ -86,7 +86,7 @@ class ArtisanOfFormsApplyToPermanent extends ApplyToPermanent {
}
@Override
public Boolean apply(Game game, Permanent permanent) {
public boolean apply(Game game, Permanent permanent) {
Effect effect = new CopyPermanentEffect(new ArtisanOfFormsApplyToPermanent());
effect.setText("have {this} become a copy of target creature and gain this ability");
permanent.addAbility(new HeroicAbility(effect, true), game);

2
Mage.Sets/src/mage/cards/b/BrainPry.java
View file

@ -84,7 +84,7 @@ class BrainPryEffect extends OneShotEffect {
MageObject sourceObject = game.getObject(source.getSourceId());
String cardName = (String) game.getState().getValue(source.getSourceId().toString() + NameACardEffect.INFO_KEY);
if (targetPlayer != null && controller != null && sourceObject != null && cardName != null) {
Boolean hasDiscarded = false;
boolean hasDiscarded = false;
for (Card card : targetPlayer.getHand().getCards(game)) {
if (card.getName().equals(cardName)) {
targetPlayer.discard(card, source, game);

2
Mage.Sets/src/mage/cards/c/ConcussiveBolt.java
View file

@ -110,7 +110,7 @@ class ConcussiveBoltRestrictionEffect extends RestrictionEffect {
@Override
public boolean applies(Permanent permanent, Ability source, Game game) {
Boolean metalcraft = (Boolean) this.getValue("MetalcraftConcussiveBolt");
boolean metalcraft = (Boolean) this.getValue("MetalcraftConcussiveBolt");
if (metalcraft && permanent.getControllerId().equals(source.getFirstTarget())) {
return true;
}

2
Mage.Sets/src/mage/cards/c/CrownOfTheAges.java
View file

@ -132,7 +132,7 @@ class CrownOfTheAgesEffect extends OneShotEffect {
Permanent fromPermanent = game.getPermanent(aura.getAttachedTo());
Player controller = game.getPlayer(source.getControllerId());
if (fromPermanent != null && controller != null) {
Boolean passed = true;
boolean passed = true;
FilterCreaturePermanent filterChoice = new FilterCreaturePermanent("another creature");
filterChoice.add(Predicates.not(new PermanentIdPredicate(fromPermanent.getId())));

4
Mage.Sets/src/mage/cards/c/Cryptoplasm.java
View file

@ -102,7 +102,7 @@ class CryptoplasmEffect extends OneShotEffect {
if (creatureToCopy != null) {
ApplyToPermanent applier = new ApplyToPermanent() {
@Override
public Boolean apply(Game game, Permanent permanent) {
public boolean apply(Game game, Permanent permanent) {
Ability upkeepAbility = new BeginningOfUpkeepTriggeredAbility(new CryptoplasmEffect(), TargetController.YOU, true);
upkeepAbility.addTarget(new TargetCreaturePermanent());
permanent.addAbility(upkeepAbility, source.getSourceId(), game);
@ -110,7 +110,7 @@ class CryptoplasmEffect extends OneShotEffect {
}
@Override
public Boolean apply(Game game, MageObject mageObject) {
public boolean apply(Game game, MageObject mageObject) {
Ability upkeepAbility = new BeginningOfUpkeepTriggeredAbility(new CryptoplasmEffect(), TargetController.YOU, true);
upkeepAbility.addTarget(new TargetCreaturePermanent());
mageObject.getAbilities().add(upkeepAbility);

4
Mage.Sets/src/mage/cards/d/DacksDuplicate.java
View file

@ -75,7 +75,7 @@ public class DacksDuplicate extends CardImpl {
class DacksDuplicateApplyToPermanent extends ApplyToPermanent {
@Override
public Boolean apply(Game game, Permanent permanent) {
public boolean apply(Game game, Permanent permanent) {
/**
* 29/05/2014 The ability of Dack’s Duplicate doesn’t target the
* creature.
@ -86,7 +86,7 @@ class DacksDuplicateApplyToPermanent extends ApplyToPermanent {
}
@Override
public Boolean apply(Game game, MageObject mageObject) {
public boolean apply(Game game, MageObject mageObject) {
mageObject.getAbilities().add(new DethroneAbility());
mageObject.getAbilities().add(HasteAbility.getInstance());
return true;

4
Mage.Sets/src/mage/cards/d/DimirDoppelganger.java
View file

@ -130,7 +130,7 @@ class DimirDoppelgangerEffect extends OneShotEffect {
class DimirDoppelgangerApplier extends ApplyToPermanent {
@Override
public Boolean apply(Game game, Permanent permanent) {
public boolean apply(Game game, Permanent permanent) {
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DimirDoppelgangerEffect(), new ManaCostsImpl("{1}{U}{B}"));
ability.addTarget(new TargetCardInGraveyard(new FilterCreatureCard("creature card in a graveyard")));
permanent.getAbilities().add(ability);
@ -138,7 +138,7 @@ class DimirDoppelgangerApplier extends ApplyToPermanent {
}
@Override
public Boolean apply(Game game, MageObject mageObject) {
public boolean apply(Game game, MageObject mageObject) {
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DimirDoppelgangerEffect(), new ManaCostsImpl("{1}{U}{B}"));
ability.addTarget(new TargetCardInGraveyard(new FilterCreatureCard("creature card in a graveyard")));
mageObject.getAbilities().add(ability);

2
Mage.Sets/src/mage/cards/e/EssenceBacklash.java
View file

@ -91,7 +91,7 @@ class EssenceBacklashEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Boolean result = false;
boolean result = false;
Spell spell = game.getStack().getSpell(source.getFirstTarget());
if (spell != null) {
Player spellController = game.getPlayer(spell.getControllerId());

4
Mage.Sets/src/mage/cards/e/EvilTwin.java
View file

@ -89,7 +89,7 @@ class EvilTwinApplyToPermanent extends ApplyToPermanent {
}
@Override
public Boolean apply(Game game, Permanent permanent) {
public boolean apply(Game game, Permanent permanent) {
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{U}{B}"));
ability.addCost(new TapSourceCost());
ability.addTarget(new TargetCreaturePermanent(filter));
@ -98,7 +98,7 @@ class EvilTwinApplyToPermanent extends ApplyToPermanent {
}
@Override
public Boolean apply(Game game, MageObject mageObject) {
public boolean apply(Game game, MageObject mageObject) {
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{U}{B}"));
ability.addCost(new TapSourceCost());
ability.addTarget(new TargetCreaturePermanent(filter));

4
Mage.Sets/src/mage/cards/g/Gigantoplasm.java
View file

@ -81,7 +81,7 @@ public class Gigantoplasm extends CardImpl {
class GigantoplasmApplyToPermanent extends ApplyToPermanent {
@Override
public Boolean apply(Game game, Permanent permanent) {
public boolean apply(Game game, Permanent permanent) {
DynamicValue variableMana = new ManacostVariableValue();
Effect effect = new SetPowerToughnessSourceEffect(variableMana, Duration.WhileOnBattlefield, SubLayer.SetPT_7b);
effect.setText("This creature has base power and toughness X/X");
@ -91,7 +91,7 @@ class GigantoplasmApplyToPermanent extends ApplyToPermanent {
}
@Override
public Boolean apply(Game game, MageObject mageObject) {
public boolean apply(Game game, MageObject mageObject) {
DynamicValue variableMana = new ManacostVariableValue();
Effect effect = new SetPowerToughnessSourceEffect(variableMana, Duration.WhileOnBattlefield, SubLayer.SetPT_7b);
effect.setText("This creature has base power and toughness X/X");

2
Mage.Sets/src/mage/cards/g/GlamerSpinners.java
View file

@ -114,7 +114,7 @@ class GlamerSpinnersEffect extends OneShotEffect {
Player controller = game.getPlayer(source.getControllerId());
Permanent sourcePermanent = (Permanent) source.getSourceObject(game);
if (targetPermanent != null && controller != null && sourcePermanent != null) {
Boolean passed = true;
boolean passed = true;
FilterPermanent filterChoice = new FilterPermanent("a different permanent with the same controller as the target to attach the enchantments to");
filterChoice.add(new ControllerIdPredicate(targetPermanent.getControllerId()));
filterChoice.add(Predicates.not(new PermanentIdPredicate(targetPermanent.getId())));

4
Mage.Sets/src/mage/cards/l/LazavDimirMastermind.java
View file

@ -130,7 +130,7 @@ class LazavDimirMastermindEffect extends OneShotEffect {
class LazavDimirMastermindApplier extends ApplyToPermanent {
@Override
public Boolean apply(Game game, Permanent permanent) {
public boolean apply(Game game, Permanent permanent) {
Ability ability = new PutCardIntoGraveFromAnywhereAllTriggeredAbility(
new LazavDimirMastermindEffect(), true,
new FilterCreatureCard("a creature card"),
@ -143,7 +143,7 @@ class LazavDimirMastermindApplier extends ApplyToPermanent {
}
@Override
public Boolean apply(Game game, MageObject mageObject) {
public boolean apply(Game game, MageObject mageObject) {
Ability ability = new PutCardIntoGraveFromAnywhereAllTriggeredAbility(
new LazavDimirMastermindEffect(), true,
new FilterCreatureCard("a creature card"),

4
Mage.Sets/src/mage/cards/p/PhantasmalImage.java
View file

@ -53,7 +53,7 @@ public class PhantasmalImage extends CardImpl {
ApplyToPermanent phantasmalImageApplier = new ApplyToPermanent() {
@Override
public Boolean apply(Game game, Permanent permanent) {
public boolean apply(Game game, Permanent permanent) {
if (!permanent.getSubtype(game).contains("Illusion")) {
permanent.getSubtype(game).add("Illusion");
}
@ -64,7 +64,7 @@ public class PhantasmalImage extends CardImpl {
}
@Override
public Boolean apply(Game game, MageObject mageObject) {
public boolean apply(Game game, MageObject mageObject) {
if (!mageObject.getSubtype(game).contains("Illusion")) {
mageObject.getSubtype(game).add("Illusion");
}

4
Mage.Sets/src/mage/cards/p/PhyrexianMetamorph.java
View file

@ -69,12 +69,12 @@ public class PhyrexianMetamorph extends CardImpl {
ApplyToPermanent phyrexianMetamorphApplier = new ApplyToPermanent() {
@Override
public Boolean apply(Game game, Permanent permanent) {
public boolean apply(Game game, Permanent permanent) {
return apply(game, (MageObject) permanent);
}
@Override
public Boolean apply(Game game, MageObject mageObject) {
public boolean apply(Game game, MageObject mageObject) {
if (!mageObject.isArtifact()) {
mageObject.getCardType().add(CardType.ARTIFACT);
}

4
Mage.Sets/src/mage/cards/q/QuicksilverGargantuan.java
View file

@ -70,14 +70,14 @@ public class QuicksilverGargantuan extends CardImpl {
class QuicksilverGargantuanApplyToPermanent extends ApplyToPermanent {
@Override
public Boolean apply(Game game, Permanent permanent) {
public boolean apply(Game game, Permanent permanent) {
permanent.getPower().modifyBaseValue(7);
permanent.getToughness().modifyBaseValue(7);
return true;
}
@Override
public Boolean apply(Game game, MageObject mageObject) {
public boolean apply(Game game, MageObject mageObject) {
mageObject.getPower().modifyBaseValue(7);
mageObject.getToughness().modifyBaseValue(7);
return true;

4
Mage.Sets/src/mage/cards/s/SakashimaTheImpostor.java
View file

@ -80,7 +80,7 @@ public class SakashimaTheImpostor extends CardImpl {
class SakashimaTheImpostorApplier extends ApplyToPermanent {
@Override
public Boolean apply(Game game, Permanent permanent) {
public boolean apply(Game game, Permanent permanent) {
if (!permanent.getSupertype().contains("Legendary")) {
permanent.getSupertype().add("Legendary");
}
@ -94,7 +94,7 @@ class SakashimaTheImpostorApplier extends ApplyToPermanent {
}
@Override
public Boolean apply(Game game, MageObject mageObject) {
public boolean apply(Game game, MageObject mageObject) {
if (!mageObject.getSupertype().contains("Legendary")) {
mageObject.getSupertype().add("Legendary");
}

2
Mage.Sets/src/mage/cards/s/SimicGuildmage.java
View file

@ -206,7 +206,7 @@ class MoveAuraEffect extends OneShotEffect {
Permanent fromPermanent = game.getPermanent(aura.getAttachedTo());
Player controller = game.getPlayer(source.getControllerId());
if (fromPermanent != null && controller != null) {
Boolean passed = true;
boolean passed = true;
FilterPermanent filterChoice = new FilterPermanent("a different permanent with the same controller as the target to attach the enchantments to");
filterChoice.add(new ControllerIdPredicate(fromPermanent.getControllerId()));
filterChoice.add(Predicates.not(new PermanentIdPredicate(fromPermanent.getId())));

2
Mage.Sets/src/mage/cards/s/SwansOfBrynArgoll.java
View file

@ -95,7 +95,7 @@ class SwansOfBrynArgollEffect extends PreventionEffectImpl {
public boolean replaceEvent(GameEvent event, Ability source, Game game) {
PreventionEffectData preventionEffectData = preventDamageAction(event, source, game);
if (preventionEffectData.getPreventedDamage() > 0) {
Boolean passed = false;
boolean passed = false;
MageObject sourceOfDamage = game.getObject(event.getSourceId());
if (sourceOfDamage != null) {
Spell spell = game.getStack().getSpell(sourceOfDamage.getId());

2
Mage.Sets/src/mage/cards/t/ThoughtPrison.java
View file

@ -173,7 +173,7 @@ class ThoughtPrisonTriggeredAbility extends TriggeredAbilityImpl {
// Check if spell's color matches the imprinted card
ObjectColor spellColor = spell.getColor(game);
ObjectColor imprintedColor = imprintedCard.getColor(game);
Boolean matches = false;
boolean matches = false;
if (spellColor.shares(imprintedColor)) {
matches = true;

2
Mage.Sets/src/mage/cards/t/ThoughtweftGambit.java
View file

@ -79,7 +79,7 @@ class ThoughtweftGambitEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Boolean passed = false;
boolean passed = false;
Set<UUID> opponents = game.getOpponents(source.getControllerId());
Player controller = game.getPlayer(source.getControllerId());
if (opponents != null) {

4
Mage.Sets/src/mage/cards/v/VesuvanDoppelganger.java
View file

@ -113,7 +113,7 @@ class VesuvanDoppelgangerCopyEffect extends OneShotEffect {
if (copyFromPermanent != null) {
game.copyPermanent(copyFromPermanent, sourcePermanent.getId(), source, new ApplyToPermanent() {
@Override
public Boolean apply(Game game, Permanent permanent) {
public boolean apply(Game game, Permanent permanent) {
permanent.getColor(game).setColor(sourcePermanent.getColor(game));
permanent.getAbilities().add(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD,
new VesuvanDoppelgangerCopyEffect(), TargetController.YOU, true, false, rule2));
@ -121,7 +121,7 @@ class VesuvanDoppelgangerCopyEffect extends OneShotEffect {
}
@Override
public Boolean apply(Game game, MageObject mageObject) {
public boolean apply(Game game, MageObject mageObject) {
mageObject.getColor(game).setColor(sourcePermanent.getColor(game));
mageObject.getAbilities().add(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD,
new VesuvanDoppelgangerCopyEffect(), TargetController.YOU, true, false, rule2));

14
Mage.Sets/src/mage/cards/v/VesuvanShapeshifter.java
View file

@ -28,6 +28,7 @@
package mage.cards.v;
import java.util.UUID;
import mage.MageInt;
import mage.MageObject;
import mage.abilities.Ability;
@ -57,7 +58,6 @@ import mage.target.common.TargetCreaturePermanent;
import mage.util.functions.ApplyToPermanent;
/**
*
* @author spjspj
*/
public class VesuvanShapeshifter extends CardImpl {
@ -66,7 +66,7 @@ public class VesuvanShapeshifter extends CardImpl {
private static final String effectText = "as a copy of any creature on the battlefield until {this} is turned faced down";
public VesuvanShapeshifter(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{U}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}{U}");
this.subtype.add("Shapeshifter");
this.power = new MageInt(0);
this.toughness = new MageInt(0);
@ -80,7 +80,7 @@ public class VesuvanShapeshifter extends CardImpl {
this.addAbility(ability);
// As Vesuvan Shapeshifter etbs, may choose another creature. If you do, until Vesuvan Shapeshifter is turned face down, it becomes a copy of that creature
Effect effect = new CopyPermanentEffect(new FilterCreaturePermanent(), new vesuvanShapeShifterFaceUpApplier());
Effect effect = new CopyPermanentEffect(new FilterCreaturePermanent(), new VesuvanShapeShifterFaceUpApplier());
effect.setText(effectText);
ability = new EntersBattlefieldAbility(effect, true);
ability.setWorksFaceDown(false);
@ -102,10 +102,10 @@ public class VesuvanShapeshifter extends CardImpl {
}
}
class vesuvanShapeShifterFaceUpApplier extends ApplyToPermanent {
class VesuvanShapeShifterFaceUpApplier extends ApplyToPermanent {
@Override
public Boolean apply(Game game, Permanent permanent) {
public boolean apply(Game game, Permanent permanent) {
Effect effect = new VesuvanShapeshifterFaceDownEffect();
Ability ability = new BeginningOfUpkeepTriggeredAbility(effect, TargetController.YOU, true);
permanent.getAbilities().add(ability);
@ -114,7 +114,7 @@ class vesuvanShapeShifterFaceUpApplier extends ApplyToPermanent {
}
@Override
public Boolean apply(Game game, MageObject mageObject) {
public boolean apply(Game game, MageObject mageObject) {
Effect effect = new VesuvanShapeshifterFaceDownEffect();
Ability ability = new BeginningOfUpkeepTriggeredAbility(effect, TargetController.YOU, true);
mageObject.getAbilities().add(ability);
@ -152,7 +152,7 @@ class VesuvanShapeshifterEffect extends OneShotEffect {
if (controller.chooseTarget(Outcome.BecomeCreature, target, source, game) && !target.getTargets().isEmpty()) {
Permanent copyFromCreature = game.getPermanentOrLKIBattlefield(target.getFirstTarget());
if (copyFromCreature != null) {
game.copyPermanent(Duration.Custom, copyFromCreature, copyToCreature.getId(), source, new vesuvanShapeShifterFaceUpApplier());
game.copyPermanent(Duration.Custom, copyFromCreature, copyToCreature.getId(), source, new VesuvanShapeShifterFaceUpApplier());
source.getTargets().clear();
return true;
}

2
Mage.Sets/src/mage/cards/v/VolatileRig.java
View file

@ -89,7 +89,7 @@ public class VolatileRig extends CardImpl {
class VolatileRigTriggeredAbility extends TriggeredAbilityImpl {
private Boolean triggerdThisCombatStep = false;
private boolean triggerdThisCombatStep = false;
public VolatileRigTriggeredAbility() {
super(Zone.BATTLEFIELD, new VolatileRigEffect());

8
Mage/src/main/java/mage/abilities/DelayedTriggeredAbility.java
View file

@ -39,7 +39,7 @@ import mage.game.Game;
public abstract class DelayedTriggeredAbility extends TriggeredAbilityImpl {
private Duration duration;
private Boolean triggerOnlyOnce;
private boolean triggerOnlyOnce;
public DelayedTriggeredAbility(Effect effect) {
this(effect, Duration.EndOfGame);
@ -49,11 +49,11 @@ public abstract class DelayedTriggeredAbility extends TriggeredAbilityImpl {
this(effect, duration, true);
}
public DelayedTriggeredAbility(Effect effect, Duration duration, Boolean triggerOnlyOnce) {
public DelayedTriggeredAbility(Effect effect, Duration duration, boolean triggerOnlyOnce) {
this(effect, duration, triggerOnlyOnce, false);
}
public DelayedTriggeredAbility(Effect effect, Duration duration, Boolean triggerOnlyOnce, boolean optional) {
public DelayedTriggeredAbility(Effect effect, Duration duration, boolean triggerOnlyOnce, boolean optional) {
super(Zone.ALL, effect, optional);
this.duration = duration;
this.triggerOnlyOnce = triggerOnlyOnce;
@ -72,7 +72,7 @@ public abstract class DelayedTriggeredAbility extends TriggeredAbilityImpl {
return duration;
}
public Boolean getTriggerOnlyOnce() {
public boolean getTriggerOnlyOnce() {
return triggerOnlyOnce;
}

2
Mage/src/main/java/mage/abilities/common/BecomesTargetControllerSpellTriggeredAbility.java
View file

@ -40,7 +40,7 @@ import mage.game.stack.Spell;
*/
public class BecomesTargetControllerSpellTriggeredAbility extends TriggeredAbilityImpl {
public BecomesTargetControllerSpellTriggeredAbility(Effect effect, Boolean optional) {
public BecomesTargetControllerSpellTriggeredAbility(Effect effect, boolean optional) {
super(Zone.BATTLEFIELD, effect, optional);
}

4
Mage/src/main/java/mage/abilities/common/DiscardsACardOpponentTriggeredAbility.java
View file

@ -20,11 +20,11 @@ public class DiscardsACardOpponentTriggeredAbility extends TriggeredAbilityImpl
private SetTargetPointer setTargetPointer;
public DiscardsACardOpponentTriggeredAbility(Effect effect, Boolean isOptional) {
public DiscardsACardOpponentTriggeredAbility(Effect effect, boolean isOptional) {
this(effect, isOptional, SetTargetPointer.NONE);
}
public DiscardsACardOpponentTriggeredAbility(Effect effect, Boolean isOptional, SetTargetPointer setTargetPointer) {
public DiscardsACardOpponentTriggeredAbility(Effect effect, boolean isOptional, SetTargetPointer setTargetPointer) {
super(Zone.BATTLEFIELD, effect, isOptional);
this.setTargetPointer = setTargetPointer;
}

4
Mage/src/main/java/mage/abilities/common/LandfallAbility.java
View file

@ -50,11 +50,11 @@ public class LandfallAbility extends TriggeredAbilityImpl {
this(Zone.BATTLEFIELD, effect, optional);
}
public LandfallAbility(Zone zone, Effect effect, Boolean optional) {
public LandfallAbility(Zone zone, Effect effect, boolean optional) {
this(zone, effect, optional, SetTargetPointer.NONE);
}
public LandfallAbility(Zone zone, Effect effect, Boolean optional, SetTargetPointer setTargetPointer) {
public LandfallAbility(Zone zone, Effect effect, boolean optional, SetTargetPointer setTargetPointer) {
super(zone, effect, optional);
this.setTargetPointer = setTargetPointer;
}

2
Mage/src/main/java/mage/abilities/common/delayed/AtTheBeginOfYourNextUpkeepDelayedTriggeredAbility.java
View file

@ -20,7 +20,7 @@ public class AtTheBeginOfYourNextUpkeepDelayedTriggeredAbility extends DelayedTr
this(effect, Duration.Custom, true);
}
public AtTheBeginOfYourNextUpkeepDelayedTriggeredAbility(Effect effect, Duration duration, Boolean triggerOnlyOnce) {
public AtTheBeginOfYourNextUpkeepDelayedTriggeredAbility(Effect effect, Duration duration, boolean triggerOnlyOnce) {
super(effect, duration, triggerOnlyOnce);
}

4
Mage/src/main/java/mage/abilities/condition/common/TransformedCondition.java
View file

@ -38,7 +38,7 @@ import mage.game.permanent.Permanent;
*/
public class TransformedCondition implements Condition {
protected Boolean notCondition;
protected boolean notCondition;
public TransformedCondition() {
this(false);
@ -50,7 +50,7 @@ public class TransformedCondition implements Condition {
* @param notCondition if true the condition is true when the permanent is not transformed
* @return true if the condition is true, false if the condition is false
*/
public TransformedCondition(Boolean notCondition) {
public TransformedCondition(boolean notCondition) {
this.notCondition = notCondition;
}

15
Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java
View file

@ -231,7 +231,7 @@ public class ManaCostsImpl<T extends ManaCost> extends ArrayList<T> implements M
for (ManaCost cost : this) {
if (!cost.isPaid() && cost instanceof ColorlessManaCost) {
cost.assignPayment(game, ability, pool, costToPay);
if (pool.count() == 0) {
if (pool.isEmpty()) {
return;
}
}
@ -240,7 +240,7 @@ public class ManaCostsImpl<T extends ManaCost> extends ArrayList<T> implements M
for (ManaCost cost : this) {
if (!cost.isPaid() && cost instanceof ColoredManaCost) {
cost.assignPayment(game, ability, pool, costToPay);
if (pool.count() == 0) {
if (pool.isEmpty()) {
return;
}
}
@ -249,7 +249,7 @@ public class ManaCostsImpl<T extends ManaCost> extends ArrayList<T> implements M
for (ManaCost cost : this) {
if (!cost.isPaid() && cost instanceof HybridManaCost) {
cost.assignPayment(game, ability, pool, costToPay);
if (pool.count() == 0) {
if (pool.isEmpty()) {
return;
}
}
@ -265,7 +265,7 @@ public class ManaCostsImpl<T extends ManaCost> extends ArrayList<T> implements M
|| ((cost.containsColor(ColoredManaSymbol.G)) && pool.getGreen() > 0)
|| ((cost.containsColor(ColoredManaSymbol.U)) && pool.getBlue() > 0)) {
cost.assignPayment(game, ability, pool, costToPay);
if (pool.count() == 0) {
if (pool.isEmpty()) {
return;
}
}
@ -275,7 +275,7 @@ public class ManaCostsImpl<T extends ManaCost> extends ArrayList<T> implements M
for (ManaCost cost : this) {
if (!cost.isPaid() && cost instanceof MonoHybridManaCost) {
cost.assignPayment(game, ability, pool, costToPay);
if (pool.count() == 0) {
if (pool.isEmpty()) {
return;
}
}
@ -284,7 +284,7 @@ public class ManaCostsImpl<T extends ManaCost> extends ArrayList<T> implements M
for (ManaCost cost : this) {
if (!cost.isPaid() && cost instanceof SnowManaCost) {
cost.assignPayment(game, ability, pool, costToPay);
if (pool.count() == 0) {
if (pool.isEmpty()) {
return;
}
}
@ -293,7 +293,7 @@ public class ManaCostsImpl<T extends ManaCost> extends ArrayList<T> implements M
for (ManaCost cost : this) {
if (!cost.isPaid() && cost instanceof GenericManaCost) {
cost.assignPayment(game, ability, pool, costToPay);
if (pool.count() == 0) {
if (pool.isEmpty()) {
return;
}
}
@ -357,6 +357,7 @@ public class ManaCostsImpl<T extends ManaCost> extends ArrayList<T> implements M
}
private boolean isNumeric(String symbol) {
try {
Integer.parseInt(symbol);
return true;

12
Mage/src/main/java/mage/abilities/dynamicvalue/common/DomainValue.java
View file

@ -13,7 +13,7 @@ import mage.game.permanent.Permanent;
*/
public class DomainValue implements DynamicValue {
private Integer amount;
private int amount;
private boolean countTargetPlayer;
private UUID playerId;
@ -25,16 +25,16 @@ public class DomainValue implements DynamicValue {
this(1, countTargetPlayer);
}
public DomainValue(Integer amount) {
public DomainValue(int amount) {
this(amount, false);
}
public DomainValue(Integer amount, boolean countTargetPlayer) {
public DomainValue(int amount, boolean countTargetPlayer) {
this.amount = amount;
this.countTargetPlayer = countTargetPlayer;
}
public DomainValue(Integer amount, UUID playerId) {
public DomainValue(int amount, UUID playerId) {
this(amount, false);
this.playerId = playerId;
}
@ -89,10 +89,10 @@ public class DomainValue implements DynamicValue {
@Override
public String toString() {
return amount.toString();
return String.valueOf(amount);
}
public Integer getAmount() {
public int getAmount() {
return amount;
}

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

@ -50,7 +50,7 @@ public class CounterTargetAndSearchGraveyardHandLibraryEffect extends SearchTarg
this(false,"its controller's", "all cards with the same name as that spell" );
}
public CounterTargetAndSearchGraveyardHandLibraryEffect(Boolean graveyardExileOptional, String searchWhatText, String searchForText) {
public CounterTargetAndSearchGraveyardHandLibraryEffect(boolean graveyardExileOptional, String searchWhatText, String searchForText) {
super(graveyardExileOptional, searchWhatText, searchForText);
}

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

@ -42,7 +42,7 @@ import mage.target.TargetPermanent;
*/
public class ExileTargetAndSearchGraveyardHandLibraryEffect extends SearchTargetGraveyardHandLibraryForCardNameAndExileEffect {
public ExileTargetAndSearchGraveyardHandLibraryEffect(Boolean graveyardExileOptional, String searchWhatText, String searchForText) {
public ExileTargetAndSearchGraveyardHandLibraryEffect(boolean graveyardExileOptional, String searchWhatText, String searchForText) {
super(graveyardExileOptional, searchWhatText, searchForText);
}

4
Mage/src/main/java/mage/abilities/effects/common/search/SearchTargetGraveyardHandLibraryForCardNameAndExileEffect.java
View file

@ -57,9 +57,9 @@ public abstract class SearchTargetGraveyardHandLibraryForCardNameAndExileEffect
* Sowing Salt
* 2/1/2005: The copies must be found if they are in publicly viewable zones. Finding copies while searching private zones is optional.
*/
protected Boolean graveyardExileOptional;
protected boolean graveyardExileOptional;
public SearchTargetGraveyardHandLibraryForCardNameAndExileEffect(Boolean graveyardExileOptional, String searchWhatText, String searchForText) {
public SearchTargetGraveyardHandLibraryForCardNameAndExileEffect(boolean graveyardExileOptional, String searchWhatText, String searchForText) {
super(Outcome.Exile);
this.searchWhatText = searchWhatText;
this.searchForText = searchForText;

2
Mage/src/main/java/mage/cards/decks/importer/DekDeckImporter.java
View file

@ -20,7 +20,7 @@ public class DekDeckImporter extends DeckImporter {
// e.g. <Cards CatID="61202" Quantity="1" Sideboard="false" Name="Vildin-Pack Outcast" />
Integer cardCount = Integer.parseInt(extractAttribute(line, "Quantity"));
String cardName = extractAttribute(line, "Name");
Boolean isSideboard = "true".equals(extractAttribute(line, "Sideboard"));
boolean isSideboard = "true".equals(extractAttribute(line, "Sideboard"));
CardInfo cardInfo = CardRepository.instance.findPreferedCoreExpansionCard(cardName, true);
if (cardInfo == null) {
sbMessage.append("Could not find card: '").append(cardName).append("' at line ").append(lineCount).append('\n');

4
Mage/src/main/java/mage/util/functions/AbilityApplier.java
View file

@ -45,13 +45,13 @@ public class AbilityApplier extends ApplyToPermanent {
}
@Override
public Boolean apply(Game game, Permanent permanent) {
public boolean apply(Game game, Permanent permanent) {
permanent.addAbility(ability, game);
return true;
}
@Override
public Boolean apply(Game game, MageObject mageObject) {
public boolean apply(Game game, MageObject mageObject) {
mageObject.getAbilities().add(ability);
return true;
}

4
Mage/src/main/java/mage/util/functions/AddSubtypeApplier.java
View file

@ -22,7 +22,7 @@ public class AddSubtypeApplier extends ApplyToPermanent {
}
@Override
public Boolean apply(Game game, Permanent permanent) {
public boolean apply(Game game, Permanent permanent) {
if (!permanent.getSubtype(game).contains(subtype)) {
permanent.getSubtype(game).add(subtype);
}
@ -30,7 +30,7 @@ public class AddSubtypeApplier extends ApplyToPermanent {
}
@Override
public Boolean apply(Game game, MageObject mageObject) {
public boolean apply(Game game, MageObject mageObject) {
if (!mageObject.getSubtype(game).contains(subtype)) {
mageObject.getSubtype(game).add(subtype);
}

2
Mage/src/main/java/mage/util/functions/ApplyToMageObject.java
View file

@ -36,5 +36,5 @@ import mage.game.Game;
*/
public abstract class ApplyToMageObject {
public abstract Boolean apply(Game game, MageObject mageObject);
public abstract boolean apply(Game game, MageObject mageObject);
}

2
Mage/src/main/java/mage/util/functions/ApplyToPermanent.java
View file

@ -9,5 +9,5 @@ import mage.game.permanent.Permanent;
*/
public abstract class ApplyToPermanent extends ApplyToMageObject implements Serializable {
public abstract Boolean apply(Game game, Permanent permanent);
public abstract boolean apply(Game game, Permanent permanent);
}

4
Mage/src/main/java/mage/util/functions/CardTypeApplier.java
View file

@ -45,7 +45,7 @@ public class CardTypeApplier extends ApplyToPermanent {
}
@Override
public Boolean apply(Game game, Permanent permanent) {
public boolean apply(Game game, Permanent permanent) {
if (!permanent.getCardType().contains(cardType)) {
permanent.getCardType().add(cardType);
}
@ -53,7 +53,7 @@ public class CardTypeApplier extends ApplyToPermanent {
}
@Override
public Boolean apply(Game game, MageObject mageObject) {
public boolean apply(Game game, MageObject mageObject) {
if (!mageObject.getCardType().contains(cardType)) {
mageObject.getCardType().add(cardType);
}

4
Mage/src/main/java/mage/util/functions/EmptyApplyToPermanent.java
View file

@ -10,13 +10,13 @@ import mage.game.permanent.Permanent;
public class EmptyApplyToPermanent extends ApplyToPermanent {
@Override
public Boolean apply(Game game, Permanent permanent) {
public boolean apply(Game game, Permanent permanent) {
// do nothing
return true;
}
@Override
public Boolean apply(Game game, MageObject mageObject) {
public boolean apply(Game game, MageObject mageObject) {
return true;
}