Leahnaya/TableturfBattleApp
1
0
Fork 0
mirror of https://github.com/AndrioCelos/TableturfBattleApp.git synced 2026-03-21 17:34:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enable non-default costs for custom cards

Browse Source
This commit is contained in:
Andrio Celos 2025-03-29 18:52:12 +11:00
parent c531b92884
commit 260b1425bd
No known key found for this signature in database
GPG Key ID: A4B57A2FF4019E28
6 changed files with 49 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
TableturfBattleClient/index.html
View File

@ -632,24 +632,24 @@
<div id="galleryCardEditor" hidden>
<textarea type="text" id="galleryCardEditorName" placeholder="Card name"></textarea>
<div id="galleryCardEditorGrid"></div>
<div id="galleryCardEditorSpecialCost">
<label for="galleryCardEditorSpecialCostDefaultBox"><input type="checkbox" id="galleryCardEditorSpecialCostDefaultBox" checked/> Default</label>
</div>
<div id="galleryCardEditorImageToolbar" class="galleryCardEditorToolbar">
<input type="file" id="galleryCardEditorImageFile" accept="image/*" autocomplete="off"/>
<button id="galleryCardEditorImageSelectButton">Choose image</button>
<button id="galleryCardEditorImageClearButton">Clear</button>
<footer>(The image will not be seen by other players.)</footer>
</div>
<div id="galleryCardEditorImageToolbar2" class="galleryCardEditorToolbar">
<div id="galleryCardEditorColoursToolbar" class="galleryCardEditorToolbar">
Colours:
<input type="color" id="galleryCardEditorColour1"/>
<input type="color" id="galleryCardEditorColour2"/>
<select id="galleryCardEditorColourPresetBox"></select>
</div>
<div id="galleryCardEditorImageToolbar3" class="galleryCardEditorToolbar">
<div id="galleryCardEditorRarityToolbar" class="galleryCardEditorToolbar">
<label for="galleryCardEditorRarityBox">Rarity: <select id="galleryCardEditorRarityBox"></select></label>
</div>
<div id="galleryCardEditorSpecialCost">
<label for="galleryCardEditorSpecialCostDefaultBox"><input type="checkbox" id="galleryCardEditorSpecialCostDefaultBox" checked/>Default</label>
</div>
</div>
<form method="dialog">
<button type="button" id="galleryCardEditorEditButton">Edit</button>

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

@ -426,7 +426,6 @@ function deckExportJsonReplacer(key: string, value: any) {
case 'number':
case 'altNumber':
case 'artFileName':
case 'specialCost':
case 'size':
case 'textScale':
case 'isVariantOf':

32
TableturfBattleClient/src/Pages/GalleryPage.ts
View File

@ -114,11 +114,43 @@ function openGalleryCardView(card: Card) {
updateSelectedPreset([card.inkColour1, card.inkColour2]);
galleryCardEditorName.value = card.line2 == null ? card.name : `${card.line1}\n${card.line2}`;
let size = 0; let hasSpecialSpace = false;
for (let y = 0; y < 8; y++) {
for (let x = 0; x < 8; x++) {
galleryCardEditorGridButtons[y][x].dataset.state = card.grid[y][x].toString();
switch (card.grid[y][x]) {
case Space.Ink1:
size++;
break;
case Space.SpecialInactive1:
size++;
hasSpecialSpace = true;
break;
}
}
}
let defaultSpecialCost =
size <= 3 ? 1
: size <= 5 ? 2
: size <= 8 ? 3
: size <= 11 ? 4
: size <= 15 ? 5
: 6;
if (!hasSpecialSpace && defaultSpecialCost > 3)
defaultSpecialCost = 3;
galleryCardEditorSpecialCostDefaultBox.checked = card.specialCost == defaultSpecialCost;
customCardSpecialCost = card.specialCost;
for (let i = 0; i < galleryCardEditorSpecialCostButtons.length; i++) {
const button = galleryCardEditorSpecialCostButtons[i];
if (parseInt(button.dataset.value!) <= card.specialCost)
button.classList.add('active');
else
button.classList.remove('active');
}
updateCustomCardSize();
}

18
TableturfBattleClient/tableturf.css
View File

@ -1987,13 +1987,13 @@ button.dragging {
font-size: 60%;
}
.galleryCardEditorToolbar:nth-last-child(3) { bottom: 18%; }
.galleryCardEditorToolbar:nth-last-child(2) { bottom: 12%; }
.galleryCardEditorToolbar:nth-last-child(1) { bottom: 6%; }
#galleryCardEditorImageToolbar { bottom: 18%; }
#galleryCardEditorColoursToolbar { bottom: 12%; }
#galleryCardEditorRarityToolbar { bottom: 6%; }
#galleryCardEditorImageFile { display: none; }
#galleryCardEditorImageToolbar2 input {
#galleryCardEditorColoursToolbar input {
width: 3em;
}
@ -2002,17 +2002,17 @@ button.dragging {
}
#galleryCardEditorSpecialCost {
display: none;
display: grid;
position: absolute;
grid-template-columns: repeat(5, 1fr);
left: 26.8%;
top: 86.8%;
gap: 0.072em;
top: 86.2%;
gap: 0.15em 0.075em;
}
#galleryCardEditorSpecialCost button {
width: 1.7em;
height: 1.7em;
width: 2.5vh;
aspect-ratio: 1;
border: none;
background: #00000080;
position: relative;

