From ea3388489918ac01ace905e5b1c1b01940a5dcc4 Mon Sep 17 00:00:00 2001 From: Razzmatazz Date: Tue, 7 May 2024 07:39:13 -0500 Subject: [PATCH 1/3] update presets --- .../data/manual_presets.json | 603 ++++++++++-------- 1 file changed, 353 insertions(+), 250 deletions(-) diff --git a/src/tarkov-data-manager/data/manual_presets.json b/src/tarkov-data-manager/data/manual_presets.json index 32445dae..b508bd08 100644 --- a/src/tarkov-data-manager/data/manual_presets.json +++ b/src/tarkov-data-manager/data/manual_presets.json @@ -1524,419 +1524,504 @@ ] }, { - "_id": "fnscarhcqb00000000000001", - "appendName": "6398681b9f81ff62557b8225", + "_id": "fnscarhflir0000000000001", + "appendName": "5d1b5e94d7ad1a2b865a96b0 ShortName", "_items": [ { - "_id": "66265a3745b89134640ccce1", + "_id": "6639ee21387309934807ad74", "_tpl": "6183afd850224f204c1da514" }, { - "_id": "66265a3745b89134640ccce2", - "_tpl": "652911675ae2ae97b80fdf3c", - "parentId": "66265a3745b89134640ccce1", + "_id": "6639ee21387309934807ad75", + "_tpl": "5d15cf3bd7ad1a67e71518b2", + "parentId": "6639ee21387309934807ad74", "slotId": "mod_pistol_grip" }, { - "_id": "66265a3745b89134640ccce3", + "_id": "6639ee21387309934807ad76", "_tpl": "6183d53f1cb55961fa0fdcda", - "parentId": "66265a3745b89134640ccce1", + "parentId": "6639ee21387309934807ad74", "slotId": "mod_magazine" }, { - "_id": "66265a3745b89134640ccce4", + "_id": "6639ee21387309934807ad77", "_tpl": "6165aeedfaa1272e431521e3", - "parentId": "66265a3745b89134640ccce1", + "parentId": "6639ee21387309934807ad74", "slotId": "mod_reciever" }, { - "_id": "66265a3745b89134640ccce5", - "_tpl": "577d128124597739d65d0e56", - "parentId": "66265a3745b89134640ccce4", + "_id": "6639ee21387309934807ad78", + "_tpl": "5d1b5e94d7ad1a2b865a96b0", + "parentId": "6639ee21387309934807ad77", "slotId": "mod_scope" }, { - "_id": "66265a3745b89134640ccce6", - "_tpl": "577d141e24597739c5255e01", - "parentId": "66265a3745b89134640ccce5", - "slotId": "mod_scope" - }, - { - "_id": "66265a3745b89134640ccce7", + "_id": "6639ee21387309934807ad79", "_tpl": "6183b0711cb55961fa0fdcad", - "parentId": "66265a3745b89134640ccce4", + "parentId": "6639ee21387309934807ad77", "slotId": "mod_barrel" }, { - "_id": "66265a3745b89134640ccce8", + "_id": "6639ee21387309934807ad7a", "_tpl": "612e0e3c290d254f5e6b291d", - "parentId": "66265a3745b89134640ccce7", + "parentId": "6639ee21387309934807ad79", "slotId": "mod_muzzle" }, { - "_id": "66265a3745b89134640ccce9", + "_id": "6639ee21387309934807ad7b", "_tpl": "61816fcad92c473c770215cc", - "parentId": "66265a3745b89134640ccce7", + "parentId": "6639ee21387309934807ad79", "slotId": "mod_sight_front" }, { - "_id": "66265a3745b89134640cccea", + "_id": "6639ee21387309934807ad7c", "_tpl": "61817865d3a39d50044c13a4", - "parentId": "66265a3745b89134640ccce4", + "parentId": "6639ee21387309934807ad77", "slotId": "mod_sight_rear" }, { - "_id": "66265a3745b89134640ccceb", + "_id": "6639ee21387309934807ad7d", "_tpl": "619666f4af1f5202c57a952d", - "parentId": "66265a3745b89134640ccce4", + "parentId": "6639ee21387309934807ad77", "slotId": "mod_mount_000" }, { - "_id": "66265a3745b89134640cccec", + "_id": "6639ee21387309934807ad7e", "_tpl": "57cffcd624597763133760c5", - "parentId": "66265a3745b89134640ccceb", + "parentId": "6639ee21387309934807ad7d", "slotId": "mod_foregrip" }, { - "_id": "66265a3745b89134640ccced", + "_id": "6639ee21387309934807ad7f", "_tpl": "5b7be47f5acfc400170e2dd2", - "parentId": "66265a3745b89134640ccceb", + "parentId": "6639ee21387309934807ad7d", "slotId": "mod_mount_002" }, { - "_id": "66265a3745b89134640cccee", + "_id": "6639ee21387309934807ad80", + "_tpl": "5b7be47f5acfc400170e2dd2", + "parentId": "6639ee21387309934807ad7d", + "slotId": "mod_mount_000" + }, + { + "_id": "6639ee21387309934807ad81", + "_tpl": "5b7be47f5acfc400170e2dd2", + "parentId": "6639ee21387309934807ad7d", + "slotId": "mod_mount_001" + }, + { + "_id": "6639ee21387309934807ad82", + "_tpl": "6267c6396b642f77f56f5c1c", + "parentId": "6639ee21387309934807ad81", + "slotId": "mod_tactical" + }, + { + "_id": "6639ee21387309934807ad83", + "_tpl": "57d17c5e2459775a5c57d17d", + "parentId": "6639ee21387309934807ad82", + "slotId": "mod_flashlight" + }, + { + "_id": "6639ee21387309934807ad84", + "_tpl": "544909bb4bdc2d6f028b4577", + "parentId": "6639ee21387309934807ad77", + "slotId": "mod_tactical_000" + }, + { + "_id": "6639ee21387309934807ad85", "_tpl": "5649a2464bdc2d91118b45a8", - "parentId": "66265a3745b89134640ccce4", + "parentId": "6639ee21387309934807ad77", "slotId": "mod_mount_002" }, { - "_id": "66265a3745b89134640cccef", + "_id": "6639ee21387309934807ad86", + "_tpl": "615d8d878004cc50514c3233", + "parentId": "6639ee21387309934807ad85", + "slotId": "mod_scope" + }, + { + "_id": "6639ee21387309934807ad87", + "_tpl": "616442e4faa1272e43152193", + "parentId": "6639ee21387309934807ad86", + "slotId": "mod_scope" + }, + { + "_id": "6639ee21387309934807ad88", "_tpl": "61816734d8e3106d9806c1f3", - "parentId": "66265a3745b89134640ccce1", + "parentId": "6639ee21387309934807ad74", "slotId": "mod_stock" }, { - "_id": "66265a3745b89134640cccf0", + "_id": "6639ee21387309934807ad89", "_tpl": "61825d136ef05c2ce828f1cc", - "parentId": "66265a3745b89134640cccef", + "parentId": "6639ee21387309934807ad88", "slotId": "mod_stock_001" }, { - "_id": "66265a3745b89134640cccf1", + "_id": "6639ee21387309934807ad8a", "_tpl": "618167616ef05c2ce828f1a8", - "parentId": "66265a3745b89134640cccf0", + "parentId": "6639ee21387309934807ad89", "slotId": "mod_stock" }, { - "_id": "66265a3745b89134640cccf2", + "_id": "6639ee21387309934807ad8b", + "_tpl": "61825d24d3a39d50044c13af", + "parentId": "6639ee21387309934807ad88", + "slotId": "mod_stock_002" + }, + { + "_id": "6639ee21387309934807ad8c", "_tpl": "6181688c6c780c1e710c9b04", - "parentId": "66265a3745b89134640ccce1", + "parentId": "6639ee21387309934807ad74", "slotId": "mod_charge" } ] }, { - "_id": "dtmdr556sakertrihawk0001", - "appendName": "626bb8532c923541184624b4 ShortName", + "_id": "dtmdr556hhs1tan000000001", + "appendName": "5c0a2cec0db834001b7ce47d ShortName", "_items": [ { - "_id": "66265a3745b89134640cccf4", + "_id": "6639ee21387309934807adac", "_tpl": "5c488a752e221602b412af63" }, { - "_id": "66265a3745b89134640cccf5", - "_tpl": "5dcbd6dddbd3d91b3e5468de", - "parentId": "66265a3745b89134640cccf4", + "_id": "6639ee21387309934807adad", + "_tpl": "5c48a2c22e221602b313fb6c", + "parentId": "6639ee21387309934807adac", "slotId": "mod_pistol_grip" }, { - "_id": "66265a3745b89134640cccf6", - "_tpl": "5c6d46132e221601da357d56", - "parentId": "66265a3745b89134640cccf4", + "_id": "6639ee21387309934807adae", + "_tpl": "5d1340cad7ad1a0b0b249869", + "parentId": "6639ee21387309934807adac", "slotId": "mod_magazine" }, { - "_id": "66265a3745b89134640cccf7", - "_tpl": "5dcbd6b46ec07c0c4347a564", - "parentId": "66265a3745b89134640cccf4", + "_id": "6639ee21387309934807adaf", + "_tpl": "5c48a14f2e2216152006edd7", + "parentId": "6639ee21387309934807adac", "slotId": "mod_handguard" }, { - "_id": "66265a3745b89134640cccf8", + "_id": "6639ee21387309934807adb0", "_tpl": "651a8e529829226ceb67c319", - "parentId": "66265a3745b89134640cccf7", + "parentId": "6639ee21387309934807adaf", "slotId": "mod_mount_000" }, { - "_id": "66265a3745b89134640cccf9", - "_tpl": "6269545d0e57f218e4548ca2", - "parentId": "66265a3745b89134640cccf7", - "slotId": "mod_mount_001" + "_id": "6639ee21387309934807adb1", + "_tpl": "544909bb4bdc2d6f028b4577", + "parentId": "6639ee21387309934807adaf", + "slotId": "mod_tactical" + }, + { + "_id": "6639ee21387309934807adb2", + "_tpl": "5c18b90d2e2216152142466b", + "parentId": "6639ee21387309934807adaf", + "slotId": "mod_sight_front" }, { - "_id": "66265a3745b89134640cccfa", + "_id": "6639ee21387309934807adb3", "_tpl": "6269545d0e57f218e4548ca2", - "parentId": "66265a3745b89134640cccf7", + "parentId": "6639ee21387309934807adaf", "slotId": "mod_mount_002" }, { - "_id": "66265a3745b89134640cccfb", - "_tpl": "544909bb4bdc2d6f028b4577", - "parentId": "66265a3745b89134640cccf7", + "_id": "6639ee21387309934807adb4", + "_tpl": "626becf9582c3e319310b837", + "parentId": "6639ee21387309934807adb3", "slotId": "mod_tactical" }, { - "_id": "66265a3745b89134640cccfc", - "_tpl": "5c18b90d2e2216152142466b", - "parentId": "66265a3745b89134640cccf7", - "slotId": "mod_sight_front" - }, - { - "_id": "66265a3745b89134640cccfd", + "_id": "6639ee21387309934807adb5", "_tpl": "5c48a2852e221602b21d5923", - "parentId": "66265a3745b89134640cccf4", + "parentId": "6639ee21387309934807adac", "slotId": "mod_barrel" }, { - "_id": "66265a3745b89134640cccfe", - "_tpl": "609269c3b0e443224b421cc1", - "parentId": "66265a3745b89134640cccfd", + "_id": "6639ee21387309934807adb6", + "_tpl": "5ea172e498dacb342978818e", + "parentId": "6639ee21387309934807adb5", "slotId": "mod_muzzle" }, { - "_id": "66265a3745b89134640cccff", - "_tpl": "60926df0132d4d12c81fd9df", - "parentId": "66265a3745b89134640cccfe", + "_id": "6639ee21387309934807adb7", + "_tpl": "5ea17bbc09aa976f2e7a51cd", + "parentId": "6639ee21387309934807adb6", "slotId": "mod_muzzle" }, { - "_id": "66265a3745b89134640ccd00", - "_tpl": "626bb8532c923541184624b4", - "parentId": "66265a3745b89134640cccf4", + "_id": "6639ee21387309934807adb8", + "_tpl": "5c0a2cec0db834001b7ce47d", + "parentId": "6639ee21387309934807adac", "slotId": "mod_scope" }, { - "_id": "66265a3745b89134640ccd01", - "_tpl": "5bc09a18d4351e003562b68e", - "parentId": "66265a3745b89134640cccf4", + "_id": "6639ee21387309934807adb9", + "_tpl": "5c18b9192e2216398b5a8104", + "parentId": "6639ee21387309934807adac", "slotId": "mod_sight_rear" } ] }, { - "_id": "coltm4a1viperpdw00000001", - "appendName": "627254cc9c563e6e442c398f ShortName", + "_id": "coltm4a1echo100000000001", + "appendName": "6478641c19d732620e045e17 ShortName", "_items": [ { - "_id": "66265a2345b89134640ccca9", + "_id": "6639ee0e387309934807a4a2", "_tpl": "5447a9cd4bdc2dbd208b4567" }, { - "_id": "66265a2345b89134640cccaa", - "_tpl": "615d8faecabb9b7ad90f4d5d", - "parentId": "66265a2345b89134640ccca9", + "_id": "6639ee0e387309934807a4a3", + "_tpl": "5a339805c4a2826c6e06d73d", + "parentId": "6639ee0e387309934807a4a2", "slotId": "mod_pistol_grip" }, { - "_id": "66265a2345b89134640cccab", - "_tpl": "55d355e64bdc2d962f8b4569", - "parentId": "66265a2345b89134640ccca9", + "_id": "6639ee0e387309934807a4a4", + "_tpl": "59bfe68886f7746004266202", + "parentId": "6639ee0e387309934807a4a2", "slotId": "mod_reciever" }, { - "_id": "66265a2345b89134640cccac", - "_tpl": "55d35ee94bdc2d61338b4568", - "parentId": "66265a2345b89134640cccab", + "_id": "6639ee0e387309934807a4a5", + "_tpl": "55d3632e4bdc2d972f8b4569", + "parentId": "6639ee0e387309934807a4a4", "slotId": "mod_barrel" }, { - "_id": "66265a2345b89134640cccad", - "_tpl": "63d3ce281fe77d0f2801859e", - "parentId": "66265a2345b89134640cccac", + "_id": "6639ee0e387309934807a4a6", + "_tpl": "56eabcd4d2720b66698b4574", + "parentId": "6639ee0e387309934807a4a5", "slotId": "mod_gas_block" }, { - "_id": "66265a2345b89134640cccae", - "_tpl": "5cf6937cd7f00c056c53fb39", - "parentId": "66265a2345b89134640cccac", + "_id": "6639ee0e387309934807a4a7", + "_tpl": "626667e87379c44d557b7550", + "parentId": "6639ee0e387309934807a4a5", "slotId": "mod_muzzle" }, { - "_id": "66265a2345b89134640cccaf", - "_tpl": "5c78f2612e221600114c9f0d", - "parentId": "66265a2345b89134640cccab", + "_id": "6639ee0e387309934807a4a8", + "_tpl": "5c9a25172e2216000f20314e", + "parentId": "6639ee0e387309934807a4a4", "slotId": "mod_handguard" }, { - "_id": "66265a2345b89134640cccb0", - "_tpl": "5c78f2882e22165df16b832e", - "parentId": "66265a2345b89134640cccaf", - "slotId": "mod_muzzle" + "_id": "6639ee0e387309934807a4a9", + "_tpl": "638f2003bbd47aeb9e0ff637", + "parentId": "6639ee0e387309934807a4a8", + "slotId": "mod_handguard" }, { - "_id": "66265a2345b89134640cccb1", - "_tpl": "651a8bf3a8520e48047bf708", - "parentId": "66265a2345b89134640cccaf", + "_id": "6639ee0e387309934807a4aa", + "_tpl": "591af28e86f77414a27a9e1d", + "parentId": "6639ee0e387309934807a4a9", "slotId": "mod_foregrip" }, { - "_id": "66265a2345b89134640cccb2", - "_tpl": "56def37dd2720bec348b456a", - "parentId": "66265a2345b89134640cccaf", + "_id": "6639ee0e387309934807a4ab", + "_tpl": "6267c6396b642f77f56f5c1c", + "parentId": "6639ee0e387309934807a4a8", "slotId": "mod_tactical_001" }, { - "_id": "66265a2345b89134640cccb3", + "_id": "6639ee0e387309934807a4ac", + "_tpl": "57d17c5e2459775a5c57d17d", + "parentId": "6639ee0e387309934807a4ab", + "slotId": "mod_flashlight" + }, + { + "_id": "6639ee0e387309934807a4ad", "_tpl": "5c17804b2e2216152006c02f", - "parentId": "66265a2345b89134640cccaf", + "parentId": "6639ee0e387309934807a4a8", "slotId": "mod_sight_front" }, { - "_id": "66265a2345b89134640cccb4", - "_tpl": "5c1780312e221602b66cc189", - "parentId": "66265a2345b89134640cccab", - "slotId": "mod_sight_rear" + "_id": "6639ee0e387309934807a4ae", + "_tpl": "5649a2464bdc2d91118b45a8", + "parentId": "6639ee0e387309934807a4a8", + "slotId": "mod_scope" }, { - "_id": "66265a2345b89134640cccb5", - "_tpl": "5a33b652c4a28232996e407c", - "parentId": "66265a2345b89134640cccab", + "_id": "6639ee0e387309934807a4af", + "_tpl": "58d2664f86f7747fec5834f6", + "parentId": "6639ee0e387309934807a4ae", "slotId": "mod_scope" }, { - "_id": "66265a2345b89134640cccb6", - "_tpl": "5a32aa8bc4a2826c6e06d737", - "parentId": "66265a2345b89134640cccb5", + "_id": "6639ee0e387309934807a4b0", + "_tpl": "58d268fc86f774111273f8c2", + "parentId": "6639ee0e387309934807a4af", + "slotId": "mod_scope" + }, + { + "_id": "6639ee0e387309934807a4b1", + "_tpl": "6478641c19d732620e045e17", + "parentId": "6639ee0e387309934807a4a4", "slotId": "mod_scope" }, { - "_id": "66265a2345b89134640cccb7", - "_tpl": "627254cc9c563e6e442c398f", - "parentId": "66265a2345b89134640ccca9", + "_id": "6639ee0e387309934807a4b2", + "_tpl": "5c1780312e221602b66cc189", + "parentId": "6639ee0e387309934807a4a4", + "slotId": "mod_sight_rear" + }, + { + "_id": "6639ee0e387309934807a4b3", + "_tpl": "638de3603a1a4031d8260b8c", + "parentId": "6639ee0e387309934807a4a2", "slotId": "mod_stock" }, { - "_id": "66265a2345b89134640cccb8", + "_id": "6639ee0e387309934807a4b4", + "_tpl": "6529370c405a5f51dd023db8", + "parentId": "6639ee0e387309934807a4b3", + "slotId": "mod_stock_000" + }, + { + "_id": "6639ee0e387309934807a4b5", "_tpl": "5f633ff5c444ce7e3c30a006", - "parentId": "66265a2345b89134640ccca9", + "parentId": "6639ee0e387309934807a4a2", "slotId": "mod_charge" }, { - "_id": "66265a2345b89134640cccb9", - "_tpl": "5c6d46132e221601da357d56", - "parentId": "66265a2345b89134640ccca9", + "_id": "6639ee0e387309934807a4b6", + "_tpl": "55802d5f4bdc2dac148b458e", + "parentId": "6639ee0e387309934807a4a2", "slotId": "mod_magazine" } ] }, { - "_id": "coltm4a1hhs1000000000001", - "appendName": "5c07dd120db834001c39092d ShortName", + "_id": "coltm4a1reapir0000000001", + "appendName": "5a1eaa87fcdbcb001865f75e ShortName", "_items": [ { - "_id": "66265a3745b89134640cccce", - "_tpl": "5447a9cd4bdc2dbd208b4567" + "_id": "6639ee21387309934807ad97", + "_tpl": "5447a9cd4bdc2dbd208b4567", + "upd": { + "Repairable": { + "Durability": 100, + "MaxDurability": 100 + }, + "StackObjectsCount": 10000 + } }, { - "_id": "66265a3745b89134640ccccf", - "_tpl": "602e71bd53a60014f9705bfa", - "parentId": "66265a3745b89134640cccce", + "_id": "6639ee21387309934807ad98", + "_tpl": "59db3a1d86f77429e05b4e92", + "parentId": "6639ee21387309934807ad97", "slotId": "mod_pistol_grip" }, { - "_id": "66265a3745b89134640cccd0", - "_tpl": "55d355e64bdc2d962f8b4569", - "parentId": "66265a3745b89134640cccce", + "_id": "6639ee21387309934807ad99", + "_tpl": "59bfe68886f7746004266202", + "parentId": "6639ee21387309934807ad97", "slotId": "mod_reciever" }, { - "_id": "66265a3745b89134640cccd1", + "_id": "6639ee21387309934807ad9a", "_tpl": "55d35ee94bdc2d61338b4568", - "parentId": "66265a3745b89134640cccd0", + "parentId": "6639ee21387309934807ad99", "slotId": "mod_barrel" }, { - "_id": "66265a3745b89134640cccd2", + "_id": "6639ee21387309934807ad9b", "_tpl": "56eabcd4d2720b66698b4574", - "parentId": "66265a3745b89134640cccd1", + "parentId": "6639ee21387309934807ad9a", "slotId": "mod_gas_block" }, { - "_id": "66265a3745b89134640cccd3", - "_tpl": "62669bccdb9ebb4daa44cd14", - "parentId": "66265a3745b89134640cccd1", + "_id": "6639ee21387309934807ad9c", + "_tpl": "64943b74e9998d641b0412ed", + "parentId": "6639ee21387309934807ad9a", "slotId": "mod_muzzle" }, { - "_id": "66265a3745b89134640cccd4", + "_id": "6639ee21387309934807ad9d", "_tpl": "588b56d02459771481110ae2", - "parentId": "66265a3745b89134640cccd0", + "parentId": "6639ee21387309934807ad99", "slotId": "mod_handguard" }, { - "_id": "66265a3745b89134640cccd5", + "_id": "6639ee21387309934807ad9e", "_tpl": "6396aaa9a52ace83df0840ab", - "parentId": "66265a3745b89134640cccd4", + "parentId": "6639ee21387309934807ad9d", "slotId": "mod_handguard" }, { - "_id": "66265a3745b89134640cccd6", - "_tpl": "5c7fc87d2e221644f31c0298", - "parentId": "66265a3745b89134640cccd5", + "_id": "6639ee21387309934807ad9f", + "_tpl": "59f8a37386f7747af3328f06", + "parentId": "6639ee21387309934807ad9e", "slotId": "mod_foregrip" }, { - "_id": "66265a3745b89134640cccd7", + "_id": "6639ee21387309934807ada0", "_tpl": "644a3df63b0b6f03e101e065", - "parentId": "66265a3745b89134640cccd4", + "parentId": "6639ee21387309934807ad9d", "slotId": "mod_tactical" }, { - "_id": "66265a3745b89134640cccd8", + "_id": "6639ee21387309934807ada1", "_tpl": "5c17804b2e2216152006c02f", - "parentId": "66265a3745b89134640cccd4", + "parentId": "6639ee21387309934807ad9d", "slotId": "mod_sight_front" }, { - "_id": "66265a3745b89134640cccd9", - "_tpl": "5c07dd120db834001c39092d", - "parentId": "66265a3745b89134640cccd0", + "_id": "6639ee21387309934807ada2", + "_tpl": "5c1780312e221602b66cc189", + "parentId": "6639ee21387309934807ad99", + "slotId": "mod_sight_rear" + }, + { + "_id": "6639ee21387309934807ada3", + "_tpl": "5a1ead28fcdbcb001912fa9f", + "parentId": "6639ee21387309934807ad99", "slotId": "mod_scope" }, { - "_id": "66265a3745b89134640cccda", - "_tpl": "5c1780312e221602b66cc189", - "parentId": "66265a3745b89134640cccd0", - "slotId": "mod_sight_rear" + "_id": "6639ee21387309934807ada4", + "_tpl": "5a1eaa87fcdbcb001865f75e", + "parentId": "6639ee21387309934807ada3", + "slotId": "mod_scope" + }, + { + "_id": "6639ee21387309934807ada5", + "_tpl": "5a1eacb3fcdbcb09800872be", + "parentId": "6639ee21387309934807ada4", + "slotId": "mod_tactical" }, { - "_id": "66265a3745b89134640cccdb", + "_id": "6639ee21387309934807ada6", "_tpl": "5c793fb92e221644f31bfb64", - "parentId": "66265a3745b89134640cccce", + "parentId": "6639ee21387309934807ad97", "slotId": "mod_stock" }, { - "_id": "66265a3745b89134640cccdc", - "_tpl": "6516e971a3d4c6497930b450", - "parentId": "66265a3745b89134640cccdb", + "_id": "6639ee21387309934807ada7", + "_tpl": "6516e91f609aaf354b34b3e2", + "parentId": "6639ee21387309934807ada6", "slotId": "mod_stock_000" }, { - "_id": "66265a3745b89134640cccdd", - "_tpl": "6516e9bc5901745209404287", - "parentId": "66265a3745b89134640cccdc", + "_id": "6639ee21387309934807ada8", + "_tpl": "6516e9d7e239bd0c487e3766", + "parentId": "6639ee21387309934807ada7", "slotId": "mod_stock_000" }, { - "_id": "66265a3745b89134640cccde", + "_id": "6639ee21387309934807ada9", "_tpl": "5ea16d4d5aad6446a939753d", - "parentId": "66265a3745b89134640cccce", + "parentId": "6639ee21387309934807ad97", "slotId": "mod_charge" }, { - "_id": "66265a3745b89134640cccdf", - "_tpl": "5aaa5dfee5b5b000140293d3", - "parentId": "66265a3745b89134640cccce", + "_id": "6639ee21387309934807adaa", + "_tpl": "544a37c44bdc2d25388b4567", + "parentId": "6639ee21387309934807ad97", "slotId": "mod_magazine" } ] @@ -1946,179 +2031,197 @@ "appendName": "6086b5731246154cad35d6c7 ShortName", "_items": [ { - "_id": "66265a2345b89134640cccbb", + "_id": "6639ee0e387309934807a4be", "_tpl": "576165642459773c7a400233" }, { - "_id": "66265a2345b89134640cccbc", + "_id": "6639ee0e387309934807a4bf", "_tpl": "6086b5731246154cad35d6c7", - "parentId": "66265a2345b89134640cccbb", + "parentId": "6639ee0e387309934807a4be", "slotId": "mod_handguard" }, { - "_id": "66265a2345b89134640cccbd", + "_id": "6639ee0e387309934807a4c0", "_tpl": "6086b5392535c57a13424d70", - "parentId": "66265a2345b89134640cccbc", + "parentId": "6639ee0e387309934807a4bf", "slotId": "mod_mount_001" }, { - "_id": "66265a2345b89134640cccbe", + "_id": "6639ee0e387309934807a4c1", "_tpl": "57d17e212459775a1179a0f5", - "parentId": "66265a2345b89134640cccbd", + "parentId": "6639ee0e387309934807a4c0", "slotId": "mod_tactical" }, { - "_id": "66265a2345b89134640cccbf", + "_id": "6639ee0e387309934807a4c2", "_tpl": "59d790f486f77403cb06aec6", - "parentId": "66265a2345b89134640cccbe", + "parentId": "6639ee0e387309934807a4c1", "slotId": "mod_flashlight" }, { - "_id": "66265a2345b89134640cccc0", + "_id": "6639ee0e387309934807a4c3", "_tpl": "6087e663132d4d12c81fd96b", - "parentId": "66265a2345b89134640cccbb", + "parentId": "6639ee0e387309934807a4be", "slotId": "mod_pistol_grip" }, { - "_id": "66265a2345b89134640cccc1", - "_tpl": "58272d7f2459774f6311ddfd", - "parentId": "66265a2345b89134640cccbb", + "_id": "6639ee0e387309934807a4c4", + "_tpl": "59fb137a86f7740adb646af1", + "parentId": "6639ee0e387309934807a4be", "slotId": "mod_muzzle" }, { - "_id": "66265a2345b89134640cccc2", + "_id": "6639ee0e387309934807a4c5", "_tpl": "57616c112459773cce774d66", - "parentId": "66265a2345b89134640cccbb", + "parentId": "6639ee0e387309934807a4be", "slotId": "mod_reciever" }, { - "_id": "66265a2345b89134640cccc3", + "_id": "6639ee0e387309934807a4c6", "_tpl": "58272b842459774abc128d50", - "parentId": "66265a2345b89134640cccbb", + "parentId": "6639ee0e387309934807a4be", "slotId": "mod_sight_rear" }, { - "_id": "66265a2345b89134640cccc4", - "_tpl": "5d2da1e948f035477b1ce2ba", - "parentId": "66265a2345b89134640cccc3", + "_id": "6639ee0e387309934807a4c7", + "_tpl": "655f13e0a246670fb0373245", + "parentId": "6639ee0e387309934807a4c6", "slotId": "mod_scope" }, { - "_id": "66265a2345b89134640cccc5", + "_id": "6639ee0e387309934807a4c8", "_tpl": "5ac78eaf5acfc4001926317a", - "parentId": "66265a2345b89134640cccbb", + "parentId": "6639ee0e387309934807a4be", "slotId": "mod_stock" }, { - "_id": "66265a2345b89134640cccc6", + "_id": "6639ee0e387309934807a4c9", "_tpl": "5b222d405acfc400153af4fe", - "parentId": "66265a2345b89134640cccc5", + "parentId": "6639ee0e387309934807a4c8", "slotId": "mod_stock" }, { - "_id": "66265a2345b89134640cccc7", + "_id": "6639ee0e387309934807a4ca", "_tpl": "5a0c59791526d8dba737bba7", - "parentId": "66265a2345b89134640cccc6", + "parentId": "6639ee0e387309934807a4c9", "slotId": "mod_stock_000" }, { - "_id": "66265a2345b89134640cccc8", + "_id": "6639ee0e387309934807a4cb", "_tpl": "5cf8f3b0d7f00c00217872ef", - "parentId": "66265a2345b89134640cccbb", + "parentId": "6639ee0e387309934807a4be", "slotId": "mod_magazine" }, { - "_id": "66265a2345b89134640cccc9", + "_id": "6639ee0e387309934807a4cc", "_tpl": "6130ca3fd92c473c77020dbd", - "parentId": "66265a2345b89134640cccbb", + "parentId": "6639ee0e387309934807a4be", "slotId": "mod_charge" } ] }, { - "_id": "aks74uzenitco00000000001", - "appendName": "5bbf1c1c88a45017144d28c5", + "_id": "aks74uwaffle000000000001", + "appendName": "615d8f8567085e45ef1409ca ShortName", "_items": [ { - "_id": "66265a4845b89134640cce2b", + "_id": "6639ee2d387309934807b467", "_tpl": "57dc2fa62459775949412633" }, { - "_id": "66265a4845b89134640cce2c", - "_tpl": "5f6341043ada5942720e2dc5", - "parentId": "66265a4845b89134640cce2b", + "_id": "6639ee2d387309934807b468", + "_tpl": "5649ae4a4bdc2d1b2b8b4588", + "parentId": "6639ee2d387309934807b467", "slotId": "mod_pistol_grip" }, { - "_id": "66265a4845b89134640cce2d", + "_id": "6639ee2d387309934807b469", "_tpl": "59d36a0086f7747e673f3946", - "parentId": "66265a4845b89134640cce2b", + "parentId": "6639ee2d387309934807b467", "slotId": "mod_gas_block" }, { - "_id": "66265a4845b89134640cce2e", + "_id": "6639ee2d387309934807b46a", "_tpl": "57ffa9f4245977728561e844", - "parentId": "66265a4845b89134640cce2d", + "parentId": "6639ee2d387309934807b469", "slotId": "mod_handguard" }, { - "_id": "66265a4845b89134640cce2f", + "_id": "6639ee2d387309934807b46b", "_tpl": "57ffaea724597779f52b3a4d", - "parentId": "66265a4845b89134640cce2e", + "parentId": "6639ee2d387309934807b46a", "slotId": "mod_tactical_000" }, { - "_id": "66265a4845b89134640cce30", + "_id": "6639ee2d387309934807b46c", + "_tpl": "57d17e212459775a1179a0f5", + "parentId": "6639ee2d387309934807b46b", + "slotId": "mod_tactical" + }, + { + "_id": "6639ee2d387309934807b46d", + "_tpl": "57d17c5e2459775a5c57d17d", + "parentId": "6639ee2d387309934807b46c", + "slotId": "mod_flashlight" + }, + { + "_id": "6639ee2d387309934807b46e", "_tpl": "5c5952732e2216398b5abda2", - "parentId": "66265a4845b89134640cce2f", + "parentId": "6639ee2d387309934807b46b", "slotId": "mod_scope" }, { - "_id": "66265a4845b89134640cce31", - "_tpl": "558032614bdc2de7118b4585", - "parentId": "66265a4845b89134640cce2e", + "_id": "6639ee2d387309934807b46f", + "_tpl": "59fc48e086f77463b1118392", + "parentId": "6639ee2d387309934807b46a", "slotId": "mod_foregrip" }, { - "_id": "66265a4845b89134640cce32", + "_id": "6639ee2d387309934807b470", "_tpl": "59ecc28286f7746d7a68aa8c", - "parentId": "66265a4845b89134640cce2b", + "parentId": "6639ee2d387309934807b467", "slotId": "mod_stock" }, { - "_id": "66265a4845b89134640cce33", + "_id": "6639ee2d387309934807b471", "_tpl": "59ecc3dd86f7746dc827481c", - "parentId": "66265a4845b89134640cce32", + "parentId": "6639ee2d387309934807b470", "slotId": "mod_stock" }, { - "_id": "66265a4845b89134640cce34", - "_tpl": "593d493f86f7745e6b2ceb22", - "parentId": "66265a4845b89134640cce2b", + "_id": "6639ee2d387309934807b472", + "_tpl": "615d8f5dd92c473c770212ef", + "parentId": "6639ee2d387309934807b467", + "slotId": "mod_muzzle" + }, + { + "_id": "6639ee2d387309934807b473", + "_tpl": "615d8f8567085e45ef1409ca", + "parentId": "6639ee2d387309934807b472", "slotId": "mod_muzzle" }, { - "_id": "66265a4845b89134640cce35", + "_id": "6639ee2d387309934807b474", "_tpl": "5aaa4194e5b5b055d06310a5", - "parentId": "66265a4845b89134640cce2b", + "parentId": "6639ee2d387309934807b467", "slotId": "mod_magazine" }, { - "_id": "66265a4845b89134640cce36", + "_id": "6639ee2d387309934807b475", "_tpl": "655cb6b5d680a544f30607fa", - "parentId": "66265a4845b89134640cce2b", + "parentId": "6639ee2d387309934807b467", "slotId": "mod_reciever" }, { - "_id": "66265a4845b89134640cce37", - "_tpl": "615d8d878004cc50514c3233", - "parentId": "66265a4845b89134640cce36", + "_id": "6639ee2d387309934807b476", + "_tpl": "5c064c400db834001d23f468", + "parentId": "6639ee2d387309934807b475", "slotId": "mod_scope" }, { - "_id": "66265a4845b89134640cce38", - "_tpl": "616442e4faa1272e43152193", - "parentId": "66265a4845b89134640cce37", + "_id": "6639ee2d387309934807b477", + "_tpl": "64785e7c19d732620e045e15", + "parentId": "6639ee2d387309934807b476", "slotId": "mod_scope" } ] From 905de62d9a3fc357d4ed8e7f5e1b19bc5a20a96a Mon Sep 17 00:00:00 2001 From: Razzmatazz Date: Tue, 7 May 2024 07:49:19 -0500 Subject: [PATCH 2/3] fix error --- src/tarkov-data-manager/jobs/update-presets.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tarkov-data-manager/jobs/update-presets.js b/src/tarkov-data-manager/jobs/update-presets.js index 14bc7e90..1c0e256c 100644 --- a/src/tarkov-data-manager/jobs/update-presets.js +++ b/src/tarkov-data-manager/jobs/update-presets.js @@ -395,7 +395,7 @@ class UpdatePresetsJob extends DataJob { // make sure we don't include any disabled presets this.presetsData = Object.keys(this.presetsData).reduce((all, presetId) => { //console.log(`${presetId} ${localItems.has(presetId)} ${localItems.get(presetId)?.types.includes('disabled')}`); - if (localItems.has(presetId) && !localItems.get(presetId).types.includes('disabled')) { + if (localItems.has(presetId) && !localItems.get(presetId).types?.includes('disabled')) { all[presetId] = this.presetsData[presetId]; } return all; From b6c8da9fc23fd8931667bd1ca6ef64eca27e6baa Mon Sep 17 00:00:00 2001 From: Razzmatazz Date: Wed, 8 May 2024 08:12:06 -0500 Subject: [PATCH 3/3] better batch presets --- .../jobs/update-presets.js | 15 ++--- .../modules/remote-data.js | 15 ++--- .../modules/scanner-api.js | 57 ++++++------------- 3 files changed, 30 insertions(+), 57 deletions(-) diff --git a/src/tarkov-data-manager/jobs/update-presets.js b/src/tarkov-data-manager/jobs/update-presets.js index 1c0e256c..f8688d77 100644 --- a/src/tarkov-data-manager/jobs/update-presets.js +++ b/src/tarkov-data-manager/jobs/update-presets.js @@ -103,7 +103,7 @@ class UpdatePresetsJob extends DataJob { bsgCategoryId: baseItem._parent, types: ['preset'], default: preset._encyclopedia === firstItem.id, - _items: preset._items, + items: preset._items.filter(i => items[i._tpl]._parent !== '65649eb40bf0ed77b8044453'), // skip built-in armor parts containsItems: [{ item: firstItem, count: 1 @@ -114,16 +114,11 @@ class UpdatePresetsJob extends DataJob { // add parts to preset // check if any are flea banned - // skip built-in armor parts - for (let i = 1; i < preset._items.length; i++) { - const part = preset._items[i]; + for (let i = 1; i < presetData.items.length; i++) { + const part = presetData.items[i]; if (!items[part._tpl]._props.CanSellOnRagfair) { presetData.noFlea = true; } - // skip built-in armor parts - if (items[part._tpl]._parent === '65649eb40bf0ed77b8044453') { - continue; - } if (items[part._tpl]._parent !== '644120aa86ffbe10ee032b6f') { presetData.armorOnly = false; } @@ -213,7 +208,7 @@ class UpdatePresetsJob extends DataJob { count: 1 } ], - _items: [ + items: [ { _id: '000000000000000000000001', _tpl: bearTag._id, @@ -315,7 +310,7 @@ class UpdatePresetsJob extends DataJob { normalized_name: p.normalized_name, width: p.width, height: p.height, - properties: {backgroundColor: p.backgroundColor, _items: p._items}, + properties: {backgroundColor: p.backgroundColor, items: p.items}, }).then(results => { /*if (results.affectedRows > 0) { this.logger.log(`${p.name} updated`); diff --git a/src/tarkov-data-manager/modules/remote-data.js b/src/tarkov-data-manager/modules/remote-data.js index 0b2746be..9336eacb 100644 --- a/src/tarkov-data-manager/modules/remote-data.js +++ b/src/tarkov-data-manager/modules/remote-data.js @@ -304,7 +304,7 @@ const methods = { value = JSON.stringify(value); } if (currentValue !== value) { - changeValues[property] = value; + changeValues[property] = value; } } if (Object.keys(changeValues).length === 0) { @@ -314,17 +314,18 @@ const methods = { const fieldNames = []; const placeHolderValues = []; for (const property in changeValues) { - if (property === 'properties') { - currentItemData[property] = properties[property]; - } else { - currentItemData[property] = changeValues[property]; - } fieldNames.push(`${property} = ?`); placeHolderValues.push(changeValues[property]) } placeHolderValues.push(id); return query(`UPDATE item_data SET ${fieldNames.join(', ')} WHERE id = ?`, placeHolderValues).then(result => { - myData.set(id, currentItemData); + for (const property in changeValues) { + if (property === 'properties') { + currentItemData[property] = properties[property]; + } else { + currentItemData[property] = changeValues[property]; + } + } return result; }); }, diff --git a/src/tarkov-data-manager/modules/scanner-api.js b/src/tarkov-data-manager/modules/scanner-api.js index 087dcb4f..59c273d5 100644 --- a/src/tarkov-data-manager/modules/scanner-api.js +++ b/src/tarkov-data-manager/modules/scanner-api.js @@ -100,59 +100,32 @@ const getOptions = (options, user) => { }; const queryResultToBatchItem = item => { - let contains = item.contains ? item.contains.split(',') : []; + let contains = []; let itemPresets = []; if (presets.byBase[item.id]) { itemPresets = presets.byBase[item.id].map(preset => { - if (preset.default) { - contains = preset.containsItems.reduce((parts, currentItem) => { - parts.push({ - id: currentItem.item.id, - name: presets.locale.en[currentItem.item.name], - count: currentItem.count, - }); - return parts; - }, []); - } return { id: preset.id, - name: preset.name, - shortName: preset.shortName, + name: presets.locale.en[preset.name], + shortName: presets.locale.en[preset.shortName], types: preset.types, backgroundColor: preset.backgroundColor, width: preset.width, height: preset.height, default: preset.default, - contains: preset.containsItems.reduce((parts, currentItem) => { - parts.push({ - id: currentItem.item.id, - name: currentItem.item.name, - count: currentItem.count, - }); - return parts; - }, []), + items: preset.items, } }); - } else if (presets.presets[item.id]) { - contains = presets.presets[item.id].containsItems.reduce((parts, currentItem) => { - parts.push({ - id: currentItem.item.id, - name: currentItem.item.name, - count: currentItem.count, - }); - return parts; - }, []); } - const backgroundColor = item.properties?.backgroundColor ? item.properties.backgroundColor : 'default'; return { id: item.id, name: String(item.name), shortName: String(item.short_name), types: item.types ? item.types.split(',').map(dashCase => {return dashToCamelCase(dashCase);}) : [], - backgroundColor: backgroundColor, + backgroundColor: item.properties?.backgroundColor ? item.properties.backgroundColor : 'default', width: item.width ? item.width : 1, height: item.height ? item.height : 1, - contains: contains, + items: contains, matchIndex: item.match_index, needsBaseImage: item.needs_base_image ? true : false, needsImage: item.needs_image ? true : false, @@ -179,13 +152,17 @@ const queryResultToBatchItem = item => { needs8xImage: false, types: [ 'gun', 'wearable' ], contains: [ - '564ca99c4bdc2d16268b4589', - '57dc324a24597759501edc20', - '57dc32dc245977596d4ef3d3', - '57dc334d245977597164366f', - '57dc347d245977596754e7a1', - '57e3dba62459770f0c32322b', - '59d36a0086f7747e673f3946' + { + _id: '61a9f9234e42d705e3133837', + _tpl: '57dc2fa62459775949412633', + }, + { + _id: '61a9f9234e42d705e3133838', + _tpl: '57e3dba62459770f0c32322b', + parentId: '61a9f9234e42d705e3133837', + slotId: 'mod_pistol_grip' + }, + ... ] } */ // relevant options: limitItem, imageOnly, batchSize, offersFrom