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

Merge branch 'fixes' into 'master'

Browse Source 
Minor fixes

See merge request core-developers/forge!4890
This commit is contained in:
Michael Kamensky
2021-06-16 15:04:03 +00:00
parent d844df988f 410ceb2bfc
commit 0b74be743a
4 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -246,7 +246,6 @@ public class ChooseCardAi extends SpellAbilityAi {
return true;
}
});
System.out.println("Tangle Wire" + options + " - " + betterList);
if (!betterList.isEmpty()) {
choice = betterList.get(0);
} else {

6
forge-ai/src/main/java/forge/ai/ability/CountersMoveAi.java
View File

@@ -29,7 +29,6 @@ import forge.util.collect.FCollection;
public class CountersMoveAi extends SpellAbilityAi {
@Override
protected boolean checkApiLogic(final Player ai, final SpellAbility sa) {
if (sa.usesTargeting()) {
sa.resetTargets();
if (!moveTgtAI(ai, sa)) {
@@ -83,8 +82,7 @@ public class CountersMoveAi extends SpellAbilityAi {
return true;
}
// something you can't block, try to reduce its
// attack
// something you can't block, try to reduce its attack
if (!ComputerUtilCard.canBeBlockedProfitably(ai, cpy)) {
return true;
}
@@ -119,7 +117,6 @@ public class CountersMoveAi extends SpellAbilityAi {
@Override
protected boolean doTriggerAINoCost(final Player ai, SpellAbility sa, boolean mandatory) {
if (sa.usesTargeting()) {
sa.resetTargets();
@@ -237,7 +234,6 @@ public class CountersMoveAi extends SpellAbilityAi {
}
private boolean moveTgtAI(final Player ai, final SpellAbility sa) {
final Card host = sa.getHostCard();
final Game game = ai.getGame();
final String type = sa.getParam("CounterType");

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

@@ -221,9 +221,9 @@ public final class CardUtil {
newCopy.getCurrentState().copyFrom(in.getState(in.getFaceupCardStateName()), true);
if (in.isFaceDown()) {
// prevent StackDescription from revealing face
newCopy.setName(in.toString());
newCopy.turnFaceDownNoUpdate();
// prevent StackDescription from revealing face
newCopy.updateStateForView();
}
if (in.isAdventureCard() && in.getFaceupCardStateName().equals(CardStateName.Original)) {

2
forge-gui/res/cardsfolder/d/dauthi_voidwalker.txt
View File

@@ -6,7 +6,7 @@ K:Shadow
R:Event$ Moved | ActiveZones$ Battlefield | Destination$ Graveyard | ValidCard$ Card.nonToken+OppOwn | ReplaceWith$ Exile | Description$ If a card would be put into an opponent's graveyard from anywhere, instead exile it with a void counter on it.
SVar:Exile:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Exile | Defined$ ReplacedCard | SubAbility$ DBPutCounter
SVar:DBPutCounter:DB$ PutCounter | Defined$ ReplacedCard | CounterType$ VOID | CounterNum$ 1
A:AB$ ChooseCard | Cost$ T Sac<1/CARDNAME> | Defined$ You | Amount$ 1 | Mandatory$ True | ChoiceTitle$ Choose an exiled card an opponent owns with a void counter on it | Choices$ Card.OppOwn+counters_GE1_VOID | ChoiceZone$ Exile | RememberChosen$ True | SubAbility$ DBEffect | SpellDescription$ Choose an exiled card an opponent owns with a void counter on it. You may play it this turn without paying its mana cost.
A:AB$ ChooseCard | Cost$ T Sac<1/CARDNAME> | Defined$ You | AILogic$ AtLeast1 | Amount$ 1 | Mandatory$ True | ChoiceTitle$ Choose an exiled card an opponent owns with a void counter on it | Choices$ Card.OppOwn+counters_GE1_VOID | ChoiceZone$ Exile | RememberChosen$ True | SubAbility$ DBEffect | SpellDescription$ Choose an exiled card an opponent owns with a void counter on it. You may play it this turn without paying its mana cost.
SVar:DBEffect:DB$ Effect | StaticAbilities$ MayPlay | RememberObjects$ Remembered | ForgetOnMoved$ Exile | SubAbility$ DBCleanup
SVar:MayPlay:Mode$ Continuous | MayPlay$ True | MayPlayWithoutManaCost$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ Until end of turn, you may play this card without paying its mana cost.
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True