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

Fix Second Guess (#1246)

Browse Source 
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
This commit is contained in:
tool4ever
2022-07-30 13:01:46 +02:00
committed by GitHub
parent 63914dbe35
commit 569e948068
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -229,7 +229,7 @@ public class ComputerUtil {
// Then base on Targeting Restriction
final String[] validTgts = tgt.getValidTgts();
if ((validTgts.length != 1) || !validTgts[0].equals("Card")) {
if (validTgts.length != 1 || !validTgts[0].equals("Card")) {
restrict += 10;
}

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

@@ -474,11 +474,10 @@ public final class AbilityFactory {
final TargetRestrictions tgt = sa.getTargetRestrictions();
// Don't set the zone if it targets a player
if ((tgt != null) && !tgt.canTgtPlayer()) {
sa.getTargetRestrictions().setZone(origin);
if (tgt != null && !tgt.canTgtPlayer()) {
tgt.setZone(origin);
}
}
}
public static final SpellAbility buildFusedAbility(final Card card) {

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

@@ -943,7 +943,8 @@ public class CardProperty {
final List<Card> cards = CardUtil.getThisTurnCast("Card", source, spellAbility);
if (cards.size() < 2) {
return false;
} else if (cards.get(1) != card) {
}
if (!cards.get(1).equalsWithTimestamp(card)) {
return false;
}
} else if (property.equals("ThisTurnCast")) {

2
forge-gui/res/cardsfolder/e/errant_street_artist.txt
View File

@@ -5,6 +5,6 @@ PT:0/3
K:Flash
K:Defender
K:Haste
A:AB$ CopySpellAbility | Cost$ 1 U T | ValidTgts$ Spell.YouCtrl+wasNotCast | TargetType$ Spell | MayChooseTarget$ True | AILogic$ OnceIfViable | SpellDescription$ Copy target spell you control that wasn't cast. You may choose new targets for the copy.
A:AB$ CopySpellAbility | Cost$ 1 U T | ValidTgts$ Card.YouCtrl+wasNotCast | TargetType$ Spell | MayChooseTarget$ True | AILogic$ OnceIfViable | SpellDescription$ Copy target spell you control that wasn't cast. You may choose new targets for the copy.
AI:RemoveDeck:Random
Oracle:Flash\nDefender, haste\n{1}{U}, {T}: Copy target spell you control that wasn't cast. You may choose new targets for the copy.

2
forge-gui/res/cardsfolder/s/second_guess.txt
View File

@@ -1,5 +1,5 @@
Name:Second Guess
ManaCost:1 U
Types:Instant
A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | TgtPrompt$ Select second spell cast this turn. | ValidTgts$ Spell.SecondSpellCastThisTurn | SpellDescription$ Counter target spell that's the second spell cast this turn.
A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | TgtPrompt$ Select second spell cast this turn. | ValidTgts$ Card.SecondSpellCastThisTurn | SpellDescription$ Counter target spell that's the second spell cast this turn.
Oracle:Counter target spell that's the second spell cast this turn.