diff --git a/Game/Assets/HUD/Croshair.tres b/Game/Assets/HUD/Croshair.tres index bcfe365..7fc1f29 100644 --- a/Game/Assets/HUD/Croshair.tres +++ b/Game/Assets/HUD/Croshair.tres @@ -1,27 +1,19 @@ [gd_resource type="VisualShader" load_steps=6 format=3 uid="uid://dos1mlwtb3tju"] [sub_resource type="VisualShaderNodeColorFunc" id="VisualShaderNodeColorFunc_15wpt"] -default_input_values = [0, Vector3(0, 0, 0)] -expanded_output_ports = [] [sub_resource type="VisualShaderNodeSwitch" id="VisualShaderNodeSwitch_w5e8y"] default_input_values = [0, false, 1, Vector3(1, 1, 1), 2, Vector3(0, 0, 0)] -expanded_output_ports = [] op_type = 2 [sub_resource type="VisualShaderNodeCompare" id="VisualShaderNodeCompare_8o1qy"] default_input_values = [0, 0.0, 1, 0.9, 2, 1e-05] -expanded_output_ports = [] function = 4 [sub_resource type="VisualShaderNodeInput" id="VisualShaderNodeInput_0xt2k"] -default_input_values = [] -expanded_output_ports = [] input_name = "screen_uv" [sub_resource type="VisualShaderNodeTexture" id="VisualShaderNodeTexture_33whc"] -default_input_values = [] -expanded_output_ports = [] source = 1 [resource] diff --git a/Game/Main.tscn b/Game/Main.tscn index 8bc6677..a5ad4f3 100644 --- a/Game/Main.tscn +++ b/Game/Main.tscn @@ -8,77 +8,51 @@ [ext_resource type="Script" path="res://Assets/Announcer/Announcer.gd" id="6_gcsgr"] [sub_resource type="VisualShaderNodeFloatFunc" id="VisualShaderNodeFloatFunc_6ihsi"] -default_input_values = [0, 0.0] -expanded_output_ports = [] function = 31 [sub_resource type="VisualShaderNodeFloatOp" id="VisualShaderNodeFloatOp_4sg8c"] -default_input_values = [0, 0.0, 1, 0.0] -expanded_output_ports = [] operator = 7 [sub_resource type="VisualShaderNodeSmoothStep" id="VisualShaderNodeSmoothStep_cq3b8"] output_port_for_preview = 0 default_input_values = [0, -0.25, 1, 0.25, 2, 0.0] -expanded_output_ports = [] [sub_resource type="VisualShaderNodeFloatOp" id="VisualShaderNodeFloatOp_ibeng"] output_port_for_preview = 0 -default_input_values = [0, 0.0, 1, 0.0] -expanded_output_ports = [] operator = 2 [sub_resource type="VisualShaderNodeFloatUniform" id="VisualShaderNodeFloatUniform_64m16"] -default_input_values = [] -expanded_output_ports = [] uniform_name = "Depth" [sub_resource type="VisualShaderNodeSmoothStep" id="VisualShaderNodeSmoothStep_1syv6"] -default_input_values = [0, 0.0, 1, 0.0, 2, 0.0] -expanded_output_ports = [] [sub_resource type="VisualShaderNodeFloatUniform" id="VisualShaderNodeFloatUniform_gmj03"] -default_input_values = [] -expanded_output_ports = [] uniform_name = "Damage" [sub_resource type="VisualShaderNodeFloatFunc" id="VisualShaderNodeFloatFunc_g75xc"] -default_input_values = [0, 0.0] -expanded_output_ports = [] function = 31 [sub_resource type="VisualShaderNodeColorConstant" id="VisualShaderNodeColorConstant_awhie"] -default_input_values = [] -expanded_output_ports = [] constant = Color(1, 0.118141, 0, 1) [sub_resource type="VisualShaderNodeInput" id="VisualShaderNodeInput_hcnqy"] output_port_for_preview = 0 -default_input_values = [] -expanded_output_ports = [] input_name = "uv" [sub_resource type="VisualShaderNodeVectorDecompose" id="VisualShaderNodeVectorDecompose_c1wnt"] output_port_for_preview = 0 -default_input_values = [0, Vector3(0, 0, 0)] -expanded_output_ports = [] [sub_resource type="VisualShaderNodeSmoothStep" id="VisualShaderNodeSmoothStep_4gtfo"] output_port_for_preview = 0 default_input_values = [0, -0.25, 1, 0.25, 2, 0.0] -expanded_output_ports = [] [sub_resource type="VisualShaderNodeFloatFunc" id="VisualShaderNodeFloatFunc_bp0gw"] -default_input_values = [0, 0.0] -expanded_output_ports = [] function = 31 [sub_resource type="VisualShaderNodeFloatOp" id="VisualShaderNodeFloatOp_wvp6b"] -default_input_values = [0, 0.0, 1, 0.0] -expanded_output_ports = [] operator = 7 -[sub_resource type="VisualShader" id="VisualShader_6cwap"] +[sub_resource type="VisualShader" id="VisualShader_nmuki"] resource_local_to_scene = true code = "shader_type canvas_item; render_mode skip_vertex_transform, unshaded; @@ -198,56 +172,30 @@ nodes/fragment/18/node = SubResource( "VisualShaderNodeColorConstant_awhie" ) nodes/fragment/18/position = Vector2(1600, -400) nodes/fragment/connections = PackedInt32Array(2, 0, 4, 0, 8, 0, 9, 0, 9, 0, 7, 2, 10, 0, 11, 0, 4, 1, 8, 0, 4, 1, 9, 1, 4, 0, 10, 0, 4, 0, 11, 1, 11, 0, 12, 2, 12, 0, 13, 0, 7, 0, 13, 1, 14, 0, 12, 1, 14, 0, 7, 1, 13, 0, 15, 2, 16, 0, 15, 1, 15, 0, 17, 0, 17, 0, 0, 1, 18, 0, 0, 0) -[sub_resource type="ShaderMaterial" id="ShaderMaterial_q54x5"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_4ynd0"] resource_local_to_scene = true -shader = SubResource( "VisualShader_6cwap" ) -shader_param/Damage = 0.0 +shader = SubResource( "VisualShader_nmuki" ) shader_param/Depth = 0.33 +shader_param/Damage = 0.0 [node name="Main" type="Node"] script = ExtResource( "3" ) [node name="HUD" parent="." instance=ExtResource( "4" )] -[node name="EyeBleed" parent="HUD/Damage" index="0"] -material = SubResource( "ShaderMaterial_q54x5" ) - -[node name="AnimationPlayer" parent="HUD/Crosshair" index="3"] -blend_times = [] - -[node name="ChatHistory" parent="HUD/Chat/VBoxContainer" index="0"] -custom_effects = [] -structured_text_bidi_override_options = [] - -[node name="Label" parent="HUD/Chat/VBoxContainer/Typing" index="0"] -structured_text_bidi_override_options = [] - -[node name="Editor" parent="HUD/Chat/VBoxContainer/Typing" index="1"] -structured_text_bidi_override_options = [] - -[node name="RespawnCountdown" parent="HUD" index="4"] -structured_text_bidi_override_options = [] - -[node name="ScoreRank" parent="HUD" index="5"] -structured_text_bidi_override_options = [] +[node name="Damage" parent="HUD/PostProcessing" index="1"] +material = SubResource( "ShaderMaterial_4ynd0" ) [node name="Header" parent="HUD/ScoreTable/VBoxContainer" index="0"] offset_bottom = 45.0 theme_override_font_sizes/font_size = 30 -structured_text_bidi_override_options = [] [node name="ScoreTab" parent="HUD/ScoreTable/VBoxContainer" index="1"] offset_top = 49.0 -custom_effects = [] -structured_text_bidi_override_options = [] - -[node name="Performance" parent="HUD" index="8"] -structured_text_bidi_override_options = [] [node name="GUI" parent="." instance=ExtResource( "2" )] [node name="Players" type="Node3D" parent="."] -script = null __meta__ = { "_edit_lock_": true } @@ -261,7 +209,6 @@ anchor_left = 1.0 anchor_right = 1.0 offset_left = -188.0 offset_bottom = 176.0 -script = null __meta__ = { "_edit_lock_": true, "_edit_use_anchors_": false @@ -271,7 +218,6 @@ __meta__ = { offset_right = 188.0 offset_bottom = 40.0 text = "MUTE SOUND" -script = null __meta__ = { "_edit_use_anchors_": false } @@ -281,14 +227,12 @@ offset_top = 44.0 offset_right = 188.0 offset_bottom = 73.0 text = "Host" -script = null [node name="Connect" type="Button" parent="NetworkTesting"] offset_top = 77.0 offset_right = 188.0 offset_bottom = 106.0 text = "Connect" -script = null __meta__ = { "_edit_use_anchors_": false } @@ -299,15 +243,12 @@ offset_right = 188.0 offset_bottom = 143.0 rect_min_size = Vector2(100, 30) text = "name" -structured_text_bidi_override_options = [] -script = null [node name="ColorPickerButton" type="ColorPickerButton" parent="NetworkTesting"] offset_top = 147.0 offset_right = 188.0 offset_bottom = 176.0 edit_alpha = false -script = null __meta__ = { "_edit_use_anchors_": false } @@ -317,14 +258,11 @@ offset_top = 180.0 offset_right = 188.0 offset_bottom = 209.0 text = "KILL YOURSELF" -script = null [node name="Label" type="Label" parent="."] visible = false offset_right = 505.0 offset_bottom = 238.0 -structured_text_bidi_override_options = [] -script = null __meta__ = { "_edit_use_anchors_": false } @@ -332,7 +270,6 @@ __meta__ = { [node name="LightmapProbe" type="LightmapProbe" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 17, 0) visible = false -script = null [node name="Announcer" type="AudioStreamPlayer" parent="."] stream = ExtResource( "5_ilayd" ) @@ -341,7 +278,6 @@ script = ExtResource( "6_gcsgr" ) [node name="PingTimer" type="Timer" parent="."] autostart = true -script = null [connection signal="toggled" from="NetworkTesting/CheckButton" to="." method="_on_CheckButton_toggled"] [connection signal="pressed" from="NetworkTesting/Host" to="." method="_on_Host_pressed"]