External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-09 12:22:10 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

small rewrite in the creaturesDiedWatcher

Browse source
This commit is contained in:
igoudt 2017-05-12 09:24:56 +02:00
parent 7d905d39ca
commit fc7cdcdc4e
2 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/main/java/mage/abilities/dynamicvalue/common/CreaturesDiedThisTurnCount.java
View file

@ -40,7 +40,7 @@ public class CreaturesDiedThisTurnCount implements DynamicValue {
@Override @Override
public int calculate(Game game, Ability sourceAbility, Effect effect) { public int calculate(Game game, Ability sourceAbility, Effect effect) {
CreaturesDiedWatcher watcher = (CreaturesDiedWatcher)game.getState().getWatchers().get(CreaturesDiedWatcher.class.getSimpleName()); CreaturesDiedWatcher watcher = (CreaturesDiedWatcher) game.getState().getWatchers().get(CreaturesDiedWatcher.class.getSimpleName());
if (watcher != null) { if (watcher != null) {
return watcher.getAmountOfCreaturesDiesThisTurn(); return watcher.getAmountOfCreaturesDiesThisTurn();
} }

18
Mage/src/main/java/mage/watchers/common/CreaturesDiedWatcher.java
View file

@ -29,6 +29,8 @@ package mage.watchers.common;
import java.util.HashMap; import java.util.HashMap;
import java.util.UUID; import java.util.UUID;
import java.util.stream.Collectors;
import mage.constants.WatcherScope; import mage.constants.WatcherScope;
import mage.game.Game; import mage.game.Game;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
@ -36,12 +38,10 @@ import mage.game.events.ZoneChangeEvent;
import mage.watchers.Watcher; import mage.watchers.Watcher;
/** /**
*
* @author LevelX2 * @author LevelX2
*/ */
public class CreaturesDiedWatcher extends Watcher { public class CreaturesDiedWatcher extends Watcher {
private int amountOfCreaturesThatDied;
private final HashMap<UUID, Integer> amountOfCreaturesThatDiedByController = new HashMap<>(); private final HashMap<UUID, Integer> amountOfCreaturesThatDiedByController = new HashMap<>();
public CreaturesDiedWatcher() { public CreaturesDiedWatcher() {
@ -50,7 +50,6 @@ public class CreaturesDiedWatcher extends Watcher {
public CreaturesDiedWatcher(final CreaturesDiedWatcher watcher) { public CreaturesDiedWatcher(final CreaturesDiedWatcher watcher) {
super(watcher); super(watcher);
this.amountOfCreaturesThatDied = watcher.amountOfCreaturesThatDied;
this.amountOfCreaturesThatDiedByController.putAll(watcher.amountOfCreaturesThatDiedByController); this.amountOfCreaturesThatDiedByController.putAll(watcher.amountOfCreaturesThatDiedByController);
} }
@ -61,11 +60,7 @@ public class CreaturesDiedWatcher extends Watcher {
if (zEvent.isDiesEvent() if (zEvent.isDiesEvent()
&& zEvent.getTarget() != null && zEvent.getTarget() != null
&& zEvent.getTarget().isCreature()) { && zEvent.getTarget().isCreature()) {
amountOfCreaturesThatDied++; int amount = getAmountOfCreaturesDiesThisTurn(zEvent.getTarget().getControllerId());
int amount = 0;
if (amountOfCreaturesThatDiedByController.containsKey(zEvent.getTarget().getControllerId())) {
amount = amountOfCreaturesThatDiedByController.get(zEvent.getTarget().getControllerId());
}
amountOfCreaturesThatDiedByController.put(zEvent.getTarget().getControllerId(), amount + 1); amountOfCreaturesThatDiedByController.put(zEvent.getTarget().getControllerId(), amount + 1);
} }
} }
@ -73,13 +68,9 @@ public class CreaturesDiedWatcher extends Watcher {
@Override @Override
public void reset() { public void reset() {
amountOfCreaturesThatDied = 0;
amountOfCreaturesThatDiedByController.clear(); amountOfCreaturesThatDiedByController.clear();
} }
public int getAmountOfCreaturesDiesThisTurn() {
return amountOfCreaturesThatDied;
}
public int getAmountOfCreaturesDiesThisTurn(UUID playerId) { public int getAmountOfCreaturesDiesThisTurn(UUID playerId) {
return amountOfCreaturesThatDiedByController.getOrDefault(playerId, 0); return amountOfCreaturesThatDiedByController.getOrDefault(playerId, 0);
@ -90,4 +81,7 @@ public class CreaturesDiedWatcher extends Watcher {
return new CreaturesDiedWatcher(this); return new CreaturesDiedWatcher(this);
} }
public int getAmountOfCreaturesDiesThisTurn() {
return amountOfCreaturesThatDiedByController.values().stream().mapToInt(x -> x).sum();
}
} }