diff --git a/audio/sounds/zap_wip.ogg b/audio/sounds/zap_wip.ogg new file mode 100644 index 0000000..259e173 Binary files /dev/null and b/audio/sounds/zap_wip.ogg differ diff --git a/audio/sounds/zap_wip.ogg.import b/audio/sounds/zap_wip.ogg.import new file mode 100644 index 0000000..c28ec25 --- /dev/null +++ b/audio/sounds/zap_wip.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/zap_wip.ogg-51e4569934565cf93f128910a5e31bee.oggstr" + +[deps] + +source_file="res://audio/sounds/zap_wip.ogg" +dest_files=[ "res://.import/zap_wip.ogg-51e4569934565cf93f128910a5e31bee.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/autoloads/audio.gd b/autoloads/audio.gd index b0792f5..792a1d6 100644 --- a/autoloads/audio.gd +++ b/autoloads/audio.gd @@ -26,7 +26,7 @@ const a_doublejump = preload("res://audio/sounds/double_jump.ogg") const a_shoot = preload("res://audio/sounds/shoot_arrow.ogg") const a_die = preload("res://audio/sounds/die.ogg") const a_die_splash = preload("res://audio/sounds/splash.ogg") -const a_die_zap = preload("res://audio/sounds/splash.ogg") +const a_die_zap = preload("res://audio/sounds/zap_wip.ogg") const a_die_skeleton = preload("res://audio/sounds/die_skeleton.ogg") const a_scrump_die = preload("res://audio/sounds/scrump_die.ogg") const a_explosion = preload("res://audio/sounds/explosion.ogg") diff --git a/menus/sound_test.tscn b/menus/sound_test.tscn index ab55aca..c2bed6d 100644 --- a/menus/sound_test.tscn +++ b/menus/sound_test.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=125 format=2] +[gd_scene load_steps=126 format=2] [ext_resource path="res://shaders/ska_plane.gdshader" type="Shader" id=1] [ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=2] @@ -117,6 +117,7 @@ [ext_resource path="res://audio/sounds/intro_voiceover.ogg" type="AudioStream" id=115] [ext_resource path="res://audio/sounds/cop_shoot.ogg" type="AudioStream" id=116] [ext_resource path="res://audio/sounds/splash.ogg" type="AudioStream" id=117] +[ext_resource path="res://audio/sounds/zap_wip.ogg" type="AudioStream" id=118] [sub_resource type="ShaderMaterial" id=1] shader = ExtResource( 1 ) @@ -183,6 +184,7 @@ material = SubResource( 12 ) position = Vector2( 72, 152 ) scale = Vector2( 2, 2 ) frames = SubResource( 15 ) +frame = 1 playing = true [node name="AnimatedSprite3" type="AnimatedSprite" parent="."] @@ -190,6 +192,7 @@ material = SubResource( 12 ) position = Vector2( 112, 152 ) scale = Vector2( 2, 2 ) frames = SubResource( 15 ) +frame = 1 playing = true [node name="AnimatedSprite4" type="AnimatedSprite" parent="."] @@ -197,6 +200,7 @@ material = SubResource( 12 ) position = Vector2( 152, 152 ) scale = Vector2( 2, 2 ) frames = SubResource( 15 ) +frame = 1 playing = true [node name="AnimatedSprite5" type="AnimatedSprite" parent="."] @@ -204,6 +208,7 @@ material = SubResource( 12 ) position = Vector2( 192, 152 ) scale = Vector2( 2, 2 ) frames = SubResource( 15 ) +frame = 1 playing = true [node name="Music" type="TextureButton" parent="."] @@ -253,7 +258,7 @@ focus_neighbour_top = NodePath("../Music") texture_focused = ExtResource( 27 ) script = ExtResource( 16 ) titles = [ "Select", "Confirm", "Jump", "Double Jump", "Land", "Climb", "Bmilc", "Shoot", "Die", "Sploosh", "Bzaap", "Teleport", "Gover", "Key Get", "Arrow Get", "Star Get", "Skeleton Die", "Scrump Shoot", "Scrump Hurt", "Scrump Die", "Bubble Get", "Big Explosion", "Mech Shoot", "Laser Charge", "Rainbow Laser", "Mech Hurt 1", "Mech Hurt 2", "Mech Hurt 3", "Small Explosion", "Bullet Casing", "Button Click", "Ominous", "GunCock", "Shards Expelled", "Shards Absorbed", "Fami Transform", "Scope Squish", "Scope Splat", "Famira Roar", "2083 Shoot", "Laser Ready", "Famira Breath", "Famira Die", "Collected Shard", "Missed Shard", "Final Score", "Revolution 2083", "Good Job!", "Great Job!", "Wonderful!", "Come Here", "Help Me", "Agh!", "Fuck!", "Shit...", "Take This", "Fami's Grand Plan", "Debug M", "Spaghetti", "Sword", "Egg Collect", "Collapse", "Cop Shoot", "Talking", "Shard Float", "Fami Grumble", "Segz", "Mech Creak", "Mech Step 1", "Mech Step 2", "Mech Walking", "Mech Duck", "Mech Unduck", "Resolve", "Robolution 2083", "Penolution 2083", "Ivolution 2083", "Dogolution 2083", "Classic Good Job", "Good Job - Penny", "Good Job - Ivy", "Good Job - Dog", "Great Job - Penny", "Great Job - Ivy", "Great Job - Dog", "Classic Wonderful", "Wonderful - Penny", "Wonderful - Ivy", "Wonderful - Dog", "Fucking Cop...", "Goddammit...", "Motherfucker...", "Intro Voiceover" ] -sounds = [ ExtResource( 7 ), ExtResource( 10 ), ExtResource( 25 ), ExtResource( 34 ), ExtResource( 8 ), ExtResource( 42 ), ExtResource( 41 ), ExtResource( 32 ), ExtResource( 30 ), ExtResource( 117 ), null, ExtResource( 113 ), ExtResource( 35 ), ExtResource( 6 ), ExtResource( 9 ), ExtResource( 43 ), ExtResource( 33 ), ExtResource( 51 ), ExtResource( 37 ), ExtResource( 31 ), ExtResource( 24 ), ExtResource( 36 ), ExtResource( 39 ), ExtResource( 77 ), ExtResource( 52 ), ExtResource( 50 ), ExtResource( 47 ), ExtResource( 49 ), ExtResource( 48 ), ExtResource( 38 ), ExtResource( 29 ), ExtResource( 55 ), ExtResource( 40 ), ExtResource( 57 ), ExtResource( 58 ), ExtResource( 53 ), ExtResource( 54 ), ExtResource( 56 ), ExtResource( 59 ), ExtResource( 82 ), ExtResource( 83 ), ExtResource( 72 ), ExtResource( 64 ), ExtResource( 66 ), ExtResource( 61 ), ExtResource( 65 ), ExtResource( 74 ), ExtResource( 62 ), ExtResource( 60 ), ExtResource( 76 ), ExtResource( 69 ), ExtResource( 68 ), ExtResource( 63 ), ExtResource( 70 ), ExtResource( 71 ), ExtResource( 67 ), ExtResource( 73 ), ExtResource( 80 ), ExtResource( 79 ), ExtResource( 78 ), ExtResource( 87 ), ExtResource( 85 ), ExtResource( 116 ), ExtResource( 92 ), ExtResource( 114 ), ExtResource( 81 ), ExtResource( 75 ), ExtResource( 88 ), ExtResource( 86 ), ExtResource( 94 ), ExtResource( 93 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 91 ), ExtResource( 105 ), ExtResource( 106 ), ExtResource( 108 ), ExtResource( 107 ), ExtResource( 111 ), ExtResource( 95 ), ExtResource( 96 ), ExtResource( 97 ), ExtResource( 98 ), ExtResource( 100 ), ExtResource( 99 ), ExtResource( 101 ), ExtResource( 109 ), ExtResource( 110 ), ExtResource( 112 ), ExtResource( 103 ), ExtResource( 102 ), ExtResource( 104 ), ExtResource( 115 ) ] +sounds = [ ExtResource( 7 ), ExtResource( 10 ), ExtResource( 25 ), ExtResource( 34 ), ExtResource( 8 ), ExtResource( 42 ), ExtResource( 41 ), ExtResource( 32 ), ExtResource( 30 ), ExtResource( 117 ), ExtResource( 118 ), ExtResource( 113 ), ExtResource( 35 ), ExtResource( 6 ), ExtResource( 9 ), ExtResource( 43 ), ExtResource( 33 ), ExtResource( 51 ), ExtResource( 37 ), ExtResource( 31 ), ExtResource( 24 ), ExtResource( 36 ), ExtResource( 39 ), ExtResource( 77 ), ExtResource( 52 ), ExtResource( 50 ), ExtResource( 47 ), ExtResource( 49 ), ExtResource( 48 ), ExtResource( 38 ), ExtResource( 29 ), ExtResource( 55 ), ExtResource( 40 ), ExtResource( 57 ), ExtResource( 58 ), ExtResource( 53 ), ExtResource( 54 ), ExtResource( 56 ), ExtResource( 59 ), ExtResource( 82 ), ExtResource( 83 ), ExtResource( 72 ), ExtResource( 64 ), ExtResource( 66 ), ExtResource( 61 ), ExtResource( 65 ), ExtResource( 74 ), ExtResource( 62 ), ExtResource( 60 ), ExtResource( 76 ), ExtResource( 69 ), ExtResource( 68 ), ExtResource( 63 ), ExtResource( 70 ), ExtResource( 71 ), ExtResource( 67 ), ExtResource( 73 ), ExtResource( 80 ), ExtResource( 79 ), ExtResource( 78 ), ExtResource( 87 ), ExtResource( 85 ), ExtResource( 116 ), ExtResource( 92 ), ExtResource( 114 ), ExtResource( 81 ), ExtResource( 75 ), ExtResource( 88 ), ExtResource( 86 ), ExtResource( 94 ), ExtResource( 93 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 91 ), ExtResource( 105 ), ExtResource( 106 ), ExtResource( 108 ), ExtResource( 107 ), ExtResource( 111 ), ExtResource( 95 ), ExtResource( 96 ), ExtResource( 97 ), ExtResource( 98 ), ExtResource( 100 ), ExtResource( 99 ), ExtResource( 101 ), ExtResource( 109 ), ExtResource( 110 ), ExtResource( 112 ), ExtResource( 103 ), ExtResource( 102 ), ExtResource( 104 ), ExtResource( 115 ) ] categories = [ { "color": Color( 0.690196, 0.690196, 0.690196, 1 ), "index": 0,