From fbaad193c1f89ee872dba0a995968026263f1b21 Mon Sep 17 00:00:00 2001
From: IdiNium <47635037+idinium96@users.noreply.github.com>
Date: Sat, 4 Jun 2022 03:44:44 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix=20parsing=20[Fabricator=20]K?=
 =?UTF-8?q?illstreak=20Kit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 classes/listing.js | 60 +++++++++++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 25 deletions(-)

diff --git a/classes/listing.js b/classes/listing.js
index 54ecd97..78d53ee 100644
--- a/classes/listing.js
+++ b/classes/listing.js
@@ -165,7 +165,7 @@ class Listing {
             // if (this.item.sheen) {
             //     attributes.sheen = this.item.sheen.id;
             // }
-            
+
             // if (this.item.killstreaker) {
             //     attributes.killstreaker = this.item.killstreaker.id;
             // }
@@ -206,14 +206,18 @@ class Listing {
 
             if (this.item.recipe) {
                 if (this.item.recipe.targetItem) {
-                    attributes.target = this.item.recipe.targetItem.id;
+                    attributes.target = this.item.recipe.targetItem.defindex;
                 }
 
                 if (this.item.recipe.outputItem) {
-                    attributes.output = this.item.recipe.outputItem.id;
+                    attributes.output = this.item.recipe.outputItem.defindex;
+                    const summary = this.item.recipe.outputItem.summary;
+                    if (summary.includes('Killstreak Kit')) {
+                        attributes.killstreak = summary.includes('Specialized Killstreak Kit') ? 2 : 3;
+                    }
 
                     if (this.item.recipe.outputItem.quality) {
-                        attributes.outputQuality = this.item.recipe.outputItem.quality;
+                        attributes.outputQuality = this.item.recipe.outputItem.quality.id;
                     }
                 }
             }
@@ -279,34 +283,40 @@ class Listing {
                     if (!paintDefindexes.includes(this.item.defindex)) {
                         attributes.paint = attribute.float_value;
                     }
-                } else if (
-                    [2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007].includes(attribute.defindex) &&
-                    attribute.is_output == true
-                ) {
-                    if (attribute.attributes === undefined) {
-                        attributes.outputQuality = parseInt(attribute.quality);
-
-                        if (attributes.outputQuality === 14) {
-                            // Chemistry Set Collector's
-                            attributes.output = parseInt(attribute.itemdef);
+                } else if ([2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007].includes(attribute.defindex)) {
+                    if (attribute.is_output == true) {
+                        if (attribute.attributes === undefined) {
+                            attributes.outputQuality = parseInt(attribute.quality);
+
+                            if (attributes.outputQuality === 14) {
+                                // Chemistry Set Collector's
+                                attributes.output = parseInt(attribute.itemdef);
+                            } else {
+                                // Chemistry Set Strangifier
+                                attributes.target = parseInt(attribute.itemdef);
+                            }
                         } else {
-                            // Chemistry Set Strangifier
-                            attributes.target = parseInt(attribute.itemdef);
-                        }
-                    } else {
-                        // Killstreak Fabricator Kit: getting output, outputQuality and target
+                            // Killstreak Fabricator Kit: getting output, outputQuality and target
 
-                        attributes.output = attribute.itemdef;
-                        attributes.outputQuality = attribute.quality;
+                            attributes.output = attribute.itemdef;
+                            attributes.outputQuality = attribute.quality;
 
+                            const attributes2 = attribute.attributes;
+                            const attributes2Count = attributes2.length;
+
+                            for (let i = 0; i < attributes2Count; i++) {
+                                if (attributes2[i].defindex == 2012) {
+                                    attributes.target = attributes2[i].float_value;
+                                }
+                            }
+                        }
+                    } else if (attribute.match_all_attribs === true) {
                         const attributes2 = attribute.attributes;
                         const attributes2Count = attributes2.length;
 
                         for (let i = 0; i < attributes2Count; i++) {
-                            const attributes2Element = attributes2[i];
-                            if (attributes2Element.defindex == 2012) {
-                                const value = attributes2Element.float_value;
-                                attributes.target = typeof value === 'string' ? parseInt(value) : value;
+                            if (attributes2[i].defindex == 2025) {
+                                attributes.killstreak = attributes2[i].float_value + 1;
                             }
                         }
                     }