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

Fix AI never casting paired commanders

Browse Source
This commit is contained in:
TRT
2023-08-14 20:37:37 +02:00
committed by Chris H
parent e9f825f3c0
commit 0f002e6526
5 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-ai/src/main/java/forge/ai/AiController.java
View File

@@ -279,6 +279,11 @@ public class AiController {
continue;
}
// can't fetch partner isn't problematic
if (tr.getKeyword() != null && tr.getKeyword().getOriginal().startsWith("Partner")) {
continue;
}
if (!ZoneType.Battlefield.toString().equals(tr.getParam("Destination"))) {
continue;
}

9
forge-ai/src/main/java/forge/ai/PlayerControllerAi.java
View File

@@ -593,15 +593,6 @@ public class PlayerControllerAi extends PlayerController {
return !ComputerUtil.wantMulligan(player, cardsToReturn);
}
@Override
public CardCollectionView getCardsToMulligan(Player firstPlayer) {
if (!ComputerUtil.wantMulligan(player, 0)) {
return null;
}
return player.getCardsIn(ZoneType.Hand);
}
@Override
public CardCollectionView londonMulliganReturnCards(final Player mulliganingPlayer, int cardsToReturn) {
// TODO This is better than it was before, but still suboptimal (but fast).

1
forge-game/src/main/java/forge/game/player/PlayerController.java
View File

@@ -191,7 +191,6 @@ public abstract class PlayerController {
public abstract Object vote(SpellAbility sa, String prompt, List<Object> options, ListMultimap<Object, Player> votes, Player forPlayer);
public abstract CardCollectionView getCardsToMulligan(Player firstPlayer);
public abstract boolean mulliganKeepHand(Player player, int cardsToReturn);
public abstract CardCollectionView londonMulliganReturnCards(Player mulliganingPlayer, int cardsToReturn);

5
forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java
View File

@@ -319,11 +319,6 @@ public class PlayerControllerForTests extends PlayerController {
return true;
}
@Override
public CardCollectionView getCardsToMulligan(Player firstPlayer) {
return null;
}
@Override
public void declareAttackers(Player attacker, Combat combat) {
//Doing nothing is safe in most cases, but not all (creatures that must attack etc). TODO: introduce checks?

8
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -1460,14 +1460,6 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
return inp.getSelectedCards();
}
@Override
public CardCollectionView getCardsToMulligan(final Player firstPlayer) {
// Partial Paris is gone, so it being commander doesn't really matter anymore...
final InputConfirmMulligan inp = new InputConfirmMulligan(this, player, firstPlayer);
inp.showAndWait();
return inp.isKeepHand() ? null : player.getCardsIn(ZoneType.Hand);
}
@Override
public void declareAttackers(final Player attackingPlayer, final Combat combat) {
if (mayAutoPass()) {