Leahnaya/TableturfBattleApp
1
0
Fork 0
mirror of https://github.com/AndrioCelos/TableturfBattleApp.git synced 2026-08-24 11:54:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix fields being missing from exported decks

Browse Source
This commit is contained in:
Andrio Celos
2023-10-22 18:53:51 +11:00
parent 23abd86966
commit 9f3745ade6
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
TableturfBattleClient/src/Pages/DeckListPage.ts
View File

@@ -91,7 +91,7 @@ deckViewBackButton.addEventListener('click', e => {
});
function saveDecks() {
const json = JSON.stringify(decks.filter(d => !d.isReadOnly), [ 'name', 'cards', 'sleeves' ]);
const json = JSON.stringify(decks.filter(d => !d.isReadOnly), [ 'name', 'cards', 'sleeves', 'upgrades' ]);
localStorage.setItem('decks', json);
}
@@ -99,13 +99,13 @@ function saveDecks() {
const decksString = localStorage.getItem('decks');
if (decksString) {
for (const deck of JSON.parse(decksString)) {
decks.push(new SavedDeck(deck.name, deck.sleeves ?? 0, deck.cards, deck.upgrades ?? new Array(15), false));
decks.push(new SavedDeck(deck.name, deck.sleeves ?? 0, deck.cards, deck.upgrades ?? new Array(15).fill(1), false));
}
} else {
const lastDeckString = localStorage.getItem('lastDeck');
const lastDeck = lastDeckString?.split(/\+/)?.map(s => parseInt(s));
if (lastDeck && lastDeck.length == 15) {
decks.push(new SavedDeck('Custom Deck', 0, lastDeck, new Array(15), false));
decks.push(new SavedDeck('Custom Deck', 0, lastDeck, new Array(15).fill(1), false));
saveDecks();
}
localStorage.removeItem('lastDeck');
@@ -132,7 +132,7 @@ function createDeckButton(deck: SavedDeck) {
const index = decks.indexOf(deck);
draggingDeckButton = buttonElement;
e.dataTransfer.effectAllowed = 'copyMove';
e.dataTransfer.setData('text/plain', JSON.stringify(deck, [ 'name', 'cards' ]));
e.dataTransfer.setData('text/plain', JSON.stringify(deck, [ 'name', 'cards', 'sleeves', 'upgrades' ]));
e.dataTransfer.setData('application/tableturf-deck-index', index.toString());
buttonElement.classList.add('dragging');
});
@@ -212,11 +212,11 @@ function importDecks(decksToImport: (SavedDeck | number[])[]) {
for (const el of decksToImport) {
let deck;
if (el instanceof Array)
deck = new SavedDeck(`Imported Deck ${decks.length + 1}`, 0, el, new Array(15), false);
deck = new SavedDeck(`Imported Deck ${decks.length + 1}`, 0, el, new Array(15).fill(1), false);
else {
deck = el;
deck.sleeves ??= 0;
deck.upgrades ??= new Array(15);
deck.upgrades ??= new Array(15).fill(1);
deck.isReadOnly = false;
if (!deck.name) deck.name = `Imported Deck ${decks.length + 1}`;
}
@@ -234,7 +234,7 @@ function importDecks(decksToImport: (SavedDeck | number[])[]) {
}
newDeckButton.addEventListener('click', () => {
selectedDeck = new SavedDeck(`Deck ${decks.length + 1}`, 0, new Array(15), new Array(15), false);
selectedDeck = new SavedDeck(`Deck ${decks.length + 1}`, 0, new Array(15).fill(0), new Array(15).fill(1), false);
createDeckButton(selectedDeck);
decks.push(selectedDeck);
editDeck();
@@ -372,7 +372,7 @@ function deselectDeck() {
deckExportButton.addEventListener('click', () => {
if (selectedDeck == null) return;
const json = JSON.stringify(selectedDeck, [ 'name', 'cards' ]);
const json = JSON.stringify(selectedDeck, [ 'name', 'cards', 'sleeves', 'upgrades' ]);
deckExportTextBox.value = json;
deckExportCopyButton.innerText = 'Copy';
deckExportDialog.showModal();
@@ -451,7 +451,7 @@ deckImportFileBox.addEventListener('change', async () => {
});
deckExportAllButton.addEventListener('click', () => {
const json = JSON.stringify(decks.filter(d => !d.isReadOnly), [ 'name', 'cards' ]);
const json = JSON.stringify(decks.filter(d => !d.isReadOnly), [ 'name', 'cards', 'sleeves', 'upgrades' ]);
deckExportTextBox.value = json;
deckExportCopyButton.innerText = 'Copy';
deckExportDialog.showModal();

4
TableturfBattleClient/src/ReplayLoader.ts
View File

@@ -65,7 +65,7 @@ class ReplayLoader {
gamesWon: 0
};
players.push(player);
playerData.push({ deck: new Deck("Deck", 0, cards, new Array(15)), initialDrawOrder, drawOrder, won: false });
playerData.push({ deck: new Deck("Deck", 0, cards, new Array(15).fill(1)), initialDrawOrder, drawOrder, won: false });
}
const turns = this.readTurns(numPlayers);
@@ -105,7 +105,7 @@ class ReplayLoader {
else
drawOrder.push(n >> 4 & 0xF);
}
playerData.push({ deck: new Deck("Deck", 0, cards, new Array(15)), initialDrawOrder, drawOrder, won });
playerData.push({ deck: new Deck("Deck", 0, cards, new Array(15).fill(1)), initialDrawOrder, drawOrder, won });
}
const turns = this.readTurns(numPlayers);
currentReplay.games.push({ stage, playerData, turns });

2
TableturfBattleClient/src/app.ts
View File

@@ -16,7 +16,7 @@ let initialised = false;
let initialiseCallback: (() => void) | null = null;
let canPushState = isSecureContext && location.protocol != 'file:';
const decks = [ new SavedDeck('Starter Deck', 0, [ 6, 34, 159, 13, 45, 137, 22, 52, 141, 28, 55, 103, 40, 56, 92 ], new Array(15), true) ];
const decks = [ new SavedDeck('Starter Deck', 0, [ 6, 34, 159, 13, 45, 137, 22, 52, 141, 28, 55, 103, 40, 56, 92 ], new Array(15).fill(1), true) ];
let selectedDeck: SavedDeck | null = null;
let editingDeck = false;
let deckModified = false;