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

godot_ship/.import/dark.png-1931de55ce8abaebbea8e169cd476889.md5

@@ -0,0 +1,3 @@
+source_md5="a88d669f1f058a347cc4de2244bac64b"
+dest_md5="1073062c6e594eff250036d7489d44a7"
+

godot_ship/assets/backgrounds/dark.png.import

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/5longShipS.png-9d546ec87dabd586e250ea5c5229aa8f.stex"
+path="res://.import/dark.png-1931de55ce8abaebbea8e169cd476889.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://assets/game/5longShipS.png"
-dest_files=[ "res://.import/5longShipS.png-9d546ec87dabd586e250ea5c5229aa8f.stex" ]
+source_file="res://assets/backgrounds/dark.png"
+dest_files=[ "res://.import/dark.png-1931de55ce8abaebbea8e169cd476889.stex" ]
 
 [params]
 

godot_ship/assets/game/2longShipS.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/2longShipS.png-801d61680041dba5398a94c57d0e9262.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/game/2longShipS.png"
-dest_files=[ "res://.import/2longShipS.png-801d61680041dba5398a94c57d0e9262.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

godot_ship/assets/game/3longShipAS.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/3longShipAS.png-c88b2d866e65fe50f618c22da6c0a5d4.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/game/3longShipAS.png"
-dest_files=[ "res://.import/3longShipAS.png-c88b2d866e65fe50f618c22da6c0a5d4.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

godot_ship/assets/game/3longShipBS.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/3longShipBS.png-16d8048d7e635bcebbedc6038f4faaa5.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/game/3longShipBS.png"
-dest_files=[ "res://.import/3longShipBS.png-16d8048d7e635bcebbedc6038f4faaa5.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

godot_ship/assets/game/4longShipS.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/4longShipS.png-8dc80f51885d7a7242ed523ee285aaa0.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/game/4longShipS.png"
-dest_files=[ "res://.import/4longShipS.png-8dc80f51885d7a7242ed523ee285aaa0.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

godot_ship/scenes/Game/Game.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://script/title screen/Title-Screen-Background.png" type="Texture" id=1]
+[ext_resource path="res://assets/backgrounds/dark.png" type="Texture" id=1]
 [ext_resource path="res://script/game/Gameplay/Game.gd" type="Script" id=3]
 
 [node name="Game" type="Control"]

godot_ship/scenes/Game/Player.tscn

@@ -0,0 +1,8 @@
+[gd_scene format=2]
+
+[node name="Player" type="Control"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+__meta__ = {
+"_edit_use_anchors_": false
+}

godot_ship/scenes/Options.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://script/options/Option-Background.png" type="Texture" id=1]
+[ext_resource path="res://assets/backgrounds/dark.png" type="Texture" id=1]
 [ext_resource path="res://script/options/Options.gd" type="Script" id=2]
 
 [node name="Options" type="Control"]

godot_ship/scenes/Title Screen.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=5 format=2]
 
-[ext_resource path="res://script/title screen/Title-Screen-Background.png" type="Texture" id=1]
+[ext_resource path="res://assets/backgrounds/dark.png" type="Texture" id=1]
 [ext_resource path="res://script/title screen/Title Screen.gd" type="Script" id=2]
 [ext_resource path="res://assets/font/Minecraft.ttf" type="DynamicFontData" id=3]
 

godot_ship/script/game/Gameplay/Game.gd

@@ -12,7 +12,7 @@ onready var Setup = preload("res://scenes/Game/Setup.tscn")
 onready var Fire  = preload("res://scenes/Game/Fire.tscn")
 
 # Path to Player class, for instantiating new Players in code
-var Player = "res://script/game/Gameplay/Player.gd"
+onready var Player = preload("res://scenes/Game/Player.tscn")
 
 
 # Array of instances of the Player class; stores the Players
@@ -45,10 +45,12 @@ func game_start():
 
 #   victory_screen: display the victory screen
 func victory_screen():
+	# TODO: Create the victory screen, fill it with knowledge
 	pass
 
 #   display_turn(): display which turn it is on the screen
 func display_turn():
+	# TODO: Update the turn display, if there is one?
 	pass
 
 func _on_Forfeit_pressed():

godot_ship/script/options/Option-Background.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Option-Background.png-a36d67b33a10832808db404a3f8ef365.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://script/options/Option-Background.png"
-dest_files=[ "res://.import/Option-Background.png-a36d67b33a10832808db404a3f8ef365.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=false
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=false
-svg/scale=1.0

godot_ship/script/title screen/Title-Screen-Background.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Title-Screen-Background.png-dbef7fef33c56892772634130111c923.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://script/title screen/Title-Screen-Background.png"
-dest_files=[ "res://.import/Title-Screen-Background.png-dbef7fef33c56892772634130111c923.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=false
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=false
-svg/scale=1.0