mirror of
https://github.com/correl/mage.git
synced 2024-12-26 19:16:54 +00:00
begin fix for multiple copies of Krark's Thumb
This commit is contained in:
parent
c34f611279
commit
74c1cbf6d9
4 changed files with 68 additions and 29 deletions
|
@ -2418,6 +2418,16 @@ public class TestPlayer implements Player {
|
||||||
computerPlayer.setLoyaltyUsePerTurn(loyaltyUsePerTurn);
|
computerPlayer.setLoyaltyUsePerTurn(loyaltyUsePerTurn);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getExtraCoinFlips() {
|
||||||
|
return computerPlayer.getExtraCoinFlips();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setExtraCoinFlips(int extraCoinFlips) {
|
||||||
|
computerPlayer.setExtraCoinFlips(extraCoinFlips);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getMaxHandSize() {
|
public int getMaxHandSize() {
|
||||||
return computerPlayer.getMaxHandSize();
|
return computerPlayer.getMaxHandSize();
|
||||||
|
|
|
@ -262,6 +262,16 @@ public class PlayerStub implements Player {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getExtraCoinFlips() {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setExtraCoinFlips(int extraCoinFlips) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getMaxHandSize() {
|
public int getMaxHandSize() {
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -141,6 +141,10 @@ public interface Player extends MageItem, Copyable<Player> {
|
||||||
|
|
||||||
void setLoyaltyUsePerTurn(int loyaltyUsePerTurn);
|
void setLoyaltyUsePerTurn(int loyaltyUsePerTurn);
|
||||||
|
|
||||||
|
int getExtraCoinFlips();
|
||||||
|
|
||||||
|
void setExtraCoinFlips(int getExtraCoinFlips);
|
||||||
|
|
||||||
int getMaxHandSize();
|
int getMaxHandSize();
|
||||||
|
|
||||||
void setMaxHandSize(int maxHandSize);
|
void setMaxHandSize(int maxHandSize);
|
||||||
|
@ -355,6 +359,7 @@ public interface Player extends MageItem, Copyable<Player> {
|
||||||
/**
|
/**
|
||||||
* Reveals all players' libraries. Useful for abilities like Jace, Architect of Thought's -8
|
* Reveals all players' libraries. Useful for abilities like Jace, Architect of Thought's -8
|
||||||
* that have effects that require information from all libraries.
|
* that have effects that require information from all libraries.
|
||||||
|
*
|
||||||
* @param source
|
* @param source
|
||||||
* @param game
|
* @param game
|
||||||
* @return
|
* @return
|
||||||
|
|
|
@ -98,6 +98,7 @@ public abstract class PlayerImpl implements Player, Serializable {
|
||||||
protected int landsPlayed;
|
protected int landsPlayed;
|
||||||
protected int landsPerTurn = 1;
|
protected int landsPerTurn = 1;
|
||||||
protected int loyaltyUsePerTurn = 1;
|
protected int loyaltyUsePerTurn = 1;
|
||||||
|
protected int extraCoinFlips = 1;
|
||||||
protected int maxHandSize = 7;
|
protected int maxHandSize = 7;
|
||||||
protected int maxAttackedBy = Integer.MAX_VALUE;
|
protected int maxAttackedBy = Integer.MAX_VALUE;
|
||||||
protected ManaPool manaPool;
|
protected ManaPool manaPool;
|
||||||
|
@ -223,6 +224,7 @@ public abstract class PlayerImpl implements Player, Serializable {
|
||||||
this.landsPlayed = player.landsPlayed;
|
this.landsPlayed = player.landsPlayed;
|
||||||
this.landsPerTurn = player.landsPerTurn;
|
this.landsPerTurn = player.landsPerTurn;
|
||||||
this.loyaltyUsePerTurn = player.loyaltyUsePerTurn;
|
this.loyaltyUsePerTurn = player.loyaltyUsePerTurn;
|
||||||
|
this.extraCoinFlips = player.extraCoinFlips;
|
||||||
this.maxHandSize = player.maxHandSize;
|
this.maxHandSize = player.maxHandSize;
|
||||||
this.maxAttackedBy = player.maxAttackedBy;
|
this.maxAttackedBy = player.maxAttackedBy;
|
||||||
this.manaPool = player.manaPool.copy();
|
this.manaPool = player.manaPool.copy();
|
||||||
|
@ -313,6 +315,7 @@ public abstract class PlayerImpl implements Player, Serializable {
|
||||||
this.landsPlayed = player.getLandsPlayed();
|
this.landsPlayed = player.getLandsPlayed();
|
||||||
this.landsPerTurn = player.getLandsPerTurn();
|
this.landsPerTurn = player.getLandsPerTurn();
|
||||||
this.loyaltyUsePerTurn = player.getLoyaltyUsePerTurn();
|
this.loyaltyUsePerTurn = player.getLoyaltyUsePerTurn();
|
||||||
|
this.extraCoinFlips = player.getExtraCoinFlips();
|
||||||
this.maxHandSize = player.getMaxHandSize();
|
this.maxHandSize = player.getMaxHandSize();
|
||||||
this.maxAttackedBy = player.getMaxAttackedBy();
|
this.maxAttackedBy = player.getMaxAttackedBy();
|
||||||
this.manaPool = player.getManaPool().copy();
|
this.manaPool = player.getManaPool().copy();
|
||||||
|
@ -433,6 +436,7 @@ public abstract class PlayerImpl implements Player, Serializable {
|
||||||
this.abilities.clear();
|
this.abilities.clear();
|
||||||
this.landsPerTurn = 1;
|
this.landsPerTurn = 1;
|
||||||
this.loyaltyUsePerTurn = 1;
|
this.loyaltyUsePerTurn = 1;
|
||||||
|
this.extraCoinFlips = 1;
|
||||||
this.maxHandSize = 7;
|
this.maxHandSize = 7;
|
||||||
this.maxAttackedBy = Integer.MAX_VALUE;
|
this.maxAttackedBy = Integer.MAX_VALUE;
|
||||||
this.canGainLife = true;
|
this.canGainLife = true;
|
||||||
|
@ -2079,6 +2083,16 @@ public abstract class PlayerImpl implements Player, Serializable {
|
||||||
this.loyaltyUsePerTurn = loyaltyUsePerTurn;
|
this.loyaltyUsePerTurn = loyaltyUsePerTurn;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getExtraCoinFlips() {
|
||||||
|
return extraCoinFlips;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setExtraCoinFlips(int extraCoinFlips) {
|
||||||
|
this.extraCoinFlips = extraCoinFlips;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getMaxHandSize() {
|
public int getMaxHandSize() {
|
||||||
return maxHandSize;
|
return maxHandSize;
|
||||||
|
|
Loading…
Reference in a new issue