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 'assorted-fixes' into 'master'

Browse Source 
Fixed the AI activating Jace, Cunning Castaway +1 too late.

See merge request core-developers/forge!530
This commit is contained in:
Michael Kamensky
2018-05-03 15:58:53 +00:00
parent d47acc16a9 62585848bd
commit 9b2e54c001
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -149,6 +149,11 @@ public class EffectAi extends SpellAbilityAi {
randomReturn = true;
} else if (logic.equals("Always")) {
randomReturn = true;
} else if (logic.equals("Main1")) {
if (phase.getPhase().isBefore(PhaseType.MAIN1)) {
return false;
}
randomReturn = true;
} else if (logic.equals("Main2")) {
if (phase.getPhase().isBefore(PhaseType.MAIN2)) {
return false;

2
forge-gui/res/cardsfolder/j/jace_cunning_castaway.txt
View File

@@ -2,7 +2,7 @@ Name:Jace, Cunning Castaway
ManaCost:1 U U
Types:Legendary Planeswalker Jace
Loyalty:3
A:AB$ Effect | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Triggers$ TrigDrawDiscard | SVars$ DBDraw,DBDiscard | Duration$ EndOfTurn | AILogic$ Main2 | Name$ Jace, Cunning Castaway Effect | SpellDescription$ Whenever one or more creatures you control deal combat damage to a player this turn, draw a card, then discard a card.
A:AB$ Effect | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Triggers$ TrigDrawDiscard | SVars$ DBDraw,DBDiscard | Duration$ EndOfTurn | AILogic$ Main1 | Name$ Jace, Cunning Castaway Effect | SpellDescription$ Whenever one or more creatures you control deal combat damage to a player this turn, draw a card, then discard a card.
SVar:TrigDrawDiscard:Mode$ DamageDoneOnce | CombatDamage$ True | ValidSource$ Creature.YouCtrl | TriggerZones$ Command | ValidTarget$ Player | Execute$ DBDraw | TriggerDescription$ Whenever one or more creatures you control deal combat damage to a player this turn, draw a card, then discard a card.
SVar:DBDraw:DB$ Draw | NumCards$ 1 | SubAbility$ DBDiscard | SpellDescription$ Draw a card, then discard a card.
SVar:DBDiscard:DB$ Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose