From 8375598ecd1a563f1b86f453504335da5b608413 Mon Sep 17 00:00:00 2001 From: cblech Date: Mon, 20 Jan 2025 16:47:07 +0100 Subject: [PATCH] Added test for Dialogic Choices --- dialog/test_time_line.dtl | 12 +++++-- .../dialogic_test_time_line_translation.csv | 11 +++++-- project.godot | 31 ++++++++++++------- scenes/mockups/abandoned_street.tscn | 2 +- scripts/player.gd | 3 ++ 5 files changed, 41 insertions(+), 18 deletions(-) diff --git a/dialog/test_time_line.dtl b/dialog/test_time_line.dtl index 093806c..dc11aaa 100644 --- a/dialog/test_time_line.dtl +++ b/dialog/test_time_line.dtl @@ -1,3 +1,9 @@ -defaulty_the_default_character: Hello World! #id:11 -defaulty_the_default_character: This is very cool text in english! #id:12 -This is a text, with a 'comma' and "quotation marks" in it. #id:14 +if {TestVariable} == "Choise": + var is choise #id:15 +defaulty_the_default_character: Hello Hello! (var\: {TestVariable}) #id:11 +- This is a choise #id:16 + set {TestVariable} = "Choise" + defaulty_the_default_character: Cool #id:17 +- This is another choise #id:18 + set {TestVariable} = "Another Choise" + defaulty_the_default_character: Also Cool #id:19 diff --git a/dialog/translations/dialogic_test_time_line_translation.csv b/dialog/translations/dialogic_test_time_line_translation.csv index 659b91d..009f33a 100644 --- a/dialog/translations/dialogic_test_time_line_translation.csv +++ b/dialog/translations/dialogic_test_time_line_translation.csv @@ -1,4 +1,9 @@ keys,en,de -Text/11/text,Hello World!,Hallo Welt! -Text/12/text,This is very cool text in english!,Das ist ein sehr cooler Text auf Deutsch! -Text/14/text,"This is a text, with a 'comma' and ""quotation marks"" in it.","Das ist ein Text, mit einem 'Komma' und ""Anführungszeichen"" darin." +Text/15/text,var is choise, +Text/11/text,Hello Hello! (var: {TestVariable}),Hallo Welt! +Choice/16/text,This is a choise, +Choice/16/disabled_text,, +Text/17/text,Cool, +Choice/18/text,This is another choise, +Choice/18/disabled_text,, +Text/19/text,Also Cool, diff --git a/project.godot b/project.godot index f65766e..2cea996 100644 --- a/project.godot +++ b/project.godot @@ -12,7 +12,7 @@ config_version=5 config/name="Babushka" run/main_scene="res://scenes/2DTestingGround.tscn" -config/features=PackedStringArray("4.2", "Forward Plus") +config/features=PackedStringArray("4.3", "Forward Plus") config/icon="res://icon.svg" [autoload] @@ -27,7 +27,9 @@ directories/dch_directory={ directories/dtl_directory={ "test_time_line": "res://dialog/test_time_line.dtl" } -variables={} +variables={ +"TestVariable": "none" +} glossary/default_case_sensitive=true layout/style_list=[] layout/default_style="Default" @@ -59,12 +61,14 @@ translation/add_separator=false translation/intern/save_mode=0 translation/intern/file_mode=1 translation/intern/translation_folder="res://dialog/translations" -translation/id_counter=20 +translation/id_counter=25 translation/locales=["de", "en"] text/autopauses={} [display] +window/size/viewport_width=1920 +window/size/viewport_height=1080 window/size/always_on_top=true [dotnet] @@ -79,34 +83,39 @@ enabled=PackedStringArray("res://addons/dialogic/plugin.cfg") move_left={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":97,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":97,"location":0,"echo":false,"script":null) ] } move_right={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"location":0,"echo":false,"script":null) ] } move_up={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"location":0,"echo":false,"script":null) ] } move_down={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"location":0,"echo":false,"script":null) ] } dialogic_default_action={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194309,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194309,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) , Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":1,"canceled":false,"pressed":true,"double_click":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":32,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":88,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":32,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":88,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":0,"pressure":0.0,"pressed":false,"script":null) ] } +click={ +"deadzone": 0.5, +"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":1,"canceled":false,"pressed":false,"double_click":false,"script":null) +] +} [internationalization] -locale/translations=PackedStringArray("res://dialog/translations/dialogic_character_translations.en.translation", "res://dialog/translations/dialogic_test_time_line_translation.de.translation", "res://dialog/translations/dialogic_test_time_line_translation.en.translation", "res://dialog/translations/dialogic_character_translations.de.translation") +locale/translations=PackedStringArray("res://dialog/translations/dialogic_character_translations.en.translation", "res://dialog/translations/dialogic_test_time_line_translation.de.translation", "res://dialog/translations/dialogic_test_time_line_translation.en.translation", "res://dialog/translations/dialogic_character_translations.de.translation", "res://dialog/translations/dialogic_semi_cat_translation.de.translation", "res://dialog/translations/dialogic_semi_cat_translation.en.translation") diff --git a/scenes/mockups/abandoned_street.tscn b/scenes/mockups/abandoned_street.tscn index 3948d8f..534a727 100644 --- a/scenes/mockups/abandoned_street.tscn +++ b/scenes/mockups/abandoned_street.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=3 uid="uid://dx7gn5yiq1aki"] +[gd_scene load_steps=12 format=3 uid="uid://c2owjj4h8bm76"] [ext_resource type="PackedScene" uid="uid://dd3giw31imfk4" path="res://scenes/player.tscn" id="1_kndfx"] [ext_resource type="Texture2D" uid="uid://cg1cxmqbo1pa" path="res://graphics/mockups/darktree1.png" id="2_mxft2"] diff --git a/scripts/player.gd b/scripts/player.gd index 85d601a..b67605e 100644 --- a/scripts/player.gd +++ b/scripts/player.gd @@ -27,4 +27,7 @@ func _process(delta: float) -> void: TranslationServer.set_locale("de") else: TranslationServer.set_locale("en") + + if Input.is_action_just_pressed("ui_right"): + print(Dialogic.VAR.TestVariable) pass