Merge branch 'main' of https://github.com/MarcEricMartel/FirstPersonSlapper
This commit is contained in:
@@ -14,6 +14,7 @@ onready var hitbox = $HitBox/CollisionShape
|
||||
onready var particles = $CPUParticles
|
||||
onready var death_timer = $DeathTimer
|
||||
onready var mesh = $MeshInstance
|
||||
onready var Explosion = $Explosion
|
||||
|
||||
func _ready():
|
||||
var rng = RandomNumberGenerator.new()
|
||||
@@ -42,6 +43,7 @@ func get_slapped(slap_level, slap_kill, slap_vector):
|
||||
|
||||
func get_shot(hitboxOwner):
|
||||
hitboxOwner.die()
|
||||
Explosion.play()
|
||||
die()
|
||||
|
||||
func die():
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
[ext_resource path="res://Textures/MetalCorrodedHeavy001/MetalCorrodedHeavy001_METALNESS_1K_METALNESS.jpg" type="Texture" id=4]
|
||||
[ext_resource path="res://Textures/MetalCorrodedHeavy001/MetalCorrodedHeavy001_Flat.jpg" type="Texture" id=5]
|
||||
[ext_resource path="res://Textures/MetalCorrodedHeavy001/MetalCorrodedHeavy001_NRM_1K_METALNESS.jpg" type="Texture" id=6]
|
||||
[ext_resource path="res://Audio/boom.wav" type="AudioStream" id=7]
|
||||
|
||||
[sub_resource type="SphereMesh" id=6]
|
||||
|
||||
@@ -25,7 +26,6 @@ normal_texture = ExtResource( 6 )
|
||||
[sub_resource type="SphereShape" id=7]
|
||||
|
||||
[sub_resource type="SphereShape" id=8]
|
||||
radius = 1.53964
|
||||
|
||||
[sub_resource type="SphereShape" id=9]
|
||||
|
||||
@@ -102,3 +102,6 @@ scale_amount_curve = SubResource( 15 )
|
||||
wait_time = 3.0
|
||||
|
||||
[connection signal="timeout" from="DeathTimer" to="." method="_on_DeathTimer_timeout"]
|
||||
[node name="Explosion" type="AudioStreamPlayer3D" parent="."]
|
||||
stream = ExtResource( 7 )
|
||||
bus = "SFX"
|
||||
|
||||
Reference in New Issue
Block a user