From f9f6ba5b3fd66f7b9a5b8b3bfe71b76e0e45ea09 Mon Sep 17 00:00:00 2001 From: Xavier Del Campo Romero Date: Sun, 15 Nov 2026 13:43:01 +0100 Subject: aofshiasfoihasfa --- Spatial.gd | 5 ++++- Spatial.tscn | 20 +++++++++++++++++++- music.mp3 | Bin 1213656 -> 1343043 bytes select.gd | 9 ++++++++- select.tscn | 10 +++++++++- zombie.gd | 6 +++++- zombie.tscn | 6 +++++- 7 files changed, 50 insertions(+), 6 deletions(-) diff --git a/Spatial.gd b/Spatial.gd index 8adf0e7..e02bb1e 100644 --- a/Spatial.gd +++ b/Spatial.gd @@ -105,7 +105,7 @@ func create_box(team): boxes += [box] add_child(box) -func _on_powerup(node): +func _on_powerup(node, zombie): if node.get_type() == pw.Type.swap: var green = green_points @@ -116,6 +116,9 @@ func _on_powerup(node): pink_points = green emit_signal("new_points") + var sfx = get_node("powerup/p" + str(zombie.get_rid())) + + sfx.play() remove_child(node) func _on_cat_killed(zombie): diff --git a/Spatial.tscn b/Spatial.tscn index ee56967..fe9414c 100644 --- a/Spatial.tscn +++ b/Spatial.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=23 format=2] +[gd_scene load_steps=27 format=2] [ext_resource path="res://floor.png" type="Texture" id=1] [ext_resource path="res://sky.tscn" type="PackedScene" id=2] @@ -8,6 +8,10 @@ [ext_resource path="res://vera/Vera.ttf" type="DynamicFontData" id=6] [ext_resource path="res://vera/VeraBd.ttf" type="DynamicFontData" id=7] [ext_resource path="res://music.mp3" type="AudioStream" id=8] +[ext_resource path="res://sfx/p0/Power Up.wav" type="AudioStream" id=9] +[ext_resource path="res://sfx/p1/Power Up.wav" type="AudioStream" id=10] +[ext_resource path="res://sfx/p2/Power Up.wav" type="AudioStream" id=11] +[ext_resource path="res://sfx/p3/Power Up.wav" type="AudioStream" id=12] [sub_resource type="PlaneMesh" id=1] size = Vector2( 20, 40 ) @@ -244,3 +248,17 @@ transform = Transform( 15, 0, 0, 0, 10.6066, 10.6066, 0, -10.6066, 10.6066, 0, 0 [node name="music" type="AudioStreamPlayer" parent="."] stream = ExtResource( 8 ) + +[node name="powerup" type="Node" parent="."] + +[node name="p0" type="AudioStreamPlayer" parent="powerup"] +stream = ExtResource( 9 ) + +[node name="p1" type="AudioStreamPlayer" parent="powerup"] +stream = ExtResource( 10 ) + +[node name="p2" type="AudioStreamPlayer" parent="powerup"] +stream = ExtResource( 11 ) + +[node name="p3" type="AudioStreamPlayer" parent="powerup"] +stream = ExtResource( 12 ) diff --git a/music.mp3 b/music.mp3 index a285014..47c16ad 100644 Binary files a/music.mp3 and b/music.mp3 differ diff --git a/select.gd b/select.gd index daf4564..4c25e3d 100644 --- a/select.gd +++ b/select.gd @@ -22,6 +22,7 @@ var lores: Array = [ ] var players: Array = [0, 1, 2, 3] +var accepted: Array = [false, false, false, false] func start(): var game = preload("res://Spatial.tscn").instance() @@ -40,7 +41,13 @@ func process_zombie(i): var id = "p" + str(i) + "_" var key = 0 - if Input.is_action_just_pressed(id + "down"): + if accepted[i]: + return + + if Input.is_action_just_pressed(id + "powerup"): + accepted[i] = true + get_node("sounds/p" + str(i)).play() + elif Input.is_action_just_pressed(id + "down"): players[i] += 1 if players[i] >= 4: diff --git a/select.tscn b/select.tscn index 51bad49..002c384 100644 --- a/select.tscn +++ b/select.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=16 format=2] +[gd_scene load_steps=20 format=2] [ext_resource path="res://bg.png" type="Texture" id=1] [ext_resource path="res://select/p0.png" type="Texture" id=2] @@ -12,6 +12,10 @@ [ext_resource path="res://vera/VeraBd.ttf" type="DynamicFontData" id=10] [ext_resource path="res://select.gd" type="Script" id=11] [ext_resource path="res://music.mp3" type="AudioStream" id=12] +[ext_resource path="res://sfx/p3/Seleccion.wav" type="AudioStream" id=13] +[ext_resource path="res://sfx/p1/Seleccion.wav" type="AudioStream" id=14] +[ext_resource path="res://sfx/p2/Seleccion.wav" type="AudioStream" id=15] +[ext_resource path="res://sfx/p0/Seleccion.wav" type="AudioStream" id=16] [sub_resource type="DynamicFont" id=1] size = 120 @@ -203,9 +207,13 @@ stream = ExtResource( 12 ) [node name="sounds" type="Node" parent="."] [node name="p0" type="AudioStreamPlayer" parent="sounds"] +stream = ExtResource( 16 ) [node name="p1" type="AudioStreamPlayer" parent="sounds"] +stream = ExtResource( 14 ) [node name="p2" type="AudioStreamPlayer2D" parent="sounds"] +stream = ExtResource( 15 ) [node name="p3" type="AudioStreamPlayer2D" parent="sounds"] +stream = ExtResource( 13 ) diff --git a/zombie.gd b/zombie.gd index 7b122e7..61a4868 100644 --- a/zombie.gd +++ b/zombie.gd @@ -98,7 +98,7 @@ func _physics_process(delta): if c.is_in_group("powerup"): powerup = c.get_type() $timer.start(10) - emit_signal("powerup", c) + emit_signal("powerup", c, self) $magnet_light.visible = false $explosion_light.visible = false @@ -162,6 +162,9 @@ func _process(delta): func set_rid(z): myrid = z +func get_rid(): + return myrid + func set_id(z): myid = z @@ -242,6 +245,7 @@ func run_powerup(boxes, zombies): var id = "p" + str(myrid) + "_" if Input.is_action_just_released(id + "powerup"): + $explosion.play() expired() for b in boxes: diff --git a/zombie.tscn b/zombie.tscn index 337b34a..7faca79 100644 --- a/zombie.tscn +++ b/zombie.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=9 format=2] [ext_resource path="res://zombie0/f1.png" type="Texture" id=1] [ext_resource path="res://zombie.gd" type="Script" id=2] +[ext_resource path="res://explosion.mp3" type="AudioStream" id=3] [sub_resource type="PlaneMesh" id=1] size = Vector2( 2, 4 ) @@ -58,3 +59,6 @@ light_energy = 3.861 transform = Transform( 0.3, 0, 0, 0, -1.31134e-08, 0.3, 0, -0.3, -1.31134e-08, 0, 2.86357, -1.25171e-07 ) mesh = SubResource( 4 ) material/0 = SubResource( 5 ) + +[node name="explosion" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 3 ) -- cgit v1.2.3