github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed issue with dependecies of continuous effects

Browse source
This commit is contained in:
Evan Kranzler 2020-04-23 17:37:31 -04:00
parent 63b46c081c
commit 9978b9bec9
1 changed files with 76 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

127
Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java
View file

@ -338,7 +338,7 @@ public class ContinuousEffects implements Serializable {
} }
// boolean checkLKI = event.getType().equals(EventType.ZONE_CHANGE) || event.getType().equals(EventType.DESTROYED_PERMANENT); // boolean checkLKI = event.getType().equals(EventType.ZONE_CHANGE) || event.getType().equals(EventType.DESTROYED_PERMANENT);
//get all applicable transient Replacement effects //get all applicable transient Replacement effects
for (Iterator<ReplacementEffect> iterator = replacementEffects.iterator(); iterator.hasNext();) { for (Iterator<ReplacementEffect> iterator = replacementEffects.iterator(); iterator.hasNext(); ) {
ReplacementEffect effect = iterator.next(); ReplacementEffect effect = iterator.next();
if (!effect.checksEventType(event, game)) { if (!effect.checksEventType(event, game)) {
continue; continue;
@ -371,7 +371,7 @@ public class ContinuousEffects implements Serializable {
} }
} }
for (Iterator<PreventionEffect> iterator = preventionEffects.iterator(); iterator.hasNext();) { for (Iterator<PreventionEffect> iterator = preventionEffects.iterator(); iterator.hasNext(); ) {
PreventionEffect effect = iterator.next(); PreventionEffect effect = iterator.next();
if (!effect.checksEventType(event, game)) { if (!effect.checksEventType(event, game)) {
continue; continue;
@ -740,8 +740,8 @@ public class ContinuousEffects implements Serializable {
* @param event * @param event
* @param targetAbility ability the event is attached to. can be null. * @param targetAbility ability the event is attached to. can be null.
* @param game * @param game
* @param silentMode true if the event does not really happen but it's * @param silentMode true if the event does not really happen but it's
* checked if the event would be replaced * checked if the event would be replaced
* @return * @return
*/ */
public boolean preventedByRuleModification(GameEvent event, Ability targetAbility, Game game, boolean silentMode) { public boolean preventedByRuleModification(GameEvent event, Ability targetAbility, Game game, boolean silentMode) {
@ -789,7 +789,7 @@ public class ContinuousEffects implements Serializable {
do { do {
Map<ReplacementEffect, Set<Ability>> rEffects = getApplicableReplacementEffects(event, game); Map<ReplacementEffect, Set<Ability>> rEffects = getApplicableReplacementEffects(event, game);
// Remove all consumed effects (ability dependant) // Remove all consumed effects (ability dependant)
for (Iterator<ReplacementEffect> it1 = rEffects.keySet().iterator(); it1.hasNext();) { for (Iterator<ReplacementEffect> it1 = rEffects.keySet().iterator(); it1.hasNext(); ) {
ReplacementEffect entry = it1.next(); ReplacementEffect entry = it1.next();
if (consumed.containsKey(entry.getId()) /*&& !(entry instanceof CommanderReplacementEffect) */) { // 903.9. if (consumed.containsKey(entry.getId()) /*&& !(entry instanceof CommanderReplacementEffect) */) { // 903.9.
Set<UUID> consumedAbilitiesIds = consumed.get(entry.getId()); Set<UUID> consumedAbilitiesIds = consumed.get(entry.getId());
@ -945,7 +945,7 @@ public class ContinuousEffects implements Serializable {
Map<ContinuousEffect, Set<UUID>> waitingEffects = new LinkedHashMap<>(); Map<ContinuousEffect, Set<UUID>> waitingEffects = new LinkedHashMap<>();
Set<UUID> appliedEffects = new HashSet<>(); Set<UUID> appliedEffects = new HashSet<>();
applyCounters.apply(Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, null, game); applyCounters.apply(Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, null, game);
activeLayerEffects=getLayeredEffects(game); activeLayerEffects = getLayeredEffects(game);
while (!done) { // loop needed if a added effect adds again an effect (e.g. Level 5- of Joraga Treespeaker) while (!done) { // loop needed if a added effect adds again an effect (e.g. Level 5- of Joraga Treespeaker)
done = true; done = true;
@ -953,59 +953,84 @@ public class ContinuousEffects implements Serializable {
// debug // debug
/* /*
System.out.println(game.getTurn() + ", " + game.getPhase() + ": " + "need apply " + layer.stream() System.out.println(
.map((eff) -> {return eff.getClass().getName().replaceAll(".+\\.(.+)", "$1");}) game.getTurn()
.collect(Collectors.joining(", "))); + ", " + game.getPhase()
+ ": need to apply "
+ layer.stream()
.map(Object::getClass)
.map(Class::getName)
.map(s -> s.replaceAll(".+\\.(.+)", "$1"))
.collect(Collectors.joining(", "))
);
*/ */
for (ContinuousEffect effect : layer) { for (ContinuousEffect effect : layer) {
if (activeLayerEffects.contains(effect) && !appliedEffects.contains(effect.getId())) { // Effect does still exist and was not applied yet if (!activeLayerEffects.contains(effect) || appliedEffects.contains(effect.getId())) {
Set<UUID> dependentTo = effect.isDependentTo(layer); continue;
if (!appliedEffects.containsAll(dependentTo)) { } // Effect does still exist and was not applied yet
Set<UUID> dependentTo = effect.isDependentTo(layer);
if (!appliedEffects.containsAll(dependentTo)) {
waitingEffects
.entrySet()
.stream()
.filter(entry -> dependentTo.contains(entry.getKey().getId())
&& entry.getValue().contains(effect.getId()))
.forEach(entry -> {
entry.getValue().remove(effect.getId());
dependentTo.remove(entry.getKey().getId());
});
waitingEffects.entrySet().removeIf(x -> x.getValue() == null || x.getValue().isEmpty());
if (!dependentTo.isEmpty() && !waitingEffects.containsKey(effect)) {
// make sure circular dependencies weren't the only dependencies
waitingEffects.put(effect, dependentTo); waitingEffects.put(effect, dependentTo);
continue; continue;
} }
List<Ability> appliedAbilities = appliedEffectAbilities.get(effect); }
Set<Ability> abilities = layeredEffects.getAbility(effect.getId()); List<Ability> appliedAbilities = appliedEffectAbilities.get(effect);
for (Ability ability : abilities) { Set<Ability> abilities = layeredEffects.getAbility(effect.getId());
if (appliedAbilities == null || !appliedAbilities.contains(ability)) { for (Ability ability : abilities) {
if (appliedAbilities == null) { if (appliedAbilities != null && appliedAbilities.contains(ability)) {
appliedAbilities = new ArrayList<>(); continue;
appliedEffectAbilities.put(effect, appliedAbilities);
}
appliedAbilities.add(ability);
effect.apply(Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, ability, game);
done = false;
// list must be updated after each applied effect (eg. if "Turn to Frog" removes abilities)
activeLayerEffects = getLayeredEffects(game);
}
} }
appliedEffects.add(effect.getId()); if (appliedAbilities == null) {
appliedAbilities = new ArrayList<>();
appliedEffectAbilities.put(effect, appliedAbilities);
}
appliedAbilities.add(ability);
effect.apply(Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, ability, game);
done = false;
// list must be updated after each applied effect (eg. if "Turn to Frog" removes abilities)
activeLayerEffects = getLayeredEffects(game);
}
appliedEffects.add(effect.getId());
if (!waitingEffects.isEmpty()) { if (waitingEffects.isEmpty()) {
// check if waiting effects can be applied now continue;
for (Iterator<Map.Entry<ContinuousEffect, Set<UUID>>> iterator = waitingEffects.entrySet().iterator(); iterator.hasNext();) { }
Map.Entry<ContinuousEffect, Set<UUID>> entry = iterator.next(); // check if waiting effects can be applied now
if (appliedEffects.containsAll(entry.getValue())) { // all dependent to effects are applied now so apply the effect itself for (Iterator<Map.Entry<ContinuousEffect, Set<UUID>>> iterator = waitingEffects.entrySet().iterator(); iterator.hasNext(); ) {
appliedAbilities = appliedEffectAbilities.get(entry.getKey()); Map.Entry<ContinuousEffect, Set<UUID>> entry = iterator.next();
abilities = layeredEffects.getAbility(entry.getKey().getId()); if (!appliedEffects.containsAll(entry.getValue())) { // all dependent to effects are applied now so apply the effect itself
for (Ability ability : abilities) { continue;
if (appliedAbilities == null || !appliedAbilities.contains(ability)) {
if (appliedAbilities == null) {
appliedAbilities = new ArrayList<>();
appliedEffectAbilities.put(entry.getKey(), appliedAbilities);
}
appliedAbilities.add(ability);
entry.getKey().apply(Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, ability, game);
done = false;
// list must be updated after each applied effect (eg. if "Turn to Frog" removes abilities)
activeLayerEffects = getLayeredEffects(game);
}
}
appliedEffects.add(entry.getKey().getId());
iterator.remove();
}
}
} }
appliedAbilities = appliedEffectAbilities.get(entry.getKey());
abilities = layeredEffects.getAbility(entry.getKey().getId());
for (Ability ability : abilities) {
if (appliedAbilities != null && appliedAbilities.contains(ability)) {
continue;
}
if (appliedAbilities == null) {
appliedAbilities = new ArrayList<>();
appliedEffectAbilities.put(entry.getKey(), appliedAbilities);
}
appliedAbilities.add(ability);
entry.getKey().apply(Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, ability, game);
done = false;
// list must be updated after each applied effect (eg. if "Turn to Frog" removes abilities)
activeLayerEffects = getLayeredEffects(game);
}
appliedEffects.add(entry.getKey().getId());
iterator.remove();
} }
} }
} }