Added sounds and refactoring player handling (WIP)
This commit is contained in:
@@ -13,7 +13,7 @@ func _ready():
|
||||
collision_area.connect("body_entered", on_body_enter)
|
||||
|
||||
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
||||
func _physics_process(delta):
|
||||
func _physics_process(_delta):
|
||||
if processed:
|
||||
queue_free()
|
||||
|
||||
|
||||
@@ -1,17 +1,15 @@
|
||||
[gd_scene load_steps=3 format=3 uid="uid://dx6fxak21icvs"]
|
||||
[gd_scene load_steps=3 format=3 uid="uid://ck1gd38drird6"]
|
||||
|
||||
[ext_resource type="Script" path="res://entities/BombEmitter.gd" id="1_110pt"]
|
||||
[ext_resource type="Script" path="res://entities/BombEmitter.gd" id="1_nvjs2"]
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_7yhwp"]
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_yy20u"]
|
||||
height = 0.5
|
||||
radius = 3.0
|
||||
radius = 5.0
|
||||
|
||||
[node name="BombEmitter" type="Node3D"]
|
||||
script = ExtResource("1_110pt")
|
||||
script = ExtResource("1_nvjs2")
|
||||
|
||||
[node name="Area3D" type="Area3D" parent="."]
|
||||
collision_layer = 0
|
||||
collision_mask = 4
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D"]
|
||||
shape = SubResource("CylinderShape3D_7yhwp")
|
||||
shape = SubResource("CylinderShape3D_yy20u")
|
||||
|
||||
@@ -14,6 +14,9 @@ class_name Player extends CharacterBody3D
|
||||
|
||||
@onready var geometry: MeshInstance3D = $Geometry
|
||||
@onready var collision: CollisionShape3D = $CollisionShape3D
|
||||
@onready var dash_stream_player: AudioStreamPlayer = $DashAudioStreamPlayer
|
||||
@onready var explosion_stream_player: AudioStreamPlayer = $ExplosionAudioStreamPlayer
|
||||
@onready var spawn_stream_player: AudioStreamPlayer = $SpawnAudioStreamPlayer
|
||||
|
||||
var bomb_emitter_scene = preload("res://entities/BombEmitter.tscn")
|
||||
|
||||
@@ -143,6 +146,8 @@ func calc_coloring_position():
|
||||
|
||||
func on_player_spawn():
|
||||
print ("Player " + str(self) + ": spawning")
|
||||
spawn_stream_player.pitch_scale = 0.8 + randf () * 0.4
|
||||
spawn_stream_player.play()
|
||||
|
||||
func on_player_falling():
|
||||
print ("Player " + str(self) + ": falling")
|
||||
@@ -154,12 +159,17 @@ func on_dash():
|
||||
is_dashing = true;
|
||||
dash_time = DASH_DURATION
|
||||
energy = max (0, energy - DASH_ENERGY)
|
||||
dash_stream_player.pitch_scale = 0.9 + randf () * 0.2
|
||||
dash_stream_player.play()
|
||||
|
||||
func on_drop_bomb():
|
||||
coloring_bomb_sprite.visible = true;
|
||||
bomb_time = BOMB_DURATION
|
||||
energy = max (0, energy - BOMB_ENERGY)
|
||||
|
||||
explosion_stream_player.pitch_scale = 0.6 + randf () * 0.2
|
||||
explosion_stream_player.play()
|
||||
|
||||
var bomb_emitter : BombEmitter = bomb_emitter_scene.instantiate()
|
||||
bomb_emitter.global_position = global_position
|
||||
get_parent_node_3d().add_child(bomb_emitter)
|
||||
|
||||
+15
-1
@@ -1,6 +1,9 @@
|
||||
[gd_scene load_steps=4 format=3 uid="uid://bfyjtfdko3l7o"]
|
||||
[gd_scene load_steps=7 format=3 uid="uid://bfyjtfdko3l7o"]
|
||||
|
||||
[ext_resource type="Script" path="res://entities/Player.gd" id="1_w5gy0"]
|
||||
[ext_resource type="AudioStream" uid="uid://bhbhh78j5rkfe" path="res://assets/sounds/pixabay/dash/whoosh-6316.mp3" id="2_ykhbt"]
|
||||
[ext_resource type="AudioStream" uid="uid://qeg12ynvjvy0" path="res://assets/sounds/pixabay/explosion/081895_impact_wav-43951.mp3" id="3_mjsr0"]
|
||||
[ext_resource type="AudioStream" uid="uid://b33xjins3dqpp" path="res://assets/sounds/pixabay/sfx/game-teleport-90735.mp3" id="4_y7abk"]
|
||||
|
||||
[sub_resource type="BoxMesh" id="BoxMesh_yle83"]
|
||||
size = Vector3(0.24, 0.75, 0.24)
|
||||
@@ -29,3 +32,14 @@ mesh = SubResource("BoxMesh_yle83")
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.496337, 0)
|
||||
shape = SubResource("CylinderShape3D_rwgp3")
|
||||
|
||||
[node name="DashAudioStreamPlayer" type="AudioStreamPlayer" parent="."]
|
||||
stream = ExtResource("2_ykhbt")
|
||||
|
||||
[node name="ExplosionAudioStreamPlayer" type="AudioStreamPlayer" parent="."]
|
||||
stream = ExtResource("3_mjsr0")
|
||||
volume_db = -15.707
|
||||
pitch_scale = 0.84
|
||||
|
||||
[node name="SpawnAudioStreamPlayer" type="AudioStreamPlayer" parent="."]
|
||||
stream = ExtResource("4_y7abk")
|
||||
|
||||
@@ -11,6 +11,11 @@ func _ready():
|
||||
area3d.connect("body_entered", on_player_enter)
|
||||
area3d.connect("body_exited", on_player_exited)
|
||||
|
||||
func _process(_delta):
|
||||
for player: Player in near_players:
|
||||
if player.state == Player.PlayerState.Dead:
|
||||
near_players.erase(player)
|
||||
|
||||
func on_player_enter(node: Node3D):
|
||||
var player: Player = node as Player
|
||||
if node == null:
|
||||
|
||||
Reference in New Issue
Block a user