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

GUI: fixed not working clicks in commander zone for mdf cards (#7489, #7485);

Browse source
This commit is contained in:
Oleg Agafonov 2021-02-03 08:24:00 +04:00
parent a70e50419b
commit cc03cbbb67
1 changed files with 38 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
Mage/src/main/java/mage/players/PlayerImpl.java
View file

@ -43,6 +43,7 @@ import mage.filter.predicate.permanent.PermanentIdPredicate;
import mage.game.*; import mage.game.*;
import mage.game.combat.CombatGroup; import mage.game.combat.CombatGroup;
import mage.game.command.CommandObject; import mage.game.command.CommandObject;
import mage.game.command.Commander;
import mage.game.events.*; import mage.game.events.*;
import mage.game.match.MatchPlayer; import mage.game.match.MatchPlayer;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
@ -1576,41 +1577,13 @@ public abstract class PlayerImpl implements Player, Serializable {
game.setCheckPlayableState(true); game.setCheckPlayableState(true);
try { try {
// collect and filter playable activated abilities // collect and filter playable activated abilities
// GUI: user clicks on card, but it must activate ability from any card's parts (main, left, right) // GUI: user clicks on card, but it must activate ability from ANY card's parts (main, left, right)
UUID needId1, needId2, needId3; Set<UUID> needIds = getObjectParts(object);
if (object instanceof SplitCard) {
needId1 = object.getId();
needId2 = ((SplitCard) object).getLeftHalfCard().getId();
needId3 = ((SplitCard) object).getRightHalfCard().getId();
} else if (object instanceof ModalDoubleFacesCard) {
needId1 = object.getId();
needId2 = ((ModalDoubleFacesCard) object).getLeftHalfCard().getId();
needId3 = ((ModalDoubleFacesCard) object).getRightHalfCard().getId();
} else if (object instanceof AdventureCard) {
needId1 = object.getId();
needId2 = ((AdventureCard) object).getMainCard().getId();
needId3 = ((AdventureCard) object).getSpellCard().getId();
} else if (object instanceof AdventureCardSpell) {
needId1 = object.getId();
needId2 = ((AdventureCardSpell) object).getParentCard().getId();
needId3 = object.getId();
} else if (object instanceof Spell) {
// example: activate Lightning Storm's ability from the spell on the stack
needId1 = object.getId();
needId2 = ((Spell) object).getCard().getId();
needId3 = null;
} else {
needId1 = object.getId();
needId2 = null;
needId3 = null;
}
// workaround to find all abilities first and filter it for one object // workaround to find all abilities first and filter it for one object
List<ActivatedAbility> allPlayable = getPlayable(game, true, zone, false); List<ActivatedAbility> allPlayable = getPlayable(game, true, zone, false);
for (ActivatedAbility ability : allPlayable) { for (ActivatedAbility ability : allPlayable) {
if (Objects.equals(ability.getSourceId(), needId1) if (needIds.contains(ability.getSourceId())) {
|| Objects.equals(ability.getSourceId(), needId2)
|| Objects.equals(ability.getSourceId(), needId3)) {
useable.putIfAbsent(ability.getId(), ability); useable.putIfAbsent(ability.getId(), ability);
} }
} }
@ -1620,6 +1593,40 @@ public abstract class PlayerImpl implements Player, Serializable {
return useable; return useable;
} }
protected Set<UUID> getObjectParts(MageObject object) {
// collect all possible object's parts (example: all sides in mdf/split cards)
Set<UUID> res = new HashSet<>();
if (object instanceof SplitCard || object instanceof SplitCardHalf) {
SplitCard mainCard = (SplitCard) ((Card) object).getMainCard();
res.add(object.getId());
res.add(mainCard.getId());
res.add(mainCard.getLeftHalfCard().getId());
res.add(mainCard.getRightHalfCard().getId());
} else if (object instanceof ModalDoubleFacesCard || object instanceof ModalDoubleFacesCardHalf) {
ModalDoubleFacesCard mainCard = (ModalDoubleFacesCard) ((Card) object).getMainCard();
res.add(object.getId());
res.add(mainCard.getId());
res.add(mainCard.getLeftHalfCard().getId());
res.add(mainCard.getRightHalfCard().getId());
} else if (object instanceof AdventureCard || object instanceof AdventureCardSpell) {
AdventureCard mainCard = (AdventureCard) ((Card) object).getMainCard();
res.add(object.getId());
res.add(mainCard.getId());
res.add(mainCard.getSpellCard().getId());
} else if (object instanceof Spell) {
// example: activate Lightning Storm's ability from the spell on the stack
res.add(object.getId());
res.add(((Spell) object).getCard().getId()); // only single side goes to the stack
} else if (object instanceof Commander) {
// commander can contains double sides
res.add(object.getId());
res.addAll(getObjectParts(((Commander) object).getSourceObject()));
} else {
res.add(object.getId());
}
return res;
}
protected LinkedHashMap<UUID, ActivatedManaAbilityImpl> getUseableManaAbilities(MageObject object, Zone zone, Game game) { protected LinkedHashMap<UUID, ActivatedManaAbilityImpl> getUseableManaAbilities(MageObject object, Zone zone, Game game) {
LinkedHashMap<UUID, ActivatedManaAbilityImpl> useable = new LinkedHashMap<>(); LinkedHashMap<UUID, ActivatedManaAbilityImpl> useable = new LinkedHashMap<>();
boolean canUse = !(object instanceof Permanent) || ((Permanent) object).canUseActivatedAbilities(game); boolean canUse = !(object instanceof Permanent) || ((Permanent) object).canUseActivatedAbilities(game);