Merge pull request pelican-eggs#2236 from parkervcp/truck_sim

Update: truck sim
smcfreak · Apr 24, 2023 · 41b5fd9 · 41b5fd9
2 parents 3e0a1d9 + cf7f05a
commit 41b5fd9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 49 deletions.
diff --git a/...uck-simulator/american-truck-simulator/egg-american-truck-simulator-dedicated-server.json b/...uck-simulator/american-truck-simulator/egg-american-truck-simulator-dedicated-server.json
@@ -4,23 +4,23 @@
         "version": "PTDL_v2",
         "update_url": null
     },
-    "exported_at": "2022-12-15T18:37:30+01:00",
+    "exported_at": "2023-04-24T17:42:49+02:00",
     "name": "American Truck Simulator Dedicated Server",
     "author": "chase@cstmgames.com",
     "description": "This will set up SteamCMD and all the required files for the newly released American Truck Simulator Dedicated server.  Simply placed the exported server config from your ATS instance to the .local\/share\/American Truck Simulator\/ folder and select start.  Make sure that auto start is off on server creation to allow you to upload your config files.",
     "features": [
         "steam_disk_space"
     ],
     "docker_images": {
-        "ghcr.io\/parkervcp\/games:source": "ghcr.io\/parkervcp\/games:source"
+        "ghcr.io\/parkervcp\/steamcmd:debian": "ghcr.io\/parkervcp\/steamcmd:debian"
     },
     "file_denylist": [],
     "startup": ".\/bin\/linux_x64\/amtrucks_server",
     "config": {
         "files": "{\r\n    \"\/.local\/share\/American Truck Simulator\/server_config.sii\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \" connection_dedicated_port:\": \" connection_dedicated_port: {{server.build.default.port}}\",\r\n            \" query_dedicated_port:\": \" query_dedicated_port: {{env.QUERY_PORT}}\",\r\n            \" server_logon_token:\": \" server_logon_token: \\\"{{env.STEAM_TOKEN}}\\\"\",\r\n            \" lobby_name:\": \" lobby_name: \\\"{{env.LOBBY_NAME}}\\\"\"\r\n        }\r\n    }\r\n}",
         "startup": "{\r\n    \"done\": \"[MP] Session running.\"\r\n}",
         "logs": "{}",
-        "stop": "^C"
+        "stop": "^^C"
     },
     "scripts": {
         "installation": {
@@ -50,26 +50,6 @@
             "rules": "required|string|in:2239530",
             "field_type": "text"
         },
-        {
-            "name": "Steam username",
-            "description": "",
-            "env_variable": "STEAM_USER",
-            "default_value": "",
-            "user_viewable": true,
-            "user_editable": true,
-            "rules": "nullable|string|max:32",
-            "field_type": "text"
-        },
-        {
-            "name": "Steam password",
-            "description": "",
-            "env_variable": "STEAM_PASS",
-            "default_value": "",
-            "user_viewable": true,
-            "user_editable": true,
-            "rules": "nullable|string|max:64",
-            "field_type": "text"
-        },
         {
             "name": "Query port",
             "description": "By there readme of the game the query port must be between 27015-27020, but from our testing this port can be any port",
@@ -82,12 +62,12 @@
         },
         {
             "name": "Steam Auth token",
-            "description": "Acquire a logon token on https:\/\/steamcommunity.com\/dev\/managegameservers (game ownership is required).",
+            "description": "By default, whenever a dedicated server is launched it is using an anonymous account. For such an account non-persistent server id is generated (used for direct search). To avoid this you can acquire a logon token on https:\/\/steamcommunity.com\/dev\/managegameservers (game ownership is required)",
             "env_variable": "STEAM_TOKEN",
             "default_value": "",
             "user_viewable": true,
             "user_editable": true,
-            "rules": "required|string|max:32",
+            "rules": "nullable|string|max:32",
             "field_type": "text"
         },
         {

diff --git a/...ers/truck-simulator/euro-truck-simulator2/egg-euro-truck-simulator2-dedicated-server.json b/...ers/truck-simulator/euro-truck-simulator2/egg-euro-truck-simulator2-dedicated-server.json
@@ -4,7 +4,7 @@
         "version": "PTDL_v2",
         "update_url": null
     },
-    "exported_at": "2023-01-14T17:26:13+01:00",
+    "exported_at": "2023-04-24T17:19:01+02:00",
     "name": "Euro Truck Simulator 2 Dedicated server",
     "author": "josdekurk@gmail.com",
     "description": "Travel across Europe as king of the road, a trucker who delivers important cargo across impressive distances! With dozens of cities to explore, your endurance, skill and speed will all be pushed to their limits.",
@@ -62,12 +62,12 @@
         },
         {
             "name": "Steam Auth token",
-            "description": "Acquire a logon token on https:\/\/steamcommunity.com\/dev\/managegameservers (game ownership is required).",
+            "description": "By default, whenever a dedicated server is launched it is using an anonymous account. For such an account non-persistent server id is generated (used for direct search). To avoid this you can acquire a logon token on https:\/\/steamcommunity.com\/dev\/managegameservers (game ownership is required)",
             "env_variable": "STEAM_TOKEN",
             "default_value": "",
             "user_viewable": true,
             "user_editable": true,
-            "rules": "required|string|max:32",
+            "rules": "nullable|string|max:32",
             "field_type": "text"
         },
         {
@@ -79,26 +79,6 @@
             "user_editable": true,
             "rules": "required|string|max:64",
             "field_type": "text"
-        },
-        {
-            "name": "Steam password",
-            "description": "",
-            "env_variable": "STEAM_PASS",
-            "default_value": "",
-            "user_viewable": true,
-            "user_editable": true,
-            "rules": "nullable|string|max:64",
-            "field_type": "text"
-        },
-        {
-            "name": "Steam username",
-            "description": "",
-            "env_variable": "STEAM_USER",
-            "default_value": "",
-            "user_viewable": true,
-            "user_editable": true,
-            "rules": "nullable|string|max:32",
-            "field_type": "text"
         }
     ]
 }
diff --git a/game_eggs/steamcmd_servers/truck-simulator/server_config.sii b/game_eggs/steamcmd_servers/truck-simulator/server_config.sii
@@ -8,7 +8,7 @@ server_config : _nameless.54e.4440 {
  max_players: 8
  max_vehicles_total: 100
  max_ai_vehicles_player: 50
- max_ai_vehicles_player_spawn: 30
+ max_ai_vehicles_player_spawn: 50
  connection_virtual_port: 100
  query_virtual_port: 101
  connection_dedicated_port: 27015