Revert "Merge branch 'paco-aicannotplaybyarea' into 'master'"

This reverts merge request !6085
This commit is contained in:
Tim Mocny
2022-01-27 21:48:54 +00:00
parent 9d32ec86f3
commit fbb7308747
7 changed files with 11 additions and 68 deletions

View File

@@ -2077,23 +2077,18 @@ public class AiController {
return result;
}
public Map<DeckSection, List<? extends PaperCard>> complainCardsCantPlayWell(Deck myDeck) {
Map<DeckSection, List<? extends PaperCard>> complaints = new HashMap<>();
public Collection<? extends PaperCard> complainCardsCantPlayWell(Deck myDeck) {
List<PaperCard> result = Lists.newArrayList();
// When using simulation, AI should be able to figure out most cards.
if (!useSimulation) {
for (Entry<DeckSection, CardPool> ds : myDeck) {
List<PaperCard> result = Lists.newArrayList();
for (Entry<PaperCard, Integer> cp : ds.getValue()) {
if (cp.getKey().getRules().getAiHints().getRemAIDecks()) {
if (cp.getKey().getRules().getAiHints().getRemAIDecks())
result.add(cp.getKey());
}
}
if (!result.isEmpty()) {
complaints.put(ds.getKey(), result);
}
}
}
return complaints;
return result;
}
// this is where the computer cheats

View File

@@ -28,7 +28,6 @@ import forge.card.MagicColor;
import forge.card.mana.ManaCost;
import forge.card.mana.ManaCostShard;
import forge.deck.Deck;
import forge.deck.DeckSection;
import forge.game.Game;
import forge.game.GameEntity;
import forge.game.GameObject;
@@ -1126,12 +1125,7 @@ public class PlayerControllerAi extends PlayerController {
}
@Override
public void revealAISkipCards(String message, Map<Player, Map<DeckSection, List<? extends PaperCard>>> deckCards) {
// Ai won't understand that anyway
}
@Override
public Map<DeckSection, List<? extends PaperCard>> complainCardsCantPlayWell(Deck myDeck) {
public Collection<? extends PaperCard> complainCardsCantPlayWell(Deck myDeck) {
return brains.complainCardsCantPlayWell(myDeck);
}