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

Merge branch 'master' into 'master'

Browse Source 
fix divided allocation

See merge request core-developers/forge!4605
This commit is contained in:
Anthony Calosa
2021-04-26 20:01:36 +00:00
parent 2a71716ba4 742be996fe
commit 3f803a3f48
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java
View File

@@ -866,17 +866,16 @@ public class CountersPutAi extends SpellAbilityAi {
choice = Aggregates.random(list); choice = Aggregates.random(list);
} }
} }
if (choice != null && divided) { }
int alloc = Math.max(amount / totalTargets, 1); if (choice != null && divided) {
if (sa.getTargets().size() == Math.min(totalTargets, sa.getMaxTargets()) - 1) { int alloc = Math.max(amount / totalTargets, 1);
sa.addDividedAllocation(choice, left); if (sa.getTargets().size() == Math.min(totalTargets, sa.getMaxTargets()) - 1) {
} else { sa.addDividedAllocation(choice, left);
sa.addDividedAllocation(choice, alloc); } else {
left -= alloc; sa.addDividedAllocation(choice, alloc);
} left -= alloc;
} }
} }
if (choice != null) { if (choice != null) {
sa.getTargets().add(choice); sa.getTargets().add(choice);
list.remove(choice); list.remove(choice);