From e9a17934e71d8e101090ed8a53c63473076cb0e8 Mon Sep 17 00:00:00 2001
From: AleaJactaEst <jean.sorgemoel.liber@free.fr>
Date: Sat, 12 Feb 2022 20:45:44 +0100
Subject: [PATCH] #5 - adding menu language & quit

---
 UI/labels.tscn                  |   4 +-
 locales/en.po                   |  31 +++++++++++++
 locales/fr.po                   |  31 +++++++++++++
 locales/locale.sh               |  27 ++++++++++++
 locales/messages.mo             | Bin 0 -> 3190 bytes
 locales/messages.pot            |  21 +++++++++
 main.tscn                       |  11 -----
 player/player.gd                |   8 ++--
 project.godot                   |  12 ++++-
 scenes/hud/hud.gd               |  27 ++++++++++++
 scenes/hud/hud.tscn             |  75 ++++++++++++++++++++++++++++++++
 scenes/languages/languages.gd   |  44 +++++++++++++++++++
 scenes/languages/languages.tscn |  37 ++++++++++++++++
 scenes/main/main.tscn           |  14 ++++++
 14 files changed, 324 insertions(+), 18 deletions(-)
 create mode 100644 locales/en.po
 create mode 100644 locales/fr.po
 create mode 100755 locales/locale.sh
 create mode 100644 locales/messages.mo
 create mode 100644 locales/messages.pot
 delete mode 100644 main.tscn
 create mode 100644 scenes/hud/hud.gd
 create mode 100644 scenes/hud/hud.tscn
 create mode 100644 scenes/languages/languages.gd
 create mode 100644 scenes/languages/languages.tscn
 create mode 100644 scenes/main/main.tscn

diff --git a/UI/labels.tscn b/UI/labels.tscn
index 718df6a..943c7f9 100644
--- a/UI/labels.tscn
+++ b/UI/labels.tscn
@@ -1,6 +1,6 @@
-[gd_scene load_steps=4 format=3]
+[gd_scene load_steps=4 format=3 uid="uid://cfld6w0cve6gw"]
 
-[ext_resource type="Texture2D" path="res://UI/textures/marker.png" id="1_2jmfe"]
+[ext_resource type="Texture2D" uid="uid://buv7yoovo0sw" path="res://UI/textures/marker.png" id="1_2jmfe"]
 [ext_resource type="Script" path="res://UI/labels.gd" id="1_4t0l0"]
 
 [sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_4fvmj"]
diff --git a/locales/en.po b/locales/en.po
new file mode 100644
index 0000000..5885d1f
--- /dev/null
+++ b/locales/en.po
@@ -0,0 +1,31 @@
+# Don't remove the two lines below, they're required for gettext to work correctly.
+msgid ""
+msgstr ""
+"Project-Id-Version: khanat-client 1\n"
+"PO-Revision-Date: 1\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Echap = Menu"
+msgstr "Echap to show menu"
+
+msgid "Keys"
+msgstr "Control"
+
+msgid "Languages"
+msgstr "Languages"
+
+msgid "Language"
+msgstr "Language"
+
+msgid "Select Language"
+msgstr "Select your language"
+
+msgid "Quit"
+msgstr "Exit"
+
diff --git a/locales/fr.po b/locales/fr.po
new file mode 100644
index 0000000..de844ca
--- /dev/null
+++ b/locales/fr.po
@@ -0,0 +1,31 @@
+# Don't remove the two lines below, they're required for gettext to work correctly.
+msgid ""
+msgstr ""
+"Project-Id-Version: khanat-client 1\n"
+"PO-Revision-Date: 1\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+msgid "Echap = Menu"
+msgstr "Appuyer sur Echap pour faire appaître le menu"
+
+msgid "Keys"
+msgstr "Contrôles"
+
+msgid "Languages"
+msgstr "Langues"
+
+msgid "Language"
+msgstr "Langue"
+
+msgid "Select language"
+msgstr "Sélectionner votre langue"
+
+msgid "Quit"
+msgstr "Sortir"
+
diff --git a/locales/locale.sh b/locales/locale.sh
new file mode 100755
index 0000000..a73a9c5
--- /dev/null
+++ b/locales/locale.sh
@@ -0,0 +1,27 @@
+*#!/bin/bash
+WORKDIR="$(dirname $(readlink -f $0))"
+
+function generate_locale()
+{
+	echo "--- Begin : $1"
+	if [ -f $1.po ] 
+	then
+		msgmerge --update --backup=none $1.po messages.pot
+	else
+		msginit --no-translator --input=messages.pot --locale=$1
+	fi
+	echo "--- Check : $1"
+	msgfmt $1.po --check
+	echo "--- End : $1"
+}
+ORIGIN=$PWD
+cd $WORKDIR
+#######################
+# LIST LANGUAGE : START
+#######################
+generate_locale fr
+generate_locale en
+######################
+# LIST LANGUAGE : END
+######################
+cd $ORIGIN
diff --git a/locales/messages.mo b/locales/messages.mo
new file mode 100644
index 0000000000000000000000000000000000000000..4108bf8564052540ba97b092090e1b3f45692f5a
GIT binary patch
literal 3190
zcmai#O>Epm6vqcBl%`Oi(DGHlrC&*5o2Gn~R6#hqv#E*K-mdL@6bZ}Oog}7SJNP4M
zDue_V4t(5NBoL@bJ-`(tkPs3#!~t<b0#TI%mkJ~<2#G@__&<BHA0=r=di(Qx^Ze$`
zn>XG|+c%wM7*9iXLB79%F%5k6Cj4NW-^AEM;Kv}%e*-=UUIcFe{{aWUf5ENbz|D-^
z2JQrJ2lq&QMDjUlpOpG6cqjbk!F#|JIsZ1e1^WBocJKnY4g6B_TWS9hr1dU?cY}X}
z6mJWXBmDvJF7OaY@t+6xf(}T2XXN}_a{fbb2kf7LkAmMx{sHcWzHKvNf``F9;3T*o
zjHG@JRG@za(mKC@6p!6n*mr_d&u66WfR8|52C2U1z(MeHX}<^_gnk92bq=5?v|j^6
zO6*0+IdC)1&If5<ui#MVT;9MBOza(y{NI!Ik3fp^DM<VJ0z~Q9PauwxU6TAw+AmA}
zPY|iFzd(BbiqyB@@M)dxAkFUrDb7C0gVH_>(tAfil!kHeMzALJI!JlUNc&45otr21
zWsu^oO8qsE{9gxYe{V{@EA3}N^8Wy&mOd|e0i^!;1f>4>8pKxE4<N<+S?a%nbbh}}
zosy@0ZUt$*9U%4RE@>YIDc@&7ItK%!dbl9@FG@xrjw>HK@%t3yV4>!D-H&I=d+lD*
z)L{tSDH@MKh9Oit%143FptWhAPeSOP-Up$6+Yh+|Lb>*iy-<(}I|Lbmj6l}L5j@Zy
zXgmR-y3lwSf^zf?+9TDe1fhFFwH$;{Z_|CD9-~2Lz7KK$axa9&;|22i(4C@tPJ_;c
zl^a~Ood$RF2hB9x@^MoubGM<E`8u;ztzp@&q1M)$)YZ<M7dAz}dc0q7Ci%EI<EoVk
z>pVNQ*->harImX$n|Bn0&)6NMt~yqCs;;ZE-Khqj(oDzd7%bB<DlV^9dAS?F)@+@#
zZmu;|Gu#?C9Jj7o*0kBEupSe|@2V#p&F)c=Nh7a?Ay$-TEW9*}1vBe56;d;*rmH&k
zakF9d+4u~C^g8J%xPeXe+KMctMOTdpN1fnq@2ef7#dYk@oi&|?yJlRAW$<aM@2%X>
z7u@2utr-*jZXIJ@!nJ7qR#)d!Twg1%Om$tC3Edo5^=n2cj(`0iH3!YG{#3DdDmOLO
z^?WL*)OA9+74#5VfBjH-jjxqz?$Al<e^I8i3OCocy5s0P-q5+#>6T6{^Vg7BRdw`E
z>s&Qkb#&drE#}4s@f+OIPO9VR{j2v@gumv?#iVOCG;Y``_4h_mw3FPen#M+HPHRTR
zoOV@xTAj6AoSSXdHwYzNYwC<vL)6ak7Twzr?PysrO9Y~svU(i743@N3X-dS2ABCgJ
zsYNgJ(o!?<MVKlh19h|15X(MImMUH<Mq$&vBrVyo7bbz1M)9bkW@*&+Qord1!K$(#
zLJ`BY1;=n9^A<$O7G8T)38PSSY@><@2Wnc4ch?>{ba<c~g(+4p*{e%fD;1~H;ibUy
z!(&Qw(Tfw2jyZO<bhPV7Y0Qhb#KUIP^23Eu<>;KB4%CAz_JUG1irWcRUdq*E?8q^t
zcpMuHmEB{?$k4F?R$h$!rchR+ELLK#DOlBylT-=4wqUf^;;Ae@&)qq-)l%A7;x`AA
zAy%UYSw3ZuDl()*aS=3kDm?I;3T9wmtnOurVD-RT#Yv#XQI;?(%EFc+=I7~r=##JD
z``?p9-Aj^{C~g(6oyh!@If;n#RQtZCNMJFF6J|~_9h(cWk~$Y<DKk&W<1bPR<Pni0
z0^~2`Nibd{F%d*_UeKF7w#_Q|qbj;cLC~cvRlKa_N60h_n~S}>o~5c51(@<%B4Xo6
zU&Mh(5=5EzvLIEOQ8@1};J{L}8LMVNkl>F&gsdSF|BN>mpk)g~0Th<nvv8kB$0%?U
pY}yZ7(Td^)E8c3NM4^&KOKhbuw!PDS8%`~xou=rM1i^bR!+$9kz%Kv*

literal 0
HcmV?d00001

diff --git a/locales/messages.pot b/locales/messages.pot
new file mode 100644
index 0000000..900dec7
--- /dev/null
+++ b/locales/messages.pot
@@ -0,0 +1,21 @@
+# Don't remove the two lines below, they're required for gettext to work correctly.
+msgid ""
+msgstr ""
+
+msgid "Echap = Menu"
+msgstr ""
+
+msgid "Keys"
+msgstr ""
+
+msgid "Languages"
+msgstr ""
+
+msgid "Language"
+msgstr ""
+
+msgid "Select language"
+msgstr ""
+
+msgid "Quit"
+msgstr ""
diff --git a/main.tscn b/main.tscn
deleted file mode 100644
index 33b3d96..0000000
--- a/main.tscn
+++ /dev/null
@@ -1,11 +0,0 @@
-[gd_scene load_steps=3 format=3 uid="uid://cem7wppuuoabv"]
-
-[ext_resource type="PackedScene" uid="uid://cvdmfc2hi172g" path="res://maps/basic_setup.tscn" id="1_s50i7"]
-[ext_resource type="PackedScene" uid="uid://dwxrvijqyym70" path="res://player/player.tscn" id="2_bge2k"]
-
-[node name="main_scene" type="Node3D"]
-
-[node name="player" parent="." instance=ExtResource( "2_bge2k" )]
-transform = Transform3D(0.750872, 0, -0.660447, 0, 1, 0, 0.660447, 0, 0.750872, -3.68624, 0, -17.6199)
-
-[node name="terrain_basic_setup" parent="." instance=ExtResource( "1_s50i7" )]
diff --git a/player/player.gd b/player/player.gd
index 00935fd..e902321 100644
--- a/player/player.gd
+++ b/player/player.gd
@@ -418,10 +418,10 @@ func _physics_process_walk(delta):
 
 	var collided = move_and_slide()
 
-	if is_on_floor():
-		print("is_on_floor")
-	else:
-		print("not is_on_floor")
+#	if is_on_floor():
+#		print("iZs_on_floor")
+#	else:
+#		print("not is_on_floor")
 	if collided and is_on_floor() and (input_x != 0.0 or input_y != 0.0) and $RayCastGround.is_colliding() and !$RayCastStep.is_colliding():
 		var delta_1:Vector3 = get_position_delta()
 		var areawalk = delta_1.x * delta_1.x + delta_1.z * delta_1.z
diff --git a/project.godot b/project.godot
index 4f8b0d2..9fc59f2 100644
--- a/project.godot
+++ b/project.godot
@@ -11,7 +11,7 @@ config_version=5
 [application]
 
 config/name="Third Person basic scene"
-run/main_scene="res://main.tscn"
+run/main_scene="res://scenes/main/main.tscn"
 config/icon="res://icon.png"
 config/features=PackedStringArray("4.0", "Vulkan Clustered")
 
@@ -45,6 +45,12 @@ ui_down={
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"store_command":true,"alt_pressed":false,"shift_pressed":false,"meta_pressed":false,"command_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"unicode":0,"echo":false,"script":null)
 ]
 }
+ui_menu={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"store_command":true,"alt_pressed":false,"shift_pressed":false,"meta_pressed":false,"command_pressed":false,"pressed":false,"keycode":16777262,"physical_keycode":0,"unicode":16777262,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"store_command":true,"alt_pressed":false,"shift_pressed":false,"meta_pressed":false,"command_pressed":false,"pressed":false,"keycode":16777217,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
+]
+}
 ui_strafe={
 "deadzone": 0.5,
 "events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"store_command":true,"alt_pressed":false,"shift_pressed":false,"meta_pressed":false,"command_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":1,"pressed":false,"double_click":false,"script":null)
@@ -80,3 +86,7 @@ switch_state_player={
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"store_command":true,"alt_pressed":false,"shift_pressed":false,"meta_pressed":false,"command_pressed":false,"pressed":false,"keycode":67,"physical_keycode":0,"unicode":99,"echo":false,"script":null)
 ]
 }
+
+[internationalization]
+
+locale/translations=PackedStringArray("res://locales/en.po", "res://locales/fr.po")
diff --git a/scenes/hud/hud.gd b/scenes/hud/hud.gd
new file mode 100644
index 0000000..57f61e2
--- /dev/null
+++ b/scenes/hud/hud.gd
@@ -0,0 +1,27 @@
+extends Control
+
+
+func _input(event):
+	if Input.is_action_pressed("ui_menu"):
+		$Menu.visible = ! $Menu.visible
+
+
+func _on_timer_timeout():
+	print("fin")
+	$Message/Label.visible = false
+
+
+func _on_quit_pressed():
+	#get_tree().quit()
+	$ConfirmQuit.popup_centered()
+	$ConfirmQuit.visible = true
+	pass
+
+
+func _on_confirmation_dialog_confirmed():
+	get_tree().quit()
+
+
+func _on_languages_pressed():
+	$MenuOption/Window.popup_centered()
+	$MenuOption/Window.visible = true
diff --git a/scenes/hud/hud.tscn b/scenes/hud/hud.tscn
new file mode 100644
index 0000000..be587e2
--- /dev/null
+++ b/scenes/hud/hud.tscn
@@ -0,0 +1,75 @@
+[gd_scene load_steps=3 format=3 uid="uid://cdyi1a858p7em"]
+
+[ext_resource type="Script" path="res://scenes/hud/hud.gd" id="1_s6f6d"]
+[ext_resource type="PackedScene" uid="uid://dpvequp5fv27k" path="res://scenes/languages/languages.tscn" id="2_um8fw"]
+
+[node name="Control" type="Control"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+script = ExtResource( "1_s6f6d" )
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Message" type="HBoxContainer" parent="."]
+anchor_right = 1.0
+size_flags_horizontal = 0
+size_flags_vertical = 0
+alignment = 2
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Label" type="Label" parent="Message"]
+offset_left = 917.0
+offset_right = 1024.0
+offset_bottom = 26.0
+size_flags_vertical = 1
+text = "Echap = Menu"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Menu" type="HBoxContainer" parent="."]
+visible = false
+anchor_right = 1.0
+offset_right = 40.0
+offset_bottom = 40.0
+alignment = 1
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Keys" type="Button" parent="Menu"]
+offset_left = 444.0
+offset_right = 488.0
+offset_bottom = 40.0
+text = "Keys"
+
+[node name="Languages" type="Button" parent="Menu"]
+offset_left = 492.0
+offset_right = 574.0
+offset_bottom = 40.0
+text = "Languages"
+
+[node name="Quit" type="Button" parent="Menu"]
+offset_left = 578.0
+offset_right = 619.0
+offset_bottom = 40.0
+text = "Quit"
+
+[node name="Timer" type="Timer" parent="."]
+wait_time = 10.0
+one_shot = true
+autostart = true
+
+[node name="ConfirmQuit" type="ConfirmationDialog" parent="."]
+dialog_text = "Do you want quit?"
+
+[node name="MenuOption" parent="." instance=ExtResource( "2_um8fw" )]
+visible = false
+
+[connection signal="pressed" from="Menu/Languages" to="." method="_on_languages_pressed"]
+[connection signal="pressed" from="Menu/Quit" to="." method="_on_quit_pressed"]
+[connection signal="timeout" from="Timer" to="." method="_on_timer_timeout"]
+[connection signal="confirmed" from="ConfirmQuit" to="." method="_on_confirmation_dialog_confirmed"]
diff --git a/scenes/languages/languages.gd b/scenes/languages/languages.gd
new file mode 100644
index 0000000..6eff9ee
--- /dev/null
+++ b/scenes/languages/languages.gd
@@ -0,0 +1,44 @@
+extends Control
+
+# Called when the node enters the scene tree for the first time.
+func _ready():
+	$Window/VBoxContainer/Select.clear()
+	var id = 0
+	var selected = -1
+	var near_selected = -1
+	var current_locale = TranslationServer.get_locale()
+	var root_language = current_locale.split('_')[0]
+	for key in TranslationServer.get_loaded_locales():
+		if key == TranslationServer.get_locale():
+			selected = id
+		else:
+			var tmp = key.split("_")
+			# print("tmp:" + tmp[0])
+			if tmp[0] == root_language:
+				if tmp.size() == 1:
+					near_selected = id
+				elif near_selected == -1:
+					near_selected = id
+		$Window/VBoxContainer/Select.add_item(TranslationServer.get_locale_name(key) + " [" + key + "]", id)
+		id += 1
+	if selected == -1 and near_selected != -1:
+		selected = near_selected
+	if selected == -1:
+		# Your language not exist, create it just for the form
+		var key = TranslationServer.get_locale()
+		$Window/VBoxContainer/Select.add_item(TranslationServer.get_locale_name(key) + " (" + key + " !)", id)
+		selected = id
+	$Window/VBoxContainer/Select.select(selected)
+
+
+func _on_select_item_selected(index):
+	var pos = 0
+	for key in TranslationServer.get_loaded_locales():
+		if pos == $Window/VBoxContainer/Select.get_selected():
+			TranslationServer.set_locale(key)
+			return
+		pos += 1
+
+
+func _on_quit_pressed():
+	$Window.visible = false
diff --git a/scenes/languages/languages.tscn b/scenes/languages/languages.tscn
new file mode 100644
index 0000000..9b143b3
--- /dev/null
+++ b/scenes/languages/languages.tscn
@@ -0,0 +1,37 @@
+[gd_scene load_steps=2 format=3 uid="uid://dpvequp5fv27k"]
+
+[ext_resource type="Script" path="res://scenes/languages/languages.gd" id="1_qc7c5"]
+
+[node name="Control" type="Control"]
+script = ExtResource( "1_qc7c5" )
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Window" type="Window" parent="."]
+title = "Language"
+visible = false
+
+[node name="VBoxContainer" type="VBoxContainer" parent="Window"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_right = 40.0
+offset_bottom = 40.0
+
+[node name="Label" type="Label" parent="Window/VBoxContainer"]
+offset_right = 40.0
+offset_bottom = 23.0
+text = "Select language"
+
+[node name="Select" type="OptionButton" parent="Window/VBoxContainer"]
+offset_right = 43.0
+offset_bottom = 31.0
+
+[node name="Quit" type="Button" parent="Window/VBoxContainer"]
+offset_top = 35.0
+offset_right = 43.0
+offset_bottom = 66.0
+text = "Quit"
+
+[connection signal="item_selected" from="Window/VBoxContainer/Select" to="." method="_on_select_item_selected"]
+[connection signal="pressed" from="Window/VBoxContainer/Quit" to="." method="_on_quit_pressed"]
diff --git a/scenes/main/main.tscn b/scenes/main/main.tscn
new file mode 100644
index 0000000..2b87e66
--- /dev/null
+++ b/scenes/main/main.tscn
@@ -0,0 +1,14 @@
+[gd_scene load_steps=4 format=3 uid="uid://cem7wppuuoabv"]
+
+[ext_resource type="PackedScene" uid="uid://dwxrvijqyym70" path="res://player/player.tscn" id="1_btdsd"]
+[ext_resource type="PackedScene" uid="uid://cvdmfc2hi172g" path="res://maps/basic_setup.tscn" id="2_jj4oa"]
+[ext_resource type="PackedScene" uid="uid://cdyi1a858p7em" path="res://scenes/hud/hud.tscn" id="3_5vcj4"]
+
+[node name="main_scene" type="Node3D"]
+
+[node name="player" parent="." instance=ExtResource( "1_btdsd" )]
+transform = Transform3D(0.750872, 0, -0.660447, 0, 1, 0, 0.660447, 0, 0.750872, -3.68624, 0, -17.6199)
+
+[node name="terrain_basic_setup" parent="." instance=ExtResource( "2_jj4oa" )]
+
+[node name="Control" parent="." instance=ExtResource( "3_5vcj4" )]