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

Merge pull request #56 from magefree/master

Browse source 
merge
This commit is contained in:
theelk801 2017-09-05 13:31:28 -04:00 committed by GitHub
commit 1f92fbcf3e
10 changed files with 128 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Vintage.java
View file

@ -94,7 +94,7 @@ public class Vintage extends Constructed {
restricted.add("Memory Jar");
restricted.add("Merchant Scroll");
restricted.add("Mind's Desire");
restricted.add("Monastery Mentory")
restricted.add("Monastery Mentory");
restricted.add("Mox Emerald");
restricted.add("Mox Jet");
restricted.add("Mox Pearl");
@ -105,7 +105,7 @@ public class Vintage extends Constructed {
restricted.add("Ponder");
restricted.add("Sol Ring");
restricted.add("Strip Mine");
restricted.add("Thorn of Amethyst")
restricted.add("Thorn of Amethyst");
restricted.add("Time Vault");
restricted.add("Time Walk");
restricted.add("Timetwister");

4
Mage.Server/src/main/java/mage/server/User.java
View file

@ -388,7 +388,7 @@ public class User {
} else {
// Table is missing after connection was lost during sideboard.
// Means other players were removed or conceded the game?
logger.error("sideboarding id not found : " + entry.getKey());
logger.debug(getName() + " reconnects during sideboarding but tableId not found: " + entry.getKey());
}
}
ServerMessagesUtil.instance.incReconnects();
@ -450,12 +450,14 @@ public class User {
TournamentManager.instance.quit(tournamentId, userId);
}
userTournaments.clear();
constructing.clear();
logger.trace("REMOVE " + userName + " Tables " + tables.size());
for (Entry<UUID, Table> entry : tables.entrySet()) {
logger.debug("-- leave tableId: " + entry.getValue().getId());
TableManager.instance.leaveTable(userId, entry.getValue().getId());
}
tables.clear();
sideboarding.clear();
logger.trace("REMOVE " + userName + " Game sessions: " + gameSessions.size());
for (GameSessionPlayer gameSessionPlayer : gameSessions.values()) {
logger.debug("-- kill game session of gameId: " + gameSessionPlayer.getGameId());

74
Mage.Sets/src/mage/cards/g/GoringCeratops.java Normal file
View file

@ -0,0 +1,74 @@
/*
* 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.cards.g;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.AttacksTriggeredAbility;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.continuous.GainAbilityControlledEffect;
import mage.abilities.keyword.DoubleStrikeAbility;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.filter.StaticFilters;
/**
*
* @author caldover
*/
public class GoringCeratops extends CardImpl {
public GoringCeratops(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{W}{W}");
this.subtype.add("Dinosaur");
this.power = new MageInt(3);
this.toughness = new MageInt(3);
// Double Strike
this.addAbility(DoubleStrikeAbility.getInstance());
// Whenever Goring Ceratops attacks, other creatures you control gain double strike until end of turn.
Effect effect = new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURE, true);
effect.setText("other creatures you control gain double strike");
Ability ability = new AttacksTriggeredAbility(effect, false);
this.addAbility(ability);
}
public GoringCeratops(final GoringCeratops card) {
super(card);
}
@Override
public GoringCeratops copy() {
return new GoringCeratops(this);
}
}

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

@ -54,7 +54,7 @@ import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerIdPredicate;
import mage.game.ExileZone;
import mage.game.Game;
import mage.game.events.DamageEvent;
import mage.game.events.DamagedEvent;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.players.ManaPoolItem;
@ -125,7 +125,7 @@ class GrenzoHavocRaiserTriggeredAbility extends TriggeredAbilityImpl {
Player damagedPlayer = game.getPlayer(event.getPlayerId());
Permanent permanent = game.getPermanentOrLKIBattlefield(event.getSourceId());
if (damagedPlayer != null && permanent != null
&& ((DamageEvent) event).isCombatDamage()
&& ((DamagedEvent) event).isCombatDamage()
&& getControllerId().equals(permanent.getControllerId())) {
FilterCreaturePermanent filter = new FilterCreaturePermanent("creature " + damagedPlayer.getLogName() + " controls");
filter.add(new ControllerIdPredicate(damagedPlayer.getId()));

7
Mage.Sets/src/mage/cards/v/VisionCharm.java
View file

@ -102,6 +102,8 @@ class VisionCharmEffect extends ContinuousEffectImpl {
public VisionCharmEffect(final VisionCharmEffect effect) {
super(effect);
targetLandType = effect.targetLandType;
targetBasicLandType = effect.targetBasicLandType;
}
@Override
@ -120,8 +122,13 @@ class VisionCharmEffect extends ContinuousEffectImpl {
choice = new ChoiceBasicLandType();
controller.choose(outcome, choice, game);
targetBasicLandType = choice.getChoice();
if (targetLandType == null || targetBasicLandType == null) {
this.discard();
return;
}
} else {
this.discard();
return;
}
FilterPermanent filter = new FilterLandPermanent();
filter.add(new SubtypePredicate(SubType.byDescription(targetLandType)));

1
Mage.Sets/src/mage/sets/Ixalan.java
View file

@ -58,6 +58,7 @@ public class Ixalan extends ExpansionSet {
cards.add(new SetCardInfo("Entrancing Melody", 55, Rarity.RARE, mage.cards.e.EntrancingMelody.class));
cards.add(new SetCardInfo("Gishath, Sun's Avatar", 222, Rarity.MYTHIC, mage.cards.g.GishathSunsAvatar.class));
cards.add(new SetCardInfo("Glacial Fortress", 255, Rarity.RARE, mage.cards.g.GlacialFortress.class));
cards.add(new SetCardInfo("Goring Certatops", 13, Rarity.RARE, mage.cards.g.GoringCeratops.class));
cards.add(new SetCardInfo("Headwater Sentries", 58, Rarity.COMMON, mage.cards.h.HeadwaterSentries.class));
cards.add(new SetCardInfo("Herald of Secret Streams", 59, Rarity.RARE, mage.cards.h.HeraldOfSecretStreams.class));
cards.add(new SetCardInfo("Huatli's Snubhorn", 286, Rarity.COMMON, mage.cards.h.HuatlisSnubhorn.class));

4
Mage/src/main/java/mage/abilities/effects/common/combat/AttacksIfAbleTargetEffect.java
View file

@ -74,9 +74,9 @@ public class AttacksIfAbleTargetEffect extends RequirementEffect {
return staticText;
}
if (this.duration == Duration.EndOfTurn) {
return new StringBuilder("Target ").append(mode.getTargets().get(0).getTargetName()).append(" attacks this turn if able").toString();
return "Target " + mode.getTargets().get(0).getTargetName() + " attacks this turn if able";
} else {
return new StringBuilder("Target ").append(mode.getTargets().get(0).getTargetName()).append(" attacks each turn if able").toString();
return "Target " + mode.getTargets().get(0).getTargetName() + " attacks each turn if able";
}
}

14
Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouEffect.java
View file

@ -40,15 +40,8 @@ import mage.game.permanent.Permanent;
*/
public class CantAttackYouEffect extends RestrictionEffect {
private boolean canAttackYouAnyway = false;
public CantAttackYouEffect(Duration duration) {
this(duration, false);
}
public CantAttackYouEffect(Duration duration, boolean canAttackYouAnyway) {
super(duration);
this.canAttackYouAnyway = canAttackYouAnyway;
}
public CantAttackYouEffect(final CantAttackYouEffect effect) {
@ -67,11 +60,6 @@ public class CantAttackYouEffect extends RestrictionEffect {
@Override
public boolean canAttack(Permanent attacker, UUID defenderId, Ability source, Game game) {
for (UUID player : game.getOpponents(source.getId())) {
if (attacker.canAttack(player, game)) {
return false;
}
}
return !canAttackYouAnyway;
return !defenderId.equals(source.getControllerId());
}
}

19
Mage/src/main/java/mage/abilities/effects/common/combat/GoadTargetEffect.java
View file

@ -33,6 +33,8 @@ import mage.abilities.effects.OneShotEffect;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.targetpointer.FixedTarget;
/**
@ -63,12 +65,17 @@ public class GoadTargetEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
ContinuousEffect effect = new AttacksIfAbleTargetEffect(Duration.UntilYourNextTurn);
effect.setTargetPointer(new FixedTarget(getTargetPointer().getFirst(game, source)));
game.addEffect(effect, source);
effect = new CantAttackYouEffect(Duration.UntilYourNextTurn, true);
effect.setTargetPointer(new FixedTarget(getTargetPointer().getFirst(game, source)));
game.addEffect(effect, source);
Permanent targetCreature = game.getPermanent(getTargetPointer().getFirst(game, source));
Player controller = game.getPlayer(source.getControllerId());
if (targetCreature != null && controller != null) {
ContinuousEffect effect = new AttacksIfAbleTargetEffect(Duration.UntilYourNextTurn);
effect.setTargetPointer(new FixedTarget(getTargetPointer().getFirst(game, source)));
game.addEffect(effect, source);
effect = new CantAttackYouEffect(Duration.UntilYourNextTurn);
effect.setTargetPointer(new FixedTarget(getTargetPointer().getFirst(game, source)));
game.addEffect(effect, source);
game.informPlayers(controller.getLogName() + " is goating " + targetCreature.getLogName());
}
return true;
}
}

48
Mage/src/main/java/mage/game/draft/DraftImpl.java
View file

@ -1,16 +1,16 @@
/*
* 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
@ -20,14 +20,14 @@
* 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.draft;
import java.util.*;
import mage.cards.Card;
import mage.cards.ExpansionSet;
import mage.game.draft.DraftOptions.TimingOption;
@ -36,8 +36,6 @@ import mage.game.events.TableEvent.EventType;
import mage.players.Player;
import mage.players.PlayerList;
import java.util.*;
/**
*
* @author BetaSteward_at_googlemail.com
@ -89,9 +87,9 @@ public abstract class DraftImpl implements Draft {
DraftPlayer newDraftPlayer = new DraftPlayer(newPlayer);
DraftPlayer oldDraftPlayer = players.get(oldPlayer.getId());
newDraftPlayer.setBooster(oldDraftPlayer.getBooster());
Map<UUID, DraftPlayer> newPlayers = new LinkedHashMap<>();
Map<UUID, DraftPlayer> newPlayers = new LinkedHashMap<>();
synchronized (players) {
for(Map.Entry<UUID, DraftPlayer> entry :players.entrySet()) {
for (Map.Entry<UUID, DraftPlayer> entry : players.entrySet()) {
if (entry.getKey().equals(oldPlayer.getId())) {
newPlayers.put(newPlayer.getId(), newDraftPlayer);
} else {
@ -99,7 +97,7 @@ public abstract class DraftImpl implements Draft {
}
}
players.clear();
for (Map.Entry<UUID, DraftPlayer> entry: newPlayers.entrySet()) {
for (Map.Entry<UUID, DraftPlayer> entry : newPlayers.entrySet()) {
players.put(entry.getKey(), entry.getValue());
}
}
@ -109,7 +107,7 @@ public abstract class DraftImpl implements Draft {
currentId = newPlayer.getId();
}
table.clear();
for(UUID playerId : players.keySet()) {
for (UUID playerId : players.keySet()) {
table.add(playerId);
}
@ -117,7 +115,9 @@ public abstract class DraftImpl implements Draft {
}
if (oldDraftPlayer.isPicking()) {
newDraftPlayer.setPicking();
newDraftPlayer.getPlayer().pickCard(newDraftPlayer.getBooster(), newDraftPlayer.getDeck(), this);
if (!newDraftPlayer.getBooster().isEmpty()) {
newDraftPlayer.getPlayer().pickCard(newDraftPlayer.getBooster(), newDraftPlayer.getDeck(), this);
}
}
return true;
}
@ -143,7 +143,7 @@ public abstract class DraftImpl implements Draft {
/**
* Number of boosters that each player gets in this draft
*
*
* @return
*/
@Override
@ -151,7 +151,6 @@ public abstract class DraftImpl implements Draft {
return numberBoosters;
}
@Override
public List<ExpansionSet> getSets() {
return sets;
@ -219,10 +218,9 @@ public abstract class DraftImpl implements Draft {
}
}
protected void openBooster() {
if (boosterNum < numberBoosters) {
for (DraftPlayer player: players.values()) {
for (DraftPlayer player : players.values()) {
if (draftCube != null) {
player.setBooster(draftCube.createBooster());
} else {
@ -237,25 +235,26 @@ public abstract class DraftImpl implements Draft {
protected boolean pickCards() {
cardNum++;
for (DraftPlayer player: players.values()) {
for (DraftPlayer player : players.values()) {
if (player.getBooster().isEmpty()) {
return false;
}
player.setPicking();
player.getPlayer().pickCard(player.getBooster(), player.getDeck(), this);
}
synchronized(this) {
synchronized (this) {
while (!donePicking()) {
try {
this.wait();
} catch (InterruptedException ex) { }
} catch (InterruptedException ex) {
}
}
}
return true;
}
protected boolean donePicking() {
if(isAbort()) {
if (isAbort()) {
return true;
}
return players.values()
@ -304,14 +303,14 @@ public abstract class DraftImpl implements Draft {
public boolean addPick(UUID playerId, UUID cardId, Set<UUID> hiddenCards) {
DraftPlayer player = players.get(playerId);
if (player.isPicking()) {
for (Card card: player.booster) {
for (Card card : player.booster) {
if (card.getId().equals(cardId)) {
player.addPick(card, hiddenCards);
player.booster.remove(card);
break;
}
}
synchronized(this) {
synchronized (this) {
this.notifyAll();
}
}
@ -341,7 +340,7 @@ public abstract class DraftImpl implements Draft {
@Override
public void resetBufferedCards() {
Set<ExpansionSet> setsDone = new HashSet<>();
for(ExpansionSet set: sets) {
for (ExpansionSet set : sets) {
if (!setsDone.contains(set)) {
set.removeSavedCards();
setsDone.add(set);
@ -350,5 +349,4 @@ public abstract class DraftImpl implements Draft {
}
}