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 pull request #73 from magefree/master

Browse source 
merge
This commit is contained in:
theelk801 2017-09-16 21:57:19 -04:00 committed by GitHub
commit a6b95db4fc
5 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Common/src/main/java/mage/utils/MageVersion.java
View file

@ -41,7 +41,7 @@ public class MageVersion implements Serializable, Comparable<MageVersion> {
public final static int MAGE_VERSION_MAJOR = 1;
public final static int MAGE_VERSION_MINOR = 4;
public final static int MAGE_VERSION_PATCH = 26;
public final static String MAGE_VERSION_MINOR_PATCH = "V3";
public final static String MAGE_VERSION_MINOR_PATCH = "V4";
public final static String MAGE_VERSION_INFO = "";
private final int major;

6
Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
View file

@ -1112,8 +1112,10 @@ public class HumanPlayer extends PlayerImpl {
// attack selected default defender
declareAttacker(attacker.getId(), attackedDefender, game, false);
}
// } else if (response.getInteger() != null) { // Ok or F-Key
} else if (response.getInteger() != null) { // F-Key
if (checkIfAttackersValid(game)) {
return;
}
} else if (response.getBoolean() != null) { // ok button
if (checkIfAttackersValid(game)) {
return;

18
Mage.Sets/src/mage/cards/d/DeathgorgeScavenger.java
View file

@ -34,12 +34,12 @@ import mage.abilities.common.EntersBattlefieldOrAttacksSourceTriggeredAbility;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.continuous.BoostSourceEffect;
import mage.cards.Card;
import mage.constants.SubType;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.constants.SubType;
import mage.constants.Zone;
import mage.game.Game;
import mage.players.Player;
@ -92,14 +92,16 @@ class DeathgorgeScavengerEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Card card = game.getCard(getTargetPointer().getFirst(game, source));
Player controller = game.getPlayer(source.getControllerId());
if (controller != null && card != null) {
controller.moveCardToExileWithInfo(card, null, "", source.getSourceId(), game, Zone.GRAVEYARD, true);
if (card.isCreature()) {
controller.gainLife(2, game);
} else {
new BoostSourceEffect(1, 1, Duration.EndOfTurn).apply(game, source);
if (controller != null) {
Card card = game.getCard(getTargetPointer().getFirst(game, source));
if (card != null) {
controller.moveCards(card, Zone.EXILED, source, game);
if (card.isCreature()) {
controller.gainLife(2, game);
} else {
game.addEffect(new BoostSourceEffect(1, 1, Duration.EndOfTurn), source);
}
}
return true;
}

2
Mage.Sets/src/mage/cards/m/MaraudingLooter.java
View file

@ -57,7 +57,7 @@ public class MaraudingLooter extends CardImpl {
// Raid - At the beginning of your end step, if you attacked with a creature this turn, you may draw a card. If you do, discard a card.
Ability ability = new ConditionalTriggeredAbility(
new BeginningOfEndStepTriggeredAbility(new DrawDiscardControllerEffect(1, 1), TargetController.YOU, false),
new BeginningOfEndStepTriggeredAbility(new DrawDiscardControllerEffect(1, 1, true), TargetController.YOU, false),
RaidCondition.instance,
"<i>Raid</i> &mdash; At the beginning of your end step, "
+ "if you attacked with a creature this turn, "

2
Mage/src/main/java/mage/cards/repository/CardRepository.java
View file

@ -58,7 +58,7 @@ public enum CardRepository {
// raise this if db structure was changed
private static final long CARD_DB_VERSION = 51;
// raise this if new cards were added to the server
private static final long CARD_CONTENT_VERSION = 90;
private static final long CARD_CONTENT_VERSION = 91;
private Dao<CardInfo, Object> cardDao;
private Set<String> classNames;