@juice789/tf2items 1.0.15 → 1.0.17

package/schemaHelper.json

@@ -118,7 +118,8 @@
         "Winter 2021 Cosmetics Collection",
         "Summer 2022 Cosmetics Collection",
         "Ghoulish Gains Collection",
-        "Winter 2022 Cosmetics Collection"
+        "Winter 2022 Cosmetics Collection",
+        "Summer 2023 Cosmetics Collection"
     ],
     "weaponCollections": [
         "Concealed Killer Collection",
@@ -143,7 +144,8 @@
         "Scream Fortress XII Collection",
         "Winter 2020 Collection",
         "Scream Fortress XIII Collection",
-        "Scream Fortress XIV Collection"
+        "Scream Fortress XIV Collection",
+        "Summer 2023 War Paint Case"
     ],
     "fabricatorDefindex": [
         "190",

package/sku.js

@@ -129,7 +129,8 @@ const getName = ({
     safeItems[defindex].item_name,
     wear && '(' + wears[wear] + ')',
     series && '#' + series
-].filter(Boolean).join(' ')
+].filter(Boolean).join(' ').replace('\\n', `
+`)
 
 const itemNameFromSku = (sku, ...params) => {
     const item = itemFromSku(sku)

package/skuBp.js

@@ -29,11 +29,11 @@ const toBpQuality = (sku) => {
 const toBpName = (sku) => {
 
     const item = omit(
-        ['quality', 'elevated', 'uncraftable', 'craft', 'target', 'output', 'oq', 'effect'],
+        ['quality', 'elevated', 'uncraftable', 'craft', 'target', 'output', 'oq', 'effect', 'series'],
         itemFromSku(sku)
     )
 
-    return getName(item, Boolean(item.texture)).replace('\\n', '%0A')
+    return getName(item, Boolean(item.texture))
 }
 
 const toBpPriceIndex = (sku) => {

package/skuLinks.js

@@ -23,11 +23,11 @@ const {
     textures
 } = require('./schema.json')
 
-const manncoUrl = (sku) => {
+const marketHashNameFromSku = (sku) => {
+
     const {
         defindex,
         quality,
-        uncraftable,
         killstreakTier,
         target,
         output,
@@ -38,43 +38,39 @@ const manncoUrl = (sku) => {
         wear,
         australium,
         series,
-        effect
+        uncraftable
     } = itemFromSku(sku)
 
-
     const chemSeries = {
         20000: 1,
         20005: 2
     }
 
-    const manncoUrl = [
-        440,
-        uncraftable && 'uncraftable',
+    const marketHashName = [
         oq && oq !== '6' && qualityNames[oq],
-        effect && particleEffects[effect],
-        elevated && 'strange',
-        ['6', '15'].includes(quality) === false && qualityNames[quality],
-        festivized && 'festivized',
+        elevated && 'Strange',
+        !['6', '15'].includes(quality) && qualityNames[quality],
+        festivized && 'Festivized',
         killstreakTier && killstreakTiers[killstreakTier],
-        australium && 'australium',
+        australium && 'Australium',
         texture && textures[texture],
         target && items[target].item_name,
         output && items[output].item_name,
         items[defindex].propername === '1' && quality.toString() === '6' && !uncraftable && !elevated && !festivized && !killstreakTier && 'The',
-        items[defindex].item_name.replace('\\n', ' '),
-        wear && wears[wear],
-        chemSeries[defindex] && 'series-' + chemSeries[defindex],
-        series && (!items[defindex].seriesHidden || ['111', '112', '113', '114', '115', '116'].includes(series)) && 'series-' + series
-    ].filter(Boolean).join('-').replaceAll(/[^0-9a-zA-Z -]/g, '').replaceAll(' ', '-').toLowerCase()
+        items[defindex].item_name,
+        wear && '(' + wears[wear] + ')',
+        chemSeries[defindex] && 'Series #' + chemSeries[defindex],
+        series && !items[defindex].seriesHidden && 'Series #' + series
+    ].filter(Boolean).join(' ')
 
-    return 'https://mannco.store/item/' + manncoUrl
+    return marketHashName
 }
 
-const scmUrl = (sku) => {
-
+const manncoUrl = (sku) => {
     const {
         defindex,
         quality,
+        uncraftable,
         killstreakTier,
         target,
         output,
@@ -85,33 +81,41 @@ const scmUrl = (sku) => {
         wear,
         australium,
         series,
-        uncraftable
+        effect
     } = itemFromSku(sku)
 
+
     const chemSeries = {
         20000: 1,
         20005: 2
     }
 
-    const scmUrl = [
+    const manncoUrl = [
+        440,
+        uncraftable && 'uncraftable',
         oq && oq !== '6' && qualityNames[oq],
-        elevated && 'Strange',
-        !['6', '15'].includes(quality) && qualityNames[quality],
-        festivized && 'Festivized',
+        effect && particleEffects[effect],
+        elevated && 'strange',
+        ['6', '15'].includes(quality) === false && qualityNames[quality],
+        festivized && 'festivized',
         killstreakTier && killstreakTiers[killstreakTier],
-        australium && 'Australium',
+        australium && 'australium',
         texture && textures[texture],
         target && items[target].item_name,
         output && items[output].item_name,
         items[defindex].propername === '1' && quality.toString() === '6' && !uncraftable && !elevated && !festivized && !killstreakTier && 'The',
-        items[defindex].item_name,
-        wear && '(' + wears[wear] + ')',
-        chemSeries[defindex] && 'Series%20%23' + chemSeries[defindex],
-        series && !items[defindex].seriesHidden && 'Series%20%23' + series
-    ].filter(Boolean).join(' ')
+        items[defindex].item_name.replace('\\n', ' '),
+        wear && wears[wear],
+        chemSeries[defindex] && 'series-' + chemSeries[defindex],
+        series && (!items[defindex].seriesHidden || ['111', '112', '113', '114', '115', '116'].includes(series)) && 'series-' + series
+    ].filter(Boolean).join('-').replaceAll(/[^0-9a-zA-Z -]/g, '').replaceAll(' ', '-').toLowerCase()
 
+    return 'https://mannco.store/item/' + manncoUrl
+}
 
-    return 'https://steamcommunity.com/market/listings/440/' + scmUrl
+const scmUrl = (sku) => {
+    const marketHashName = marketHashNameFromSku(sku)
+    return 'https://steamcommunity.com/market/listings/440/' + encodeURIComponent(marketHashName)
 }
 
 const bpUrl = (sku) => {
@@ -122,11 +126,11 @@ const bpUrl = (sku) => {
 
     const bpUrl = [
         toBpQuality(sku),
-        toBpName(sku),
+        encodeURIComponent(toBpName(sku)),
         'Tradable',
         uncraftable === true ? 'Non-Craftable' : 'Craftable',
         toBpPriceIndex(sku)
-    ].filter(Boolean).join('/').replace('%', '%25').replace('%250A', '%0A')
+    ].filter(Boolean).join('/')
 
     return 'https://backpack.tf/stats/' + bpUrl
 }
@@ -176,5 +180,6 @@ module.exports = {
     manncoUrl,
     marketplaceUrl,
     bpUrl,
-    scmUrl
+    scmUrl,
+    marketHashNameFromSku
 }