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

godot_ship/script/audio controller/Audio Bus.gd

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

godot_ship/script/audio controller/AudioController.gd

@@ -9,9 +9,22 @@ extends Control
 func _ready():
 	var _errno = 0
 	_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():
 	$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.
 #func _process(delta):
 #	pass