diff --git a/audio/sounds/good_job_haze.ogg b/audio/sounds/good_job_haze.ogg index db4cff9..18f9888 100644 Binary files a/audio/sounds/good_job_haze.ogg and b/audio/sounds/good_job_haze.ogg differ diff --git a/audio/sounds/good_job_ivy.ogg b/audio/sounds/good_job_ivy.ogg index 63613c8..2706f0d 100644 Binary files a/audio/sounds/good_job_ivy.ogg and b/audio/sounds/good_job_ivy.ogg differ diff --git a/audio/sounds/good_job_penny.ogg b/audio/sounds/good_job_penny.ogg index dcd6d2b..d296f03 100644 Binary files a/audio/sounds/good_job_penny.ogg and b/audio/sounds/good_job_penny.ogg differ diff --git a/audio/sounds/great_job_dog.ogg.import b/audio/sounds/great_job_dog.ogg.import new file mode 100644 index 0000000..7fb2ccc --- /dev/null +++ b/audio/sounds/great_job_dog.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/great_job_dog.ogg-d5861f1eb79f2944ff1fb57a2a380d61.oggstr" + +[deps] + +source_file="res://audio/sounds/great_job_dog.ogg" +dest_files=[ "res://.import/great_job_dog.ogg-d5861f1eb79f2944ff1fb57a2a380d61.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/audio/sounds/great_job_haze.ogg.import b/audio/sounds/great_job_haze.ogg.import new file mode 100644 index 0000000..c458b28 --- /dev/null +++ b/audio/sounds/great_job_haze.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/great_job_haze.ogg-eff3cbdd6900d16b1973d95c847b8ff1.oggstr" + +[deps] + +source_file="res://audio/sounds/great_job_haze.ogg" +dest_files=[ "res://.import/great_job_haze.ogg-eff3cbdd6900d16b1973d95c847b8ff1.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/audio/sounds/great_job_ivy.ogg.import b/audio/sounds/great_job_ivy.ogg.import new file mode 100644 index 0000000..ddfe82d --- /dev/null +++ b/audio/sounds/great_job_ivy.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/great_job_ivy.ogg-c2aefb6f69bb89df5bc185341129b6ca.oggstr" + +[deps] + +source_file="res://audio/sounds/great_job_ivy.ogg" +dest_files=[ "res://.import/great_job_ivy.ogg-c2aefb6f69bb89df5bc185341129b6ca.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/audio/sounds/great_job_penny.ogg.import b/audio/sounds/great_job_penny.ogg.import new file mode 100644 index 0000000..98ad084 --- /dev/null +++ b/audio/sounds/great_job_penny.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/great_job_penny.ogg-a9b4c1b6050a8b63442cbfaca9f9b776.oggstr" + +[deps] + +source_file="res://audio/sounds/great_job_penny.ogg" +dest_files=[ "res://.import/great_job_penny.ogg-a9b4c1b6050a8b63442cbfaca9f9b776.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/audio/sounds/peaks/good_job_ivy.ogg.reapeaks b/audio/sounds/peaks/good_job_ivy.ogg.reapeaks new file mode 100644 index 0000000..ea58dda Binary files /dev/null and b/audio/sounds/peaks/good_job_ivy.ogg.reapeaks differ diff --git a/audio/sounds/revolution2083_dog.ogg.import b/audio/sounds/revolution2083_dog.ogg.import new file mode 100644 index 0000000..1dcf6b1 --- /dev/null +++ b/audio/sounds/revolution2083_dog.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/revolution2083_dog.ogg-4110fb770d11e4388608404992b040bf.oggstr" + +[deps] + +source_file="res://audio/sounds/revolution2083_dog.ogg" +dest_files=[ "res://.import/revolution2083_dog.ogg-4110fb770d11e4388608404992b040bf.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/audio/sounds/shard_get.ogg b/audio/sounds/shard_get.ogg index 67c45d5..fa199c8 100644 Binary files a/audio/sounds/shard_get.ogg and b/audio/sounds/shard_get.ogg differ diff --git a/audio/sounds/shard_get.ogg.import b/audio/sounds/shard_get.ogg.import new file mode 100644 index 0000000..d5eaabd --- /dev/null +++ b/audio/sounds/shard_get.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/shard_get.ogg-a18bec7b7dd395a2d36d41bfd5cbbacd.oggstr" + +[deps] + +source_file="res://audio/sounds/shard_get.ogg" +dest_files=[ "res://.import/shard_get.ogg-a18bec7b7dd395a2d36d41bfd5cbbacd.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/audio/sounds/victory_dog.ogg.import b/audio/sounds/victory_dog.ogg.import new file mode 100644 index 0000000..9ac2372 --- /dev/null +++ b/audio/sounds/victory_dog.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/victory_dog.ogg-8fc11c95546e6908c2b2cec0ace6c1df.oggstr" + +[deps] + +source_file="res://audio/sounds/victory_dog.ogg" +dest_files=[ "res://.import/victory_dog.ogg-8fc11c95546e6908c2b2cec0ace6c1df.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/audio/sounds/victory_nobonus.ogg.import b/audio/sounds/victory_nobonus.ogg.import new file mode 100644 index 0000000..a32c7af --- /dev/null +++ b/audio/sounds/victory_nobonus.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/victory_nobonus.ogg-13f05df78c075383aaddddec05e2dada.oggstr" + +[deps] + +source_file="res://audio/sounds/victory_nobonus.ogg" +dest_files=[ "res://.import/victory_nobonus.ogg-13f05df78c075383aaddddec05e2dada.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/autoloads/audio.gd b/autoloads/audio.gd index 1d2964a..89e34b1 100644 --- a/autoloads/audio.gd +++ b/autoloads/audio.gd @@ -18,7 +18,7 @@ const a_key = preload("res://audio/sounds/key.ogg") const a_arrow = preload("res://audio/sounds/arrow_collect.ogg") const a_jump = preload("res://audio/sounds/jump.ogg") const a_star = preload("res://audio/sounds/star.ogg") -const a_shard = preload("res://audio/sounds/shard.ogg") +const a_shard = preload("res://audio/sounds/shard_get.ogg") const a_climb_up = preload("res://audio/sounds/a_climb.ogg") const a_climb_down = preload("res://audio/sounds/a_bmilc.ogg") const a_sword = preload("res://audio/sounds/sword.ogg") @@ -36,7 +36,10 @@ const a_confirm = preload("res://audio/sounds/confirm.ogg") const a_bullet_barrage = preload("res://audio/sounds/bullet_barrage.ogg") const a_rainbow_laser = preload("res://audio/sounds/rainbow_laser.ogg") const a_spaghetti = preload("res://audio/sounds/spaghetti.ogg") -const a_good_job = preload("res://audio/sounds/good_job.ogg") +const a_good_job_penny = preload("res://audio/sounds/good_job_penny.ogg") +const a_good_job_haze = preload("res://audio/sounds/good_job_haze.ogg") +const a_good_job_ivy = preload("res://audio/sounds/good_job_ivy.ogg") +const a_good_job_dog = preload("res://audio/sounds/good_job_dog.ogg") const a_2600_charge = preload("res://audio/sounds/2600_charge.ogg") const a_victory = preload("res://audio/sounds/victory.ogg") const a_shard_results = preload("res://audio/sounds/shard_results.ogg") @@ -68,8 +71,18 @@ func play_shard_sound(): AudioServer.set_bus_mute(idx, true) ac_music.set_stream_paused(true) ac_pause_music.set_stream_paused(true) + var r = 0 if Game.deaths == 0: - play_sound(a_good_job,ac_shard) + if Game.shards == 4: + r = randi() % 100 + else: + r = randi() % 90 + if r <= 30: play_sound(a_good_job_penny,ac_shard) + if r > 30 && r <= 60: play_sound(a_good_job_haze,ac_shard) + if r > 60 && r <= 90: play_sound(a_good_job_ivy,ac_shard) + if r > 90: play_sound(a_good_job_dog,ac_shard) + + else: play_sound(a_shard,ac_shard) diff --git a/menus/title_screen.gd b/menus/title_screen.gd index 2dd72da..22cdcde 100644 --- a/menus/title_screen.gd +++ b/menus/title_screen.gd @@ -1,8 +1,10 @@ extends Node const robo_voice = preload("res://audio/sounds/revolution2083.ogg") -const penny_voice = preload("res://audio/sounds/revo83penny.ogg") -const haze_voice = preload("res://audio/sounds/revo83haze.ogg") +const penny_voice = preload("res://audio/sounds/revolution2083_penny.ogg") +const haze_voice = preload("res://audio/sounds/revolution2083_haze.ogg") +const ivy_voice = preload("res://audio/sounds/revolution2083_ivy.ogg") +const dog_voice = preload("res://audio/sounds/revolution2083_dog.ogg") onready var audio = $AudioStreamPlayer export var next_menu: PackedScene var has_started = false @@ -15,8 +17,10 @@ func _input(event): if Input.is_action_just_pressed("start") && !has_started: Audio.play_sound(Audio.a_star,Audio.ac_collectible) var r = randi() % 101 - if r % 2 == 0: audio.stream = penny_voice - if r % 2 == 1: audio.stream = haze_voice + if r > 0 && r < 31: audio.stream = penny_voice + if r >= 30 && r < 61: audio.stream = haze_voice + if r >= 60 && r < 91: audio.stream = ivy_voice + if r >= 90: audio.stream = dog_voice if r == 0: audio.stream = robo_voice audio.play() $AnimationPlayer.play("activate") diff --git a/objects/lore/station/msx.tscn b/objects/lore/station/msx.tscn index 2624a1c..7fb605b 100644 --- a/objects/lore/station/msx.tscn +++ b/objects/lore/station/msx.tscn @@ -22,5 +22,5 @@ margin_bottom = 143.0 [node name="Label" parent="Control" index="0"] margin_top = 3.0 margin_bottom = 91.0 -text = "Ms. X (Marisa Xevious): +text = "Ms. X (Sally Xevious): born 10/21/2062, she was locked up for such trivial crimes as shoplifting and marijuana possession. her reliance on drugs causes many issues in her life."