Merge branch 'main' of https://github.com/MarcEricMartel/FirstPersonSlapper
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
extends KinematicBody
|
||||
|
||||
signal dying
|
||||
|
||||
var hit_acceleration = 10
|
||||
var hit_speed = 100
|
||||
@@ -47,6 +48,7 @@ func get_shot(hitboxOwner):
|
||||
die()
|
||||
|
||||
func die():
|
||||
emit_signal("dying")
|
||||
particles.emitting = true
|
||||
hurtbox.disabled = true
|
||||
hitbox.disabled = true
|
||||
|
@@ -1,29 +1,15 @@
|
||||
[gd_scene load_steps=18 format=2]
|
||||
[gd_scene load_steps=16 format=2]
|
||||
|
||||
[ext_resource path="res://Scripts/HitBox.gd" type="Script" id=1]
|
||||
[ext_resource path="res://Scenes/Enemy.gd" type="Script" id=2]
|
||||
[ext_resource path="res://Scripts/HurtBox.gd" type="Script" id=3]
|
||||
[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://Materials/Ball_Mat.tres" type="Material" id=4]
|
||||
[ext_resource path="res://Materials/Black_Contour.tres" type="Material" id=5]
|
||||
[ext_resource path="res://Audio/boom.wav" type="AudioStream" id=7]
|
||||
[ext_resource path="res://Audio/80-s-clap.wav" type="AudioStream" id=8]
|
||||
[ext_resource path="res://Audio/MegaSlap.wav" type="AudioStream" id=9]
|
||||
|
||||
[sub_resource type="SphereMesh" id=6]
|
||||
|
||||
[sub_resource type="SpatialMaterial" id=12]
|
||||
albedo_color = Color( 0.74902, 0.992157, 0.776471, 0.341176 )
|
||||
albedo_texture = ExtResource( 5 )
|
||||
metallic_texture = ExtResource( 4 )
|
||||
emission_enabled = true
|
||||
emission = Color( 0, 0, 0, 1 )
|
||||
emission_energy = 1.0
|
||||
emission_operator = 0
|
||||
emission_on_uv2 = false
|
||||
normal_enabled = true
|
||||
normal_scale = 1.0
|
||||
normal_texture = ExtResource( 6 )
|
||||
[sub_resource type="SphereMesh" id=16]
|
||||
|
||||
[sub_resource type="SphereShape" id=7]
|
||||
|
||||
@@ -32,6 +18,7 @@ normal_texture = ExtResource( 6 )
|
||||
[sub_resource type="SphereShape" id=9]
|
||||
|
||||
[sub_resource type="SpatialMaterial" id=13]
|
||||
next_pass = ExtResource( 5 )
|
||||
params_billboard_mode = 3
|
||||
particles_anim_h_frames = 1
|
||||
particles_anim_v_frames = 1
|
||||
@@ -61,8 +48,8 @@ _data = [ Vector2( 0.029703, 1.56592 ), 0.0, 0.0, 0, 0, Vector2( 0.995049, 0.656
|
||||
script = ExtResource( 2 )
|
||||
|
||||
[node name="MeshInstance" type="MeshInstance" parent="."]
|
||||
mesh = SubResource( 6 )
|
||||
material/0 = SubResource( 12 )
|
||||
mesh = SubResource( 16 )
|
||||
material/0 = ExtResource( 4 )
|
||||
|
||||
[node name="Hurtbox" type="Area" parent="."]
|
||||
transform = Transform( 2.03634, 0, 0, 0, 2.03634, 0, 0, 0, 2.03634, 0, 0, 0 )
|
||||
|
Reference in New Issue
Block a user