external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Account for rebranded cards

Browse Source
This commit is contained in:
tool4EvEr
2023-09-01 21:30:12 +02:00
parent 45a59fe77a
commit 54302fc89b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java
View File

@@ -130,6 +130,7 @@ public abstract class DeckGeneratorBase {
int res = 0; int res = 0;
while (res < cnt) { while (res < cnt) {
PaperCard cp = source.get(MyRandom.getRandom().nextInt(srcLen)); PaperCard cp = source.get(MyRandom.getRandom().nextInt(srcLen));
// TODO AltName conversion needed?
int newCount = cardCounts.get(cp.getName()) + 1; int newCount = cardCounts.get(cp.getName()) + 1;
//add card to deck if not already maxed out on card //add card to deck if not already maxed out on card

4
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java
View File

@@ -215,7 +215,7 @@ public abstract class ACEditorBase<TItem extends InventoryItem, TModel extends D
Iterable<Entry<String,Integer>> cardsByName = null; Iterable<Entry<String,Integer>> cardsByName = null;
if (deck != null) { if (deck != null) {
final CardPool allCards = deck.getAllCardsInASinglePool(deck.has(DeckSection.Commander)); final CardPool allCards = deck.getAllCardsInASinglePool(deck.has(DeckSection.Commander));
cardsByName = Aggregates.groupSumBy(allCards, PaperCard.FN_GET_NAME); cardsByName = Aggregates.groupSumBy(allCards, pc -> pc.getRules().getNormalizedName());
} }
for (final Entry<TItem, Integer> itemEntry : itemsToAdd) { for (final Entry<TItem, Integer> itemEntry : itemsToAdd) {
@@ -237,7 +237,7 @@ public abstract class ACEditorBase<TItem extends InventoryItem, TModel extends D
Entry<String, Integer> cardAmountInfo = Iterables.find(cardsByName, new Predicate<Entry<String, Integer>>() { Entry<String, Integer> cardAmountInfo = Iterables.find(cardsByName, new Predicate<Entry<String, Integer>>() {
@Override @Override
public boolean apply(Entry<String, Integer> t) { public boolean apply(Entry<String, Integer> t) {
return t.getKey().equals(card.getName()); return t.getKey().equals(card.getRules().getNormalizedName());
} }
}, null); }, null);
if (cardAmountInfo != null) { if (cardAmountInfo != null) {