external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor - remove unused methods,

Browse Source 
quest controllers uses lobbyPlayer to detect human playing quest
one discard(int, sa) call less (inlined in AiInputCommon)
This commit is contained in:
Maxmtg
2013-03-16 22:05:59 +00:00
parent 742cec28a7
commit 7c334b51b1
3 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/forge/game/ai/AiInputCommon.java
View File

@@ -87,8 +87,12 @@ public class AiInputCommon extends Input {
final int size = player.getCardsIn(ZoneType.Hand).size(); final int size = player.getCardsIn(ZoneType.Hand).size();
if (!player.isUnlimitedHandSize()) { if (!player.isUnlimitedHandSize()) {
final int numDiscards = size - player.getMaxHandSize();
player.discard(numDiscards, null); int max = Math.min(player.getZone(ZoneType.Hand).size(), size - player.getMaxHandSize());
final List<Card> toDiscard = player.getAi().getCardsToDiscard(max, (String[])null, null);
for (int i = 0; i < toDiscard.size(); i++) {
player.discard(toDiscard.get(i), null);
}
} }
} }
break; break;

16
src/main/java/forge/game/player/Player.java
View File

@@ -1687,18 +1687,6 @@ public abstract class Player extends GameEntity implements Comparable<Player> {
return list; return list;
} }
/**
* <p>
* discardRandom.
* </p>
*
* @param sa
* a {@link forge.card.spellability.SpellAbility} object.
* @return a List<Card> of cards discarded
*/
public final List<Card> discardRandom(final SpellAbility sa) {
return this.discardRandom(1, sa);
}
/** /**
* <p> * <p>
@@ -1910,9 +1898,7 @@ public abstract class Player extends GameEntity implements Comparable<Player> {
} }
// Dev Mode // Dev Mode
if (Singletons.getModel().getPreferences().getPrefBoolean(FPref.DEV_UNLIMITED_LAND) if (Singletons.getModel().getPreferences().getPrefBoolean(FPref.DEV_UNLIMITED_LAND) && this.getType() == PlayerType.HUMAN && Preferences.DEV_MODE) {
&& this.isHuman()
&& Preferences.DEV_MODE) {
return true; return true;
} }

4
src/main/java/forge/quest/QuestController.java
View File

@@ -29,7 +29,6 @@ import forge.quest.data.GameFormatQuest;
import forge.game.GameFormat; import forge.game.GameFormat;
import forge.game.event.Event; import forge.game.event.Event;
import forge.game.event.MulliganEvent; import forge.game.event.MulliganEvent;
import forge.game.player.PlayerType;
import forge.item.CardPrinted; import forge.item.CardPrinted;
import forge.item.PreconDeck; import forge.item.PreconDeck;
import forge.properties.ForgeProps; import forge.properties.ForgeProps;
@@ -446,7 +445,8 @@ public class QuestController {
if ( ev instanceof MulliganEvent ) { if ( ev instanceof MulliganEvent ) {
MulliganEvent mev = (MulliganEvent)ev; MulliganEvent mev = (MulliganEvent)ev;
// First mulligan is free // First mulligan is free
if (mev.player.getType() == PlayerType.HUMAN && getAssets().hasItem(QuestItemType.SLEIGHT) && mev.player.getStats().getMulliganCount() == 0) { if (mev.player.getLobbyPlayer() == Singletons.getControl().getLobby().getQuestPlayer()
&& getAssets().hasItem(QuestItemType.SLEIGHT) && mev.player.getStats().getMulliganCount() == 0) {
mev.player.drawCard(); mev.player.drawCard();
} }
} }