diff --git a/3D/Maps/Fusion.map b/3D/Maps/Fusion.map index 8147f875..b3dc1539 100644 --- a/3D/Maps/Fusion.map +++ b/3D/Maps/Fusion.map @@ -1424,8 +1424,3 @@ "target" "break_room" "activationtype" "Toggle" } -// entity 50 -{ -"classname" "actor_controlpad" -"origin" "-28 228 36" -} diff --git a/3D/TrenchBroom/EntityDefinitions/base/activation_type_base.tres b/3D/TrenchBroom/EntityDefinitions/base/activation_type_base.tres index a8351af2..30233508 100644 --- a/3D/TrenchBroom/EntityDefinitions/base/activation_type_base.tres +++ b/3D/TrenchBroom/EntityDefinitions/base/activation_type_base.tres @@ -8,13 +8,13 @@ classname = "ActivationType" description = "Activation Type" class_properties = Dictionary[String, Variant]({ "activationtype": { -"Toggle": "Toggle", -"Enable": "Enable", -"Disable": "Disable", -"Use": "Use", -"Destroy": "Destroy", -"Open": "Open", "Close": "Close", +"Destroy": "Destroy", +"Disable": "Disable", +"Enable": "Enable", +"Open": "Open", +"Toggle": "Toggle", +"Use": "Use" } }) class_property_descriptions = Dictionary[String, Variant]({ diff --git a/Dialogue/Styles/Layers/Terminal_Textbox/TextboxWithPortrait/custom_textbox_with_portrait_.tscn b/Dialogue/Styles/Layers/Terminal_Textbox/TextboxWithPortrait/custom_textbox_with_portrait_.tscn index a4c4d742..8cc70837 100644 --- a/Dialogue/Styles/Layers/Terminal_Textbox/TextboxWithPortrait/custom_textbox_with_portrait_.tscn +++ b/Dialogue/Styles/Layers/Terminal_Textbox/TextboxWithPortrait/custom_textbox_with_portrait_.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=8 format=3 uid="uid://d3dusydsn1qjd"] +[gd_scene load_steps=10 format=3 uid="uid://d3dusydsn1qjd"] [ext_resource type="Script" uid="uid://cfcx0of1aekhk" path="res://addons/dialogic/Modules/Character/node_portrait_container.gd" id="1_4jxq7"] [ext_resource type="Script" uid="uid://dmxeo7lm8ftsi" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_SpeakerPortraitTextbox/speaker_portrait_textbox_layer.gd" id="1_7jt4d"] @@ -6,6 +6,7 @@ [ext_resource type="Script" uid="uid://be3h8wr0w68dx" path="res://addons/dialogic/Modules/Text/node_name_label.gd" id="2_y0h34"] [ext_resource type="Script" uid="uid://ddkvkdb6nxtyi" path="res://addons/dialogic/Modules/Text/node_dialog_text.gd" id="3_11puy"] [ext_resource type="Script" uid="uid://bkfrnlul8c6cv" path="res://addons/dialogic/Modules/Text/node_type_sound.gd" id="5_sr2qw"] +[ext_resource type="Shader" uid="uid://bee5btjyyqer2" path="res://Shaders/CRT_Menu.gdshader" id="7_0wct5"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_dmg1w"] bg_color = Color(0.254902, 0.254902, 0.254902, 1) @@ -15,6 +16,13 @@ corner_radius_top_right = 3 corner_radius_bottom_right = 3 corner_radius_bottom_left = 3 +[sub_resource type="ShaderMaterial" id="ShaderMaterial_t1cgn"] +shader = ExtResource("7_0wct5") +shader_parameter/scanline_count = 135.714006446415 +shader_parameter/x_curve = 10.0 +shader_parameter/y_curve = 10.0 +shader_parameter/aberration_strength = 0.037000239257499956 + [node name="TextboxWithSpeakerPortrait" type="Control"] layout_mode = 3 anchors_preset = 15 @@ -126,4 +134,9 @@ script = ExtResource("3_11puy") textbox_root = NodePath("../../..") [node name="DialogicNode_TypeSounds" type="AudioStreamPlayer" parent="Anchor/Panel/HBox/VBoxContainer/DialogicNode_DialogText"] +bus = &"Voice" script = ExtResource("5_sr2qw") + +[node name="ColorRect" type="ColorRect" parent="Anchor/Panel"] +material = SubResource("ShaderMaterial_t1cgn") +layout_mode = 2 diff --git a/IsoTest/Factory4.tscn b/IsoTest/Factory4.tscn index 38f5dd47..ea09e17b 100644 --- a/IsoTest/Factory4.tscn +++ b/IsoTest/Factory4.tscn @@ -2619,7 +2619,6 @@ Script = ExtResource("51_75vcj") ActivationGroup = "danmaku_room_1" EmitOnStart = false Indestructible = true -ActivationType = 6 [node name="entity_44_actor_tank_large" parent="FuncGodotMap" instance=ExtResource("52_m41gm")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 8.5, 2, -3.75) @@ -2713,15 +2712,11 @@ TargetGroup = "camera_1" [node name="entity_66_actor_securitycamera" parent="FuncGodotMap" instance=ExtResource("65_tuguo")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -7, 2.25, 4) -ActivationType = 6 DamageResistances = Array[ExtResource("66_bk01g")]([]) -ActivationType = 6 [node name="entity_67_actor_securitycamera" parent="FuncGodotMap" instance=ExtResource("65_tuguo")] transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, -20, 2.25, 14.25) -ActivationType = 6 DamageResistances = Array[ExtResource("66_bk01g")]([]) -ActivationType = 6 [node name="entity_68_actor_teleporter" parent="FuncGodotMap" instance=ExtResource("12_mtei5")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -12, 1.0625, 5) @@ -2729,7 +2724,6 @@ transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -12, [node name="entity_69_actor_emitter_wall" parent="FuncGodotMap" instance=ExtResource("67_flmyo")] transform = Transform3D(1, 0, 1.7484555e-07, 0, 1, 0, -1.7484555e-07, 0, 1, -5.25, 1.25, 4.25) EmitOnStart = false -ActivationType = 6 [node name="entity_70_actor_tank_large" parent="FuncGodotMap" instance=ExtResource("52_m41gm")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 20.5, 2, 5) @@ -2740,27 +2734,22 @@ transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 20.5 [node name="entity_72_actor_box_blue_tall" parent="FuncGodotMap" instance=ExtResource("68_v32ux")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 15, 1.5625, 3) Health = 10.0 -ActivationType = 6 [node name="entity_73_actor_box_blue_tall" parent="FuncGodotMap" instance=ExtResource("68_v32ux")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 14.5, 1.5625, -1) Health = 10.0 -ActivationType = 6 [node name="entity_74_actor_box_blue" parent="FuncGodotMap" instance=ExtResource("69_e0jxh")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 9, 1.25, 15.5) Health = 10.0 -ActivationType = 6 [node name="entity_75_actor_box_yellow" parent="FuncGodotMap" instance=ExtResource("70_xhmq5")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 12, 1.25, 6) Health = 10.0 -ActivationType = 6 [node name="entity_76_actor_box_yellow" parent="FuncGodotMap" instance=ExtResource("70_xhmq5")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 12, 1.75, 6) Health = 10.0 -ActivationType = 6 [node name="entity_77_solid_bullet_permeable" type="StaticBody3D" parent="FuncGodotMap"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18.25, 3.875, 4.375) @@ -2804,7 +2793,6 @@ Script = ExtResource("72_flmyo") ActivationGroup = "camera_1" EmitOnStart = false Health = 6.0 -ActivationType = 6 [node name="entity_84_actor_capacitor" parent="FuncGodotMap" instance=ExtResource("57_o843m")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 19.5, 4, -0.5) @@ -2821,73 +2809,60 @@ transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 21, [node name="entity_88_actor_box_blue_tall" parent="FuncGodotMap" instance=ExtResource("68_v32ux")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 19.25, 4.0625, 5) Health = 10.0 -ActivationType = 6 [node name="entity_89_actor_box_blue" parent="FuncGodotMap" instance=ExtResource("69_e0jxh")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 20.25, 3.75, 5.5) Health = 10.0 -ActivationType = 6 [node name="entity_90_actor_box_red" parent="FuncGodotMap" instance=ExtResource("74_sx5yh")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 19.25, 3.75, 6) Health = 10.0 -ActivationType = 6 [node name="entity_91_actor_box_green" parent="FuncGodotMap" instance=ExtResource("75_ky75o")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 20.25, 3.75, 6.5) Health = 10.0 -ActivationType = 6 [node name="entity_92_actor_barrel_1" parent="FuncGodotMap" instance=ExtResource("76_hiw3o")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12.5, 1.5, 5) Health = 10.0 DamageResistances = Array[ExtResource("66_bk01g")]([]) -ActivationType = 6 [node name="entity_93_actor_barrel_1" parent="FuncGodotMap" instance=ExtResource("76_hiw3o")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12.75, 1.5, 6) Health = 10.0 DamageResistances = Array[ExtResource("66_bk01g")]([]) -ActivationType = 6 [node name="entity_94_actor_barrel_1" parent="FuncGodotMap" instance=ExtResource("76_hiw3o")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.75, 1.5, 10.75) Health = 10.0 DamageResistances = Array[ExtResource("66_bk01g")]([]) -ActivationType = 6 [node name="entity_95_actor_barrel_1" parent="FuncGodotMap" instance=ExtResource("76_hiw3o")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18.5, 4, 5) Health = 10.0 DamageResistances = Array[ExtResource("66_bk01g")]([]) -ActivationType = 6 [node name="entity_96_actor_barrel_1" parent="FuncGodotMap" instance=ExtResource("76_hiw3o")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18.5, 4, 5.75) Health = 10.0 DamageResistances = Array[ExtResource("66_bk01g")]([]) -ActivationType = 6 [node name="entity_97_actor_barrel_1" parent="FuncGodotMap" instance=ExtResource("76_hiw3o")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18, 4, 5.5) Health = 10.0 DamageResistances = Array[ExtResource("66_bk01g")]([]) -ActivationType = 6 [node name="entity_98_actor_box_blue_tall" parent="FuncGodotMap" instance=ExtResource("68_v32ux")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 21, 4.0625, -11.5) Health = 10.0 -ActivationType = 6 [node name="entity_99_actor_box_blue_tall" parent="FuncGodotMap" instance=ExtResource("68_v32ux")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 25, 4.0625, -18.5) Health = 10.0 -ActivationType = 6 [node name="entity_100_actor_emitter_wall" parent="FuncGodotMap" instance=ExtResource("67_flmyo")] transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, 25.375, 3.75, -14.25) EmitOnStart = false -ActivationType = 6 [node name="entity_101_solid_bullet_permeable" type="StaticBody3D" parent="FuncGodotMap"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8.25, 1.375, 3.875) @@ -3036,40 +3011,32 @@ TargetGroup = "door_5" [node name="entity_122_actor_securitycamera" parent="FuncGodotMap" instance=ExtResource("65_tuguo")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 1.5, 4.75, -17) TargetGroup = "camera_keycard_room" -ActivationType = 6 DamageResistances = Array[ExtResource("66_bk01g")]([]) -ActivationType = 6 TargetGroup = "camera_keycard_room" [node name="entity_123_actor_box_red" parent="FuncGodotMap" instance=ExtResource("74_sx5yh")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 1.5, 3.75, -13.5) Health = 10.0 -ActivationType = 6 [node name="entity_124_actor_box_blue_tall" parent="FuncGodotMap" instance=ExtResource("68_v32ux")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.75, 4.0625, -10.75) Health = 10.0 -ActivationType = 6 [node name="entity_125_actor_box_blue_tall" parent="FuncGodotMap" instance=ExtResource("68_v32ux")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 4.0625, -16) Health = 10.0 -ActivationType = 6 [node name="entity_126_actor_box_green" parent="FuncGodotMap" instance=ExtResource("75_ky75o")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 2.75, 3.75, -12) Health = 10.0 -ActivationType = 6 [node name="entity_127_actor_box_blue" parent="FuncGodotMap" instance=ExtResource("69_e0jxh")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0.5, 3.75, -12) Health = 10.0 -ActivationType = 6 [node name="entity_128_actor_box_blue" parent="FuncGodotMap" instance=ExtResource("69_e0jxh")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 1.5, 3.75, -12) Health = 10.0 -ActivationType = 6 [node name="entity_129_actor_table" parent="FuncGodotMap" instance=ExtResource("13_bv7qr")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0.75, 3.75, -9.75) @@ -3083,27 +3050,22 @@ transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0.75 [node name="entity_132_actor_box_wood" parent="FuncGodotMap" instance=ExtResource("95_dbn2g")] transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, 2.25, 3.75, -9.5) Health = 10.0 -ActivationType = 6 [node name="entity_133_actor_box_wood" parent="FuncGodotMap" instance=ExtResource("95_dbn2g")] transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, 2.25, 3.75, -8.5) Health = 10.0 -ActivationType = 6 [node name="entity_134_actor_box_wood" parent="FuncGodotMap" instance=ExtResource("95_dbn2g")] transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, 3, 3.75, -8) Health = 10.0 -ActivationType = 6 [node name="entity_135_actor_box_wood" parent="FuncGodotMap" instance=ExtResource("95_dbn2g")] transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, 2.25, 3.75, -7.5) Health = 10.0 -ActivationType = 6 [node name="entity_136_actor_box_wood" parent="FuncGodotMap" instance=ExtResource("95_dbn2g")] transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, 3, 3.75, -9) Health = 10.0 -ActivationType = 6 [node name="entity_137_actor_locker" parent="FuncGodotMap" instance=ExtResource("14_14ntx")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0, 4.25, -16.75) @@ -3158,12 +3120,10 @@ Billboard = true [node name="entity_152_actor_box_blue_tall" parent="FuncGodotMap" instance=ExtResource("68_v32ux")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5, 1.5625, 11) Health = 10.0 -ActivationType = 6 [node name="entity_153_actor_box_blue_tall" parent="FuncGodotMap" instance=ExtResource("68_v32ux")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3, 1.5625, 11) Health = 10.0 -ActivationType = 6 [node name="entity_154_solid_bullet_permeable" type="StaticBody3D" parent="FuncGodotMap"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.125, 1.375, 10.75) @@ -3316,19 +3276,16 @@ LootKeys = Array[StringName]([&"ICE_AMMO"]) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 19.25, 1.5, 15.25) Health = 10.0 DamageResistances = Array[ExtResource("66_bk01g")]([]) -ActivationType = 6 [node name="entity_173_actor_barrel_1" parent="FuncGodotMap" instance=ExtResource("76_hiw3o")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 19.75, 1.5, 13.5) Health = 10.0 DamageResistances = Array[ExtResource("66_bk01g")]([]) -ActivationType = 6 [node name="entity_174_actor_barrel_1" parent="FuncGodotMap" instance=ExtResource("76_hiw3o")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 17.5, 1.5, 15) Health = 10.0 DamageResistances = Array[ExtResource("66_bk01g")]([]) -ActivationType = 6 [node name="entity_175_marker_spawn_item" type="Marker3D" parent="FuncGodotMap"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.5, 3.875, -16) @@ -3444,17 +3401,14 @@ transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, 2.5, [node name="entity_191_actor_box_red" parent="FuncGodotMap" instance=ExtResource("74_sx5yh")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 5, 1.25, 16) Health = 10.0 -ActivationType = 6 [node name="entity_192_actor_box_blue" parent="FuncGodotMap" instance=ExtResource("69_e0jxh")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 4, 1.25, 15.75) Health = 10.0 -ActivationType = 6 [node name="entity_193_actor_box_blue" parent="FuncGodotMap" instance=ExtResource("69_e0jxh")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 6.25, 1.25, 12.5) Health = 10.0 -ActivationType = 6 [node name="entity_194_marker_spawn_enemy_fairy_small" type="Marker3D" parent="FuncGodotMap"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 3.875, -9.5) @@ -3475,7 +3429,6 @@ Billboard = true [node name="entity_196_actor_controlpad" parent="FuncGodotMap" instance=ExtResource("94_cw08v")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 16, 2, -6) TargetGroup = "elevator_test" -ActivationType = 6 [node name="entity_197_actor_dialogue" parent="FuncGodotMap" instance=ExtResource("104_fsha6")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 1, 1.75, -3) diff --git a/IsoTest/IsoMapTest2.tscn b/IsoTest/IsoMapTest2.tscn index 7874b509..b07f13de 100644 --- a/IsoTest/IsoMapTest2.tscn +++ b/IsoTest/IsoMapTest2.tscn @@ -69,7 +69,6 @@ transform = Transform3D(0.7071067, -0.41562688, 0.57206136, 0, 0.80901694, 0.587 projection = 1 size = 8.0 script = ExtResource("1_g4gcm") -SnapCamera = false MaxAimOffsetDistance = 16.0 CameraOffset = Vector3(8, 8, 8) TargetPath = NodePath("../CameraTarget") diff --git a/Resources/Styles/Terminal_Style_Box.tres b/Resources/Styles/Terminal_Style_Box.tres index 5d6e9ce8..2b74d8f3 100644 --- a/Resources/Styles/Terminal_Style_Box.tres +++ b/Resources/Styles/Terminal_Style_Box.tres @@ -4,10 +4,9 @@ [resource] texture = ExtResource("1_owepd") -texture_margin_left = 8.0 -texture_margin_top = 8.0 -texture_margin_right = 8.0 -texture_margin_bottom = 8.0 +texture_margin_left = 16.0 +texture_margin_top = 16.0 +texture_margin_right = 16.0 +texture_margin_bottom = 16.0 axis_stretch_horizontal = 2 axis_stretch_vertical = 2 -modulate_color = Color(1, 1, 1, 0.847059) diff --git a/Scenes/HUD/HUD.tscn b/Scenes/HUD/HUD.tscn index 272059c0..79f269c2 100644 --- a/Scenes/HUD/HUD.tscn +++ b/Scenes/HUD/HUD.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=38 format=3 uid="uid://dkwi1hu1bixoe"] +[gd_scene load_steps=41 format=3 uid="uid://dkwi1hu1bixoe"] [ext_resource type="Script" uid="uid://baf6pxbvhqmjk" path="res://Scripts/Hud.cs" id="1_m0hb0"] [ext_resource type="PackedScene" uid="uid://dsaj5dx82brsg" path="res://Scenes/HUD/UiSelector.tscn" id="2_jidad"] @@ -26,9 +26,11 @@ [ext_resource type="Texture2D" uid="uid://duwiasewxvcb5" path="res://Sprites/Items/Icicle_Gun.png" id="19_h6xwv"] [ext_resource type="Texture2D" uid="uid://c8fr1ea20odaw" path="res://Sprites/Items/Heart_Extend.png" id="19_j6myr"] [ext_resource type="Texture2D" uid="uid://cid62phhew3ep" path="res://Sprites/UI/StatusSprite02.png" id="19_n0pka"] +[ext_resource type="StyleBox" uid="uid://dprati3kf7gdg" path="res://Resources/Styles/Terminal_Style_Box.tres" id="20_0ncp3"] [ext_resource type="Script" uid="uid://bv1fkn7qiyyr1" path="res://Scripts/UI/StatusMenu.cs" id="20_qo5e4"] [ext_resource type="Texture2D" uid="uid://8n23xie4kore" path="res://Sprites/Items/Shield_Pickup.png" id="22_5cvcb"] [ext_resource type="Texture2D" uid="uid://cvc0x4bbnhusw" path="res://Sprites/Items/Ice_Crystal_Shield.png" id="22_jefn6"] +[ext_resource type="Shader" uid="uid://bee5btjyyqer2" path="res://Shaders/CRT_Menu.gdshader" id="29_m7rbi"] [sub_resource type="LabelSettings" id="LabelSettings_a7f6n"] font = ExtResource("7_jefn6") @@ -88,6 +90,13 @@ texture_margin_bottom = 3.0 [sub_resource type="LabelSettings" id="LabelSettings_bkqle"] font_color = Color(0, 0.737255, 0.113725, 1) +[sub_resource type="ShaderMaterial" id="ShaderMaterial_0ncp3"] +shader = ExtResource("29_m7rbi") +shader_parameter/scanline_count = 358.8470170452325 +shader_parameter/x_curve = 10.0 +shader_parameter/y_curve = 10.0 +shader_parameter/aberration_strength = 0.6140002666650002 + [node name="HUD" type="CanvasLayer" node_paths=PackedStringArray("_healthLabel", "_healthBar", "_shieldLabel", "_shieldBar", "_motivationLabel", "_itemsContainer", "_gameOverPanel", "_fairyTerminatedPanel", "_hudInfoPanel", "NotificationsContainer", "WeaponContainer", "PauseMenuContainer", "DebugMenuHolder")] process_mode = 3 script = ExtResource("1_m0hb0") @@ -311,12 +320,26 @@ offset_top = 26.0 offset_right = 226.0 offset_bottom = 144.0 -[node name="InventoryMenu" type="TabContainer" parent="."] -visible = false -offset_left = 16.0 -offset_top = 9.0 -offset_right = 305.0 -offset_bottom = 153.0 +[node name="Control" type="Panel" parent="."] +offset_left = 30.0 +offset_top = 24.0 +offset_right = 354.0 +offset_bottom = 198.0 +theme_override_styles/panel = ExtResource("20_0ncp3") + +[node name="InventoryMenu" type="TabContainer" parent="Control"] +layout_mode = 1 +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = -151.0 +offset_top = -74.0 +offset_right = 149.0 +offset_bottom = 75.0 +grow_horizontal = 2 +grow_vertical = 2 mouse_filter = 2 theme = ExtResource("9_sx5r0") theme_override_fonts/font = ExtResource("6_sk1eq") @@ -324,7 +347,7 @@ current_tab = 4 script = ExtResource("11_7pulb") metadata/_edit_group_ = true -[node name="Weapons" type="ItemList" parent="InventoryMenu"] +[node name="Weapons" type="ItemList" parent="Control/InventoryMenu"] visible = false layout_mode = 2 theme = ExtResource("9_sx5r0") @@ -336,7 +359,7 @@ script = ExtResource("10_oflr6") ItemsFilter = Array[int]([9]) metadata/_tab_index = 0 -[node name="Consumables" type="ItemList" parent="InventoryMenu"] +[node name="Consumables" type="ItemList" parent="Control/InventoryMenu"] visible = false layout_mode = 2 theme = ExtResource("9_sx5r0") @@ -348,7 +371,7 @@ script = ExtResource("10_oflr6") ItemsFilter = Array[int]([4, 5, 8, 7, 6]) metadata/_tab_index = 1 -[node name="Ammo" type="ItemList" parent="InventoryMenu"] +[node name="Ammo" type="ItemList" parent="Control/InventoryMenu"] visible = false layout_mode = 2 theme = ExtResource("9_sx5r0") @@ -360,7 +383,7 @@ script = ExtResource("10_oflr6") ItemsFilter = Array[int]([3]) metadata/_tab_index = 2 -[node name="Key" type="ItemList" parent="InventoryMenu"] +[node name="Key" type="ItemList" parent="Control/InventoryMenu"] visible = false layout_mode = 2 theme = ExtResource("9_sx5r0") @@ -372,7 +395,7 @@ script = ExtResource("10_oflr6") ItemsFilter = Array[int]([0, 1, 2, 13, 10, 11, 12]) metadata/_tab_index = 3 -[node name="Status" type="PanelContainer" parent="InventoryMenu" node_paths=PackedStringArray("HealthExpansionCounter", "ShieldExpansionCounter", "WeaponButton")] +[node name="Status" type="PanelContainer" parent="Control/InventoryMenu" node_paths=PackedStringArray("HealthExpansionCounter", "ShieldExpansionCounter", "WeaponButton")] layout_mode = 2 theme = ExtResource("9_sx5r0") theme_override_styles/panel = ExtResource("13_sjdna") @@ -384,32 +407,32 @@ ShieldExpansionCounter = NodePath("MarginContainer/HBoxContainer/VBoxContainer3/ WeaponButton = NodePath("MarginContainer/HBoxContainer/VBoxContainer2/EquippedWeapon") metadata/_tab_index = 4 -[node name="MarginContainer" type="MarginContainer" parent="InventoryMenu/Status"] +[node name="MarginContainer" type="MarginContainer" parent="Control/InventoryMenu/Status"] layout_mode = 2 theme_override_constants/margin_left = 32 theme_override_constants/margin_right = 32 -[node name="HBoxContainer" type="HBoxContainer" parent="InventoryMenu/Status/MarginContainer"] +[node name="HBoxContainer" type="HBoxContainer" parent="Control/InventoryMenu/Status/MarginContainer"] layout_mode = 2 alignment = 1 -[node name="VBoxContainer2" type="VBoxContainer" parent="InventoryMenu/Status/MarginContainer/HBoxContainer"] +[node name="VBoxContainer2" type="VBoxContainer" parent="Control/InventoryMenu/Status/MarginContainer/HBoxContainer"] layout_mode = 2 size_flags_horizontal = 2 alignment = 1 -[node name="EquippedWeapon" type="Button" parent="InventoryMenu/Status/MarginContainer/HBoxContainer/VBoxContainer2"] +[node name="EquippedWeapon" type="Button" parent="Control/InventoryMenu/Status/MarginContainer/HBoxContainer/VBoxContainer2"] layout_mode = 2 text = "IC-9 " icon = ExtResource("19_h6xwv") -[node name="VBoxContainer3" type="VBoxContainer" parent="InventoryMenu/Status/MarginContainer/HBoxContainer"] +[node name="VBoxContainer3" type="VBoxContainer" parent="Control/InventoryMenu/Status/MarginContainer/HBoxContainer"] layout_mode = 2 size_flags_horizontal = 10 alignment = 1 -[node name="Shield" type="Button" parent="InventoryMenu/Status/MarginContainer/HBoxContainer/VBoxContainer3"] +[node name="Shield" type="Button" parent="Control/InventoryMenu/Status/MarginContainer/HBoxContainer/VBoxContainer3"] layout_mode = 2 theme_override_constants/line_spacing = -4 text = "Ice @@ -417,41 +440,55 @@ Crystal" icon = ExtResource("22_jefn6") alignment = 0 -[node name="HBoxContainer" type="HBoxContainer" parent="InventoryMenu/Status/MarginContainer/HBoxContainer/VBoxContainer3"] +[node name="HBoxContainer" type="HBoxContainer" parent="Control/InventoryMenu/Status/MarginContainer/HBoxContainer/VBoxContainer3"] layout_mode = 2 -[node name="HealthExtensions" type="Button" parent="InventoryMenu/Status/MarginContainer/HBoxContainer/VBoxContainer3/HBoxContainer"] +[node name="HealthExtensions" type="Button" parent="Control/InventoryMenu/Status/MarginContainer/HBoxContainer/VBoxContainer3/HBoxContainer"] layout_mode = 2 text = "x2" icon = ExtResource("19_j6myr") alignment = 0 -[node name="ShieldExtensions" type="Button" parent="InventoryMenu/Status/MarginContainer/HBoxContainer/VBoxContainer3/HBoxContainer"] +[node name="ShieldExtensions" type="Button" parent="Control/InventoryMenu/Status/MarginContainer/HBoxContainer/VBoxContainer3/HBoxContainer"] layout_mode = 2 text = "x1" icon = ExtResource("22_5cvcb") alignment = 0 -[node name="VBoxContainer" type="VBoxContainer" parent="InventoryMenu/Status"] +[node name="VBoxContainer" type="VBoxContainer" parent="Control/InventoryMenu/Status"] custom_minimum_size = Vector2(96, 0) layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 3 -[node name="Label" type="Label" parent="InventoryMenu/Status/VBoxContainer"] +[node name="Label" type="Label" parent="Control/InventoryMenu/Status/VBoxContainer"] layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 0 text = "CIRNO" label_settings = SubResource("LabelSettings_bkqle") -[node name="TextureRect" type="TextureRect" parent="InventoryMenu/Status/VBoxContainer"] +[node name="TextureRect" type="TextureRect" parent="Control/InventoryMenu/Status/VBoxContainer"] layout_mode = 2 size_flags_vertical = 3 texture = ExtResource("19_n0pka") expand_mode = 1 stretch_mode = 3 +[node name="ColorRect" type="ColorRect" parent="Control"] +material = SubResource("ShaderMaterial_0ncp3") +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_left = 12.0 +offset_top = 12.0 +offset_right = -12.0 +offset_bottom = -12.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 + [node name="FPS" type="Label" parent="."] z_index = 20 z_as_relative = false @@ -465,4 +502,4 @@ text = "1234" label_settings = ExtResource("2_x7kl7") script = ExtResource("15_x61tu") -[connection signal="pressed" from="InventoryMenu/Status/MarginContainer/HBoxContainer/VBoxContainer2/EquippedWeapon" to="InventoryMenu/Weapons" method="show"] +[connection signal="pressed" from="Control/InventoryMenu/Status/MarginContainer/HBoxContainer/VBoxContainer2/EquippedWeapon" to="Control/InventoryMenu/Weapons" method="show"] diff --git a/Shaders/CRT_Menu.gdshader b/Shaders/CRT_Menu.gdshader new file mode 100644 index 00000000..b9f856c5 --- /dev/null +++ b/Shaders/CRT_Menu.gdshader @@ -0,0 +1,37 @@ +//---CRT Shader--- +shader_type canvas_item; + +uniform float scanline_count : hint_range(0, 1800) = 50.0; +uniform sampler2D SCREEN_TEXTURE : hint_screen_texture, filter_linear_mipmap; +uniform float x_curve: hint_range(1.0, 10.0) = 3.0; +uniform float y_curve: hint_range(1.0, 10.0) = 3.0; + +uniform float aberration_strength: hint_range(-5.0, 5.0) = 3.0; + + +vec2 uv_curve(vec2 uv) +{ + uv = (uv - 0.5) * 2.0; + + //You can modify the numbers and try different values + uv.x *= 1.0 + pow(abs(uv.y) / x_curve, 2.0); + uv.y *= 1.0 + pow(abs(uv.x) / y_curve, 2.0); + + uv = (uv/2.0) + 0.5; + return uv; +} + +void fragment() +{ + //You can modify the *3.0, *-3.0 for a bigger or smaller + float r = texture(SCREEN_TEXTURE, uv_curve(SCREEN_UV) + vec2(SCREEN_PIXEL_SIZE.x * 0.0), 0.0).r; + float g = texture(SCREEN_TEXTURE, uv_curve(SCREEN_UV) + vec2(SCREEN_PIXEL_SIZE.x * aberration_strength), 0.0).g; + float b = texture(SCREEN_TEXTURE, uv_curve(SCREEN_UV) + vec2(SCREEN_PIXEL_SIZE.x *-aberration_strength), 0.0).b; + + //If you dont want scanlines you can just delete this part + float s = sin(uv_curve(SCREEN_UV).y * scanline_count * PI * 2.0); + s = (s * 0.5 + 0.5) * 0.9 + 0.1; + vec4 scan_line = vec4(vec3(pow(s, 0.25)), 1.0); + + COLOR = vec4(r, g, b, 1.0) * scan_line; +} \ No newline at end of file diff --git a/Shaders/CRT_Menu.gdshader.uid b/Shaders/CRT_Menu.gdshader.uid new file mode 100644 index 00000000..f0c65a99 --- /dev/null +++ b/Shaders/CRT_Menu.gdshader.uid @@ -0,0 +1 @@ +uid://bee5btjyyqer2 diff --git a/Sprites/UI/Terminal_Slice.aseprite b/Sprites/UI/Terminal_Slice.aseprite index 03223add..b54f4a8e 100644 --- a/Sprites/UI/Terminal_Slice.aseprite +++ b/Sprites/UI/Terminal_Slice.aseprite @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c63b14cbe9a45c54443150006907cc5069ac2db4b3f1c8a2092fff36bfea4ba9 -size 1198 +oid sha256:ffc36a4d3329dcf7671d61918a8ff811a1d2f9cad413c2b748121653937a2380 +size 770 diff --git a/Sprites/UI/Terminal_Slice.png b/Sprites/UI/Terminal_Slice.png index 787372c4..9afa8b18 100644 --- a/Sprites/UI/Terminal_Slice.png +++ b/Sprites/UI/Terminal_Slice.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b53595fbddb8795e06e266e92c0b2004002f02e76eec796b717691b68c8091f0 -size 213 +oid sha256:c757359506c265b16f9985a453ece21c8ec1c6c506c7d89a698a1a684357d85b +size 529 diff --git a/Sprites/UI/Terminal_Slice.png.import b/Sprites/UI/Terminal_Slice.png.import index 199961f3..dafe5f09 100644 --- a/Sprites/UI/Terminal_Slice.png.import +++ b/Sprites/UI/Terminal_Slice.png.import @@ -18,6 +18,8 @@ dest_files=["res://.godot/imported/Terminal_Slice.png-9aada730e34b074a11be4095d3 compress/mode=0 compress/high_quality=false compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 @@ -25,6 +27,10 @@ mipmaps/generate=false mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 process/fix_alpha_border=true process/premult_alpha=false process/normal_map_invert_y=false