Merge branch '3.10.5-DEV' (#1028)

2025-02-12 13:10:43 -05:00 · 2025-01-04 18:18:46 -08:00 · 2025-01-04 18:18:46 -08:00 · 035d83910b
commit 035d83910b
parent befde520fd 0b43e7304c
5 changed files with 22 additions and 12 deletions
--- a/project/assets/configs/core.json
+++ b/project/assets/configs/core.json
@ -1,5 +1,5 @@
 {
-    "sptVersion": "3.10.4",
+    "sptVersion": "3.10.5",
    "projectName": "SPT",
    "compatibleTarkovVersion": "0.15.5.33420",
    "serverName": "SPT Server",
--- a/project/assets/configs/quest.json
+++ b/project/assets/configs/quest.json
@ -228,13 +228,6 @@
            "startTimestamp": 1341615600000,
            "endTimestamp": "",
            "yearly": true
-        },
-        "674647f38466ebb03408b291": {
-            "name": "Thats a Great Plan Walter",
-            "season": "None",
-            "startTimestamp": 1341615600000,
-            "endTimestamp": "",
-            "yearly": false
        }
    },
    "repeatableQuests": [
--- a/project/assets/configs/seasonalevents.json
+++ b/project/assets/configs/seasonalevents.json
@ -8339,7 +8339,7 @@
        {
            "enabled": true,
            "name": "newyears",
-            "type": "NEW_YEARS",
+            "type": "NEWYEARS",
            "startDay": "1",
            "startMonth": "1",
            "endDay": "7",
@ -8348,7 +8348,7 @@
        {
            "enabled": true,
            "name": "April fools",
-            "type": "APRIL_FOOLS",
+            "type": "APRILFOOLS",
            "startDay": "1",
            "startMonth": "4",
            "endDay": "2",
--- a/project/assets/database/templates/quests.json
+++ b/project/assets/database/templates/quests.json
@ -60335,10 +60335,27 @@
          "parentId": "",
          "status": [
            4,
-            5
+            5,
+            7
          ],
          "target": "5edac34d0bb72a50635c2bfa",
          "visibilityConditions": []
+        },
+        {
+          "availableAfter": 0,
+          "conditionType": "Quest",
+          "dispersion": 0,
+          "dynamicLocale": false,
+          "globalQuestCounterId": "",
+          "id": "677260a62c1ea725720d6532",
+          "index": 1,
+          "parentId": "",
+          "status": [
+            4,
+            5
+          ],
+          "target": "5edab4b1218d181e29451435",
+          "visibilityConditions": []
        }
      ],
      "Fail": []
--- a/project/package.json
+++ b/project/package.json
@ -1,6 +1,6 @@
 {
    "name": "spt-server",
-    "version": "3.10.4",
+    "version": "3.10.5",
    "author": "SPT Server",
    "license": "NCSA",
    "main": "obj/bundle.js",