diff --git a/Game/Assets/Characters/Player.gd b/Game/Assets/Characters/Player.gd index adc34f0..182fafa 100644 --- a/Game/Assets/Characters/Player.gd +++ b/Game/Assets/Characters/Player.gd @@ -19,6 +19,8 @@ extends CharacterBody3D @onready var weapon = $Head/Camera/Hand/Weapon +var gibs_vfx = preload("res://Assets/Effects/Gibs.tscn") + # climb functions - temporarily disabled #@onready var body_height = body.shape.height #@onready var body_y = body.position.y @@ -163,10 +165,15 @@ func damage(hp: int): # die() func die(killer_pid: int): -# if get_tree().get_rpc_sender_id() != get_network_authority(): + var gibs = gibs_vfx.instantiate() + get_tree().root.add_child(gibs) + gibs.global_transform = self.global_transform# + + #if get_tree().get_rpc_sender_id() != get_network_authority(): # print ("Death requested by a non-master. Ignoring") # return main.rpc(&'destroy_player', self.get_network_authority()) + main.chat.rpc(&'chat_notification', "Player [/i][b][color=" + main.player_list.players[self.get_network_authority()].color.to_html() + "]" + main.player_list.players[self.get_network_authority()].name + "[/color][/b][i] was killed by " + main.player_list.players[killer_pid].name ) #queue_free() diff --git a/Game/Assets/Effects/Gibs.tscn b/Game/Assets/Effects/Gibs.tscn new file mode 100644 index 0000000..f8b7ab7 --- /dev/null +++ b/Game/Assets/Effects/Gibs.tscn @@ -0,0 +1,31 @@ +[gd_scene load_steps=4 format=3 uid="uid://egphnvwk6cg"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_3sp1q"] +albedo_color = Color(0.509804, 0.0235294, 0, 1) +roughness = 0.26 + +[sub_resource type="SphereMesh" id="SphereMesh_riydg"] +material = SubResource( "StandardMaterial3D_3sp1q" ) +radius = 0.1 +height = 0.2 +radial_segments = 8 +rings = 8 + +[sub_resource type="Curve" id="Curve_0e5oj"] +_data = [Vector2(0.00694444, 0.954545), 0.0, 0.0, 0, 0, Vector2(1, 0), -2.07914, 0.0, 0, 0] + +[node name="GPUParticles3D" type="CPUParticles3D"] +emitting = false +amount = 32 +lifetime = 5.0 +one_shot = true +explosiveness = 1.0 +fixed_fps = 30 +mesh = SubResource( "SphereMesh_riydg" ) +emission_shape = 3 +emission_points = PackedVector3Array(0.213792, 0.293558, -0.239298, -0.12737, 0.631196, -0.141563, 0.192791, 0.151973, -0.137897, 0.359606, 0.947813, -0.0768365, 0.194725, 0.587412, 0.214862, -0.0413049, 0.633023, 0.337953, -0.190239, 0.734695, -0.213316, 0.398734, 0.954908, -0.0184722, -0.0121239, 1.4246, -0.0232558, -0.0535609, 1.64598, -0.121451, 0.16018, 0.432162, 0.137138, 0.28397, 0.802465, 0.273994, -0.086569, 0.331748, -0.373907, 0.151013, 1.00774, 0.106493, 0.0316862, 0.78307, -0.0015597, 0.0137127, 1.32038, 0.186835, 0.354167, 0.429079, 0.0606308, 0.308906, 0.195378, -0.112554, 0.162532, 0.712726, -0.0580729, -0.148121, 0.258527, 0.196588, 0.121123, 0.125489, -0.0131164, -0.268994, 1.3866, -0.170491, -0.321323, 1.14779, 0.0402509, -0.0245586, 1.1546, -0.340647, 0.168819, 0.119007, 0.210639, 0.390349, 1.22382, 0.066388, 0.226391, 0.449593, 0.211008, 0.091519, 1.4079, 0.278107, -0.111734, 0.672877, 0.363257, -0.122951, 1.37178, 0.0514085, -0.265176, 0.408875, 0.23233, 0.138502, 0.247815, -0.282018, 0.158044, 1.35905, -0.301838, -0.0117804, 1.42503, -0.372285, -0.266539, 1.25614, 0.211245, 0.0765518, 0.871181, 0.13197, 0.0944997, 0.234855, 0.255727, -0.147605, 0.149461, 0.102494, -0.041316, 0.119079, 0.0632052, 0.0285764, 0.862697, -0.291928, 0.153573, 0.875813, 0.240219, -0.094903, 1.24591, 0.331878, -0.300984, 1.10989, 0.25754, 0.0280152, 0.227853, 0.305782, 0.144829, 1.13028, 0.247458, -0.297053, 1.33953, -0.25212, 0.255629, 0.426613, 0.175493, 0.180825, 0.921968, 0.333394, 0.0429266, 1.29984, 0.137121, 0.120818, 1.0851, 0.0890484, -0.246802, 0.314922, 0.118292, -0.0702293, 0.131391, 0.121838, 0.107325, 0.777287, -0.322295, 0.112643, 0.932287, 0.36087, 0.212013, 1.29013, 0.190726, 0.131307, 1.25809, -0.342333, -0.144784, 0.574611, 0.270844, 0.00399578, 1.25063, 0.228666, 0.109936, 1.47567, -0.0186085, 0.382821, 0.989886, 0.0529952, -0.11686, 1.24431, -0.363027, 0.209045, 1.60135, 0.0683457, 0.0921369, 0.784928, 0.151519, -0.0889999, 0.839174, -0.367262, 0.135316, 1.26909, 0.227138, -0.168382, 1.46148, -0.0122506, 0.227487, 0.604992, -0.244163, 0.263066, 0.41004, -0.200542, -0.181149, 0.957524, 0.186846, 0.313458, 1.23143, -0.0450301, 0.0249283, 1.27376, -0.180561, -0.229117, 1.24942, 0.279538, 0.181303, 1.1398, 0.164216, 0.201891, 1.54447, 0.025169, -0.301608, 1.20045, -0.0241991, 0.293079, 0.852535, 0.186271, 0.270674, 0.626333, 0.141311, 0.185143, 1.56542, -0.0231146, -0.183985, 0.855768, -0.109044, 0.220596, 0.85369, 0.184708, 0.0326539, 0.670344, -0.201186, 0.0935103, 0.36576, 0.332694, 0.0295326, 0.784154, 0.378336, -0.164651, 0.72306, -0.0226527, -0.22198, 1.50055, 0.117691, -0.0424937, 1.2494, 0.370492, 0.0782578, 1.0032, 0.115449, 0.143578, 0.950895, -0.00153738, 0.125742, 1.09669, 0.266231, -0.0031639, 0.0938585, -0.158077, 0.25241, 0.81581, 0.299586, 0.0682948, 0.329631, -0.0851988, -0.12918, 0.248223, -0.337992, 0.0366944, 0.303778, -0.345714, -0.240697, 0.608311, -0.178695, -0.0507606, 0.581082, 0.372165, -0.00363311, 0.193522, -0.306941, 0.0744256, 1.12727, -0.269475, -0.0880248, 0.306396, -0.124157, -0.383416, 1.34143, -0.091211, 0.0435722, 1.22679, -0.0277889, -0.154645, 0.629385, 0.334208, -0.136264, 0.312748, 0.340147, -0.0730954, 0.160824, -0.122244, -0.0656257, 0.292709, 0.18593, -0.233391, 0.599557, -0.117712, 0.359666, 1.42768, 0.00898111, 0.165606, 1.24167, -0.0305199, 0.0108935, 0.376355, -0.277372, 0.147166, 0.616227, 0.295277, -0.248208, 0.167717, -0.0723494, 0.223818, 1.35089, 0.0880279, -0.146517, 0.91615, 0.224953, 0.0213891, 1.30633, -0.0351697, -0.0157524, 1.48568, -0.181715, -0.0318395, 0.490449, -0.0141865, -0.219646, 0.944284, -0.0685343, -0.258311, 1.24031, 0.0813233, 0.161967, 1.239, -0.352594, 0.339281, 0.426037, -0.0404075, -0.198885, 1.35612, 0.102736, -0.00542265, 1.01909, -0.309931, -0.127917, 0.110843, -0.201308, 0.0107117, 0.113423, 0.0182374, -0.161015, 0.224641, -0.297972, 0.301496, 0.932366, -0.242365, 0.216504, 1.2761, -0.256302, -0.282683, 0.924247, 0.257186) +spread = 180.0 +initial_velocity_min = 1.0 +initial_velocity_max = 4.0 +scale_amount_curve = SubResource( "Curve_0e5oj" ) +script = null diff --git a/Game/Assets/Effects/ImpactPlayer.tscn b/Game/Assets/Effects/ImpactBlood.tscn similarity index 100% rename from Game/Assets/Effects/ImpactPlayer.tscn rename to Game/Assets/Effects/ImpactBlood.tscn diff --git a/Game/Assets/Effects/ImpactWall.tscn b/Game/Assets/Effects/ImpactSparks.tscn similarity index 100% rename from Game/Assets/Effects/ImpactWall.tscn rename to Game/Assets/Effects/ImpactSparks.tscn diff --git a/Game/Assets/HUD/HUD.tscn b/Game/Assets/HUD/HUD.tscn index a1fa4ae..8cc40dd 100644 --- a/Game/Assets/HUD/HUD.tscn +++ b/Game/Assets/HUD/HUD.tscn @@ -1,14 +1,14 @@ -[gd_scene load_steps=11 format=2] +[gd_scene load_steps=11 format=3 uid="uid://bff5uslrxesjx"] -[ext_resource path="res://Assets/HUD/Vignette.png" type="Texture2D" id=1] -[ext_resource path="res://Assets/HUD/Crosshair.png" type="Texture2D" id=2] -[ext_resource path="res://Assets/SFX/UI_Confirm_Kill.wav" type="AudioStream" id=3] -[ext_resource path="res://Assets/SFX/UI_Confirm_Hit.wav" type="AudioStream" id=4] -[ext_resource path="res://Assets/HUD/Crosshair.gd" type="Script" id=5] -[ext_resource path="res://Assets/HUD/Chat.gd" type="Script" id=6] -[ext_resource path="res://Assets/HUD/Theme.tres" type="Theme" id=7] +[ext_resource type="Texture2D" uid="uid://blnjjtjifk22i" path="res://Assets/HUD/Vignette.png" id="1"] +[ext_resource type="Texture2D" uid="uid://cvckx0ssydl4d" path="res://Assets/HUD/Crosshair.png" id="2"] +[ext_resource type="AudioStream" uid="uid://bomutmdekfv3m" path="res://Assets/SFX/UI_Confirm_Kill.wav" id="3"] +[ext_resource type="AudioStream" uid="uid://184gasqdlb20" path="res://Assets/SFX/UI_Confirm_Hit.wav" id="4"] +[ext_resource type="Script" path="res://Assets/HUD/Crosshair.gd" id="5"] +[ext_resource type="Script" path="res://Assets/HUD/Chat.gd" id="6"] +[ext_resource type="Theme" uid="uid://ddtu7o1dbp0s8" path="res://Assets/HUD/Theme.tres" id="7"] -[sub_resource type="Animation" id=1] +[sub_resource type="Animation" id="1"] resource_name = "Default" length = 0.001 tracks/0/type = "value" @@ -24,7 +24,7 @@ tracks/0/keys = { "values": [Color(1, 1, 1, 1)] } -[sub_resource type="Animation" id=2] +[sub_resource type="Animation" id="2"] length = 0.2 step = 0.05 tracks/0/type = "value" @@ -49,12 +49,12 @@ tracks/1/keys = { "clips": [{ "end_offset": 0.0, "start_offset": 0.0, -"stream": ExtResource( 4 ) +"stream": ExtResource( "4" ) }], "times": PackedFloat32Array(0) } -[sub_resource type="Animation" id=3] +[sub_resource type="Animation" id="3"] length = 0.5 step = 0.05 tracks/0/type = "value" @@ -79,7 +79,7 @@ tracks/1/keys = { "clips": [{ "end_offset": 0.0, "start_offset": 0.0, -"stream": ExtResource( 3 ) +"stream": ExtResource( "3" ) }], "times": PackedFloat32Array(0) } @@ -97,7 +97,7 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -script = ExtResource( 5 ) +script = ExtResource( "5" ) __meta__ = { "_edit_use_anchors_": false } @@ -113,7 +113,7 @@ offset_top = -32.0 offset_right = 96.0 offset_bottom = 96.0 rect_scale = Vector2(0.5, 0.5) -texture = ExtResource( 2 ) +texture = ExtResource( "2" ) expand = true script = null __meta__ = { @@ -122,21 +122,21 @@ __meta__ = { [node name="AnimationPlayer" type="AnimationPlayer" parent="Crosshair"] autoplay = "Default" -anims/Default = SubResource( 1 ) -anims/Hit = SubResource( 2 ) -anims/Kill = SubResource( 3 ) +anims/Default = SubResource( "1" ) +anims/Hit = SubResource( "2" ) +anims/Kill = SubResource( "3" ) blend_times = [] script = null [node name="Hit_Confirmation" type="AudioStreamPlayer" parent="Crosshair"] -stream = ExtResource( 3 ) +stream = ExtResource( "3" ) script = null [node name="Vignette" type="TextureRect" parent="."] modulate = Color(1, 1, 1, 0) anchor_right = 1.0 anchor_bottom = 1.0 -texture = ExtResource( 1 ) +texture = ExtResource( "1" ) expand = true stretch_mode = 7 script = null @@ -149,7 +149,7 @@ offset_left = 24.0 offset_top = 24.0 offset_right = 324.0 offset_bottom = 474.0 -script = ExtResource( 6 ) +script = ExtResource( "6" ) __meta__ = { "_edit_use_anchors_": false } @@ -168,7 +168,7 @@ offset_top = 37.0 offset_right = 300.0 offset_bottom = 507.0 rect_min_size = Vector2(0, 470) -theme = ExtResource( 7 ) +theme = ExtResource( "7" ) bbcode_enabled = true scroll_active = false scroll_following = true diff --git a/Game/Assets/Weapons/Weapon.gd b/Game/Assets/Weapons/Weapon.gd index af0b5ee..53186a2 100644 --- a/Game/Assets/Weapons/Weapon.gd +++ b/Game/Assets/Weapons/Weapon.gd @@ -8,8 +8,8 @@ extends Node3D var casing = preload("res://Assets/Weapons/Handgun/Casing.tscn") var flash = preload("res://Assets/Effects/MuzzleFlash.tscn") -var impact_wall = preload("res://Assets/Effects/ImpactWall.tscn") -var impact_player = preload("res://Assets/Effects/ImpactPlayer.tscn") +var impact_wall = preload("res://Assets/Effects/ImpactSparks.tscn") +var impact_player = preload("res://Assets/Effects/ImpactBlood.tscn") # Declare member variables here. Examples: # var a = 2 diff --git a/Game/Main.tscn b/Game/Main.tscn index 98f0dd1..de022f7 100644 --- a/Game/Main.tscn +++ b/Game/Main.tscn @@ -3,7 +3,7 @@ [ext_resource type="PackedScene" uid="uid://b1078bn8gy2qf" path="res://Map.tscn" id="1"] [ext_resource type="PackedScene" path="res://Assets/UI/GUI.tscn" id="2"] [ext_resource type="Script" path="res://Main.gd" id="3"] -[ext_resource type="PackedScene" path="res://Assets/HUD/HUD.tscn" id="4"] +[ext_resource type="PackedScene" uid="uid://bff5uslrxesjx" path="res://Assets/HUD/HUD.tscn" id="4"] [node name="Main" type="Node"] script = ExtResource( "3" ) diff --git a/Game/Map.tscn b/Game/Map.tscn index 55b34c7..87a3271 100644 --- a/Game/Map.tscn +++ b/Game/Map.tscn @@ -1,9 +1,31 @@ -[gd_scene load_steps=11 format=3 uid="uid://b1078bn8gy2qf"] +[gd_scene load_steps=12 format=3 uid="uid://b1078bn8gy2qf"] -[ext_resource type="PackedScene" uid="uid://moex8kh68vu3" path="res://Assets/MapComponents/SpawnPoint.tscn" id="1"] -[ext_resource type="PackedScene" uid="uid://831g53oe7qt8" path="res://Assets/Props/BeerCan.glb" id="3"] +[ext_resource type="PackedScene" path="res://Assets/MapComponents/SpawnPoint.tscn" id="1"] +[ext_resource type="PackedScene" uid="uid://bfs2skkrik1xb" path="res://Assets/Props/BeerCan.glb" id="3"] [ext_resource type="PackedScene" uid="uid://w476ulvte1f6" path="res://Assets/Maps/DM1/DM1.glb" id="6"] +[sub_resource type="GDScript" id="GDScript_gjkl2"] +script/source = "extends Node3D + +# Declare member variables here. Examples: +# var a = 2 +# var b = \"text\" + +#var time := .0 + +# Called when the node enters the scene tree for the first time. +#func _ready(): +# $ReflectionProbe.hide() + +# Called every frame. 'delta' is the elapsed time since the previous frame. +#func _process(delta): +# time += delta +# if round (time / 2.0) == 0: +# $ReflectionProbe.show() +# elif round (time / 1.0) == 0: +# $ReflectionProbe.hide() +" + [sub_resource type="PhysicalSkyMaterial" id="1"] [sub_resource type="Sky" id="2"] @@ -18,7 +40,6 @@ tonemap_white = 2.0 ssao_enabled = true ssao_radius = 8.0 ssao_intensity = 1.0 -sdfgi_enabled = true sdfgi_use_occlusion = true sdfgi_read_sky_light = true sdfgi_bounce_feedback = 1.24 @@ -69,7 +90,7 @@ dof_blur_amount = 1.0 override_exposure = 0.0 [node name="Map" type="Node3D"] -script = null +script = SubResource( "GDScript_gjkl2" ) [node name="OmniLight3D" type="OmniLight3D" parent="."] transform = Transform3D(-0.462097, -0.0829879, -0.882938, -0.612372, 0.75, 0.25, 0.641457, 0.656211, -0.397392, 0.124393, 4.30152, -8.12432)