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

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

Browse source
This commit is contained in:
igoudt 2017-07-09 16:22:01 +02:00
commit d6c8356ded
9 changed files with 228 additions and 237 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.form
View file

@ -150,7 +150,7 @@
<Property name="toolTipText" type="java.lang.String" value="Write the card&apos;s name on the card to make the card name more recognizable."/> <Property name="toolTipText" type="java.lang.String" value="Write the card&apos;s name on the card to make the card name more recognizable."/>
<Property name="actionCommand" type="java.lang.String" value=""/> <Property name="actionCommand" type="java.lang.String" value=""/>
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor"> <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Default Cursor"/> <Color id="Standardcursor"/>
</Property> </Property>
</Properties> </Properties>
<Events> <Events>
@ -516,8 +516,8 @@
<Component class="javax.swing.JLabel" name="labelDialogFont"> <Component class="javax.swing.JLabel" name="labelDialogFont">
<Properties> <Properties>
<Property name="horizontalAlignment" type="int" value="0"/> <Property name="horizontalAlignment" type="int" value="0"/>
<Property name="text" type="java.lang.String" value="Messages and menues"/> <Property name="text" type="java.lang.String" value="Messages and menus"/>
<Property name="toolTipText" type="java.lang.String" value="&lt;HTML&gt;The size of the font of messages and menues"/> <Property name="toolTipText" type="java.lang.String" value="&lt;HTML&gt;The size of the font of messages and menus"/>
</Properties> </Properties>
<AccessibilityProperties> <AccessibilityProperties>
<Property name="AccessibleContext.accessibleDescription" type="java.lang.String" value="&lt;HTML&gt;The size of the font used to display messages or menus."/> <Property name="AccessibleContext.accessibleDescription" type="java.lang.String" value="&lt;HTML&gt;The size of the font used to display messages or menus."/>

6
Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
View file

@ -620,7 +620,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
.add(main_cardLayout.createSequentialGroup() .add(main_cardLayout.createSequentialGroup()
.add(6, 6, 6) .add(6, 6, 6)
.add(main_cardLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false) .add(main_cardLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
.add(tooltipDelayLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 308, Short.MAX_VALUE) .add(tooltipDelayLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 308, Short.MAX_VALUE)
.add(org.jdesktop.layout.GroupLayout.LEADING, showCardName) .add(org.jdesktop.layout.GroupLayout.LEADING, showCardName)
.add(tooltipDelay, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .add(tooltipDelay, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
@ -904,8 +904,8 @@ public class PreferencesDialog extends javax.swing.JDialog {
guiSizeBasic.add(sliderDialogFont, gridBagConstraints); guiSizeBasic.add(sliderDialogFont, gridBagConstraints);
labelDialogFont.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); labelDialogFont.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
labelDialogFont.setText("Messages and menues"); labelDialogFont.setText("Messages and menus");
labelDialogFont.setToolTipText("<HTML>The size of the font of messages and menues"); labelDialogFont.setToolTipText("<HTML>The size of the font of messages and menus");
gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1; gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 1; gridBagConstraints.gridy = 1;

11
Mage.Sets/src/mage/cards/d/DayOfJudgment.java
View file

@ -25,16 +25,14 @@
* authors and should not be interpreted as representing official policies, either expressed * authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com. * or implied, of BetaSteward_at_googlemail.com.
*/ */
package mage.cards.d; package mage.cards.d;
import java.util.UUID;
import mage.abilities.effects.common.DestroyAllEffect; import mage.abilities.effects.common.DestroyAllEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.StaticFilters;
import java.util.UUID;
/** /**
* *
@ -43,9 +41,10 @@ import java.util.UUID;
public class DayOfJudgment extends CardImpl { public class DayOfJudgment extends CardImpl {
public DayOfJudgment(UUID ownerId, CardSetInfo setInfo) { public DayOfJudgment(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{W}{W}"); super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{W}{W}");
this.getSpellAbility().addEffect(new DestroyAllEffect(new FilterCreaturePermanent())); // Destroy all creatures.
this.getSpellAbility().addEffect(new DestroyAllEffect(StaticFilters.FILTER_PERMANENT_CREATURES));
} }
public DayOfJudgment(final DayOfJudgment card) { public DayOfJudgment(final DayOfJudgment card) {

10
Mage.Sets/src/mage/cards/i/InstillEnergy.java
View file

@ -36,12 +36,10 @@ import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.effects.AsThoughEffectImpl; import mage.abilities.effects.AsThoughEffectImpl;
import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.AttachEffect;
import mage.abilities.effects.common.UntapEnchantedEffect; import mage.abilities.effects.common.UntapEnchantedEffect;
import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.EnchantAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.AsThoughEffectType; import mage.constants.AsThoughEffectType;
import mage.constants.AttachmentType;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Outcome; import mage.constants.Outcome;
@ -58,7 +56,7 @@ import mage.target.common.TargetCreaturePermanent;
public class InstillEnergy extends CardImpl { public class InstillEnergy extends CardImpl {
public InstillEnergy(UUID ownerId, CardSetInfo setInfo) { public InstillEnergy(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{G}"); super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{G}");
this.subtype.add("Aura"); this.subtype.add("Aura");
// Enchant creature // Enchant creature
@ -68,9 +66,7 @@ public class InstillEnergy extends CardImpl {
Ability ability = new EnchantAbility(auraTarget.getTargetName()); Ability ability = new EnchantAbility(auraTarget.getTargetName());
this.addAbility(ability); this.addAbility(ability);
// Enchanted creature can attack as though it had haste. // Enchanted creature can attack as though it had haste.
Ability asThough = new SimpleStaticAbility(Zone.BATTLEFIELD, new CanAttackAsThoughItHadHasteEnchantedEffect(Duration.WhileOnBattlefield)); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanAttackAsThoughItHadHasteEnchantedEffect(Duration.WhileOnBattlefield)));
Ability haste = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(asThough, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature can attack as though it had haste."));
this.addAbility(haste);
// {0}: Untap enchanted creature. Activate this ability only during your turn and only once each turn. // {0}: Untap enchanted creature. Activate this ability only during your turn and only once each turn.
this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new UntapEnchantedEffect(), new GenericManaCost(0), 1, MyTurnCondition.instance)); this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new UntapEnchantedEffect(), new GenericManaCost(0), 1, MyTurnCondition.instance));
} }
@ -88,7 +84,7 @@ public class InstillEnergy extends CardImpl {
class CanAttackAsThoughItHadHasteEnchantedEffect extends AsThoughEffectImpl { class CanAttackAsThoughItHadHasteEnchantedEffect extends AsThoughEffectImpl {
public CanAttackAsThoughItHadHasteEnchantedEffect(Duration duration) { public CanAttackAsThoughItHadHasteEnchantedEffect(Duration duration) {
super(AsThoughEffectType.ATTACK, duration, Outcome.Benefit); super(AsThoughEffectType.ATTACK_AS_HASTE, duration, Outcome.Benefit);
staticText = "Enchanted creature can attack as though it had haste"; staticText = "Enchanted creature can attack as though it had haste";
} }

10
Mage.Sets/src/mage/cards/t/TragicArrogance.java
View file

@ -56,7 +56,7 @@ import mage.target.common.TargetArtifactPermanent;
public class TragicArrogance extends CardImpl { public class TragicArrogance extends CardImpl {
public TragicArrogance(UUID ownerId, CardSetInfo setInfo) { public TragicArrogance(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{W}{W}"); super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{W}{W}");
// For each player, you choose from among the permanents that player controls an artifact, a creature, an enchantment, and a planeswalker. Then each player sacrifices all other nonland permanents he or she controls. // For each player, you choose from among the permanents that player controls an artifact, a creature, an enchantment, and a planeswalker. Then each player sacrifices all other nonland permanents he or she controls.
this.getSpellAbility().addEffect(new TragicArroganceffect()); this.getSpellAbility().addEffect(new TragicArroganceffect());
@ -112,7 +112,7 @@ class TragicArroganceffect extends OneShotEffect {
filterPlaneswalkerPermanent.add(new ControllerIdPredicate(playerId)); filterPlaneswalkerPermanent.add(new ControllerIdPredicate(playerId));
Target target4 = new TargetPermanent(1, 1, filterPlaneswalkerPermanent, true); Target target4 = new TargetPermanent(1, 1, filterPlaneswalkerPermanent, true);
if (target1.canChoose(controller.getId(), game)) { if (target1.canChoose(source.getSourceId(), controller.getId(), game)) {
controller.chooseTarget(Outcome.Benefit, target1, source, game); controller.chooseTarget(Outcome.Benefit, target1, source, game);
Permanent artifact = game.getPermanent(target1.getFirstTarget()); Permanent artifact = game.getPermanent(target1.getFirstTarget());
if (artifact != null) { if (artifact != null) {
@ -121,7 +121,7 @@ class TragicArroganceffect extends OneShotEffect {
target1.clearChosen(); target1.clearChosen();
} }
if (target2.canChoose(player.getId(), game)) { if (target2.canChoose(source.getSourceId(), controller.getId(), game)) {
controller.chooseTarget(Outcome.Benefit, target2, source, game); controller.chooseTarget(Outcome.Benefit, target2, source, game);
Permanent creature = game.getPermanent(target2.getFirstTarget()); Permanent creature = game.getPermanent(target2.getFirstTarget());
if (creature != null) { if (creature != null) {
@ -130,7 +130,7 @@ class TragicArroganceffect extends OneShotEffect {
target2.clearChosen(); target2.clearChosen();
} }
if (target3.canChoose(player.getId(), game)) { if (target3.canChoose(source.getSourceId(), controller.getId(), game)) {
controller.chooseTarget(Outcome.Benefit, target3, source, game); controller.chooseTarget(Outcome.Benefit, target3, source, game);
Permanent enchantment = game.getPermanent(target3.getFirstTarget()); Permanent enchantment = game.getPermanent(target3.getFirstTarget());
if (enchantment != null) { if (enchantment != null) {
@ -139,7 +139,7 @@ class TragicArroganceffect extends OneShotEffect {
target3.clearChosen(); target3.clearChosen();
} }
if (target4.canChoose(player.getId(), game)) { if (target4.canChoose(source.getSourceId(), controller.getId(), game)) {
controller.chooseTarget(Outcome.Benefit, target4, source, game); controller.chooseTarget(Outcome.Benefit, target4, source, game);
Permanent planeswalker = game.getPermanent(target4.getFirstTarget()); Permanent planeswalker = game.getPermanent(target4.getFirstTarget());
if (planeswalker != null) { if (planeswalker != null) {

8
Mage.Sets/src/mage/cards/u/UrilTheMiststalker.java
View file

@ -27,6 +27,7 @@
*/ */
package mage.cards.u; package mage.cards.u;
import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.dynamicvalue.common.AuraAttachedCount; import mage.abilities.dynamicvalue.common.AuraAttachedCount;
@ -39,8 +40,6 @@ import mage.constants.Duration;
import mage.constants.SuperType; import mage.constants.SuperType;
import mage.constants.Zone; import mage.constants.Zone;
import java.util.UUID;
/** /**
* *
* @author jeffwadsworth * @author jeffwadsworth
@ -48,13 +47,10 @@ import java.util.UUID;
public class UrilTheMiststalker extends CardImpl { public class UrilTheMiststalker extends CardImpl {
public UrilTheMiststalker(UUID ownerId, CardSetInfo setInfo) { public UrilTheMiststalker(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{G}{W}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}{G}{W}");
addSuperType(SuperType.LEGENDARY); addSuperType(SuperType.LEGENDARY);
this.subtype.add("Beast"); this.subtype.add("Beast");
this.power = new MageInt(5); this.power = new MageInt(5);
this.toughness = new MageInt(5); this.toughness = new MageInt(5);

5
Mage.Sets/src/mage/sets/Weatherlight.java
View file

@ -24,8 +24,7 @@
* The views and conclusions contained in the software and documentation are those of the * 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 * authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com. * or implied, of BetaSteward_at_googlemail.com.
*/ */
package mage.sets; package mage.sets;
import mage.cards.ExpansionSet; import mage.cards.ExpansionSet;
@ -108,7 +107,7 @@ public class Weatherlight extends ExpansionSet {
cards.add(new SetCardInfo("Fire Whip", 100, Rarity.COMMON, mage.cards.f.FireWhip.class)); cards.add(new SetCardInfo("Fire Whip", 100, Rarity.COMMON, mage.cards.f.FireWhip.class));
cards.add(new SetCardInfo("Fit of Rage", 102, Rarity.COMMON, mage.cards.f.FitOfRage.class)); cards.add(new SetCardInfo("Fit of Rage", 102, Rarity.COMMON, mage.cards.f.FitOfRage.class));
cards.add(new SetCardInfo("Fledgling Djinn", 11, Rarity.COMMON, mage.cards.f.FledglingDjinn.class)); cards.add(new SetCardInfo("Fledgling Djinn", 11, Rarity.COMMON, mage.cards.f.FledglingDjinn.class));
cards.add(new SetCardInfo("Flux", 27, Rarity.COMMON, mage.cards.f.Flux.class)); cards.add(new SetCardInfo("Flux", 39, Rarity.COMMON, mage.cards.f.Flux.class));
cards.add(new SetCardInfo("Fog Elemental", 40, Rarity.COMMON, mage.cards.f.FogElemental.class)); cards.add(new SetCardInfo("Fog Elemental", 40, Rarity.COMMON, mage.cards.f.FogElemental.class));
cards.add(new SetCardInfo("Foriysian Brigade", 130, Rarity.UNCOMMON, mage.cards.f.ForiysianBrigade.class)); cards.add(new SetCardInfo("Foriysian Brigade", 130, Rarity.UNCOMMON, mage.cards.f.ForiysianBrigade.class));
cards.add(new SetCardInfo("Gaea's Blessing", 71, Rarity.UNCOMMON, mage.cards.g.GaeasBlessing.class)); cards.add(new SetCardInfo("Gaea's Blessing", 71, Rarity.UNCOMMON, mage.cards.g.GaeasBlessing.class));

1
Mage/src/main/java/mage/constants/AsThoughEffectType.java
View file

@ -7,6 +7,7 @@ package mage.constants;
public enum AsThoughEffectType { public enum AsThoughEffectType {
ATTACK, ATTACK,
ATTACK_AS_HASTE,
ACTIVATE_HASTE, ACTIVATE_HASTE,
BLOCK_TAPPED, BLOCK_TAPPED,
BLOCK_SHADOW, BLOCK_SHADOW,

2
Mage/src/main/java/mage/game/permanent/PermanentImpl.java
View file

@ -1037,7 +1037,7 @@ public abstract class PermanentImpl extends CardImpl implements Permanent {
if (tapped) { if (tapped) {
return false; return false;
} }
if (hasSummoningSickness()) { if (hasSummoningSickness() && !game.getContinuousEffects().asThough(this.objectId, AsThoughEffectType.ATTACK_AS_HASTE, this.getControllerId(), game)) {
return false; return false;
} }
//20101001 - 508.1c //20101001 - 508.1c