@juice789/tf2items 1.0.28 → 1.0.30

package/app.js

@@ -14,7 +14,7 @@ const { createApi, api } = require('./api.js')
 const sagas = require('./sagas.js')
 const { saveSchema } = require('./saveSchema.js')
 
-const { fromEconItem } = require('./fromEconItem.js')
+const { fromEconItem, fromEconItemOptions } = require('./fromEconItem.js')
 const { fromListingV1 } = require('./fromListingV1.js')
 const { fromListingV2 } = require('./fromListingV2.js')
 const { blanketify } = require('./blanket.js')
@@ -49,6 +49,7 @@ module.exports = {
     createApi,
     api,
     fromEconItem,
+    fromEconItemOptions,
     fromListingV1,
     fromListingV2,
     blanketify,

package/fromEconItem.js

@@ -36,12 +36,16 @@ const {
     path,
     equals,
     pick,
-    assocPath
+    assocPath,
+    isEmpty,
+    join,
+    filter,
+    omit
 } = require('ramda')
 
 const { safeItems: items } = require('./schemaItems.js')
 const { particleEffects, textures } = require('./schema.json')
-const { qualityNames, wears } = require('./schemaHelper.json')
+const { qualityNames, wears, paintDefindex, spellDefindex } = require('./schemaHelper.json')
 const { skuFromItem } = require('./sku.js')
 const { renameKeys } = require('ramda-adjunct')
 
@@ -63,23 +67,15 @@ const findTag = uncurryN(2, (tagName) => compose(
     propOr([], 'tags')
 ))
 
-const old_id = ifElse(
-    has('new_assetid'),
-    prop('assetid'),
-    always(null)
-)
+const old_id = ({ new_assetid, rollback_new_assetid, assetid }) => (new_assetid || rollback_new_assetid) ? assetid : null
 
-const id = chain(
-    propOr(__, 'new_assetid'),
-    prop('assetid')
-)
+const id = ({ new_assetid, rollback_new_assetid, assetid }) => new_assetid || rollback_new_assetid || assetid
 
 const recipe = compose(
     find(__, ['Fabricator', 'Strangifier Chemistry Set', 'Chemistry Set']),
     flip(marketHashIncludes),
 )
 
-
 const series = ifElse(
     compose(equals('Crate'), findTag('Type')),
     ifElse(
@@ -185,6 +181,24 @@ const uncraftable = compose(
     propOr([], 'descriptions')
 )
 
+const paintOptions = Object.keys(paintDefindex).map(paintName => `Paint Color: ${paintName}`)
+
+const paintColor = compose(
+    when(Boolean, ({ value }) => paintDefindex[value.split('Paint Color: ')[1]]),
+    find(compose(includes(__, paintOptions), prop('value'))),
+    propOr([], 'descriptions')
+)
+
+const spellOptions = Object.keys(spellDefindex).map(spellName => `Halloween: ${spellName} (spell only active during event)`)
+
+const halloweenSpell = compose(
+    when(isEmpty, always(null)),
+    join('_'),
+    map(({ value }) => spellDefindex[value.split('Halloween: ')[1].replace(' (spell only active during event)', '')]),
+    filter(compose(includes(__, spellOptions), prop('value'))),
+    propOr([], 'descriptions')
+)
+
 const market_hash_name = prop('market_hash_name')
 
 const setQuality = when(
@@ -213,6 +227,8 @@ const propsTf2_1 = {
     series,
     craft,
     recipe,
+    halloweenSpell,
+    paintColor,
     id,
     old_id
 }
@@ -305,16 +321,12 @@ const keyRemap = when(
         String,
         prop('defindex')
     ),
-    compose(
-        assoc('defindex', '5021'),
-        assoc('uncraftable', false)
-    )
+    assoc('defindex', '5021')
 )
 
-//725 tour of duty ticket
-const uncraftRemap = when(
+const uncraftRemap = (uncraftRemapDefindex) => when(
     compose(
-        includes(__, ['725']),
+        includes(__, uncraftRemapDefindex),
         String,
         prop('defindex')
     ),
@@ -344,35 +356,43 @@ const otherRemap = when(
     chain(assoc('defindex'), compose(prop(__, otherIndex), prop('defindex')))
 )
 
-const remaps = compose(
-    kitRemap,
-    keyRemap,
-    uncraftRemap,
-    otherRemap
-)
+const defaultOptions440 = {
+    omitProps: ['paintColor', 'halloweenSpell'],
+    uncraftRemapDefindex: ['5021']
+}
 
-const fromEconItem440 = compose(
+const fromEconItem440 = ({ omitProps = [], uncraftRemapDefindex = [] } = defaultOptions440) => compose(
     pick(['sku', 'id', 'old_id']),
     chain(assoc('sku'), skuFromItem),
-    remaps,
+    uncraftRemap(uncraftRemapDefindex),
+    kitRemap,
+    keyRemap,
+    otherRemap,
     chain(mergeRight, compose(map(__, propsTf2_2), applyTo)),
-    map(__, propsTf2_1),
+    map(__, omit(omitProps, propsTf2_1)),
     unary(applyTo),
     setQuality
 )
 
-const fromEconItemOther = compose(
+const fromEconItemOther = (options = {}) => compose(
     map(__, propsOtherGame),
     unary(applyTo)
 )
 
 const fromEconItem = ifElse(
     propEq(440, 'appid'),
-    fromEconItem440,
-    fromEconItemOther
+    fromEconItem440(),
+    fromEconItemOther()
 )
 
+const fromEconItemOptions = curry((options, econItem) => ifElse(
+    propEq(440, 'appid'),
+    fromEconItem440(options),
+    fromEconItemOther(options)
+)(econItem))
+
 module.exports = {
     fromEconItem,
+    fromEconItemOptions,
     kitRemap
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@juice789/tf2items",
-  "version": "1.0.28",
+  "version": "1.0.30",
   "description": "tf2 item schema thingys",
   "main": "app.js",
   "scripts": {

package/schemaHelper.json

@@ -91,6 +91,151 @@
         "supply_crate": "supply_crate",
         "tool": "tool"
     },
+    "paintHex": {
+        "5027": [
+            "729E42"
+        ],
+        "5028": [
+            "424F3B"
+        ],
+        "5029": [
+            "51384A"
+        ],
+        "5030": [
+            "D8BED8"
+        ],
+        "5031": [
+            "7D4071"
+        ],
+        "5032": [
+            "CF7336"
+        ],
+        "5033": [
+            "A57545"
+        ],
+        "5034": [
+            "C5AF91"
+        ],
+        "5035": [
+            "694D3A"
+        ],
+        "5036": [
+            "7C6C57"
+        ],
+        "5037": [
+            "E7B53B"
+        ],
+        "5038": [
+            "7E7E7E"
+        ],
+        "5039": [
+            "E6E6E6"
+        ],
+        "5040": [
+            "141414"
+        ],
+        "5046": [
+            "B8383B",
+            "5885A2"
+        ],
+        "5051": [
+            "FF69B4"
+        ],
+        "5052": [
+            "2F4F4F"
+        ],
+        "5053": [
+            "808000"
+        ],
+        "5054": [
+            "32CD32"
+        ],
+        "5055": [
+            "F0E68C"
+        ],
+        "5056": [
+            "E9967A"
+        ],
+        "5060": [
+            "483838",
+            "384248"
+        ],
+        "5061": [
+            "A89A8C",
+            "839FA3"
+        ],
+        "5062": [
+            "3B1F23",
+            "18233D"
+        ],
+        "5063": [
+            "654740",
+            "28394D"
+        ],
+        "5064": [
+            "803020",
+            "256D8D"
+        ],
+        "5065": [
+            "C36C2D",
+            "B88035"
+        ],
+        "5076": [
+            "BCDDB3"
+        ],
+        "5077": [
+            "2D2D24"
+        ]
+    },
+    "paintDefindex": {
+        "Indubitably Green": "5027",
+        "Zepheniah's Greed": "5028",
+        "Noble Hatter's Violet": "5029",
+        "Color No. 216-190-216": "5030",
+        "A Deep Commitment to Purple": "5031",
+        "Mann Co. Orange": "5032",
+        "Muskelmannbraun": "5033",
+        "Peculiarly Drab Tincture": "5034",
+        "Radigan Conagher Brown": "5035",
+        "Ye Olde Rustic Colour": "5036",
+        "Australium Gold": "5037",
+        "Aged Moustache Grey": "5038",
+        "An Extraordinary Abundance of Tinge": "5039",
+        "A Distinctive Lack of Hue": "5040",
+        "Team Spirit": "5046",
+        "Pink as Hell": "5051",
+        "A Color Similar to Slate": "5052",
+        "Drably Olive": "5053",
+        "The Bitter Taste of Defeat and Lime": "5054",
+        "The Color of a Gentlemann's Business Pants": "5055",
+        "Dark Salmon Injustice": "5056",
+        "Operator's Overalls": "5060",
+        "Waterlogged Lab Coat": "5061",
+        "Balaclavas Are Forever": "5062",
+        "An Air of Debonair": "5063",
+        "The Value of Teamwork": "5064",
+        "Cream Spirit": "5065",
+        "A Mann's Mint": "5076",
+        "After Eight": "5077"
+    },
+    "spellDefindex": {
+        "Halloween Fire": "8925",
+        "Pumpkin Bombs": "8922",
+        "Exorcism": "8921",
+        "Headless Horseshoes": "8920",
+        "Bruised Purple Footprints": "8919",
+        "Rotten Orange Footprints": "8918",
+        "Violent Violet Footprints": "8917",
+        "Corpse Gray Footprints": "8916",
+        "Gangreen Footprints": "8915",
+        "Team Spirit Footprints": "8914",
+        "Voices from Below": "8906",
+        "Sinister Staining": "8904",
+        "Spectral Spectrum": "8903",
+        "Chromatic Corruption": "8902",
+        "Die Job": "8901",
+        "Putrescent Pigmentation": "8900"
+    },
     "cosmeticCollections": [
         "Gun Mettle Cosmetics Collection",
         "Quarantined Collection Case",

package/sku.js

@@ -32,7 +32,9 @@ const skuFromItem = ({
     wear,
     australium,
     series,
-    craft
+    craft,
+    paintColor,
+    halloweenSpell
 }) => [
     defindex,
     quality,
@@ -49,6 +51,8 @@ const skuFromItem = ({
     ['1', true].includes(australium) && 'australium',
     series && isNaN(series) === false && 'c-' + parseInt(series),
     craft && isNaN(craft) === false && 'no-' + parseInt(craft),
+    paintColor && 'pc-' + paintColor,
+    halloweenSpell && 'hs-' + halloweenSpell
 ].filter(Boolean).join(';')
 
 const rules = {
@@ -64,7 +68,9 @@ const rules = {
     w: "wear",
     australium: 'australium',
     c: "series",
-    no: "craft"
+    no: "craft",
+    pc: "paintColor",
+    hs: "halloweenSpell"
 }
 
 const decodeRules = compose(