From 0e93e05427b045088a8f5257cee3c1a3a54e7888 Mon Sep 17 00:00:00 2001 From: Sophia Pearson Date: Tue, 4 Oct 2022 22:02:27 +0200 Subject: scenes: finish Godot 4 upgrades --- Assets/Themes/Default.tres | 10 ++++--- Scenes/Game/CommandInputArea.tscn | 14 ++++----- Scenes/Game/Game.tscn | 63 +++++++++++++++++++++++---------------- Scenes/Menus/MainMenuButtons.tscn | 26 +++++++--------- Scenes/MonitorEffect.tscn | 35 +++++++++++----------- Scenes/Terminal/ButtonBlock.tscn | 23 ++++++++------ Scenes/Terminal/InputArea.tscn | 28 +++++++++++------ Scenes/Terminal/MenuScreen.tscn | 36 ++++++++++------------ Scenes/Terminal/OutputArea.tscn | 17 ++++++----- Scenes/Terminal/OutputBlock.tscn | 13 ++++---- Scenes/Terminal/Screen.tscn | 30 ++++++++++++------- Scenes/Terminal/StatusArea.tscn | 20 ++++++------- 12 files changed, 173 insertions(+), 142 deletions(-) diff --git a/Assets/Themes/Default.tres b/Assets/Themes/Default.tres index 2e15010..05fc2c5 100644 --- a/Assets/Themes/Default.tres +++ b/Assets/Themes/Default.tres @@ -34,19 +34,21 @@ InvertedPanelContainer/styles/panel = ExtResource("1") InvertedRichTextLabel/base_type = &"RichTextLabel" InvertedRichTextLabel/colors/default_color = Color(0.2, 0.2, 0.2, 1) Label/colors/font_color = Color(0.243137, 0.811765, 0.235294, 1) -Label/font_sizes/font_size = 16 +Label/font_sizes/font_size = 24 Label/styles/normal = SubResource("3") +LineEdit/colors/caret_color = Color(0.2, 0.2, 0.2, 1) LineEdit/colors/cursor_color = Color(0.2, 0.2, 0.2, 1) LineEdit/colors/font_color = Color(0.2, 0.2, 0.2, 1) -LineEdit/colors/font_color_uneditable = Color(0.2, 0.2, 0.2, 1) +LineEdit/colors/font_uneditable_color = Color(0.2, 0.2, 0.2, 1) +LineEdit/constants/caret_width = 4 LineEdit/font_sizes/font_size = 24 LineEdit/styles/focus = SubResource("7") LineEdit/styles/normal = SubResource("1") LineEdit/styles/read_only = SubResource("2") PanelContainer/styles/panel = ExtResource("2") RichTextLabel/colors/default_color = Color(0.243137, 0.811765, 0.235294, 1) -RichTextLabel/font_sizes/bold_font_size = 16 -RichTextLabel/font_sizes/bold_italics_font_size = 16 +RichTextLabel/font_sizes/bold_font_size = 24 +RichTextLabel/font_sizes/bold_italics_font_size = 24 RichTextLabel/font_sizes/normal_font_size = 24 RichTextLabel/styles/focus = SubResource("5") RichTextLabel/styles/normal = SubResource("6") diff --git a/Scenes/Game/CommandInputArea.tscn b/Scenes/Game/CommandInputArea.tscn index b377443..0701232 100644 --- a/Scenes/Game/CommandInputArea.tscn +++ b/Scenes/Game/CommandInputArea.tscn @@ -1,12 +1,12 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=4 format=3 uid="uid://pcvqnlnw512w"] -[ext_resource path="res://Scenes/Terminal/InputArea.tscn" type="PackedScene" id=1] -[ext_resource path="res://Scripts/Game/CommandParser.cs" type="Script" id=2] -[ext_resource path="res://Scripts/Game/CommandInputArea.cs" type="Script" id=3] +[ext_resource type="PackedScene" uid="uid://b886lame7u8c8" path="res://Scenes/Terminal/InputArea.tscn" id="1"] +[ext_resource type="Script" path="res://Scripts/Game/CommandParser.cs" id="2"] +[ext_resource type="Script" path="res://Scripts/Game/CommandInputArea.cs" id="3"] -[node name="CommandInputArea" instance=ExtResource( 1 )] -script = ExtResource( 3 ) +[node name="CommandInputArea" instance=ExtResource("1")] +script = ExtResource("3") [node name="CommandParser" type="Node" parent="." index="2"] unique_name_in_owner = true -script = ExtResource( 2 ) +script = ExtResource("2") diff --git a/Scenes/Game/Game.tscn b/Scenes/Game/Game.tscn index 4d62d3a..8fb8e2b 100644 --- a/Scenes/Game/Game.tscn +++ b/Scenes/Game/Game.tscn @@ -1,50 +1,63 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=6 format=3 uid="uid://4updkf321om"] -[ext_resource path="res://Scenes/Terminal/Screen.tscn" type="PackedScene" id=1] -[ext_resource path="res://Scenes/Terminal/OutputArea.tscn" type="PackedScene" id=2] -[ext_resource path="res://Scenes/Game/CommandInputArea.tscn" type="PackedScene" id=3] -[ext_resource path="res://Scripts/Game/Game.cs" type="Script" id=4] -[ext_resource path="res://Scenes/Terminal/StatusArea.tscn" type="PackedScene" id=5] -[ext_resource path="res://Scenes/Terminal/OutputBlock.tscn" type="PackedScene" id=6] +[ext_resource type="PackedScene" uid="uid://bp8kjovrt7gxk" path="res://Scenes/Terminal/Screen.tscn" id="1"] +[ext_resource type="PackedScene" uid="uid://b1pnf82wkug43" path="res://Scenes/Terminal/OutputArea.tscn" id="2"] +[ext_resource type="PackedScene" path="res://Scenes/Game/CommandInputArea.tscn" id="3"] +[ext_resource type="Script" path="res://Scripts/Game/Game.cs" id="4"] +[ext_resource type="PackedScene" uid="uid://bdpejpul8aruh" path="res://Scenes/Terminal/StatusArea.tscn" id="5"] [node name="Game" type="Node"] -script = ExtResource( 4 ) +script = ExtResource("4") -[node name="Screen" parent="." instance=ExtResource( 1 )] +[node name="Screen" parent="." instance=ExtResource("1")] + +[node name="ScreenContainer" parent="Screen" index="0"] +layout_mode = 3 +grow_horizontal = 2 +grow_vertical = 2 [node name="TopBar" parent="Screen/ScreenContainer" index="0"] -offset_right = 800.0 -offset_bottom = 27.0 +layout_mode = 3 +offset_bottom = 25.0 -[node name="StatusArea" parent="Screen/ScreenContainer/TopBar" index="0" instance=ExtResource( 5 )] +[node name="StatusArea" parent="Screen/ScreenContainer/TopBar" index="0" instance=ExtResource("5")] unique_name_in_owner = true +anchors_preset = 0 +anchor_right = 0.0 offset_left = 8.0 -offset_right = 792.0 +offset_right = 1144.0 +offset_bottom = 25.0 +grow_horizontal = 1 Title = "Adventure Title" [node name="Content" parent="Screen/ScreenContainer" index="1"] -offset_top = 27.0 -offset_right = 800.0 -offset_bottom = 575.0 +layout_mode = 3 +offset_top = 25.0 +offset_bottom = 620.0 -[node name="OutputArea" parent="Screen/ScreenContainer/Content" index="0" instance=ExtResource( 2 )] +[node name="OutputArea" parent="Screen/ScreenContainer/Content" index="0" instance=ExtResource("2")] unique_name_in_owner = true +anchors_preset = 0 anchor_right = 0.0 anchor_bottom = 0.0 offset_left = 8.0 -offset_right = 792.0 -offset_bottom = 548.0 -OutputBlockScene = ExtResource( 6 ) +offset_right = 1144.0 +offset_bottom = 595.0 +grow_horizontal = 2 +grow_vertical = 2 [node name="BottomBar" parent="Screen/ScreenContainer" index="2"] -offset_top = 575.0 -offset_right = 800.0 -offset_bottom = 600.0 +layout_mode = 3 +offset_top = 620.0 -[node name="InputArea" parent="Screen/ScreenContainer/BottomBar" index="0" instance=ExtResource( 3 )] +[node name="InputArea" parent="Screen/ScreenContainer/BottomBar" index="0" instance=ExtResource("3")] unique_name_in_owner = true +anchors_preset = 0 +anchor_right = 0.0 offset_left = 8.0 -offset_right = 792.0 +offset_right = 1144.0 +offset_bottom = 28.0 +grow_horizontal = 1 [connection signal="CommandSubmitted" from="Screen/ScreenContainer/BottomBar/InputArea" to="." method="OnCommandSubmitted"] [connection signal="UnknownInputSubmitted" from="Screen/ScreenContainer/BottomBar/InputArea" to="." method="OnUnknownInputSubmitted"] diff --git a/Scenes/Menus/MainMenuButtons.tscn b/Scenes/Menus/MainMenuButtons.tscn index e2652b4..f1d318c 100644 --- a/Scenes/Menus/MainMenuButtons.tscn +++ b/Scenes/Menus/MainMenuButtons.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://j5l33sidadvf"] -[ext_resource type="PackedScene" path="res://Scenes/Terminal/ButtonBlock.tscn" id="1"] +[ext_resource type="PackedScene" uid="uid://bh5vxp7oki3cr" path="res://Scenes/Terminal/ButtonBlock.tscn" id="1"] [ext_resource type="Script" path="res://Scripts/Menus/MainMenuButtons.cs" id="2"] [node name="MainMenuButtons" instance=ExtResource("1")] @@ -9,34 +9,28 @@ anchor_top = 0.5 anchor_bottom = 0.5 offset_top = -41.5 offset_bottom = 41.5 -grow_horizontal = 2 -grow_vertical = 2 -theme_override_constants/margin_left = 400 -theme_override_constants/margin_right = 400 script = ExtResource("2") [node name="Buttons" parent="." index="0"] -layout_mode = 2 -offset_left = 400.0 -offset_right = 752.0 -offset_bottom = 83.0 +offset_top = 4.0 +offset_bottom = 79.0 [node name="StartButton" type="Button" parent="Buttons" index="0"] layout_mode = 2 -offset_right = 352.0 +offset_right = 640.0 offset_bottom = 25.0 text = "BUTTON_START_GAME" [node name="CreditsButton" type="Button" parent="Buttons" index="1"] layout_mode = 2 -offset_top = 29.0 -offset_right = 352.0 -offset_bottom = 54.0 +offset_top = 25.0 +offset_right = 640.0 +offset_bottom = 50.0 text = "BUTTON_CREDITS" [node name="QuitButton" type="Button" parent="Buttons" index="2"] layout_mode = 2 -offset_top = 58.0 -offset_right = 352.0 -offset_bottom = 83.0 +offset_top = 50.0 +offset_right = 640.0 +offset_bottom = 75.0 text = "BUTTON_QUIT_GAME" diff --git a/Scenes/MonitorEffect.tscn b/Scenes/MonitorEffect.tscn index 46b4f68..3cd345e 100644 --- a/Scenes/MonitorEffect.tscn +++ b/Scenes/MonitorEffect.tscn @@ -1,27 +1,28 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=3 format=3 uid="uid://bgddsbe8r06bh"] -[ext_resource path="res://Assets/Shaders/crt_shader.gdshader" type="Shader" id=1] +[ext_resource type="Shader" path="res://Assets/Shaders/crt_shader.gdshader" id="1"] -[sub_resource type="ShaderMaterial" id=1] -shader = ExtResource( 1 ) -shader_param/bloom_enabled = true -shader_param/bloom_amount = 0.3 -shader_param/bloom_radius = 2.0 -shader_param/chromatic_abberation_enabled = true -shader_param/chromatic_abberation_amount = 2.0 -shader_param/scan_lines_enabled = true -shader_param/scan_lines_count = 180.0 -shader_param/scan_lines_opacity = 0.85 -shader_param/vignette_enabled = true -shader_param/vignette_opacity = 0.33 -shader_param/boost_intensity = 1.3 +[sub_resource type="ShaderMaterial" id="1"] +shader = ExtResource("1") +shader_parameter/bloom_amount = 0.3 +shader_parameter/bloom_enabled = true +shader_parameter/bloom_radius = 2.0 +shader_parameter/boost_intensity = 1.3 +shader_parameter/chromatic_abberation_amount = 2.0 +shader_parameter/chromatic_abberation_enabled = true +shader_parameter/scan_lines_count = 180.0 +shader_parameter/scan_lines_enabled = true +shader_parameter/scan_lines_opacity = 0.85 +shader_parameter/vignette_enabled = true +shader_parameter/vignette_opacity = 0.33 [node name="MonitorEffect" type="CanvasLayer"] layer = 2 [node name="ShaderRectangle" type="ColorRect" parent="."] -material = SubResource( 1 ) +material = SubResource("1") +clip_contents = true +anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 -clip_contents = true mouse_filter = 2 diff --git a/Scenes/Terminal/ButtonBlock.tscn b/Scenes/Terminal/ButtonBlock.tscn index 6982d3d..d4fe66d 100644 --- a/Scenes/Terminal/ButtonBlock.tscn +++ b/Scenes/Terminal/ButtonBlock.tscn @@ -1,20 +1,25 @@ -[gd_scene load_steps=2 format=2] +[gd_scene load_steps=2 format=3 uid="uid://bh5vxp7oki3cr"] -[ext_resource path="res://Scripts/Terminal/ButtonBlock.cs" type="Script" id=1] +[ext_resource type="Script" path="res://Scripts/Terminal/ButtonBlock.cs" id="1"] [node name="ButtonBlock" type="MarginContainer"] +anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 size_flags_horizontal = 3 size_flags_vertical = 3 -custom_constants/offset_right = 200 -custom_constants/offset_left = 200 -script = ExtResource( 1 ) +theme_override_constants/margin_left = 256 +theme_override_constants/margin_right = 256 +script = ExtResource("1") [node name="Buttons" type="VBoxContainer" parent="."] unique_name_in_owner = true -offset_left = 200.0 -offset_right = 600.0 -offset_bottom = 600.0 -custom_constants/separation = 0 +layout_mode = 2 +offset_left = 256.0 +offset_top = 324.0 +offset_right = 896.0 +offset_bottom = 324.0 +size_flags_vertical = 4 alignment = 1 diff --git a/Scenes/Terminal/InputArea.tscn b/Scenes/Terminal/InputArea.tscn index 54c514e..5a21790 100644 --- a/Scenes/Terminal/InputArea.tscn +++ b/Scenes/Terminal/InputArea.tscn @@ -1,27 +1,37 @@ -[gd_scene load_steps=2 format=2] +[gd_scene load_steps=2 format=3 uid="uid://b886lame7u8c8"] -[ext_resource path="res://Scripts/Terminal/InputArea.cs" type="Script" id=1] +[ext_resource type="Script" path="res://Scripts/Terminal/InputArea.cs" id="1"] [node name="InputArea" type="HBoxContainer"] -offset_right = 640.0 +anchors_preset = 10 +anchor_right = 1.0 offset_bottom = 25.0 -script = ExtResource( 1 ) +grow_horizontal = 2 +script = ExtResource("1") [node name="PromptLabel" type="Label" parent="."] unique_name_in_owner = true +layout_mode = 2 offset_right = 20.0 -offset_bottom = 25.0 -theme_type_variation = "InvertedLabel" +offset_bottom = 28.0 +size_flags_horizontal = 0 +theme_type_variation = &"InvertedLabel" text = "?>" [node name="TextInput" type="LineEdit" parent="."] unique_name_in_owner = true -offset_left = 28.0 -offset_right = 640.0 -offset_bottom = 25.0 +layout_mode = 2 +offset_left = 24.0 +offset_top = 1.0 +offset_right = 1152.0 +offset_bottom = 26.0 size_flags_horizontal = 3 +size_flags_vertical = 4 context_menu_enabled = false selecting_enabled = false +flat = true caret_blink = true +caret_blink_interval = 0.5 +caret_force_displayed = true [connection signal="text_submitted" from="TextInput" to="." method="OnTextEntered"] diff --git a/Scenes/Terminal/MenuScreen.tscn b/Scenes/Terminal/MenuScreen.tscn index 92387de..11fd4bf 100644 --- a/Scenes/Terminal/MenuScreen.tscn +++ b/Scenes/Terminal/MenuScreen.tscn @@ -1,28 +1,22 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=4 format=3 uid="uid://bhu0kaqbhdr74"] -[ext_resource path="res://Scenes/Terminal/Screen.tscn" type="PackedScene" id=1] -[ext_resource path="res://Scenes/Terminal/StatusArea.tscn" type="PackedScene" id=2] -[ext_resource path="res://Scripts/Terminal/MenuScreen.cs" type="Script" id=3] +[ext_resource type="PackedScene" uid="uid://bp8kjovrt7gxk" path="res://Scenes/Terminal/Screen.tscn" id="1"] +[ext_resource type="PackedScene" uid="uid://bdpejpul8aruh" path="res://Scenes/Terminal/StatusArea.tscn" id="2"] +[ext_resource type="Script" path="res://Scripts/Terminal/MenuScreen.cs" id="3"] -[node name="MenuScreen" instance=ExtResource( 1 )] -script = ExtResource( 3 ) +[node name="MenuScreen" instance=ExtResource("1")] +script = ExtResource("3") +Title = "" -[node name="TopBar" parent="ScreenContainer" index="0"] -offset_right = 800.0 -offset_bottom = 27.0 +[node name="ScreenContainer" parent="." index="0"] +grow_horizontal = 2 +grow_vertical = 2 -[node name="TitleArea" parent="ScreenContainer/TopBar" index="0" instance=ExtResource( 2 )] +[node name="TitleArea" parent="ScreenContainer/TopBar" index="0" instance=ExtResource("2")] unique_name_in_owner = true +layout_mode = 2 +anchors_preset = 0 +anchor_right = 0.0 offset_left = 8.0 -offset_right = 792.0 +offset_right = 1144.0 Title = "[center][/center]" - -[node name="Content" parent="ScreenContainer" index="1"] -offset_top = 27.0 -offset_right = 800.0 -offset_bottom = 600.0 - -[node name="BottomBar" parent="ScreenContainer" index="2"] -offset_top = 600.0 -offset_right = 800.0 -offset_bottom = 600.0 diff --git a/Scenes/Terminal/OutputArea.tscn b/Scenes/Terminal/OutputArea.tscn index 4f41b9a..36a0320 100644 --- a/Scenes/Terminal/OutputArea.tscn +++ b/Scenes/Terminal/OutputArea.tscn @@ -1,18 +1,19 @@ -[gd_scene load_steps=2 format=2] +[gd_scene load_steps=3 format=3 uid="uid://b1pnf82wkug43"] -[ext_resource path="res://Scripts/Terminal/OutputArea.cs" type="Script" id=1] +[ext_resource type="Script" path="res://Scripts/Terminal/OutputArea.cs" id="1"] +[ext_resource type="PackedScene" uid="uid://dluo5vs75j467" path="res://Scenes/Terminal/OutputBlock.tscn" id="2_u5yup"] [node name="OutputArea" type="ScrollContainer"] +anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 -mouse_filter = 1 -scroll_horizontal_enabled = false -script = ExtResource( 1 ) +script = ExtResource("1") +OutputBlockScene = ExtResource("2_u5yup") [node name="LineContainer" type="VBoxContainer" parent="."] unique_name_in_owner = true -offset_right = 640.0 -offset_bottom = 480.0 +layout_mode = 2 +offset_right = 1152.0 +offset_bottom = 648.0 size_flags_horizontal = 3 size_flags_vertical = 3 -custom_constants/separation = 0 diff --git a/Scenes/Terminal/OutputBlock.tscn b/Scenes/Terminal/OutputBlock.tscn index 3613aed..a44d22d 100644 --- a/Scenes/Terminal/OutputBlock.tscn +++ b/Scenes/Terminal/OutputBlock.tscn @@ -1,17 +1,18 @@ -[gd_scene load_steps=2 format=2] +[gd_scene load_steps=2 format=3 uid="uid://dluo5vs75j467"] -[ext_resource path="res://Scripts/Terminal/OutputBlock.cs" type="Script" id=1] +[ext_resource type="Script" path="res://Scripts/Terminal/OutputBlock.cs" id="1"] [node name="OutputBlock" type="MarginContainer"] +anchors_preset = 10 anchor_right = 1.0 size_flags_horizontal = 3 -script = ExtResource( 1 ) +script = ExtResource("1") +Content = "" [node name="ContentLabel" type="RichTextLabel" parent="."] unique_name_in_owner = true -offset_right = 640.0 -offset_bottom = 27.0 -size_flags_horizontal = 3 +layout_mode = 2 +offset_right = 1152.0 bbcode_enabled = true fit_content_height = true scroll_active = false diff --git a/Scenes/Terminal/Screen.tscn b/Scenes/Terminal/Screen.tscn index 7b853b4..920dfb0 100644 --- a/Scenes/Terminal/Screen.tscn +++ b/Scenes/Terminal/Screen.tscn @@ -1,25 +1,35 @@ -[gd_scene format=2] +[gd_scene format=3 uid="uid://bp8kjovrt7gxk"] [node name="Screen" type="Control"] +layout_mode = 3 +anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 [node name="ScreenContainer" type="VBoxContainer" parent="."] +layout_mode = 1 +anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 -custom_constants/separation = 0 [node name="TopBar" type="PanelContainer" parent="ScreenContainer"] -offset_right = 640.0 -theme_type_variation = "InvertedPanelContainer" +layout_mode = 2 +offset_right = 1152.0 +size_flags_vertical = 0 +theme_type_variation = &"InvertedPanelContainer" [node name="Content" type="PanelContainer" parent="ScreenContainer"] -offset_right = 640.0 -offset_bottom = 480.0 +layout_mode = 2 +offset_right = 1152.0 +offset_bottom = 648.0 size_flags_vertical = 3 [node name="BottomBar" type="PanelContainer" parent="ScreenContainer"] -offset_top = 480.0 -offset_right = 640.0 -offset_bottom = 480.0 -theme_type_variation = "InvertedPanelContainer" +layout_mode = 2 +offset_top = 648.0 +offset_right = 1152.0 +offset_bottom = 648.0 +size_flags_vertical = 8 +theme_type_variation = &"InvertedPanelContainer" diff --git a/Scenes/Terminal/StatusArea.tscn b/Scenes/Terminal/StatusArea.tscn index 1a9e4af..9aa82a1 100644 --- a/Scenes/Terminal/StatusArea.tscn +++ b/Scenes/Terminal/StatusArea.tscn @@ -1,19 +1,19 @@ -[gd_scene load_steps=2 format=2] +[gd_scene load_steps=2 format=3 uid="uid://bdpejpul8aruh"] -[ext_resource path="res://Scripts/Terminal/StatusArea.cs" type="Script" id=1] +[ext_resource type="Script" path="res://Scripts/Terminal/StatusArea.cs" id="1"] [node name="StatusArea" type="HBoxContainer"] -offset_right = 640.0 -offset_bottom = 27.0 -script = ExtResource( 1 ) +anchors_preset = 10 +anchor_right = 1.0 +grow_horizontal = 2 +script = ExtResource("1") +Title = "" [node name="TitleLabel" type="RichTextLabel" parent="."] unique_name_in_owner = true -offset_right = 640.0 -offset_bottom = 27.0 +layout_mode = 2 +offset_right = 1152.0 size_flags_horizontal = 3 -theme_type_variation = "InvertedRichTextLabel" +theme_type_variation = &"InvertedRichTextLabel" bbcode_enabled = true -text = "This is where the title goes" -text = "This is where the title goes" fit_content_height = true -- cgit v1.2.3