Browse Source

add sounds

a
Alice Gaudon 10 months ago
parent
commit
021a99fcd5
12 changed files with 47 additions and 7 deletions
  1. +1
    -0
      scenes/campfire/CampfireBackground.tscn
  2. +1
    -5
      scenes/main_menu.tscn
  3. +1
    -1
      scripts/MusicPlayer.gd
  4. +3
    -0
      scripts/campfire2.gd
  5. +3
    -0
      scripts/game1/Game1Script.gd
  6. +2
    -1
      scripts/main_menu.gd
  7. +4
    -0
      scripts/menu/MainMenu.gd
  8. +2
    -0
      scripts/oil_tanker.gd
  9. BIN
      sounds/Chris Zabriskie - Direct to Video - 03 I Don't See the Branches, I See the Leaves.ogg
  10. +15
    -0
      sounds/Chris Zabriskie - Direct to Video - 03 I Don't See the Branches, I See the Leaves.ogg.import
  11. BIN
      sounds/Chris Zabriskie - Direct to Video - 07 It's Always Too Late to Start Over.ogg
  12. +15
    -0
      sounds/Chris Zabriskie - Direct to Video - 07 It's Always Too Late to Start Over.ogg.import

+ 1
- 0
scenes/campfire/CampfireBackground.tscn View File

@ -12,6 +12,7 @@ centered = false
[node name="FireCrackles" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 3 )
volume_db = -6.0
autoplay = true
[node name="Ely" type="AnimatedSprite" parent="."]


+ 1
- 5
scenes/main_menu.tscn View File

@ -1,4 +1,4 @@
[gd_scene load_steps=12 format=2]
[gd_scene load_steps=11 format=2]
[ext_resource path="res://scripts/menu/title_background.gd" type="Script" id=1]
[ext_resource path="res://fonts/dialog_default_font.tres" type="DynamicFont" id=2]
@ -7,7 +7,6 @@
[ext_resource path="res://scripts/menu/MainMenu.gd" type="Script" id=5]
[ext_resource path="res://images/main_menu/title_background_campfire.tres" type="SpriteFrames" id=6]
[ext_resource path="res://images/main_menu/titleWithoutEly_loop.tres" type="SpriteFrames" id=7]
[ext_resource path="res://sounds/main_title.ogg" type="AudioStream" id=8]
[ext_resource path="res://scripts/main_menu.gd" type="Script" id=9]
[sub_resource type="StyleBoxEmpty" id=1]
@ -93,8 +92,5 @@ script = ExtResource( 3 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="MainMusic" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 8 )
[connection signal="animation_finished" from="ely" to="ely" method="_on_background_animation_finished"]
[connection signal="animation_finished" from="fire" to="fire" method="_on_background_animation_finished"]

+ 1
- 1
scripts/MusicPlayer.gd View File

@ -46,7 +46,7 @@ func get_free_track() -> AudioStreamPlayer:
free_track = track
if free_track == null:
free_track = AudioStreamPlayer.new()
print('yo')
free_track.volume_db = -6
add_child(free_track)
print(free_track)
return free_track


+ 3
- 0
scripts/campfire2.gd View File

@ -9,6 +9,8 @@ export (String, FILE, '*.json') var end_1_dialogue
export (String, FILE, '*.json') var end_truth_dialogue
export (String, FILE, '*.json') var end_lie_dialogue
onready var music_player = get_node('/root/MusicPlayer') as MusicPlayer
func _ready():
assert(end_1_dialogue != null)
assert(end_truth_dialogue != null)
@ -24,6 +26,7 @@ var choice = -1
func make_choice(choice : int):
the_choice.hide()
music_player.play("Chris Zabriskie - Direct to Video - 07 It's Always Too Late to Start Over")
yield(dialogue_box.start_dialogue(end_truth_dialogue if choice == 0 else end_lie_dialogue), 'end')
get_tree().change_scene("res://scenes/credits.tscn")


+ 3
- 0
scripts/game1/Game1Script.gd View File

