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

TriggerCounterPlayerAddedAll: new Trigger that triggers when a player puts more counters on one object

Browse Source
This commit is contained in:
Hans Mackowiak
2021-04-10 18:43:40 +02:00
parent 183209baa3
commit d8b665f64f
12 changed files with 159 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
forge-gui/src/main/java/forge/player/HumanCostDecision.java
View File

@@ -861,11 +861,11 @@ public class HumanCostDecision extends CostDecisionMakerBase {
return false;
}
if (c.getCounters(cType) <= counterTable.get(c, cType)) {
if (c.getCounters(cType) <= counterTable.get(null, c, cType)) {
return false;
}
counterTable.put(c, cType, 1);
counterTable.put(null, c, cType, 1);
onSelectStateChanged(c, true);
refresh();
@@ -878,13 +878,13 @@ public class HumanCostDecision extends CostDecisionMakerBase {
return null;
}
if (counterType != null) {
if (c.getCounters(counterType) <= counterTable.get(c, counterType)) {
if (c.getCounters(counterType) <= counterTable.get(null, c, counterType)) {
return null;
}
} else {
boolean found = false;
for (Map.Entry<CounterType, Integer> e : c.getCounters().entrySet()) {
if (e.getValue() > counterTable.get(c, e.getKey())) {
if (e.getValue() > counterTable.get(null, c, e.getKey())) {
found = true;
break;
}
@@ -915,13 +915,7 @@ public class HumanCostDecision extends CostDecisionMakerBase {
}
private int getDistibutedCounters() {
int sum = 0;
for (Integer v : this.counterTable.values()) {
sum += v;
}
return sum;
return counterTable.totalValues();
}
protected final boolean isValidChoice(final GameEntity choice) {
@@ -934,7 +928,7 @@ public class HumanCostDecision extends CostDecisionMakerBase {
@Override
public Collection<GameEntity> getSelected() {
return counterTable.rowKeySet();
return counterTable.columnKeySet();
}
}