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

Apply patch

Browse Source
This commit is contained in:
tool4EvEr
2023-11-05 11:51:45 +01:00
parent 5c68ded1fe
commit 6410d24e04
7 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2091,9 +2091,7 @@ public class AiController {
return simPicker.chooseCardToHiddenOriginChangeZone(destination, origin, sa, fetchList, player2, decider);
}
if (sa.getApi() == ApiType.Explore) {
return ExploreAi.shouldPutInGraveyard(fetchList, decider);
} else if (sa.getApi() == ApiType.Learn) {
if (sa.getApi() == ApiType.Learn) {
return LearnAi.chooseCardToLearn(fetchList, decider, sa);
} else {
return ChangeZoneAi.chooseCardToHiddenOriginChangeZone(destination, origin, sa, fetchList, player2, decider);

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

@@ -242,7 +242,7 @@ public class PlayerControllerAi extends PlayerController {
}
@Override
public boolean confirmAction(SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params, Card cardToShow) {
public boolean confirmAction(SpellAbility sa, PlayerActionConfirmMode mode, String message, Card cardToShow, Map<String, Object> params) {
return getAi().confirmAction(sa, mode, message, params);
}

21
forge-ai/src/main/java/forge/ai/ability/ExploreAi.java
View File

@@ -13,9 +13,12 @@ import forge.game.card.CardCollectionView;
import forge.game.card.CardLists;
import forge.game.card.CardPredicates;
import forge.game.player.Player;
import forge.game.player.PlayerActionConfirmMode;
import forge.game.spellability.SpellAbility;
import forge.game.zone.ZoneType;
import java.util.Map;
public class ExploreAi extends SpellAbilityAi {
/* (non-Javadoc)
* @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
@@ -36,7 +39,7 @@ public class ExploreAi extends SpellAbilityAi {
return true;
}
public static Card shouldPutInGraveyard(CardCollection top, Player ai) {
public static boolean shouldPutInGraveyard(Card topCard, Player ai) {
int predictedMana = ComputerUtilMana.getAvailableManaSources(ai, false).size();
CardCollectionView cardsOTB = ai.getCardsIn(ZoneType.Battlefield);
CardCollectionView cardsInHand = ai.getCardsIn(ZoneType.Hand);
@@ -52,20 +55,20 @@ public class ExploreAi extends SpellAbilityAi {
numLandsToStillNeedMore = aic.getIntProperty(AiProps.EXPLORE_NUM_LANDS_TO_STILL_NEED_MORE);
}
if (!top.isEmpty()) {
Card topCard = top.getFirst();
if (landsInHand.isEmpty() && landsOTB.size() <= numLandsToStillNeedMore) {
// We need more lands to improve our mana base, explore away the non-lands
return topCard;
}
if (topCard.getCMC() - maxCMCDiff >= predictedMana && !topCard.hasSVar("DoNotDiscardIfAble")) {
return true;
} else if (topCard.getCMC() - maxCMCDiff >= predictedMana && !topCard.hasSVar("DoNotDiscardIfAble")) {
// We're not casting this in foreseeable future, put it in the graveyard
return topCard;
}
return true;
}
// Put on top of the library (do not mark the card for placement in the graveyard)
return null;
return false;
}
@Override
public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
return shouldPutInGraveyard((Card)params.get("RevealedCard"), player);
}
}

4
forge-ai/src/main/java/forge/ai/simulation/SpellAbilityPicker.java
View File

@@ -435,9 +435,7 @@ public class SpellAbilityPicker {
return card;
}
}
if (sa.getApi() == ApiType.Explore) {
return ExploreAi.shouldPutInGraveyard(fetchList, decider);
} else if (sa.getApi() == ApiType.Learn) {
if (sa.getApi() == ApiType.Learn) {
return LearnAi.chooseCardToLearn(fetchList, decider, sa);
} else {
return ChangeZoneAi.chooseCardToHiddenOriginChangeZone(destination, origin, sa, fetchList, player2, decider);

5
forge-game/src/main/java/forge/game/ability/effects/ExploreEffect.java
View File

@@ -1,5 +1,6 @@
package forge.game.ability.effects;
import com.google.common.collect.Maps;
import forge.game.Game;
import forge.game.GameEntityCounterTable;
import forge.game.ability.AbilityKey;
@@ -77,9 +78,11 @@ public class ExploreEffect extends SpellAbilityEffect {
movedCard = game.getAction().moveTo(ZoneType.Hand, r, sa, moveParams);
revealedLand = true;
} else {
Map<String, Object> params = Maps.newHashMap();
params.put("RevealedCard", r);
if (pl.getController().confirmAction(sa, null,
Localizer.getInstance().getMessage("lblPutThisCardToYourGraveyard",
CardTranslation.getTranslatedName(r.getName())), null, r))
CardTranslation.getTranslatedName(r.getName())), r, params))
movedCard = game.getAction().moveTo(ZoneType.Graveyard, r, sa, moveParams);
}

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

@@ -187,7 +187,7 @@ public class PlayerControllerForTests extends PlayerController {
}
@Override
public boolean confirmAction(SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> newParam, Card cardToShow) {
public boolean confirmAction(SpellAbility sa, PlayerActionConfirmMode mode, String message, Card cardToShow, Map<String, Object> params) {
return true;
}

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

@@ -772,7 +772,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
*/
@Override
public boolean confirmAction(final SpellAbility sa, final PlayerActionConfirmMode mode, final String message,
Map<String, Object> params, Card cardToShow) {
Card cardToShow, Map<String, Object> params) {
// Another card should be displayed in the prompt on mouse over rather than the SA source
if (cardToShow != null) {
tempShowCard(cardToShow);