j/Boat-Battle
1
0
Fork 0
mirror of https://github.com/JohnBreaux/Boat-Battle.git synced 2024-11-15 05:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'game-logic' of github.com:StatewideInk/Group12 into game-logic

Browse Source
This commit is contained in:
John 2021-11-13 23:58:47 -06:00
commit d99419901f
12 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
godot_ship/.import/HitSFX.ogg-93a1e93085ac0a2fc2e723f5d44a2ca9.md5
View File

@ -1,3 +1,3 @@
source_md5="aa361943427692c39cd21430895a1f89" source_md5="aa361943427692c39cd21430895a1f89"
dest_md5="a384b01bb3a48f53f019cb11e44e2019" dest_md5="71290af628a880e44134b3636fc49535"

BIN
godot_ship/.import/HitSFX.ogg-93a1e93085ac0a2fc2e723f5d44a2ca9.oggstr
View File

Binary file not shown.

2
godot_ship/.import/MissSFX.ogg-d7b93821aa1c2b607fa4dc4bb3561322.md5
View File

@ -1,3 +1,3 @@
source_md5="4121e74ab010d628490c26ed5391a8f1" source_md5="4121e74ab010d628490c26ed5391a8f1"
dest_md5="e6145a1ff71559de29a79fa4b0b0fee2" dest_md5="8556f1ced20c3b073ae4fcb8a300e349"

BIN
godot_ship/.import/MissSFX.ogg-d7b93821aa1c2b607fa4dc4bb3561322.oggstr
View File

Binary file not shown.

2
godot_ship/.import/SunkSFX.ogg-52b6d419298328defecfc61b6c15659d.md5
View File

@ -1,3 +1,3 @@
source_md5="d71fa2832e0ad78e94bbd353bc53c2bf" source_md5="d71fa2832e0ad78e94bbd353bc53c2bf"
dest_md5="87d33fdc866cbaaee42f97113a36ceac" dest_md5="e694209bc2af13019893f9a931b65aae"

BIN
godot_ship/.import/SunkSFX.ogg-52b6d419298328defecfc61b6c15659d.oggstr
View File

Binary file not shown.

2
godot_ship/assets/audio/HitSFX.ogg.import
View File

@ -11,5 +11,5 @@ dest_files=[ "res://.import/HitSFX.ogg-93a1e93085ac0a2fc2e723f5d44a2ca9.oggstr"
[params] [params]
loop=true loop=false
loop_offset=0 loop_offset=0

2
godot_ship/assets/audio/MissSFX.ogg.import
View File

@ -11,5 +11,5 @@ dest_files=[ "res://.import/MissSFX.ogg-d7b93821aa1c2b607fa4dc4bb3561322.oggstr"
[params] [params]
loop=true loop=false
loop_offset=0 loop_offset=0

2
godot_ship/assets/audio/SunkSFX.ogg.import
View File

@ -11,5 +11,5 @@ dest_files=[ "res://.import/SunkSFX.ogg-52b6d419298328defecfc61b6c15659d.oggstr"
[params] [params]
loop=true loop=false
loop_offset=0 loop_offset=0

17
godot_ship/scenes/AudioController.tscn
View File

@ -1,8 +1,11 @@
[gd_scene load_steps=4 format=2] [gd_scene load_steps=7 format=2]
[ext_resource path="res://assets/audio/BGM - Captain Scurvy.ogg" type="AudioStream" id=1] [ext_resource path="res://assets/audio/BGM - Captain Scurvy.ogg" type="AudioStream" id=1]
[ext_resource path="res://script/audio controller/AudioController.gd" type="Script" id=2] [ext_resource path="res://script/audio controller/AudioController.gd" type="Script" id=2]
[ext_resource path="res://assets/audio/ButtonSFX.ogg" type="AudioStream" id=3] [ext_resource path="res://assets/audio/ButtonSFX.ogg" type="AudioStream" id=3]
[ext_resource path="res://assets/audio/HitSFX.ogg" type="AudioStream" id=4]
[ext_resource path="res://assets/audio/MissSFX.ogg" type="AudioStream" id=5]
[ext_resource path="res://assets/audio/SunkSFX.ogg" type="AudioStream" id=6]
[node name="Control" type="Control"] [node name="Control" type="Control"]
anchor_right = 1.0 anchor_right = 1.0
@ -20,3 +23,15 @@ bus = "BGM"
[node name="buttonSFX" type="AudioStreamPlayer" parent="."] [node name="buttonSFX" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 3 ) stream = ExtResource( 3 )
bus = "SFX" bus = "SFX"
[node name="shipHitSFX" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 4 )
bus = "SFX"
[node name="shipMissedSFX" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 5 )
bus = "SFX"
[node name="shipSunkSFX" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 6 )
bus = "SFX"

3
godot_ship/script/audio controller/Audio Bus.gd
View File

@ -6,3 +6,6 @@ extends Node
# Ask for a scene change # Ask for a scene change
signal button_clicked signal button_clicked
signal ship_hit
signal ship_missed
signal ship_sunk

13
godot_ship/script/audio controller/AudioController.gd
View File

@ -9,9 +9,22 @@ extends Control
func _ready(): func _ready():
var _errno = 0 var _errno = 0
_errno += AudioBus.connect("button_clicked", self, "_button_clicked") _errno += AudioBus.connect("button_clicked", self, "_button_clicked")
_errno += AudioBus.connect("ship_hit", self, "_ship_hit")
_errno += AudioBus.connect("ship_missed", self, "_ship_missed")
_errno += AudioBus.connect("ship_sunk", self, "_ship_sunk")
func _button_clicked(): func _button_clicked():
$buttonSFX.play() $buttonSFX.play()
func _ship_hit():
$shipHitSFX.play()
func _ship_missed():
$shipMissedSFX.play()
func _ship_sunk():
$shipSunkSFX.play()
# Called every frame. 'delta' is the elapsed time since the previous frame. # Called every frame. 'delta' is the elapsed time since the previous frame.
#func _process(delta): #func _process(delta):
# pass # pass