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

Merge branch 'partner2' into 'master'

Browse Source 
Partner with: better fix

See merge request core-developers/forge!4650
This commit is contained in:
Michael Kamensky
2021-05-04 18:18:02 +00:00
parent a246257eff ea0add13ad
commit 92472c815a
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -216,10 +216,6 @@ public class ChangeZoneAi extends SpellAbilityAi {
} }
if ("Always".equals(sa.getParam("AILogic"))) { if ("Always".equals(sa.getParam("AILogic"))) {
if (sa.getTrigger().getParam("TriggerDescription") != null && sa.getTrigger().getParam("TriggerDescription").contains("Partner with")) {
sa.resetTargets();
sa.getTargets().add(aiPlayer);
}
return true; return true;
} else if ("IfNotBuffed".equals(sa.getParam("AILogic"))) { } else if ("IfNotBuffed".equals(sa.getParam("AILogic"))) {
if (ComputerUtilCard.isUselessCreature(aiPlayer, sa.getHostCard())) { if (ComputerUtilCard.isUselessCreature(aiPlayer, sa.getHostCard())) {

2
forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
View File

@@ -3010,7 +3010,7 @@ public class CardFactoryUtil {
final String effect = "DB$ ChangeZone | ValidTgts$ Player | TgtPrompt$ Select target player" + final String effect = "DB$ ChangeZone | ValidTgts$ Player | TgtPrompt$ Select target player" +
" | Origin$ Library | Destination$ Hand | ChangeType$ Card.named" + k[1] + " | Origin$ Library | Destination$ Hand | ChangeType$ Card.named" + k[1] +
" | ChangeNum$ 1 | Hidden$ True | Chooser$ Targeted | Optional$ Targeted | AILogic$ Always"; " | ChangeNum$ 1 | Hidden$ True | Chooser$ Targeted | Optional$ Targeted";
final Trigger trigger = TriggerHandler.parseTrigger(trigStr, card, intrinsic); final Trigger trigger = TriggerHandler.parseTrigger(trigStr, card, intrinsic);
trigger.setOverridingAbility(AbilityFactory.getAbility(effect, card)); trigger.setOverridingAbility(AbilityFactory.getAbility(effect, card));