From 9842eb03d6136c2292e9767c1969ecadbdced037 Mon Sep 17 00:00:00 2001 From: Greelan <53196309+Greelan@users.noreply.github.com> Date: Mon, 14 Aug 2023 21:59:57 +1000 Subject: [PATCH] OpenTTD: update ports, tweak settings and configs (#443) --- openttd.kvp | 6 +++--- openttdconfig.json | 46 +++++++++++++++++++++++++++++++++++++++------- openttdopenttd.cfg | 20 +++++++++++++------- 3 files changed, 55 insertions(+), 17 deletions(-) diff --git a/openttd.kvp b/openttd.kvp index 163cb39..53bd896 100644 --- a/openttd.kvp +++ b/openttd.kvp @@ -5,7 +5,7 @@ Meta.Arch=x86_64 Meta.Author=Greelan, DARKACE Meta.URL=https://www.openttd.org/ Meta.DisplayImageSource=steam:1536610 -Meta.EndpointURIFormat=steam://connect/{ip}:{GenericModule.App.Ports.$QueryPort} +Meta.EndpointURIFormat= Meta.ConfigManifest=openttdconfig.json Meta.MetaConfigManifest=openttdmetaconfig.json Meta.ConfigRoot=openttd.kvp @@ -40,11 +40,11 @@ App.HasReadableConsole=True App.SupportsLiveSettingsChanges=False App.LiveSettingChangeCommandFormat=set {0} "{1}" App.ApplicationIPBinding=0.0.0.0 -App.Ports=[{"Protocol":"Both","Port":3979,"Ref":"ServerPort","Name":"Server Port","Description":"Port for game traffic"},{"Protocol":"UDP","Port":3978,"Ref":"QueryPort","Name":"Query Port","Description":"Port for server list query traffic"},{"Protocol":"Both","Port":3977,"Ref":"ServerAdminPort","Name":"Server Admin Port","Description":"Port for server admin interface"}] +App.Ports=[{"Protocol":"Both","Port":3979,"Ref":"ServerPort","Name":"Server Port","Description":"Port for game traffic"},{"Protocol":"TCP","Port":3977,"Ref":"ServerAdminPort","Name":"Server Admin Port","Description":"Port for server admin interface"}] App.AdminPortRef=0 App.PrimaryApplicationPortRef=ServerPort App.UniversalSleepApplicationUDPPortRef=ServerPort -App.UniversalSleepSteamQueryPortRef=QueryPort +App.UniversalSleepSteamQueryPortRef=0 App.MaxUsers=25 App.UseRandomAdminPassword=False App.RemoteAdminPassword=Password123 diff --git a/openttdconfig.json b/openttdconfig.json index a6e16cf..6c61220 100644 --- a/openttdconfig.json +++ b/openttdconfig.json @@ -25,6 +25,23 @@ "IncludeInCommandLine":false, "EnumValues":{} }, + { + "DisplayName":"Server Public Status", + "Category":"OpenTTD Server Settings", + "Description":"Sets whether the server is local or public and, if public, whether it is included on the server list or is invite-only", + "Keywords":"local,public,invite,list,game,type,server_game_type", + "FieldName":"server_game_type", + "InputType":"enum", + "IsFlagArgument":false, + "ParamFieldName":"network.server_game_type", + "IncludeInCommandLine":false, + "DefaultValue":"local", + "EnumValues":{ + "local":"Local (default)", + "invite-only":"Public (invite only)", + "public":"Public" + } + }, { "DisplayName":"Server Name", "Category":"OpenTTD Server Settings", @@ -522,15 +539,16 @@ "IncludeInCommandLine":false, "DefaultValue":"0", "EnumValues":{ - "0":"Permissive (default)", + "0":"Lenient (default)", "1":"Tolerant", - "2":"Hostile" + "2":"Hostile", + "3":"Permissive" } }, { - "DisplayName":"Town Population Noise Level Increase - Permissive", + "DisplayName":"Town Population Noise Level Increase - Lenient", "Category":"OpenTTD Enviro Settings", - "Description":"If Town Council Tolerance is permissive, then the town noise limit will increase from the default for every specified number of inhabitants", + "Description":"If Town Council Tolerance is lenient, then the town noise limit will increase from the default for every specified number of inhabitants", "Keywords":"town,noise,population,permissive,town_noise_population[0]", "FieldName":"town_noise_population0", "InputType":"number", @@ -569,6 +587,20 @@ "Placeholder":"4000", "EnumValues":{} }, + { + "DisplayName":"Town Population Noise Level Increase - Permissive", + "Category":"OpenTTD Enviro Settings", + "Description":"If Town Council Tolerance is permissive, then the town noise limit will increase from the default for every specified number of inhabitants", + "Keywords":"town,noise,population,permissive,town_noise_population[3]", + "FieldName":"town_noise_population3", + "InputType":"number", + "IsFlagArgument":false, + "ParamFieldName":"economy.town_noise_population[3]", + "IncludeInCommandLine":false, + "DefaultValue":"400", + "Placeholder":"400", + "EnumValues":{} + }, { "DisplayName":"Allow Bribes", "Category":"OpenTTD Enviro Settings", @@ -1768,14 +1800,14 @@ "IsFlagArgument":false, "ParamFieldName":"difficulty.industry_density", "IncludeInCommandLine":false, - "DefaultValue":"5", + "DefaultValue":"4", "EnumValues":{ "0":"None (funding only)", "1":"Minimal", "2":"Very low", "3":"Low", - "4":"Normal", - "5":"High (default)" + "4":"Normal (default)", + "5":"High" } }, { diff --git a/openttdopenttd.cfg b/openttdopenttd.cfg index 4c2be68..9f1af26 100644 --- a/openttdopenttd.cfg +++ b/openttdopenttd.cfg @@ -63,13 +63,12 @@ invisibility_options = 0 keyboard = keyboard_caps = last_newgrf_count = 0 -gui_zoom = -1 -font_zoom = -1 +gui_scale = -1 [difficulty] max_no_competitors = 0 number_towns = 2 -industry_density = 5 +industry_density = 4 max_loan = 300000 initial_interest = 2 vehicle_costs = 0 @@ -111,6 +110,7 @@ dist_local_authority = 20 town_noise_population[0] = 800 town_noise_population[1] = 2000 town_noise_population[2] = 4000 +town_noise_population[3] = 400 infrastructure_maintenance = false [order] @@ -160,7 +160,7 @@ threaded_saves = true date_format_in_default_names = iso show_finances = true auto_scrolling = 0 -scroll_mode = 0 +scroll_mode = 2 smooth_scroll = false right_mouse_wnd_close = false measure_tooltip = true @@ -177,6 +177,7 @@ sprite_zoom_min = 0 population_in_label = true link_terraform_toolbar = false smallmap_land_colour = 0 +linkgraph_colours = 0 liveries = 2 starting_colour = 16 auto_remove_signals = false @@ -214,13 +215,13 @@ station_platlength = 5 station_dragdrop = true station_show_coverage = false persistent_buildingtools = true -expenses_layout = true station_gui_group_order = 0 station_gui_sort_by = 0 station_gui_sort_order = 0 missing_strings_threshold = 25 graph_line_thickness = 3 show_newgrf_name = false +show_cargo_in_vehicle_lists = false show_date_in_logs = false settings_restriction_mode = 0 developer = 1 @@ -236,6 +237,7 @@ fast_forward_speed_limit = 2500 network_chat_box_width_pct = 40 network_chat_box_height = 25 network_chat_timeout = 20 +scale_bevels = true [linkgraph] recalc_interval = 4 @@ -284,6 +286,7 @@ shuffle = false arrival_player = full arrival_other = summarized accident = full +accident_other = full company_info = full open = summarized close = summarized @@ -329,7 +332,7 @@ npf.npf_road_bay_occupied_penalty = 1500 npf.maximum_go_to_depot_penalty = 2000 yapf.disable_node_optimization = false yapf.max_search_nodes = 10000 -yapf.rail_firstred_twoway_eol = false +yapf.rail_firstred_twoway_eol = true yapf.rail_firstred_penalty = 1000 yapf.rail_firstred_exit_penalty = 10000 yapf.rail_lastred_penalty = 1000 @@ -387,7 +390,7 @@ land_generator = 1 oil_refinery_limit = 32 tgen_smoothness = 1 variety = 0 -generation_seed = 2858340425 +generation_seed = 970327061 tree_placer = 2 heightmap_rotation = 0 se_flat_world_height = 1 @@ -395,6 +398,7 @@ map_x = 8 map_y = 8 water_borders = 15 custom_town_number = 1 +custom_industry_number = 1 custom_terrain_type = 30 custom_sea_level = 1 min_river_length = 16 @@ -411,6 +415,8 @@ clear_per_64k_frames = 4194304 clear_frame_burst = 4096 tree_per_64k_frames = 4194304 tree_frame_burst = 4096 +build_object_per_64k_frames = 2097152 +build_object_frame_burst = 2048 autoslope = true extra_dynamite = true max_bridge_length = 64