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

Revert "Ambrosia Whiteheart AI slight improvement (#8473)"

Browse Source 
This reverts commit ba8a30ebdd.
This commit is contained in:
Agetian
2025-08-21 07:47:43 +03:00
committed by GitHub
parent 16fcbc0ebf
commit d2de3da8fb
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
View File

@@ -1594,9 +1594,7 @@ public class ChangeZoneAi extends SpellAbilityAi {
} else if (logic.startsWith("ExilePreference")) { } else if (logic.startsWith("ExilePreference")) {
return doExilePreferenceLogic(decider, sa, fetchList); return doExilePreferenceLogic(decider, sa, fetchList);
} else if (logic.equals("BounceOwnTrigger")) { } else if (logic.equals("BounceOwnTrigger")) {
return doBounceOwnTriggerLogic(decider, sa, fetchList, false); return doBounceOwnTriggerLogic(decider, sa, fetchList);
} else if (logic.equals("BounceOwnTriggerOptional")) {
return doBounceOwnTriggerLogic(decider, sa, fetchList, true);
} }
} }
if (fetchList.isEmpty()) { if (fetchList.isEmpty()) {
@@ -2160,14 +2158,14 @@ public class ChangeZoneAi extends SpellAbilityAi {
return AiCardMemory.isRememberedCard(ai, c, AiCardMemory.MemorySet.BOUNCED_THIS_TURN); return AiCardMemory.isRememberedCard(ai, c, AiCardMemory.MemorySet.BOUNCED_THIS_TURN);
} }
private static Card doBounceOwnTriggerLogic(Player ai, SpellAbility sa, CardCollection choices, boolean preferredOnly) { private static Card doBounceOwnTriggerLogic(Player ai, SpellAbility sa, CardCollection choices) {
CardCollection unprefChoices = CardLists.filter(choices, c -> !c.isToken() && c.getOwner().equals(ai)); CardCollection unprefChoices = CardLists.filter(choices, c -> !c.isToken() && c.getOwner().equals(ai));
// TODO check for threatened cards // TODO check for threatened cards
CardCollection prefChoices = CardLists.filter(unprefChoices, c -> c.hasETBTrigger(false)); CardCollection prefChoices = CardLists.filter(unprefChoices, c -> c.hasETBTrigger(false));
if (!prefChoices.isEmpty()) { if (!prefChoices.isEmpty()) {
return ComputerUtilCard.getBestAI(prefChoices); return ComputerUtilCard.getBestAI(prefChoices);
} }
if (!preferredOnly && !unprefChoices.isEmpty() && sa.getSubAbility() != null) { if (!unprefChoices.isEmpty() && sa.getSubAbility() != null) {
// some extra benefit like First Responder // some extra benefit like First Responder
return ComputerUtilCard.getWorstAI(unprefChoices); return ComputerUtilCard.getWorstAI(unprefChoices);
} }

2
forge-gui/res/cardsfolder/a/ambrosia_whiteheart.txt
View File

@@ -4,7 +4,7 @@ Types:Legendary Creature Bird
PT:2/2 PT:2/2
K:Flash K:Flash
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may return another permanent you control to its owner's hand. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may return another permanent you control to its owner's hand.
SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | AILogic$ BounceOwnTriggerOptional | Mandatory$ True | ChangeType$ Permanent.Other+YouCtrl SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | AILogic$ BounceOwnTrigger | Mandatory$ True | ChangeType$ Permanent.Other+YouCtrl
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Landfall — Whenever a land you control enters, CARDNAME gets +1/+0 until end of turn. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Landfall — Whenever a land you control enters, CARDNAME gets +1/+0 until end of turn.
SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +1 SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +1
SVar:BuffedBy:Land SVar:BuffedBy:Land

2
forge-gui/res/cardsfolder/a/aviary_mechanic.txt
View File

@@ -3,5 +3,5 @@ ManaCost:1 W
Types:Creature Dwarf Artificer Types:Creature Dwarf Artificer
PT:2/2 PT:2/2
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may return another permanent you control to its owner's hand. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may return another permanent you control to its owner's hand.
SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | AILogic$ BounceOwnTriggerOptional | Mandatory$ True | ChangeType$ Permanent.Other+YouCtrl SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | AILogic$ BounceOwnTrigger | Mandatory$ True | ChangeType$ Permanent.Other+YouCtrl
Oracle:When Aviary Mechanic enters, you may return another permanent you control to its owner's hand. Oracle:When Aviary Mechanic enters, you may return another permanent you control to its owner's hand.