Fix token cards not being filtered out

serprex · Sep 24, 2023 · 5972b93 · 5972b93
1 parent b970a69
commit 5972b93
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/rs/src/card.rs b/src/rs/src/card.rs
@@ -279,7 +279,8 @@ pub fn selector_filter(set: CardSet, col: u32, element: i8, rarity: i8) -> Vec<u
 	let cards = cardSetCards(set);
 	let mut result = Vec::with_capacity(15);
 	for card in cards.filter(col > 2) {
-		if (rarity == 4 || card.element == element)
+		if (card.flag & Flag::token) == 0
+			&& (rarity == 4 || card.element == element)
 			&& (rarity == 0 || card.rarity == rarity)
 			&& match col % 3 {
 				0 => card.kind == Kind::Creature,

diff --git a/src/views/Reward.jsx b/src/views/Reward.jsx
@@ -26,6 +26,7 @@ function getRewardList(reward) {
 		const result = [];
 		Cards.Codes.forEach(card => {
 			if (
+				!card.token &&
 				card.upped === upped &&
 				card.shiny === shiny &&
 				card.rarity === rarity