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

Fixed order of extra turns. Extra turns of a player were only performed before and after that players turn. That didn't handle the order of extra turns correctly.

Browse source
This commit is contained in:
LevelX2 2014-10-29 11:22:47 +01:00
parent 0942e9140c
commit 7999126f61
3 changed files with 88 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Mage.Sets/src/mage/sets/riseoftheeldrazi/LighthouseChronologist.java
View file

@ -65,9 +65,14 @@ public class LighthouseChronologist extends LevelerCard {
this.addAbility(new LevelUpAbility(new ManaCostsImpl("{U}")));
Abilities<Ability> abilities1 = new AbilitiesImpl<Ability>();
// LEVEL 4-6
// 2/4
Abilities<Ability> abilities1 = new AbilitiesImpl<>();
Abilities<Ability> abilities2 = new AbilitiesImpl<Ability>();
// LEVEL 7+
// 3/5
// At the beginning of each end step, if it's not your turn, take an extra turn after this one.
Abilities<Ability> abilities2 = new AbilitiesImpl<>();
abilities2.add(new LighthouseChronologistAbility());
LevelerCardBuilder.construct(this,

110
Mage/src/mage/game/GameImpl.java
View file

@ -28,6 +28,23 @@
package mage.game;
import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Random;
import java.util.Set;
import java.util.Stack;
import java.util.UUID;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.ActivatedAbility;
@ -42,6 +59,7 @@ import mage.abilities.effects.PreventionEffectData;
import mage.abilities.effects.common.CopyEffect;
import mage.abilities.effects.common.continious.SourceEffect;
import mage.abilities.keyword.LeylineAbility;
import mage.abilities.keyword.MorphAbility;
import mage.abilities.keyword.TransformAbility;
import mage.abilities.mana.DelayedTriggeredManaAbility;
import mage.abilities.mana.TriggeredManaAbility;
@ -52,7 +70,14 @@ import mage.cards.CardsImpl;
import mage.cards.SplitCard;
import mage.cards.decks.Deck;
import mage.choices.Choice;
import mage.constants.*;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.MultiplayerAttackOption;
import mage.constants.Outcome;
import mage.constants.PhaseStep;
import mage.constants.PlayerAction;
import mage.constants.RangeOfInfluence;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.Filter;
import mage.filter.FilterPermanent;
@ -67,8 +92,14 @@ import mage.game.combat.Combat;
import mage.game.command.CommandObject;
import mage.game.command.Commander;
import mage.game.command.Emblem;
import mage.game.events.*;
import mage.game.events.DamageEvent;
import mage.game.events.GameEvent;
import mage.game.events.Listener;
import mage.game.events.PlayerQueryEvent;
import mage.game.events.PlayerQueryEventSource;
import mage.game.events.TableEvent;
import mage.game.events.TableEvent.EventType;
import mage.game.events.TableEventSource;
import mage.game.permanent.Battlefield;
import mage.game.permanent.Permanent;
import mage.game.permanent.PermanentCard;
@ -79,6 +110,7 @@ import mage.game.stack.StackObject;
import mage.game.turn.Phase;
import mage.game.turn.Step;
import mage.game.turn.Turn;
import mage.game.turn.TurnMod;
import mage.players.Player;
import mage.players.PlayerList;
import mage.players.Players;
@ -86,15 +118,14 @@ import mage.target.Target;
import mage.target.TargetPermanent;
import mage.target.TargetPlayer;
import mage.util.functions.ApplyToPermanent;
import mage.watchers.common.*;
import mage.watchers.common.BlockedAttackerWatcher;
import mage.watchers.common.CastSpellLastTurnWatcher;
import mage.watchers.common.MorbidWatcher;
import mage.watchers.common.PlayerDamagedBySourceWatcher;
import mage.watchers.common.PlayerLostLifeWatcher;
import mage.watchers.common.SoulbondWatcher;
import org.apache.log4j.Logger;
import java.io.IOException;
import java.io.Serializable;
import java.util.*;
import java.util.Map.Entry;
import mage.abilities.keyword.MorphAbility;
public abstract class GameImpl implements Game, Serializable {
private static final transient Logger logger = Logger.getLogger(GameImpl.class);
@ -603,18 +634,18 @@ public abstract class GameImpl implements Game, Serializable {
protected void play(UUID nextPlayerId) {
if (!isPaused() && !gameOver(null)) {
PlayerList players = state.getPlayerList(nextPlayerId);
Player player = getPlayer(players.get());
Player playerByOrder = getPlayer(players.get());
while (!isPaused() && !gameOver(null)) {
playExtraTurns(player);
GameEvent event = new GameEvent(GameEvent.EventType.PLAY_TURN, null, null, player.getId());
playExtraTurns();
GameEvent event = new GameEvent(GameEvent.EventType.PLAY_TURN, null, null, playerByOrder.getId());
if (!replaceEvent(event)) {
if (!playTurn(player)) {
if (!playTurn(playerByOrder)) {
break;
}
state.setTurnNum(state.getTurnNum() + 1);
}
playExtraTurns(player);
player = players.getNext(this);
playExtraTurns();
playerByOrder = players.getNext(this);
}
}
if (gameOver(null)) {
@ -638,42 +669,39 @@ public abstract class GameImpl implements Game, Serializable {
}
}
private void playExtraTurns(Player player) {
private void playExtraTurns() {
//20091005 - 500.7
UUID extraTurnId = getNextExtraTurn(player.getId());
while (extraTurnId != null) {
GameEvent event = new GameEvent(GameEvent.EventType.PLAY_TURN, null, null, player.getId());
TurnMod extraTurn = getNextExtraTurn();
while (extraTurn != null) {
GameEvent event = new GameEvent(GameEvent.EventType.PLAY_TURN, null, null, extraTurn.getPlayerId());
if (!replaceEvent(event)) {
state.setExtraTurn(true);
state.setTurnId(extraTurnId);
informPlayers(player.getName() + " takes an extra turn");
playTurn(player);
state.setTurnNum(state.getTurnNum() + 1);
Player extraPlayer = this.getPlayer(extraTurn.getPlayerId());
if (extraPlayer != null && extraPlayer.isInGame()) {
state.setExtraTurn(true);
state.setTurnId(extraTurn.getId());
informPlayers(extraPlayer.getName() + " takes an extra turn");
playTurn(extraPlayer);
state.setTurnNum(state.getTurnNum() + 1);
}
}
extraTurnId = getNextExtraTurn(player.getId());
extraTurn = getNextExtraTurn();
}
state.setTurnId(null);
state.setExtraTurn(false);
}
private UUID getNextExtraTurn(UUID playerId) {
Player player = this.getPlayer(playerId);
if (player != null) {
boolean checkForExtraTurn = true;
while(checkForExtraTurn) {
UUID extraTurnId = getState().getTurnMods().getExtraTurn(playerId);
if (extraTurnId != null) {
GameEvent event = new GameEvent(GameEvent.EventType.EXTRA_TURN, extraTurnId, null, playerId);
if (!replaceEvent(event)) {
return extraTurnId;
}
} else {
checkForExtraTurn = false;
}
if (!player.isInGame()) {
return null;
private TurnMod getNextExtraTurn() {
boolean checkForExtraTurn = true;
while(checkForExtraTurn) {
TurnMod extraTurn = getState().getTurnMods().getNextExtraTurn();
if (extraTurn != null) {
GameEvent event = new GameEvent(GameEvent.EventType.EXTRA_TURN, extraTurn.getId(), null, extraTurn.getPlayerId());
if (!replaceEvent(event)) {
return extraTurn;
}
} else {
checkForExtraTurn = false;
}
}
return null;

12
Mage/src/mage/game/turn/TurnMods.java
View file

@ -61,6 +61,18 @@ public class TurnMods extends ArrayList<TurnMod> {
return null;
}
public TurnMod getNextExtraTurn() {
ListIterator<TurnMod> it = this.listIterator(this.size());
while (it.hasPrevious()) {
TurnMod turnMod = it.previous();
if (turnMod.isExtraTurn() == true) {
it.remove();
return turnMod;
}
}
return null;
}
public boolean skipTurn(UUID playerId) {
ListIterator<TurnMod> it = this.listIterator(this.size());
while (it.hasPrevious()) {