Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

GUI: added stacked feature for a same creature tokens (#12256)

Browse source
This commit is contained in:
grimreap124 2024-05-20 15:15:15 +10:00 • committed by GitHub
parent 199345db07
commit f53c9da3e4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 66 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java
View file

@ -113,7 +113,6 @@ public class CardPluginImpl implements CardPlugin {
needFullPermanentRender);
default:
throw new IllegalStateException("Unknown render mode " + renderMode);
}
}
@ -145,7 +144,7 @@ public class CardPluginImpl implements CardPlugin {
continue;
}
if ((!perm.isLand() && !perm.isToken()) || (perm.isCreature())) {
if ((!perm.isLand() && !perm.isToken()) || (perm.isCreature() && !perm.isToken())) {
Stack newStack = new Stack();
newStack.add(perm);
workingRow.add(newStack);
@ -153,6 +152,17 @@ public class CardPluginImpl implements CardPlugin {
}
int insertIndex = -1;
int cardPower = perm.getOriginal().getOriginalPower() != null
? perm.getOriginal().getOriginalPower().getValue()
: 0;
int cardToughness = perm.getOriginal().getOriginalToughness() != null
? perm.getOriginalPermanent().getOriginalToughness().getValue()
: 0;
List<CounterView> cardCounters = perm.getOriginalPermanent().getCounters() != null
? perm.getOriginalPermanent().getCounters()
: Collections.emptyList();
List<String> cardAbilities = perm.getOriginal().getRules() != null ? perm.getOriginal().getRules()
: new ArrayList<>();
// Find already added to with the same name.
for (int i = 0, n = workingRow.size(); i < n; i++) {
@ -161,8 +171,23 @@ public class CardPluginImpl implements CardPlugin {
Stack stack = workingRow.get(i);
MagePermanent firstPanelPerm = stack.get(0);
int stackPower = firstPanelPerm.getOriginal().getOriginalPower() != null
? firstPanelPerm.getOriginal().getOriginalPower().getValue()
: 0;
int stackToughness = firstPanelPerm.getOriginal().getOriginalToughness() != null
? firstPanelPerm.getOriginal().getOriginalToughness().getValue()
: 0;
List<CounterView> stackCounters = firstPanelPerm.getOriginalPermanent().getCounters() != null
? firstPanelPerm.getOriginalPermanent().getCounters()
: Collections.emptyList();
List<String> stackAbilities = firstPanelPerm.getOriginal().getRules() != null
? firstPanelPerm.getOriginal().getRules()
: new ArrayList<>();
// Check the names are equal and are creatures with the same summoning sickness
if (firstPanelPerm.getOriginal().getName().equals(perm.getOriginal().getName())
&& stackPower == cardPower && stackToughness == cardToughness
&& stackAbilities.equals(cardAbilities) && stackCounters.equals(cardCounters)
&& (!perm.isCreature() || firstPanelPerm.getOriginalPermanent().hasSummoningSickness() == perm
.getOriginalPermanent().hasSummoningSickness())) {
@ -171,24 +196,13 @@ public class CardPluginImpl implements CardPlugin {
insertIndex = i;
break;
}
List<CounterView> counters = firstPanelPerm.getOriginalPermanent().getCounters();
if (counters != null && !counters.isEmpty()) {
// don't put to first panel if it has counters
insertIndex = i;
break;
}
if (!empty(perm.getOriginalPermanent().getAttachments()) || stack.size() == cardStackMax) {
// If this land has attachments or the stack is full, put it to the right.
insertIndex = i + 1;
continue;
}
counters = perm.getOriginalPermanent().getCounters();
if (counters != null && !counters.isEmpty()) {
// if a land has counter, put it to the right
insertIndex = i + 1;
continue;
}
// Add to stack.
stack.add(0, perm);
continue outerLoop;