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

Merge branch 'smallfixes' into 'master'

Browse Source 
Small fixes sequel

See merge request core-developers/forge!4875
This commit is contained in:
Michael Kamensky
2021-06-13 10:59:19 +00:00
parent 733962a935 ff801fe747
commit 77d88b66e8
4 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,7 +100,6 @@ public class DamageDealAi extends DamageAiBase {
@Override @Override
protected boolean canPlayAI(Player ai, SpellAbility sa) { protected boolean canPlayAI(Player ai, SpellAbility sa) {
final Cost abCost = sa.getPayCosts(); final Cost abCost = sa.getPayCosts();
final Card source = sa.getHostCard(); final Card source = sa.getHostCard();
final String sourceName = ComputerUtilAbility.getAbilitySourceName(sa); final String sourceName = ComputerUtilAbility.getAbilitySourceName(sa);

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

@@ -805,9 +805,9 @@ public class AbilityUtils {
final SpellAbility root = sa.getRootAbility(); final SpellAbility root = sa.getRootAbility();
list = new CardCollection((Card) root.getReplacingObject(AbilityKey.fromString(calcX[0].substring(8)))); list = new CardCollection((Card) root.getReplacingObject(AbilityKey.fromString(calcX[0].substring(8))));
} }
// there could be null inside!
list = Iterables.filter(list, Card.class);
if (list != null) { if (list != null) {
// there could be null inside!
list = Iterables.filter(list, Card.class);
val = handlePaid(list, calcX[1], card, ability); val = handlePaid(list, calcX[1], card, ability);
} }
} }
@@ -3390,7 +3390,6 @@ public class AbilityUtils {
return doXMath(n, CardFactoryUtil.extractOperators(s), source, ctb); return doXMath(n, CardFactoryUtil.extractOperators(s), source, ctb);
} }
/** /**
* <p> * <p>
* handlePaid. * handlePaid.

3
forge-game/src/main/java/forge/game/player/PlayerProperty.java
View File

@@ -17,7 +17,6 @@ import forge.util.TextUtil;
public class PlayerProperty { public class PlayerProperty {
public static boolean playerHasProperty(Player player, String property, Player sourceController, Card source, CardTraitBase spellAbility) { public static boolean playerHasProperty(Player player, String property, Player sourceController, Card source, CardTraitBase spellAbility) {
Game game = player.getGame(); Game game = player.getGame();
if (property.equals("You")) { if (property.equals("You")) {
if (!player.equals(sourceController)) { if (!player.equals(sourceController)) {
@@ -382,7 +381,7 @@ public class PlayerProperty {
return false; return false;
} }
} else if (property.equals("castSpellThisTurn")) { } else if (property.equals("castSpellThisTurn")) {
if (player.getSpellsCastThisTurn() > 0) { if (player.getSpellsCastThisTurn() == 0) {
return false; return false;
} }
} else if (property.equals("attackedWithCreaturesThisTurn")) { } else if (property.equals("attackedWithCreaturesThisTurn")) {

4
forge-gui/res/cardsfolder/m/monoskelion.txt
View File

@@ -3,6 +3,6 @@ ManaCost:2
Types:Artifact Creature Construct Types:Artifact Creature Construct
PT:1/1 PT:1/1
K:etbCounter:P1P1:1 K:etbCounter:P1P1:1
A:AB$ DealDamage | AILogic$ Triskelion | Cost$ SubCounter<1/P1P1> | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to any target. A:AB$ DealDamage | AILogic$ Triskelion | Cost$ 1 SubCounter<1/P1P1> | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to any target.
DeckHas:Ability$Counters DeckHas:Ability$Counters
Oracle:Monoskelion enters the battlefield with a +1/+1 counter on it.\nRemove a +1/+1 counter from Monoskelion: It deals 1 damage to any target. Oracle:Monoskelion enters the battlefield with a +1/+1 counter on it.\n{1}, Remove a +1/+1 counter from Monoskelion: It deals 1 damage to any target.