Skier L2 updates

Ereshkigal-BaseAssortGenerator/src/skier.js

@@ -193,6 +193,9 @@ class SkierAssort {
         const CoreMod = require("../../CoreMod/src/Core.js");
         let id = null;
 		
+		//.300 aac blackout bcp fmj
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fbe3ffdf8b6a877a729ea82", "58330581ace78e27b8b10cee", 91, "RUB", 3, false, 700000, 500);
+
         //DVL-10 Mag
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5888988e24597752fe43a6fa", "58330581ace78e27b8b10cee", 5167, "RUB", 2, false, 15000);
 
@@ -203,7 +206,20 @@ class SkierAssort {
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5ce69cbad7f00c00b61c5098", "58330581ace78e27b8b10cee", 3220, "RUB", 2, false, 2000);
 
         //Glock .45 ACP 13-round magazine
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fb651b52b1b027b1f50bcff", "58330581ace78e27b8b10cee", 1783, "RUB", 2, true, 999999);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fb651b52b1b027b1f50bcff", 
+		"58330581ace78e27b8b10cee", 1783, "RUB", 2, true, 999999);
+		
+		//Glock .45 acp kriss g30 magex 30-round magazine
+		CoreMod.CreateTraderBarter(HashUtil.generate(), "5fb651dc85f90547f674b6f4", "hideout", "hideout", [
+                [{
+                        "count": 1,
+                        "_tpl": "5734770f24597738025ee254"
+                    }, {
+                        "count": 1,
+                        "_tpl": "5d1c819a86f774771b0acd6c"
+                    }
+                ]
+            ], "58330581ace78e27b8b10cee", 1, false, 3000, 6);
 
         //FAB Defense protection cap for AGR-870
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5bfe86bd0db83400232fe959", "58330581ace78e27b8b10cee", 297, "RUB", 2, false, 2000);
@@ -218,7 +234,7 @@ class SkierAssort {
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5cf4fb76d7f00c065703d3ac", "58330581ace78e27b8b10cee", 4025, "RUB", 2, false, 20000);
 
         //AK Zenit DTK-1 7.62x39 & 5.45x39 muzzle brake & compensator
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5649ab884bdc2ded0b8b457f", "58330581ace78e27b8b10cee", 4865, "RUB", 2, false, 15000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5649ab884bdc2ded0b8b457f", "58330581ace78e27b8b10cee", 4865, "RUB", 2, false, 15000, 5);
 
         //AR-15 Surefire WarComp 5.56x45 Flash hider
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c6d710d2e22165df16b81e7", "58330581ace78e27b8b10cee", 5520, "RUB", 2, false, 2000);
@@ -232,12 +248,31 @@ class SkierAssort {
         //TT 7.62x25 makeshift sound suppressor
         CoreMod.CreateTraderAssort(HashUtil.generate(), "571a28e524597720b4066567", "58330581ace78e27b8b10cee", 17140, "RUB", 2, false, 2000, 3);
 		
-        //OKP-7 Reflex sight
+		// hexagon 12k 12ga sound suppressor
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "570fd79bd2720bc7458b4583", "58330581ace78e27b8b10cee", 16885, "RUB", 2, false, 5000, 4);
+		CoreMod.CreateTraderBarter(HashUtil.generate(), "59c0ec5b86f77435b128bfca", "hideout", "hideout", [
+                [{
+                        "count": 1,
+                        "_tpl": "59e3647686f774176a362507"
+                    }
+                ]
+            ], "58330581ace78e27b8b10cee", 1, false, 2000, 2);
+	
+			
+		//rotor 43 9x19 muzzle brake
+		CoreMod.CreateTraderBarter(HashUtil.generate(), "5a9fb739a2750c003215717f", "hideout", "hideout", [
+                [{
+                        "count": 1,
+                        "_tpl": "5af0484c86f7740f02001f7f"
+                    }
+                ]
+            ], "58330581ace78e27b8b10cee", 1, false, 2000, 2);
 
         //Primary Arms Compact prism scope 2.5x
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c1cdd512e22161b267d91ae", "58330581ace78e27b8b10cee", 20125, "RUB", 2, false, 20000);
 		
+        //OKP-7 Reflex sight
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "570fd79bd2720bc7458b4583", "58330581ace78e27b8b10cee", 16885, "RUB", 2, false, 5000, 4);
+
         //Holosun HS401G5 reflex sight
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5b30b0dc5acfc400153b7124", "58330581ace78e27b8b10cee", 17131, "RUB", 2, false, 2000, 4);
 
@@ -253,12 +288,12 @@ class SkierAssort {
         //KRISS Defiance low profile flip up front sight
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5fb6567747ce63734e3fa1dc", "58330581ace78e27b8b10cee", 2530, "RUB", 2, false, 20000, 5);
 		
-        //Zenit 2P Klesch flashlight + laser designator
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "560d657b4bdc2da74d8b4572", "58330581ace78e27b8b10cee", 18028, "RUB", 2, false, 15000);
-
         //PNV-10T NV Goggles
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c0696830db834001d23f5da", "58330581ace78e27b8b10cee", 32200, "RUB", 2, false, 2000, 3);
 
+        //Zenit 2P Klesch flashlight + laser designator
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "560d657b4bdc2da74d8b4572", "58330581ace78e27b8b10cee", 18028, "RUB", 2, false, 15000);
+
         //MP-443 B-8 mount
         CoreMod.CreateTraderAssort(HashUtil.generate(), "576a7c512459771e796e0e17", "58330581ace78e27b8b10cee", 3156, "RUB", 2, false, 15000);
 
@@ -283,18 +318,39 @@ class SkierAssort {
         //Zenit B-13V "Klassika" dovetail rail platform
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c90c3622e221601da359851", "58330581ace78e27b8b10cee", 8740, "RUB", 2, false, 2000, 4);
 		
+		//KRISS vector bottom rail
+		CoreMod.CreateTraderAssort(HashUtil.generate(), "5fbb976df9986c4cff3fe5f2", "58330581ace78e27b8b10cee", 1265, "RUB", 2, false, 20000, 5);
+		
+		//KRISS vector side rail
+		CoreMod.CreateTraderAssort(HashUtil.generate(), "5fce0f9b55375d18a253eff2", "58330581ace78e27b8b10cee", 1188, "RUB", 2, false, 20000, 5);
+		
+		//colt buffer tube
+		CoreMod.CreateTraderAssort(HashUtil.generate(), "5649be884bdc2d79388b4577", "58330581ace78e27b8b10cee", 1352, "RUB", 2, false, 12000, 8);
+		
+		// aks-74/aks-74u zenit pt lock
+		CoreMod.CreateTraderAssort(HashUtil.generate(), "59ecc28286f7746d7a68aa8c", "58330581ace78e27b8b10cee", 3713, "RUB", 2, false, 15000, 10);
+
+		// akm/ak-74 zenit pt lock
+		CoreMod.CreateTraderAssort(HashUtil.generate(), "5b222d335acfc4771e1be099", "58330581ace78e27b8b10cee", 3668, "RUB", 2, false, 2000, 10);
+		
+		//ak zenit pt-1 "klassika" stock
+		CoreMod.CreateTraderAssort(HashUtil.generate(), "5b222d405acfc400153af4fe", "58330581ace78e27b8b10cee", 13522, "RUB", 2, false, 20000, 5);
+
         //FAB Defense buffer tube for AGR-870
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5bfe89510db834001808a127", "58330581ace78e27b8b10cee", 1231, "RUB", 2, false, 2000);
 
         //KRISS Vector Gen.2 folding stock
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5fb6558ad6f0b2136f2d7eb7", "58330581ace78e27b8b10cee", 7038, "RUB", 2, false, 20000, 5);
 		
+		//KRISS vector pistol sling adapter
+		CoreMod.CreateTraderAssort(HashUtil.generate(), "5fb655a72b1b027b1f50bd06", "58330581ace78e27b8b10cee", 1725, "RUB", 2, false, 2000, 4);
+
+		//FAB Defense GL-Core buttstock
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "602e620f9b513876d4338d9a", "58330581ace78e27b8b10cee", 4715, "RUB", 2, false, 10000, 4);
+
         //KRISS Vector non-folding stock adapter
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5fb655b748c711690e3a8d5a", "58330581ace78e27b8b10cee", 4485, "RUB", 2, false, 20000, 7);
 
-        //FAB Defense GL-Core buttstock
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "602e620f9b513876d4338d9a", "58330581ace78e27b8b10cee", 4715, "RUB", 2, false, 10000, 4);
-
         //TT 7.62x25 121mm homespun threaded barrel
         CoreMod.CreateTraderAssort(HashUtil.generate(), "571a279b24597720b4066566", "58330581ace78e27b8b10cee", 2472, "RUB", 2, false, 2000, 3);
 
@@ -304,21 +360,27 @@ class SkierAssort {
         //AR-15 5.56x45 406mm barrel
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c0e2f94d174af029f650d56", "58330581ace78e27b8b10cee", 18630, "RUB", 2, false, 2000, 4);
 
-        //KRISS Vector 9x19 6 inch barrel
+        //KRISS Vector 9x19 5 inch barrel
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fbbc366ca32ed67276c1557", "58330581ace78e27b8b10cee", 9430, "RUB", 2, false, 20000, 5);
+		
+		//KRISS Vector 9x19 6 inch barrel
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5fbbc383d5cb881a7363194a", "58330581ace78e27b8b10cee", 11155, "RUB", 2, false, 20000, 5);
 
         //SOK-12 Leapers UTG PRO MTU002 Short Top aluminum handguard
         CoreMod.CreateTraderAssort(HashUtil.generate(), "58272b392459774b4c7b3ccd", "58330581ace78e27b8b10cee", 8670, "RUB", 2, false, 15000);
 		
-        //PR870 forestock
+		// ak tdi akm-l handguard
+		CoreMod.CreateTraderAssort(HashUtil.generate(), "5d1b198cd7ad1a604869ad72", "58330581ace78e27b8b10cee", 4830, "RUB", 2, false, 2000);
+
+        //m870 fab defense PR870 forestock
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5a788031c585673f2b5c1c79", "58330581ace78e27b8b10cee", 2359, "RUB", 2, false, 2000);
 		
+		//AR-15 Magpul MOE SL mid length M-LOK handguard
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c78f26f2e221601da3581d1", "58330581ace78e27b8b10cee", 12765, "RUB", 2, false, 2000);
+
         //Zenit B-10 handguard
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c617a5f2e2216000f1e81b3", "58330581ace78e27b8b10cee", 7049, "RUB", 2, false, 25000, 5);
 
-        //AR-15 Magpul MOE SL mid length M-LOK handguard
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c78f26f2e221601da3581d1", "58330581ace78e27b8b10cee", 12765, "RUB", 2, false, 2000);
-
         //AK TDI AKM-L handguard
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5d1b198cd7ad1a604869ad72", "58330581ace78e27b8b10cee", 4830, "RUB", 2, false, 1870);
 
@@ -329,7 +391,7 @@ class SkierAssort {
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5bfe86a20db834001d23e8f7", "58330581ace78e27b8b10cee", 3300, "RUB", 2, false, 20000, 4);
 
         //Euros
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "569668774bdc2da2298b4568", "58330581ace78e27b8b10cee", 147, "RUB", 2, true, 999999);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "569668774bdc2da2298b4568", "58330581ace78e27b8b10cee", 145, "RUB", 2, true, 999999);
 
         //M870
         id = HashUtil.generate();
@@ -337,18 +399,17 @@ class SkierAssort {
 
         //Vector .45 ACP
         id = HashUtil.generate();
-        CoreMod.CreateTraderAssortWithPreset(id, "5fd251ee16cac650092f5d02", "58330581ace78e27b8b10cee", 86439, "RUB", 2, false, 20000, 3);
+        CoreMod.CreateTraderAssortWithPreset(id, "5fd251ee16cac650092f5d02", "58330581ace78e27b8b10cee", 89439, "RUB", 2, false, 20000, 3);
 
-        //STM-9
+        //STM-9 gen.2 9x19 carbine default preset
-        //Todo: create preset
         id = HashUtil.generate();
-        CoreMod.CreateTraderAssortWithPreset(id, "5c0c1dff86f7744dba7a2892", "58330581ace78e27b8b10cee", 44121, "RUB", 2, false, 50000, 4);
+        CoreMod.CreateTraderAssortWithPreset(id, "60479c3f420fac5ebc199f86", "58330581ace78e27b8b10cee", 44121, "RUB", 2, false, 50000, 4);
 
         //SIG MCX .300
         id = HashUtil.generate();
         CoreMod.CreateTraderBarterWithPreset(id, "5fd251a31189a17bcc172662", "hideout", "hideout", [
                 [{
-                        "count": 1,
+                        "count": 2,
                         "_tpl": "5c1265fc86f7743f896a21c2"
                     }, {
                         "count": 1,
@@ -369,9 +430,6 @@ class SkierAssort {
                 ]
             ], "58330581ace78e27b8b10cee", 3, false, 2000, 12);
 
-        //.300 aac blackout bcp fmj
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fbe3ffdf8b6a877a729ea82", "58330581ace78e27b8b10cee", 91, "RUB", 3, false, 700000);
-
         //ak 7.62x39 molot 40-round magazine
         CoreMod.CreateTraderAssort(HashUtil.generate(), "59e5f5a486f7746c530b3ce2", "58330581ace78e27b8b10cee", 2862, "RUB", 3, false, 15000);