1
TableturfBattleServer/Card.cs
View File

@ -58,7 +58,6 @@ public class Card {
}
}
this.Size = size;
this.SpecialCost = specialCost ?? size switch { <= 3 => 1, <= 5 => 2, <= 8 => 3, <= 11 => 4, <= 15 => 5, _ => 6 };
}

6
TableturfBattleServer/DataStructures.cs
View File

@ -24,7 +24,7 @@ public class PlayerData(int playerIndex, Card[]? hand, Deck? deck, Move? move, L
public PlayerData(int playerIndex, Player player) : this(playerIndex, player.Hand, player.CurrentGameData.Deck, player.Move, player.CardsUsed, player.StageSelectionPrompt) { }
}
public record UserCustomCard(string Name, string? Line1, string? Line2, Colour InkColour1, Colour InkColour2, Rarity Rarity, Space[,] Grid) {
public record UserCustomCard(string Name, string? Line1, string? Line2, int? SpecialCost, Colour InkColour1, Colour InkColour2, Rarity Rarity, Space[,] Grid) {
public bool CheckGrid(out bool hasSpecialSpace, out int size) {
size = 0;
hasSpecialSpace = false;
@ -52,7 +52,7 @@ public record UserCustomCard(string Name, string? Line1, string? Line2, Colour I
}
public bool Equals(Card? card) {
if (card is null || card.Name != this.Name || card.Rarity != this.Rarity) return false;
if (card is null || card.Name != this.Name || card.Rarity != this.Rarity || card.SpecialCost != this.SpecialCost) return false;
for (var x = 0; x < 8; x++) {
for (var y = 0; y < 8; y++) {
if (this.Grid[x, y] != card.GetSpace(x, y, 0)) return false;
@ -61,5 +61,5 @@ public record UserCustomCard(string Name, string? Line1, string? Line2, Colour I
return true;
}
public Card ToCard(int number, int altNumber, int? specialCost) => new(number, altNumber, this.Line2 != null ? $"{this.Line1}\n{this.Line2}" : this.Name, this.Rarity, specialCost, null, this.Grid) { InkColour1 = this.InkColour1, InkColour2 = this.InkColour2 };
public Card ToCard(int number, int altNumber, int? defaultSpecialCost) => new(number, altNumber, this.Line2 != null ? $"{this.Line1}\n{this.Line2}" : this.Name, this.Rarity, this.SpecialCost ?? defaultSpecialCost, null, this.Grid) { InkColour1 = this.InkColour1, InkColour2 = this.InkColour2 };
}