Merge pull request #5 from yaspo/QOL

Add attributes to collection view
minetoblend · Aug 28, 2024 · c1c7d3e · c1c7d3e
2 parents af5287a + 98009dd
commit c1c7d3e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/src/commands/collection.ts b/src/commands/collection.ts
@@ -81,7 +81,10 @@ export class CollectionCommand extends Command {
 								wishlist = ` · ◆${card.mapper.wishlistEntries.length} `;
 							}
 
-							return `\`${card.id}\` · ${conditionEmoji} ${wishlist}· ${card.mapper.username} (${card.burnValue} gold)`;
+							let attributes = [...card.getAttributes()].map(it => `\`${it}\``).join(' · ')
+							attributes = attributes ? ' · ' + attributes : ''
+
+							return `\`${card.id}\` · ${conditionEmoji} ${wishlist}· ${card.mapper.username} (${card.burnValue} gold)${attributes}`;
 						})
 						.join('\n') + `\n\nSorting by: \`${orderByReadable}\``
 				);

diff --git a/src/commands/drop.ts b/src/commands/drop.ts
@@ -115,7 +115,7 @@ export class DropCommand extends Command {
 			const buttons = cards.map((card) => {
 				let name = card.mapper.username;
 
-				if (card.attributes.length > 0) {
+				if (card.foil) {
 					name += ' (Foil)';
 				}
 

diff --git a/src/commands/use.ts b/src/commands/use.ts
@@ -161,7 +161,7 @@ export class UseCommand extends Command {
 		const buttons = cards.map((card) => {
 			let name = card.mapper.username;
 
-			if (card.attributes.length > 0) {
+			if (card.foil) {
 				name += ' (Foil)';
 			}
 

diff --git a/src/entities/card.ts b/src/entities/card.ts
@@ -86,13 +86,12 @@ export class Card {
 		}[this.condition.id]!;
 	}
 
-	get attributes() {
-		const attributes: string[] = [];
-
-		if (this.foil) attributes.push('Foil');
-
-		return attributes;
-	}
+	* getAttributes(): Generator<string> {
+		if (this.foil)
+			yield 'foil'
+		if (this.jobMindblocked)
+	  		yield 'mindblocked'
+ 	 }
 
 	get jobEffort() {
 		return Math.round(