External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 04:52:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reworked Hate condition.

Browse source
This commit is contained in:
LevelX2 2016-09-28 08:30:31 +02:00
parent 9cf9d69c55
commit c703ebaa9d
16 changed files with 47 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage/src/main/java/mage/abilities/condition/common/HateCondition.java
View file

@ -30,7 +30,7 @@ package mage.abilities.condition.common;
import mage.abilities.Ability;
import mage.abilities.condition.Condition;
import mage.game.Game;
import mage.watchers.common.NonCombatDamageWatcher;
import mage.watchers.common.LifeLossOtherFromCombatWatcher;
/**
* Describes condition when an opponent has been dealt any amount of non-combat
@ -54,8 +54,8 @@ public class HateCondition implements Condition {
@Override
public boolean apply(Game game, Ability source) {
NonCombatDamageWatcher watcher = (NonCombatDamageWatcher) game.getState().getWatchers().get("NonCombatDamageWatcher");
return watcher != null && watcher.opponentsBeenDealtNonCombatDamage(source.getControllerId());
LifeLossOtherFromCombatWatcher watcher = (LifeLossOtherFromCombatWatcher) game.getState().getWatchers().get(LifeLossOtherFromCombatWatcher.class.getName());
return watcher != null && watcher.opponentLostLifeOtherFromCombat(source.getControllerId());
}
@Override

36
Mage/src/main/java/mage/watchers/common/NonCombatDamageWatcher.java → Mage/src/main/java/mage/watchers/common/LifeLossOtherFromCombatWatcher.java
View file

@ -32,58 +32,48 @@ import java.util.Set;
import java.util.UUID;
import mage.constants.WatcherScope;
import mage.game.Game;
import mage.game.events.DamagedPlayerEvent;
import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType;
import mage.watchers.Watcher;
/*
*
* @author Styxo
*/
public class NonCombatDamageWatcher extends Watcher {
public class LifeLossOtherFromCombatWatcher extends Watcher {
private final Set<UUID> playersBeenDealtNonCombatDamage = new HashSet<>();
private final Set<UUID> players = new HashSet<>();
public NonCombatDamageWatcher() {
super("NonCombatDamageWatcher", WatcherScope.GAME);
public LifeLossOtherFromCombatWatcher() {
super(LifeLossOtherFromCombatWatcher.class.getName(), WatcherScope.GAME);
}
public NonCombatDamageWatcher(final NonCombatDamageWatcher watcher) {
public LifeLossOtherFromCombatWatcher(final LifeLossOtherFromCombatWatcher watcher) {
super(watcher);
}
@Override
public void watch(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.LOST_LIFE) {
if (event.getType() == GameEvent.EventType.LOST_LIFE && !event.getFlag()) {
UUID playerId = event.getPlayerId();
if (playerId != null) {
playersBeenDealtNonCombatDamage.add(playerId);
players.add(playerId);
}
} else if (event.getType() == EventType.DAMAGED_PLAYER) {
DamagedPlayerEvent dEvent = (DamagedPlayerEvent) event;
if (!dEvent.isCombatDamage()) {
UUID playerId = event.getPlayerId();
if (playerId != null) {
playersBeenDealtNonCombatDamage.add(playerId);
}
}
}
}
public boolean opponentsBeenDealtNonCombatDamage(UUID playerId) {
return (!playersBeenDealtNonCombatDamage.contains(playerId) && playersBeenDealtNonCombatDamage.size() > 0)
|| (playersBeenDealtNonCombatDamage.contains(playerId) && playersBeenDealtNonCombatDamage.size() > 1);
public boolean opponentLostLifeOtherFromCombat(UUID playerId) {
return (!players.contains(playerId) && players.size() > 0)
|| (players.contains(playerId) && players.size() > 1);
}
@Override
public void reset() {
super.reset();
playersBeenDealtNonCombatDamage.clear();
players.clear();
}
@Override
public NonCombatDamageWatcher copy() {
return new NonCombatDamageWatcher(this);
public LifeLossOtherFromCombatWatcher copy() {
return new LifeLossOtherFromCombatWatcher(this);
}
}