From b4a4e7092729e809cfa86e42bc0c6efcb76a7396 Mon Sep 17 00:00:00 2001 From: Ereshkigal Date: Sun, 8 Aug 2021 15:14:24 +0200 Subject: [PATCH 1/7] Therapist 100% done + new trades for skier/prapor --- Ereshkigal-BaseAssortGenerator/src/prapor.js | 13 +- Ereshkigal-BaseAssortGenerator/src/ragman.js | 387 ++++++++++-------- Ereshkigal-BaseAssortGenerator/src/skier.js | 3 + .../src/therapist.js | 34 +- 4 files changed, 255 insertions(+), 182 deletions(-) diff --git a/Ereshkigal-BaseAssortGenerator/src/prapor.js b/Ereshkigal-BaseAssortGenerator/src/prapor.js index ba3c26a..c93990d 100644 --- a/Ereshkigal-BaseAssortGenerator/src/prapor.js +++ b/Ereshkigal-BaseAssortGenerator/src/prapor.js @@ -117,6 +117,8 @@ class PraporAssort{ ] ], "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); @@ -516,6 +518,14 @@ class PraporAssort{ //PP-19-01 Vityaz-SN dust cover STD CoreMod.CreateTraderAssort(HashUtil.generate(), "59985a8086f77414ec448d1a", "54cb50c76803fa8b248b4571", 1307, "RUB", 2, false, 15000); + //6L25 + CoreMod.CreateTraderBarter(HashUtil.generate(), "57838f9f2459774a150289a0", "hideout", "hideout", [ + [{ + "count": 1, + "_tpl": "590c639286f774151567fa95" + } + ] + ], "54cb50c76803fa8b248b4571", 2, false, 2000, 5); //5x45 BT x30 GS box CoreMod.CreateTraderBarter(HashUtil.generate(), "57372c89245977685d4159b1", "hideout", "hideout", [ @@ -630,9 +640,8 @@ class PraporAssort{ CoreMod.CreateTraderAssortWithPreset(id, "5b8683a486f77467f2423114", "54cb50c76803fa8b248b4571", 56271, "RUB", 2, false, 20000); //AK-74N Black - //Todo Preset needs to be manually added id = HashUtil.generate(); - CoreMod.CreateTraderBarterWithPreset(id, "5c0c1f2b86f77455912eaefc", "hideout", "hideout", [ + CoreMod.CreateTraderBarterWithPreset(id, "AK-74N_Black", "hideout", "hideout", [ [{ "count": 5, "_tpl": "573475fb24597737fb1379e1" diff --git a/Ereshkigal-BaseAssortGenerator/src/ragman.js b/Ereshkigal-BaseAssortGenerator/src/ragman.js index 5de3ea4..a5dc812 100644 --- a/Ereshkigal-BaseAssortGenerator/src/ragman.js +++ b/Ereshkigal-BaseAssortGenerator/src/ragman.js @@ -2,7 +2,7 @@ エレシュキガル */ -class RagmanAssort{ +class RagmanAssort { static GenerateLL1() { const CoreMod = require("../../CoreMod/src/Core.js"); @@ -133,11 +133,12 @@ class RagmanAssort{ CoreMod.CreateTraderAssort(HashUtil.generate(), "5a16b672fcdbcb001912fa83", "5ac3b934156ae10c4430e83c", 12985, "RUB", 2, false, 2000); //zsh-1-2m face shield - CoreMod.CreateTraderBarter(HashUtil.generate(), "5aa7e3abe5b5b000171d064d", "hideout", "hideout", [[{ - "count": 2, - "_tpl": "59e366c186f7741778269d85" - } - ]], "5ac3b934156ae10c4430e83c", 2, true, 2000); + CoreMod.CreateTraderBarter(HashUtil.generate(), "5aa7e3abe5b5b000171d064d", "hideout", "hideout", [ + [{ + "count": 2, + "_tpl": "59e366c186f7741778269d85" + }] + ], "5ac3b934156ae10c4430e83c", 2, true, 2000); //kiver face shield CoreMod.CreateTraderAssort(HashUtil.generate(), "5b46238386f7741a693bcf9c", "5ac3b934156ae10c4430e83c", 27828, "RUB", 2, false, 8000); @@ -155,11 +156,12 @@ class RagmanAssort{ CoreMod.CreateTraderAssort(HashUtil.generate(), "5aa2ba19e5b5b00014028f4e", "5ac3b934156ae10c4430e83c", 5007, "RUB", 2, true); //tactical fleece hat - CoreMod.CreateTraderBarter(HashUtil.generate(), "5aa2ba19e5b5b00014028f4e", "hideout", "hideout", [[{ - "count": 1, - "_tpl": "590c2c9c86f774245b1f03f2" - } - ]], "5ac3b934156ae10c4430e83c", 2, true, 20000, 4); + CoreMod.CreateTraderBarter(HashUtil.generate(), "5aa2ba19e5b5b00014028f4e", "hideout", "hideout", [ + [{ + "count": 1, + "_tpl": "590c2c9c86f774245b1f03f2" + }] + ], "5ac3b934156ae10c4430e83c", 2, true, 20000, 4); //ux pro beanie hat CoreMod.CreateTraderAssort(HashUtil.generate(), "5aa2ba46e5b5b000137b758d", "5ac3b934156ae10c4430e83c", 2268, "RUB", 2, false, 20000); @@ -168,11 +170,19 @@ class RagmanAssort{ CoreMod.CreateTraderAssort(HashUtil.generate(), "5f60e784f2bcbb675b00dac7", "5ac3b934156ae10c4430e83c", 13517, "RUB", 2, false, 20000); //6B47 Ratnik-BSh helmet with cover (Digital Flora) - //CoreMod.CreateTraderBarter(HashUtil.generate(), "5aa7cfc0e5b5b00015693143", "hideout", "hideout", [[{ - // "count": unknown, - // "_tpl": "unknown" - // } - // ]], "5ac3b934156ae10c4430e83c", 2, true, 20000); + + id = HashUtil.generate() + CoreMod.CreateTraderBarter(id, "5aa7cfc0e5b5b00015693143", "hideout", "hideout", [ + [{ + "count": 7, + "level": 10, + "side": "Any", + "_tpl": "59f32c3b86f77472a31742f0" + } + + ] + ], "5ac3b934156ae10c4430e83c", 2, true, 20000); + CoreMod.CreateTraderAssortUnlock("5ac3b934156ae10c4430e83c", "success", id, "5969f9e986f7741dde183a50") //Pharmacist //Bandana CoreMod.CreateTraderAssort(HashUtil.generate(), "5b43271c5acfc432ff4dce65", "5ac3b934156ae10c4430e83c", 2215, "RUB", 2, false, 2000); @@ -203,24 +213,26 @@ class RagmanAssort{ CoreMod.CreateTraderAssort(HashUtil.generate(), "5645bcc04bdc2d363b8b4572", "5ac3b934156ae10c4430e83c", 28917, "RUB", 2, false, 60000, 5); //Peltor comtac 2 headset - CoreMod.CreateTraderBarter(HashUtil.generate(), "5645bcc04bdc2d363b8b4572", "hideout", "hideout", [[{ - "count": 3, - "_tpl": "57347b8b24597737dd42e192" - } - ]], "5ac3b934156ae10c4430e83c", 2, true, 2000, 5); + CoreMod.CreateTraderBarter(HashUtil.generate(), "5645bcc04bdc2d363b8b4572", "hideout", "hideout", [ + [{ + "count": 3, + "_tpl": "57347b8b24597737dd42e192" + }] + ], "5ac3b934156ae10c4430e83c", 2, true, 2000, 5); //bnti kirasa-n armor - CoreMod.CreateTraderBarter(HashUtil.generate(), "5b44d22286f774172b0c9de8", "hideout", "hideout", [[{ - "count": 1, - "_tpl": "5af0484c86f7740f02001f7f" - }, { - "count": 1, - "_tpl": "57514643245977207f2c2d09" - }, { - "count": 1, - "_tpl": "575146b724597720a27126d5" - } - ]], "5ac3b934156ae10c4430e83c", 2, true, 50); + CoreMod.CreateTraderBarter(HashUtil.generate(), "5b44d22286f774172b0c9de8", "hideout", "hideout", [ + [{ + "count": 1, + "_tpl": "5af0484c86f7740f02001f7f" + }, { + "count": 1, + "_tpl": "57514643245977207f2c2d09" + }, { + "count": 1, + "_tpl": "575146b724597720a27126d5" + }] + ], "5ac3b934156ae10c4430e83c", 2, true, 50); //bnti kirasa-n armor CoreMod.CreateTraderAssort(HashUtil.generate(), "5b44d22286f774172b0c9de8", "5ac3b934156ae10c4430e83c", 64553, "RUB", 2, false, 2000); @@ -232,14 +244,15 @@ class RagmanAssort{ CoreMod.CreateTraderAssort(HashUtil.generate(), "5c0e5bab86f77461f55ed1f3", "5ac3b934156ae10c4430e83c", 49207, "RUB", 2, false, 5000, 3); //crye precision avs plate carrier - CoreMod.CreateTraderBarter(HashUtil.generate(), "544a5caa4bdc2d1a388b4568", "hideout", "hideout", [[{ - "count": 2, - "_tpl": "5734758f24597738025ee253" - }, { - "count": 2, - "_tpl": "5b3b713c5acfc4330140bd8d" - } - ]], "5ac3b934156ae10c4430e83c", 2, true, 2000, 1); + CoreMod.CreateTraderBarter(HashUtil.generate(), "544a5caa4bdc2d1a388b4568", "hideout", "hideout", [ + [{ + "count": 2, + "_tpl": "5734758f24597738025ee253" + }, { + "count": 2, + "_tpl": "5b3b713c5acfc4330140bd8d" + }] + ], "5ac3b934156ae10c4430e83c", 2, true, 2000, 1); //umtbs 6sh112 scout-sniper CoreMod.CreateTraderAssort(HashUtil.generate(), "5929a2a086f7744f4b234d43", "5ac3b934156ae10c4430e83c", 23780, "RUB", 2, false, 6000, 6); @@ -248,14 +261,15 @@ class RagmanAssort{ CoreMod.CreateTraderAssort(HashUtil.generate(), "59e7643b86f7742cbf2c109a", "5ac3b934156ae10c4430e83c", 18776, "RUB", 2, false, 15000, 4); //ana tactical alpha chest rig - CoreMod.CreateTraderBarter(HashUtil.generate(), "592c2d1a86f7746dbe2af32a", "hideout", "hideout", [[{ - "count": 5, - "_tpl": "57347c1124597737fb1379e3" - }, { - "count": 1, - "_tpl": "59faf98186f774067b6be103" - } - ]], "5ac3b934156ae10c4430e83c", 2, false, 200, 1); + CoreMod.CreateTraderBarter(HashUtil.generate(), "592c2d1a86f7746dbe2af32a", "hideout", "hideout", [ + [{ + "count": 5, + "_tpl": "57347c1124597737fb1379e3" + }, { + "count": 1, + "_tpl": "59faf98186f774067b6be103" + }] + ], "5ac3b934156ae10c4430e83c", 2, false, 200, 1); //Blackhawk! Commando Chest Harness (Coyote Tan) CoreMod.CreateTraderAssort(HashUtil.generate(), "5b44c8ea86f7742d1627baf1", "5ac3b934156ae10c4430e83c", 37373, "RUB", 2, false, 2000); @@ -264,31 +278,34 @@ class RagmanAssort{ CoreMod.CreateTraderAssort(HashUtil.generate(), "5ca20abf86f77418567a43f2", "5ac3b934156ae10c4430e83c", 29301, "RUB", 2, false, 20000); //6B5-15 Zh-86 "Uley" armored rig - CoreMod.CreateTraderBarter(HashUtil.generate(), "5c0e446786f7742013381639", "hideout", "hideout", [[{ - "count": 3, - "_tpl": "5c13cd2486f774072c757944" - }, { - "count": 4, - "_tpl": "5c13cef886f774072e618e82" - } - ]], "5ac3b934156ae10c4430e83c", 2, false, 15000, 1); + CoreMod.CreateTraderBarter(HashUtil.generate(), "5c0e446786f7742013381639", "hideout", "hideout", [ + [{ + "count": 3, + "_tpl": "5c13cd2486f774072c757944" + }, { + "count": 4, + "_tpl": "5c13cef886f774072e618e82" + }] + ], "5ac3b934156ae10c4430e83c", 2, false, 15000, 1); //6B5-15 Zh-86 "Uley" armored rig - CoreMod.CreateTraderBarter(HashUtil.generate(), "5c0e446786f7742013381639", "hideout", "hideout", [[{ - "count": 3, - "_tpl": "5c0e446786f7742013381639" - } - ]], "5ac3b934156ae10c4430e83c", 2, false, 15000, 1); + CoreMod.CreateTraderBarter(HashUtil.generate(), "5c0e446786f7742013381639", "hideout", "hideout", [ + [{ + "count": 3, + "_tpl": "5c0e446786f7742013381639" + }] + ], "5ac3b934156ae10c4430e83c", 2, false, 15000, 1); //6B3TM-01M armored rig CoreMod.CreateTraderAssort(HashUtil.generate(), "5d5d646386f7742797261fd9", "5ac3b934156ae10c4430e83c", 50283, "RUB", 2, false, 15000, 2); //6B3TM-01M armored rig - CoreMod.CreateTraderBarter(HashUtil.generate(), "5d5d646386f7742797261fd9", "hideout", "hideout", [[{ - "count": 4, - "_tpl": "5d5d646386f7742797261fd9" - } - ]], "5ac3b934156ae10c4430e83c", 2, false, 15000, 2); + CoreMod.CreateTraderBarter(HashUtil.generate(), "5d5d646386f7742797261fd9", "hideout", "hideout", [ + [{ + "count": 4, + "_tpl": "5d5d646386f7742797261fd9" + }] + ], "5ac3b934156ae10c4430e83c", 2, false, 15000, 2); //Haley Strategic D3CRX Chest Harness CoreMod.CreateTraderAssort(HashUtil.generate(), "5d5d85c586f774279a21cbdb", "5ac3b934156ae10c4430e83c", 35076, "RUB", 2, false, 20000, 4); @@ -312,21 +329,23 @@ class RagmanAssort{ CoreMod.CreateTraderAssort(HashUtil.generate(), "5b432f3d5acfc4704b4a1dfb", "5ac3b934156ae10c4430e83c", 3565, "RUB", 3, true, 999999); //altyn face shield - CoreMod.CreateTraderBarter(HashUtil.generate(), "5aa7e373e5b5b000137b76f0", "hideout", "hideout", [[{ - "count": 3, - "_tpl": "5aa7e373e5b5b000137b76f0" - } - ]], "5ac3b934156ae10c4430e83c", 3, false, 200); + CoreMod.CreateTraderBarter(HashUtil.generate(), "5aa7e373e5b5b000137b76f0", "hideout", "hideout", [ + [{ + "count": 3, + "_tpl": "5aa7e373e5b5b000137b76f0" + }] + ], "5ac3b934156ae10c4430e83c", 3, false, 200); //zsh-1-2m face shield CoreMod.CreateTraderAssort(HashUtil.generate(), "5aa7e3abe5b5b000171d064d", "5ac3b934156ae10c4430e83c", 19260, "RUB", 3, false, 2000, 3); //LShZ-2DTM face shield - CoreMod.CreateTraderBarter(HashUtil.generate(), "5d6d3829a4b9361bc8618943", "hideout", "hideout", [[{ - "count": 3, - "_tpl": "59e366c186f7741778269d85" - } - ]], "5ac3b934156ae10c4430e83c", 3, false, 20000); + CoreMod.CreateTraderBarter(HashUtil.generate(), "5d6d3829a4b9361bc8618943", "hideout", "hideout", [ + [{ + "count": 3, + "_tpl": "59e366c186f7741778269d85" + }] + ], "5ac3b934156ae10c4430e83c", 3, false, 20000); //lshz-2dtm cover CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6d3943a4b9360dbc46d0cc", "5ac3b934156ae10c4430e83c", 1665, "RUB", 3, false, 2000); @@ -341,11 +360,12 @@ class RagmanAssort{ CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6d2e22a4b9361bd5780d05", "5ac3b934156ae10c4430e83c", 6216, "RUB", 3, false, 20000); //kinda cowboy hat - CoreMod.CreateTraderBarter(HashUtil.generate(), "5aa2b9ede5b5b000137b758b", "hideout", "hideout", [[{ - "count": 1, - "_tpl": "5e2af29386f7746d4159f077" - } - ]], "5ac3b934156ae10c4430e83c", 3, false, 2000, 3); + CoreMod.CreateTraderBarter(HashUtil.generate(), "5aa2b9ede5b5b000137b758b", "hideout", "hideout", [ + [{ + "count": 1, + "_tpl": "5e2af29386f7746d4159f077" + }] + ], "5ac3b934156ae10c4430e83c", 3, false, 2000, 3); //ops-core fast mt super high cut helmet (tan) CoreMod.CreateTraderAssort(HashUtil.generate(), "5ac8d6885acfc400180ae7b0", "5ac3b934156ae10c4430e83c", 148092, "RUB", 3, false, 2000); @@ -357,24 +377,26 @@ class RagmanAssort{ CoreMod.CreateTraderAssort(HashUtil.generate(), "5b4327aa5acfc400175496e0", "5ac3b934156ae10c4430e83c", 2409, "RUB", 3, false, 2000); //devtac ronin ballistic helmet - CoreMod.CreateTraderBarter(HashUtil.generate(), "5b4329f05acfc47a86086aa1", "hideout", "hideout", [[{ - "count": 4, - "_tpl": "590c2d8786f774245b1f03f3" - }, { - "count": 4, - "_tpl": "590c311186f77424d1667482" - }, { - "count": 1, - "_tpl": "5d40419286f774318526545f" - } - ]], "5ac3b934156ae10c4430e83c", 3, false, 2000, 1); + CoreMod.CreateTraderBarter(HashUtil.generate(), "5b4329f05acfc47a86086aa1", "hideout", "hideout", [ + [{ + "count": 4, + "_tpl": "590c2d8786f774245b1f03f3" + }, { + "count": 4, + "_tpl": "590c311186f77424d1667482" + }, { + "count": 1, + "_tpl": "5d40419286f774318526545f" + }] + ], "5ac3b934156ae10c4430e83c", 3, false, 2000, 1); //maska-1shch bulletproof helmet (olive drab) - CoreMod.CreateTraderBarter(HashUtil.generate(), "5c091a4e0db834001d5addc8", "hideout", "hideout", [[{ - "count": 4, - "_tpl": "5d235b4d86f7742e017bc88a" - } - ]], "5ac3b934156ae10c4430e83c", 3, false, 2000); + CoreMod.CreateTraderBarter(HashUtil.generate(), "5c091a4e0db834001d5addc8", "hideout", "hideout", [ + [{ + "count": 4, + "_tpl": "5d235b4d86f7742e017bc88a" + }] + ], "5ac3b934156ae10c4430e83c", 3, false, 2000); //BNTI LShZ-2DTM helmet CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6d3716a4b9361bc8618872", "5ac3b934156ae10c4430e83c", 163075, "RUB", 3, false, 20000, 3); @@ -383,21 +405,23 @@ class RagmanAssort{ CoreMod.CreateTraderAssort(HashUtil.generate(), "5aa2ba71e5b5b000137b758f", "5ac3b934156ae10c4430e83c", 28272, "RUB", 3, false, 8000); //BNTI Gzhel-K armor - CoreMod.CreateTraderBarter(HashUtil.generate(), "5ab8e79e86f7742d8b372e78", "hideout", "hideout", [[{ - "count": 2, - "_tpl": "5734758f24597738025ee253" - }, { - "count": 5, - "_tpl": "5af0484c86f7740f02001f7f" - } - ]], "5ac3b934156ae10c4430e83c", 3, false, 2000, 4); + CoreMod.CreateTraderBarter(HashUtil.generate(), "5ab8e79e86f7742d8b372e78", "hideout", "hideout", [ + [{ + "count": 2, + "_tpl": "5734758f24597738025ee253" + }, { + "count": 5, + "_tpl": "5af0484c86f7740f02001f7f" + }] + ], "5ac3b934156ae10c4430e83c", 3, false, 2000, 4); //iotv gen4 body armor (high mobility kit) - CoreMod.CreateTraderBarter(HashUtil.generate(), "5b44d0de86f774503d30cba8", "hideout", "hideout", [[{ - "count": 7, - "_tpl": "5d235b4d86f7742e017bc88a" - } - ]], "5ac3b934156ae10c4430e83c", 3, false, 1000, 2); + CoreMod.CreateTraderBarter(HashUtil.generate(), "5b44d0de86f774503d30cba8", "hideout", "hideout", [ + [{ + "count": 7, + "_tpl": "5d235b4d86f7742e017bc88a" + }] + ], "5ac3b934156ae10c4430e83c", 3, false, 1000, 2); //6b13 assault armor (digital flora) CoreMod.CreateTraderAssort(HashUtil.generate(), "5c0e53c886f7747fa54205c7", "5ac3b934156ae10c4430e83c", 67821, "RUB", 3, false, 2000); @@ -409,17 +433,18 @@ class RagmanAssort{ CoreMod.CreateTraderAssort(HashUtil.generate(), "5ca2151486f774244a3b8d30", "5ac3b934156ae10c4430e83c", 239800, "RUB", 3, false, 2000); //5.11 tactical hexgrid plate carrier - CoreMod.CreateTraderBarter(HashUtil.generate(), "5fd4c474dd870108a754b241", "hideout", "hideout", [[{ - "count": 5, - "_tpl": "5ab8f20c86f7745cdb629fb2" - }, { - "count": 5, - "_tpl": "59e7708286f7742cbd762753" - }, { - "count": 5, - "_tpl": "5aa2b923e5b5b000137b7589" - } - ]], "5ac3b934156ae10c4430e83c", 3, false, 2000, 1); + CoreMod.CreateTraderBarter(HashUtil.generate(), "5fd4c474dd870108a754b241", "hideout", "hideout", [ + [{ + "count": 5, + "_tpl": "5ab8f20c86f7745cdb629fb2" + }, { + "count": 5, + "_tpl": "59e7708286f7742cbd762753" + }, { + "count": 5, + "_tpl": "5aa2b923e5b5b000137b7589" + }] + ], "5ac3b934156ae10c4430e83c", 3, false, 2000, 1); //nfm thor concealable vest body armor CoreMod.CreateTraderAssort(HashUtil.generate(), "609e8540d5c319764c2bc2e9", "5ac3b934156ae10c4430e83c", 56610, "RUB", 3, false, 5000); @@ -431,78 +456,86 @@ class RagmanAssort{ CoreMod.CreateTraderAssort(HashUtil.generate(), "5648a69d4bdc2ded0b8b457b", "5ac3b934156ae10c4430e83c", 45177, "RUB", 3, false, 40000); //crye precision avs plate carrier - CoreMod.CreateTraderBarter(HashUtil.generate(), "544a5caa4bdc2d1a388b4568", "hideout", "hideout", [[{ - "count": 7, - "_tpl": "5d40412b86f7743cb332ac3a" - }, { - "count": 5, - "_tpl": "5d4041f086f7743cac3f22a7" - } - ]], "5ac3b934156ae10c4430e83c", 3, false, 5000, 2); + CoreMod.CreateTraderBarter(HashUtil.generate(), "544a5caa4bdc2d1a388b4568", "hideout", "hideout", [ + [{ + "count": 7, + "_tpl": "5d40412b86f7743cb332ac3a" + }, { + "count": 5, + "_tpl": "5d4041f086f7743cac3f22a7" + }] + ], "5ac3b934156ae10c4430e83c", 3, false, 5000, 2); //ana tactical alpha chest rig CoreMod.CreateTraderAssort(HashUtil.generate(), "592c2d1a86f7746dbe2af32a", "5ac3b934156ae10c4430e83c", 51181, "RUB", 3, false, 2000); //ana tactical m2 armored rig - CoreMod.CreateTraderBarter(HashUtil.generate(), "5ab8dced86f774646209ec87", "hideout", "hideout", [[{ - "count": 3, - "_tpl": "5aa2b923e5b5b000137b7589" - }, { - "count": 3, - "_tpl": "5ac4c50d5acfc40019262e87" - } - ]], "5ac3b934156ae10c4430e83c", 3, false, 5000, 2); + CoreMod.CreateTraderBarter(HashUtil.generate(), "5ab8dced86f774646209ec87", "hideout", "hideout", [ + [{ + "count": 3, + "_tpl": "5aa2b923e5b5b000137b7589" + }, { + "count": 3, + "_tpl": "5ac4c50d5acfc40019262e87" + }] + ], "5ac3b934156ae10c4430e83c", 3, false, 5000, 2); //5.11 tactical tactec plate carrier - CoreMod.CreateTraderBarter(HashUtil.generate(), "5b44cad286f77402a54ae7e5", "hideout", "hideout", [[{ - "count": 5, - "_tpl": "5b432c305acfc40019478128" - }, { - "count": 6, - "_tpl": "5b4326435acfc433000ed01d" - } - ]], "5ac3b934156ae10c4430e83c", 3, false, 100, 1); + CoreMod.CreateTraderBarter(HashUtil.generate(), "5b44cad286f77402a54ae7e5", "hideout", "hideout", [ + [{ + "count": 5, + "_tpl": "5b432c305acfc40019478128" + }, { + "count": 6, + "_tpl": "5b4326435acfc433000ed01d" + }] + ], "5ac3b934156ae10c4430e83c", 3, false, 100, 1); //belt-a + belt-b gear rig - CoreMod.CreateTraderBarter(HashUtil.generate(), "5c0e6a1586f77404597b4965", "hideout", "hideout", [[{ - "count": 1, - "_tpl": "590de71386f774347051a052" - } - ]], "5ac3b934156ae10c4430e83c", 3, false, 2000); + CoreMod.CreateTraderBarter(HashUtil.generate(), "5c0e6a1586f77404597b4965", "hideout", "hideout", [ + [{ + "count": 1, + "_tpl": "590de71386f774347051a052" + }] + ], "5ac3b934156ae10c4430e83c", 3, false, 2000); //ana tactical m1 armored rig - CoreMod.CreateTraderBarter(HashUtil.generate(), "5c0e722886f7740458316a57", "hideout", "hideout", [[{ - "count": 4, - "_tpl": "5c0fa877d174af02a012e1cf" - }, { - "count": 1, - "_tpl": "5e8f3423fd7471236e6e3b64" - } - ]], "5ac3b934156ae10c4430e83c", 3, false, 2000); + CoreMod.CreateTraderBarter(HashUtil.generate(), "5c0e722886f7740458316a57", "hideout", "hideout", [ + [{ + "count": 4, + "_tpl": "5c0fa877d174af02a012e1cf" + }, { + "count": 1, + "_tpl": "5e8f3423fd7471236e6e3b64" + }] + ], "5ac3b934156ae10c4430e83c", 3, false, 2000); //wartech tv-110 plate carrier rig - CoreMod.CreateTraderBarter(HashUtil.generate(), "5c0e746986f7741453628fe5", "hideout", "hideout", [[{ - "count": 4, - "_tpl": "59e3556c86f7741776641ac2" - }, { - "count": 2, - "_tpl": "5d40412b86f7743cb332ac3a" - } - ]], "5ac3b934156ae10c4430e83c", 3, false, 2000, 1); + CoreMod.CreateTraderBarter(HashUtil.generate(), "5c0e746986f7741453628fe5", "hideout", "hideout", [ + [{ + "count": 4, + "_tpl": "59e3556c86f7741776641ac2" + }, { + "count": 2, + "_tpl": "5d40412b86f7743cb332ac3a" + }] + ], "5ac3b934156ae10c4430e83c", 3, false, 2000, 1); //ars arma a18 skanda plate carrier - CoreMod.CreateTraderBarter(HashUtil.generate(), "5d5d87f786f77427997cfaef", "hideout", "hideout", [[{ - "count": 5, - "_tpl": "5d403f9186f7743cac3f229b" - } - ]], "5ac3b934156ae10c4430e83c", 3, false, 2000, 2); + CoreMod.CreateTraderBarter(HashUtil.generate(), "5d5d87f786f77427997cfaef", "hideout", "hideout", [ + [{ + "count": 5, + "_tpl": "5d403f9186f7743cac3f229b" + }] + ], "5ac3b934156ae10c4430e83c", 3, false, 2000, 2); //velocity systems multi-purpose patrol vest - CoreMod.CreateTraderBarter(HashUtil.generate(), "5df8a42886f77412640e2e75", "hideout", "hideout", [[{ - "count": 3, - "_tpl": "5734773724597737fd047c14" - } - ]], "5ac3b934156ae10c4430e83c", 3, false, 20000, 3); + CoreMod.CreateTraderBarter(HashUtil.generate(), "5df8a42886f77412640e2e75", "hideout", "hideout", [ + [{ + "count": 3, + "_tpl": "5734773724597737fd047c14" + }] + ], "5ac3b934156ae10c4430e83c", 3, false, 20000, 3); //stich profi chest rig mk2 (assault, a-tacs fg) CoreMod.CreateTraderAssort(HashUtil.generate(), "60a621c49c197e4e8c4455e6", "5ac3b934156ae10c4430e83c", 41625, "RUB", 3, false, 2000); @@ -520,4 +553,4 @@ class RagmanAssort{ } } -module.exports = RagmanAssort; +module.exports = RagmanAssort; \ No newline at end of file diff --git a/Ereshkigal-BaseAssortGenerator/src/skier.js b/Ereshkigal-BaseAssortGenerator/src/skier.js index 480b11a..d86040f 100644 --- a/Ereshkigal-BaseAssortGenerator/src/skier.js +++ b/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", 2, false, 700000,500); + //DVL-10 Mag CoreMod.CreateTraderAssort(HashUtil.generate(), "5888988e24597752fe43a6fa", "58330581ace78e27b8b10cee", 5167, "RUB", 2, false, 15000); diff --git a/Ereshkigal-BaseAssortGenerator/src/therapist.js b/Ereshkigal-BaseAssortGenerator/src/therapist.js index ff237d6..844ede8 100644 --- a/Ereshkigal-BaseAssortGenerator/src/therapist.js +++ b/Ereshkigal-BaseAssortGenerator/src/therapist.js @@ -13,6 +13,11 @@ class TherapistAssort { let id = null; // ASSORT ID ITEM TEMPLATE TRADER ID PRICE CURRENCY LOYALTY UNLIMITED STOCK MAXIMUM BUY //Therapist LL1 + //Car first aid kit + id = HashUtil.generate() + CoreMod.CreateTraderAssort(id, "590c661e86f7741e566b646a", "54cb57776803fa99248b456e", 7372, "RUB", 1, true, 999999); + CoreMod.CreateTraderAssortUnlock("54cb57776803fa99248b456e", "success", id, "59689ee586f7740d1570bbd5") //Sanitary Standard p1 + //Analgin Painkillers CoreMod.CreateTraderAssort(HashUtil.generate(), "544fb37f4bdc2dee738b4567", "54cb57776803fa99248b456e", 5695, "RUB", 1, true, 999999); @@ -156,6 +161,17 @@ class TherapistAssort { static GenerateLL2() { const CoreMod = require("../../CoreMod/src/Core.js"); //THERAPIST LL2 + + //Army bandage + id = HashUtil.generate() + CoreMod.CreateTraderAssort(id, "5751a25924597722c463c472", "54cb57776803fa99248b456e", 2032, "RUB", 2, true, 999999); + CoreMod.CreateTraderAssortUnlock("54cb57776803fa99248b456e", "success", id, "5968eb3186f7741dde183a4d") //Operation Aquarius p2 + + //Salewa first aid kit + id = HashUtil.generate() + CoreMod.CreateTraderAssort(id, "544fb45d4bdc2dee738b4568", "54cb57776803fa99248b456e", 23162, "RUB", 2, false, 5000); + CoreMod.CreateTraderAssortUnlock("54cb57776803fa99248b456e", "success", id, "596760e186f7741e11214d58") //Operation Aquarius p + //Emelya rye croutons CoreMod.CreateTraderAssort(HashUtil.generate(), "5751487e245977207e26a315", "54cb57776803fa99248b456e", 13562, "RUB", 2, false, 6500, 4); @@ -305,6 +321,10 @@ class TherapistAssort { } static GenerateLL3() { const CoreMod = require("../../CoreMod/src/Core.js"); + //IFAK + + CoreMod.CreateTraderAssort(id, "5af0454c86f7746bf20992e8", "54cb57776803fa99248b456e", 15873, "RUB", 3, false, 7000); + //Aluminum splint CoreMod.CreateTraderAssort(HashUtil.generate(), "5af0454c86f7746bf20992e8", "54cb57776803fa99248b456e", 15873, "RUB", 3, false, 7000); @@ -313,7 +333,9 @@ class TherapistAssort { CoreMod.CreateTraderAssort(HashUtil.generate(), "5e8488fa988a8701445df1e4", "54cb57776803fa99248b456e", 4756, "RUB", 3, false, 60000, 5); //IFAK individual first aid kit - CoreMod.CreateTraderAssort(HashUtil.generate(), "590c678286f77426c9660122", "54cb57776803fa99248b456e", 27202, "RUB", 3, false, 15000); + id = HashUtil.generate() + CoreMod.CreateTraderAssort(id, "590c678286f77426c9660122", "54cb57776803fa99248b456e", 27202, "RUB", 3, false, 15000); + CoreMod.CreateTraderAssortUnlock("54cb57776803fa99248b456e", "success", id, "59689ee586f7740d1570bbd5") //Health Care Privacy - Part 1 //sj1 tglabs combat stimulant injector CoreMod.CreateTraderBarter(HashUtil.generate(), "5c0e531286f7747fa54205c2", "hideout", "hideout", [ @@ -412,7 +434,9 @@ class TherapistAssort { const CoreMod = require("../../CoreMod/src/Core.js"); //morphine injector - CoreMod.CreateTraderAssort(HashUtil.generate(), "544fb3f34bdc2d03748b456a", "54cb57776803fa99248b456e", 28289, "RUB", 4, true); + id = HashUtil.generate() + CoreMod.CreateTraderAssort(id, "544fb3f34bdc2d03748b456a", "54cb57776803fa99248b456e", 28289, "RUB", 4, true); + CoreMod.CreateTraderAssortUnlock("54cb57776803fa99248b456e", "success", id, "5a68665c86f774255929b4c7") //Health Care Privacy - Part 3 //Augmentin antibiotic pills CoreMod.CreateTraderAssort(HashUtil.generate(), "590c695186f7741e566b64a2", "54cb57776803fa99248b456e", 30844, "RUB", 4, false, 4000, 1); @@ -451,7 +475,9 @@ class TherapistAssort { CoreMod.CreateTraderAssort(HashUtil.generate(), "5c0e533786f7747fa23f4d47", "54cb57776803fa99248b456e", 28630, "RUB", 4, false, 2000, 1); //adrenaline injector - CoreMod.CreateTraderAssort(HashUtil.generate(), "5c10c8fd86f7743d7d706df3", "54cb57776803fa99248b456e", 28630, "RUB", 4, false, 20000, 1); + id = HashUtil.generate() + CoreMod.CreateTraderAssort(id, "5c10c8fd86f7743d7d706df3", "54cb57776803fa99248b456e", 28630, "RUB", 4, false, 20000, 1); + CoreMod.CreateTraderAssortUnlock("54cb57776803fa99248b456e", "success", id, "5c0d0d5086f774363760aef2") //Athlete //pack of sugar CoreMod.CreateTraderBarter(HashUtil.generate(), "59e3577886f774176a362503", "hideout", "hideout", [ @@ -530,6 +556,8 @@ class TherapistAssort { TherapistAssort.GenerateLL2(); TherapistAssort.GenerateLL3(); TherapistAssort.GenerateLL4(); + VFS.writeFile(`./traders/54cb57776803fa99248b456e/assort.json`, JsonUtil.serialize(DatabaseServer.tables.traders["54cb57776803fa99248b456e"].assort, true)) + VFS.writeFile(`./traders/54cb57776803fa99248b456e/questassort.json`, JsonUtil.serialize(DatabaseServer.tables.traders["54cb57776803fa99248b456e"].questassort, true)) } } From a5ee3e3ef3e3c8c3226130e4d4d6b330ae327a4c Mon Sep 17 00:00:00 2001 From: Ereshkigal Date: Sun, 8 Aug 2021 15:52:49 +0200 Subject: [PATCH 2/7] Prapor assortunlocks --- .../config/custom_presets.json | 80 ++ Ereshkigal-BaseAssortGenerator/package.js | 2 + Ereshkigal-BaseAssortGenerator/src/prapor.js | 690 +++++++++--------- 3 files changed, 442 insertions(+), 330 deletions(-) diff --git a/Ereshkigal-BaseAssortGenerator/config/custom_presets.json b/Ereshkigal-BaseAssortGenerator/config/custom_presets.json index 70e833b..c60c3f1 100644 --- a/Ereshkigal-BaseAssortGenerator/config/custom_presets.json +++ b/Ereshkigal-BaseAssortGenerator/config/custom_presets.json @@ -251,5 +251,85 @@ } } ] + }, + "ASH-12_Silenced_LL4": { + "_id": "ASH-12_Silenced_LL4", + "_type": "Preset", + "_changeWeaponName": false, + "_name": "ash_12_silenced", + "_parent": "893a544a5de59baa183c806a", + "_items": [ + { + "_id": "893a544a5de59baa183c806a", + "_tpl": "5cadfbf7ae92152ac412eeef", + "upd": { + "Repairable": { + "MaxDurability": 100, + "Durability": 100 + }, + "FireMode": { + "FireMode": "single" + } + } + }, + { + "_id": "89df79347dfc7df98a989188", + "_tpl": "5caf187cae92157c28402e43", + "parentId": "893a544a5de59baa183c806a", + "slotId": "mod_muzzle" + }, + { + "_id": "300cebc1cb6d97fe5e2c5377", + "_tpl": "5caf1041ae92157c28402e3f", + "parentId": "893a544a5de59baa183c806a", + "slotId": "mod_magazine" + }, + { + "_id": "ac2c80197a7f593f1924b6e9", + "_tpl": "5caf16a2ae92152ac412efbc", + "parentId": "893a544a5de59baa183c806a", + "slotId": "mod_sight_front", + "upd": { + "Sight": { + "ScopesCurrentCalibPointIndexes": [ + 0 + ], + "ScopesSelectedModes": [ + 0 + ], + "SelectedScope": 0 + } + } + }, + { + "_id": "32f372594e610518abd2df76", + "_tpl": "5cdaa99dd7f00c002412d0b2", + "parentId": "893a544a5de59baa183c806a", + "slotId": "mod_handguard" + }, + { + "_id": "4a37c14ff3eeb816dc2311b9", + "_tpl": "5caf1691ae92152ac412efb9", + "parentId": "893a544a5de59baa183c806a", + "slotId": "mod_scope", + "upd": { + "Sight": { + "ScopesCurrentCalibPointIndexes": [ + 0 + ], + "ScopesSelectedModes": [ + 0 + ], + "SelectedScope": 0 + } + } + }, + { + "_id": "483f20776801fa5928c217d6", + "_tpl": "5cda9bcfd7f00c0c0b53e900", + "parentId": "32f372594e610518abd2df76", + "slotId": "mod_foregrip" + } + ] } } \ No newline at end of file diff --git a/Ereshkigal-BaseAssortGenerator/package.js b/Ereshkigal-BaseAssortGenerator/package.js index fd9120c..a9ce005 100644 --- a/Ereshkigal-BaseAssortGenerator/package.js +++ b/Ereshkigal-BaseAssortGenerator/package.js @@ -18,6 +18,7 @@ class GenerateEverything { constructor() { const mod = require("./package.json") Logger.info(`Loading: ${mod.name} : ${mod.version}`); + const customPresets = require("./config/custom_presets.json"); ModLoader.onLoad["Assorts-prapor"] = prapor.generatePraporAssort; ModLoader.onLoad["Assorts-therapist"] = therapist.generateTherapistAssort; ModLoader.onLoad["Assorts-skier"] = skier.generateSkierAssort; @@ -25,6 +26,7 @@ class GenerateEverything { ModLoader.onLoad["Assorts-peacekeeper"] = peacekeeper.generatePeacekeeperAssort; ModLoader.onLoad["Assorts-ragman"] = ragman.generateRagmanAssort; ModLoader.onLoad["Assorts-jeager"] = jeager.generateJeagerAssort; + Object.assign(DatabaseServer.tables.globals.ItemPresets, customPresets) } } diff --git a/Ereshkigal-BaseAssortGenerator/src/prapor.js b/Ereshkigal-BaseAssortGenerator/src/prapor.js index c93990d..c0b7fe1 100644 --- a/Ereshkigal-BaseAssortGenerator/src/prapor.js +++ b/Ereshkigal-BaseAssortGenerator/src/prapor.js @@ -2,7 +2,7 @@ エレシュキガル */ -class PraporAssort{ +class PraporAssort { static GenerateLL1() { const CoreMod = require("../../CoreMod/src/Core.js"); @@ -17,21 +17,19 @@ 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); @@ -39,6 +37,11 @@ class PraporAssort{ //7.62x39mm PS GZH CoreMod.CreateTraderAssort(HashUtil.generate(), "5656d7c34bdc2d9d198b4587", "54cb50c76803fa8b248b4571", 91, "RUB", 1, true, 999999); + //5.45x39mm PS gs + id = HashUtil.generate() + CoreMod.CreateTraderAssort(id, "56dff3afd2720bba668b4567", "54cb50c76803fa8b248b4571", 81, "RUB", 1, true, 999999); + CoreMod.CreateTraderAssortUnlock("54cb50c76803fa8b248b4571", "success", id, "59674eb386f774539f14813a") + //5.45x39mm PRS GS CoreMod.CreateTraderAssort(HashUtil.generate(), "56dff338d2720bbd668b4569", "54cb50c76803fa8b248b4571", 51, "RUB", 1, true, 999999); @@ -80,12 +83,11 @@ 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); @@ -110,14 +112,13 @@ 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); @@ -175,12 +176,11 @@ 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); @@ -243,15 +243,14 @@ class PraporAssort{ //AKS-74U id = HashUtil.generate(); CoreMod.CreateTraderBarterWithPreset(id, "584147732459775a2b6d9f12", "hideout", "hideout", [ - [{ - "count": 1, - "_tpl": "573478bc24597738002c6175" - }, { - "count": 1, - "_tpl": "5e2af00086f7746d3f3c33f7" - } - ] - ], "54cb50c76803fa8b248b4571", 1, false, 7000); + [{ + "count": 1, + "_tpl": "573478bc24597738002c6175" + }, { + "count": 1, + "_tpl": "5e2af00086f7746d3f3c33f7" + }] + ], "54cb50c76803fa8b248b4571", 1, false, 7000); //AKS-74u id = HashUtil.generate(); @@ -261,12 +260,11 @@ 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(); @@ -275,15 +273,14 @@ 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(); @@ -296,15 +293,14 @@ class PraporAssort{ //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(); @@ -313,12 +309,11 @@ 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); @@ -333,27 +328,25 @@ 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); @@ -368,37 +361,45 @@ class PraporAssort{ //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, 1000, 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"); let id = null; + + //Zenit-BelOMO PSO-1M2-1 4x24 scope + id = HashUtil.generate() + CoreMod.CreateTraderAssort(id, "576fd4ec2459777f0b518431", "54cb50c76803fa8b248b4571", 21565, "RUB", 1, false, 20000, 4); + CoreMod.CreateTraderAssortUnlock("54cb50c76803fa8b248b4571", "success", id, "5967530a86f77462ba22226b"); //Bad rep evidence + + //Haxagon 12k supressor + id = HashUtil.generate() + CoreMod.CreateTraderAssort(id, "59c0ec5b86f77435b128bfca", "54cb50c76803fa8b248b4571", 25112, "RUB", 2, false, 10000); + CoreMod.CreateTraderAssortUnlock("54cb50c76803fa8b248b4571", "success", id, "5967725e86f774601a446662"); //Shaking up teller + //9mm PST GZH CoreMod.CreateTraderAssort(HashUtil.generate(), "56d59d3ad2720bdb418b4577", "54cb50c76803fa8b248b4571", 68, "RUB", 2, true, 999999); @@ -521,83 +522,85 @@ class PraporAssort{ //6L25 CoreMod.CreateTraderBarter(HashUtil.generate(), "57838f9f2459774a150289a0", "hideout", "hideout", [ [{ - "count": 1, - "_tpl": "590c639286f774151567fa95" - } - ] + "count": 1, + "_tpl": "590c639286f774151567fa95" + }] ], "54cb50c76803fa8b248b4571", 2, false, 2000, 5); + //6L31 + id = HashUtil.generate() + CoreMod.CreateTraderBarter(id, "55d482194bdc2d1d4e8b456b", "hideout", "hideout", [ + [{ + "count": 1, + "_tpl": "5d1b32c186f774252167a530" + }] + ], "54cb50c76803fa8b248b4571", 2, false, 2000, 5); + CoreMod.CreateTraderAssortUnlock("54cb50c76803fa8b248b4571", "success", id, "59675d6c86f7740a842fc482"); //Ice cream cones + //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(); @@ -642,90 +645,83 @@ class PraporAssort{ //AK-74N Black id = HashUtil.generate(); CoreMod.CreateTraderBarterWithPreset(id, "AK-74N_Black", "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() { @@ -733,28 +729,31 @@ 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); + //7.62x39mm BP gzh + id = HashUtil.generate() + CoreMod.CreateTraderAssort(id, "56dfef82d2720bbd668b4567", "54cb50c76803fa8b248b4571", 985, "RUB", 3, false, 300000, 300); + CoreMod.CreateTraderAssortUnlock("54cb50c76803fa8b248b4571", "success", id, "59ca29fb86f77445ab465c87"); //Punisher part5 + //5.45x39mm BT gs CoreMod.CreateTraderAssort(HashUtil.generate(), "56dff061d2720bb5668b4567", "54cb50c76803fa8b248b4571", 641, "RUB", 3, false, 300000); @@ -823,24 +822,22 @@ 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); @@ -879,7 +876,9 @@ class PraporAssort{ CoreMod.CreateTraderAssort(HashUtil.generate(), "57c44dd02459772d2e0ae249", "54cb50c76803fa8b248b4571", 25448, "RUB", 3, false, 2000); //pbs-4 5.45x39 sound suppressor - CoreMod.CreateTraderAssort(HashUtil.generate(), "57ffb0e42459777d047111c5", "54cb50c76803fa8b248b4571", 35961, "RUB", 3, false, 10000); + id = HashUtil.generate() + CoreMod.CreateTraderAssort(id, "57ffb0e42459777d047111c5", "54cb50c76803fa8b248b4571", 35961, "RUB", 3, false, 10000); + CoreMod.CreateTraderAssortUnlock("54cb50c76803fa8b248b4571", "success", id, "5967725e86f774601a446662"); //Shaking up teller //pbs-1 7.62x39 sound suppressor CoreMod.CreateTraderAssort(HashUtil.generate(), "5a0d63621526d8dba31fe3bf", "54cb50c76803fa8b248b4571", 52512, "RUB", 3, false, 2000); @@ -994,27 +993,25 @@ 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); @@ -1024,45 +1021,70 @@ 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); //sv-98 7.62x54r bolt-action sniper rifle - CoreMod.CreateTraderAssort(HashUtil.generate(), "55801eed4bdc2d89578b4588", "54cb50c76803fa8b248b4571", 35204, "RUB", 3, true, 999999); + id = HashUtil.generate() + CoreMod.CreateTraderAssortWithPreset(id, "58414a16245977599247970a", "54cb50c76803fa8b248b4571", 35204, "RUB", 3, true, 999999); + CoreMod.CreateTraderAssortUnlock("54cb50c76803fa8b248b4571", "success", id, "59c50a9e86f7745fef66f4ff"); //The punisher p1 //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); + + //5,45x39mm BT gs + id = HashUtil.generate() + CoreMod.CreateTraderAssort(id, "56dff061d2720bb5668b4567", "54cb50c76803fa8b248b4571", 641, "RUB", 3, true, 99999, 500); + CoreMod.CreateTraderAssortUnlock("54cb50c76803fa8b248b4571", "success", id, "59ca264786f77445a80ed044") } static GenerateLL4() { const CoreMod = require("../../CoreMod/src/Core.js"); + //9x39 BP gs 8 pcs. ammo pack + id = HashUtil.generate() + CoreMod.CreateTraderBarter(id, "5c1260dc86f7746b106e8748", "hideout", "hideout", [ + [{ + "count": 1, + "_tpl": "5734770f24597738025ee254" + }] + ], "54cb50c76803fa8b248b4571", 4, false, 2500, 10); + CoreMod.CreateTraderAssortUnlock("54cb50c76803fa8b248b4571","success",id,"5c0d190cd09282029f5390d8"); // Grenadier + + //7.62x54r BT gzh + id = HashUtil.generate() + CoreMod.CreateTraderAssort(id, "5e023d34e8a400319a28ed44", "54cb50c76803fa8b248b4571", 1057, "RUB", 4, true, 99999, 200); + CoreMod.CreateTraderAssortUnlock("54cb50c76803fa8b248b4571", "success", id, "59c512ad86f7741f0d09de9b") + + //12,7x55 mm PS12B + id = HashUtil.generate() + CoreMod.CreateTraderAssort(id, "5cadf6eeae921500134b2799", "54cb50c76803fa8b248b4571", 695, "RUB", 4, true, 99999, 200); + CoreMod.CreateTraderAssortUnlock("54cb50c76803fa8b248b4571", "success", id, "5c0d190cd09282029f5390d8")// Grenadier + + //7.62x54r snb CoreMod.CreateTraderAssort(HashUtil.generate(), "560d61e84bdc2da74d8b4571", "54cb50c76803fa8b248b4571", 816, "RUB", 4, false, 2000); @@ -1138,63 +1160,71 @@ class PraporAssort{ //npp klass condor glasses CoreMod.CreateTraderAssort(HashUtil.generate(), "603409c80ca681766b6a0fb2", "54cb50c76803fa8b248b4571", 16744, "RUB", 4, false, 10000, 2); + //ash-12 12.7x55 assault rifle silenced + CoreMod.CreateTraderBarterWithPreset(HashUtil.generate(), "ASH-12_Silenced_LL4", "hideout", "hideout", [ + [{ + "count": 1, + "_tpl": "5d0376a486f7747d8050965c" + }, { + "count": 1, + "_tpl": "5c06779c86f77426e00dd782" + }] + ], "54cb50c76803fa8b248b4571", 4, false, 2000, 1); + //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); + id = HashUtil.generate() + CoreMod.CreateTraderBarterWithPreset(id, "5d23467086f77443f37fc602", "hideout", "hideout", [ + [{ + "count": 2, + "_tpl": "5d40407c86f774318526545a" + }] + ], "54cb50c76803fa8b248b4571", 4, false, 2000, 1); + CoreMod.CreateTraderAssortUnlock("54cb50c76803fa8b248b4571","success",id,"5d4bec3486f7743cac246665"); //Regulated materials //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(); PraporAssort.GenerateLL2(); PraporAssort.GenerateLL3(); PraporAssort.GenerateLL4(); + VFS.writeFile(`./traders/54cb50c76803fa8b248b4571/assort.json`, JsonUtil.serialize(DatabaseServer.tables.traders["54cb50c76803fa8b248b4571"].assort, true)) + VFS.writeFile(`./traders/54cb50c76803fa8b248b4571/questassort.json`, JsonUtil.serialize(DatabaseServer.tables.traders["54cb50c76803fa8b248b4571"].questassort, true)) } } -module.exports = PraporAssort; +module.exports = PraporAssort; \ No newline at end of file From b4c2bc6400eec7bbfee38ca04c2f937ebcd993bb Mon Sep 17 00:00:00 2001 From: Ereshkigal Date: Sun, 8 Aug 2021 15:54:57 +0200 Subject: [PATCH 3/7] missing price --- Ereshkigal-BaseAssortGenerator/src/peacekeeper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ereshkigal-BaseAssortGenerator/src/peacekeeper.js b/Ereshkigal-BaseAssortGenerator/src/peacekeeper.js index 3b76f34..1486c2c 100644 --- a/Ereshkigal-BaseAssortGenerator/src/peacekeeper.js +++ b/Ereshkigal-BaseAssortGenerator/src/peacekeeper.js @@ -730,7 +730,7 @@ class PeacekeeperAssort { CoreMod.CreateTraderAssort(HashUtil.generate(), "5c9a25172e2216000f20314e", "5935c25fb3acc3127c3d8cd9", 169, "USD", 4, false, 2000); //remington m700 ab arms mod*x gen 3 keymod handguard - CoreMod.CreateTraderAssort(HashUtil.generate(), "5cde7afdd7f00c000d36b89d", "5935c25fb3acc3127c3d8cd9", , "USD", 4, false, 2000); + CoreMod.CreateTraderAssort(HashUtil.generate(), "5cde7afdd7f00c000d36b89d", "5935c25fb3acc3127c3d8cd9", 96, "USD", 4, false, 2000); //ar-15 urx 3.1 10.75 inch handguard CoreMod.CreateTraderAssort(HashUtil.generate(), "5d122e7bd7ad1a07102d6d7f", "5935c25fb3acc3127c3d8cd9", 182, "USD", 4, false, 2000); From db7e3c4d647b19d18958b85ce344e258d247225d Mon Sep 17 00:00:00 2001 From: Ereshkigal Date: Sun, 8 Aug 2021 15:58:44 +0200 Subject: [PATCH 4/7] Few missing id set --- Ereshkigal-BaseAssortGenerator/src/prapor.js | 4 ++-- Ereshkigal-BaseAssortGenerator/src/therapist.js | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Ereshkigal-BaseAssortGenerator/src/prapor.js b/Ereshkigal-BaseAssortGenerator/src/prapor.js index c0b7fe1..f2da74c 100644 --- a/Ereshkigal-BaseAssortGenerator/src/prapor.js +++ b/Ereshkigal-BaseAssortGenerator/src/prapor.js @@ -726,7 +726,7 @@ class PraporAssort { } static GenerateLL3() { const CoreMod = require("../../CoreMod/src/Core.js"); - + let id = null //5.45x39 BS gs 30 pcs ammo pack CoreMod.CreateTraderBarter(HashUtil.generate(), "57372bd3245977670b7cd243", "hideout", "hideout", [ [{ @@ -1063,7 +1063,7 @@ class PraporAssort { } static GenerateLL4() { const CoreMod = require("../../CoreMod/src/Core.js"); - + let id = null //9x39 BP gs 8 pcs. ammo pack id = HashUtil.generate() CoreMod.CreateTraderBarter(id, "5c1260dc86f7746b106e8748", "hideout", "hideout", [ diff --git a/Ereshkigal-BaseAssortGenerator/src/therapist.js b/Ereshkigal-BaseAssortGenerator/src/therapist.js index 844ede8..9302916 100644 --- a/Ereshkigal-BaseAssortGenerator/src/therapist.js +++ b/Ereshkigal-BaseAssortGenerator/src/therapist.js @@ -160,6 +160,7 @@ class TherapistAssort { } static GenerateLL2() { const CoreMod = require("../../CoreMod/src/Core.js"); + let id = null //THERAPIST LL2 //Army bandage @@ -321,8 +322,8 @@ class TherapistAssort { } static GenerateLL3() { const CoreMod = require("../../CoreMod/src/Core.js"); + let id = null //IFAK - CoreMod.CreateTraderAssort(id, "5af0454c86f7746bf20992e8", "54cb57776803fa99248b456e", 15873, "RUB", 3, false, 7000); @@ -432,7 +433,7 @@ class TherapistAssort { } static GenerateLL4() { const CoreMod = require("../../CoreMod/src/Core.js"); - + let id = null //morphine injector id = HashUtil.generate() CoreMod.CreateTraderAssort(id, "544fb3f34bdc2d03748b456a", "54cb57776803fa99248b456e", 28289, "RUB", 4, true); From 434bd829cf916de2769641b400320acf75e0aa60 Mon Sep 17 00:00:00 2001 From: Ereshkigal Date: Sun, 8 Aug 2021 16:03:27 +0200 Subject: [PATCH 5/7] Duplicate oops --- Ereshkigal-BaseAssortGenerator/src/ragman.js | 2 +- Ereshkigal-BaseAssortGenerator/src/therapist.js | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Ereshkigal-BaseAssortGenerator/src/ragman.js b/Ereshkigal-BaseAssortGenerator/src/ragman.js index a5dc812..c6e8101 100644 --- a/Ereshkigal-BaseAssortGenerator/src/ragman.js +++ b/Ereshkigal-BaseAssortGenerator/src/ragman.js @@ -122,7 +122,7 @@ class RagmanAssort { } static GenerateLL2() { const CoreMod = require("../../CoreMod/src/Core.js"); - + let id = null //cold fear infrared balaclava CoreMod.CreateTraderAssort(HashUtil.generate(), "5ab8f39486f7745cd93a1cca", "5ac3b934156ae10c4430e83c", 4793, "RUB", 2, false, 5000); diff --git a/Ereshkigal-BaseAssortGenerator/src/therapist.js b/Ereshkigal-BaseAssortGenerator/src/therapist.js index 9302916..72cdce6 100644 --- a/Ereshkigal-BaseAssortGenerator/src/therapist.js +++ b/Ereshkigal-BaseAssortGenerator/src/therapist.js @@ -323,9 +323,6 @@ class TherapistAssort { static GenerateLL3() { const CoreMod = require("../../CoreMod/src/Core.js"); let id = null - //IFAK - CoreMod.CreateTraderAssort(id, "5af0454c86f7746bf20992e8", "54cb57776803fa99248b456e", 15873, "RUB", 3, false, 7000); - //Aluminum splint CoreMod.CreateTraderAssort(HashUtil.generate(), "5af0454c86f7746bf20992e8", "54cb57776803fa99248b456e", 15873, "RUB", 3, false, 7000); From 8dddbd99b1d3c8a885ea1dd8d121366ccddb8560 Mon Sep 17 00:00:00 2001 From: Ereshkigal Date: Sun, 8 Aug 2021 16:11:56 +0200 Subject: [PATCH 6/7] VSS Magless + RPK 16 drum mag preset --- .../config/custom_presets.json | 178 ++++++++++++++++++ Ereshkigal-BaseAssortGenerator/src/prapor.js | 4 +- 2 files changed, 180 insertions(+), 2 deletions(-) diff --git a/Ereshkigal-BaseAssortGenerator/config/custom_presets.json b/Ereshkigal-BaseAssortGenerator/config/custom_presets.json index c60c3f1..49a4682 100644 --- a/Ereshkigal-BaseAssortGenerator/config/custom_presets.json +++ b/Ereshkigal-BaseAssortGenerator/config/custom_presets.json @@ -331,5 +331,183 @@ "slotId": "mod_foregrip" } ] + }, + "RPK-16_Drum": { + "_id": "RPK-16_Drum", + "_type": "Preset", + "_changeWeaponName": false, + "_name": "RPK-16 Drum", + "_parent": "d7a5662e20d1ba628ce909fd", + "_items": [ + { + "_id": "d7a5662e20d1ba628ce909fd", + "_tpl": "5beed0f50db834001c062b12", + "upd": { + "StackObjectsCount": 2000, + "Repairable": { + "MaxDurability": 100, + "Durability": 100 + }, + "Foldable": { + "Folded": false + }, + "FireMode": { + "FireMode": "single" + } + } + }, + { + "_id": "9f87a06c78e449eab346ec15", + "_tpl": "5beec8ea0db834001a6f9dbf", + "parentId": "d7a5662e20d1ba628ce909fd", + "slotId": "mod_pistol_grip" + }, + { + "_id": "3ff48ea4ed797ac5486854eb", + "_tpl": "5beec91a0db834001961942d", + "parentId": "d7a5662e20d1ba628ce909fd", + "slotId": "mod_reciever" + }, + { + "_id": "824f5e92e5842b3aff16ee88", + "_tpl": "5bed625c0db834001c062946", + "parentId": "d7a5662e20d1ba628ce909fd", + "slotId": "mod_magazine" + }, + { + "_id": "296d8b7e298f16e9eb221d39", + "_tpl": "5beec8b20db834001961942a", + "parentId": "d7a5662e20d1ba628ce909fd", + "slotId": "mod_stock_001" + }, + { + "_id": "f5d445f2f723a151957ba507", + "_tpl": "5beec3e30db8340019619424", + "parentId": "d7a5662e20d1ba628ce909fd", + "slotId": "mod_handguard" + }, + { + "_id": "d0134e71867b88bfd27efe44", + "_tpl": "5beec1bd0db834001e6006f3", + "parentId": "d7a5662e20d1ba628ce909fd", + "slotId": "mod_barrel" + }, + { + "_id": "fab49be0d681f011b6b7707e", + "_tpl": "5beec9450db83400970084fd", + "parentId": "3ff48ea4ed797ac5486854eb", + "slotId": "mod_sight_rear", + "upd": { + "Sight": { + "ScopesCurrentCalibPointIndexes": [ + 0 + ], + "ScopesSelectedModes": [ + 0 + ], + "SelectedScope": 0 + } + } + }, + { + "_id": "ecc1cbd838dd33a0cf3afafa", + "_tpl": "5beec8c20db834001d2c465c", + "parentId": "296d8b7e298f16e9eb221d39", + "slotId": "mod_stock" + }, + { + "_id": "7876e6b8d0089aff28b0c221", + "_tpl": "5beecbb80db834001d2c465e", + "parentId": "f5d445f2f723a151957ba507", + "slotId": "mod_mount_000" + }, + { + "_id": "a9cc2c587a6624e5a011c625", + "_tpl": "5beecbb80db834001d2c465e", + "parentId": "f5d445f2f723a151957ba507", + "slotId": "mod_mount_001" + }, + { + "_id": "5cdc8969cd7a7ccea6fc6de5", + "_tpl": "5beec3420db834001b095429", + "parentId": "d0134e71867b88bfd27efe44", + "slotId": "mod_muzzle" + }, + { + "_id": "dd515963e57a9290c8ae1365", + "_tpl": "5bf3f59f0db834001a6fa060", + "parentId": "fab49be0d681f011b6b7707e", + "slotId": "mod_sight_rear", + "upd": { + "Sight": { + "ScopesCurrentCalibPointIndexes": [ + 0 + ], + "ScopesSelectedModes": [ + 0 + ], + "SelectedScope": 0 + } + } + } + ] + }, + "VSS_Magless": { + "_id": "VSS_Magless", + "_type": "Preset", + "_changeWeaponName": false, + "_name": "VSS Vintorez magless", + "_parent": "06c465f556002417834e0c19", + "_items": [ + { + "_id": "06c465f556002417834e0c19", + "_tpl": "57838ad32459774a17445cd2", + "upd": { + "StackObjectsCount": 200, + "Repairable": { + "MaxDurability": 100, + "Durability": 100 + }, + "FireMode": { + "FireMode": "single" + } + } + }, + { + "_id": "8ff0ce4165d75ae6ee19e983", + "_tpl": "57838c962459774a1651ec63", + "parentId": "06c465f556002417834e0c19", + "slotId": "mod_muzzle" + }, + { + "_id": "cbcf1e97145a3cbf9b8b4fce", + "_tpl": "578395402459774a256959b5", + "parentId": "06c465f556002417834e0c19", + "slotId": "mod_reciever" + }, + { + "_id": "9f0c2c9eab7fa456d186a8e4", + "_tpl": "578395e82459774a0e553c7b", + "parentId": "06c465f556002417834e0c19", + "slotId": "mod_stock" + }, + { + "_id": "39a8c5dde2b7c1586867e2c7", + "_tpl": "57838e1b2459774a256959b1", + "parentId": "8ff0ce4165d75ae6ee19e983", + "slotId": "mod_sight_rear", + "upd": { + "Sight": { + "ScopesCurrentCalibPointIndexes": [ + 0 + ], + "ScopesSelectedModes": [ + 0 + ], + "SelectedScope": 0 + } + } + } + ] } } \ No newline at end of file diff --git a/Ereshkigal-BaseAssortGenerator/src/prapor.js b/Ereshkigal-BaseAssortGenerator/src/prapor.js index f2da74c..5f4b057 100644 --- a/Ereshkigal-BaseAssortGenerator/src/prapor.js +++ b/Ereshkigal-BaseAssortGenerator/src/prapor.js @@ -832,7 +832,7 @@ class PraporAssort { 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", [ + CoreMod.CreateTraderBarter(HashUtil.generate(), "RPK-16_Drum", "hideout", "hideout", [ [{ "count": 4, "_tpl": "590c2b4386f77425357b6123" @@ -1003,7 +1003,7 @@ class PraporAssort { ], "54cb50c76803fa8b248b4571", 3, false, 2000, 2); //vss vintorez 9x39 special sniper rifle - CoreMod.CreateTraderBarterWithPreset(HashUtil.generate(), "58414a3f2459775a77263531", "hideout", "hideout", [ + CoreMod.CreateTraderBarterWithPreset(HashUtil.generate(), "VSS_Magless", "hideout", "hideout", [ [{ "count": 10, "_tpl": "590c595c86f7747884343ad7" From 9a28b6e5afdce90a5e878d6324c66e3158c6c54f Mon Sep 17 00:00:00 2001 From: Ereshkigal Date: Sun, 8 Aug 2021 16:24:43 +0200 Subject: [PATCH 7/7] oops --- Ereshkigal-BaseAssortGenerator/src/prapor.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Ereshkigal-BaseAssortGenerator/src/prapor.js b/Ereshkigal-BaseAssortGenerator/src/prapor.js index 5f4b057..014432a 100644 --- a/Ereshkigal-BaseAssortGenerator/src/prapor.js +++ b/Ereshkigal-BaseAssortGenerator/src/prapor.js @@ -832,7 +832,7 @@ class PraporAssort { CoreMod.CreateTraderAssort(HashUtil.generate(), "5b1fb3e15acfc4001637f068", "54cb50c76803fa8b248b4571", 3909, "RUB", 3, false, 2000); //rpk-16 5.45x39 95-round drum magazine - CoreMod.CreateTraderBarter(HashUtil.generate(), "RPK-16_Drum", "hideout", "hideout", [ + CoreMod.CreateTraderBarter(HashUtil.generate(), "5bed625c0db834001c062946", "hideout", "hideout", [ [{ "count": 4, "_tpl": "590c2b4386f77425357b6123" @@ -992,7 +992,7 @@ class PraporAssort { CoreMod.CreateTraderAssortWithPreset(HashUtil.generate(), "60479fb29c15b12b9a480fb0", "54cb50c76803fa8b248b4571", 18137, "RUB", 3, false, 40000); //rpk-16 5.45x39 light machine gun - CoreMod.CreateTraderBarterWithPreset(HashUtil.generate(), "5c0d1ec986f77439512a1a72", "hideout", "hideout", [ + CoreMod.CreateTraderBarterWithPreset(HashUtil.generate(), "RPK-16_Drum", "hideout", "hideout", [ [{ "count": 2, "_tpl": "590c5a7286f7747884343aea"