@@ -7,6 +7,7 @@ import style from '../../../utils/style.js';
77import * as deckLoader from '../../../utils/loadDeck.js' ;
88import compound from '../../../utils/compoundEvent.js' ;
99import hasOwn from '../../../utils/hasOwn.js' ;
10+ import { cardName } from '../../../utils/cardHelper.js' ;
1011
1112const setting = settings . register ( {
1213 name : 'Disable Deck Storage' ,
@@ -114,7 +115,7 @@ onPage('Decks', function deckStorage() {
114115 if ( trim ) {
115116 return deck . cards . filter ( ( { id, shiny } ) => {
116117 const data = getCardData ( id , shiny ) ;
117- return data && data . name ;
118+ return data && cardName ( data ) ;
118119 } ) ;
119120 }
120121 return deck . cards ;
@@ -146,8 +147,10 @@ onPage('Decks', function deckStorage() {
146147 function cards ( list ) {
147148 const names = [ ] ;
148149 list . forEach ( ( card ) => {
149- let data = getCardData ( card . id , card . shiny ) || { } ;
150- const name = data . name && `<span class="${ data . rarity } ">${ data . name } </span>` || `<span style="color: orange;">${ ( data = getFromLibrary ( card . id , global ( 'allCards' ) ) ) && data . name || 'Deleted' } (Missing)</span>` ;
150+ let data = getCardData ( card . id , card . shiny ) ;
151+ const name = data ?
152+ `<span class="${ data . rarity } ">${ cardName ( data ) } </span>` :
153+ `<span style="color: orange;">${ ( data = getFromLibrary ( card . id , global ( 'allCards' ) ) ) && cardName ( data ) || 'Deleted' } (Missing)</span>` ;
151154 names . push ( `- ${ card . shiny ? '<span style="color: yellow;">S</span> ' : '' } ${ name } ` ) ;
152155 } ) ;
153156 return names . join ( '<br />' ) ;
@@ -195,7 +198,7 @@ onPage('Decks', function deckStorage() {
195198 fixClass ( ! ! deck ) ;
196199 if ( deck ) {
197200 text = `
198- <div id="deckName">${ localStorage . getItem ( nameKey ) || ( `${ soul } -${ i + 1 } ` ) } </div>
201+ <div id="deckName">${ localStorage . getItem ( nameKey ) || `${ soul } -${ i + 1 } ` } </div>
199202 <div><input id="deckNameInput" maxlength="28" style="border: 0; border-bottom: 2px solid #00617c; background: #000; width: 100%; display: none;" type="text" placeholder="${ soul } -${ i + 1 } " value="${ localStorage . getItem ( nameKey ) || '' } "></div>
200203 <div style="font-size: 13px;">${ artifacts ( i ) } </div>
201204 <div>Click to load (${ deck . length } )</div>
0 commit comments