From dae0783390ca3d62c03e1a286ffb19efbc8904d4 Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 8 Jun 2020 22:12:17 -0400 Subject: [PATCH] fixed styling and also starter exclusive --- .../entercode/PackSimulator/generate.js | 31 +++++++++---------- src/components/entercode/packs.scss | 3 +- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/components/entercode/PackSimulator/generate.js b/src/components/entercode/PackSimulator/generate.js index 531bc92..57276bd 100644 --- a/src/components/entercode/PackSimulator/generate.js +++ b/src/components/entercode/PackSimulator/generate.js @@ -65,29 +65,28 @@ class GenerateCard { return; } - if (card_names.indexOf(card.gsx$name) > -1 || card.gsx$exclusive.includes("Starter")) { - return gencard(results); + if (card_names.indexOf(card.gsx$name) > -1 || card.gsx$exclusive.toLowerCase().includes("starter")) { + gencard(results); + return; } + card_names.push(card.gsx$name); if (card.gsx$type != "Creatures") { cards.push(
); } else { - const courage = gendisp(card.gsx$courage); - const power = gendisp(card.gsx$power); - const wisdom = gendisp(card.gsx$wisdom); - const speed = gendisp(card.gsx$speed); - const energy = geneng(card.gsx$energy); - cards.push(
-
- {courage} - {power} - {wisdom} - {speed} - {energy} + cards.push( +
+
+ {gendisp(card.gsx$courage)} + {gendisp(card.gsx$power)} + {gendisp(card.gsx$wisdom)} + {gendisp(card.gsx$speed)} + {geneng(card.gsx$energy)} +
-
); + ); } } @@ -154,4 +153,4 @@ class GenerateCard { const { generate, setupDB } = new GenerateCard(); -export { generate, setupDB }; \ No newline at end of file +export { generate, setupDB }; diff --git a/src/components/entercode/packs.scss b/src/components/entercode/packs.scss index 6182630..b52cc80 100644 --- a/src/components/entercode/packs.scss +++ b/src/components/entercode/packs.scss @@ -1,6 +1,6 @@ @media only screen and (min-width: 975px) { .pack { - max-width: 70%; + max-width: 90%; } } /* Desktop */ @@ -12,7 +12,6 @@ } .pack { - height: 100%; display: flex; flex-direction: row; flex-wrap: wrap;