From 0f6c3bb1a370406adbb7b96874be513e48415a65 Mon Sep 17 00:00:00 2001 From: Persephone Bubblegum-Holiday Date: Mon, 14 Apr 2025 12:20:59 -0700 Subject: [PATCH] fixes --- Scenes/Node Types/ChuckSpot.tscn | 2 +- Scenes/Stages/2Stage.tscn | 9 ++------ Scenes/UI/HUD.tscn | 35 -------------------------------- Scenes/UI/Node Map.tscn | 24 ++++++++++++---------- Scripts/GL_Node_Map.gd | 4 ---- 5 files changed, 16 insertions(+), 58 deletions(-) delete mode 100644 Scenes/UI/HUD.tscn diff --git a/Scenes/Node Types/ChuckSpot.tscn b/Scenes/Node Types/ChuckSpot.tscn index 6735320..049f238 100644 --- a/Scenes/Node Types/ChuckSpot.tscn +++ b/Scenes/Node Types/ChuckSpot.tscn @@ -13,9 +13,9 @@ layout_mode = 0 tooltip_text = "Controls the spotlight for Chuck E." script = ExtResource("2_p5wec") identification = "L_SPOT_CHUCK" -visual_name = "Chuck E. Spotlight" names = PackedStringArray("enabled") types = PackedStringArray("bool") +visual_name = "Chuck E. Spotlight" [connection signal="mouse_entered" from="Node" to="Node" method="mouse_enter"] [connection signal="mouse_exited" from="Node" to="Node" method="mouse_exit"] diff --git a/Scenes/Stages/2Stage.tscn b/Scenes/Stages/2Stage.tscn index ea73cc5..cd67492 100644 --- a/Scenes/Stages/2Stage.tscn +++ b/Scenes/Stages/2Stage.tscn @@ -1,7 +1,6 @@ -[gd_scene load_steps=20 format=3 uid="uid://qvo7vlvac8o5"] +[gd_scene load_steps=19 format=3 uid="uid://qvo7vlvac8o5"] [ext_resource type="Script" uid="uid://8vyuhyx0xogt" path="res://Scripts/freecam.gd" id="1_ru8gb"] -[ext_resource type="PackedScene" uid="uid://clixk4m0rm0mu" path="res://Scenes/UI/HUD.tscn" id="2_yrqm3"] [ext_resource type="PackedScene" uid="uid://c57u187iciexi" path="res://Scenes/UI/Node Map.tscn" id="3_u0wf5"] [ext_resource type="PackedScene" uid="uid://dwdcfwbmoo36b" path="res://Models/Props/stage_base.glb" id="4_ol4ys"] [ext_resource type="PackedScene" uid="uid://dlf6gkpsv5g05" path="res://Models/Props/keyboard.glb" id="5_ti4ja"] @@ -26,15 +25,11 @@ ambient_light_source = 3 ambient_light_color = Color(1, 1, 1, 1) ambient_light_energy = 0.01 -[node name="1Stage" type="Node3D"] +[node name="2Stage" type="Node3D"] [node name="Camera3D" type="Camera3D" parent="."] transform = Transform3D(0.999998, 0.00163928, -0.000874435, -0.00163943, 0.999999, -0.000166063, 0.000874161, 0.000167496, 1, 0.01889, 3.26498, 9.74284) script = ExtResource("1_ru8gb") -toggle_key = 4194305 -overlay_text = false - -[node name="HUD" parent="Camera3D" instance=ExtResource("2_yrqm3")] [node name="NodeMap" parent="." instance=ExtResource("3_u0wf5")] diff --git a/Scenes/UI/HUD.tscn b/Scenes/UI/HUD.tscn deleted file mode 100644 index 836a921..0000000 --- a/Scenes/UI/HUD.tscn +++ /dev/null @@ -1,35 +0,0 @@ -[gd_scene load_steps=3 format=3 uid="uid://clixk4m0rm0mu"] - -[ext_resource type="Theme" uid="uid://b3wjoiiv6sq22" path="res://UI/Themes/Default.tres" id="1_omqfp"] - -[sub_resource type="LabelSettings" id="LabelSettings_qc5w2"] -font_size = 18 - -[node name="Control" type="Control"] -layout_mode = 3 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 - -[node name="Label" type="Label" parent="."] -z_index = 1000 -layout_mode = 1 -anchors_preset = 3 -anchor_left = 1.0 -anchor_top = 1.0 -anchor_right = 1.0 -anchor_bottom = 1.0 -offset_left = -855.0 -offset_top = -59.0 -offset_right = -4.0 -offset_bottom = -4.0 -grow_horizontal = 0 -grow_vertical = 0 -theme = ExtResource("1_omqfp") -theme_override_font_sizes/font_size = 9 -text = "Give LIFE Cybers -Press ESC to view node map, right click to add a node, middle click and drag to pan, scroll to zoom." -label_settings = SubResource("LabelSettings_qc5w2") -horizontal_alignment = 2 diff --git a/Scenes/UI/Node Map.tscn b/Scenes/UI/Node Map.tscn index 83849f3..fd72e3e 100644 --- a/Scenes/UI/Node Map.tscn +++ b/Scenes/UI/Node Map.tscn @@ -1,14 +1,17 @@ -[gd_scene load_steps=6 format=3 uid="uid://c57u187iciexi"] +[gd_scene load_steps=7 format=3 uid="uid://c57u187iciexi"] [ext_resource type="Script" uid="uid://i4p62x8fnqpn" path="res://Scripts/GL_Node_Map.gd" id="1_jyqbx"] [ext_resource type="PackedScene" uid="uid://mowdu1i1rldt" path="res://Scenes/UI/Search.tscn" id="1_xwfut"] [ext_resource type="Theme" uid="uid://b3wjoiiv6sq22" path="res://UI/Themes/Default.tres" id="2_2eix6"] -[sub_resource type="Gradient" id="Gradient_xwfut"] -colors = PackedColorArray(0.448074, 0.0582233, 0.099986, 1, 0.330802, 0.066494, 0.0423852, 1) +[sub_resource type="Gradient" id="Gradient_2eix6"] +offsets = PackedFloat32Array(0) +colors = PackedColorArray(0.121569, 0.121569, 0.121569, 0.501961) -[sub_resource type="GradientTexture1D" id="GradientTexture1D_jyqbx"] -gradient = SubResource("Gradient_xwfut") +[sub_resource type="GradientTexture1D" id="GradientTexture1D_msys2"] +gradient = SubResource("Gradient_2eix6") + +[sub_resource type="LabelSettings" id="LabelSettings_x1ecx"] [node name="NodeMap" type="Control" groups=["Node Map"]] layout_mode = 3 @@ -26,7 +29,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -texture = SubResource("GradientTexture1D_jyqbx") +texture = SubResource("GradientTexture1D_msys2") [node name="Holder" type="Control" parent="."] anchors_preset = 0 @@ -41,7 +44,7 @@ anchor_left = 1.0 anchor_top = 1.0 anchor_right = 1.0 anchor_bottom = 1.0 -offset_left = -1143.0 +offset_left = -773.0 offset_top = -97.0 offset_right = -11.0 offset_bottom = -48.0 @@ -49,10 +52,9 @@ grow_horizontal = 0 grow_vertical = 0 theme = ExtResource("2_2eix6") theme_override_font_sizes/font_size = 8 -text = "Give LIFE: TEST_C_ETCHINGS -Press Esc for Nodes, Right Click to search node. -Tab toggles background.Middle Click hold to pan. -Scroll to Zoom. Hover things for tooltips." +text = "Give LIFE Cybers +Press ESC to view node map, right click to add a node, middle click and drag to pan, scroll to zoom." +label_settings = SubResource("LabelSettings_x1ecx") horizontal_alignment = 2 [node name="MarginContainer" type="MarginContainer" parent="."] diff --git a/Scripts/GL_Node_Map.gd b/Scripts/GL_Node_Map.gd index d34a807..ca16bbe 100644 --- a/Scripts/GL_Node_Map.gd +++ b/Scripts/GL_Node_Map.gd @@ -1,7 +1,6 @@ extends Control class_name GL_Node_Map -var background: TextureRect var holder: Control var is_panning: bool = false var last_mouse_pos: Vector2 @@ -26,7 +25,6 @@ func _notification(what): func _ready(): visible = false - background = get_node("Background") holder = get_node("Holder") optionsVar = get_node("MarginContainer/HBoxContainer/OptionButton") Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) @@ -51,8 +49,6 @@ func _input(event: InputEvent) -> void: match event.keycode: KEY_ESCAPE: visible = not visible - KEY_TAB: - background.self_modulate.a = abs(background.self_modulate.a - 1) if not visible: Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) else: