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

Merge branch 'gauntletfix' into 'master'

Browse Source 
Fix some more NPE related to gauntlets

See merge request core-developers/forge!5583
This commit is contained in:
Michael Kamensky
2021-10-18 16:27:26 +00:00
parent 5c97a0f835 5b72d1f682
commit 33566c037c
14 changed files with 36 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-ai/src/main/java/forge/ai/ComputerUtil.java
View File

@@ -1910,11 +1910,7 @@ public class ComputerUtil {
* @return true if the creature dies according to current board position.
*/
public static boolean predictCreatureWillDieThisTurn(final Player ai, final Card creature, final SpellAbility excludeSa) {
final Game game = creature.getGame();
// a creature will die as a result of combat
boolean willDieInCombat = game.getPhaseHandler().inCombat()
&& ComputerUtilCombat.combatantWouldBeDestroyed(creature.getController(), creature, game.getCombat());
final Game game = ai.getGame();
// a creature will [hopefully] die from a spell on stack
boolean willDieFromSpell = false;
@@ -1933,6 +1929,10 @@ public class ComputerUtil {
}
willDieFromSpell = !noStackCheck && predictThreatenedObjects(creature.getController(), excludeSa).contains(creature);
// a creature will die as a result of combat
boolean willDieInCombat = !willDieFromSpell && game.getPhaseHandler().inCombat()
&& ComputerUtilCombat.combatantWouldBeDestroyed(creature.getController(), creature, game.getCombat());
return willDieInCombat || willDieFromSpell;
}

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

@@ -750,7 +750,6 @@ public class ComputerUtilCard {
for (final Entry<String, Integer> entry : map.entrySet()) {
final String type = entry.getKey();
// Log.debug(type + " - " + entry.getValue());
if (max < entry.getValue()) {
max = entry.getValue();
@@ -784,7 +783,6 @@ public class ComputerUtilCard {
// TODO JAVA 8 use getOrDefault
for (final Card c : list) {
// Changeling are all creature types, they are not interesting for
// counting creature types
if (c.hasStartOfKeyword(Keyword.CHANGELING.toString())) {

1
forge-ai/src/main/java/forge/ai/ability/GoadAi.java
View File

@@ -19,7 +19,6 @@ public class GoadAi extends SpellAbilityAi {
@Override
protected boolean checkApiLogic(final Player ai, final SpellAbility sa) {
final Card source = sa.getHostCard();
final Game game = source.getGame();

1
forge-ai/src/main/java/forge/ai/ability/MustAttackAi.java
View File

@@ -25,7 +25,6 @@ public class MustAttackAi extends SpellAbilityAi {
*/
@Override
protected boolean doTriggerAINoCost(Player aiPlayer, SpellAbility sa, boolean mandatory) {
boolean chance;
// TODO - implement AI

1
forge-ai/src/main/java/forge/ai/ability/MustBlockAi.java
View File

@@ -160,7 +160,6 @@ public class MustBlockAi extends SpellAbilityAi {
private List<Card> determineGoodBlockers(final Card attacker, final Player ai, Player defender, SpellAbility sa,
final boolean onlyLethal, final boolean testTapped) {
List<Card> list = Lists.newArrayList();
list = CardLists.filter(defender.getCardsIn(ZoneType.Battlefield), CardPredicates.Presets.CREATURES);

3
forge-ai/src/main/java/forge/ai/ability/PermanentNoncreatureAi.java
View File

@@ -42,8 +42,7 @@ public class PermanentNoncreatureAi extends PermanentAi {
CardCollection targets = CardLists.getTargetableCards(game.getCardsIn(origin), effectExile);
if (sourceName.equals("Suspension Field")
|| sourceName.equals("Detention Sphere")) {
// existing "exile until leaves" enchantments only target
// opponent's permanents
// existing "exile until leaves" enchantments only target opponent's permanents
// TODO: consider replacing the condition with host.hasSVar("OblivionRing")
targets = CardLists.filterControlledBy(targets, ai.getOpponents());
}

5
forge-ai/src/main/java/forge/ai/ability/RestartGameAi.java
View File

@@ -38,9 +38,4 @@ public class RestartGameAi extends SpellAbilityAi {
return false;
}
@Override
protected boolean doTriggerAINoCost(Player aiPlayer, SpellAbility sa, boolean mandatory) {
// This trigger AI is completely unused, but return true just in case
return true;
}
}

8
forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java
View File

@@ -197,13 +197,7 @@ public class DamageDealEffect extends DamageBaseEffect {
return;
}
CardCollection assigneeCards = new CardCollection();
// Do we have a way of doing this in a better fashion?
for (GameObject obj : tgts) {
if (obj instanceof Card) {
assigneeCards.add((Card) obj);
}
}
CardCollection assigneeCards = new CardCollection(Iterables.filter(tgts, Card.class));
Player assigningPlayer = players.get(0);
Map<Card, Integer> map = assigningPlayer.getController().assignCombatDamage(sourceLKI, assigneeCards, dmg, null, true);

6
forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletBuild.java
View File

@@ -122,8 +122,8 @@ public enum CSubmenuGauntletBuild implements ICDoc {
}
private void addDeck() {
final Deck deckToAdd = view.getLstLeft().getPlayer().getDeck();
if ( null == deckToAdd ) {
final Deck deckToAdd = view.getLstLeft().getPlayer() != null ? view.getLstLeft().getPlayer().getDeck() : null;
if (null == deckToAdd) {
return;
}
workingDecks.add(deckToAdd);
@@ -145,7 +145,7 @@ public enum CSubmenuGauntletBuild implements ICDoc {
private void deckUp() {
final int oldIndex = view.getLstRight().getSelectedIndex();
if (oldIndex == 0) { return; }
if (oldIndex <= 0) { return; }
final Deck movingDeck = workingDecks.remove(oldIndex);
workingDecks.add(oldIndex - 1, movingDeck);

2
forge-gui/res/cardsfolder/b/bounding_wolf.txt
View File

@@ -1,6 +1,6 @@
Name:Bounding Wolf
ManaCost:2 G
Types:Creature wolf
Types:Creature Wolf
PT:3/2
K:Flash
K:Reach

3
forge-gui/res/cardsfolder/m/master_of_the_wild_hunt.txt
View File

@@ -8,7 +8,8 @@ A:AB$ DealDamage | Cost$ T | SubAbility$ TapWolves | ValidTgts$ Creature | NumDm
SVar:TapWolves:DB$ TapAll | ValidCards$ Creature.Wolf+YouCtrl+untapped | RememberTapped$ True | SubAbility$ WildHuntDamage | StackDescription$ None
SVar:WildHuntDamage:DB$ RepeatEach | RepeatSubAbility$ WolfStrike | UseImprinted$ True | RepeatCards$ Card.IsRemembered | DamageMap$ True | SubAbility$ HuntedDamage | StackDescription$ None
SVar:WolfStrike:DB$ DealDamage | DamageSource$ Imprinted | NumDmg$ X | Defined$ ParentTarget | StackDescription$ None
SVar:HuntedDamage:DB$ DealDamage | DamageSource$ ParentTarget | NumDmg$ Y | DividerOnResolution$ ParentTargetedController | Defined$ Remembered | StackDescription$ None
SVar:HuntedDamage:DB$ DealDamage | DamageSource$ ParentTarget | NumDmg$ Y | DividerOnResolution$ ParentTargetedController | Defined$ Remembered | SubAbility$ DBDamageResolve | StackDescription$ None
SVar:DBDamageResolve:DB$ DamageResolve
SVar:X:Imprinted$CardPower
SVar:Y:Targeted$CardPower
SVar:Picture:http://www.wizards.com/global/images/magic/general/master_of_the_wild_hunt.jpg

4
forge-gui/src/main/java/forge/deck/DeckgenUtil.java
View File

@@ -144,7 +144,7 @@ public class DeckgenUtil {
* @return
*/
public static Deck buildCardGenDeck(PaperCard card, PaperCard secondKeycard, GameFormat format, boolean isForAI){
return buildLDACardGenDeck(card, format, isForAI);
return buildLDACardGenDeck(card, format, isForAI);
}
/**
@@ -425,6 +425,8 @@ public class DeckgenUtil {
/** @return {@link forge.deck.Deck} */
public static Deck getRandomCustomDeck() {
final IStorage<Deck> allDecks = FModel.getDecks().getConstructed();
// in case user has not created any yet
if (allDecks.size() == 0) { return null; }
final int rand = (int) (Math.floor(MyRandom.getRandom().nextDouble() * allDecks.size()));
final String name = allDecks.getItemNames().toArray(new String[0])[rand];
return allDecks.get(name);

30
forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletUtil.java
View File

@@ -37,30 +37,32 @@ public class GauntletUtil {
deck = DeckgenUtil.getRandomColorDeck(FModel.getFormats().getStandard().getFilterPrinted(),true);
break;
case STANDARD_CARDGEN_DECK:
deck = DeckgenUtil.buildLDACArchetypeDeck(FModel.getFormats().getStandard(),true);
break;
deck = DeckgenUtil.buildLDACArchetypeDeck(FModel.getFormats().getStandard(),true);
break;
case PIONEER_CARDGEN_DECK:
deck = DeckgenUtil.buildLDACArchetypeDeck(FModel.getFormats().getPioneer(),true);
break;
deck = DeckgenUtil.buildLDACArchetypeDeck(FModel.getFormats().getPioneer(),true);
break;
case HISTORIC_CARDGEN_DECK:
deck = DeckgenUtil.buildLDACArchetypeDeck(FModel.getFormats().getHistoric(),true);
break;
deck = DeckgenUtil.buildLDACArchetypeDeck(FModel.getFormats().getHistoric(),true);
break;
case MODERN_CARDGEN_DECK:
deck = DeckgenUtil.buildLDACArchetypeDeck(FModel.getFormats().getModern(),true);
break;
deck = DeckgenUtil.buildLDACArchetypeDeck(FModel.getFormats().getModern(),true);
break;
case LEGACY_CARDGEN_DECK:
deck = DeckgenUtil.buildLDACArchetypeDeck(FModel.getFormats().get("Legacy"),true);
break;
deck = DeckgenUtil.buildLDACArchetypeDeck(FModel.getFormats().get("Legacy"),true);
break;
case VINTAGE_CARDGEN_DECK:
deck = DeckgenUtil.buildLDACArchetypeDeck(FModel.getFormats().get("Vintage"),true);
break;
deck = DeckgenUtil.buildLDACArchetypeDeck(FModel.getFormats().get("Vintage"),true);
break;
case MODERN_COLOR_DECK:
deck = DeckgenUtil.getRandomColorDeck(FModel.getFormats().getModern().getFilterPrinted(),true);
break;
case CUSTOM_DECK:
deck = DeckgenUtil.getRandomCustomDeck();
eventNames.add(deck.getName());
break;
if (deck != null) { // fall back to precon if none available
eventNames.add(deck.getName());
break;
}
case PRECONSTRUCTED_DECK:
deck = DeckgenUtil.getRandomPreconDeck();
eventNames.add(deck.getName());

6
forge-gui/src/main/java/forge/gamemodes/tournament/TournamentUtil.java
View File

@@ -56,8 +56,10 @@ public class TournamentUtil {
break;
case CUSTOM_DECK:
deck = DeckgenUtil.getRandomCustomDeck();
eventNames.add(deck.getName());
break;
if (deck != null) { // fall back to precon if none available
eventNames.add(deck.getName());
break;
}
case PRECONSTRUCTED_DECK:
deck = DeckgenUtil.getRandomPreconDeck();
eventNames.add(deck.getName());