From 3b63d4f42f254c9057d909a76472c36196a79e4c Mon Sep 17 00:00:00 2001 From: Lurkars Date: Wed, 24 Jul 2019 13:02:35 +0200 Subject: [PATCH] small fixes --- resources/ui/.~lock.i18n.csv# | 1 + resources/ui/i18n.csv | 2 ++ resources/ui/i18n.de.translation | Bin 3372 -> 3436 bytes resources/ui/i18n.en.translation | Bin 3101 -> 3161 bytes scenes/menus/SettingsMenu.tscn | 8 ++++---- scripts/game/local_storage.gd | 10 ++++++---- scripts/menus/settings.gd | 22 +++++++++++++++------- scripts/networking/game_server.gd | 2 ++ scripts/networking/server.gd | 2 +- 9 files changed, 31 insertions(+), 16 deletions(-) create mode 100644 resources/ui/.~lock.i18n.csv# 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 1d5cb449450ea47c0993207f6fb61f5f9204a71c..a9570404f31add3f777db6c00ae72e184418f39b 100644 GIT binary patch literal 3436 zcmbtXdu&tp6~1vGa~{Pdr5Pa&IHhC|LDMX21`7kl!wH1MWOmw>M@b#$Vmo&1)c2Z- zAfdD&Z4;tV*hX**QW!6dQrd>0rsA>Ds6bn(Wm+dnQZ}#C#Av6ILC2OwyWaO*-ygN2 z{|lNH77l@;k*Fmw-D%Er-$>Y7w{b5NG< zf!Q4O1Z33!m`PD1{*X86rg$R$b`@ZBA<-;MJ=!#yLvMs`G0wc(igSC4O{@cUC**lZA7l??0K#{J&_fW8#tJ!yv)JLM zcP={6ZIUDl@OvS5mVffAz0kZ%x$m=*6V=c;hQL*#EG^8t(T@WckM9Kj(Yr65TGHe6-8uef8E{e0w8c9P|Kl6#kRI(D?FBCGiTYl7{q2hdFxVr% z9)Zt(>uMoq&fMfc&b5w!RB6 z*fV=s<1obvVNd2?yZ_Yrl9c|1|F)NH4@6;*W7hV3@PLE6N6wfFE_w}%fA?$4+Xluu zziK&p7)sB}-1qhkjO~Y>%tzHPJQq3KYsl~)Ipmf>U-nO z{QLofH`X^bUtSr8&DqlrM_sa(b&pJk6Z>Y}0w4HG&E+6$&X_%kxD#Vrx0S(W?Uacv zPYo_dvtr-Gy+6l4{B8ws&Wt_$_u~h9*288j)*$#<^4kp$&Vj)^ly$cXD{e!JxvYO~ z`|Y12D1FGEsIRp8z@j?%vFB7g+LGA512}u8h}N z;No88$@W(}Q*4pV}$fdyV>7C!lzw7Lu^@~2|9^2Zy43`Rk&4bJ@d$zv| zTFg=S|NccsY%PpDyyIPg=Y9L>(SN}pr>S_k^ZRQij5ypCaeud?X5u$6CeQ!s?vbJe zC`#0KI>)zsItU^M6yaZA=zk^?_rzQTer&8`=v^3->;CtW7Z?5%{@kh5zY`-r3%k}J zPCjsoh~w>g*9QE=Vb&H`+TnVTK{(p zJ9RG6&htY@f%9j@1BNea>B>5Pq87o#yopgNUr@L2#6i?2@~u8-skjD%T$3;P=*=TH zU<*FPz46kkwft@cAM(vxN`?`SnD{$?`p(*UPr_zT{Qd`Xw`}-3wD?Y%derVy2+CdJ zdrRxN{nrtPF_@FJQjVL#FFXS+`~?1`_h#=B;G79_a3AJCc4Ox2qLJYJ+_l#Pv+?0e>3cM(E*x&hPbEon6-6}^C-S>1% zlkEP`CdnRBH%Xdfk9A>rwtfq#T9Lho~v| z8?vsDo1R`lkR&Jm&-x!R_el)^ literal 3372 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 A4*&oF literal 3101 zcmbtXX-rgC6uux*8AnlCN6`UiM2Q$Eb=MA+xC@p6h17_~;mynw24-X43i=AA>A92H$zfN3IdW>aZ5p$&kO4RJ>3xA4-$|SUnt;^ZEl}Ka@&GFo8pkY zGV7^b^GY6>#enh1iXs)u3VQ}193ivrFiX&#EhyRDGV1|o4>`)@ASbAj5)8P!#qD8= zBjEA}LAFn*gAQkUF+F`a)6>v+I-Qv|BMM@INDzA3@KB0g+%|AcJUvF>L6A|LpTPAL z=xlE1aa{;q#BGW#h3$tdhSX~KH(_t&_&p8(zQ#TTy9sgz(hB(jas@(pf8(0$Td?nP zOeanpJv!LEAO_Bvpp&`X?$Oqks=*^*kJDiCnFKt8b5^bkxGsb);x_p%gzeT~;wpfb zLaHFOkadu)5L!FLbyxImf*c2qgoa|}YtnXn1A}e`$^Fb9_sYPurj?8Y!wqLA{8t~Z zJ!yh3oi*hbG1ngb^m%b7{=;uruk=Q7J$&ijQXIt;6m*M7fuKckPaa4U zmurpO^eRBdc(u=o(?;-AUpw!z&6AApf(!2%^y}^&)?r9aXGwL$$7$Tx$772$ef{a& z(}3kC`_!v``yIMhq7R`bu6LY22O#!S^xbrkEv3h#(IwCw z`~3OZmm>yi_hg4qvfh9W?b$ej@(cTI;4B0QCN7_tnt1 z{PHbu6yHbVKXUfi+?RmG`H4L1tkWNtgQt0EUqv4m*IhDigA<)K-P2}$N#-If3O^B_ zli*sk3+uE$B!b^}XK@qtK%92&2jgo~AMm`|@5H6Iefjk72hB_(@)W=J!oehfj(ILE z=(=+j{Af?8j__xH#H@%ypW^)z^Rx_A*X)O%$a8A-)eU`tJDy8u`RS&=!PCs~5Rvya z-RVOWz~WvA-m)@SJsf~~pcqka=FZqL&jZuB(H_csZtt#x7WIYS!}N>Uw-HZ$(Amhh z?<#g+kzai0oA1vZlECMpT1Vq5=TC%_cu#Drf;Gc{DL-+srKh%C=j((;z5|iIl{1lt z@{-V*4}>fQXO|phEGrKO5FMQ{O=Y$&*#$b4Ic0mO*fiD3nsZcE>T`KndB_!HE6m0u zVlt|X**2A>B^$CcR^<;+!wYI@bgasvTT?7i?)5P@Rc1~#>*7>qH2=y#sVw|+D`Xg^ zGP^IRuwwf4<@W`G%&bes^2o%nS59uyQ*ZO{`6`>}mIFaE3*{*Wv}U$-QJI=&-aU4@ zS{9k_^?Cs(_pi=E88v^v^|lBz%kox8ZkN-Pl~*y!Bsrb@ws|`a!F?GhN{m4tT z77=)3O_5C>4pS!&1WZYdx-*H^l}aTjd)TUi!)cf#4Ib~|8+OA6`h^eUT^ z$_>N7ZBJQ%Cku!>i74&{^hKnIv4=cTSL z{H!W1qak`?3=ZWTUm^fYMg+Ip7pP7YU*I-hSZM6u9lg;EWX?&2)my&{f7=7HRK~E+ ltnSg_{8ro#vuEwDo@CWMO7i4(>kp?e$2bTd;%xlK;9nt^nOgt= 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()