@ -11,6 +11,8 @@ var player_camera : Camera2D
onready var dialogue_box = $UI/Dialog
export (String, FILE, '*.json') var dialogue
onready var music_player = get_node('/root/MusicPlayer') as MusicPlayer
onready var levels = [
#'TestLogEntity',
'Level1',
@ -38,6 +40,7 @@ func _ready():
return
yield(get_tree().create_timer(6), "timeout")
music_player.play("Chris Zabriskie - Direct to Video - 03 I Don't See the Branches, I See the Leaves")
$Opening1.play('default')
$Opening1/Mask.play('default')
$Opening1/OpeningOver.play('default')


+ 2
- 1
scripts/main_menu.gd View File

@ -1,5 +1,6 @@
extends Node2D
onready var music_player = get_node('/root/MusicPlayer') as MusicPlayer
func _ready():
$MainMusic.play()
music_player.play('main_title')

+ 4
- 0
scripts/menu/MainMenu.gd View File

@ -1,5 +1,7 @@
extends Node
onready var music_player = get_node('/root/MusicPlayer') as MusicPlayer
func _ready():
$Buttons/PlayButton.grab_focus()
for button in $Buttons.get_children():
@ -7,6 +9,8 @@ func _ready():
func _on_Button_pressed(scene_to_load : String):
if scene_to_load != "":
music_player.fade_out()
get_tree().change_scene(scene_to_load)
else:
music_player.fade_out()
get_tree().quit()

+ 2
- 0
scripts/oil_tanker.gd View File

@ -4,6 +4,7 @@ signal can_leave
var can_leave = false
onready var dialogue_box = $UI/Dialog
onready var music_player = get_node('/root/MusicPlayer') as MusicPlayer
#0
onready var oil_tanker = $OilTanker
@ -105,6 +106,7 @@ func end_step_2(body : Node):
yield(get_tree().create_timer(1), "timeout")
yield(dialogue_box.start_dialogue(dialogue_5), 'end')
yield(get_tree().create_timer(0.2), "timeout")
music_player.fade_out()
get_tree().change_scene("res://scenes/campfire2.tscn")
func _input(event):


BIN
sounds/Chris Zabriskie - Direct to Video - 03 I Don't See the Branches, I See the Leaves.ogg View File


+ 15
- 0
sounds/Chris Zabriskie - Direct to Video - 03 I Don't See the Branches, I See the Leaves.ogg.import View File

@ -0,0 +1,15 @@
[remap]
importer="ogg_vorbis"
type="AudioStreamOGGVorbis"
path="res://.import/Chris Zabriskie - Direct to Video - 03 I Don't See the Branches, I See the Leaves.ogg-7a0547bf1d516755a7b69367e9f6573a.oggstr"
[deps]
source_file="res://sounds/Chris Zabriskie - Direct to Video - 03 I Don't See the Branches, I See the Leaves.ogg"
dest_files=[ "res://.import/Chris Zabriskie - Direct to Video - 03 I Don't See the Branches, I See the Leaves.ogg-7a0547bf1d516755a7b69367e9f6573a.oggstr" ]
[params]
loop=true
loop_offset=0

BIN
sounds/Chris Zabriskie - Direct to Video - 07 It's Always Too Late to Start Over.ogg View File


+ 15
- 0
sounds/Chris Zabriskie - Direct to Video - 07 It's Always Too Late to Start Over.ogg.import View File

@ -0,0 +1,15 @@
[remap]
importer="ogg_vorbis"
type="AudioStreamOGGVorbis"
path="res://.import/Chris Zabriskie - Direct to Video - 07 It's Always Too Late to Start Over.ogg-0c87f633d9f4f7ca0cb0ddc35e26b788.oggstr"
[deps]
source_file="res://sounds/Chris Zabriskie - Direct to Video - 07 It's Always Too Late to Start Over.ogg"
dest_files=[ "res://.import/Chris Zabriskie - Direct to Video - 07 It's Always Too Late to Start Over.ogg-0c87f633d9f4f7ca0cb0ddc35e26b788.oggstr" ]
[params]
loop=true
loop_offset=0

Loading…
Cancel
Save