diff --git a/resources/ui/.~lock.i18n.csv# b/resources/ui/.~lock.i18n.csv# new file mode 100644 index 0000000..39f0bff --- /dev/null +++ b/resources/ui/.~lock.i18n.csv# @@ -0,0 +1 @@ +,lhaubaum,lhaubaum-ThinkPad-T430s,24.07.2019 12:59,file:///home/lhaubaum/.config/libreoffice/4; \ No newline at end of file diff --git a/resources/ui/i18n.csv b/resources/ui/i18n.csv index ac6fcd2..271749d 100644 --- a/resources/ui/i18n.csv +++ b/resources/ui/i18n.csv @@ -40,6 +40,8 @@ GRAPHICS,graphics,Grafik SAVE,save,Speichern KEYBOARD,keyboard,Tastatur JOYPAD,joypad,Joypad +SERVER_ADDR,server address,Server Adresse +API_ADDR,api adress,API Adresse Up,,Hoch Down,,Runter Left,,Links diff --git a/resources/ui/i18n.de.translation b/resources/ui/i18n.de.translation index 1d5cb44..a957040 100644 Binary files a/resources/ui/i18n.de.translation and b/resources/ui/i18n.de.translation differ diff --git a/resources/ui/i18n.en.translation b/resources/ui/i18n.en.translation index e2ffa16..aff3f01 100644 Binary files a/resources/ui/i18n.en.translation and b/resources/ui/i18n.en.translation differ diff --git a/scenes/menus/SettingsMenu.tscn b/scenes/menus/SettingsMenu.tscn index 5486762..6d9ab9e 100644 --- a/scenes/menus/SettingsMenu.tscn +++ b/scenes/menus/SettingsMenu.tscn @@ -124,7 +124,7 @@ margin_bottom = -4.0 [node name="GridContainer" type="GridContainer" parent="menu/tabs/system"] margin_left = 12.0 margin_top = 8.0 -margin_right = 476.0 +margin_right = 907.0 margin_bottom = 124.0 columns = 2 @@ -136,7 +136,7 @@ valign = 1 [node name="locales" type="ItemList" parent="menu/tabs/system/GridContainer"] margin_left = 194.0 -margin_right = 464.0 +margin_right = 895.0 margin_bottom = 27.0 size_flags_horizontal = 3 auto_height = true @@ -151,7 +151,7 @@ valign = 1 [node name="server_addr" type="LineEdit" parent="menu/tabs/system/GridContainer"] margin_left = 194.0 margin_top = 31.0 -margin_right = 464.0 +margin_right = 895.0 margin_bottom = 68.0 [node name="api_addr_label" type="Label" parent="menu/tabs/system/GridContainer"] @@ -164,7 +164,7 @@ valign = 1 [node name="api_addr" type="LineEdit" parent="menu/tabs/system/GridContainer"] margin_left = 194.0 margin_top = 72.0 -margin_right = 464.0 +margin_right = 895.0 margin_bottom = 109.0 [node name="save" type="Button" parent="menu"] diff --git a/scripts/game/local_storage.gd b/scripts/game/local_storage.gd index 2462b48..1979419 100644 --- a/scripts/game/local_storage.gd +++ b/scripts/game/local_storage.gd @@ -5,10 +5,12 @@ const FILE_PATH = "user://local_storage" func _ready(): TranslationServer.set_locale(read_value("locale","en")) - if read_value("server_addr") != null: - game_server.set_server_addr(read_value("server_addr")) - if read_value("api_addr") != null: - game_server.set_api_addr(read_value("api_addr")) + var server_addr = read_value("server_addr") + if server_addr != null && not server_addr.empty(): + game_server.set_server_addr(server_addr) + var api_addr = read_value("api_addr") + if api_addr != null && not api_addr.empty(): + game_server.set_api_addr(api_addr) func read_content(): diff --git a/scripts/menus/settings.gd b/scripts/menus/settings.gd index e20b9e1..bb67087 100644 --- a/scripts/menus/settings.gd +++ b/scripts/menus/settings.gd @@ -12,8 +12,8 @@ var locale func _ready(): get_node("menu/back").connect("pressed",self,"_on_back_pressed") find_node("bots").set_pressed(local_storage.read_value("bots", true)) - find_node("server_addr").set_text(local_storage.read_value("server_addr", game_server.SERVER_ADDR)) - find_node("api_addr").set_text(local_storage.read_value("api_addr", game_server.API_ADDR)) + find_node("server_addr").set_text(game_server.get_server_addr()) + find_node("api_addr").set_text(game_server.get_api_addr()) game_tab.set_name(tr("GAME")) controls_tab.set_name(tr("CONTROLS")) graphics_tab.set_name(tr("GRAPHICS")) @@ -61,15 +61,23 @@ func _on_locales_tree_exiting(): func _on_save_pressed(): var values = {} - values['player_name'] = player_settings.get_name_node().text + values['player_name'] = player_settings.get_name_node().get_text() values['player_color'] = player_settings.get_color_node().color.to_html() values['bots'] = find_node("bots").is_pressed() values['locale'] = locale - values['server_addr'] = find_node("server_addr").text - values['api_addr'] = find_node("api_addr").text + + var server_addr = find_node("server_addr").get_text() + if server_addr.empty(): + server_addr = game_server.SERVER_ADDR + values['server_addr'] = server_addr + + var api_addr = find_node("api_addr").get_text() + if api_addr.empty(): + api_addr = game_server.API_ADDR + values['api_addr'] = api_addr local_storage.write_values(values) - game_server.set_server_addr(local_storage.read_value("server_addr",game_server.SERVER_ADDR)) - game_server.set_api_addr(local_storage.read_value("api_addr",game_server.API_ADDR)) + game_server.set_server_addr(server_addr) + game_server.set_api_addr(api_addr) _on_back_pressed() diff --git a/scripts/networking/game_server.gd b/scripts/networking/game_server.gd index 26e1bcb..5f64801 100644 --- a/scripts/networking/game_server.gd +++ b/scripts/networking/game_server.gd @@ -32,6 +32,8 @@ func get_api_addr(): func set_api_addr(new_api_addr:String): + if not new_api_addr.ends_with("/"): + new_api_addr += "/" api_addr = new_api_addr diff --git a/scripts/networking/server.gd b/scripts/networking/server.gd index 14a3e52..4fab228 100644 --- a/scripts/networking/server.gd +++ b/scripts/networking/server.gd @@ -35,7 +35,7 @@ func _ready(): if err == OK: print(server_id + "New game hosted: port=" + str(port) + " secret=" + str(server_secret) + " bots=" + str(gamestate.bots) + " server-addr=" + game_server.get_server_addr() + " api-addr=" + game_server.get_api_addr()) else: - print(server_id + "Could not create Server! (port=" + str(port) + " secret=" + str(server_secret) + " server-addr=" + game_server.get_server_addr() + " api-addr=" + game_server.get_api_addr() + ")") + push_error(server_id + "Could not create Server! (port=" + str(port) + " secret=" + str(server_secret) + " server-addr=" + game_server.get_server_addr() + " api-addr=" + game_server.get_api_addr() + ")") quit_server()