diff --git a/src/pages/player/index.js b/src/pages/player/index.js index 298234325..592b551ff 100644 --- a/src/pages/player/index.js +++ b/src/pages/player/index.js @@ -439,27 +439,21 @@ function Player() { baseImageLink: preset.baseImageLink, }; } - //const itemImage = ({item.name}); - const itemImage = ( - - ); + let countLabel; + let label = ''; if (loadoutItem.upd?.StackObjectsCount > 1) { - label = `x ${loadoutItem.upd?.StackObjectsCount}`; + countLabel = loadoutItem.upd?.StackObjectsCount; } if (loadoutItem.upd?.Dogtag) { const tag = loadoutItem.upd.Dogtag; const weapon = items.find(i => i.id === tag.WeaponName?.split(' ')[0]); - + countLabel = tag.Level; label = ( - {`${tag.Nickname} (${tag.Level} ${t(tag.Side)})`} + {tag.Nickname} {` ${t(tag.Status)} `} - {`${tag.KillerName} (${tag.Level} ${t(tag.Side)})`} + {tag.KillerName} {weapon !== undefined && [ {` ${t('using')} `}, {weapon.name} @@ -471,18 +465,27 @@ function Player() { if (loadoutItem.upd?.Key) { const key = items.find(i => i.id === loadoutItem._tpl); if (key) { - label = `${key.properties.uses-loadoutItem.upd.Key.NumberOfUsages}/${key.properties.uses}`; + countLabel = `${key.properties.uses-loadoutItem.upd.Key.NumberOfUsages}/${key.properties.uses}`; } } if (loadoutItem.upd?.Repairable) { - label = `${loadoutItem.upd.Repairable.Durability}/${loadoutItem.upd.Repairable.MaxDurability}` + countLabel = `${loadoutItem.upd.Repairable.Durability}/${loadoutItem.upd.Repairable.MaxDurability}` } if (loadoutItem.upd?.MedKit) { const item = items.find(i => i.id === loadoutItem._tpl); if (item?.properties?.uses || item?.properties?.hitpoints) { - label = `${loadoutItem.upd.MedKit.HpResource}/${item.properties?.uses || item.properties?.hitpoints}`; + countLabel = `${loadoutItem.upd.MedKit.HpResource}/${item.properties?.uses || item.properties?.hitpoints}`; } } + + const itemImage = ( + + ); contents.push(( {getLoadoutContents(loadoutItem)}