From 2350c98af91636f1dfd7a89e3d4e782cad4da74d Mon Sep 17 00:00:00 2001 From: AleaJactaEst Date: Sun, 6 Mar 2022 18:15:34 +0100 Subject: [PATCH] update windows to configure control #3 --- locales/en.po | 116 +++++++++++++++++++++++++++++++ locales/fr.po | 111 +++++++++++++++++++++++++++++ locales/messages.mo | Bin 1361 -> 2080 bytes locales/messages.pot | 111 +++++++++++++++++++++++++++++ project.godot | 127 ++++++++++++++++++++++++++++++++++ scenes/controls/controls.gd | 100 +++++++++++++++++++++++++- scenes/controls/controls.tscn | 22 ++++++ start-khanat-client.sh | 12 +++- 8 files changed, 595 insertions(+), 4 deletions(-) diff --git a/locales/en.po b/locales/en.po index e18da8e..5fe279d 100644 --- a/locales/en.po +++ b/locales/en.po @@ -113,3 +113,119 @@ msgstr "Please select your button mouse" msgid "OPTION_DEFINE_INPUT/MESSAGE_JOYPAD" msgstr "Please select your button joypad" +msgid "INPUT_ACTION_UP" +msgstr "" + +msgid "INPUT_ACTION_DOWN" +msgstr "" + +msgid "INPUT_ACTION_LEFT" +msgstr "" + +msgid "INPUT_ACTION_RIGHT" +msgstr "" + +msgid "INPUT_ACTION_STRAFE_LEFT" +msgstr "" + +msgid "INPUT_ACTION_STRAFE_RIGHT" +msgstr "" + +msgid "INPUT_ACTION_RUN" +msgstr "" + +msgid "INPUT_ACTION_AUTO_UP" +msgstr "" + +msgid "INPUT_ACTION_SIT_DOWN" +msgstr "" + +msgid "INPUT_ACTION_FLY" +msgstr "" + +msgid "INPUT_ACTION_ENTER_VEHICLE" +msgstr "" + +msgid "INPUT_VIEW_CAMERA_LEFT" +msgstr "" + +msgid "INPUT_VIEW_CAMERA_RIGHT" +msgstr "" + +msgid "INPUT_VIEW_CAMERA_UP" +msgstr "" + +msgid "INPUT_VIEW_CAMERA_DOWN" +msgstr "" + +msgid "INPUT_VIEW_UP" +msgstr "" + +msgid "INPUT_VIEW_DOWN" +msgstr "" + +msgid "INPUT_VIEW_FRONT" +msgstr "" + +msgid "INPUT_VIEW_BACK" +msgstr "" + +msgid "INPUT_VIEW_CAMERA_FPS_TPS" +msgstr "" + +msgid "INPUT_VIEW_SCREENSHOT" +msgstr "" + +msgid "INPUT_VIEW_ZOOM_IN" +msgstr "" + +msgid "INPUT_VIEW_ZOOM_OUT" +msgstr "" + +msgid "CONTROL_VIEW_BY_GROUP" +msgstr "" + +#, fuzzy +msgid "CONTROL_VIEW_BY_INPUT" +msgstr "Sort by input" + +msgid "CONTROL_VIEW_BY_INPUT_SORTED" +msgstr "" + +#, fuzzy +msgid "CONTROL_INPUT_ACTION" +msgstr "Cancel" + +#, fuzzy +msgid "CONTROL_INPUT_VIEW" +msgstr "Cancel" + +#, fuzzy +msgid "CONTROL_INPUT_OTHER" +msgstr "Cancel" + +#, fuzzy +msgid "CONTROL_ADD_INPUT" +msgstr "Sort by input" + +#, fuzzy +msgid "CONTROL_DEL_INPUT" +msgstr "Cancel" + +msgid "BUTTON_RIGHT" +msgstr "" + +msgid "BUTTON_LEFT" +msgstr "" + +msgid "BUTTON_WHEEL_UP" +msgstr "" + +msgid "BUTTON_WHEEL_DOWN" +msgstr "" + +msgid "INPUT_VIEW_CAMERA_MOVE_PLAYER_FOLLOW" +msgstr "" + +msgid "INPUT_VIEW_CAMERA_MOVE_ONLY" +msgstr "" diff --git a/locales/fr.po b/locales/fr.po index 8f617c0..98f4cab 100644 --- a/locales/fr.po +++ b/locales/fr.po @@ -112,3 +112,114 @@ msgstr "Merci d'appuyer sur un bouton de la souris" msgid "OPTION_DEFINE_INPUT/MESSAGE_JOYPAD" msgstr "Merci d'appuyer sur un bouton de votre manette de jeux" + +msgid "INPUT_ACTION_UP" +msgstr "En avant" + +msgid "INPUT_ACTION_DOWN" +msgstr "En arrière" + +msgid "INPUT_ACTION_LEFT" +msgstr "Tourner à gauche" + +msgid "INPUT_ACTION_RIGHT" +msgstr "Tourner à droite" + +msgid "INPUT_ACTION_STRAFE_LEFT" +msgstr "Déplacement latéral à gauche" + +msgid "INPUT_ACTION_STRAFE_RIGHT" +msgstr "Déplacement latéral à droite" + +msgid "INPUT_ACTION_RUN" +msgstr "Courir/Marcher" + +msgid "INPUT_ACTION_AUTO_UP" +msgstr "Marche auto" + +msgid "INPUT_ACTION_SIT_DOWN" +msgstr "S'asseoir/se lever" + +msgid "INPUT_ACTION_FLY" +msgstr "Voler" + +msgid "INPUT_ACTION_ENTER_VEHICLE" +msgstr "Monter/Descendre d'un véhicule" + +msgid "INPUT_VIEW_CAMERA_LEFT" +msgstr "Caméra sur axe vertical, gauche" + +msgid "INPUT_VIEW_CAMERA_RIGHT" +msgstr "Caméra sur axe vertical, droite" + +msgid "INPUT_VIEW_CAMERA_UP" +msgstr "Caméra sur axe horizontal, haut" + +msgid "INPUT_VIEW_CAMERA_DOWN" +msgstr "Caméra sur axe horizontal, bas" + +msgid "INPUT_VIEW_UP" +msgstr "Centre de l'axe plus bas" + +msgid "INPUT_VIEW_DOWN" +msgstr "Centre de l'axe plus haut" + +msgid "INPUT_VIEW_FRONT" +msgstr "Recentrer la caméra derrière le personnage" + +msgid "INPUT_VIEW_BACK" +msgstr "Regarder derrière soi" + +msgid "INPUT_VIEW_CAMERA_FPS_TPS" +msgstr "1ère/3ème personne" + +msgid "INPUT_VIEW_SCREENSHOT" +msgstr "Capture d'écran" + +msgid "INPUT_VIEW_ZOOM_IN" +msgstr "Zoommer" + +msgid "INPUT_VIEW_ZOOM_OUT" +msgstr "Dézoomer" + +msgid "CONTROL_VIEW_BY_GROUP" +msgstr "Afficher par groupe" + +msgid "CONTROL_VIEW_BY_INPUT" +msgstr "Afficher par entrée" + +msgid "CONTROL_VIEW_BY_INPUT_SORTED" +msgstr "Trié par rapport aux entrées" + +msgid "CONTROL_INPUT_ACTION" +msgstr "Action" + +msgid "CONTROL_INPUT_VIEW" +msgstr "Vue" + +msgid "CONTROL_INPUT_OTHER" +msgstr "Autre" + +msgid "CONTROL_ADD_INPUT" +msgstr "Ajouter" + +msgid "CONTROL_DEL_INPUT" +msgstr "Supprimer" + +msgid "BUTTON_RIGHT" +msgstr "Bouton droit de la souris" + +msgid "BUTTON_LEFT" +msgstr "Bouton gauche de la souris" + +msgid "BUTTON_WHEEL_UP" +msgstr "Molette souris vers avant" + +msgid "BUTTON_WHEEL_DOWN" +msgstr "Molette souris vers arrière" + +msgid "INPUT_VIEW_CAMERA_MOVE_PLAYER_FOLLOW" +msgstr "Déplacer la caméra et le joueur suit" + +msgid "INPUT_VIEW_CAMERA_MOVE_ONLY" +msgstr "Déplacer la caméra seulement" diff --git a/locales/messages.mo b/locales/messages.mo index 753785be7c5af7cf53ed278a0dc761821b1a96a2..33beb0addda8261f2a34695e0c6cbda59c30c7a4 100644 GIT binary patch literal 2080 zcma)*&yU+g6vtz9efsi06q^s%*V%%F;>F(G>C_-;zfRI;7RZzNU2=`Y2Ww23!n$CfeA=) zKLcL@zXd7ZA3*Z|1EjoHp2_zI&tbdcD|k_zCqY_w7KDkN2l22qyeRJ5 zAo*PeNskIhepQfzHc0hLkaW2VlHZpg<@*&#@xRXbJxK9>1}V>9a{dXD|34t*eG0)L z0b2zjM|xHi=S6gCR69o}A8Hhv_Qmn0jqcdtMt6$#r!%DeskYbADc5y$YIJ^dW=J7D zBY-_eFEpx|+RNxKpwk&I+gtc}Garz~R4-{p^|89!@w;v-=s7K??g#$BbILc|fmgE& zO*_t@aK7#KdrqNcx8L*&4Sv&aVTn*f88OFh`azycIbCvOrt7ranjQ28J>O}QU!%Ew zbWP9g`oXn9(Cm19|EMVoY+sQ_0aI*W?oi^rn z^-V0Xnj`B&87HAu6@F`9C}FH&6iQ|IX32A{uKYM8 zqh$*tE0}AE#8`eTR1yiJ;|j0Mjh+e<4n-6#_(Uoh!*vA5?3^rLifM%_t>nR6g-cax zH`~sm*qa-dOLeUbB3u4qhFC`4G38k#Lbb(lVd6xZYTs{IS0DLN8e=kc{uoP9ksax7VjV3_&Yj1e%n|XOQE2!=&*Os)vVXy7p6u(}d`f==$v}HA6--!q z@cF_0*Luhe7cT#Yy-12g@+7+!X~4a#(3@GI1rE35f)z~X>!zs^h+xZcsAPVbY)#eh g+XDCHBizmpmOCKJaTrfGHa6H3v^kXC|Gv8HUwk~(-~a#s delta 550 zcmYk(u}Z^09LMp0Y?`#S)wF3si++(z%E9A|c!w(J9%(k9(~F0w`y2-f&o&O6P1KiaVTJu|n*q)C==9Z9-2$o5hD)SQtRnOr2m6b8 xXN1~Fp@MW66&RC>2C0*)I2HOo%Bn>FMgKoN%{`}HJ|4{c6EA%VuF}V_`wQ3eD5(Gd diff --git a/locales/messages.pot b/locales/messages.pot index b59cccf..cafe1e0 100644 --- a/locales/messages.pot +++ b/locales/messages.pot @@ -104,3 +104,114 @@ msgstr "" msgid "OPTION_DEFINE_INPUT/MESSAGE_JOYPAD" msgstr "" +msgid "INPUT_ACTION_UP" +msgstr "" + +msgid "INPUT_ACTION_DOWN" +msgstr "" + +msgid "INPUT_ACTION_LEFT" +msgstr "" + +msgid "INPUT_ACTION_RIGHT" +msgstr "" + +msgid "INPUT_ACTION_STRAFE_LEFT" +msgstr "" + +msgid "INPUT_ACTION_STRAFE_RIGHT" +msgstr "" + +msgid "INPUT_ACTION_RUN" +msgstr "" + +msgid "INPUT_ACTION_AUTO_UP" +msgstr "" + +msgid "INPUT_ACTION_SIT_DOWN" +msgstr "" + +msgid "INPUT_ACTION_FLY" +msgstr "" + +msgid "INPUT_ACTION_ENTER_VEHICLE" +msgstr "" + +msgid "INPUT_VIEW_CAMERA_LEFT" +msgstr "" + +msgid "INPUT_VIEW_CAMERA_RIGHT" +msgstr "" + +msgid "INPUT_VIEW_CAMERA_UP" +msgstr "" + +msgid "INPUT_VIEW_CAMERA_DOWN" +msgstr "" + +msgid "INPUT_VIEW_UP" +msgstr "" + +msgid "INPUT_VIEW_DOWN" +msgstr "" + +msgid "INPUT_VIEW_FRONT" +msgstr "" + +msgid "INPUT_VIEW_BACK" +msgstr "" + +msgid "INPUT_VIEW_CAMERA_FPS_TPS" +msgstr "" + +msgid "INPUT_VIEW_SCREENSHOT" +msgstr "" + +msgid "INPUT_VIEW_ZOOM_IN" +msgstr "" + +msgid "INPUT_VIEW_ZOOM_OUT" +msgstr "" + +msgid "CONTROL_VIEW_BY_GROUP" +msgstr "" + +msgid "CONTROL_VIEW_BY_INPUT" +msgstr "" + +msgid "CONTROL_VIEW_BY_INPUT_SORTED" +msgstr "" + +msgid "CONTROL_INPUT_ACTION" +msgstr "" + +msgid "CONTROL_INPUT_VIEW" +msgstr "" + +msgid "CONTROL_INPUT_OTHER" +msgstr "" + +msgid "CONTROL_ADD_INPUT" +msgstr "" + +msgid "CONTROL_DEL_INPUT" +msgstr "" + +msgid "BUTTON_RIGHT" +msgstr "" + +msgid "BUTTON_LEFT" +msgstr "" + +msgid "BUTTON_WHEEL_UP" +msgstr "" + +msgid "BUTTON_WHEEL_DOWN" +msgstr "" + +msgid "INPUT_VIEW_CAMERA_MOVE_PLAYER_FOLLOW" +msgstr "" + +msgid "INPUT_VIEW_CAMERA_MOVE_ONLY" +msgstr "" + diff --git a/project.godot b/project.godot index 0049803..6be860c 100644 --- a/project.godot +++ b/project.godot @@ -101,6 +101,133 @@ board_ship={ "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":70,"physical_keycode":0,"unicode":0,"echo":false,"script":null) ] } +INPUT_ACTION_UP={ +"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":87,"physical_keycode":0,"unicode":0,"echo":false,"script":null) +] +} +INPUT_ACTION_DOWN={ +"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":83,"physical_keycode":0,"unicode":0,"echo":false,"script":null) +] +} +INPUT_ACTION_LEFT={ +"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":65,"physical_keycode":0,"unicode":0,"echo":false,"script":null) +] +} +INPUT_ACTION_RIGHT={ +"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":68,"physical_keycode":0,"unicode":0,"echo":false,"script":null) +] +} +INPUT_ACTION_STRAFE_LEFT={ +"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":81,"physical_keycode":0,"unicode":0,"echo":false,"script":null) +] +} +INPUT_ACTION_STRAFE_RIGHT={ +"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":69,"physical_keycode":0,"unicode":0,"echo":false,"script":null) +] +} +INPUT_ACTION_RUN={ +"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":16777224,"physical_keycode":0,"unicode":0,"echo":false,"script":null) +] +} +INPUT_ACTION_AUTO_UP={ +"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":82,"physical_keycode":0,"unicode":0,"echo":false,"script":null) +] +} +INPUT_ACTION_SIT_DOWN={ +"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":16777223,"physical_keycode":0,"unicode":0,"echo":false,"script":null) +] +} +INPUT_ACTION_FLY={ +"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":70,"physical_keycode":0,"unicode":0,"echo":false,"script":null) +] +} +INPUT_ACTION_ENTER_VEHICLE={ +"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":88,"physical_keycode":0,"unicode":0,"echo":false,"script":null) +] +} +INPUT_VIEW_CAMERA_LEFT={ +"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":16777231,"physical_keycode":0,"unicode":0,"echo":false,"script":null) +] +} +INPUT_VIEW_CAMERA_RIGHT={ +"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":16777233,"physical_keycode":0,"unicode":0,"echo":false,"script":null) +] +} +INPUT_VIEW_CAMERA_UP={ +"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":16777232,"physical_keycode":0,"unicode":0,"echo":false,"script":null) +] +} +INPUT_VIEW_CAMERA_DOWN={ +"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":16777234,"physical_keycode":0,"unicode":0,"echo":false,"script":null) +] +} +INPUT_VIEW_UP={ +"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":true,"meta_pressed":false,"command_pressed":false,"pressed":false,"keycode":16777232,"physical_keycode":0,"unicode":0,"echo":false,"script":null) +] +} +INPUT_VIEW_DOWN={ +"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":true,"meta_pressed":false,"command_pressed":false,"pressed":false,"keycode":16777234,"physical_keycode":0,"unicode":0,"echo":false,"script":null) +] +} +INPUT_VIEW_FRONT={ +"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":true,"pressed":false,"keycode":16777232,"physical_keycode":0,"unicode":0,"echo":false,"script":null) +] +} +INPUT_VIEW_BACK={ +"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":true,"pressed":false,"keycode":16777234,"physical_keycode":0,"unicode":0,"echo":false,"script":null) +] +} +INPUT_VIEW_CAMERA_FPS_TPS={ +"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":86,"physical_keycode":0,"unicode":0,"echo":false,"script":null) +] +} +INPUT_VIEW_SCREENSHOT={ +"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":16777226,"physical_keycode":0,"unicode":0,"echo":false,"script":null) +] +} +INPUT_VIEW_ZOOM_IN={ +"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":4,"pressed":false,"double_click":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":true,"meta_pressed":false,"command_pressed":false,"pressed":false,"keycode":16777235,"physical_keycode":0,"unicode":0,"echo":false,"script":null) +] +} +INPUT_VIEW_ZOOM_OUT={ +"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":16,"position":Vector2(321, 157),"global_position":Vector2(321, 157),"factor":1.0,"button_index":5,"pressed":true,"double_click":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":true,"meta_pressed":false,"command_pressed":false,"pressed":false,"keycode":16777236,"physical_keycode":0,"unicode":0,"echo":false,"script":null) +] +} +INPUT_VIEW_CAMERA_MOVE_PLAYER_FOLLOW={ +"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":2,"position":Vector2(217, 135),"global_position":Vector2(217, 135),"factor":1.0,"button_index":2,"pressed":true,"double_click":false,"script":null) +] +} +INPUT_VIEW_CAMERA_MOVE_ONLY={ +"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) +] +} [internationalization] diff --git a/scenes/controls/controls.gd b/scenes/controls/controls.gd index befc2a4..855708d 100644 --- a/scenes/controls/controls.gd +++ b/scenes/controls/controls.gd @@ -132,10 +132,87 @@ func load_current_control(): func configure_control(): - if $Window/VBox/Menu/SortByInput.is_pressed(): - configure_control_sort_by_input() - else: + if $Window/VBox/Menu/ShowMethod.get_selected() == 0: + $Window/VBox/Input.visible = false + $Window/VBox/Tree.visible = true + configure_control_by_group() + elif $Window/VBox/Menu/ShowMethod.get_selected() == 1: + $Window/VBox/Tree.visible = false + $Window/VBox/Input.visible = true configure_control_sort_by_categories() + else: + $Window/VBox/Tree.visible = false + $Window/VBox/Input.visible = true + configure_control_sort_by_input() + + +func configure_control_by_group(): + $Window/VBox/Tree.clear() + var root = $Window/VBox/Tree.create_item() + $Window/VBox/Tree.hide_root = true + var child_action = $Window/VBox/Tree.create_item(root) + child_action.set_text(0, tr("CONTROL_INPUT_ACTION")) + var child_view = $Window/VBox/Tree.create_item(root) + child_view.set_text(0, tr("CONTROL_INPUT_VIEW")) + var child_other = $Window/VBox/Tree.create_item(root) + child_other.set_text(0, tr("CONTROL_INPUT_OTHER")) + for action in InputMap.get_actions(): + var text:String = action + if text.find("INPUT_ACTION") == 0: + var subchild:TreeItem = $Window/VBox/Tree.create_item(child_action) + subchild.set_text(0, tr(text)) + var buttontxt : Texture2D = preload("res://scenes/controls/add.png") + subchild.add_button(0, buttontxt, 0, false, "CONTROL_ADD_INPUT") + subchild.set_meta("action", 0) + subchild.set_meta("group", action) + var a = InputMap.action_get_events(action) + for z in a: + var text2:String = Common.get_string_input(z) + var subchild2:TreeItem = $Window/VBox/Tree.create_item(subchild) + subchild2.set_text(0, tr(text2)) + var button2txt : Texture2D = preload("res://scenes/controls/trash.png") + subchild2.add_button(0, button2txt, 0, false, "CONTROL_DEL_INPUT") + subchild2.set_meta("action", 1) + subchild2.set_meta("group", action) + subchild2.set_meta("control", z) + elif text.find("INPUT_VIEW") == 0: + var subchild:TreeItem = $Window/VBox/Tree.create_item(child_view) + subchild.set_text(0, tr(text)) + var buttontxt : Texture2D = preload("res://scenes/controls/add.png") + subchild.add_button(0, buttontxt, 0, false, "CONTROL_ADD_INPUT") + subchild.set_meta("action", 0) + subchild.set_meta("group", action) + var a = InputMap.action_get_events(action) + for z in a: + var text2:String = Common.get_string_input(z) + var subchild2:TreeItem = $Window/VBox/Tree.create_item(subchild) + subchild2.set_text(0, tr(text2)) + var button2txt : Texture2D = preload("res://scenes/controls/trash.png") + subchild2.add_button(0, button2txt, 0, false, "CONTROL_DEL_INPUT") + subchild2.set_meta("action", 1) + subchild2.set_meta("group", action) + subchild2.set_meta("control", z) + else: + var subchild:TreeItem = $Window/VBox/Tree.create_item(child_other) + subchild.set_text(0, tr(text)) + var buttontxt : Texture2D = preload("res://scenes/controls/add.png") + subchild.add_button(0, buttontxt, 0, false, "CONTROL_ADD_INPUT") + subchild.set_meta("action", 0) + subchild.set_meta("group", action) + var a = InputMap.action_get_events(action) + for z in a: + var text2:String = Common.get_string_input(z) + var subchild2:TreeItem = $Window/VBox/Tree.create_item(subchild) + subchild2.set_text(0, tr(text2)) + var button2txt : Texture2D = preload("res://scenes/controls/trash.png") + subchild2.add_button(0, button2txt, 0, false, "CONTROL_DEL_INPUT") + subchild2.set_meta("action", 1) + subchild2.set_meta("group", action) + subchild2.set_meta("control", z) + + +func __button_pressed(): + print("__button_pressed") func configure_control_sort_by_input(): @@ -232,3 +309,20 @@ func _on_control_box_add_pressed(action, command): $SelectType/Window.popup_centered() $SelectType/Window.visible = true + + +func _on_option_button_item_selected(index): + configure_control() + + +func _on_tree_button_pressed(item:TreeItem, column, id): + if item.has_meta("action") and item.has_meta("group"): + var action = item.get_meta("group") + if item.get_meta("action") == 0: + $SelectType.set_param(action, "signal_refresh" ) + $SelectType/Window.popup_centered() + $SelectType/Window.visible = true + elif item.has_meta("control"): + var control = item.get_meta("control") + InputMap.action_erase_event(action, control) + configure_control() diff --git a/scenes/controls/controls.tscn b/scenes/controls/controls.tscn index 5056b5b..0f3081d 100644 --- a/scenes/controls/controls.tscn +++ b/scenes/controls/controls.tscn @@ -36,7 +36,21 @@ offset_right = 1024.0 offset_bottom = 31.0 size_flags_horizontal = 3 +[node name="ShowMethod" type="OptionButton" parent="Window/VBox/Menu"] +offset_right = 43.0 +offset_bottom = 31.0 +text = "CONTROL_VIEW_BY_GROUP" +item_count = 3 +selected = 0 +popup/item_0/text = "CONTROL_VIEW_BY_GROUP" +popup/item_0/id = 0 +popup/item_1/text = "CONTROL_VIEW_BY_INPUT" +popup/item_1/id = 1 +popup/item_2/text = "CONTROL_VIEW_BY_INPUT_SORTED" +popup/item_2/id = 2 + [node name="SortByInput" type="CheckBox" parent="Window/VBox/Menu"] +visible = false offset_right = 510.0 offset_bottom = 31.0 size_flags_horizontal = 7 @@ -62,6 +76,12 @@ offset_bottom = 530.0 size_flags_horizontal = 3 size_flags_vertical = 3 +[node name="Tree" type="Tree" parent="Window/VBox"] +visible = false +offset_right = 40.0 +offset_bottom = 40.0 +size_flags_vertical = 3 + [node name="Quit" type="Button" parent="Window/VBox"] offset_left = 491.0 offset_top = 569.0 @@ -74,6 +94,8 @@ text = "EDIT_CONTROL/QUIT" [node name="SelectType" parent="." instance=ExtResource( "2_ps0mu" )] [connection signal="close_requested" from="Window" to="." method="_on_quit_pressed"] +[connection signal="item_selected" from="Window/VBox/Menu/ShowMethod" to="." method="_on_option_button_item_selected"] [connection signal="pressed" from="Window/VBox/Menu/SortByInput" to="." method="_on_sort_by_input_pressed"] [connection signal="pressed" from="Window/VBox/Menu/Reload" to="." method="reload_control_system"] +[connection signal="button_pressed" from="Window/VBox/Tree" to="." method="_on_tree_button_pressed"] [connection signal="pressed" from="Window/VBox/Quit" to="." method="_on_quit_pressed"] diff --git a/start-khanat-client.sh b/start-khanat-client.sh index 2628df4..801ad52 100755 --- a/start-khanat-client.sh +++ b/start-khanat-client.sh @@ -4,6 +4,7 @@ declare DEBUG=0 declare HELP=0 declare EDITOR=0 declare FORCE=0 +declare IMPORT=0 declare WORKDIR="$(dirname $(readlink -f $0))" declare GODOT_SRC="https://downloads.tuxfamily.org/godotengine/4.0/alpha3/Godot_v4.0-alpha3_linux.64.zip" declare OUTZIP="$WORKDIR/$(basename $GODOT_SRC)" @@ -84,7 +85,7 @@ function extract() } -while getopts hdeo:s:f flag +while getopts hdeo:s:fi flag do case "${flag}" in h) HELP=1;; @@ -93,6 +94,7 @@ do o) OUTZIP=${OPTARG};; s) GODOT_SRC=${OPTARG};; f) FORCE=1;; + i) IMPORT=1;; *) HELP=1;; esac done @@ -106,6 +108,7 @@ $(basename $0) [Option] : Donwload Launch Godot -d : Show debug message -e : Start Godot in editor mode -f : force download & uncompress + -i : force import data -o : target godot file (downloaded) -s : Url to download a specific godot version EOF @@ -118,6 +121,12 @@ download "$GODOT_SRC" "$OUTZIP" EXE=$(extract "$OUTZIP") msg_info "Prg:$EXE" +if [ $IMPORT -ne 0 ] +then + $WORKDIR/$EXE --editor --quit + exit $? +fi + if [ $EDITOR -ne 0 ] then OPTION="$OPTION -e" @@ -126,4 +135,5 @@ fi $WORKDIR/$EXE $OPTION + msg_info "End"