Merge pull request #2038 from QuentinGruber/release/0.35.0

Release/0.35.0
QuentinGruber · Mar 22, 2024 · b282ee3 · b282ee3
2 parents d73b04b + f05e2b0
commit b282ee3
Show file tree

Hide file tree

Showing 75 changed files with 353,193 additions and 218,853 deletions.
diff --git a/data/2016/dataSources/ServerItemDefinitions.json b/data/2016/dataSources/ServerItemDefinitions.json
@@ -37730,7 +37730,8 @@
         "PASSIVE_EQUIP_SLOT_GROUP_ID": 0,
         "SCRAP_VALUE_OVERRIDE": 0,
         "PICKUP_EFFECT": 5151,
-        "WORLD_MODEL_ID": 9436
+        "WORLD_MODEL_ID": 9436,
+        "PLACEMENT_MODEL_ID": 9412
     },
     "1906": {
         "NAME": "Parachute Flare",

diff --git a/data/2016/sampleData/defaultconfig.yaml b/data/2016/sampleData/defaultconfig.yaml
@@ -15,7 +15,21 @@ server:
   isNoBuildInPois: true
   baseConstructionDamage: 34000
 
+# Rcon
+
+rcon:
+  password: ""
+  port: 0
+
+# VoiceChat
+
+voicechat:
+    useVoiceChatV2: false
+    joinVoiceChatOnConnect: false
+    serverAccessToken: ""
+
 # Fairplay / anticheat config
+
 fairplay:
   useFairplay: true
   maxPing: 250
@@ -131,7 +145,7 @@ decay:
   vacantFoundationTicks: 3 # destroy empty foundations after 1 hour
   griefFoundationTimer: 72 # destroy grief foundations after 3 days (72 hours)
   griefCheckSlotAmount: 4 # must have a minimum of 4 wall slots to avoid anti-grief
-  baseVehicleDamage: 6000 # 6% damage per 3 ticks
+  baseVehicleDamage: 2000 # 2% damage per 3 ticks (1 hour)
   maxVehiclesPerArea: 2 # the max amount of vehicles that can be in an area before they start taking more damage
   vehicleDamageRange: 25 # how large of a range to detect maxVehiclesPerArea
   dailyRepairMaterials: