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

Browse Source 
Fix AI logic for Hunt the Weak and Savage Stomp

See merge request core-developers/forge!1838
This commit is contained in:
Michael Kamensky
2019-06-12 05:00:34 +00:00
parent e09cb43ef8 b23fc791a2
commit 982c138ca6
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-ai/src/main/java/forge/ai/ability/FightAi.java
View File

@@ -108,6 +108,10 @@ public class FightAi extends SpellAbilityAi {
@Override @Override
public boolean chkAIDrawback(final SpellAbility sa, final Player aiPlayer) { public boolean chkAIDrawback(final SpellAbility sa, final Player aiPlayer) {
if ("NoRecheck".equals(sa.getParam("AILogic"))) {
return true; // e.g. Hunt the Weak, the AI logic was already checked through canFightAi
}
return checkApiLogic(aiPlayer, sa); return checkApiLogic(aiPlayer, sa);
} }

2
forge-gui/res/cardsfolder/h/hunt_the_weak.txt
View File

@@ -2,7 +2,7 @@ Name:Hunt the Weak
ManaCost:3 G ManaCost:3 G
Types:Sorcery Types:Sorcery
A:SP$ PutCounter | Cost$ 3 G | AILogic$ Fight | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to put a +1/+1 counter | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBFight | SpellDescription$ Put a +1/+1 counter on target creature you control. Then that creature fights target creature you don't control. A:SP$ PutCounter | Cost$ 3 G | AILogic$ Fight | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to put a +1/+1 counter | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBFight | SpellDescription$ Put a +1/+1 counter on target creature you control. Then that creature fights target creature you don't control.
SVar:DBFight:DB$ Fight | Defined$ ParentTarget | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control SVar:DBFight:DB$ Fight | Defined$ ParentTarget | ValidTgts$ Creature.YouDontCtrl | AILogic$ NoRecheck | TgtPrompt$ Select target creature you don't control
DeckHas:Ability$Counters DeckHas:Ability$Counters
SVar:Picture:http://www.wizards.com/global/images/magic/general/hunt_the_weak.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/hunt_the_weak.jpg
Oracle:Put a +1/+1 counter on target creature you control. Then that creature fights target creature you don't control. (Each deals damage equal to its power to the other.) Oracle:Put a +1/+1 counter on target creature you control. Then that creature fights target creature you don't control. (Each deals damage equal to its power to the other.)

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

@@ -5,7 +5,7 @@ S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ CostReduction
SVar:CostReduction:Count$Compare CheckTgt GE1.2.0 SVar:CostReduction:Count$Compare CheckTgt GE1.2.0
SVar:CheckTgt:Targeted$Valid Creature.Dinosaur+YouCtrl SVar:CheckTgt:Targeted$Valid Creature.Dinosaur+YouCtrl
A:SP$ PutCounter | Cost$ 2 G | AILogic$ Fight | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to put a +1/+1 counter | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBFight | References$ CostReduction,CheckTgt | SpellDescription$ Put a +1/+1 counter on target creature you control. Then that creature fights target creature you don't control. A:SP$ PutCounter | Cost$ 2 G | AILogic$ Fight | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to put a +1/+1 counter | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBFight | References$ CostReduction,CheckTgt | SpellDescription$ Put a +1/+1 counter on target creature you control. Then that creature fights target creature you don't control.
SVar:DBFight:DB$ Fight | Defined$ ParentTarget | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control SVar:DBFight:DB$ Fight | Defined$ ParentTarget | ValidTgts$ Creature.YouDontCtrl | AILogic$ NoRecheck | TgtPrompt$ Select target creature you don't control
DeckHas:Ability$Counters DeckHas:Ability$Counters
SVar:Picture:http://www.wizards.com/global/images/magic/general/savage_stomp.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/savage_stomp.jpg
DeckHas:Ability$Token & Ability$Counters DeckHas:Ability$Token & Ability$Counters