From 13915e17c01dfadde6d3f3d9e0176569ea9013df Mon Sep 17 00:00:00 2001 From: Chomp Date: Sun, 8 Aug 2021 16:19:29 +0100 Subject: [PATCH 1/3] Prapor L1 changes --- Ereshkigal-BaseAssortGenerator/src/prapor.js | 675 ++++++++++--------- 1 file changed, 345 insertions(+), 330 deletions(-) diff --git a/Ereshkigal-BaseAssortGenerator/src/prapor.js b/Ereshkigal-BaseAssortGenerator/src/prapor.js index ba3c26a..7c79c89 100644 --- a/Ereshkigal-BaseAssortGenerator/src/prapor.js +++ b/Ereshkigal-BaseAssortGenerator/src/prapor.js @@ -2,9 +2,11 @@ エレシュキガル */ -class PraporAssort{ +class PraporAssort +{ - static GenerateLL1() { + static GenerateLL1() + { const CoreMod = require("../../CoreMod/src/Core.js"); DatabaseServer.tables.traders["54cb50c76803fa8b248b4571"].assort = { "items": [], @@ -17,21 +19,21 @@ class PraporAssort{ //5x45 BP x30 GS box CoreMod.CreateTraderBarter(HashUtil.generate(), "57372ac324597767001bc261", "hideout", "hideout", [ - [{ - "count": 1, - "_tpl": "59e358a886f7741776641ac3" - } - ] - ], "54cb50c76803fa8b248b4571", 1, false, 2000, 3); + [{ + "count": 1, + "_tpl": "59e358a886f7741776641ac3" + } + ] + ], "54cb50c76803fa8b248b4571", 1, false, 2000, 3); //5x45 BT x30 GS box CoreMod.CreateTraderBarter(HashUtil.generate(), "57372c89245977685d4159b1", "hideout", "hideout", [ - [{ - "count": 2, - "_tpl": "57347da92459774491567cf5" - } - ] - ], "54cb50c76803fa8b248b4571", 1, false, 4000, 4); + [{ + "count": 2, + "_tpl": "57347da92459774491567cf5" + } + ] + ], "54cb50c76803fa8b248b4571", 1, false, 4000, 4); //7mm buckshot CoreMod.CreateTraderAssort(HashUtil.generate(), "560d5e524bdc2d25448b4571", "54cb50c76803fa8b248b4571", 33, "RUB", 1, true, 999999); @@ -40,7 +42,7 @@ class PraporAssort{ CoreMod.CreateTraderAssort(HashUtil.generate(), "5656d7c34bdc2d9d198b4587", "54cb50c76803fa8b248b4571", 91, "RUB", 1, true, 999999); //5.45x39mm PRS GS - CoreMod.CreateTraderAssort(HashUtil.generate(), "56dff338d2720bbd668b4569", "54cb50c76803fa8b248b4571", 51, "RUB", 1, true, 999999); + CoreMod.CreateTraderAssort(HashUtil.generate(), "56dff338d2720bbd668b4569", "54cb50c76803fa8b248b4571", 46, "RUB", 1, true, 999999); //5.45x39mm T GS CoreMod.CreateTraderAssort(HashUtil.generate(), "56dff4a2d2720bbd668b456a", "54cb50c76803fa8b248b4571", 44, "RUB", 1, true, 999999); @@ -80,15 +82,15 @@ class PraporAssort{ //F-1 Hand grenade CoreMod.CreateTraderBarter(HashUtil.generate(), "5710c24ad2720bc3458b45a3", "hideout", "hideout", [ - [{ - "count": 2, - "_tpl": "590a3cd386f77436f20848cb" - } - ] - ], "54cb50c76803fa8b248b4571", 1, false, 2000, 3); + [{ + "count": 2, + "_tpl": "590a3cd386f77436f20848cb" + } + ] + ], "54cb50c76803fa8b248b4571", 1, false, 2000, 3); //RDG Smoke - CoreMod.CreateTraderAssort(HashUtil.generate(), "5a2a57cfc4a2826c6e06d44a", "54cb50c76803fa8b248b4571", 5931, "RUB", 1, false, 37000, 6); + CoreMod.CreateTraderAssort(HashUtil.generate(), "5a2a57cfc4a2826c6e06d44a", "54cb50c76803fa8b248b4571", 5931, "RUB", 1, false, 37000, 4); //PM 9X18PM 90-93 8-round magazine CoreMod.CreateTraderAssort(HashUtil.generate(), "5448c12b4bdc2d02308b456f", "54cb50c76803fa8b248b4571", 1025, "RUB", 1, true, 999999); @@ -110,12 +112,12 @@ class PraporAssort{ //PP-91 9x18PM 30-round magazine CoreMod.CreateTraderBarter(HashUtil.generate(), "57d1519e24597714373db79d", "hideout", "hideout", [ - [{ - "count": 1, - "_tpl": "5d1b31ce86f7742523398394" - } - ] - ], "54cb50c76803fa8b248b4571", 1, false, 2000, 12); + [{ + "count": 1, + "_tpl": "5d1b31ce86f7742523398394" + } + ] + ], "54cb50c76803fa8b248b4571", 1, false, 2000, 12); //PP-19-01 Vityaz-SN 9x19 30-round magazine CoreMod.CreateTraderAssort(HashUtil.generate(), "599860ac86f77436b225ed1a", "54cb50c76803fa8b248b4571", 2640, "RUB", 1, true, 999999); @@ -127,7 +129,7 @@ class PraporAssort{ CoreMod.CreateTraderAssort(HashUtil.generate(), "5a17fb03fcdbcbcae668728f", "54cb50c76803fa8b248b4571", 926, "RUB", 1, true, 999999); //Mosin 7.62x54R 5-round magazine - CoreMod.CreateTraderAssort(HashUtil.generate(), "5ae0973a5acfc4001562206c", "54cb50c76803fa8b248b4571", 2148, "RUB", 1, false, 3000); + CoreMod.CreateTraderAssort(HashUtil.generate(), "5ae0973a5acfc4001562206c", "54cb50c76803fa8b248b4571", 2148, "RUB", 1, false, 3000, 5); //PPSh-41 7.62x25 35-round magazine CoreMod.CreateTraderAssort(HashUtil.generate(), "5ea034eb5aad6446a939737b", "54cb50c76803fa8b248b4571", 2868, "RUB", 1, true, 999999, 10); @@ -140,6 +142,9 @@ class PraporAssort{ //AK-74 5.45x39 muzzle brake & compensator (6P20 0-20) CoreMod.CreateTraderAssort(HashUtil.generate(), "5649aa744bdc2ded0b8b457e", "54cb50c76803fa8b248b4571", 757, "RUB", 1, false, 70000); + + //akm 7.62x39 muzzle brake & compensator (6p1 0-14) + CoreMod.CreateTraderAssort(HashUtil.generate(), "59d64fc686f774171b243fe2", "54cb50c76803fa8b248b4571", 663, "RUB", 1, false, 2000, 4); //AKS-74U 5.45x39 muzzle brake (6P26 0-20) CoreMod.CreateTraderAssort(HashUtil.generate(), "57dc324a24597759501edc20", "54cb50c76803fa8b248b4571", 784, "RUB", 1, false, 70000); @@ -173,12 +178,12 @@ class PraporAssort{ //Zenit-BelOMO PSO-1M2-1 4x24 scope CoreMod.CreateTraderBarter(HashUtil.generate(), "576fd4ec2459777f0b518431", "hideout", "hideout", [ - [{ - "count": 2, - "_tpl": "590a3c0a86f774385a33c450" - } - ] - ], "54cb50c76803fa8b248b4571", 1, false, 2000); + [{ + "count": 2, + "_tpl": "590a3c0a86f774385a33c450" + } + ] + ], "54cb50c76803fa8b248b4571", 1, false, 2000); //PU 3.5x rifle scope CoreMod.CreateTraderAssort(HashUtil.generate(), "5b3f7c1c5acfc40dc5296b1d", "54cb50c76803fa8b248b4571", 13446, "RUB", 1, false, 20000, 5); @@ -238,18 +243,18 @@ class PraporAssort{ id = HashUtil.generate(); CoreMod.CreateTraderAssortWithPreset(id, "58dffce486f77409f40f8162", "54cb50c76803fa8b248b4571", 21810, "RUB", 1, true, 999999); - //AKS-74U + //AKS-74UN id = HashUtil.generate(); CoreMod.CreateTraderBarterWithPreset(id, "584147732459775a2b6d9f12", "hideout", "hideout", [ - [{ - "count": 1, - "_tpl": "573478bc24597738002c6175" - }, { - "count": 1, - "_tpl": "5e2af00086f7746d3f3c33f7" - } - ] - ], "54cb50c76803fa8b248b4571", 1, false, 7000); + [{ + "count": 2, + "_tpl": "573478bc24597738002c6175" + }, { + "count": 1, + "_tpl": "5e2af00086f7746d3f3c33f7" + } + ] + ], "54cb50c76803fa8b248b4571", 1, false, 2000, 1); //AKS-74u id = HashUtil.generate(); @@ -259,12 +264,12 @@ class PraporAssort{ //AKM id = HashUtil.generate(); CoreMod.CreateTraderBarterWithPreset(id, "59e8d2ab86f77407f03fc9c2", "hideout", "hideout", [ - [{ - "count": 3, - "_tpl": "57347d7224597744596b4e72" - } - ] - ], "54cb50c76803fa8b248b4571", 1, false, 20000, 1); + [{ + "count": 3, + "_tpl": "57347d7224597744596b4e72" + } + ] + ], "54cb50c76803fa8b248b4571", 1, false, 20000, 1); //PM "Makarov" 9x18 id = HashUtil.generate(); @@ -273,15 +278,15 @@ class PraporAssort{ // PM "Makarov" 9x18 id = HashUtil.generate(); CoreMod.CreateTraderBarterWithPreset(id, "58414967245977598f1ad391", "hideout", "hideout", [ - [{ - "count": 1, - "_tpl": "57347c5b245977448d35f6e1" - }, { - "count": 1, - "_tpl": "57347c77245977448d35f6e2" - } - ] - ], "54cb50c76803fa8b248b4571", 1, false, 20000, 5); + [{ + "count": 1, + "_tpl": "57347c5b245977448d35f6e1" + }, { + "count": 1, + "_tpl": "57347c77245977448d35f6e2" + } + ] + ], "54cb50c76803fa8b248b4571", 1, false, 20000, 5); //tt-33 id = HashUtil.generate(); @@ -289,20 +294,30 @@ class PraporAssort{ //mp-443 id = HashUtil.generate(); - CoreMod.CreateTraderAssortWithPreset(id, "584148a524597759eb357a44", "54cb50c76803fa8b248b4571", 13816, "RUB", 1, false, 200000); + CoreMod.CreateTraderAssortWithPreset(id, "584148a524597759eb357a44", "54cb50c76803fa8b248b4571", 13816, "RUB", 1, false, 2000, 2); + + //mp-443 + id = HashUtil.generate(); + CoreMod.CreateTraderBarterWithPreset(id, "584148a524597759eb357a44", "hideout", "hideout", [ + [{ + "count": 1, + "_tpl": "573477e124597737dd42e191" + } + ] + ], "54cb50c76803fa8b248b4571", 1, false, 2000); //APS id = HashUtil.generate(); CoreMod.CreateTraderBarterWithPreset(id, "5ac4accf86f774181345c3d7", "hideout", "hideout", [ - [{ - "count": 1, - "_tpl": "59e35ef086f7741777737012" - }, { - "count": 1, - "_tpl": "57347c5b245977448d35f6e1" - } - ] - ], "54cb50c76803fa8b248b4571", 1, false, 2000); + [{ + "count": 1, + "_tpl": "59e35ef086f7741777737012" + }, { + "count": 1, + "_tpl": "57347c5b245977448d35f6e1" + } + ] + ], "54cb50c76803fa8b248b4571", 1, false, 2000); //pp-91 kedr id = HashUtil.generate(); @@ -311,19 +326,19 @@ class PraporAssort{ //PP-19-01 id = HashUtil.generate(); CoreMod.CreateTraderBarterWithPreset(id, "59b81f7386f77421ac688a0a", "hideout", "hideout", [ - [{ - "count": 4, - "_tpl": "57347cd0245977445a2d6ff1" - } - ] - ], "54cb50c76803fa8b248b4571", 1, false, 2000, 2); + [{ + "count": 4, + "_tpl": "57347cd0245977445a2d6ff1" + } + ] + ], "54cb50c76803fa8b248b4571", 1, false, 2000, 2); //6B34 anti-fragmentation glasses CoreMod.CreateTraderAssort(HashUtil.generate(), "5b432be65acfc433000ed01f", "54cb50c76803fa8b248b4571", 3003, "RUB", 1, true, 999999, 3); //PPSH-41 id = HashUtil.generate(); - CoreMod.CreateTraderAssortWithPreset(id, "5eb2963686f7742d3f5ab0f8", "54cb50c76803fa8b248b4571", 15488, "RUB", 1, false, 200000); + CoreMod.CreateTraderAssortWithPreset(id, "5eb2963686f7742d3f5ab0f8", "54cb50c76803fa8b248b4571", 26599, "RUB", 1, false, 200000, 3); //6B47 Ratnik-BSh helmet CoreMod.CreateTraderAssort(HashUtil.generate(), "5a7c4850e899ef00150be885", "54cb50c76803fa8b248b4571", 33336, "RUB", 1, true, 999999, 3); @@ -331,68 +346,68 @@ class PraporAssort{ //Mosin sniper carbine id = HashUtil.generate(); CoreMod.CreateTraderBarterWithPreset(id, "5c0c1f2b86f77455912eaefc", "hideout", "hideout", [ - [{ - "count": 5, - "_tpl": "5672cb304bdc2dc2088b456a" - }, { - "count": 8, - "_tpl": "5672cb124bdc2d1a0f8b4568" - } - ] - ], "54cb50c76803fa8b248b4571", 1, false, 2000, 1); + [{ + "count": 5, + "_tpl": "5672cb304bdc2dc2088b456a" + }, { + "count": 8, + "_tpl": "5672cb124bdc2d1a0f8b4568" + } + ] + ], "54cb50c76803fa8b248b4571", 1, false, 2000, 1); //SFera-S CoreMod.CreateTraderBarter(HashUtil.generate(), "5aa7d193e5b5b000171d063f", "hideout", "hideout", [ - [{ - "count": 2, - "_tpl": "57347d9c245977448b40fa85" - }, { - "count": 1, - "_tpl": "5d40407c86f774318526545a" - } - ] - ], "54cb50c76803fa8b248b4571", 1, false, 2000, 3); + [{ + "count": 2, + "_tpl": "57347d9c245977448b40fa85" + }, { + "count": 1, + "_tpl": "5d40407c86f774318526545a" + } + ] + ], "54cb50c76803fa8b248b4571", 1, false, 2000, 3); //GSSh-01 active headset CoreMod.CreateTraderAssort(HashUtil.generate(), "5b432b965acfc47a8774094e", "54cb50c76803fa8b248b4571", 13039, "RUB", 1, true, 999999); //Mosin infantry id = HashUtil.generate(); - CoreMod.CreateTraderAssortWithPreset(id, "5b8683a486f77467f2423114", "54cb50c76803fa8b248b4571", 47192, "RUB", 1, true, 999999); + CoreMod.CreateTraderAssortWithPreset(id, "5b8683a486f77467f2423114", "54cb50c76803fa8b248b4571", 35043, "RUB", 1, true, 999999); //Mosin infantry carbine id = HashUtil.generate(); - CoreMod.CreateTraderAssortWithPreset(id, "5c0c1dff86f7744dba7a2892", "54cb50c76803fa8b248b4571", 47794, "RUB", 1, false, 20000, 4); + CoreMod.CreateTraderAssortWithPreset(id, "5c0c1dff86f7744dba7a2892", "54cb50c76803fa8b248b4571", 34825, "RUB", 1, false, 20000, 4); //6B23-1 CoreMod.CreateTraderBarter(HashUtil.generate(), "5c0e5bab86f77461f55ed1f3", "hideout", "hideout", [ - [{ - "count": 1, - "_tpl": "59fafb5d86f774067a6f2084" - } - ] - ], "54cb50c76803fa8b248b4571", 1, false, 1000, 1); + [{ + "count": 1, + "_tpl": "59fafb5d86f774067a6f2084" + } + ] + ], "54cb50c76803fa8b248b4571", 1, false, 2000, 1); //VKBO bag CoreMod.CreateTraderBarter(HashUtil.generate(), "5ab8ee7786f7742d8f33f0b9", "hideout", "hideout", [ - [{ - "count": 2, - "_tpl": "5672cb124bdc2d1a0f8b4568" - } - ] - ], "54cb50c76803fa8b248b4571", 1, false, 20000, 3); + [{ + "count": 2, + "_tpl": "5672cb124bdc2d1a0f8b4568" + } + ] + ], "54cb50c76803fa8b248b4571", 1, false, 20000, 3); //6sh112 CoreMod.CreateTraderBarter(HashUtil.generate(), "5929a2a086f7744f4b234d43", "hideout", "hideout", [ - [{ - "count": 1, - "_tpl": "575146b724597720a27126d5" - }, { - "count": 1, - "_tpl": "57347d90245977448f7b7f65" - } - ] - ], "54cb50c76803fa8b248b4571", 1, false, 2000, 2); + [{ + "count": 1, + "_tpl": "575146b724597720a27126d5" + }, { + "count": 1, + "_tpl": "57347d90245977448f7b7f65" + } + ] + ], "54cb50c76803fa8b248b4571", 1, false, 2000, 2); } static GenerateLL2() { const CoreMod = require("../../CoreMod/src/Core.js"); @@ -519,75 +534,75 @@ class PraporAssort{ //5x45 BT x30 GS box CoreMod.CreateTraderBarter(HashUtil.generate(), "57372c89245977685d4159b1", "hideout", "hideout", [ - [{ - "count": 1, - "_tpl": "590a373286f774287540368b" - } - ] - ], "54cb50c76803fa8b248b4571", 2, false, 2000); + [{ + "count": 1, + "_tpl": "590a373286f774287540368b" + } + ] + ], "54cb50c76803fa8b248b4571", 2, false, 2000); //RGD-5 Hand grenade CoreMod.CreateTraderBarter(HashUtil.generate(), "5448be9a4bdc2dfd2f8b456a", "hideout", "hideout", [ - [{ - "count": 1, - "_tpl": "590a3cd386f77436f20848cb" - } - ] - ], "54cb50c76803fa8b248b4571", 2, true, 999999); + [{ + "count": 1, + "_tpl": "590a3cd386f77436f20848cb" + } + ] + ], "54cb50c76803fa8b248b4571", 2, true, 999999); //6L18 CoreMod.CreateTraderBarter(HashUtil.generate(), "564ca9df4bdc2d35148b4569", "hideout", "hideout", [ - [{ - "count": 1, - "_tpl": "590a3c0a86f774385a33c450" - }, { - "count": 1, - "_tpl": "590c311186f77424d1667482" - } - ] - ], "54cb50c76803fa8b248b4571", 2, false, 6000, 10); + [{ + "count": 1, + "_tpl": "590a3c0a86f774385a33c450" + }, { + "count": 1, + "_tpl": "590c311186f77424d1667482" + } + ] + ], "54cb50c76803fa8b248b4571", 2, false, 6000, 10); //PPSH Drum mag CoreMod.CreateTraderBarter(HashUtil.generate(), "5ea034f65aad6446a939737e", "hideout", "hideout", [ - [{ - "count": 1, - "_tpl": "5d1c819a86f774771b0acd6c" - } - ] - ], "54cb50c76803fa8b248b4571", 2, false, 5000, 2); + [{ + "count": 1, + "_tpl": "5d1c819a86f774771b0acd6c" + } + ] + ], "54cb50c76803fa8b248b4571", 2, false, 5000, 2); //Valday PS-320 1x/6x scope CoreMod.CreateTraderBarter(HashUtil.generate(), "5c0517910db83400232ffee5", "hideout", "hideout", [ - [{ - "count": 2, - "_tpl": "5d40407c86f774318526545a" - }, { - "count": 1, - "_tpl": "590c5f0d86f77413997acfab" - } - ] - ], "54cb50c76803fa8b248b4571", 2, false, 2000, 2); + [{ + "count": 2, + "_tpl": "5d40407c86f774318526545a" + }, { + "count": 1, + "_tpl": "590c5f0d86f77413997acfab" + } + ] + ], "54cb50c76803fa8b248b4571", 2, false, 2000, 2); //MPL-50 Entrenching tool CoreMod.CreateTraderBarter(HashUtil.generate(), "5bead2e00db834001c062938", "hideout", "hideout", [ - [{ - "count": 2, - "_tpl": "5b4329075acfc400153b78ff" - } - ] - ], "54cb50c76803fa8b248b4571", 2, true, 999999); + [{ + "count": 2, + "_tpl": "5b4329075acfc400153b78ff" + } + ] + ], "54cb50c76803fa8b248b4571", 2, true, 999999); //Metal fuel tank CoreMod.CreateTraderBarter(HashUtil.generate(), "5d1b36a186f7742523398433", "hideout", "hideout", [ - [{ - "count": 2, - "_tpl": "59fafb5d86f774067a6f2084" - }, { - "count": 1, - "_tpl": "5b43575a86f77424f443fe62" - } - ] - ], "54cb50c76803fa8b248b4571", 2, false, 2000, 1); + [{ + "count": 2, + "_tpl": "59fafb5d86f774067a6f2084" + }, { + "count": 1, + "_tpl": "5b43575a86f77424f443fe62" + } + ] + ], "54cb50c76803fa8b248b4571", 2, false, 2000, 1); //AK-74N Wood id = HashUtil.generate(); @@ -633,90 +648,90 @@ class PraporAssort{ //Todo Preset needs to be manually added id = HashUtil.generate(); CoreMod.CreateTraderBarterWithPreset(id, "5c0c1f2b86f77455912eaefc", "hideout", "hideout", [ - [{ - "count": 5, - "_tpl": "573475fb24597737fb1379e1" - } - ] - ], "54cb50c76803fa8b248b4571", 2, false, 20000, 2); + [{ + "count": 5, + "_tpl": "573475fb24597737fb1379e1" + } + ] + ], "54cb50c76803fa8b248b4571", 2, false, 20000, 2); //AKS-74UB id = HashUtil.generate(); CoreMod.CreateTraderBarterWithPreset(id, "584147982459775a6c55e931", "hideout", "hideout", [ - [{ - "count": 1, - "_tpl": "59e3658a86f7741776641ac4" - }, { - "count": 2, - "_tpl": "5909e99886f7740c983b9984" - }, { - "count": 1, - "_tpl": "573476d324597737da2adc13" - } - ] - ], "54cb50c76803fa8b248b4571", 2, false, 1000, 2); + [{ + "count": 1, + "_tpl": "59e3658a86f7741776641ac4" + }, { + "count": 2, + "_tpl": "5909e99886f7740c983b9984" + }, { + "count": 1, + "_tpl": "573476d324597737da2adc13" + } + ] + ], "54cb50c76803fa8b248b4571", 2, false, 1000, 2); //AK-74 Plum id = HashUtil.generate(); CoreMod.CreateTraderBarterWithPreset(id, "5dd7f8c524e5d7504a4e3077", "hideout", "hideout", [ - [{ - "count": 2, - "_tpl": "5c13cef886f774072e618e82" - }, { - "count": 2, - "_tpl": "57347c93245977448d35f6e3" - } - ] - ], "54cb50c76803fa8b248b4571", 2, false, 2000, 2); + [{ + "count": 2, + "_tpl": "5c13cef886f774072e618e82" + }, { + "count": 2, + "_tpl": "57347c93245977448d35f6e3" + } + ] + ], "54cb50c76803fa8b248b4571", 2, false, 2000, 2); //ks-23m Long id = HashUtil.generate(); CoreMod.CreateTraderBarterWithPreset(id, "5f6771214ef1ca4f4e1b8a06", "hideout", "hideout", [ - [{ - "count": 4, - "_tpl": "590c2c9c86f774245b1f03f2" - }, { - "count": 4, - "_tpl": "57347cd0245977445a2d6ff1" - }, { - "count": 3, - "_tpl": "5909e99886f7740c983b9984" - } - ] - ], "54cb50c76803fa8b248b4571", 1, false, 2000, 2); + [{ + "count": 4, + "_tpl": "590c2c9c86f774245b1f03f2" + }, { + "count": 4, + "_tpl": "57347cd0245977445a2d6ff1" + }, { + "count": 3, + "_tpl": "5909e99886f7740c983b9984" + } + ] + ], "54cb50c76803fa8b248b4571", 1, false, 2000, 2); //SV-98 id = HashUtil.generate(); CoreMod.CreateTraderBarterWithPreset(id, "58414a16245977599247970a", "hideout", "hideout", [ - [{ - "count": 5, - "_tpl": "573475fb24597737fb1379e1" - }, { - "count": 3, - "_tpl": "573476d324597737da2adc13" - } - ] - ], "54cb50c76803fa8b248b4571", 1, false, 2000, 2); + [{ + "count": 5, + "_tpl": "573475fb24597737fb1379e1" + }, { + "count": 3, + "_tpl": "573476d324597737da2adc13" + } + ] + ], "54cb50c76803fa8b248b4571", 1, false, 2000, 2); //MP-443 Grach id = HashUtil.generate(); CoreMod.CreateTraderBarterWithPreset(id, "584148a524597759eb357a44", "hideout", "hideout", [ - [{ - "count": 1, - "_tpl": "573477e124597737dd42e191" - } - ] - ], "54cb50c76803fa8b248b4571", 1, false, 2000, 2); + [{ + "count": 1, + "_tpl": "573477e124597737dd42e191" + } + ] + ], "54cb50c76803fa8b248b4571", 1, false, 2000, 2); //SR-1MP id = HashUtil.generate(); CoreMod.CreateTraderBarterWithPreset(id, "5a327f6386f77479010da870", "hideout", "hideout", [ - [{ - "count": 1, - "_tpl": "590c5a7286f7747884343aea" - } - ] - ], "54cb50c76803fa8b248b4571", 1, false, 300, 2); + [{ + "count": 1, + "_tpl": "590c5a7286f7747884343aea" + } + ] + ], "54cb50c76803fa8b248b4571", 1, false, 300, 2); } static GenerateLL3() { @@ -724,24 +739,24 @@ class PraporAssort{ //5.45x39 BS gs 30 pcs ammo pack CoreMod.CreateTraderBarter(HashUtil.generate(), "57372bd3245977670b7cd243", "hideout", "hideout", [ - [{ - "count": 2, - "_tpl": "5751496424597720a27126da" - }, { - "count": 2, - "_tpl": "573476d324597737da2adc13" - } - ] - ], "54cb50c76803fa8b248b4571", 3, false, 3000, 3); + [{ + "count": 2, + "_tpl": "5751496424597720a27126da" + }, { + "count": 2, + "_tpl": "573476d324597737da2adc13" + } + ] + ], "54cb50c76803fa8b248b4571", 3, false, 3000, 3); //9x39 SPP 8pcs ammo pack CoreMod.CreateTraderBarter(HashUtil.generate(), "5c12619186f7743f871c8a32", "hideout", "hideout", [ - [{ - "count": 2, - "_tpl": "5734795124597738002c6176" - } - ] - ], "54cb50c76803fa8b248b4571", 3, false, 2000, 50); + [{ + "count": 2, + "_tpl": "5734795124597738002c6176" + } + ] + ], "54cb50c76803fa8b248b4571", 3, false, 2000, 50); //5.45x39mm BP gs CoreMod.CreateTraderAssort(HashUtil.generate(), "56dfef82d2720bbd668b4567", "54cb50c76803fa8b248b4571", 415, "RUB", 3, false, 300000, 300); @@ -814,24 +829,24 @@ class PraporAssort{ //9x39 sr3m,130 30-round magazine CoreMod.CreateTraderBarter(HashUtil.generate(), "5a9e81fba2750c00164f6b11", "hideout", "hideout", [ - [{ - "count": 4, - "_tpl": "590c2b4386f77425357b6123" - } - ] - ], "54cb50c76803fa8b248b4571", 3, false, 6000, 5); + [{ + "count": 4, + "_tpl": "590c2b4386f77425357b6123" + } + ] + ], "54cb50c76803fa8b248b4571", 3, false, 6000, 5); //ak 7.62x39 bakelite 40-round magazine CoreMod.CreateTraderAssort(HashUtil.generate(), "5b1fb3e15acfc4001637f068", "54cb50c76803fa8b248b4571", 3909, "RUB", 3, false, 2000); //rpk-16 5.45x39 95-round drum magazine CoreMod.CreateTraderBarter(HashUtil.generate(), "5bed625c0db834001c062946", "hideout", "hideout", [ - [{ - "count": 4, - "_tpl": "590c2b4386f77425357b6123" - } - ] - ], "54cb50c76803fa8b248b4571", 3, false, 2000, 2); + [{ + "count": 4, + "_tpl": "590c2b4386f77425357b6123" + } + ] + ], "54cb50c76803fa8b248b4571", 3, false, 2000, 2); //svd 7.62x54r 10-round magazine CoreMod.CreateTraderAssort(HashUtil.generate(), "5c471c442e221602b542a6f8", "54cb50c76803fa8b248b4571", 4000, "RUB", 3, true, 999999); @@ -985,27 +1000,27 @@ class PraporAssort{ //rpk-16 5.45x39 light machine gun CoreMod.CreateTraderBarterWithPreset(HashUtil.generate(), "5c0d1ec986f77439512a1a72", "hideout", "hideout", [ - [{ - "count": 2, - "_tpl": "590c5a7286f7747884343aea" - }, { - "count": 3, - "_tpl": "5d1c819a86f774771b0acd6c" - } - ] - ], "54cb50c76803fa8b248b4571", 3, false, 2000, 2); + [{ + "count": 2, + "_tpl": "590c5a7286f7747884343aea" + }, { + "count": 3, + "_tpl": "5d1c819a86f774771b0acd6c" + } + ] + ], "54cb50c76803fa8b248b4571", 3, false, 2000, 2); //vss vintorez 9x39 special sniper rifle CoreMod.CreateTraderBarterWithPreset(HashUtil.generate(), "58414a3f2459775a77263531", "hideout", "hideout", [ - [{ - "count": 10, - "_tpl": "590c595c86f7747884343ad7" - }, { - "count": 5, - "_tpl": "59e7715586f7742ee5789605" - } - ] - ], "54cb50c76803fa8b248b4571", 3, false, 200, 1); + [{ + "count": 10, + "_tpl": "590c595c86f7747884343ad7" + }, { + "count": 5, + "_tpl": "59e7715586f7742ee5789605" + } + ] + ], "54cb50c76803fa8b248b4571", 3, false, 200, 1); //svds 7.62x54r sniper rifle CoreMod.CreateTraderAssortWithPreset(HashUtil.generate(), "5c98be1e86f7741cc96ffd79", "54cb50c76803fa8b248b4571", 94772, "RUB", 3, false, 20000); @@ -1015,15 +1030,15 @@ class PraporAssort{ //6kh5 bayonet CoreMod.CreateTraderBarter(HashUtil.generate(), "5bffdc370db834001d23eca8", "hideout", "hideout", [ - [{ - "count": 2, - "_tpl": "5c0fa877d174af02a012e1cf" - }, { - "count": 1, - "_tpl": "59e7715586f7742ee5789605" - } - ] - ], "54cb50c76803fa8b248b4571", 3, true, 2000); + [{ + "count": 2, + "_tpl": "5c0fa877d174af02a012e1cf" + }, { + "count": 1, + "_tpl": "59e7715586f7742ee5789605" + } + ] + ], "54cb50c76803fa8b248b4571", 3, true, 2000); //toz ks-23m 23x75mm pump-action shotgun CoreMod.CreateTraderAssortWithPreset(HashUtil.generate(), "5f6771214ef1ca4f4e1b8a06", "54cb50c76803fa8b248b4571", 45790, "RUB", 3, false, 20000); @@ -1033,23 +1048,23 @@ class PraporAssort{ //bnti korund-vm armor CoreMod.CreateTraderBarter(HashUtil.generate(), "5f5f41476bdad616ad46d631", "hideout", "hideout", [ - [{ - "count": 4, - "_tpl": "590c645c86f77412b01304d9" - } - ] - ], "54cb50c76803fa8b248b4571", 3, false, 2000, 1); + [{ + "count": 4, + "_tpl": "590c645c86f77412b01304d9" + } + ] + ], "54cb50c76803fa8b248b4571", 3, false, 2000, 1); //6sh118 raid backpack CoreMod.CreateTraderBarter(HashUtil.generate(), "5df8a4d786f77412672a1e3b", "hideout", "hideout", [ - [{ - "count": 9, - "level": 25, - "side": "usec", - "_tpl": "59f32c3b86f77472a31742f0" - } - ] - ], "54cb50c76803fa8b248b4571", 3, false, 2000, 1); + [{ + "count": 9, + "level": 25, + "side": "usec", + "_tpl": "59f32c3b86f77472a31742f0" + } + ] + ], "54cb50c76803fa8b248b4571", 3, false, 2000, 1); } static GenerateLL4() { const CoreMod = require("../../CoreMod/src/Core.js"); @@ -1131,54 +1146,54 @@ class PraporAssort{ //ash-12 12.7x55 assault rifle CoreMod.CreateTraderBarterWithPreset(HashUtil.generate(), "5d23467086f77443f37fc602", "hideout", "hideout", [ - [{ - "count": 1, - "_tpl": "5d0376a486f7747d8050965c" - }, { - "count": 1, - "_tpl": "5c06779c86f77426e00dd782" - } - ] - ], "54cb50c76803fa8b248b4571", 4, false, 2000, 1); + [{ + "count": 1, + "_tpl": "5d0376a486f7747d8050965c" + }, { + "count": 1, + "_tpl": "5c06779c86f77426e00dd782" + } + ] + ], "54cb50c76803fa8b248b4571", 4, false, 2000, 1); //rpk-16 5.45x39 light machine gun CoreMod.CreateTraderAssortWithPreset(HashUtil.generate(), "5c0d1ec986f77439512a1a72", "54cb50c76803fa8b248b4571", 68452, "RUB", 4, false, 2000); //vss vintorez 9x39 special sniper rifle CoreMod.CreateTraderBarterWithPreset(HashUtil.generate(), "58414a3f2459775a77263531", "hideout", "hideout", [ - [{ - "count": 4, - "_tpl": "5d40419286f774318526545f" - }, { - "count": 7, - "_tpl": "5d4042a986f7743185265463" - } - ] - ], "54cb50c76803fa8b248b4571", 4, false, 5000, 1); + [{ + "count": 4, + "_tpl": "5d40419286f774318526545f" + }, { + "count": 7, + "_tpl": "5d4042a986f7743185265463" + } + ] + ], "54cb50c76803fa8b248b4571", 4, false, 5000, 1); //6b43 zabralo-sh 6a body armor CoreMod.CreateTraderBarter(HashUtil.generate(), "545cdb794bdc2d3a198b456a", "hideout", "hideout", [ - [{ - "count": 3, - "_tpl": "60391a8b3364dc22b04d0ce5" - }, { - "count": 3, - "_tpl": "60391b0fb847c71012789415" - } - ] - ], "54cb50c76803fa8b248b4571", 4, false, 300, 1); + [{ + "count": 3, + "_tpl": "60391a8b3364dc22b04d0ce5" + }, { + "count": 3, + "_tpl": "60391b0fb847c71012789415" + } + ] + ], "54cb50c76803fa8b248b4571", 4, false, 300, 1); //bnti korund-vm armor CoreMod.CreateTraderAssort(HashUtil.generate(), "5f5f41476bdad616ad46d631", "54cb50c76803fa8b248b4571", 112619, "RUB", 4, false, 20000); //6sh118 raid backpack CoreMod.CreateTraderBarter(HashUtil.generate(), "5df8a4d786f77412672a1e3b", "hideout", "hideout", [ - [{ - "count": 2, - "_tpl": "5d0375ff86f774186372f685" - } - ] - ], "54cb50c76803fa8b248b4571", 4, false, 4000, 1); + [{ + "count": 2, + "_tpl": "5d0375ff86f774186372f685" + } + ] + ], "54cb50c76803fa8b248b4571", 4, false, 4000, 1); } static generatePraporAssort() { PraporAssort.GenerateLL1(); From f8ca0328b676c69fb72b93fad0038acc78fc2bea Mon Sep 17 00:00:00 2001 From: Chomp Date: Sun, 8 Aug 2021 16:46:08 +0100 Subject: [PATCH 2/3] minor Prapor L1 changes --- Ereshkigal-BaseAssortGenerator/src/prapor.js | 31 ++++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/Ereshkigal-BaseAssortGenerator/src/prapor.js b/Ereshkigal-BaseAssortGenerator/src/prapor.js index 014432a..fec4bb7 100644 --- a/Ereshkigal-BaseAssortGenerator/src/prapor.js +++ b/Ereshkigal-BaseAssortGenerator/src/prapor.js @@ -43,7 +43,7 @@ class PraporAssort { CoreMod.CreateTraderAssortUnlock("54cb50c76803fa8b248b4571", "success", id, "59674eb386f774539f14813a") //5.45x39mm PRS GS - CoreMod.CreateTraderAssort(HashUtil.generate(), "56dff338d2720bbd668b4569", "54cb50c76803fa8b248b4571", 51, "RUB", 1, true, 999999); + CoreMod.CreateTraderAssort(HashUtil.generate(), "56dff338d2720bbd668b4569", "54cb50c76803fa8b248b4571", 46, "RUB", 1, true, 999999); //5.45x39mm T GS CoreMod.CreateTraderAssort(HashUtil.generate(), "56dff4a2d2720bbd668b456a", "54cb50c76803fa8b248b4571", 44, "RUB", 1, true, 999999); @@ -90,7 +90,7 @@ class PraporAssort { ], "54cb50c76803fa8b248b4571", 1, false, 2000, 3); //RDG Smoke - CoreMod.CreateTraderAssort(HashUtil.generate(), "5a2a57cfc4a2826c6e06d44a", "54cb50c76803fa8b248b4571", 5931, "RUB", 1, false, 37000, 6); + CoreMod.CreateTraderAssort(HashUtil.generate(), "5a2a57cfc4a2826c6e06d44a", "54cb50c76803fa8b248b4571", 5931, "RUB", 1, false, 37000, 4); //PM 9X18PM 90-93 8-round magazine CoreMod.CreateTraderAssort(HashUtil.generate(), "5448c12b4bdc2d02308b456f", "54cb50c76803fa8b248b4571", 1025, "RUB", 1, true, 999999); @@ -130,7 +130,7 @@ class PraporAssort { CoreMod.CreateTraderAssort(HashUtil.generate(), "5a17fb03fcdbcbcae668728f", "54cb50c76803fa8b248b4571", 926, "RUB", 1, true, 999999); //Mosin 7.62x54R 5-round magazine - CoreMod.CreateTraderAssort(HashUtil.generate(), "5ae0973a5acfc4001562206c", "54cb50c76803fa8b248b4571", 2148, "RUB", 1, false, 3000); + CoreMod.CreateTraderAssort(HashUtil.generate(), "5ae0973a5acfc4001562206c", "54cb50c76803fa8b248b4571", 2148, "RUB", 1, false, 3000, 5); //PPSh-41 7.62x25 35-round magazine CoreMod.CreateTraderAssort(HashUtil.generate(), "5ea034eb5aad6446a939737b", "54cb50c76803fa8b248b4571", 2868, "RUB", 1, true, 999999, 10); @@ -143,6 +143,9 @@ class PraporAssort { //AK-74 5.45x39 muzzle brake & compensator (6P20 0-20) CoreMod.CreateTraderAssort(HashUtil.generate(), "5649aa744bdc2ded0b8b457e", "54cb50c76803fa8b248b4571", 757, "RUB", 1, false, 70000); + + //akm 7.62x39 muzzle brake & compensator (6p1 0-14) + CoreMod.CreateTraderAssort(HashUtil.generate(), "59d64fc686f774171b243fe2", "54cb50c76803fa8b248b4571", 663, "RUB", 1, false, 2000, 4); //AKS-74U 5.45x39 muzzle brake (6P26 0-20) CoreMod.CreateTraderAssort(HashUtil.generate(), "57dc324a24597759501edc20", "54cb50c76803fa8b248b4571", 784, "RUB", 1, false, 70000); @@ -240,11 +243,11 @@ class PraporAssort { id = HashUtil.generate(); CoreMod.CreateTraderAssortWithPreset(id, "58dffce486f77409f40f8162", "54cb50c76803fa8b248b4571", 21810, "RUB", 1, true, 999999); - //AKS-74U + //AKS-74UN id = HashUtil.generate(); CoreMod.CreateTraderBarterWithPreset(id, "584147732459775a2b6d9f12", "hideout", "hideout", [ [{ - "count": 1, + "count": 2, "_tpl": "573478bc24597738002c6175" }, { "count": 1, @@ -288,7 +291,17 @@ class PraporAssort { //mp-443 id = HashUtil.generate(); - CoreMod.CreateTraderAssortWithPreset(id, "584148a524597759eb357a44", "54cb50c76803fa8b248b4571", 13816, "RUB", 1, false, 200000); + CoreMod.CreateTraderAssortWithPreset(id, "584148a524597759eb357a44", "54cb50c76803fa8b248b4571", 13816, "RUB", 1, false, 2000, 2); + + //mp-443 + id = HashUtil.generate(); + CoreMod.CreateTraderBarterWithPreset(id, "584148a524597759eb357a44", "hideout", "hideout", [ + [{ + "count": 1, + "_tpl": "573477e124597737dd42e191" + } + ] + ], "54cb50c76803fa8b248b4571", 1, false, 2000); //APS id = HashUtil.generate(); @@ -320,7 +333,7 @@ class PraporAssort { //PPSH-41 id = HashUtil.generate(); - CoreMod.CreateTraderAssortWithPreset(id, "5eb2963686f7742d3f5ab0f8", "54cb50c76803fa8b248b4571", 15488, "RUB", 1, false, 200000); + CoreMod.CreateTraderAssortWithPreset(id, "5eb2963686f7742d3f5ab0f8", "54cb50c76803fa8b248b4571", 26599, "RUB", 1, false, 200000, 3); //6B47 Ratnik-BSh helmet CoreMod.CreateTraderAssort(HashUtil.generate(), "5a7c4850e899ef00150be885", "54cb50c76803fa8b248b4571", 33336, "RUB", 1, true, 999999, 3); @@ -353,11 +366,11 @@ class PraporAssort { //Mosin infantry id = HashUtil.generate(); - CoreMod.CreateTraderAssortWithPreset(id, "5b8683a486f77467f2423114", "54cb50c76803fa8b248b4571", 47192, "RUB", 1, true, 999999); + CoreMod.CreateTraderAssortWithPreset(id, "5b8683a486f77467f2423114", "54cb50c76803fa8b248b4571", 35043, "RUB", 1, true, 999999); //Mosin infantry carbine id = HashUtil.generate(); - CoreMod.CreateTraderAssortWithPreset(id, "5c0c1dff86f7744dba7a2892", "54cb50c76803fa8b248b4571", 47794, "RUB", 1, false, 20000, 4); + CoreMod.CreateTraderAssortWithPreset(id, "5c0c1dff86f7744dba7a2892", "54cb50c76803fa8b248b4571", 34825, "RUB", 1, false, 20000, 4); //6B23-1 CoreMod.CreateTraderBarter(HashUtil.generate(), "5c0e5bab86f77461f55ed1f3", "hideout", "hideout", [ From 18b981ea863ac8cbcb61d4aba103db68dce7d268 Mon Sep 17 00:00:00 2001 From: Chomp Date: Sun, 8 Aug 2021 18:54:26 +0100 Subject: [PATCH 3/3] modified wrong assort --- Ereshkigal-BaseAssortGenerator/src/prapor.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Ereshkigal-BaseAssortGenerator/src/prapor.js b/Ereshkigal-BaseAssortGenerator/src/prapor.js index fec4bb7..686779a 100644 --- a/Ereshkigal-BaseAssortGenerator/src/prapor.js +++ b/Ereshkigal-BaseAssortGenerator/src/prapor.js @@ -291,9 +291,9 @@ class PraporAssort { //mp-443 id = HashUtil.generate(); - CoreMod.CreateTraderAssortWithPreset(id, "584148a524597759eb357a44", "54cb50c76803fa8b248b4571", 13816, "RUB", 1, false, 2000, 2); + CoreMod.CreateTraderAssortWithPreset(id, "584148a524597759eb357a44", "54cb50c76803fa8b248b4571", 13816, "RUB", 1, false, 200000); - //mp-443 + //mp-443 id = HashUtil.generate(); CoreMod.CreateTraderBarterWithPreset(id, "584148a524597759eb357a44", "hideout", "hideout", [ [{ @@ -301,7 +301,7 @@ class PraporAssort { "_tpl": "573477e124597737dd42e191" } ] - ], "54cb50c76803fa8b248b4571", 1, false, 2000); + ], "54cb50c76803fa8b248b4571", 1, false, 2000, 2); //APS id = HashUtil.generate();