From de6c4ef1801d131fa406b9a28f130425fc3971a8 Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT Date: Mon, 20 Mar 2023 23:06:27 -0700 Subject: [PATCH 1/6] bat --- Scripts/bat/!README.txt | 25 +++++++++++++++++++ .../{run1buildDebug.bat => buildAllDebug.bat} | 0 ...n1buildRelease.bat => buildAllRelease.bat} | 0 .../bat/{run2configDev.bat => configDev.bat} | 2 +- .../bat/{runconfigdev.toml => configDev.toml} | 0 .../bat/{run2configMap.bat => configMap.bat} | 2 +- .../bat/{runconfigmap.toml => configMap.toml} | 0 ...{run2configServer.bat => configServer.bat} | 2 +- ...runconfigserver.toml => configServer.toml} | 0 Scripts/bat/readme.txt | 10 -------- Scripts/bat/run3server.bat | 4 --- Scripts/bat/run4client.bat | 4 --- Scripts/bat/runBuildAll.bat | 4 +++ Scripts/bat/runBuildClient.bat | 4 +++ Scripts/bat/runBuildServer.bat | 4 +++ Scripts/bat/runQuickAll.bat | 4 +++ Scripts/bat/runQuickClient.bat | 4 +++ Scripts/bat/runQuickServer.bat | 4 +++ 18 files changed, 52 insertions(+), 21 deletions(-) create mode 100644 Scripts/bat/!README.txt rename Scripts/bat/{run1buildDebug.bat => buildAllDebug.bat} (100%) rename Scripts/bat/{run1buildRelease.bat => buildAllRelease.bat} (100%) rename Scripts/bat/{run2configDev.bat => configDev.bat} (58%) rename Scripts/bat/{runconfigdev.toml => configDev.toml} (100%) rename Scripts/bat/{run2configMap.bat => configMap.bat} (58%) rename Scripts/bat/{runconfigmap.toml => configMap.toml} (100%) rename Scripts/bat/{run2configServer.bat => configServer.bat} (57%) rename Scripts/bat/{runconfigserver.toml => configServer.toml} (100%) delete mode 100644 Scripts/bat/readme.txt delete mode 100644 Scripts/bat/run3server.bat delete mode 100644 Scripts/bat/run4client.bat create mode 100644 Scripts/bat/runBuildAll.bat create mode 100644 Scripts/bat/runBuildClient.bat create mode 100644 Scripts/bat/runBuildServer.bat create mode 100644 Scripts/bat/runQuickAll.bat create mode 100644 Scripts/bat/runQuickClient.bat create mode 100644 Scripts/bat/runQuickServer.bat diff --git a/Scripts/bat/!README.txt b/Scripts/bat/!README.txt new file mode 100644 index 0000000000..901a18514c --- /dev/null +++ b/Scripts/bat/!README.txt @@ -0,0 +1,25 @@ +buildAllDebug + Builds all projects with debug configuration +buildAllRelease + Builds all projects with release configuration + +configDev + Sets the game server config for development +configMap + Sets the game server config for mapping +configServer + Sets the game server config for a more proper server + +runBuildAll + Builds the client and server then runs them +runBuildClient + Builds only the client and runs it +runBuildServer + Builds only the server and runs it + +runQuickAll + Runs the client and server without building +runQuickClient + Runs the client without building +runQuickServer + Runs the server without building diff --git a/Scripts/bat/run1buildDebug.bat b/Scripts/bat/buildAllDebug.bat similarity index 100% rename from Scripts/bat/run1buildDebug.bat rename to Scripts/bat/buildAllDebug.bat diff --git a/Scripts/bat/run1buildRelease.bat b/Scripts/bat/buildAllRelease.bat similarity index 100% rename from Scripts/bat/run1buildRelease.bat rename to Scripts/bat/buildAllRelease.bat diff --git a/Scripts/bat/run2configDev.bat b/Scripts/bat/configDev.bat similarity index 58% rename from Scripts/bat/run2configDev.bat rename to Scripts/bat/configDev.bat index 995286891e..ba2d28671a 100644 --- a/Scripts/bat/run2configDev.bat +++ b/Scripts/bat/configDev.bat @@ -1,3 +1,3 @@ @echo off -copy runconfigdev.toml server_config.toml +copy configDev.toml server_config.toml move server_config.toml ../../bin/Content.Server/ diff --git a/Scripts/bat/runconfigdev.toml b/Scripts/bat/configDev.toml similarity index 100% rename from Scripts/bat/runconfigdev.toml rename to Scripts/bat/configDev.toml diff --git a/Scripts/bat/run2configMap.bat b/Scripts/bat/configMap.bat similarity index 58% rename from Scripts/bat/run2configMap.bat rename to Scripts/bat/configMap.bat index 274561114c..620cba4f19 100644 --- a/Scripts/bat/run2configMap.bat +++ b/Scripts/bat/configMap.bat @@ -1,3 +1,3 @@ @echo off -copy runconfigmap.toml server_config.toml +copy configMap.toml server_config.toml move server_config.toml ../../bin/Content.Server/ diff --git a/Scripts/bat/runconfigmap.toml b/Scripts/bat/configMap.toml similarity index 100% rename from Scripts/bat/runconfigmap.toml rename to Scripts/bat/configMap.toml diff --git a/Scripts/bat/run2configServer.bat b/Scripts/bat/configServer.bat similarity index 57% rename from Scripts/bat/run2configServer.bat rename to Scripts/bat/configServer.bat index 452eaaae33..37b1ef2b72 100644 --- a/Scripts/bat/run2configServer.bat +++ b/Scripts/bat/configServer.bat @@ -1,3 +1,3 @@ @echo off -copy runconfigserver.toml server_config.toml +copy configServer.toml server_config.toml move server_config.toml ../../bin/Content.Server/ diff --git a/Scripts/bat/runconfigserver.toml b/Scripts/bat/configServer.toml similarity index 100% rename from Scripts/bat/runconfigserver.toml rename to Scripts/bat/configServer.toml diff --git a/Scripts/bat/readme.txt b/Scripts/bat/readme.txt deleted file mode 100644 index bf401fe951..0000000000 --- a/Scripts/bat/readme.txt +++ /dev/null @@ -1,10 +0,0 @@ -The files here will will, in order, build the game, copy the correct config file, launch the server, and launch the client. -There are some variations of files, explained here - -The debug vs release build is simply what people dev in vs the actual server. The release build contains various -optimizations, while the debug build contains debugging tools. -If you're mapping, use the release build as it will run smoother. - -The Server config file simply matches the actual server config, while the other two have some cvar tweaks that come in -handy for their specific tasks. -Essentially only saves you some commands when you load in, but very convenient none the less. \ No newline at end of file diff --git a/Scripts/bat/run3server.bat b/Scripts/bat/run3server.bat deleted file mode 100644 index 4de19ebb83..0000000000 --- a/Scripts/bat/run3server.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -cd ../../Bin/Content.Server -call Content.Server.exe %* -pause diff --git a/Scripts/bat/run4client.bat b/Scripts/bat/run4client.bat deleted file mode 100644 index 3b3277d5d7..0000000000 --- a/Scripts/bat/run4client.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -cd ../../Bin/Content.Client -call Content.Client.exe %* -pause diff --git a/Scripts/bat/runBuildAll.bat b/Scripts/bat/runBuildAll.bat new file mode 100644 index 0000000000..1c268aab4f --- /dev/null +++ b/Scripts/bat/runBuildAll.bat @@ -0,0 +1,4 @@ +@echo off +start runBuildServer.bat %* +start runBuildClient.bat %* +exit diff --git a/Scripts/bat/runBuildClient.bat b/Scripts/bat/runBuildClient.bat new file mode 100644 index 0000000000..48b303b5cf --- /dev/null +++ b/Scripts/bat/runBuildClient.bat @@ -0,0 +1,4 @@ +@echo off +cd ../../ +call dotnet run --project Content.Client %* +pause diff --git a/Scripts/bat/runBuildServer.bat b/Scripts/bat/runBuildServer.bat new file mode 100644 index 0000000000..df5c4d5ce2 --- /dev/null +++ b/Scripts/bat/runBuildServer.bat @@ -0,0 +1,4 @@ +@echo off +cd ../../ +call dotnet run --project Content.Server %* +pause diff --git a/Scripts/bat/runQuickAll.bat b/Scripts/bat/runQuickAll.bat new file mode 100644 index 0000000000..c2d3438094 --- /dev/null +++ b/Scripts/bat/runQuickAll.bat @@ -0,0 +1,4 @@ +@echo off +start runQuickServer.bat %* +start runQuickClient.bat %* +exit diff --git a/Scripts/bat/runQuickClient.bat b/Scripts/bat/runQuickClient.bat new file mode 100644 index 0000000000..48b303b5cf --- /dev/null +++ b/Scripts/bat/runQuickClient.bat @@ -0,0 +1,4 @@ +@echo off +cd ../../ +call dotnet run --project Content.Client %* +pause diff --git a/Scripts/bat/runQuickServer.bat b/Scripts/bat/runQuickServer.bat new file mode 100644 index 0000000000..df5c4d5ce2 --- /dev/null +++ b/Scripts/bat/runQuickServer.bat @@ -0,0 +1,4 @@ +@echo off +cd ../../ +call dotnet run --project Content.Server %* +pause From f8034fc64e76b389bef05a5dec1adde3935b8771 Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT Date: Mon, 20 Mar 2023 23:10:05 -0700 Subject: [PATCH 2/6] config --- Scripts/bat/configDev.bat | 2 +- Scripts/bat/configMap.bat | 2 +- Scripts/bat/configServer.bat | 2 +- Scripts/{bat => config}/configDev.toml | 0 Scripts/{bat => config}/configMap.toml | 0 Scripts/{bat => config}/configServer.toml | 0 Scripts/sh/!README.txt | 25 ++++ Scripts/sh/{run2configDev.sh => configDev.sh} | 4 +- Scripts/sh/{run2configMap.sh => configMap.sh} | 4 +- Scripts/sh/configServer.sh | 8 ++ Scripts/sh/readme.txt | 10 -- Scripts/sh/run2configServer.sh | 8 -- Scripts/sh/runconfigdev.toml | 135 ------------------ Scripts/sh/runconfigmap.toml | 135 ------------------ Scripts/sh/runconfigserver.toml | 134 ----------------- 15 files changed, 40 insertions(+), 429 deletions(-) rename Scripts/{bat => config}/configDev.toml (100%) rename Scripts/{bat => config}/configMap.toml (100%) rename Scripts/{bat => config}/configServer.toml (100%) create mode 100644 Scripts/sh/!README.txt rename Scripts/sh/{run2configDev.sh => configDev.sh} (50%) mode change 100755 => 100644 rename Scripts/sh/{run2configMap.sh => configMap.sh} (50%) mode change 100755 => 100644 create mode 100644 Scripts/sh/configServer.sh delete mode 100644 Scripts/sh/readme.txt delete mode 100755 Scripts/sh/run2configServer.sh delete mode 100644 Scripts/sh/runconfigdev.toml delete mode 100644 Scripts/sh/runconfigmap.toml delete mode 100644 Scripts/sh/runconfigserver.toml diff --git a/Scripts/bat/configDev.bat b/Scripts/bat/configDev.bat index ba2d28671a..171d7f6ce3 100644 --- a/Scripts/bat/configDev.bat +++ b/Scripts/bat/configDev.bat @@ -1,3 +1,3 @@ @echo off -copy configDev.toml server_config.toml +copy ../config/configDev.toml server_config.toml move server_config.toml ../../bin/Content.Server/ diff --git a/Scripts/bat/configMap.bat b/Scripts/bat/configMap.bat index 620cba4f19..0205e6845f 100644 --- a/Scripts/bat/configMap.bat +++ b/Scripts/bat/configMap.bat @@ -1,3 +1,3 @@ @echo off -copy configMap.toml server_config.toml +copy ../config/configMap.toml server_config.toml move server_config.toml ../../bin/Content.Server/ diff --git a/Scripts/bat/configServer.bat b/Scripts/bat/configServer.bat index 37b1ef2b72..020fc3916f 100644 --- a/Scripts/bat/configServer.bat +++ b/Scripts/bat/configServer.bat @@ -1,3 +1,3 @@ @echo off -copy configServer.toml server_config.toml +copy ../config/configServer.toml server_config.toml move server_config.toml ../../bin/Content.Server/ diff --git a/Scripts/bat/configDev.toml b/Scripts/config/configDev.toml similarity index 100% rename from Scripts/bat/configDev.toml rename to Scripts/config/configDev.toml diff --git a/Scripts/bat/configMap.toml b/Scripts/config/configMap.toml similarity index 100% rename from Scripts/bat/configMap.toml rename to Scripts/config/configMap.toml diff --git a/Scripts/bat/configServer.toml b/Scripts/config/configServer.toml similarity index 100% rename from Scripts/bat/configServer.toml rename to Scripts/config/configServer.toml diff --git a/Scripts/sh/!README.txt b/Scripts/sh/!README.txt new file mode 100644 index 0000000000..901a18514c --- /dev/null +++ b/Scripts/sh/!README.txt @@ -0,0 +1,25 @@ +buildAllDebug + Builds all projects with debug configuration +buildAllRelease + Builds all projects with release configuration + +configDev + Sets the game server config for development +configMap + Sets the game server config for mapping +configServer + Sets the game server config for a more proper server + +runBuildAll + Builds the client and server then runs them +runBuildClient + Builds only the client and runs it +runBuildServer + Builds only the server and runs it + +runQuickAll + Runs the client and server without building +runQuickClient + Runs the client without building +runQuickServer + Runs the server without building diff --git a/Scripts/sh/run2configDev.sh b/Scripts/sh/configDev.sh old mode 100755 new mode 100644 similarity index 50% rename from Scripts/sh/run2configDev.sh rename to Scripts/sh/configDev.sh index eed1c1d39f..eec9bd7c23 --- a/Scripts/sh/run2configDev.sh +++ b/Scripts/sh/configDev.sh @@ -2,7 +2,7 @@ # make sure to start from script dir if [ "$(dirname $0)" != "." ]; then - cd "$(dirname $0)" + cd "$(dirname $0)" fi -cp runconfigdev.toml ../../bin/Content.Server/server_config.toml +cp ../config/configDev.toml ../../bin/Content.Server/server_config.toml diff --git a/Scripts/sh/run2configMap.sh b/Scripts/sh/configMap.sh old mode 100755 new mode 100644 similarity index 50% rename from Scripts/sh/run2configMap.sh rename to Scripts/sh/configMap.sh index 80fdc3e1b3..82cc512436 --- a/Scripts/sh/run2configMap.sh +++ b/Scripts/sh/configMap.sh @@ -2,7 +2,7 @@ # make sure to start from script dir if [ "$(dirname $0)" != "." ]; then - cd "$(dirname $0)" + cd "$(dirname $0)" fi -cp runconfigmap.toml ../../bin/Content.Server/server_config.toml +cp ../config/configMap.toml ../../bin/Content.Server/server_config.toml diff --git a/Scripts/sh/configServer.sh b/Scripts/sh/configServer.sh new file mode 100644 index 0000000000..51ddf3e5b2 --- /dev/null +++ b/Scripts/sh/configServer.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env sh + +# make sure to start from script dir +if [ "$(dirname $0)" != "." ]; then + cd "$(dirname $0)" +fi + +cp ../config/configServer.toml ../../bin/Content.Server/server_config.toml diff --git a/Scripts/sh/readme.txt b/Scripts/sh/readme.txt deleted file mode 100644 index bf401fe951..0000000000 --- a/Scripts/sh/readme.txt +++ /dev/null @@ -1,10 +0,0 @@ -The files here will will, in order, build the game, copy the correct config file, launch the server, and launch the client. -There are some variations of files, explained here - -The debug vs release build is simply what people dev in vs the actual server. The release build contains various -optimizations, while the debug build contains debugging tools. -If you're mapping, use the release build as it will run smoother. - -The Server config file simply matches the actual server config, while the other two have some cvar tweaks that come in -handy for their specific tasks. -Essentially only saves you some commands when you load in, but very convenient none the less. \ No newline at end of file diff --git a/Scripts/sh/run2configServer.sh b/Scripts/sh/run2configServer.sh deleted file mode 100755 index 2a526a5030..0000000000 --- a/Scripts/sh/run2configServer.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env sh - -# make sure to start from script dir -if [ "$(dirname $0)" != "." ]; then - cd "$(dirname $0)" -fi - -cp runconfigserver.toml ../../bin/Content.Server/server_config.toml diff --git a/Scripts/sh/runconfigdev.toml b/Scripts/sh/runconfigdev.toml deleted file mode 100644 index a70bc23bca..0000000000 --- a/Scripts/sh/runconfigdev.toml +++ /dev/null @@ -1,135 +0,0 @@ -[game] -hostname = "[NA East][MRP] Parkstation" -desc = "A server focused on RP expectations and calmer rounds, looking to build player base at the moment." -maxplayers = 64 -soft_max_players = 48 -type = 1 -lobbyenabled = false -lobbyduration = 180 -role_timers = false -fallbackpreset = "extended" -map_pool = "ParkMapPool" - -[server] -rules_file = "Park_Rules.txt" -id = "parkstation" - -[whitelist] -min_players = 32 - -[rules] -rules.time = 60 -rules.exempt_local = false - -[events] -ramping_average_end_time = 120.0 -ramping_average_chaos = 7.0 - -[traitor] -min_players = 2 -players_per_traitor = 8 -starting_balance = 16 - -[zombie] -min_players = 10 -players_per_infected = 5 - - -[mapping] -autosave_interval = 180.0 - -[atmos] -space_wind = true -space_wind_max_velocity = 22.0 - -[shuttle] -emergency_early_launch_allowed = true -emergency_dock_time = 260.0 -emergency_transit_time = 180.0 -recall_turning_point = 0.75 -auto_call_time = 0 - -[biomass] -easy_mode = false - -[ambience] -restart_sounds_enabled = false - -[explosion] -tiles_per_tick = 75 -incremental_tile = true - -[ic] -restricted_names = false -flavor_text = true - -[ooc] -enable_during_round = true - -[vote] -map_enabled = true -restart_enabled = true -restart_required_ratio = 0.75 -restart_not_allowed_when_admin_online = true -timermap = 45 - - -[console] -loginlocal = true - -[hub] -advertise = false - -[auth] -# 0 = Optional, 1 = Required, 2 = Disabled -mode = 1 -allowlocal = true - -[log] -path = "logs" -format = "log_%(date)s-%(time)s.txt" -level = 1 -enabled = true - -[net] -tickrate = 30 -port = 1212 -bindto = "::,0.0.0.0" -pvs = true - -[status] -enabled = true - - -[infolinks] -discord = "https://discord.gg/49KeKwXc8g" -github = "https://github.com/Park-Station/Parkstation" -website = "https://nyanotrasen.moe" -wiki = "https://wiki.nyanotrasen.moe" - -[discord] -#DO NOT PUT WEBHOOK URL IN THIS FILE, unless you don't intend to push it. This file can be viewed by anyone on GitHub, only put the URL on the actual server. -ahelp_webhook = "" -ahelp_avatar = "https://imgur.com/a/xyjaogg.png" - -[netres] -limit = 0.0 - - -[build] -fork_id = "ParkStation14" - -[database] -# Database type to use. Can be "sqlite" or "postgres" currently. -engine = "sqlite" - -# Path to store the database at when using SQLite. Note that is NOT a disk path. -# This is relative to the server data directory, which is specified by --data-dir when starting the server from the command (or automatically set by SS14.Watchdog) -sqlite_dbpath = "preferences.db" - -# PostgreSQL database configuration, should be self explanatory. -# pg_host = "localhost" -# pg_port = 5432 -# pg_database = "ss14" -# pg_username = "ss14" -# pg_password = "ss14" diff --git a/Scripts/sh/runconfigmap.toml b/Scripts/sh/runconfigmap.toml deleted file mode 100644 index bcb1c1fc5a..0000000000 --- a/Scripts/sh/runconfigmap.toml +++ /dev/null @@ -1,135 +0,0 @@ -[game] -hostname = "[NA East][MRP] Parkstation" -desc = "A server focused on RP expectations and calmer rounds, looking to build player base at the moment." -maxplayers = 64 -soft_max_players = 48 -type = 1 -lobbyenabled = false -lobbyduration = 180 -role_timers = false -fallbackpreset = "extended" -map_pool = "MappingMapPool" - -[server] -rules_file = "Park_Rules.txt" -id = "parkstation" - -[whitelist] -min_players = 32 - -[rules] -rules.time = 60 -rules.exempt_local = false - -[events] -ramping_average_end_time = 120.0 -ramping_average_chaos = 7.0 - -[traitor] -min_players = 2 -players_per_traitor = 8 -starting_balance = 16 - -[zombie] -min_players = 10 -players_per_infected = 5 - - -[mapping] -autosave_interval = 180.0 - -[atmos] -space_wind = true -space_wind_max_velocity = 22.0 - -[shuttle] -emergency_early_launch_allowed = true -emergency_dock_time = 260.0 -emergency_transit_time = 180.0 -recall_turning_point = 0.75 -auto_call_time = 0 - -[biomass] -easy_mode = false - -[ambience] -restart_sounds_enabled = false - -[explosion] -tiles_per_tick = 75 -incremental_tile = true - -[ic] -restricted_names = false -flavor_text = true - -[ooc] -enable_during_round = true - -[vote] -map_enabled = true -restart_enabled = true -restart_required_ratio = 0.75 -restart_not_allowed_when_admin_online = true -timermap = 45 - - -[console] -loginlocal = true - -[hub] -advertise = false - -[auth] -# 0 = Optional, 1 = Required, 2 = Disabled -mode = 1 -allowlocal = true - -[log] -path = "logs" -format = "log_%(date)s-%(time)s.txt" -level = 1 -enabled = true - -[net] -tickrate = 30 -port = 1212 -bindto = "::,0.0.0.0" -pvs = false - -[status] -enabled = true - - -[infolinks] -discord = "https://discord.gg/49KeKwXc8g" -github = "https://github.com/Park-Station/Parkstation" -website = "https://nyanotrasen.moe" -wiki = "https://wiki.nyanotrasen.moe" - -[discord] -#DO NOT PUT WEBHOOK URL IN THIS FILE, unless you don't intend to push it. This file can be viewed by anyone on GitHub, only put the URL on the actual server. -ahelp_webhook = "" -ahelp_avatar = "https://imgur.com/a/xyjaogg.png" - -[netres] -limit = 0.0 - - -[build] -fork_id = "ParkStation14" - -[database] -# Database type to use. Can be "sqlite" or "postgres" currently. -engine = "sqlite" - -# Path to store the database at when using SQLite. Note that is NOT a disk path. -# This is relative to the server data directory, which is specified by --data-dir when starting the server from the command (or automatically set by SS14.Watchdog) -sqlite_dbpath = "preferences.db" - -# PostgreSQL database configuration, should be self explanatory. -# pg_host = "localhost" -# pg_port = 5432 -# pg_database = "ss14" -# pg_username = "ss14" -# pg_password = "ss14" diff --git a/Scripts/sh/runconfigserver.toml b/Scripts/sh/runconfigserver.toml deleted file mode 100644 index d4ce9364d8..0000000000 --- a/Scripts/sh/runconfigserver.toml +++ /dev/null @@ -1,134 +0,0 @@ -[game] -hostname = "[NA East][MRP] Parkstation" -desc = "A server focused on RP expectations and calmer rounds, looking to build player base at the moment." -maxplayers = 64 -soft_max_players = 48 -type = 1 -lobbyenabled = true -lobbyduration = 180 -role_timers = false -fallbackpreset = "extended" -map_pool = "ParkMapPool" - -[server] -rules_file = "Park_Rules.txt" -id = "parkstation" - -[whitelist] -min_players = 32 - -[rules] -rules.time = 60 -rules.exempt_local = false - -[events] -ramping_average_end_time = 120.0 -ramping_average_chaos = 7.0 - -[traitor] -min_players = 2 -players_per_traitor = 8 -starting_balance = 16 - -[zombie] -min_players = 10 -players_per_infected = 5 - - -[mapping] -autosave_interval = 180.0 - -[atmos] -space_wind = true -space_wind_max_velocity = 22.0 - -[shuttle] -emergency_early_launch_allowed = true -emergency_dock_time = 260.0 -emergency_transit_time = 180.0 -recall_turning_point = 0.75 -auto_call_time = 150 - -[biomass] -easy_mode = false - -[ambience] -restart_sounds_enabled = true - -[explosion] -tiles_per_tick = 75 -incremental_tile = true - -[ic] -restricted_names = false -flavor_text = true - -[ooc] -enable_during_round = true - -[vote] -map_enabled = true -restart_enabled = true -restart_required_ratio = 0.75 -restart_not_allowed_when_admin_online = true -timermap = 45 - - -[console] -loginlocal = true - -[hub] -advertise = false - -[auth] -# 0 = Optional, 1 = Required, 2 = Disabled -mode = 1 -allowlocal = true - -[log] -path = "logs" -format = "log_%(date)s-%(time)s.txt" -level = 1 -enabled = true - -[net] -tickrate = 30 -port = 1212 -bindto = "::,0.0.0.0" - -[status] -enabled = true - - -[infolinks] -discord = "https://discord.gg/49KeKwXc8g" -github = "https://github.com/Park-Station/Parkstation" -website = "https://nyanotrasen.moe" -wiki = "https://wiki.nyanotrasen.moe" - -[discord] -#DO NOT PUT WEBHOOK URL IN THIS FILE, unless you don't intend to push it. This file can be viewed by anyone on GitHub, only put the URL on the actual server. -ahelp_webhook = "" -ahelp_avatar = "https://imgur.com/a/xyjaogg.png" - -[netres] -limit = 0.0 - - -[build] -fork_id = "ParkStation14" - -[database] -# Database type to use. Can be "sqlite" or "postgres" currently. -engine = "sqlite" - -# Path to store the database at when using SQLite. Note that is NOT a disk path. -# This is relative to the server data directory, which is specified by --data-dir when starting the server from the command (or automatically set by SS14.Watchdog) -sqlite_dbpath = "preferences.db" - -# PostgreSQL database configuration, should be self explanatory. -# pg_host = "localhost" -# pg_port = 5432 -# pg_database = "ss14" -# pg_username = "ss14" -# pg_password = "ss14" From 90ae36c63f0a809d21cffce4b582e41bb70189e4 Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT Date: Mon, 20 Mar 2023 23:16:08 -0700 Subject: [PATCH 3/6] shell --- Scripts/bat/runQuickClient.bat | 2 +- Scripts/bat/runQuickServer.bat | 2 +- Scripts/sh/{run1buildDebug.sh => buildAllDebug.sh} | 0 .../sh/{run1buildRelease.sh => buildAllRelease.sh} | 0 Scripts/sh/runBuildAll.sh | 11 +++++++++++ Scripts/sh/{run3server.sh => runBuildClient.sh} | 6 +++--- Scripts/sh/{run4client.sh => runBuildServer.sh} | 6 +++--- Scripts/sh/runQuickAll.sh | 11 +++++++++++ Scripts/sh/runQuickClient.sh | 9 +++++++++ Scripts/sh/runQuickServer.sh | 9 +++++++++ 10 files changed, 48 insertions(+), 8 deletions(-) rename Scripts/sh/{run1buildDebug.sh => buildAllDebug.sh} (100%) mode change 100755 => 100644 rename Scripts/sh/{run1buildRelease.sh => buildAllRelease.sh} (100%) mode change 100755 => 100644 create mode 100644 Scripts/sh/runBuildAll.sh rename Scripts/sh/{run3server.sh => runBuildClient.sh} (58%) mode change 100755 => 100644 rename Scripts/sh/{run4client.sh => runBuildServer.sh} (58%) mode change 100755 => 100644 create mode 100644 Scripts/sh/runQuickAll.sh create mode 100644 Scripts/sh/runQuickClient.sh create mode 100644 Scripts/sh/runQuickServer.sh diff --git a/Scripts/bat/runQuickClient.bat b/Scripts/bat/runQuickClient.bat index 48b303b5cf..16e02d0ada 100644 --- a/Scripts/bat/runQuickClient.bat +++ b/Scripts/bat/runQuickClient.bat @@ -1,4 +1,4 @@ @echo off cd ../../ -call dotnet run --project Content.Client %* +call dotnet run --project Content.Client --no-build %* pause diff --git a/Scripts/bat/runQuickServer.bat b/Scripts/bat/runQuickServer.bat index df5c4d5ce2..602d33663a 100644 --- a/Scripts/bat/runQuickServer.bat +++ b/Scripts/bat/runQuickServer.bat @@ -1,4 +1,4 @@ @echo off cd ../../ -call dotnet run --project Content.Server %* +call dotnet run --project Content.Server --no-build %* pause diff --git a/Scripts/sh/run1buildDebug.sh b/Scripts/sh/buildAllDebug.sh old mode 100755 new mode 100644 similarity index 100% rename from Scripts/sh/run1buildDebug.sh rename to Scripts/sh/buildAllDebug.sh diff --git a/Scripts/sh/run1buildRelease.sh b/Scripts/sh/buildAllRelease.sh old mode 100755 new mode 100644 similarity index 100% rename from Scripts/sh/run1buildRelease.sh rename to Scripts/sh/buildAllRelease.sh diff --git a/Scripts/sh/runBuildAll.sh b/Scripts/sh/runBuildAll.sh new file mode 100644 index 0000000000..31aeb62f87 --- /dev/null +++ b/Scripts/sh/runBuildAll.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env sh + +# make sure to start from script dir +if [ "$(dirname $0)" != "." ]; then + cd "$(dirname $0)" +fi + +sh -e runBuildServer.sh +sh -e runBuildClient.sh + +exit diff --git a/Scripts/sh/run3server.sh b/Scripts/sh/runBuildClient.sh old mode 100755 new mode 100644 similarity index 58% rename from Scripts/sh/run3server.sh rename to Scripts/sh/runBuildClient.sh index 45f0a5753e..d722543496 --- a/Scripts/sh/run3server.sh +++ b/Scripts/sh/runBuildClient.sh @@ -2,8 +2,8 @@ # make sure to start from script dir if [ "$(dirname $0)" != "." ]; then - cd "$(dirname $0)" + cd "$(dirname $0)" fi -cd ../../bin/Content.Server -./Content.Server +cd ../../ +dotnet run --project Content.Client diff --git a/Scripts/sh/run4client.sh b/Scripts/sh/runBuildServer.sh old mode 100755 new mode 100644 similarity index 58% rename from Scripts/sh/run4client.sh rename to Scripts/sh/runBuildServer.sh index e43560b55f..c15433251a --- a/Scripts/sh/run4client.sh +++ b/Scripts/sh/runBuildServer.sh @@ -2,8 +2,8 @@ # make sure to start from script dir if [ "$(dirname $0)" != "." ]; then - cd "$(dirname $0)" + cd "$(dirname $0)" fi -cd ../../bin/Content.Client -./Content.Client +cd ../../ +dotnet run --project Content.Server diff --git a/Scripts/sh/runQuickAll.sh b/Scripts/sh/runQuickAll.sh new file mode 100644 index 0000000000..7c5f6ff777 --- /dev/null +++ b/Scripts/sh/runQuickAll.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env sh + +# make sure to start from script dir +if [ "$(dirname $0)" != "." ]; then + cd "$(dirname $0)" +fi + +sh -e runQuickServer.sh +sh -e runQuickClient.sh + +exit diff --git a/Scripts/sh/runQuickClient.sh b/Scripts/sh/runQuickClient.sh new file mode 100644 index 0000000000..080c78f27c --- /dev/null +++ b/Scripts/sh/runQuickClient.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env sh + +# make sure to start from script dir +if [ "$(dirname $0)" != "." ]; then + cd "$(dirname $0)" +fi + +cd ../../ +dotnet run --project Content.Client --no-build diff --git a/Scripts/sh/runQuickServer.sh b/Scripts/sh/runQuickServer.sh new file mode 100644 index 0000000000..b264ff6fc7 --- /dev/null +++ b/Scripts/sh/runQuickServer.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env sh + +# make sure to start from script dir +if [ "$(dirname $0)" != "." ]; then + cd "$(dirname $0)" +fi + +cd ../../ +dotnet run --project Content.Server --no-build From caa7d0a5c36a198dd0bd41ec892d1b1ca3a9b565 Mon Sep 17 00:00:00 2001 From: Pspritechologist <81725545+Pspritechologist@users.noreply.github.com> Date: Wed, 29 Mar 2023 13:06:18 -0400 Subject: [PATCH 4/6] Tweaked READMEs --- Scripts/bat/!README.txt | 17 ++++++++++++++--- Scripts/sh/!README.txt | 17 ++++++++++++++--- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/Scripts/bat/!README.txt b/Scripts/bat/!README.txt index 901a18514c..f60f038bd5 100644 --- a/Scripts/bat/!README.txt +++ b/Scripts/bat/!README.txt @@ -8,14 +8,14 @@ configDev configMap Sets the game server config for mapping configServer - Sets the game server config for a more proper server + Sets the game server config to match the actual server runBuildAll Builds the client and server then runs them runBuildClient - Builds only the client and runs it + Builds only the client and runs it runBuildServer - Builds only the server and runs it + Builds only the server and runs it runQuickAll Runs the client and server without building @@ -23,3 +23,14 @@ runQuickClient Runs the client without building runQuickServer Runs the server without building + + +A quick explanation on the variations of files. + +The debug vs release build is simply what people dev in vs the actual server. The release build contains various +optimizations, while the debug build contains debugging tools. +If you're mapping, use the release build as it will run smoother. + +The Server config file simply matches the actual server, while the other two have some cvar tweaks that come in +handy for their specific tasks. +Essentially only saves you some commands when you load in, but very convenient none the less. \ No newline at end of file diff --git a/Scripts/sh/!README.txt b/Scripts/sh/!README.txt index 901a18514c..f60f038bd5 100644 --- a/Scripts/sh/!README.txt +++ b/Scripts/sh/!README.txt @@ -8,14 +8,14 @@ configDev configMap Sets the game server config for mapping configServer - Sets the game server config for a more proper server + Sets the game server config to match the actual server runBuildAll Builds the client and server then runs them runBuildClient - Builds only the client and runs it + Builds only the client and runs it runBuildServer - Builds only the server and runs it + Builds only the server and runs it runQuickAll Runs the client and server without building @@ -23,3 +23,14 @@ runQuickClient Runs the client without building runQuickServer Runs the server without building + + +A quick explanation on the variations of files. + +The debug vs release build is simply what people dev in vs the actual server. The release build contains various +optimizations, while the debug build contains debugging tools. +If you're mapping, use the release build as it will run smoother. + +The Server config file simply matches the actual server, while the other two have some cvar tweaks that come in +handy for their specific tasks. +Essentially only saves you some commands when you load in, but very convenient none the less. \ No newline at end of file From 42dad9d2cf5a08b2274723ff84238af6841dbf38 Mon Sep 17 00:00:00 2001 From: Pspritechologist <81725545+Pspritechologist@users.noreply.github.com> Date: Wed, 29 Mar 2023 17:56:28 -0400 Subject: [PATCH 5/6] Updated Readme, fixed configs --- Scripts/bat/!README.txt | 4 ---- Scripts/config/configDev.toml | 4 ++-- Scripts/config/configMap.toml | 4 ++-- Scripts/config/configServer.toml | 4 ++-- Scripts/sh/!README.txt | 4 ---- 5 files changed, 6 insertions(+), 14 deletions(-) diff --git a/Scripts/bat/!README.txt b/Scripts/bat/!README.txt index f60f038bd5..f0147f8817 100644 --- a/Scripts/bat/!README.txt +++ b/Scripts/bat/!README.txt @@ -12,10 +12,6 @@ configServer runBuildAll Builds the client and server then runs them -runBuildClient - Builds only the client and runs it -runBuildServer - Builds only the server and runs it runQuickAll Runs the client and server without building diff --git a/Scripts/config/configDev.toml b/Scripts/config/configDev.toml index a70bc23bca..4e5c80dcc9 100644 --- a/Scripts/config/configDev.toml +++ b/Scripts/config/configDev.toml @@ -18,8 +18,8 @@ id = "parkstation" min_players = 32 [rules] -rules.time = 60 -rules.exempt_local = false +time = 60 +exempt_local = false [events] ramping_average_end_time = 120.0 diff --git a/Scripts/config/configMap.toml b/Scripts/config/configMap.toml index bcb1c1fc5a..e790cfed98 100644 --- a/Scripts/config/configMap.toml +++ b/Scripts/config/configMap.toml @@ -18,8 +18,8 @@ id = "parkstation" min_players = 32 [rules] -rules.time = 60 -rules.exempt_local = false +time = 60 +exempt_local = false [events] ramping_average_end_time = 120.0 diff --git a/Scripts/config/configServer.toml b/Scripts/config/configServer.toml index d4ce9364d8..d1b8cfcdb2 100644 --- a/Scripts/config/configServer.toml +++ b/Scripts/config/configServer.toml @@ -18,8 +18,8 @@ id = "parkstation" min_players = 32 [rules] -rules.time = 60 -rules.exempt_local = false +time = 60 +exempt_local = false [events] ramping_average_end_time = 120.0 diff --git a/Scripts/sh/!README.txt b/Scripts/sh/!README.txt index f60f038bd5..f0147f8817 100644 --- a/Scripts/sh/!README.txt +++ b/Scripts/sh/!README.txt @@ -12,10 +12,6 @@ configServer runBuildAll Builds the client and server then runs them -runBuildClient - Builds only the client and runs it -runBuildServer - Builds only the server and runs it runQuickAll Runs the client and server without building From 8b47b17dfc4d15af3f0d0924fd4bb499652c2ac7 Mon Sep 17 00:00:00 2001 From: Charcoal Date: Thu, 30 Mar 2023 22:56:48 -0400 Subject: [PATCH 6/6] Linux Scripts Unfucking Reworked broken scripts and chmod +x all --- Scripts/sh/buildAllDebug.sh | 0 Scripts/sh/buildAllRelease.sh | 0 Scripts/sh/configDev.sh | 0 Scripts/sh/configMap.sh | 0 Scripts/sh/configServer.sh | 0 Scripts/sh/runBuildAll.sh | 13 +++++++++++-- Scripts/sh/runBuildClient.sh | 0 Scripts/sh/runBuildServer.sh | 0 Scripts/sh/runQuickAll.sh | 5 ++++- Scripts/sh/runQuickClient.sh | 0 Scripts/sh/runQuickServer.sh | 0 11 files changed, 15 insertions(+), 3 deletions(-) mode change 100644 => 100755 Scripts/sh/buildAllDebug.sh mode change 100644 => 100755 Scripts/sh/buildAllRelease.sh mode change 100644 => 100755 Scripts/sh/configDev.sh mode change 100644 => 100755 Scripts/sh/configMap.sh mode change 100644 => 100755 Scripts/sh/configServer.sh mode change 100644 => 100755 Scripts/sh/runBuildAll.sh mode change 100644 => 100755 Scripts/sh/runBuildClient.sh mode change 100644 => 100755 Scripts/sh/runBuildServer.sh mode change 100644 => 100755 Scripts/sh/runQuickAll.sh mode change 100644 => 100755 Scripts/sh/runQuickClient.sh mode change 100644 => 100755 Scripts/sh/runQuickServer.sh diff --git a/Scripts/sh/buildAllDebug.sh b/Scripts/sh/buildAllDebug.sh old mode 100644 new mode 100755 diff --git a/Scripts/sh/buildAllRelease.sh b/Scripts/sh/buildAllRelease.sh old mode 100644 new mode 100755 diff --git a/Scripts/sh/configDev.sh b/Scripts/sh/configDev.sh old mode 100644 new mode 100755 diff --git a/Scripts/sh/configMap.sh b/Scripts/sh/configMap.sh old mode 100644 new mode 100755 diff --git a/Scripts/sh/configServer.sh b/Scripts/sh/configServer.sh old mode 100644 new mode 100755 diff --git a/Scripts/sh/runBuildAll.sh b/Scripts/sh/runBuildAll.sh old mode 100644 new mode 100755 index 31aeb62f87..718eedefaa --- a/Scripts/sh/runBuildAll.sh +++ b/Scripts/sh/runBuildAll.sh @@ -5,7 +5,16 @@ if [ "$(dirname $0)" != "." ]; then cd "$(dirname $0)" fi -sh -e runBuildServer.sh -sh -e runBuildClient.sh +echo "will run both server and client in the same terminal so will give you both outputs at once" +echo "dont mind fatl error relating to port 1212 does not seem to change anything" + +cd ../../ + +dotnet build -c debug + +cd ./Scripts/sh + +sh -e runQuickServer.sh & +sh -e runQuickClient.sh exit diff --git a/Scripts/sh/runBuildClient.sh b/Scripts/sh/runBuildClient.sh old mode 100644 new mode 100755 diff --git a/Scripts/sh/runBuildServer.sh b/Scripts/sh/runBuildServer.sh old mode 100644 new mode 100755 diff --git a/Scripts/sh/runQuickAll.sh b/Scripts/sh/runQuickAll.sh old mode 100644 new mode 100755 index 7c5f6ff777..879c3cf3ef --- a/Scripts/sh/runQuickAll.sh +++ b/Scripts/sh/runQuickAll.sh @@ -5,7 +5,10 @@ if [ "$(dirname $0)" != "." ]; then cd "$(dirname $0)" fi -sh -e runQuickServer.sh +echo "will run both server and client in the same terminal so will give you both outputs at once" +echo "dont mind fatl error relating to port 1212 does not seem to change anything" + +sh -e runQuickServer.sh & sh -e runQuickClient.sh exit diff --git a/Scripts/sh/runQuickClient.sh b/Scripts/sh/runQuickClient.sh old mode 100644 new mode 100755 diff --git a/Scripts/sh/runQuickServer.sh b/Scripts/sh/runQuickServer.sh old mode 100644 new mode 100755