diff --git a/godot/scenes/tutorial.gd b/godot/scenes/tutorial.gd index ad0ad55..7920030 100644 --- a/godot/scenes/tutorial.gd +++ b/godot/scenes/tutorial.gd @@ -4,11 +4,18 @@ extends Node2D # Called when the node enters the scene tree for the first time. func _ready(): - pass # Replace with function body. + pass # Replace with function body. # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta): - pass + pass + +func _input(event): + if event.is_action_pressed("interact"): + change_scene() func _on_button_pressed(): - get_tree().change_scene_to_packed(next_scene) + change_scene() + +func change_scene(): + get_tree().change_scene_to_packed(next_scene) diff --git a/godot/scenes/tutorial.tscn b/godot/scenes/tutorial.tscn index 18acb54..36997db 100644 --- a/godot/scenes/tutorial.tscn +++ b/godot/scenes/tutorial.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=3 format=3 uid="uid://dsbpdd7xdslx0"] +[gd_scene load_steps=4 format=3 uid="uid://cxsuv8lnui8p7"] [ext_resource type="Script" path="res://scenes/tutorial.gd" id="1_i8rpu"] [ext_resource type="PackedScene" uid="uid://cik30de5gaaah" path="res://scenes/ingame_scene.tscn" id="2_lch8g"] +[ext_resource type="Texture2D" uid="uid://dhpn2dswrkgyj" path="res://sprites/ui/controlls.svg" id="3_u3bmf"] [node name="Tutorial" type="Node2D"] script = ExtResource("1_i8rpu") @@ -19,10 +20,18 @@ dragger_visibility = 2 [node name="RichTextLabel" type="RichTextLabel" parent="AspectRatioContainer/VSplitContainer"] layout_mode = 2 -text = "Can YOU please the crowd? +bbcode_enabled = true +text = " + Can [b]YOU[/b] please the crowd? -Throw out jokes but be aware that not every joke is for everyone. -Can you please everyone before you run out of breath?" + + Throw out jokes but be aware that not every joke is for everyone. + Can you please everyone before you run out of breath? + + + Use these buttons on your controller + or press A, S, or D on your keyboard + to tell a joke" [node name="CenterContainer" type="CenterContainer" parent="AspectRatioContainer/VSplitContainer"] layout_mode = 2 @@ -31,4 +40,8 @@ layout_mode = 2 layout_mode = 2 text = "I'm ready for the show!" +[node name="Controlls" type="Sprite2D" parent="."] +position = Vector2(430, 219) +texture = ExtResource("3_u3bmf") + [connection signal="pressed" from="AspectRatioContainer/VSplitContainer/CenterContainer/Button" to="." method="_on_button_pressed"] diff --git a/godot/sprites/title_tough_crowd.svg b/godot/sprites/title_tough_crowd.svg new file mode 100644 index 0000000..607f362 --- /dev/null +++ b/godot/sprites/title_tough_crowd.svg @@ -0,0 +1,240 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/godot/sprites/title_tough_crowd.svg.import b/godot/sprites/title_tough_crowd.svg.import new file mode 100644 index 0000000..ce8ddb4 --- /dev/null +++ b/godot/sprites/title_tough_crowd.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bjw0tkgm1xw4g" +path="res://.godot/imported/title_tough_crowd.svg-7d127687f288d8aa415aebb0fe1f52c6.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/title_tough_crowd.svg" +dest_files=["res://.godot/imported/title_tough_crowd.svg-7d127687f288d8aa415aebb0fe1f52c6.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/godot/sprites/ui/controlls.svg b/godot/sprites/ui/controlls.svg new file mode 100644 index 0000000..d8c772f --- /dev/null +++ b/godot/sprites/ui/controlls.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + diff --git a/godot/sprites/ui/controlls.svg.import b/godot/sprites/ui/controlls.svg.import new file mode 100644 index 0000000..e772c59 --- /dev/null +++ b/godot/sprites/ui/controlls.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dhpn2dswrkgyj" +path="res://.godot/imported/controlls.svg-f344638583995aa20a510a8549990547.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/ui/controlls.svg" +dest_files=["res://.godot/imported/controlls.svg-f344638583995aa20a510a8549990547.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/godot/ui/components/game_logo.tscn b/godot/ui/components/game_logo.tscn index 3c702ec..a82a0db 100644 --- a/godot/ui/components/game_logo.tscn +++ b/godot/ui/components/game_logo.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://b4blrdjthcxnn"] -[ext_resource type="Texture2D" uid="uid://dmelj2qgr8w7k" path="res://icon.svg" id="1_scjn5"] +[ext_resource type="Texture2D" uid="uid://bjw0tkgm1xw4g" path="res://sprites/title_tough_crowd.svg" id="1_ehg6o"] [node name="GameLogo" type="CenterContainer"] offset_right = 110.0 @@ -15,4 +15,4 @@ theme_override_constants/margin_bottom = 10 [node name="TextureRect" type="TextureRect" parent="MarginContainer"] layout_mode = 2 -texture = ExtResource("1_scjn5") +texture = ExtResource("1_ehg6o")