Merge branch 'master' of https://dev.sp-tarkov.com/SPT/Server into 310-dev

2025-02-13 09:50:43 -05:00 · 2024-07-06 15:01:57 +01:00 · 2024-07-06 15:01:57 +01:00 · 47edbbcd98
commit 47edbbcd98
parent ca52f6d549 2c57f2d1a7
47 changed files with 2451 additions and 2657 deletions
--- a/project/assets/configs/quest.json
+++ b/project/assets/configs/quest.json
@ -161,6 +161,13 @@
 			"season": "None",
 			"startTimestamp": 1341615600000,
            "endTimestamp": "",
+            "yearly": false
+		},
+		"6658a15615cbb1b2c6014d5b": {
+			"name": "Hustle2",
+			"season": "None",
+			"startTimestamp": 1341615600000,
+            "endTimestamp": "",
            "yearly": false
 		}
    },
--- a/project/assets/database/locations/bigmap/looseLoot.json
+++ b/project/assets/database/locations/bigmap/looseLoot.json
--- a/project/assets/database/locations/bigmap/staticAmmo.json
+++ b/project/assets/database/locations/bigmap/staticAmmo.json
--- a/project/assets/database/locations/bigmap/staticContainers.json
+++ b/project/assets/database/locations/bigmap/staticContainers.json
--- a/project/assets/database/locations/bigmap/staticLoot.json
+++ b/project/assets/database/locations/bigmap/staticLoot.json
--- a/project/assets/database/locations/factory4_day/looseLoot.json
+++ b/project/assets/database/locations/factory4_day/looseLoot.json
--- a/project/assets/database/locations/factory4_day/staticAmmo.json
+++ b/project/assets/database/locations/factory4_day/staticAmmo.json
--- a/project/assets/database/locations/factory4_day/staticContainers.json
+++ b/project/assets/database/locations/factory4_day/staticContainers.json
--- a/project/assets/database/locations/factory4_day/staticLoot.json
+++ b/project/assets/database/locations/factory4_day/staticLoot.json
--- a/project/assets/database/locations/interchange/looseLoot.json
+++ b/project/assets/database/locations/interchange/looseLoot.json
--- a/project/assets/database/locations/interchange/staticAmmo.json
+++ b/project/assets/database/locations/interchange/staticAmmo.json
--- a/project/assets/database/locations/interchange/staticContainers.json
+++ b/project/assets/database/locations/interchange/staticContainers.json
--- a/project/assets/database/locations/interchange/staticLoot.json
+++ b/project/assets/database/locations/interchange/staticLoot.json
--- a/project/assets/database/locations/laboratory/looseLoot.json
+++ b/project/assets/database/locations/laboratory/looseLoot.json
--- a/project/assets/database/locations/laboratory/staticAmmo.json
+++ b/project/assets/database/locations/laboratory/staticAmmo.json
--- a/project/assets/database/locations/laboratory/staticContainers.json
+++ b/project/assets/database/locations/laboratory/staticContainers.json
--- a/project/assets/database/locations/laboratory/staticLoot.json
+++ b/project/assets/database/locations/laboratory/staticLoot.json
--- a/project/assets/database/locations/lighthouse/looseLoot.json
+++ b/project/assets/database/locations/lighthouse/looseLoot.json
--- a/project/assets/database/locations/lighthouse/staticAmmo.json
+++ b/project/assets/database/locations/lighthouse/staticAmmo.json
--- a/project/assets/database/locations/lighthouse/staticContainers.json
+++ b/project/assets/database/locations/lighthouse/staticContainers.json
--- a/project/assets/database/locations/lighthouse/staticLoot.json
+++ b/project/assets/database/locations/lighthouse/staticLoot.json
--- a/project/assets/database/locations/rezervbase/looseLoot.json
+++ b/project/assets/database/locations/rezervbase/looseLoot.json
--- a/project/assets/database/locations/rezervbase/staticAmmo.json
+++ b/project/assets/database/locations/rezervbase/staticAmmo.json
--- a/project/assets/database/locations/rezervbase/staticContainers.json
+++ b/project/assets/database/locations/rezervbase/staticContainers.json
--- a/project/assets/database/locations/rezervbase/staticLoot.json
+++ b/project/assets/database/locations/rezervbase/staticLoot.json
--- a/project/assets/database/locations/sandbox/looseLoot.json
+++ b/project/assets/database/locations/sandbox/looseLoot.json
--- a/project/assets/database/locations/sandbox/staticAmmo.json
+++ b/project/assets/database/locations/sandbox/staticAmmo.json
--- a/project/assets/database/locations/sandbox/staticContainers.json
+++ b/project/assets/database/locations/sandbox/staticContainers.json
--- a/project/assets/database/locations/sandbox/staticLoot.json
+++ b/project/assets/database/locations/sandbox/staticLoot.json
--- a/project/assets/database/locations/sandbox_high/looseLoot.json
+++ b/project/assets/database/locations/sandbox_high/looseLoot.json
--- a/project/assets/database/locations/sandbox_high/staticAmmo.json
+++ b/project/assets/database/locations/sandbox_high/staticAmmo.json
--- a/project/assets/database/locations/sandbox_high/staticContainers.json
+++ b/project/assets/database/locations/sandbox_high/staticContainers.json
--- a/project/assets/database/locations/sandbox_high/staticLoot.json
+++ b/project/assets/database/locations/sandbox_high/staticLoot.json
--- a/project/assets/database/locations/shoreline/looseLoot.json
+++ b/project/assets/database/locations/shoreline/looseLoot.json
--- a/project/assets/database/locations/shoreline/staticAmmo.json
+++ b/project/assets/database/locations/shoreline/staticAmmo.json
--- a/project/assets/database/locations/shoreline/staticContainers.json
+++ b/project/assets/database/locations/shoreline/staticContainers.json
--- a/project/assets/database/locations/shoreline/staticLoot.json
+++ b/project/assets/database/locations/shoreline/staticLoot.json
--- a/project/assets/database/locations/tarkovstreets/base.json
+++ b/project/assets/database/locations/tarkovstreets/base.json
@ -183,7 +183,7 @@
  "DisabledScavExits": "",
  "EnableCoop": true,
  "Enabled": true,
-  "EscapeTimeLimit": 34,
+  "EscapeTimeLimit": 40,
  "EscapeTimeLimitCoop": 30,
  "EscapeTimeLimitPVE": 34,
  "ExitZones": {
--- a/project/assets/database/locations/tarkovstreets/looseLoot.json
+++ b/project/assets/database/locations/tarkovstreets/looseLoot.json
--- a/project/assets/database/locations/tarkovstreets/staticAmmo.json
+++ b/project/assets/database/locations/tarkovstreets/staticAmmo.json
--- a/project/assets/database/locations/tarkovstreets/staticContainers.json
+++ b/project/assets/database/locations/tarkovstreets/staticContainers.json
--- a/project/assets/database/locations/tarkovstreets/staticLoot.json
+++ b/project/assets/database/locations/tarkovstreets/staticLoot.json
--- a/project/assets/database/locations/woods/looseLoot.json
+++ b/project/assets/database/locations/woods/looseLoot.json
--- a/project/assets/database/locations/woods/staticAmmo.json
+++ b/project/assets/database/locations/woods/staticAmmo.json
--- a/project/assets/database/locations/woods/staticContainers.json
+++ b/project/assets/database/locations/woods/staticContainers.json
--- a/project/assets/database/locations/woods/staticLoot.json
+++ b/project/assets/database/locations/woods/staticLoot.json
--- a/project/assets/database/templates/prices.json
+++ b/project/assets/database/templates/prices.json