diff --git a/forge-ai/src/main/java/forge/ai/AiProps.java b/forge-ai/src/main/java/forge/ai/AiProps.java index ae344feaf1c..5e976bbfbb0 100644 --- a/forge-ai/src/main/java/forge/ai/AiProps.java +++ b/forge-ai/src/main/java/forge/ai/AiProps.java @@ -79,6 +79,7 @@ public enum AiProps { /** */ DESTROY_IMMEDIATELY_UNBLOCKABLE_LIFE_IN_DNGR ("5"), /** */ AVOID_TARGETING_CREATS_THAT_WILL_DIE ("true"), /** */ DONT_EVAL_KILLSPELLS_ON_STACK_WITH_PERMISSION ("true"), /** */ + CHANCE_TO_CHAIN_TWO_DAMAGE_SPELLS("50"), /** */ PRIORITY_REDUCTION_FOR_STORM_SPELLS ("0"), /** */ USE_BERSERK_AGGRESSIVELY ("false"), /** */ MIN_COUNT_FOR_STORM_SPELLS ("0"), /** */ @@ -126,10 +127,9 @@ public enum AiProps { /** */ FLASH_USE_BUFF_AURAS_AS_COMBAT_TRICKS("true"), FLASH_BUFF_AURA_CHANCE_TO_CAST_EARLY("1"), FLASH_BUFF_AURA_CHANCE_CAST_AT_EOT("5"), - FLASH_BUFF_AURA_CHANCE_TO_RESPOND_TO_STACK("100"), /** */ + FLASH_BUFF_AURA_CHANCE_TO_RESPOND_TO_STACK("100"); /** */ // Experimental features, must be promoted or removed after extensive testing and, ideally, defaulting // <-- There are no experimental options here --> - CHANCE_TO_CHAIN_TWO_DAMAGE_SPELLS("0"); /** */ private final String strDefaultVal; diff --git a/forge-gui/res/ai/Cautious.ai b/forge-gui/res/ai/Cautious.ai index 05b1d3460d7..ee2ab585a38 100644 --- a/forge-gui/res/ai/Cautious.ai +++ b/forge-gui/res/ai/Cautious.ai @@ -120,6 +120,11 @@ DESTROY_IMMEDIATELY_UNBLOCKABLE_ONLY_IN_DNGR=true # for the purpose of previous option DESTROY_IMMEDIATELY_UNBLOCKABLE_LIFE_IN_DNGR=5 +# The chance that the AI will try to chain two damage spells or a damage spell and a debuffing pump spell to try to +# kill a bigger creature or a planeswalker. If set to 0, will be disabled. When enabled, will automatically become 100 +# if the AI is in danger of dying. +CHANCE_TO_CHAIN_TWO_DAMAGE_SPELLS=25 + # Permission timings MIN_SPELL_CMC_TO_COUNTER=2 CHANCE_TO_COUNTER_CMC_1=0 diff --git a/forge-gui/res/ai/Default.ai b/forge-gui/res/ai/Default.ai index e00c218cdf6..1e3510af48f 100644 --- a/forge-gui/res/ai/Default.ai +++ b/forge-gui/res/ai/Default.ai @@ -120,6 +120,11 @@ DESTROY_IMMEDIATELY_UNBLOCKABLE_ONLY_IN_DNGR=true # for the purpose of previous option DESTROY_IMMEDIATELY_UNBLOCKABLE_LIFE_IN_DNGR=5 +# The chance that the AI will try to chain two damage spells or a damage spell and a debuffing pump spell to try to +# kill a bigger creature or a planeswalker. If set to 0, will be disabled. When enabled, will automatically become 100 +# if the AI is in danger of dying. +CHANCE_TO_CHAIN_TWO_DAMAGE_SPELLS=50 + # Permission timings MIN_SPELL_CMC_TO_COUNTER=0 CHANCE_TO_COUNTER_CMC_1=30 diff --git a/forge-gui/res/ai/Experimental.ai b/forge-gui/res/ai/Experimental.ai index 48b4e967fe9..e7ea101aaba 100644 --- a/forge-gui/res/ai/Experimental.ai +++ b/forge-gui/res/ai/Experimental.ai @@ -120,6 +120,11 @@ DESTROY_IMMEDIATELY_UNBLOCKABLE_ONLY_IN_DNGR=false # for the purpose of previous option DESTROY_IMMEDIATELY_UNBLOCKABLE_LIFE_IN_DNGR=5 +# The chance that the AI will try to chain two damage spells or a damage spell and a debuffing pump spell to try to +# kill a bigger creature or a planeswalker. If set to 0, will be disabled. When enabled, will automatically become 100 +# if the AI is in danger of dying. +CHANCE_TO_CHAIN_TWO_DAMAGE_SPELLS=100 + # Permission timings MIN_SPELL_CMC_TO_COUNTER=2 CHANCE_TO_COUNTER_CMC_1=30 @@ -277,8 +282,3 @@ MOJHOSTO_CHANCE_TO_USE_JHOIRA_COPY_INSTANT=20 # -- different name if necessary -- # <-- there are no experimental options here at the moment --> - -# The chance that the AI will try to chain two damage spells or a damage spell and a debuffing pump spell to try to -# kill a bigger creature or a planeswalker. -CHANCE_TO_CHAIN_TWO_DAMAGE_SPELLS=100 - diff --git a/forge-gui/res/ai/Reckless.ai b/forge-gui/res/ai/Reckless.ai index 4641fe37b0b..b31835947a5 100644 --- a/forge-gui/res/ai/Reckless.ai +++ b/forge-gui/res/ai/Reckless.ai @@ -120,6 +120,11 @@ DESTROY_IMMEDIATELY_UNBLOCKABLE_ONLY_IN_DNGR=true # for the purpose of previous option DESTROY_IMMEDIATELY_UNBLOCKABLE_LIFE_IN_DNGR=5 +# The chance that the AI will try to chain two damage spells or a damage spell and a debuffing pump spell to try to +# kill a bigger creature or a planeswalker. If set to 0, will be disabled. When enabled, will automatically become 100 +# if the AI is in danger of dying. +CHANCE_TO_CHAIN_TWO_DAMAGE_SPELLS=75 + # Permission timings MIN_SPELL_CMC_TO_COUNTER=0 CHANCE_TO_COUNTER_CMC_1=80 diff --git a/forge-gui/res/conquest/planes/Kamigawa/Takenuma/_events.txt b/forge-gui/res/conquest/planes/Kamigawa/Takenuma/_events.txt index bf96cf935b1..8a79f913daa 100644 --- a/forge-gui/res/conquest/planes/Kamigawa/Takenuma/_events.txt +++ b/forge-gui/res/conquest/planes/Kamigawa/Takenuma/_events.txt @@ -6,4 +6,4 @@ Name:Lantern-Lit Graveyard|Deck:Lantern-Lit Graveyard.dck|Variant:Planechase|Ava Name:Toshiro Umezawa|Deck:Toshiro Umezawa.dck|Variant:Commander|Avatar:Toshiro Umezawa|Desc: Name:Yukora, the Prisoner|Deck:Yukora, the Prisoner.dck|Variant:Commander|Avatar:Yukora, the Prisoner|Desc: Name:Gix|Deck:Gix.dck|Variant:Vanguard|Avatar:Gix|Desc: -Name:Random Planechase|Deck:Random|Variant:Planechase|Avatar:Planar Warden|Desc: +Name:Random Takenuma|Deck:Random|Variant:Planechase|Avatar:Planar Warden|Desc: