External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-26 05:22:02 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

reworked Clockwork creature implementations (fixes #8292)

Browse source
This commit is contained in:
Evan Kranzler 2021-09-18 11:08:17 -04:00
parent 2c8314932e
commit 2fa76fc7be
9 changed files with 211 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/main/java/mage/cards/Card.java
View file

@ -152,6 +152,8 @@ public interface Card extends MageObject {
boolean addCounters(Counter counter, UUID playerAddingCounters, Ability source, Game game, List<UUID> appliedEffects, boolean isEffect);
boolean addCounters(Counter counter, UUID playerAddingCounters, Ability source, Game game, List<UUID> appliedEffects, boolean isEffect, int maxCounters);
void removeCounters(String name, int amount, Ability source, Game game);
void removeCounters(Counter counter, Ability source, Game game);

11
Mage/src/main/java/mage/cards/CardImpl.java
View file

@ -704,12 +704,21 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
@Override
public boolean addCounters(Counter counter, UUID playerAddingCounters, Ability source, Game game, List<UUID> appliedEffects, boolean isEffect) {
return addCounters(counter, playerAddingCounters, source, game, appliedEffects, isEffect, Integer.MAX_VALUE);
}
public boolean addCounters(Counter counter, UUID playerAddingCounters, Ability source, Game game, List<UUID> appliedEffects, boolean isEffect, int maxCounters) {
boolean returnCode = true;
GameEvent addingAllEvent = GameEvent.getEvent(GameEvent.EventType.ADD_COUNTERS, objectId, source, playerAddingCounters, counter.getName(), counter.getCount());
addingAllEvent.setAppliedEffects(appliedEffects);
addingAllEvent.setFlag(isEffect);
if (!game.replaceEvent(addingAllEvent)) {
int amount = addingAllEvent.getAmount();
int amount;
if (maxCounters < Integer.MAX_VALUE) {
amount = Integer.min(addingAllEvent.getAmount(), maxCounters - this.getCounters(game).getCount(counter.getName()));
} else {
amount = addingAllEvent.getAmount();
}
boolean isEffectFlag = addingAllEvent.getFlag();
int finalAmount = amount;
for (int i = 0; i < amount; i++) {

4
Mage/src/main/java/mage/cards/ModalDoubleFacesCard.java
View file

@ -132,8 +132,8 @@ public abstract class ModalDoubleFacesCard extends CardImpl {
}
@Override
public boolean addCounters(Counter counter, UUID playerAddingCounters, Ability source, Game game, List<UUID> appliedEffects, boolean isEffect) {
return leftHalfCard.addCounters(counter, playerAddingCounters, source, game, appliedEffects, isEffect);
public boolean addCounters(Counter counter, UUID playerAddingCounters, Ability source, Game game, List<UUID> appliedEffects, boolean isEffect, int maxCounters) {
return leftHalfCard.addCounters(counter, playerAddingCounters, source, game, appliedEffects, isEffect, maxCounters);
}
@Override

5
Mage/src/main/java/mage/game/stack/Spell.java
View file

@ -1009,6 +1009,11 @@ public class Spell extends StackObjectImpl implements Card {
return card.addCounters(counter, playerAddingCounters, source, game, appliedEffects, isEffect);
}
@Override
public boolean addCounters(Counter counter, UUID playerAddingCounters, Ability source, Game game, List<UUID> appliedEffects, boolean isEffect, int maxCounters) {
return card.addCounters(counter, playerAddingCounters, source, game, appliedEffects, isEffect, maxCounters);
}
@Override
public void removeCounters(String name, int amount, Ability source, Game game) {
card.removeCounters(name, amount, source, game);

24
Mage/src/main/java/mage/watchers/common/AttackedOrBlockedThisCombatWatcher.java
View file

@ -1,15 +1,15 @@
package mage.watchers.common;
import java.util.HashSet;
import java.util.Set;
import mage.MageObjectReference;
import mage.constants.WatcherScope;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.watchers.Watcher;
import java.util.HashSet;
import java.util.Set;
/**
*
* @author LevelX2
*/
public class AttackedOrBlockedThisCombatWatcher extends Watcher {
@ -23,14 +23,16 @@ public class AttackedOrBlockedThisCombatWatcher extends Watcher {
@Override
public void watch(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.BEGIN_COMBAT_STEP_PRE) {
this.getAttackedThisTurnCreatures().clear();
}
if (event.getType() == GameEvent.EventType.ATTACKER_DECLARED) {
this.getAttackedThisTurnCreatures().add(new MageObjectReference(event.getSourceId(), game));
}
if (event.getType() == GameEvent.EventType.BLOCKER_DECLARED) {
this.getBlockedThisTurnCreatures().add(new MageObjectReference(event.getSourceId(), game));
switch (event.getType()) {
case BEGIN_COMBAT_STEP_PRE:
this.attackedThisTurnCreatures.clear();
this.blockedThisTurnCreatures.clear();
return;
case ATTACKER_DECLARED:
this.attackedThisTurnCreatures.add(new MageObjectReference(event.getSourceId(), game));
return;
case BLOCKER_DECLARED:
this.blockedThisTurnCreatures.add(new MageObjectReference(event.getSourceId(), game));
}
}