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 pull request #1258 from tool4ever/minFix

Browse Source 
Minor fixes
This commit is contained in:
tool4ever
2022-08-01 21:20:16 +02:00
committed by GitHub
parent 12cde6fd4b 5b47d7e20d
commit 78b6062a15
8 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -875,7 +875,7 @@ public class ComputerUtilCost {
}
}
val = ObjectUtils.min(val, abCost.getMaxForNonManaX(root, ai, false));
val = ObjectUtils.min(val, abCost.getMaxForNonManaX(root, ai, effect));
if (val != null && val > 0) {
// filter cost parts for preferences, don't choose X > than possible preferences

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

@@ -768,8 +768,9 @@ public class CountersPutAi extends CountersAi {
list = AbilityUtils.getDefinedCards(source, sa.getParam("Defined"), sa);
if (amountStr.equals("X")
&& root.getXManaCostPaid() != null /* SubAbility on something that already had set PayX, e.g. Endless One ETB counters */
&& sa.hasParam(amountStr) && sa.getSVar(amountStr).equals("Count$xPaid")) {
&& root.getXManaCostPaid() == null
&& source.getXManaCostPaid() == 0 /* SubAbility on something that already had set PayX, e.g. Endless One ETB counters */
&& sa.hasSVar(amountStr) && sa.getSVar(amountStr).equals("Count$xPaid")) {
// detect if there's more than one X in the cost (Hangarback Walker, Walking Ballista, etc.)
SpellAbility testSa = sa;

12
forge-ai/src/main/java/forge/ai/ability/TokenAi.java
View File

@@ -273,6 +273,12 @@ public class TokenAi extends SpellAbilityAi {
}
}
if (mandatory) {
// Necessary because the AI goes into this method twice, first to set up targets (with mandatory=true)
// and then the second time to confirm the trigger (where mandatory may be set to false).
return true;
}
Card actualToken = spawnToken(ai, sa);
String tokenPower = sa.getParamOrDefault("TokenPower", actualToken.getBasePowerString());
String tokenToughness = sa.getParamOrDefault("TokenToughness", actualToken.getBaseToughnessString());
@@ -293,12 +299,6 @@ public class TokenAi extends SpellAbilityAi {
}
}
if (mandatory) {
// Necessary because the AI goes into this method twice, first to set up targets (with mandatory=true)
// and then the second time to confirm the trigger (where mandatory may be set to false).
return true;
}
if ("OnlyOnAlliedAttack".equals(sa.getParam("AILogic"))) {
Combat combat = ai.getGame().getCombat();
return combat != null && combat.getAttackingPlayer() != null

4
forge-game/src/main/java/forge/game/ability/effects/DigEffect.java
View File

@@ -115,7 +115,7 @@ public class DigEffect extends SpellAbilityEffect {
final Game game = player.getGame();
final Player cont = host.getController();
Player chooser = player;
int numToDig = AbilityUtils.calculateAmount(host, sa.getParam("DigNum"), sa);
int digNum = AbilityUtils.calculateAmount(host, sa.getParam("DigNum"), sa);
final ZoneType srcZone = sa.hasParam("SourceZone") ? ZoneType.smartValueOf(sa.getParam("SourceZone")) : ZoneType.Library;
@@ -189,7 +189,7 @@ public class DigEffect extends SpellAbilityEffect {
final CardCollection rest = new CardCollection();
final PlayerZone sourceZone = p.getZone(srcZone);
numToDig = Math.min(numToDig, sourceZone.size());
int numToDig = Math.min(digNum, sourceZone.size());
for (int i = 0; i < numToDig; i++) {
top.add(sourceZone.get(i));
}

4
forge-game/src/main/java/forge/game/ability/effects/DigMultipleEffect.java
View File

@@ -26,7 +26,7 @@ public class DigMultipleEffect extends SpellAbilityEffect {
final Card host = sa.getHostCard();
final Player player = sa.getActivatingPlayer();
final Game game = player.getGame();
int numToDig = AbilityUtils.calculateAmount(host, sa.getParam("DigNum"), sa);
int digNum = AbilityUtils.calculateAmount(host, sa.getParam("DigNum"), sa);
final ZoneType srcZone = sa.hasParam("SourceZone") ? ZoneType.smartValueOf(sa.getParam("SourceZone")) : ZoneType.Library;
@@ -47,7 +47,7 @@ public class DigMultipleEffect extends SpellAbilityEffect {
final CardCollection rest = new CardCollection();
final PlayerZone sourceZone = chooser.getZone(srcZone);
numToDig = Math.min(numToDig, sourceZone.size());
int numToDig = Math.min(digNum, sourceZone.size());
for (int i = 0; i < numToDig; i++) {
top.add(sourceZone.get(i));
}

8
forge-game/src/main/java/forge/game/card/CardProperty.java
View File

@@ -65,10 +65,6 @@ public class CardProperty {
if (card.sharesNameWith(name)) {
return false;
}
} else if (property.startsWith("sameName")) {
if (!card.sharesNameWith(source)) {
return false;
}
} else if (property.equals("NamedCard")) {
if (!card.sharesNameWith(source.getNamedCard())) {
return false;
@@ -813,6 +809,10 @@ public class CardProperty {
return false;
} else if (property.equals("canProduceMana")) {
return !card.getManaAbilities().isEmpty();
} else if (property.startsWith("sameName")) {
if (!card.sharesNameWith(source)) {
return false;
}
} else if (property.startsWith("sharesNameWith")) {
if (property.equals("sharesNameWith")) {
if (!card.sharesNameWith(source)) {

1
forge-game/src/main/java/forge/game/card/CardUtil.java
View File

@@ -315,6 +315,7 @@ public final class CardUtil {
}
newCopy.setCastFrom(in.getCastFrom());
newCopy.setExiledBy(in.getExiledBy());
newCopy.setExiledWith(getLKICopy(in.getExiledWith(), cachedMap));
if (in.getGame().getCombat() != null && in.isPermanent()) {

2
forge-game/src/main/java/forge/game/keyword/Trample.java
View File

@@ -2,7 +2,7 @@ package forge.game.keyword;
import java.util.Collection;
public class Trample extends KeywordInstance<Trample> {
public class Trample extends KeywordInstance<Trample> {
private String type = "";
@Override