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

Browse Source 
Assorted AI improvements (pending pipeline for merge?)

See merge request core-developers/forge!3065
This commit is contained in:
Michael Kamensky
2020-08-22 18:25:28 +00:00
parent b62a38ec32 3d33ad0192
commit 7f29ddf124
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-ai/src/main/java/forge/ai/AiController.java
View File

@@ -997,6 +997,10 @@ public class AiController {
if (source.isEquipment() && noCreatures) { if (source.isEquipment() && noCreatures) {
p -= 9; p -= 9;
} }
// don't equip stuff in main 2 if there's more stuff to cast at the moment
if (sa.getApi() == ApiType.Attach && !sa.isCurse() && source.getGame().getPhaseHandler().getPhase().isAfter(PhaseType.COMBAT_DECLARE_BLOCKERS)) {
p -= 1;
}
// 1. increase chance of using Surge effects // 1. increase chance of using Surge effects
// 2. non-surged versions are usually inefficient // 2. non-surged versions are usually inefficient
if (source.getOracleText().contains("surge cost") && !sa.isSurged()) { if (source.getOracleText().contains("surge cost") && !sa.isSurged()) {

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

@@ -69,11 +69,6 @@ public class AttachAi extends SpellAbilityAi {
return false; return false;
} }
if (ai.getGame().getPhaseHandler().getPhase().isAfter(PhaseType.COMBAT_DECLARE_BLOCKERS)
&& !"Curse".equals(sa.getParam("AILogic"))) {
return false;
}
// prevent run-away activations - first time will always return true // prevent run-away activations - first time will always return true
if (ComputerUtil.preventRunAwayActivations(sa)) { if (ComputerUtil.preventRunAwayActivations(sa)) {
return false; return false;

4
forge-gui/res/cardsfolder/g/gideons_sacrifice.txt
View File

@@ -7,6 +7,6 @@ SVar:DamageEvent:Event$ DamageDone | ActiveZones$ Command | ValidTarget$ You,Per
SVar:GideonSac:DB$ ReplaceEffect | VarName$ Affected | VarValue$ Remembered | VarType$ Card SVar:GideonSac:DB$ ReplaceEffect | VarName$ Affected | VarValue$ Remembered | VarType$ Card
SVar:NeedsToPlayVar:Z GE1 SVar:NeedsToPlayVar:Z GE1
SVar:Z:SVar$Z1/Plus.Z2 SVar:Z:SVar$Z1/Plus.Z2
SVar:Z1:Count$Creature.YouCtrl SVar:Z1:Count$Valid Creature.YouCtrl
SVar:Z2:Count$Planeswalker.YouCtrl SVar:Z2:Count$Valid Planeswalker.YouCtrl
Oracle:Choose a creature or planeswalker you control. All damage that would be dealt this turn to you and permanents you control is dealt to the chosen permanent instead (if it's still on the battlefield). Oracle:Choose a creature or planeswalker you control. All damage that would be dealt this turn to you and permanents you control is dealt to the chosen permanent instead (if it's still on the battlefield).

4
forge-gui/res/cardsfolder/m/mirrormade.txt
View File

@@ -3,4 +3,8 @@ ManaCost:1 U U
Types:Enchantment Types:Enchantment
K:ETBReplacement:Copy:DBCopy:Optional K:ETBReplacement:Copy:DBCopy:Optional
SVar:DBCopy:DB$ Clone | Choices$ Artifact.Other,Enchantment.Other | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any artifact or enchantment on the battlefield. SVar:DBCopy:DB$ Clone | Choices$ Artifact.Other,Enchantment.Other | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any artifact or enchantment on the battlefield.
SVar:NeedsToPlayVar:Z GE1
SVar:Z:SVar$Z1/Plus.Z2
SVar:Z1:Count$Valid Artifact.Other
SVar:Z2:Count$Valid Enchantment.Other
Oracle:You may have Mirrormade enter the battlefield as a copy of any artifact or enchantment on the battlefield. Oracle:You may have Mirrormade enter the battlefield as a copy of any artifact or enchantment on the battlefield.