Merge pull request #531 from the-hideout/fix-pen-chance

fix pen chance to not be null
the-hideout · Jun 13, 2024 · 852019e · 852019e
2 parents ec8242c + 5eab9b8
commit 852019e
Show file tree

Hide file tree

Showing 7 changed files with 764 additions and 191 deletions.
diff --git a/src/tarkov-data-manager/data/changed_quests.json b/src/tarkov-data-manager/data/changed_quests.json
@@ -45,7 +45,7 @@
                 "name": "The Survivalist Path - Zhivchik"
             }
         ],
-        "objectivesAdded": [
+        "__objectivesAdded": [
             {
                 "id": "65b10c6a8511b7ef8694e060",
                 "description": "65b10c6a8511b7ef8694e060",
@@ -1281,129 +1281,5 @@
                 "zoneKeys": ["bunker1"]
             }
         }
-    },
-    "5c12452c86f7744b83469073": {
-        "name": "Perfect Mediator",
-        "objectivesAdded": [
-            {
-                "id": "65e08db1a97b2cd4e452432d",
-                "description": "65e08db1a97b2cd4e452432d",
-                "type": "traderLevel",
-                "count": 4,
-                "optional": false,
-                "locationNames": [],
-                "map_ids": [],
-                "zoneNames": [],
-                "trader_id": "5c0647fdd443bc2504c2d371",
-                "trader_name": "Jaeger",
-                "level": 4,
-                "zones": []
-            }
-        ]
-    },
-    "5c0d4c12d09282029f539173": {
-        "name": "Peacekeeping Mission",
-        "objectivesAdded": [
-            {
-                "id": "63aec4fe6d6c3377e64b9f39",
-                "description": "63aec4fe6d6c3377e64b9f39",
-                "type": "shoot",
-                "count": 12,
-                "optional": false,
-                "locationNames": [
-                    "5714dc692459777137212e12 Name"
-                ],
-                "map_ids": [
-                    "5714dc692459777137212e12"
-                ],
-                "zoneNames": [],
-                "target": "Savage",
-                "shotType": "kill",
-                "bodyParts": [],
-                "usingWeapon": [
-                    {
-                        "id": "5447a9cd4bdc2dbd208b4567",
-                        "name": "Colt M4A1 5.56x45 assault rifle"
-                    }
-                ],
-                "usingWeaponMods": [],
-                "distance": {
-                    "compareMethod": ">=",
-                    "value": 0
-                },
-                "timeFromHour": 0,
-                "timeUntilHour": 0,
-                "wearing": [
-                    [
-                        {
-                            "id": "5aa7d03ae5b5b00016327db5",
-                            "name": "UNTAR helmet"
-                        },
-                        {
-                            "id": "5ab8e4ed86f7742d8e50c7fa",
-                            "name": "MF-UNTAR body armor"
-                        }
-                    ]
-                ],
-                "notWearing": [],
-                "healthEffect": null,
-                "enemyHealthEffect": null,
-                "targetNames": [
-                    "Savage"
-                ],
-                "playerHealthEffect": null,
-                "zones": []
-            },
-            {
-                "id": "65e08aa9f5879b2586d5fd4c",
-                "description": "65e08aa9f5879b2586d5fd4c",
-                "type": "shoot",
-                "count": 12,
-                "optional": false,
-                "locationNames": [
-                    "65b8d6f5cdde2479cb2a3125 Name"
-                ],
-                "map_ids": [
-                    "65b8d6f5cdde2479cb2a3125"
-                ],
-                "zoneNames": [],
-                "target": "Savage",
-                "shotType": "kill",
-                "bodyParts": [],
-                "usingWeapon": [
-                    {
-                        "id": "5447a9cd4bdc2dbd208b4567",
-                        "name": "Colt M4A1 5.56x45 assault rifle"
-                    }
-                ],
-                "usingWeaponMods": [],
-                "distance": {
-                    "compareMethod": ">=",
-                    "value": 0
-                },
-                "timeFromHour": 0,
-                "timeUntilHour": 0,
-                "wearing": [
-                    [
-                        {
-                            "id": "5aa7d03ae5b5b00016327db5",
-                            "name": "UNTAR helmet"
-                        },
-                        {
-                            "id": "5ab8e4ed86f7742d8e50c7fa",
-                            "name": "MF-UNTAR body armor"
-                        }
-                    ]
-                ],
-                "notWearing": [],
-                "healthEffect": null,
-                "enemyHealthEffect": null,
-                "targetNames": [
-                    "Savage"
-                ],
-                "playerHealthEffect": null,
-                "zones": []
-            }
-        ]
     }
 }
diff --git a/src/tarkov-data-manager/data/manual_presets.json b/src/tarkov-data-manager/data/manual_presets.json
@@ -564,7 +564,7 @@
         ]
     },
     {
-        "_id": "fnfivesevenfdeironsights",
+        "_id": "fnfivesevenfdeironsight0",
         "appendName": "55818ac54bdc2d5b648b456e Name",
         "_items": [
             {
@@ -1748,7 +1748,7 @@
         ]
     },
     {
-        "_id": "rpk166L26000000000000001",
+        "_id": "rpk166l26000000000000001",
         "appendName": "55d481904bdc2d8c2f8b456a ShortName",
         "_items": [
             {