diff --git a/godot_ship/.import/2Ship.png-1f2b7957a514f8da6d9bb3c6b90e97f4.md5 b/godot_ship/.import/2Ship.png-1f2b7957a514f8da6d9bb3c6b90e97f4.md5 new file mode 100644 index 0000000..8b1bdfe --- /dev/null +++ b/godot_ship/.import/2Ship.png-1f2b7957a514f8da6d9bb3c6b90e97f4.md5 @@ -0,0 +1,3 @@ +source_md5="b036b8f385ad112e84a3fc1fd979a64d" +dest_md5="011d0a786d919144661c98365d2a2849" + diff --git a/godot_ship/.import/2Ship.png-1f2b7957a514f8da6d9bb3c6b90e97f4.stex b/godot_ship/.import/2Ship.png-1f2b7957a514f8da6d9bb3c6b90e97f4.stex new file mode 100644 index 0000000..99f4063 Binary files /dev/null and b/godot_ship/.import/2Ship.png-1f2b7957a514f8da6d9bb3c6b90e97f4.stex differ diff --git a/godot_ship/.import/2Ship.png-f56f600f71c287a0900c4554ec6e9837.md5 b/godot_ship/.import/2Ship.png-f56f600f71c287a0900c4554ec6e9837.md5 new file mode 100644 index 0000000..108874d --- /dev/null +++ b/godot_ship/.import/2Ship.png-f56f600f71c287a0900c4554ec6e9837.md5 @@ -0,0 +1,3 @@ +source_md5="93d12a91530823316b4ea1a0017d7ffc" +dest_md5="96c4f77779707c70d2aade14e588fd60" + diff --git a/godot_ship/.import/2Ship.png-f56f600f71c287a0900c4554ec6e9837.stex b/godot_ship/.import/2Ship.png-f56f600f71c287a0900c4554ec6e9837.stex new file mode 100644 index 0000000..f125a3b Binary files /dev/null and b/godot_ship/.import/2Ship.png-f56f600f71c287a0900c4554ec6e9837.stex differ diff --git a/godot_ship/.import/2Ship_Destroyed.png-3b174719764d2b2b3ae9a0fec7d0ff67.md5 b/godot_ship/.import/2Ship_Destroyed.png-3b174719764d2b2b3ae9a0fec7d0ff67.md5 new file mode 100644 index 0000000..4468dc7 --- /dev/null +++ b/godot_ship/.import/2Ship_Destroyed.png-3b174719764d2b2b3ae9a0fec7d0ff67.md5 @@ -0,0 +1,3 @@ +source_md5="9851fdcd4e3e392cd9108e0ca5cda633" +dest_md5="4ef99e0b7c006730df94a3ba8e8b61c4" + diff --git a/godot_ship/.import/2Ship_Destroyed.png-3b174719764d2b2b3ae9a0fec7d0ff67.stex b/godot_ship/.import/2Ship_Destroyed.png-3b174719764d2b2b3ae9a0fec7d0ff67.stex new file mode 100644 index 0000000..a68e88a Binary files /dev/null and b/godot_ship/.import/2Ship_Destroyed.png-3b174719764d2b2b3ae9a0fec7d0ff67.stex differ diff --git a/godot_ship/.import/3ShipA.png-1fe0003af4adcd83b8c94b2b9d6e5b6d.md5 b/godot_ship/.import/3ShipA.png-1fe0003af4adcd83b8c94b2b9d6e5b6d.md5 new file mode 100644 index 0000000..22245da --- /dev/null +++ b/godot_ship/.import/3ShipA.png-1fe0003af4adcd83b8c94b2b9d6e5b6d.md5 @@ -0,0 +1,3 @@ +source_md5="59070c4ec859bac83324d081f7bc7fce" +dest_md5="28c2370a63fa10aa2964118063095da0" + diff --git a/godot_ship/.import/3ShipA.png-1fe0003af4adcd83b8c94b2b9d6e5b6d.stex b/godot_ship/.import/3ShipA.png-1fe0003af4adcd83b8c94b2b9d6e5b6d.stex new file mode 100644 index 0000000..02acfef Binary files /dev/null and b/godot_ship/.import/3ShipA.png-1fe0003af4adcd83b8c94b2b9d6e5b6d.stex differ diff --git a/godot_ship/.import/3ShipA_Destroyed.png-95908b7b74da915910232dfaef45af1c.md5 b/godot_ship/.import/3ShipA_Destroyed.png-95908b7b74da915910232dfaef45af1c.md5 new file mode 100644 index 0000000..3868b2f --- /dev/null +++ b/godot_ship/.import/3ShipA_Destroyed.png-95908b7b74da915910232dfaef45af1c.md5 @@ -0,0 +1,3 @@ +source_md5="981973bd65846a8aa0b6cdaf90b7d8e7" +dest_md5="4fff7820ce95350d0c7eac5e6e5d8310" + diff --git a/godot_ship/.import/3ShipA_Destroyed.png-95908b7b74da915910232dfaef45af1c.stex b/godot_ship/.import/3ShipA_Destroyed.png-95908b7b74da915910232dfaef45af1c.stex new file mode 100644 index 0000000..f5772a0 Binary files /dev/null and b/godot_ship/.import/3ShipA_Destroyed.png-95908b7b74da915910232dfaef45af1c.stex differ diff --git a/godot_ship/.import/3ShipB.png-28ed039caa6839d715648812af8f65e4.md5 b/godot_ship/.import/3ShipB.png-28ed039caa6839d715648812af8f65e4.md5 new file mode 100644 index 0000000..7f1a842 --- /dev/null +++ b/godot_ship/.import/3ShipB.png-28ed039caa6839d715648812af8f65e4.md5 @@ -0,0 +1,3 @@ +source_md5="b24ae375fc3e444bb3b893dd4fa081c9" +dest_md5="4da9fc0a51c5baaf5ce99f822e2ccf4b" + diff --git a/godot_ship/.import/3ShipB.png-28ed039caa6839d715648812af8f65e4.stex b/godot_ship/.import/3ShipB.png-28ed039caa6839d715648812af8f65e4.stex new file mode 100644 index 0000000..edcaddf Binary files /dev/null and b/godot_ship/.import/3ShipB.png-28ed039caa6839d715648812af8f65e4.stex differ diff --git a/godot_ship/.import/3ShipB_Destroyed.png-78d0de82a039cc20026f662e8052d260.md5 b/godot_ship/.import/3ShipB_Destroyed.png-78d0de82a039cc20026f662e8052d260.md5 new file mode 100644 index 0000000..2a1b1ac --- /dev/null +++ b/godot_ship/.import/3ShipB_Destroyed.png-78d0de82a039cc20026f662e8052d260.md5 @@ -0,0 +1,3 @@ +source_md5="611b7d43c6690e48e4f1a7c1b3304738" +dest_md5="825663500e46723735569e6cd71245f5" + diff --git a/godot_ship/.import/3ShipB_Destroyed.png-78d0de82a039cc20026f662e8052d260.stex b/godot_ship/.import/3ShipB_Destroyed.png-78d0de82a039cc20026f662e8052d260.stex new file mode 100644 index 0000000..4243f47 Binary files /dev/null and b/godot_ship/.import/3ShipB_Destroyed.png-78d0de82a039cc20026f662e8052d260.stex differ diff --git a/godot_ship/.import/4Ship.png-1102455fdea5ccc9870ef475ee45f60a.md5 b/godot_ship/.import/4Ship.png-1102455fdea5ccc9870ef475ee45f60a.md5 new file mode 100644 index 0000000..87d2cda --- /dev/null +++ b/godot_ship/.import/4Ship.png-1102455fdea5ccc9870ef475ee45f60a.md5 @@ -0,0 +1,3 @@ +source_md5="1d6228ffb0d2ea2aa0e22c3f58bbe4fa" +dest_md5="afaef7c4779eef6d0254b50d8f875dc5" + diff --git a/godot_ship/.import/4Ship.png-1102455fdea5ccc9870ef475ee45f60a.stex b/godot_ship/.import/4Ship.png-1102455fdea5ccc9870ef475ee45f60a.stex new file mode 100644 index 0000000..239c36c Binary files /dev/null and b/godot_ship/.import/4Ship.png-1102455fdea5ccc9870ef475ee45f60a.stex differ diff --git a/godot_ship/.import/4Ship_Destroyed.png-acd8cae1448d0240f60f78c6681833bd.md5 b/godot_ship/.import/4Ship_Destroyed.png-acd8cae1448d0240f60f78c6681833bd.md5 new file mode 100644 index 0000000..0c59f15 --- /dev/null +++ b/godot_ship/.import/4Ship_Destroyed.png-acd8cae1448d0240f60f78c6681833bd.md5 @@ -0,0 +1,3 @@ +source_md5="dd0aa67efe22d26c04757928ec2b2822" +dest_md5="85b500eeadf9068df9f503ca7b8eaef2" + diff --git a/godot_ship/.import/4Ship_Destroyed.png-acd8cae1448d0240f60f78c6681833bd.stex b/godot_ship/.import/4Ship_Destroyed.png-acd8cae1448d0240f60f78c6681833bd.stex new file mode 100644 index 0000000..474b2a6 Binary files /dev/null and b/godot_ship/.import/4Ship_Destroyed.png-acd8cae1448d0240f60f78c6681833bd.stex differ diff --git a/godot_ship/.import/5Ship.png-78bcea6c287110425f92a7d06eaf0b2b.md5 b/godot_ship/.import/5Ship.png-78bcea6c287110425f92a7d06eaf0b2b.md5 new file mode 100644 index 0000000..c4b09d8 --- /dev/null +++ b/godot_ship/.import/5Ship.png-78bcea6c287110425f92a7d06eaf0b2b.md5 @@ -0,0 +1,3 @@ +source_md5="138929229182774ac17e092717625524" +dest_md5="4abf17415a8fd06eeb2ef60cfb9581ba" + diff --git a/godot_ship/.import/5Ship.png-78bcea6c287110425f92a7d06eaf0b2b.stex b/godot_ship/.import/5Ship.png-78bcea6c287110425f92a7d06eaf0b2b.stex new file mode 100644 index 0000000..0eb4ca1 Binary files /dev/null and b/godot_ship/.import/5Ship.png-78bcea6c287110425f92a7d06eaf0b2b.stex differ diff --git a/godot_ship/.import/5Ship_Destroyed.png-26b685facbe48d12dffaa45c142d98de.md5 b/godot_ship/.import/5Ship_Destroyed.png-26b685facbe48d12dffaa45c142d98de.md5 new file mode 100644 index 0000000..904abf9 --- /dev/null +++ b/godot_ship/.import/5Ship_Destroyed.png-26b685facbe48d12dffaa45c142d98de.md5 @@ -0,0 +1,3 @@ +source_md5="c6a71a262b65376a91110c8262cb5c47" +dest_md5="41cb23a281873e90513d7bb692291714" + diff --git a/godot_ship/.import/5Ship_Destroyed.png-26b685facbe48d12dffaa45c142d98de.stex b/godot_ship/.import/5Ship_Destroyed.png-26b685facbe48d12dffaa45c142d98de.stex new file mode 100644 index 0000000..a83538c Binary files /dev/null and b/godot_ship/.import/5Ship_Destroyed.png-26b685facbe48d12dffaa45c142d98de.stex differ diff --git a/godot_ship/.import/Background_Dark.png-f04f9416ce96aca35dfd0f16063b0d5b.md5 b/godot_ship/.import/Background_Dark.png-f04f9416ce96aca35dfd0f16063b0d5b.md5 new file mode 100644 index 0000000..65f245f --- /dev/null +++ b/godot_ship/.import/Background_Dark.png-f04f9416ce96aca35dfd0f16063b0d5b.md5 @@ -0,0 +1,3 @@ +source_md5="a88d669f1f058a347cc4de2244bac64b" +dest_md5="1073062c6e594eff250036d7489d44a7" + diff --git a/godot_ship/.import/Background_Dark.png-f04f9416ce96aca35dfd0f16063b0d5b.stex b/godot_ship/.import/Background_Dark.png-f04f9416ce96aca35dfd0f16063b0d5b.stex new file mode 100644 index 0000000..1ea8a2a Binary files /dev/null and b/godot_ship/.import/Background_Dark.png-f04f9416ce96aca35dfd0f16063b0d5b.stex differ diff --git a/godot_ship/.import/Background_Light.png-3684b7dcc3b1fd645e9fff4401113c01.md5 b/godot_ship/.import/Background_Light.png-3684b7dcc3b1fd645e9fff4401113c01.md5 new file mode 100644 index 0000000..ad95732 --- /dev/null +++ b/godot_ship/.import/Background_Light.png-3684b7dcc3b1fd645e9fff4401113c01.md5 @@ -0,0 +1,3 @@ +source_md5="def9518adb67248106449930ecafbf56" +dest_md5="b1f6910cd5bbb4c510a140a0147c5476" + diff --git a/godot_ship/.import/Background_Light.png-3684b7dcc3b1fd645e9fff4401113c01.stex b/godot_ship/.import/Background_Light.png-3684b7dcc3b1fd645e9fff4401113c01.stex new file mode 100644 index 0000000..fa6121d Binary files /dev/null and b/godot_ship/.import/Background_Light.png-3684b7dcc3b1fd645e9fff4401113c01.stex differ diff --git a/godot_ship/.import/Hit.png-17e3984e00632881a34870756ffe8c73.md5 b/godot_ship/.import/Hit.png-17e3984e00632881a34870756ffe8c73.md5 new file mode 100644 index 0000000..e3aa620 --- /dev/null +++ b/godot_ship/.import/Hit.png-17e3984e00632881a34870756ffe8c73.md5 @@ -0,0 +1,3 @@ +source_md5="d7fa4a808d473904c3043c7892700d02" +dest_md5="603497c5e82c90610e6693faacd65c41" + diff --git a/godot_ship/.import/Hit.png-17e3984e00632881a34870756ffe8c73.stex b/godot_ship/.import/Hit.png-17e3984e00632881a34870756ffe8c73.stex new file mode 100644 index 0000000..df0ccf2 Binary files /dev/null and b/godot_ship/.import/Hit.png-17e3984e00632881a34870756ffe8c73.stex differ diff --git a/godot_ship/.import/Hit.png-30856058168b013ca9959912101c2c87.md5 b/godot_ship/.import/Hit.png-30856058168b013ca9959912101c2c87.md5 new file mode 100644 index 0000000..ace9f26 --- /dev/null +++ b/godot_ship/.import/Hit.png-30856058168b013ca9959912101c2c87.md5 @@ -0,0 +1,3 @@ +source_md5="99d0fd86ad7b4b502e9c3b71719fc7c7" +dest_md5="1c78fc49829e63a270e971f0d6ec7afd" + diff --git a/godot_ship/.import/Hit.png-30856058168b013ca9959912101c2c87.stex b/godot_ship/.import/Hit.png-30856058168b013ca9959912101c2c87.stex new file mode 100644 index 0000000..203b6c7 Binary files /dev/null and b/godot_ship/.import/Hit.png-30856058168b013ca9959912101c2c87.stex differ diff --git a/godot_ship/.import/Hit.png-87d7e3b710f3d0b308b047fd65cd9a0a.md5 b/godot_ship/.import/Hit.png-87d7e3b710f3d0b308b047fd65cd9a0a.md5 new file mode 100644 index 0000000..e3aa620 --- /dev/null +++ b/godot_ship/.import/Hit.png-87d7e3b710f3d0b308b047fd65cd9a0a.md5 @@ -0,0 +1,3 @@ +source_md5="d7fa4a808d473904c3043c7892700d02" +dest_md5="603497c5e82c90610e6693faacd65c41" + diff --git a/godot_ship/.import/Hit.png-87d7e3b710f3d0b308b047fd65cd9a0a.stex b/godot_ship/.import/Hit.png-87d7e3b710f3d0b308b047fd65cd9a0a.stex new file mode 100644 index 0000000..df0ccf2 Binary files /dev/null and b/godot_ship/.import/Hit.png-87d7e3b710f3d0b308b047fd65cd9a0a.stex differ diff --git a/godot_ship/.import/HitSFX.ogg-93a1e93085ac0a2fc2e723f5d44a2ca9.md5 b/godot_ship/.import/HitSFX.ogg-93a1e93085ac0a2fc2e723f5d44a2ca9.md5 new file mode 100644 index 0000000..dc35f36 --- /dev/null +++ b/godot_ship/.import/HitSFX.ogg-93a1e93085ac0a2fc2e723f5d44a2ca9.md5 @@ -0,0 +1,3 @@ +source_md5="aa361943427692c39cd21430895a1f89" +dest_md5="71290af628a880e44134b3636fc49535" + diff --git a/godot_ship/.import/HitSFX.ogg-93a1e93085ac0a2fc2e723f5d44a2ca9.oggstr b/godot_ship/.import/HitSFX.ogg-93a1e93085ac0a2fc2e723f5d44a2ca9.oggstr new file mode 100644 index 0000000..5261971 Binary files /dev/null and b/godot_ship/.import/HitSFX.ogg-93a1e93085ac0a2fc2e723f5d44a2ca9.oggstr differ diff --git a/godot_ship/.import/Miss.png-ddfb2f437f6e39c5895f51ba5ab8423e.md5 b/godot_ship/.import/Miss.png-ddfb2f437f6e39c5895f51ba5ab8423e.md5 new file mode 100644 index 0000000..8347cc4 --- /dev/null +++ b/godot_ship/.import/Miss.png-ddfb2f437f6e39c5895f51ba5ab8423e.md5 @@ -0,0 +1,3 @@ +source_md5="7db22073ddecad057e2516a409e715e9" +dest_md5="7831bb54cb10c5c9023e7f33bc355eff" + diff --git a/godot_ship/.import/Miss.png-ddfb2f437f6e39c5895f51ba5ab8423e.stex b/godot_ship/.import/Miss.png-ddfb2f437f6e39c5895f51ba5ab8423e.stex new file mode 100644 index 0000000..d790ddd Binary files /dev/null and b/godot_ship/.import/Miss.png-ddfb2f437f6e39c5895f51ba5ab8423e.stex differ diff --git a/godot_ship/.import/MissSFX.ogg-d7b93821aa1c2b607fa4dc4bb3561322.md5 b/godot_ship/.import/MissSFX.ogg-d7b93821aa1c2b607fa4dc4bb3561322.md5 new file mode 100644 index 0000000..90af281 --- /dev/null +++ b/godot_ship/.import/MissSFX.ogg-d7b93821aa1c2b607fa4dc4bb3561322.md5 @@ -0,0 +1,3 @@ +source_md5="4121e74ab010d628490c26ed5391a8f1" +dest_md5="8556f1ced20c3b073ae4fcb8a300e349" + diff --git a/godot_ship/.import/MissSFX.ogg-d7b93821aa1c2b607fa4dc4bb3561322.oggstr b/godot_ship/.import/MissSFX.ogg-d7b93821aa1c2b607fa4dc4bb3561322.oggstr new file mode 100644 index 0000000..dbb57d5 Binary files /dev/null and b/godot_ship/.import/MissSFX.ogg-d7b93821aa1c2b607fa4dc4bb3561322.oggstr differ diff --git a/godot_ship/.import/Option-Background.png-a36d67b33a10832808db404a3f8ef365.md5 b/godot_ship/.import/Option-Background.png-a36d67b33a10832808db404a3f8ef365.md5 index 65f245f..f5e763d 100644 --- a/godot_ship/.import/Option-Background.png-a36d67b33a10832808db404a3f8ef365.md5 +++ b/godot_ship/.import/Option-Background.png-a36d67b33a10832808db404a3f8ef365.md5 @@ -1,3 +1,3 @@ source_md5="a88d669f1f058a347cc4de2244bac64b" -dest_md5="1073062c6e594eff250036d7489d44a7" +dest_md5="1ed8fab74f35d40e257776b2eab84c5f" diff --git a/godot_ship/.import/Option-Background.png-a36d67b33a10832808db404a3f8ef365.stex b/godot_ship/.import/Option-Background.png-a36d67b33a10832808db404a3f8ef365.stex index 1ea8a2a..502efb5 100644 Binary files a/godot_ship/.import/Option-Background.png-a36d67b33a10832808db404a3f8ef365.stex and b/godot_ship/.import/Option-Background.png-a36d67b33a10832808db404a3f8ef365.stex differ diff --git a/godot_ship/.import/RedCrosshair.png-ed59a214d85db7c21233257c8daddbef.md5 b/godot_ship/.import/RedCrosshair.png-ed59a214d85db7c21233257c8daddbef.md5 new file mode 100644 index 0000000..de8e442 --- /dev/null +++ b/godot_ship/.import/RedCrosshair.png-ed59a214d85db7c21233257c8daddbef.md5 @@ -0,0 +1,3 @@ +source_md5="f6d6cf59e576f46ace6228c7c6fbcd43" +dest_md5="847ce85590ffc54d7107d859e3aedafc" + diff --git a/godot_ship/.import/RedCrosshair.png-ed59a214d85db7c21233257c8daddbef.stex b/godot_ship/.import/RedCrosshair.png-ed59a214d85db7c21233257c8daddbef.stex new file mode 100644 index 0000000..7b43ace Binary files /dev/null and b/godot_ship/.import/RedCrosshair.png-ed59a214d85db7c21233257c8daddbef.stex differ diff --git a/godot_ship/.import/SunkSFX.ogg-52b6d419298328defecfc61b6c15659d.md5 b/godot_ship/.import/SunkSFX.ogg-52b6d419298328defecfc61b6c15659d.md5 new file mode 100644 index 0000000..aa69243 --- /dev/null +++ b/godot_ship/.import/SunkSFX.ogg-52b6d419298328defecfc61b6c15659d.md5 @@ -0,0 +1,3 @@ +source_md5="d71fa2832e0ad78e94bbd353bc53c2bf" +dest_md5="e694209bc2af13019893f9a931b65aae" + diff --git a/godot_ship/.import/SunkSFX.ogg-52b6d419298328defecfc61b6c15659d.oggstr b/godot_ship/.import/SunkSFX.ogg-52b6d419298328defecfc61b6c15659d.oggstr new file mode 100644 index 0000000..c10859e Binary files /dev/null and b/godot_ship/.import/SunkSFX.ogg-52b6d419298328defecfc61b6c15659d.oggstr differ diff --git a/godot_ship/.import/Title-Screen-Background.png-dbef7fef33c56892772634130111c923.md5 b/godot_ship/.import/Title-Screen-Background.png-dbef7fef33c56892772634130111c923.md5 index 65f245f..f5e763d 100644 --- a/godot_ship/.import/Title-Screen-Background.png-dbef7fef33c56892772634130111c923.md5 +++ b/godot_ship/.import/Title-Screen-Background.png-dbef7fef33c56892772634130111c923.md5 @@ -1,3 +1,3 @@ source_md5="a88d669f1f058a347cc4de2244bac64b" -dest_md5="1073062c6e594eff250036d7489d44a7" +dest_md5="1ed8fab74f35d40e257776b2eab84c5f" diff --git a/godot_ship/.import/Title-Screen-Background.png-dbef7fef33c56892772634130111c923.stex b/godot_ship/.import/Title-Screen-Background.png-dbef7fef33c56892772634130111c923.stex index 1ea8a2a..502efb5 100644 Binary files a/godot_ship/.import/Title-Screen-Background.png-dbef7fef33c56892772634130111c923.stex and b/godot_ship/.import/Title-Screen-Background.png-dbef7fef33c56892772634130111c923.stex differ diff --git a/godot_ship/.import/board_blue.png-8626e50dfcb57a0efd28af7e65ef2b42.md5 b/godot_ship/.import/board_blue.png-8626e50dfcb57a0efd28af7e65ef2b42.md5 index 4238530..ec1b676 100644 --- a/godot_ship/.import/board_blue.png-8626e50dfcb57a0efd28af7e65ef2b42.md5 +++ b/godot_ship/.import/board_blue.png-8626e50dfcb57a0efd28af7e65ef2b42.md5 @@ -1,3 +1,3 @@ source_md5="b92638ab580fe79d74bb8107654c3251" -dest_md5="63739009bf08a9c44da9311804dd83ec" +dest_md5="17edee549d78810f083297a469b16f26" diff --git a/godot_ship/.import/board_blue.png-8626e50dfcb57a0efd28af7e65ef2b42.stex b/godot_ship/.import/board_blue.png-8626e50dfcb57a0efd28af7e65ef2b42.stex index 515531d..a234899 100644 Binary files a/godot_ship/.import/board_blue.png-8626e50dfcb57a0efd28af7e65ef2b42.stex and b/godot_ship/.import/board_blue.png-8626e50dfcb57a0efd28af7e65ef2b42.stex differ diff --git a/godot_ship/.import/dark.png-1931de55ce8abaebbea8e169cd476889.md5 b/godot_ship/.import/dark.png-1931de55ce8abaebbea8e169cd476889.md5 new file mode 100644 index 0000000..65f245f --- /dev/null +++ b/godot_ship/.import/dark.png-1931de55ce8abaebbea8e169cd476889.md5 @@ -0,0 +1,3 @@ +source_md5="a88d669f1f058a347cc4de2244bac64b" +dest_md5="1073062c6e594eff250036d7489d44a7" + diff --git a/godot_ship/.import/dark.png-1931de55ce8abaebbea8e169cd476889.stex b/godot_ship/.import/dark.png-1931de55ce8abaebbea8e169cd476889.stex new file mode 100644 index 0000000..1ea8a2a Binary files /dev/null and b/godot_ship/.import/dark.png-1931de55ce8abaebbea8e169cd476889.stex differ diff --git a/godot_ship/.import/old.png-e33a9570b9c50f914f31c7204a2ce0c6.md5 b/godot_ship/.import/old.png-e33a9570b9c50f914f31c7204a2ce0c6.md5 new file mode 100644 index 0000000..60c77bb --- /dev/null +++ b/godot_ship/.import/old.png-e33a9570b9c50f914f31c7204a2ce0c6.md5 @@ -0,0 +1,3 @@ +source_md5="679a219fb184d568adf29ad2c7caa3c2" +dest_md5="91aa89d551b22c26e3abc14f2a044464" + diff --git a/godot_ship/assets/audio/HitSFX.ogg b/godot_ship/assets/audio/HitSFX.ogg new file mode 100644 index 0000000..96a2dfb Binary files /dev/null and b/godot_ship/assets/audio/HitSFX.ogg differ diff --git a/godot_ship/assets/audio/HitSFX.ogg.import b/godot_ship/assets/audio/HitSFX.ogg.import new file mode 100644 index 0000000..7f85105 --- /dev/null +++ b/godot_ship/assets/audio/HitSFX.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/HitSFX.ogg-93a1e93085ac0a2fc2e723f5d44a2ca9.oggstr" + +[deps] + +source_file="res://assets/audio/HitSFX.ogg" +dest_files=[ "res://.import/HitSFX.ogg-93a1e93085ac0a2fc2e723f5d44a2ca9.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/godot_ship/assets/audio/MissSFX.ogg b/godot_ship/assets/audio/MissSFX.ogg new file mode 100644 index 0000000..578beda Binary files /dev/null and b/godot_ship/assets/audio/MissSFX.ogg differ diff --git a/godot_ship/assets/audio/MissSFX.ogg.import b/godot_ship/assets/audio/MissSFX.ogg.import new file mode 100644 index 0000000..8767d4e --- /dev/null +++ b/godot_ship/assets/audio/MissSFX.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/MissSFX.ogg-d7b93821aa1c2b607fa4dc4bb3561322.oggstr" + +[deps] + +source_file="res://assets/audio/MissSFX.ogg" +dest_files=[ "res://.import/MissSFX.ogg-d7b93821aa1c2b607fa4dc4bb3561322.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/godot_ship/assets/audio/SunkSFX.ogg b/godot_ship/assets/audio/SunkSFX.ogg new file mode 100644 index 0000000..2b1ce0d Binary files /dev/null and b/godot_ship/assets/audio/SunkSFX.ogg differ diff --git a/godot_ship/assets/audio/SunkSFX.ogg.import b/godot_ship/assets/audio/SunkSFX.ogg.import new file mode 100644 index 0000000..17cd2ab --- /dev/null +++ b/godot_ship/assets/audio/SunkSFX.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/SunkSFX.ogg-52b6d419298328defecfc61b6c15659d.oggstr" + +[deps] + +source_file="res://assets/audio/SunkSFX.ogg" +dest_files=[ "res://.import/SunkSFX.ogg-52b6d419298328defecfc61b6c15659d.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/godot_ship/script/options/Option-Background.png b/godot_ship/assets/backgrounds/Background_Dark.png similarity index 100% rename from godot_ship/script/options/Option-Background.png rename to godot_ship/assets/backgrounds/Background_Dark.png diff --git a/godot_ship/assets/game/3longShipBS.png.import b/godot_ship/assets/backgrounds/Background_Dark.png.import similarity index 67% rename from godot_ship/assets/game/3longShipBS.png.import rename to godot_ship/assets/backgrounds/Background_Dark.png.import index f0655e9..d8ce35a 100644 --- a/godot_ship/assets/game/3longShipBS.png.import +++ b/godot_ship/assets/backgrounds/Background_Dark.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/3longShipBS.png-16d8048d7e635bcebbedc6038f4faaa5.stex" +path="res://.import/Background_Dark.png-f04f9416ce96aca35dfd0f16063b0d5b.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/game/3longShipBS.png" -dest_files=[ "res://.import/3longShipBS.png-16d8048d7e635bcebbedc6038f4faaa5.stex" ] +source_file="res://assets/backgrounds/Background_Dark.png" +dest_files=[ "res://.import/Background_Dark.png-f04f9416ce96aca35dfd0f16063b0d5b.stex" ] [params] diff --git a/godot_ship/assets/backgrounds/Background_Light.png b/godot_ship/assets/backgrounds/Background_Light.png new file mode 100644 index 0000000..29a1aeb Binary files /dev/null and b/godot_ship/assets/backgrounds/Background_Light.png differ diff --git a/godot_ship/assets/backgrounds/Background_Light.png.import b/godot_ship/assets/backgrounds/Background_Light.png.import new file mode 100644 index 0000000..13140de --- /dev/null +++ b/godot_ship/assets/backgrounds/Background_Light.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Background_Light.png-3684b7dcc3b1fd645e9fff4401113c01.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/backgrounds/Background_Light.png" +dest_files=[ "res://.import/Background_Light.png-3684b7dcc3b1fd645e9fff4401113c01.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 diff --git a/godot_ship/assets/font/Minecraft.ttf b/godot_ship/assets/font/Minecraft.ttf new file mode 100644 index 0000000..85c1472 Binary files /dev/null and b/godot_ship/assets/font/Minecraft.ttf differ diff --git a/godot_ship/assets/game/2Ship.png b/godot_ship/assets/game/2Ship.png new file mode 100644 index 0000000..c13c33d Binary files /dev/null and b/godot_ship/assets/game/2Ship.png differ diff --git a/godot_ship/assets/game/2longShipS.png.import b/godot_ship/assets/game/2Ship.png.import similarity index 64% rename from godot_ship/assets/game/2longShipS.png.import rename to godot_ship/assets/game/2Ship.png.import index a5aafa4..ffcbcaf 100644 --- a/godot_ship/assets/game/2longShipS.png.import +++ b/godot_ship/assets/game/2Ship.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/2longShipS.png-801d61680041dba5398a94c57d0e9262.stex" +path="res://.import/2Ship.png-f56f600f71c287a0900c4554ec6e9837.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/game/2longShipS.png" -dest_files=[ "res://.import/2longShipS.png-801d61680041dba5398a94c57d0e9262.stex" ] +source_file="res://assets/game/2Ship.png" +dest_files=[ "res://.import/2Ship.png-f56f600f71c287a0900c4554ec6e9837.stex" ] [params] @@ -20,7 +20,7 @@ compress/hdr_mode=0 compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 -flags/filter=true +flags/filter=false flags/mipmaps=false flags/anisotropic=false flags/srgb=2 @@ -30,5 +30,5 @@ process/HDR_as_SRGB=false process/invert_color=false stream=false size_limit=0 -detect_3d=true +detect_3d=false svg/scale=1.0 diff --git a/godot_ship/assets/game/2Ship_Destroyed.png b/godot_ship/assets/game/2Ship_Destroyed.png new file mode 100644 index 0000000..b8a05e7 Binary files /dev/null and b/godot_ship/assets/game/2Ship_Destroyed.png differ diff --git a/godot_ship/assets/game/2Ship_Destroyed.png.import b/godot_ship/assets/game/2Ship_Destroyed.png.import new file mode 100644 index 0000000..55b2d08 --- /dev/null +++ b/godot_ship/assets/game/2Ship_Destroyed.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/2Ship_Destroyed.png-3b174719764d2b2b3ae9a0fec7d0ff67.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/game/2Ship_Destroyed.png" +dest_files=[ "res://.import/2Ship_Destroyed.png-3b174719764d2b2b3ae9a0fec7d0ff67.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 diff --git a/godot_ship/assets/game/2longShipS.png b/godot_ship/assets/game/2longShipS.png deleted file mode 100644 index 8af3d65..0000000 Binary files a/godot_ship/assets/game/2longShipS.png and /dev/null differ diff --git a/godot_ship/assets/game/3ShipA.png b/godot_ship/assets/game/3ShipA.png new file mode 100644 index 0000000..a6c8a04 Binary files /dev/null and b/godot_ship/assets/game/3ShipA.png differ diff --git a/godot_ship/assets/game/4longShipS.png.import b/godot_ship/assets/game/3ShipA.png.import similarity index 64% rename from godot_ship/assets/game/4longShipS.png.import rename to godot_ship/assets/game/3ShipA.png.import index 1f6589d..d16c7db 100644 --- a/godot_ship/assets/game/4longShipS.png.import +++ b/godot_ship/assets/game/3ShipA.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/4longShipS.png-8dc80f51885d7a7242ed523ee285aaa0.stex" +path="res://.import/3ShipA.png-1fe0003af4adcd83b8c94b2b9d6e5b6d.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/game/4longShipS.png" -dest_files=[ "res://.import/4longShipS.png-8dc80f51885d7a7242ed523ee285aaa0.stex" ] +source_file="res://assets/game/3ShipA.png" +dest_files=[ "res://.import/3ShipA.png-1fe0003af4adcd83b8c94b2b9d6e5b6d.stex" ] [params] @@ -20,7 +20,7 @@ compress/hdr_mode=0 compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 -flags/filter=true +flags/filter=false flags/mipmaps=false flags/anisotropic=false flags/srgb=2 @@ -30,5 +30,5 @@ process/HDR_as_SRGB=false process/invert_color=false stream=false size_limit=0 -detect_3d=true +detect_3d=false svg/scale=1.0 diff --git a/godot_ship/assets/game/3ShipA_Destroyed.png b/godot_ship/assets/game/3ShipA_Destroyed.png new file mode 100644 index 0000000..460d7fc Binary files /dev/null and b/godot_ship/assets/game/3ShipA_Destroyed.png differ diff --git a/godot_ship/assets/game/3ShipA_Destroyed.png.import b/godot_ship/assets/game/3ShipA_Destroyed.png.import new file mode 100644 index 0000000..ef51b82 --- /dev/null +++ b/godot_ship/assets/game/3ShipA_Destroyed.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/3ShipA_Destroyed.png-95908b7b74da915910232dfaef45af1c.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/game/3ShipA_Destroyed.png" +dest_files=[ "res://.import/3ShipA_Destroyed.png-95908b7b74da915910232dfaef45af1c.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 diff --git a/godot_ship/assets/game/3ShipB.png b/godot_ship/assets/game/3ShipB.png new file mode 100644 index 0000000..6e30dba Binary files /dev/null and b/godot_ship/assets/game/3ShipB.png differ diff --git a/godot_ship/assets/game/3longShipAS.png.import b/godot_ship/assets/game/3ShipB.png.import similarity index 64% rename from godot_ship/assets/game/3longShipAS.png.import rename to godot_ship/assets/game/3ShipB.png.import index 2ea37c8..3e256c7 100644 --- a/godot_ship/assets/game/3longShipAS.png.import +++ b/godot_ship/assets/game/3ShipB.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/3longShipAS.png-c88b2d866e65fe50f618c22da6c0a5d4.stex" +path="res://.import/3ShipB.png-28ed039caa6839d715648812af8f65e4.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/game/3longShipAS.png" -dest_files=[ "res://.import/3longShipAS.png-c88b2d866e65fe50f618c22da6c0a5d4.stex" ] +source_file="res://assets/game/3ShipB.png" +dest_files=[ "res://.import/3ShipB.png-28ed039caa6839d715648812af8f65e4.stex" ] [params] @@ -20,7 +20,7 @@ compress/hdr_mode=0 compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 -flags/filter=true +flags/filter=false flags/mipmaps=false flags/anisotropic=false flags/srgb=2 @@ -30,5 +30,5 @@ process/HDR_as_SRGB=false process/invert_color=false stream=false size_limit=0 -detect_3d=true +detect_3d=false svg/scale=1.0 diff --git a/godot_ship/assets/game/3ShipB_Destroyed.png b/godot_ship/assets/game/3ShipB_Destroyed.png new file mode 100644 index 0000000..5d500a0 Binary files /dev/null and b/godot_ship/assets/game/3ShipB_Destroyed.png differ diff --git a/godot_ship/assets/game/3ShipB_Destroyed.png.import b/godot_ship/assets/game/3ShipB_Destroyed.png.import new file mode 100644 index 0000000..4555e0f --- /dev/null +++ b/godot_ship/assets/game/3ShipB_Destroyed.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/3ShipB_Destroyed.png-78d0de82a039cc20026f662e8052d260.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/game/3ShipB_Destroyed.png" +dest_files=[ "res://.import/3ShipB_Destroyed.png-78d0de82a039cc20026f662e8052d260.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 diff --git a/godot_ship/assets/game/3longShipAS.png b/godot_ship/assets/game/3longShipAS.png deleted file mode 100644 index bca66d7..0000000 Binary files a/godot_ship/assets/game/3longShipAS.png and /dev/null differ diff --git a/godot_ship/assets/game/3longShipBS.png b/godot_ship/assets/game/3longShipBS.png deleted file mode 100644 index a904795..0000000 Binary files a/godot_ship/assets/game/3longShipBS.png and /dev/null differ diff --git a/godot_ship/assets/game/4Ship.png b/godot_ship/assets/game/4Ship.png new file mode 100644 index 0000000..7e83f89 Binary files /dev/null and b/godot_ship/assets/game/4Ship.png differ diff --git a/godot_ship/assets/game/4Ship.png.import b/godot_ship/assets/game/4Ship.png.import new file mode 100644 index 0000000..4cbcf24 --- /dev/null +++ b/godot_ship/assets/game/4Ship.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/4Ship.png-1102455fdea5ccc9870ef475ee45f60a.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/game/4Ship.png" +dest_files=[ "res://.import/4Ship.png-1102455fdea5ccc9870ef475ee45f60a.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 diff --git a/godot_ship/assets/game/4Ship_Destroyed.png b/godot_ship/assets/game/4Ship_Destroyed.png new file mode 100644 index 0000000..5c2a710 Binary files /dev/null and b/godot_ship/assets/game/4Ship_Destroyed.png differ diff --git a/godot_ship/assets/game/4Ship_Destroyed.png.import b/godot_ship/assets/game/4Ship_Destroyed.png.import new file mode 100644 index 0000000..c3d46de --- /dev/null +++ b/godot_ship/assets/game/4Ship_Destroyed.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/4Ship_Destroyed.png-acd8cae1448d0240f60f78c6681833bd.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/game/4Ship_Destroyed.png" +dest_files=[ "res://.import/4Ship_Destroyed.png-acd8cae1448d0240f60f78c6681833bd.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 diff --git a/godot_ship/assets/game/4longShipS.png b/godot_ship/assets/game/4longShipS.png deleted file mode 100644 index b737b89..0000000 Binary files a/godot_ship/assets/game/4longShipS.png and /dev/null differ diff --git a/godot_ship/assets/game/5Ship.png b/godot_ship/assets/game/5Ship.png new file mode 100644 index 0000000..5a7005b Binary files /dev/null and b/godot_ship/assets/game/5Ship.png differ diff --git a/godot_ship/assets/game/5Ship.png.import b/godot_ship/assets/game/5Ship.png.import new file mode 100644 index 0000000..34dca30 --- /dev/null +++ b/godot_ship/assets/game/5Ship.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/5Ship.png-78bcea6c287110425f92a7d06eaf0b2b.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/game/5Ship.png" +dest_files=[ "res://.import/5Ship.png-78bcea6c287110425f92a7d06eaf0b2b.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 diff --git a/godot_ship/assets/game/5Ship_Destroyed.png b/godot_ship/assets/game/5Ship_Destroyed.png new file mode 100644 index 0000000..6a90661 Binary files /dev/null and b/godot_ship/assets/game/5Ship_Destroyed.png differ diff --git a/godot_ship/assets/game/5Ship_Destroyed.png.import b/godot_ship/assets/game/5Ship_Destroyed.png.import new file mode 100644 index 0000000..60b407c --- /dev/null +++ b/godot_ship/assets/game/5Ship_Destroyed.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/5Ship_Destroyed.png-26b685facbe48d12dffaa45c142d98de.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/game/5Ship_Destroyed.png" +dest_files=[ "res://.import/5Ship_Destroyed.png-26b685facbe48d12dffaa45c142d98de.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 diff --git a/godot_ship/assets/game/5longShipS.png b/godot_ship/assets/game/5longShipS.png deleted file mode 100644 index 2c7832e..0000000 Binary files a/godot_ship/assets/game/5longShipS.png and /dev/null differ diff --git a/godot_ship/assets/game/Hit.png b/godot_ship/assets/game/Hit.png new file mode 100644 index 0000000..ec5ba00 Binary files /dev/null and b/godot_ship/assets/game/Hit.png differ diff --git a/godot_ship/assets/game/5longShipS.png.import b/godot_ship/assets/game/Hit.png.import similarity index 69% rename from godot_ship/assets/game/5longShipS.png.import rename to godot_ship/assets/game/Hit.png.import index 4e6d2e9..81b5358 100644 --- a/godot_ship/assets/game/5longShipS.png.import +++ b/godot_ship/assets/game/Hit.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/5longShipS.png-9d546ec87dabd586e250ea5c5229aa8f.stex" +path="res://.import/Hit.png-87d7e3b710f3d0b308b047fd65cd9a0a.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/game/Hit.png" +dest_files=[ "res://.import/Hit.png-87d7e3b710f3d0b308b047fd65cd9a0a.stex" ] [params] diff --git a/godot_ship/assets/game/Miss.png b/godot_ship/assets/game/Miss.png new file mode 100644 index 0000000..2b1014d Binary files /dev/null and b/godot_ship/assets/game/Miss.png differ diff --git a/godot_ship/assets/game/Miss.png.import b/godot_ship/assets/game/Miss.png.import new file mode 100644 index 0000000..7809347 --- /dev/null +++ b/godot_ship/assets/game/Miss.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Miss.png-ddfb2f437f6e39c5895f51ba5ab8423e.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/game/Miss.png" +dest_files=[ "res://.import/Miss.png-ddfb2f437f6e39c5895f51ba5ab8423e.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 diff --git a/godot_ship/assets/game/RedCrosshair.png b/godot_ship/assets/game/RedCrosshair.png new file mode 100644 index 0000000..4c96e0d Binary files /dev/null and b/godot_ship/assets/game/RedCrosshair.png differ diff --git a/godot_ship/assets/game/RedCrosshair.png.import b/godot_ship/assets/game/RedCrosshair.png.import new file mode 100644 index 0000000..a5ee952 --- /dev/null +++ b/godot_ship/assets/game/RedCrosshair.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/RedCrosshair.png-ed59a214d85db7c21233257c8daddbef.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/game/RedCrosshair.png" +dest_files=[ "res://.import/RedCrosshair.png-ed59a214d85db7c21233257c8daddbef.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 diff --git a/godot_ship/assets/game/board_blue.png.import b/godot_ship/assets/game/board_blue.png.import index 9778702..6feeedd 100644 --- a/godot_ship/assets/game/board_blue.png.import +++ b/godot_ship/assets/game/board_blue.png.import @@ -20,7 +20,7 @@ compress/hdr_mode=0 compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 -flags/filter=true +flags/filter=false flags/mipmaps=false flags/anisotropic=false flags/srgb=2 @@ -30,5 +30,5 @@ process/HDR_as_SRGB=false process/invert_color=false stream=false size_limit=0 -detect_3d=true +detect_3d=false svg/scale=1.0 diff --git a/godot_ship/main.tres b/godot_ship/main.tres deleted file mode 100644 index 74cd80c..0000000 --- a/godot_ship/main.tres +++ /dev/null @@ -1,1252 +0,0 @@ -[gd_resource type="Theme" format=2] - -[resource] -resource_name = "Main Theme" -BoxContainer/constants/separation = 4 -Button/colors/font_color = Color( 0, 0, 0, 1 ) -Button/colors/font_color_disabled = Color( 0, 0, 0, 1 ) -Button/colors/font_color_hover = Color( 0, 0, 0, 1 ) -Button/colors/font_color_pressed = Color( 0, 0, 0, 1 ) -Button/colors/icon_color_hover = Color( 0, 0, 0, 1 ) -Button/colors/icon_color_pressed = Color( 0, 0, 0, 1 ) -Button/constants/hseparation = 2 -Button/fonts/font = null -Button/styles/disabled = null -Button/styles/focus = null -Button/styles/hover = null -Button/styles/normal = null -Button/styles/pressed = null -CheckBox/colors/font_color = Color( 0, 0, 0, 1 ) -CheckBox/colors/font_color_disabled = Color( 0, 0, 0, 1 ) -CheckBox/colors/font_color_hover = Color( 0, 0, 0, 1 ) -CheckBox/colors/font_color_hover_pressed = Color( 0, 0, 0, 1 ) -CheckBox/colors/font_color_pressed = Color( 0, 0, 0, 1 ) -CheckBox/colors/icon_color_hover = Color( 0, 0, 0, 1 ) -CheckBox/constants/check_vadjust = 0 -CheckBox/constants/hseparation = 4 -CheckBox/fonts/font = null -CheckBox/icons/checked = null -CheckBox/icons/radio_checked = null -CheckBox/icons/radio_unchecked = null -CheckBox/icons/unchecked = null -CheckBox/styles/disabled = null -CheckBox/styles/focus = null -CheckBox/styles/hover = null -CheckBox/styles/hover_pressed = null -CheckBox/styles/normal = null -CheckBox/styles/pressed = null -CheckButton/colors/font_color = Color( 0, 0, 0, 1 ) -CheckButton/colors/font_color_disabled = Color( 0, 0, 0, 1 ) -CheckButton/colors/font_color_hover = Color( 0, 0, 0, 1 ) -CheckButton/colors/font_color_hover_pressed = Color( 0, 0, 0, 1 ) -CheckButton/colors/font_color_pressed = Color( 0, 0, 0, 1 ) -CheckButton/colors/icon_color_hover = Color( 0, 0, 0, 1 ) -CheckButton/constants/check_vadjust = 0 -CheckButton/constants/hseparation = 4 -CheckButton/fonts/font = null -CheckButton/icons/off = null -CheckButton/icons/off_disabled = null -CheckButton/icons/on = null -CheckButton/icons/on_disabled = null -CheckButton/styles/disabled = null -CheckButton/styles/focus = null -CheckButton/styles/hover = null -CheckButton/styles/hover_pressed = null -CheckButton/styles/normal = null -CheckButton/styles/pressed = null -ColorPicker/constants/h_width = 30 -ColorPicker/constants/label_width = 10 -ColorPicker/constants/margin = 4 -ColorPicker/constants/sv_height = 256 -ColorPicker/constants/sv_width = 256 -ColorPicker/icons/add_preset = null -ColorPicker/icons/color_hue = null -ColorPicker/icons/color_sample = null -ColorPicker/icons/overbright_indicator = null -ColorPicker/icons/preset_bg = null -ColorPicker/icons/screen_picker = null -ColorPickerButton/colors/font_color = Color( 0, 0, 0, 1 ) -ColorPickerButton/colors/font_color_disabled = Color( 0, 0, 0, 1 ) -ColorPickerButton/colors/font_color_hover = Color( 0, 0, 0, 1 ) -ColorPickerButton/colors/font_color_pressed = Color( 0, 0, 0, 1 ) -ColorPickerButton/constants/hseparation = 2 -ColorPickerButton/fonts/font = null -ColorPickerButton/icons/bg = null -ColorPickerButton/styles/disabled = null -ColorPickerButton/styles/focus = null -ColorPickerButton/styles/hover = null -ColorPickerButton/styles/normal = null -ColorPickerButton/styles/pressed = null -Dialogs/constants/button_margin = 32 -Dialogs/constants/margin = 8 -Editor/colors/accent_color = Color( 0, 0, 0, 1 ) -Editor/colors/axis_x_color = Color( 0, 0, 0, 1 ) -Editor/colors/axis_y_color = Color( 0, 0, 0, 1 ) -Editor/colors/axis_z_color = Color( 0, 0, 0, 1 ) -Editor/colors/base_color = Color( 0, 0, 0, 1 ) -Editor/colors/box_selection_fill_color = Color( 0, 0, 0, 1 ) -Editor/colors/box_selection_stroke_color = Color( 0, 0, 0, 1 ) -Editor/colors/contrast_color_1 = Color( 0, 0, 0, 1 ) -Editor/colors/contrast_color_2 = Color( 0, 0, 0, 1 ) -Editor/colors/dark_color_1 = Color( 0, 0, 0, 1 ) -Editor/colors/dark_color_2 = Color( 0, 0, 0, 1 ) -Editor/colors/dark_color_3 = Color( 0, 0, 0, 1 ) -Editor/colors/disabled_font_color = Color( 0, 0, 0, 1 ) -Editor/colors/error_color = Color( 0, 0, 0, 1 ) -Editor/colors/font_color = Color( 0, 0, 0, 1 ) -Editor/colors/highlight_color = Color( 0, 0, 0, 1 ) -Editor/colors/highlighted_font_color = Color( 0, 0, 0, 1 ) -Editor/colors/mono_color = Color( 0, 0, 0, 1 ) -Editor/colors/prop_category = Color( 0, 0, 0, 1 ) -Editor/colors/prop_section = Color( 0, 0, 0, 1 ) -Editor/colors/prop_subsection = Color( 0, 0, 0, 1 ) -Editor/colors/property_color = Color( 0, 0, 0, 1 ) -Editor/colors/sub_inspector_property_color = Color( 0, 0, 0, 1 ) -Editor/colors/success_color = Color( 0, 0, 0, 1 ) -Editor/colors/warning_color = Color( 0, 0, 0, 1 ) -Editor/constants/dark_theme = 1 -Editor/constants/inspector_margin = 8 -Editor/constants/scale = 1 -Editor/constants/sub_inspector_font_offset = 4 -Editor/constants/thumb_size = 64 -Editor/styles/sub_inspector_bg0 = null -Editor/styles/sub_inspector_bg1 = null -Editor/styles/sub_inspector_bg10 = null -Editor/styles/sub_inspector_bg11 = null -Editor/styles/sub_inspector_bg12 = null -Editor/styles/sub_inspector_bg13 = null -Editor/styles/sub_inspector_bg14 = null -Editor/styles/sub_inspector_bg15 = null -Editor/styles/sub_inspector_bg2 = null -Editor/styles/sub_inspector_bg3 = null -Editor/styles/sub_inspector_bg4 = null -Editor/styles/sub_inspector_bg5 = null -Editor/styles/sub_inspector_bg6 = null -Editor/styles/sub_inspector_bg7 = null -Editor/styles/sub_inspector_bg8 = null -Editor/styles/sub_inspector_bg9 = null -Editor/styles/sub_inspector_property_bg0 = null -Editor/styles/sub_inspector_property_bg1 = null -Editor/styles/sub_inspector_property_bg10 = null -Editor/styles/sub_inspector_property_bg11 = null -Editor/styles/sub_inspector_property_bg12 = null -Editor/styles/sub_inspector_property_bg13 = null -Editor/styles/sub_inspector_property_bg14 = null -Editor/styles/sub_inspector_property_bg15 = null -Editor/styles/sub_inspector_property_bg2 = null -Editor/styles/sub_inspector_property_bg3 = null -Editor/styles/sub_inspector_property_bg4 = null -Editor/styles/sub_inspector_property_bg5 = null -Editor/styles/sub_inspector_property_bg6 = null -Editor/styles/sub_inspector_property_bg7 = null -Editor/styles/sub_inspector_property_bg8 = null -Editor/styles/sub_inspector_property_bg9 = null -Editor/styles/sub_inspector_property_bg_selected0 = null -Editor/styles/sub_inspector_property_bg_selected1 = null -Editor/styles/sub_inspector_property_bg_selected10 = null -Editor/styles/sub_inspector_property_bg_selected11 = null -Editor/styles/sub_inspector_property_bg_selected12 = null -Editor/styles/sub_inspector_property_bg_selected13 = null -Editor/styles/sub_inspector_property_bg_selected14 = null -Editor/styles/sub_inspector_property_bg_selected15 = null -Editor/styles/sub_inspector_property_bg_selected2 = null -Editor/styles/sub_inspector_property_bg_selected3 = null -Editor/styles/sub_inspector_property_bg_selected4 = null -Editor/styles/sub_inspector_property_bg_selected5 = null -Editor/styles/sub_inspector_property_bg_selected6 = null -Editor/styles/sub_inspector_property_bg_selected7 = null -Editor/styles/sub_inspector_property_bg_selected8 = null -Editor/styles/sub_inspector_property_bg_selected9 = null -EditorAbout/styles/panel = null -EditorFonts/fonts/bold = null -EditorFonts/fonts/doc = null -EditorFonts/fonts/doc_bold = null -EditorFonts/fonts/doc_source = null -EditorFonts/fonts/doc_title = null -EditorFonts/fonts/expression = null -EditorFonts/fonts/main = null -EditorFonts/fonts/output_source = null -EditorFonts/fonts/rotation_control = null -EditorFonts/fonts/rulers = null -EditorFonts/fonts/source = null -EditorFonts/fonts/status_source = null -EditorFonts/fonts/title = null -EditorHelp/colors/headline_color = Color( 0, 0, 0, 1 ) -EditorIcons/icons/2D = null -EditorIcons/icons/3D = null -EditorIcons/icons/AABB = null -EditorIcons/icons/ARVRAnchor = null -EditorIcons/icons/ARVRCamera = null -EditorIcons/icons/ARVRController = null -EditorIcons/icons/ARVROrigin = null -EditorIcons/icons/AcceptDialog = null -EditorIcons/icons/ActionCopy = null -EditorIcons/icons/ActionCut = null -EditorIcons/icons/ActionPaste = null -EditorIcons/icons/Add = null -EditorIcons/icons/AddAtlasTile = null -EditorIcons/icons/AddAutotile = null -EditorIcons/icons/AddSingleTile = null -EditorIcons/icons/AddSplit = null -EditorIcons/icons/Anchor = null -EditorIcons/icons/AnimatedSprite = null -EditorIcons/icons/AnimatedSprite3D = null -EditorIcons/icons/AnimatedTexture = null -EditorIcons/icons/Animation = null -EditorIcons/icons/AnimationFilter = null -EditorIcons/icons/AnimationPlayer = null -EditorIcons/icons/AnimationTrackGroup = null -EditorIcons/icons/AnimationTrackList = null -EditorIcons/icons/AnimationTree = null -EditorIcons/icons/AnimationTreePlayer = null -EditorIcons/icons/Area = null -EditorIcons/icons/Area2D = null -EditorIcons/icons/Array = null -EditorIcons/icons/ArrayMesh = null -EditorIcons/icons/ArrowDown = null -EditorIcons/icons/ArrowLeft = null -EditorIcons/icons/ArrowRight = null -EditorIcons/icons/ArrowUp = null -EditorIcons/icons/AspectRatioContainer = null -EditorIcons/icons/AssetLib = null -EditorIcons/icons/AtlasTexture = null -EditorIcons/icons/AudioBusBypass = null -EditorIcons/icons/AudioBusLayout = null -EditorIcons/icons/AudioBusMute = null -EditorIcons/icons/AudioBusSolo = null -EditorIcons/icons/AudioStreamMP3 = null -EditorIcons/icons/AudioStreamOGGVorbis = null -EditorIcons/icons/AudioStreamPlayer = null -EditorIcons/icons/AudioStreamPlayer2D = null -EditorIcons/icons/AudioStreamPlayer3D = null -EditorIcons/icons/AudioStreamSample = null -EditorIcons/icons/AutoEnd = null -EditorIcons/icons/AutoKey = null -EditorIcons/icons/AutoPlay = null -EditorIcons/icons/AutoTriangle = null -EditorIcons/icons/Back = null -EditorIcons/icons/BackBufferCopy = null -EditorIcons/icons/Bake = null -EditorIcons/icons/BakedLightmap = null -EditorIcons/icons/BakedLightmapData = null -EditorIcons/icons/Basis = null -EditorIcons/icons/BezierHandlesBalanced = null -EditorIcons/icons/BezierHandlesFree = null -EditorIcons/icons/BezierHandlesMirror = null -EditorIcons/icons/BitMap = null -EditorIcons/icons/BitmapFont = null -EditorIcons/icons/Blend = null -EditorIcons/icons/Bone = null -EditorIcons/icons/Bone2D = null -EditorIcons/icons/BoneAttachment = null -EditorIcons/icons/BoneTrack = null -EditorIcons/icons/BoxShape = null -EditorIcons/icons/Bucket = null -EditorIcons/icons/BusVuEmpty = null -EditorIcons/icons/BusVuFrozen = null -EditorIcons/icons/BusVuFull = null -EditorIcons/icons/Button = null -EditorIcons/icons/ButtonGroup = null -EditorIcons/icons/CPUParticles = null -EditorIcons/icons/CPUParticles2D = null -EditorIcons/icons/CSGBox = null -EditorIcons/icons/CSGCapsule = null -EditorIcons/icons/CSGCombiner = null -EditorIcons/icons/CSGCylinder = null -EditorIcons/icons/CSGMesh = null -EditorIcons/icons/CSGPolygon = null -EditorIcons/icons/CSGSphere = null -EditorIcons/icons/CSGTorus = null -EditorIcons/icons/Camera = null -EditorIcons/icons/Camera2D = null -EditorIcons/icons/CameraTexture = null -EditorIcons/icons/CanvasItem = null -EditorIcons/icons/CanvasItemMaterial = null -EditorIcons/icons/CanvasItemShader = null -EditorIcons/icons/CanvasItemShaderGraph = null -EditorIcons/icons/CanvasLayer = null -EditorIcons/icons/CanvasModulate = null -EditorIcons/icons/CapsuleMesh = null -EditorIcons/icons/CapsuleShape = null -EditorIcons/icons/CapsuleShape2D = null -EditorIcons/icons/CenterContainer = null -EditorIcons/icons/CheckBox = null -EditorIcons/icons/CheckButton = null -EditorIcons/icons/Checkerboard = null -EditorIcons/icons/CircleShape2D = null -EditorIcons/icons/ClassList = null -EditorIcons/icons/Clear = null -EditorIcons/icons/ClippedCamera = null -EditorIcons/icons/Close = null -EditorIcons/icons/Collapse = null -EditorIcons/icons/CollisionPolygon = null -EditorIcons/icons/CollisionPolygon2D = null -EditorIcons/icons/CollisionShape = null -EditorIcons/icons/CollisionShape2D = null -EditorIcons/icons/Color = null -EditorIcons/icons/ColorPick = null -EditorIcons/icons/ColorPicker = null -EditorIcons/icons/ColorPickerButton = null -EditorIcons/icons/ColorRamp = null -EditorIcons/icons/ColorRect = null -EditorIcons/icons/ColorTrackVu = null -EditorIcons/icons/ConcavePolygonShape = null -EditorIcons/icons/ConcavePolygonShape2D = null -EditorIcons/icons/ConeTwistJoint = null -EditorIcons/icons/ConfirmationDialog = null -EditorIcons/icons/Container = null -EditorIcons/icons/Control = null -EditorIcons/icons/ControlAlignBottomCenter = null -EditorIcons/icons/ControlAlignBottomLeft = null -EditorIcons/icons/ControlAlignBottomRight = null -EditorIcons/icons/ControlAlignBottomWide = null -EditorIcons/icons/ControlAlignCenter = null -EditorIcons/icons/ControlAlignCenterLeft = null -EditorIcons/icons/ControlAlignCenterRight = null -EditorIcons/icons/ControlAlignLeftCenter = null -EditorIcons/icons/ControlAlignLeftWide = null -EditorIcons/icons/ControlAlignRightCenter = null -EditorIcons/icons/ControlAlignRightWide = null -EditorIcons/icons/ControlAlignTopCenter = null -EditorIcons/icons/ControlAlignTopLeft = null -EditorIcons/icons/ControlAlignTopRight = null -EditorIcons/icons/ControlAlignTopWide = null -EditorIcons/icons/ControlAlignWide = null -EditorIcons/icons/ControlHcenterWide = null -EditorIcons/icons/ControlLayout = null -EditorIcons/icons/ControlVcenterWide = null -EditorIcons/icons/ConvexPolygonShape = null -EditorIcons/icons/ConvexPolygonShape2D = null -EditorIcons/icons/CopyNodePath = null -EditorIcons/icons/CreateNewSceneFrom = null -EditorIcons/icons/CryptoKey = null -EditorIcons/icons/CubeMap = null -EditorIcons/icons/CubeMesh = null -EditorIcons/icons/Curve = null -EditorIcons/icons/Curve2D = null -EditorIcons/icons/Curve3D = null -EditorIcons/icons/CurveClose = null -EditorIcons/icons/CurveConstant = null -EditorIcons/icons/CurveCreate = null -EditorIcons/icons/CurveCurve = null -EditorIcons/icons/CurveDelete = null -EditorIcons/icons/CurveEdit = null -EditorIcons/icons/CurveIn = null -EditorIcons/icons/CurveInOut = null -EditorIcons/icons/CurveLinear = null -EditorIcons/icons/CurveOut = null -EditorIcons/icons/CurveOutIn = null -EditorIcons/icons/CurveTexture = null -EditorIcons/icons/CylinderMesh = null -EditorIcons/icons/CylinderShape = null -EditorIcons/icons/DampedSpringJoint2D = null -EditorIcons/icons/Debug = null -EditorIcons/icons/DebugContinue = null -EditorIcons/icons/DebugNext = null -EditorIcons/icons/DebugSkipBreakpointsOff = null -EditorIcons/icons/DebugSkipBreakpointsOn = null -EditorIcons/icons/DebugStep = null -EditorIcons/icons/DefaultProjectIcon = null -EditorIcons/icons/DeleteSplit = null -EditorIcons/icons/Dictionary = null -EditorIcons/icons/DirectionalLight = null -EditorIcons/icons/DistractionFree = null -EditorIcons/icons/Duplicate = null -EditorIcons/icons/DynamicFont = null -EditorIcons/icons/DynamicFontData = null -EditorIcons/icons/Edit = null -EditorIcons/icons/EditBezier = null -EditorIcons/icons/EditInternal = null -EditorIcons/icons/EditKey = null -EditorIcons/icons/EditPivot = null -EditorIcons/icons/EditResource = null -EditorIcons/icons/Editor3DHandle = null -EditorIcons/icons/EditorControlAnchor = null -EditorIcons/icons/EditorCurveHandle = null -EditorIcons/icons/EditorHandle = null -EditorIcons/icons/EditorHandleAdd = null -EditorIcons/icons/EditorInternalHandle = null -EditorIcons/icons/EditorPathSharpHandle = null -EditorIcons/icons/EditorPathSmoothHandle = null -EditorIcons/icons/EditorPivot = null -EditorIcons/icons/EditorPlugin = null -EditorIcons/icons/EditorPosition = null -EditorIcons/icons/EditorPositionPrevious = null -EditorIcons/icons/EditorPositionUnselected = null -EditorIcons/icons/Enum = null -EditorIcons/icons/Environment = null -EditorIcons/icons/Error = null -EditorIcons/icons/ErrorSign = null -EditorIcons/icons/ErrorWarning = null -EditorIcons/icons/ExpandBottomDock = null -EditorIcons/icons/Favorites = null -EditorIcons/icons/File = null -EditorIcons/icons/FileBigThumb = null -EditorIcons/icons/FileBroken = null -EditorIcons/icons/FileBrokenBigThumb = null -EditorIcons/icons/FileDead = null -EditorIcons/icons/FileDeadBigThumb = null -EditorIcons/icons/FileDeadMediumThumb = null -EditorIcons/icons/FileDialog = null -EditorIcons/icons/FileList = null -EditorIcons/icons/FileMediumThumb = null -EditorIcons/icons/FileThumbnail = null -EditorIcons/icons/Filesystem = null -EditorIcons/icons/FixedMaterial = null -EditorIcons/icons/FixedSpatialMaterial = null -EditorIcons/icons/Folder = null -EditorIcons/icons/FolderBigThumb = null -EditorIcons/icons/FolderMediumThumb = null -EditorIcons/icons/Font = null -EditorIcons/icons/Forward = null -EditorIcons/icons/GDNativeLibrary = null -EditorIcons/icons/GDScript = null -EditorIcons/icons/GIProbe = null -EditorIcons/icons/GIProbeData = null -EditorIcons/icons/Generic6DOFJoint = null -EditorIcons/icons/GizmoBakedLightmap = null -EditorIcons/icons/GizmoCPUParticles = null -EditorIcons/icons/GizmoCamera = null -EditorIcons/icons/GizmoDirectionalLight = null -EditorIcons/icons/GizmoGIProbe = null -EditorIcons/icons/GizmoLight = null -EditorIcons/icons/GizmoListener = null -EditorIcons/icons/GizmoParticles = null -EditorIcons/icons/GizmoReflectionProbe = null -EditorIcons/icons/GizmoSpatialSamplePlayer = null -EditorIcons/icons/GizmoSpatialStreamPlayer = null -EditorIcons/icons/GizmoSpotLight = null -EditorIcons/icons/Godot = null -EditorIcons/icons/GodotDocs = null -EditorIcons/icons/Gradient = null -EditorIcons/icons/GradientTexture = null -EditorIcons/icons/GraphEdit = null -EditorIcons/icons/GraphNode = null -EditorIcons/icons/Grid = null -EditorIcons/icons/GridContainer = null -EditorIcons/icons/GridMap = null -EditorIcons/icons/GridMinimap = null -EditorIcons/icons/GrooveJoint2D = null -EditorIcons/icons/Group = null -EditorIcons/icons/GroupViewport = null -EditorIcons/icons/Groups = null -EditorIcons/icons/GuiChecked = null -EditorIcons/icons/GuiClose = null -EditorIcons/icons/GuiCloseCustomizable = null -EditorIcons/icons/GuiDropdown = null -EditorIcons/icons/GuiEllipsis = null -EditorIcons/icons/GuiGraphNodePort = null -EditorIcons/icons/GuiHTick = null -EditorIcons/icons/GuiHsplitter = null -EditorIcons/icons/GuiMiniCheckerboard = null -EditorIcons/icons/GuiOptionArrow = null -EditorIcons/icons/GuiProgressBar = null -EditorIcons/icons/GuiProgressFill = null -EditorIcons/icons/GuiRadioChecked = null -EditorIcons/icons/GuiRadioUnchecked = null -EditorIcons/icons/GuiResizer = null -EditorIcons/icons/GuiScrollArrowLeft = null -EditorIcons/icons/GuiScrollArrowLeftHl = null -EditorIcons/icons/GuiScrollArrowRight = null -EditorIcons/icons/GuiScrollArrowRightHl = null -EditorIcons/icons/GuiScrollBg = null -EditorIcons/icons/GuiScrollGrabber = null -EditorIcons/icons/GuiScrollGrabberHl = null -EditorIcons/icons/GuiScrollGrabberPressed = null -EditorIcons/icons/GuiSliderGrabber = null -EditorIcons/icons/GuiSliderGrabberHl = null -EditorIcons/icons/GuiSpace = null -EditorIcons/icons/GuiSpinboxUpdown = null -EditorIcons/icons/GuiTab = null -EditorIcons/icons/GuiTabMenu = null -EditorIcons/icons/GuiTabMenuHl = null -EditorIcons/icons/GuiToggleOff = null -EditorIcons/icons/GuiToggleOn = null -EditorIcons/icons/GuiTreeArrowDown = null -EditorIcons/icons/GuiTreeArrowRight = null -EditorIcons/icons/GuiTreeArrowUp = null -EditorIcons/icons/GuiTreeUpdown = null -EditorIcons/icons/GuiUnchecked = null -EditorIcons/icons/GuiVTick = null -EditorIcons/icons/GuiViewportHdiagsplitter = null -EditorIcons/icons/GuiViewportVdiagsplitter = null -EditorIcons/icons/GuiViewportVhsplitter = null -EditorIcons/icons/GuiVisibilityHidden = null -EditorIcons/icons/GuiVisibilityVisible = null -EditorIcons/icons/GuiVisibilityXray = null -EditorIcons/icons/GuiVsplitBg = null -EditorIcons/icons/GuiVsplitter = null -EditorIcons/icons/HBoxContainer = null -EditorIcons/icons/HScrollBar = null -EditorIcons/icons/HSeparator = null -EditorIcons/icons/HSlider = null -EditorIcons/icons/HSplitContainer = null -EditorIcons/icons/HTTPRequest = null -EditorIcons/icons/Headphones = null -EditorIcons/icons/Heart = null -EditorIcons/icons/HeightMapShape = null -EditorIcons/icons/Help = null -EditorIcons/icons/HelpSearch = null -EditorIcons/icons/HingeJoint = null -EditorIcons/icons/History = null -EditorIcons/icons/Hsize = null -EditorIcons/icons/Image = null -EditorIcons/icons/ImageTexture = null -EditorIcons/icons/ImmediateGeometry = null -EditorIcons/icons/ImportCheck = null -EditorIcons/icons/ImportFail = null -EditorIcons/icons/InformationSign = null -EditorIcons/icons/InsertAfter = null -EditorIcons/icons/InsertBefore = null -EditorIcons/icons/Instance = null -EditorIcons/icons/InstanceOptions = null -EditorIcons/icons/InterpCubic = null -EditorIcons/icons/InterpLinear = null -EditorIcons/icons/InterpRaw = null -EditorIcons/icons/InterpWrapClamp = null -EditorIcons/icons/InterpWrapLoop = null -EditorIcons/icons/InterpolatedCamera = null -EditorIcons/icons/InverseKinematics = null -EditorIcons/icons/Issue = null -EditorIcons/icons/ItemList = null -EditorIcons/icons/JoyAxis = null -EditorIcons/icons/JoyButton = null -EditorIcons/icons/Joypad = null -EditorIcons/icons/Key = null -EditorIcons/icons/KeyAnimation = null -EditorIcons/icons/KeyAudio = null -EditorIcons/icons/KeyBezier = null -EditorIcons/icons/KeyBezierHandle = null -EditorIcons/icons/KeyBezierPoint = null -EditorIcons/icons/KeyBezierSelected = null -EditorIcons/icons/KeyCall = null -EditorIcons/icons/KeyHover = null -EditorIcons/icons/KeyInvalid = null -EditorIcons/icons/KeyNext = null -EditorIcons/icons/KeyPosition = null -EditorIcons/icons/KeyRotation = null -EditorIcons/icons/KeyScale = null -EditorIcons/icons/KeySelected = null -EditorIcons/icons/KeyValue = null -EditorIcons/icons/KeyXform = null -EditorIcons/icons/Keyboard = null -EditorIcons/icons/KinematicBody = null -EditorIcons/icons/KinematicBody2D = null -EditorIcons/icons/Label = null -EditorIcons/icons/LargeTexture = null -EditorIcons/icons/Light2D = null -EditorIcons/icons/LightOccluder2D = null -EditorIcons/icons/Line2D = null -EditorIcons/icons/LineEdit = null -EditorIcons/icons/LineShape2D = null -EditorIcons/icons/LinkButton = null -EditorIcons/icons/ListSelect = null -EditorIcons/icons/Listener = null -EditorIcons/icons/Load = null -EditorIcons/icons/Lock = null -EditorIcons/icons/LockViewport = null -EditorIcons/icons/Logo = null -EditorIcons/icons/Loop = null -EditorIcons/icons/LoopInterpolation = null -EditorIcons/icons/MainPlay = null -EditorIcons/icons/MarginContainer = null -EditorIcons/icons/MatchCase = null -EditorIcons/icons/MaterialPreviewCube = null -EditorIcons/icons/MaterialPreviewCubeOff = null -EditorIcons/icons/MaterialPreviewLight1 = null -EditorIcons/icons/MaterialPreviewLight1Off = null -EditorIcons/icons/MaterialPreviewLight2 = null -EditorIcons/icons/MaterialPreviewLight2Off = null -EditorIcons/icons/MaterialPreviewSphere = null -EditorIcons/icons/MaterialPreviewSphereOff = null -EditorIcons/icons/MemberConstant = null -EditorIcons/icons/MemberMethod = null -EditorIcons/icons/MemberProperty = null -EditorIcons/icons/MemberSignal = null -EditorIcons/icons/MemberTheme = null -EditorIcons/icons/MenuButton = null -EditorIcons/icons/Mesh = null -EditorIcons/icons/MeshInstance = null -EditorIcons/icons/MeshInstance2D = null -EditorIcons/icons/MeshLibrary = null -EditorIcons/icons/MeshTexture = null -EditorIcons/icons/MiniObject = null -EditorIcons/icons/MirrorX = null -EditorIcons/icons/MirrorY = null -EditorIcons/icons/Mouse = null -EditorIcons/icons/MoveDown = null -EditorIcons/icons/MoveLeft = null -EditorIcons/icons/MovePoint = null -EditorIcons/icons/MoveRight = null -EditorIcons/icons/MoveUp = null -EditorIcons/icons/MultiEdit = null -EditorIcons/icons/MultiLine = null -EditorIcons/icons/MultiMesh = null -EditorIcons/icons/MultiMeshInstance = null -EditorIcons/icons/MultiMeshInstance2D = null -EditorIcons/icons/NativeScript = null -EditorIcons/icons/Navigation = null -EditorIcons/icons/Navigation2D = null -EditorIcons/icons/NavigationMesh = null -EditorIcons/icons/NavigationMeshInstance = null -EditorIcons/icons/NavigationPolygon = null -EditorIcons/icons/NavigationPolygonInstance = null -EditorIcons/icons/New = null -EditorIcons/icons/NewRoot = null -EditorIcons/icons/Nil = null -EditorIcons/icons/NinePatchRect = null -EditorIcons/icons/Node = null -EditorIcons/icons/Node2D = null -EditorIcons/icons/NodePath = null -EditorIcons/icons/NodeWarning = null -EditorIcons/icons/NoiseTexture = null -EditorIcons/icons/NonFavorite = null -EditorIcons/icons/Object = null -EditorIcons/icons/OccluderPolygon2D = null -EditorIcons/icons/OmniLight = null -EditorIcons/icons/Onion = null -EditorIcons/icons/OptionButton = null -EditorIcons/icons/OverbrightIndicator = null -EditorIcons/icons/Override = null -EditorIcons/icons/PackedDataContainer = null -EditorIcons/icons/PackedScene = null -EditorIcons/icons/Panel = null -EditorIcons/icons/PanelContainer = null -EditorIcons/icons/Panels1 = null -EditorIcons/icons/Panels2 = null -EditorIcons/icons/Panels2Alt = null -EditorIcons/icons/Panels3 = null -EditorIcons/icons/Panels3Alt = null -EditorIcons/icons/Panels4 = null -EditorIcons/icons/PanoramaSky = null -EditorIcons/icons/ParallaxBackground = null -EditorIcons/icons/ParallaxLayer = null -EditorIcons/icons/ParticleAttractor2D = null -EditorIcons/icons/Particles = null -EditorIcons/icons/Particles2D = null -EditorIcons/icons/ParticlesMaterial = null -EditorIcons/icons/Path = null -EditorIcons/icons/Path2D = null -EditorIcons/icons/PathFollow = null -EditorIcons/icons/PathFollow2D = null -EditorIcons/icons/Pause = null -EditorIcons/icons/PhysicalBone = null -EditorIcons/icons/Pin = null -EditorIcons/icons/PinJoint = null -EditorIcons/icons/PinJoint2D = null -EditorIcons/icons/PinPressed = null -EditorIcons/icons/Plane = null -EditorIcons/icons/PlaneMesh = null -EditorIcons/icons/PlaneShape = null -EditorIcons/icons/Play = null -EditorIcons/icons/PlayBackwards = null -EditorIcons/icons/PlayCustom = null -EditorIcons/icons/PlayOverlay = null -EditorIcons/icons/PlayScene = null -EditorIcons/icons/PlayStart = null -EditorIcons/icons/PlayStartBackwards = null -EditorIcons/icons/PlayTravel = null -EditorIcons/icons/PluginScript = null -EditorIcons/icons/PointMesh = null -EditorIcons/icons/Polygon2D = null -EditorIcons/icons/PolygonPathFinder = null -EditorIcons/icons/PoolByteArray = null -EditorIcons/icons/PoolColorArray = null -EditorIcons/icons/PoolIntArray = null -EditorIcons/icons/PoolRealArray = null -EditorIcons/icons/PoolStringArray = null -EditorIcons/icons/PoolVector2Array = null -EditorIcons/icons/PoolVector3Array = null -EditorIcons/icons/Popup = null -EditorIcons/icons/PopupDialog = null -EditorIcons/icons/PopupMenu = null -EditorIcons/icons/PopupPanel = null -EditorIcons/icons/Portal = null -EditorIcons/icons/Position2D = null -EditorIcons/icons/Position3D = null -EditorIcons/icons/PrismMesh = null -EditorIcons/icons/ProceduralSky = null -EditorIcons/icons/Progress1 = null -EditorIcons/icons/Progress2 = null -EditorIcons/icons/Progress3 = null -EditorIcons/icons/Progress4 = null -EditorIcons/icons/Progress5 = null -EditorIcons/icons/Progress6 = null -EditorIcons/icons/Progress7 = null -EditorIcons/icons/Progress8 = null -EditorIcons/icons/ProgressBar = null -EditorIcons/icons/ProjectIconLoading = null -EditorIcons/icons/ProximityGroup = null -EditorIcons/icons/ProxyTexture = null -EditorIcons/icons/Quad = null -EditorIcons/icons/QuadMesh = null -EditorIcons/icons/Quat = null -EditorIcons/icons/RID = null -EditorIcons/icons/RayCast = null -EditorIcons/icons/RayCast2D = null -EditorIcons/icons/RayShape = null -EditorIcons/icons/RayShape2D = null -EditorIcons/icons/Rayito = null -EditorIcons/icons/Rect2 = null -EditorIcons/icons/RectangleShape2D = null -EditorIcons/icons/ReferenceRect = null -EditorIcons/icons/ReflectionProbe = null -EditorIcons/icons/RegionEdit = null -EditorIcons/icons/Reload = null -EditorIcons/icons/ReloadSmall = null -EditorIcons/icons/RemoteTransform = null -EditorIcons/icons/RemoteTransform2D = null -EditorIcons/icons/Remove = null -EditorIcons/icons/RemoveInternal = null -EditorIcons/icons/Rename = null -EditorIcons/icons/Reparent = null -EditorIcons/icons/ReparentToNewNode = null -EditorIcons/icons/ResourcePreloader = null -EditorIcons/icons/RichTextEffect = null -EditorIcons/icons/RichTextLabel = null -EditorIcons/icons/RigidBody = null -EditorIcons/icons/RigidBody2D = null -EditorIcons/icons/Room = null -EditorIcons/icons/RoomBounds = null -EditorIcons/icons/RootMotionView = null -EditorIcons/icons/Rotate0 = null -EditorIcons/icons/Rotate180 = null -EditorIcons/icons/Rotate270 = null -EditorIcons/icons/Rotate90 = null -EditorIcons/icons/RotateLeft = null -EditorIcons/icons/RotateRight = null -EditorIcons/icons/Ruler = null -EditorIcons/icons/SampleLibrary = null -EditorIcons/icons/Save = null -EditorIcons/icons/Script = null -EditorIcons/icons/ScriptCreate = null -EditorIcons/icons/ScriptCreateDialog = null -EditorIcons/icons/ScriptExtend = null -EditorIcons/icons/ScriptRemove = null -EditorIcons/icons/ScrollContainer = null -EditorIcons/icons/Search = null -EditorIcons/icons/SegmentShape2D = null -EditorIcons/icons/Shader = null -EditorIcons/icons/ShaderMaterial = null -EditorIcons/icons/ShortCut = null -EditorIcons/icons/Signal = null -EditorIcons/icons/Signals = null -EditorIcons/icons/SignalsAndGroups = null -EditorIcons/icons/Skeleton = null -EditorIcons/icons/Skeleton2D = null -EditorIcons/icons/SkeletonIK = null -EditorIcons/icons/SliderJoint = null -EditorIcons/icons/Slot = null -EditorIcons/icons/Snap = null -EditorIcons/icons/SnapGrid = null -EditorIcons/icons/SoftBody = null -EditorIcons/icons/Sort = null -EditorIcons/icons/Spatial = null -EditorIcons/icons/SpatialMaterial = null -EditorIcons/icons/SphereMesh = null -EditorIcons/icons/SphereShape = null -EditorIcons/icons/SpinBox = null -EditorIcons/icons/SpotLight = null -EditorIcons/icons/SpringArm = null -EditorIcons/icons/Sprite = null -EditorIcons/icons/Sprite3D = null -EditorIcons/icons/SpriteFrames = null -EditorIcons/icons/SpriteSheet = null -EditorIcons/icons/StaticBody = null -EditorIcons/icons/StaticBody2D = null -EditorIcons/icons/StatusError = null -EditorIcons/icons/StatusSuccess = null -EditorIcons/icons/StatusWarning = null -EditorIcons/icons/Stop = null -EditorIcons/icons/StreamTexture = null -EditorIcons/icons/String = null -EditorIcons/icons/StyleBoxEmpty = null -EditorIcons/icons/StyleBoxFlat = null -EditorIcons/icons/StyleBoxLine = null -EditorIcons/icons/StyleBoxTexture = null -EditorIcons/icons/TabContainer = null -EditorIcons/icons/Tabs = null -EditorIcons/icons/TestCube = null -EditorIcons/icons/TextEdit = null -EditorIcons/icons/TextFile = null -EditorIcons/icons/Texture3D = null -EditorIcons/icons/TextureArray = null -EditorIcons/icons/TextureButton = null -EditorIcons/icons/TextureProgress = null -EditorIcons/icons/TextureRect = null -EditorIcons/icons/Theme = null -EditorIcons/icons/ThumbnailWait = null -EditorIcons/icons/TileMap = null -EditorIcons/icons/TileSet = null -EditorIcons/icons/Time = null -EditorIcons/icons/TimelineIndicator = null -EditorIcons/icons/Timer = null -EditorIcons/icons/ToolAddNode = null -EditorIcons/icons/ToolButton = null -EditorIcons/icons/ToolConnect = null -EditorIcons/icons/ToolMove = null -EditorIcons/icons/ToolPan = null -EditorIcons/icons/ToolRotate = null -EditorIcons/icons/ToolScale = null -EditorIcons/icons/ToolSelect = null -EditorIcons/icons/ToolTriangle = null -EditorIcons/icons/Tools = null -EditorIcons/icons/TouchScreenButton = null -EditorIcons/icons/TrackAddKey = null -EditorIcons/icons/TrackAddKeyHl = null -EditorIcons/icons/TrackCapture = null -EditorIcons/icons/TrackContinuous = null -EditorIcons/icons/TrackDiscrete = null -EditorIcons/icons/TrackTrigger = null -EditorIcons/icons/Transform = null -EditorIcons/icons/Transform2D = null -EditorIcons/icons/TransitionEnd = null -EditorIcons/icons/TransitionEndAuto = null -EditorIcons/icons/TransitionEndAutoBig = null -EditorIcons/icons/TransitionEndBig = null -EditorIcons/icons/TransitionImmediate = null -EditorIcons/icons/TransitionImmediateAuto = null -EditorIcons/icons/TransitionImmediateAutoBig = null -EditorIcons/icons/TransitionImmediateBig = null -EditorIcons/icons/TransitionSync = null -EditorIcons/icons/TransitionSyncAuto = null -EditorIcons/icons/TransitionSyncAutoBig = null -EditorIcons/icons/TransitionSyncBig = null -EditorIcons/icons/Translation = null -EditorIcons/icons/Transpose = null -EditorIcons/icons/Tree = null -EditorIcons/icons/Tween = null -EditorIcons/icons/Unbone = null -EditorIcons/icons/Ungroup = null -EditorIcons/icons/Unlock = null -EditorIcons/icons/Uv = null -EditorIcons/icons/VBoxContainer = null -EditorIcons/icons/VScrollBar = null -EditorIcons/icons/VSeparator = null -EditorIcons/icons/VSlider = null -EditorIcons/icons/VSplitContainer = null -EditorIcons/icons/Variant = null -EditorIcons/icons/Vector2 = null -EditorIcons/icons/Vector3 = null -EditorIcons/icons/VehicleBody = null -EditorIcons/icons/VehicleWheel = null -EditorIcons/icons/VideoPlayer = null -EditorIcons/icons/Viewport = null -EditorIcons/icons/ViewportContainer = null -EditorIcons/icons/ViewportSpeed = null -EditorIcons/icons/ViewportTexture = null -EditorIcons/icons/ViewportZoom = null -EditorIcons/icons/VisibilityEnabler = null -EditorIcons/icons/VisibilityEnabler2D = null -EditorIcons/icons/VisibilityNotifier = null -EditorIcons/icons/VisibilityNotifier2D = null -EditorIcons/icons/VisualScript = null -EditorIcons/icons/VisualShader = null -EditorIcons/icons/VisualShaderPort = null -EditorIcons/icons/Warning = null -EditorIcons/icons/WindowDialog = null -EditorIcons/icons/World = null -EditorIcons/icons/World2D = null -EditorIcons/icons/WorldEnvironment = null -EditorIcons/icons/X509Certificate = null -EditorIcons/icons/YSort = null -EditorIcons/icons/Zoom = null -EditorIcons/icons/ZoomLess = null -EditorIcons/icons/ZoomMore = null -EditorIcons/icons/ZoomReset = null -EditorIcons/icons/bool = null -EditorIcons/icons/float = null -EditorIcons/icons/int = null -EditorProperty/colors/error_color = Color( 0, 0, 0, 1 ) -EditorProperty/colors/property_color = Color( 0, 0, 0, 1 ) -EditorProperty/constants/font_offset = 1 -EditorProperty/constants/vseparation = 4 -EditorProperty/styles/bg = null -EditorProperty/styles/bg_selected = null -EditorSettingsDialog/styles/panel = null -EditorStyles/styles/Background = null -EditorStyles/styles/BottomPanelDebuggerOverride = null -EditorStyles/styles/Content = null -EditorStyles/styles/DebuggerPanel = null -EditorStyles/styles/DebuggerTabBG = null -EditorStyles/styles/DebuggerTabFG = null -EditorStyles/styles/Focus = null -EditorStyles/styles/Information3dViewport = null -EditorStyles/styles/MenuHover = null -EditorStyles/styles/MenuPanel = null -EditorStyles/styles/PlayButtonPanel = null -EditorStyles/styles/SceneTabBG = null -EditorStyles/styles/SceneTabFG = null -EditorStyles/styles/ScriptEditor = null -EditorStyles/styles/ScriptEditorPanel = null -FileDialog/colors/file_icon_modulate = Color( 0, 0, 0, 1 ) -FileDialog/colors/files_disabled = Color( 0, 0, 0, 1 ) -FileDialog/colors/folder_icon_modulate = Color( 0, 0, 0, 1 ) -FileDialog/icons/file = null -FileDialog/icons/folder = null -FileDialog/icons/parent_folder = null -FileDialog/icons/reload = null -FileDialog/icons/toggle_hidden = null -Fonts/fonts/large = null -Fonts/fonts/normal = null -GraphEdit/colors/activity = Color( 0, 0, 0, 1 ) -GraphEdit/colors/grid_major = Color( 0, 0, 0, 1 ) -GraphEdit/colors/grid_minor = Color( 0, 0, 0, 1 ) -GraphEdit/colors/selection_fill = Color( 0, 0, 0, 1 ) -GraphEdit/colors/selection_stroke = Color( 0, 0, 0, 1 ) -GraphEdit/constants/bezier_len_neg = 160 -GraphEdit/constants/bezier_len_pos = 80 -GraphEdit/constants/port_grab_distance_horizontal = 48 -GraphEdit/constants/port_grab_distance_vertical = 6 -GraphEdit/icons/minimap = null -GraphEdit/icons/minus = null -GraphEdit/icons/more = null -GraphEdit/icons/reset = null -GraphEdit/icons/snap = null -GraphEdit/styles/bg = null -GraphEditMinimap/colors/resizer_color = Color( 0, 0, 0, 1 ) -GraphEditMinimap/icons/resizer = null -GraphEditMinimap/styles/bg = null -GraphEditMinimap/styles/camera = null -GraphEditMinimap/styles/node = null -GraphNode/colors/close_color = Color( 0, 0, 0, 1 ) -GraphNode/colors/resizer_color = Color( 0, 0, 0, 1 ) -GraphNode/colors/title_color = Color( 0, 0, 0, 1 ) -GraphNode/constants/close_h_offset = 20 -GraphNode/constants/close_offset = 18 -GraphNode/constants/port_offset = 3 -GraphNode/constants/separation = 1 -GraphNode/constants/title_h_offset = -16 -GraphNode/constants/title_offset = 20 -GraphNode/fonts/title_font = null -GraphNode/icons/close = null -GraphNode/icons/port = null -GraphNode/icons/resizer = null -GraphNode/styles/breakpoint = null -GraphNode/styles/comment = null -GraphNode/styles/commentfocus = null -GraphNode/styles/defaultfocus = null -GraphNode/styles/defaultframe = null -GraphNode/styles/frame = null -GraphNode/styles/position = null -GraphNode/styles/selectedframe = null -GraphNode/styles/state_machine_frame = null -GraphNode/styles/state_machine_selectedframe = null -GridContainer/constants/hseparation = 4 -GridContainer/constants/vseparation = 4 -HBoxContainer/constants/separation = 4 -HScrollBar/icons/decrement = null -HScrollBar/icons/decrement_highlight = null -HScrollBar/icons/increment = null -HScrollBar/icons/increment_highlight = null -HScrollBar/styles/grabber = null -HScrollBar/styles/grabber_highlight = null -HScrollBar/styles/grabber_pressed = null -HScrollBar/styles/scroll = null -HScrollBar/styles/scroll_focus = null -HSeparator/constants/separation = 4 -HSeparator/styles/separator = null -HSlider/icons/grabber = null -HSlider/icons/grabber_disabled = null -HSlider/icons/grabber_highlight = null -HSlider/icons/tick = null -HSlider/styles/grabber_area = null -HSlider/styles/grabber_area_highlight = null -HSlider/styles/slider = null -HSplitContainer/constants/autohide = 1 -HSplitContainer/constants/separation = 12 -HSplitContainer/icons/grabber = null -HSplitContainer/styles/bg = null -Icons/icons/close = null -ItemList/colors/font_color = Color( 0, 0, 0, 1 ) -ItemList/colors/font_color_selected = Color( 0, 0, 0, 1 ) -ItemList/colors/guide_color = Color( 0, 0, 0, 1 ) -ItemList/constants/hseparation = 4 -ItemList/constants/icon_margin = 4 -ItemList/constants/line_separation = 2 -ItemList/constants/vseparation = 2 -ItemList/fonts/font = null -ItemList/styles/bg = null -ItemList/styles/bg_focus = null -ItemList/styles/cursor = null -ItemList/styles/cursor_unfocused = null -ItemList/styles/selected = null -ItemList/styles/selected_focus = null -Label/colors/font_color = Color( 0, 0, 0, 1 ) -Label/colors/font_color_shadow = Color( 0, 0, 0, 1 ) -Label/colors/font_outline_modulate = Color( 0, 0, 0, 1 ) -Label/constants/line_spacing = 3 -Label/constants/shadow_as_outline = 0 -Label/constants/shadow_offset_x = 1 -Label/constants/shadow_offset_y = 1 -Label/fonts/font = null -Label/styles/normal = null -LineEdit/colors/clear_button_color = Color( 0, 0, 0, 1 ) -LineEdit/colors/clear_button_color_pressed = Color( 0, 0, 0, 1 ) -LineEdit/colors/cursor_color = Color( 0, 0, 0, 1 ) -LineEdit/colors/font_color = Color( 0, 0, 0, 1 ) -LineEdit/colors/font_color_selected = Color( 0, 0, 0, 1 ) -LineEdit/colors/font_color_uneditable = Color( 0, 0, 0, 1 ) -LineEdit/colors/read_only = Color( 0, 0, 0, 1 ) -LineEdit/colors/selection_color = Color( 0, 0, 0, 1 ) -LineEdit/constants/minimum_spaces = 12 -LineEdit/fonts/font = null -LineEdit/icons/clear = null -LineEdit/styles/focus = null -LineEdit/styles/normal = null -LineEdit/styles/read_only = null -LinkButton/colors/font_color = Color( 0, 0, 0, 1 ) -LinkButton/colors/font_color_disabled = Color( 0, 0, 0, 1 ) -LinkButton/colors/font_color_hover = Color( 0, 0, 0, 1 ) -LinkButton/colors/font_color_pressed = Color( 0, 0, 0, 1 ) -LinkButton/constants/underline_spacing = 2 -LinkButton/fonts/font = null -LinkButton/styles/focus = null -MarginContainer/constants/margin_bottom = 0 -MarginContainer/constants/margin_left = 0 -MarginContainer/constants/margin_right = 0 -MarginContainer/constants/margin_top = 0 -MenuButton/colors/font_color = Color( 0, 0, 0, 1 ) -MenuButton/colors/font_color_disabled = Color( 0, 0, 0, 1 ) -MenuButton/colors/font_color_hover = Color( 0, 0, 0, 1 ) -MenuButton/colors/font_color_pressed = Color( 0, 0, 0, 1 ) -MenuButton/constants/hseparation = 3 -MenuButton/fonts/font = null -MenuButton/styles/disabled = null -MenuButton/styles/focus = null -MenuButton/styles/hover = null -MenuButton/styles/normal = null -MenuButton/styles/pressed = null -OptionButton/colors/font_color = Color( 0, 0, 0, 1 ) -OptionButton/colors/font_color_disabled = Color( 0, 0, 0, 1 ) -OptionButton/colors/font_color_hover = Color( 0, 0, 0, 1 ) -OptionButton/colors/font_color_pressed = Color( 0, 0, 0, 1 ) -OptionButton/colors/icon_color_hover = Color( 0, 0, 0, 1 ) -OptionButton/constants/arrow_margin = 2 -OptionButton/constants/hseparation = 2 -OptionButton/constants/modulate_arrow = 1 -OptionButton/fonts/font = null -OptionButton/icons/arrow = null -OptionButton/styles/disabled = null -OptionButton/styles/focus = null -OptionButton/styles/hover = null -OptionButton/styles/normal = null -OptionButton/styles/pressed = null -Panel/styles/panel = null -PanelContainer/styles/panel = null -PopupDialog/styles/panel = null -PopupMenu/colors/font_color = Color( 0, 0, 0, 1 ) -PopupMenu/colors/font_color_accel = Color( 0, 0, 0, 1 ) -PopupMenu/colors/font_color_disabled = Color( 0, 0, 0, 1 ) -PopupMenu/colors/font_color_hover = Color( 0, 0, 0, 1 ) -PopupMenu/colors/font_color_separator = Color( 0, 0, 0, 1 ) -PopupMenu/constants/hseparation = 4 -PopupMenu/constants/vseparation = 4 -PopupMenu/fonts/font = null -PopupMenu/icons/checked = null -PopupMenu/icons/radio_checked = null -PopupMenu/icons/radio_unchecked = null -PopupMenu/icons/submenu = null -PopupMenu/icons/unchecked = null -PopupMenu/icons/visibility_hidden = null -PopupMenu/icons/visibility_visible = null -PopupMenu/icons/visibility_xray = null -PopupMenu/styles/disabled = null -PopupMenu/styles/focus = null -PopupMenu/styles/hover = null -PopupMenu/styles/labeled_separator_left = null -PopupMenu/styles/labeled_separator_right = null -PopupMenu/styles/normal = null -PopupMenu/styles/panel = null -PopupMenu/styles/panel_disabled = null -PopupMenu/styles/pressed = null -PopupMenu/styles/separator = null -PopupPanel/styles/panel = null -ProgressBar/colors/font_color = Color( 0, 0, 0, 1 ) -ProgressBar/colors/font_color_shadow = Color( 0, 0, 0, 1 ) -ProgressBar/fonts/font = null -ProgressBar/styles/bg = null -ProgressBar/styles/fg = null -ProjectSettingsEditor/styles/panel = null -RichTextLabel/colors/default_color = Color( 0, 0, 0, 1 ) -RichTextLabel/colors/font_color_selected = Color( 0, 0, 0, 1 ) -RichTextLabel/colors/font_color_shadow = Color( 0, 0, 0, 1 ) -RichTextLabel/colors/selection_color = Color( 0, 0, 0, 1 ) -RichTextLabel/constants/line_separation = 1 -RichTextLabel/constants/shadow_as_outline = 0 -RichTextLabel/constants/shadow_offset_x = 1 -RichTextLabel/constants/shadow_offset_y = 1 -RichTextLabel/constants/table_hseparation = 3 -RichTextLabel/constants/table_vseparation = 3 -RichTextLabel/fonts/bold_font = null -RichTextLabel/fonts/bold_italics_font = null -RichTextLabel/fonts/italics_font = null -RichTextLabel/fonts/mono_font = null -RichTextLabel/fonts/normal_font = null -RichTextLabel/styles/focus = null -RichTextLabel/styles/normal = null -ScrollContainer/styles/bg = null -SpinBox/icons/updown = null -TabContainer/colors/font_color_bg = Color( 0, 0, 0, 1 ) -TabContainer/colors/font_color_disabled = Color( 0, 0, 0, 1 ) -TabContainer/colors/font_color_fg = Color( 0, 0, 0, 1 ) -TabContainer/constants/hseparation = 4 -TabContainer/constants/label_valign_bg = 2 -TabContainer/constants/label_valign_fg = 0 -TabContainer/constants/side_margin = 8 -TabContainer/constants/top_margin = 24 -TabContainer/fonts/font = null -TabContainer/icons/decrement = null -TabContainer/icons/decrement_highlight = null -TabContainer/icons/increment = null -TabContainer/icons/increment_highlight = null -TabContainer/icons/menu = null -TabContainer/icons/menu_highlight = null -TabContainer/styles/panel = null -TabContainer/styles/tab_bg = null -TabContainer/styles/tab_disabled = null -TabContainer/styles/tab_fg = null -Tabs/colors/font_color_bg = Color( 0, 0, 0, 1 ) -Tabs/colors/font_color_disabled = Color( 0, 0, 0, 1 ) -Tabs/colors/font_color_fg = Color( 0, 0, 0, 1 ) -Tabs/constants/hseparation = 4 -Tabs/constants/label_valign_bg = 2 -Tabs/constants/label_valign_fg = 0 -Tabs/constants/top_margin = 24 -Tabs/fonts/font = null -Tabs/icons/close = null -Tabs/icons/decrement = null -Tabs/icons/decrement_highlight = null -Tabs/icons/increment = null -Tabs/icons/increment_highlight = null -Tabs/styles/button = null -Tabs/styles/button_pressed = null -Tabs/styles/panel = null -Tabs/styles/tab_bg = null -Tabs/styles/tab_disabled = null -Tabs/styles/tab_fg = null -TextEdit/colors/background_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/bookmark_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/brace_mismatch_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/breakpoint_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/caret_background_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/caret_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/code_folding_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/completion_background_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/completion_existing_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/completion_font_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/completion_scroll_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/completion_selected_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/current_line_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/executing_line_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/font_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/font_color_readonly = Color( 0, 0, 0, 1 ) -TextEdit/colors/font_color_selected = Color( 0, 0, 0, 1 ) -TextEdit/colors/function_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/line_number_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/mark_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/member_variable_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/number_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/safe_line_number_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/selection_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/symbol_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/word_highlighted_color = Color( 0, 0, 0, 1 ) -TextEdit/constants/completion_lines = 7 -TextEdit/constants/completion_max_width = 50 -TextEdit/constants/completion_scroll_width = 3 -TextEdit/constants/line_spacing = 4 -TextEdit/fonts/font = null -TextEdit/icons/fold = null -TextEdit/icons/folded = null -TextEdit/icons/space = null -TextEdit/icons/tab = null -TextEdit/styles/completion = null -TextEdit/styles/focus = null -TextEdit/styles/normal = null -TextEdit/styles/read_only = null -ToolButton/colors/font_color = Color( 0, 0, 0, 1 ) -ToolButton/colors/font_color_disabled = Color( 0, 0, 0, 1 ) -ToolButton/colors/font_color_hover = Color( 0, 0, 0, 1 ) -ToolButton/colors/font_color_pressed = Color( 0, 0, 0, 1 ) -ToolButton/constants/hseparation = 3 -ToolButton/fonts/font = null -ToolButton/styles/disabled = null -ToolButton/styles/focus = null -ToolButton/styles/hover = null -ToolButton/styles/normal = null -ToolButton/styles/pressed = null -TooltipLabel/colors/font_color = Color( 0, 0, 0, 1 ) -TooltipLabel/colors/font_color_shadow = Color( 0, 0, 0, 1 ) -TooltipLabel/constants/shadow_offset_x = 1 -TooltipLabel/constants/shadow_offset_y = 1 -TooltipLabel/fonts/font = null -TooltipPanel/styles/panel = null -Tree/colors/custom_button_font_highlight = Color( 0, 0, 0, 1 ) -Tree/colors/drop_position_color = Color( 0, 0, 0, 1 ) -Tree/colors/font_color = Color( 0, 0, 0, 1 ) -Tree/colors/font_color_selected = Color( 0, 0, 0, 1 ) -Tree/colors/guide_color = Color( 0, 0, 0, 1 ) -Tree/colors/relationship_line_color = Color( 0, 0, 0, 1 ) -Tree/colors/title_button_color = Color( 0, 0, 0, 1 ) -Tree/constants/button_margin = 4 -Tree/constants/draw_guides = 1 -Tree/constants/draw_relationship_lines = 0 -Tree/constants/hseparation = 4 -Tree/constants/item_margin = 12 -Tree/constants/scroll_border = 4 -Tree/constants/scroll_speed = 12 -Tree/constants/vseparation = 4 -Tree/fonts/font = null -Tree/fonts/title_button_font = null -Tree/icons/arrow = null -Tree/icons/arrow_collapsed = null -Tree/icons/checked = null -Tree/icons/select_arrow = null -Tree/icons/unchecked = null -Tree/icons/updown = null -Tree/styles/bg = null -Tree/styles/bg_focus = null -Tree/styles/button_pressed = null -Tree/styles/cursor = null -Tree/styles/cursor_unfocused = null -Tree/styles/custom_button = null -Tree/styles/custom_button_hover = null -Tree/styles/custom_button_pressed = null -Tree/styles/hover = null -Tree/styles/selected = null -Tree/styles/selected_focus = null -Tree/styles/title_button_hover = null -Tree/styles/title_button_normal = null -Tree/styles/title_button_pressed = null -VBoxContainer/constants/separation = 4 -VScrollBar/icons/decrement = null -VScrollBar/icons/decrement_highlight = null -VScrollBar/icons/increment = null -VScrollBar/icons/increment_highlight = null -VScrollBar/styles/grabber = null -VScrollBar/styles/grabber_highlight = null -VScrollBar/styles/grabber_pressed = null -VScrollBar/styles/scroll = null -VScrollBar/styles/scroll_focus = null -VSeparator/constants/separation = 4 -VSeparator/styles/separator = null -VSlider/icons/grabber = null -VSlider/icons/grabber_disabled = null -VSlider/icons/grabber_highlight = null -VSlider/icons/tick = null -VSlider/styles/grabber_area = null -VSlider/styles/grabber_area_highlight = null -VSlider/styles/slider = null -VSplitContainer/constants/autohide = 1 -VSplitContainer/constants/separation = 12 -VSplitContainer/icons/grabber = null -VSplitContainer/styles/bg = null -WindowDialog/colors/title_color = Color( 0, 0, 0, 1 ) -WindowDialog/constants/close_h_ofs = 18 -WindowDialog/constants/close_v_ofs = 18 -WindowDialog/constants/scaleborder_size = 4 -WindowDialog/constants/title_height = 20 -WindowDialog/fonts/title_font = null -WindowDialog/icons/close = null -WindowDialog/icons/close_highlight = null -WindowDialog/styles/panel = null diff --git a/godot_ship/project.godot b/godot_ship/project.godot index 826454e..fbccc41 100644 --- a/godot_ship/project.godot +++ b/godot_ship/project.godot @@ -16,8 +16,8 @@ config/icon="res://icon.png" [autoload] -MessageBus="*res://script/game/Message Bus.gd" -AudioBus="*res://script/game/Audio Bus.gd" +MessageBus="*res://script/Message Bus.gd" +AudioBus="*res://script/audio controller/Audio Bus.gd" OptionsController="*res://script/options/OptionsController.gd" AudioController="*res://scenes/AudioController.tscn" diff --git a/godot_ship/scenes/AudioController.tscn b/godot_ship/scenes/AudioController.tscn index 5de3d12..d130143 100644 --- a/godot_ship/scenes/AudioController.tscn +++ b/godot_ship/scenes/AudioController.tscn @@ -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://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/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"] anchor_right = 1.0 @@ -20,3 +23,18 @@ bus = "BGM" [node name="buttonSFX" type="AudioStreamPlayer" parent="."] stream = ExtResource( 3 ) bus = "SFX" + +[node name="shipHitSFX" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 4 ) +volume_db = -10.0 +bus = "SFX" + +[node name="shipMissedSFX" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 5 ) +volume_db = -5.0 +bus = "SFX" + +[node name="shipSunkSFX" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 6 ) +volume_db = -10.0 +bus = "SFX" diff --git a/godot_ship/scenes/Debug Menu.tscn b/godot_ship/scenes/Debug Menu.tscn index f4b6c46..a6239ee 100644 --- a/godot_ship/scenes/Debug Menu.tscn +++ b/godot_ship/scenes/Debug Menu.tscn @@ -1,6 +1,5 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=5 format=2] -[ext_resource path="res://main.tres" type="Theme" id=1] [ext_resource path="res://script/debug/debug_menu.gd" type="Script" id=2] [ext_resource path="res://script/debug/In.gd" type="Script" id=3] [ext_resource path="res://script/debug/Out.gd" type="Script" id=4] @@ -9,7 +8,7 @@ [node name="Debug" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 -theme = ExtResource( 1 ) +theme = ExtResource( 5 ) script = ExtResource( 2 ) __meta__ = { "_edit_use_anchors_": false @@ -51,6 +50,7 @@ focus_neighbour_right = NodePath(".") focus_neighbour_bottom = NodePath(".") focus_next = NodePath(".") focus_previous = NodePath(".") +theme = ExtResource( 5 ) max_length = 256 placeholder_text = "By your command." caret_blink = true diff --git a/godot_ship/scenes/Game/Fire.tscn b/godot_ship/scenes/Game/Fire.tscn new file mode 100644 index 0000000..7f42da6 --- /dev/null +++ b/godot_ship/scenes/Game/Fire.tscn @@ -0,0 +1,46 @@ +[gd_scene load_steps=5 format=2] + +[ext_resource path="res://assets/game/RedCrosshair.png" type="Texture" id=1] +[ext_resource path="res://script/game/Gameplay/Fire.gd" type="Script" id=2] +[ext_resource path="res://script/game/Gameplay/Crosshair.gd" type="Script" id=3] +[ext_resource path="res://assets/game/board_blue.png" type="Texture" id=4] + +[node name="Fire" type="Control"] +anchor_right = 1.0 +anchor_bottom = 1.0 +mouse_filter = 2 +script = ExtResource( 2 ) +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="board_blue" type="Sprite" parent="."] +position = Vector2( 18, 18 ) +texture = ExtResource( 4 ) +centered = false +__meta__ = { +"_edit_lock_": true +} + +[node name="Crosshair" type="Sprite" parent="."] +texture = ExtResource( 1 ) +script = ExtResource( 3 ) + +[node name="Fire" type="Button" parent="."] +margin_left = 443.545 +margin_top = 264.473 +margin_right = 528.545 +margin_bottom = 318.473 +text = "FIRE" +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="FireDialog" type="AcceptDialog" parent="."] +pause_mode = 2 +margin_right = 83.0 +margin_bottom = 58.0 +dialog_text = "You can't fire outside the board" + +[connection signal="pressed" from="Fire" to="." method="_on_Fire_pressed"] +[connection signal="confirmed" from="FireDialog" to="." method="_on_FireDialog_confirmed"] diff --git a/godot_ship/scenes/Game/Game.tscn b/godot_ship/scenes/Game/Game.tscn new file mode 100644 index 0000000..681939f --- /dev/null +++ b/godot_ship/scenes/Game/Game.tscn @@ -0,0 +1,50 @@ +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://script/game/Gameplay/Game.gd" type="Script" id=3] + +[node name="Game" type="Control"] +anchor_right = 1.0 +anchor_bottom = 1.0 +mouse_filter = 2 +script = ExtResource( 3 ) +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Buttons" type="VBoxContainer" parent="."] +anchor_left = 0.912 +anchor_top = 0.932 +anchor_right = 0.912 +anchor_bottom = 0.932 +margin_left = -3.68005 +margin_top = -4.52002 +margin_right = 49.3199 +margin_bottom = 15.48 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Forfeit" type="Button" parent="Buttons"] +margin_right = 53.0 +margin_bottom = 20.0 +text = "Forfeit" + +[node name="ConfirmationDialog" type="ConfirmationDialog" parent="."] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -111.5 +margin_top = -29.0 +margin_right = 111.5 +margin_bottom = 29.0 +rect_min_size = Vector2( 150, 52.5 ) +window_title = "Forfeit Confirmation..." +dialog_text = "Are you sure you want to forfeit?" +__meta__ = { +"_edit_use_anchors_": false, +"_editor_description_": "" +} + +[connection signal="pressed" from="Buttons/Forfeit" to="." method="_on_Forfeit_pressed"] +[connection signal="confirmed" from="ConfirmationDialog" to="." method="_on_ConfirmationDialog_confirmed"] diff --git a/godot_ship/scenes/Game/Player.tscn b/godot_ship/scenes/Game/Player.tscn new file mode 100644 index 0000000..a0e1be0 --- /dev/null +++ b/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 +} diff --git a/godot_ship/scenes/Game/Setup.tscn b/godot_ship/scenes/Game/Setup.tscn new file mode 100644 index 0000000..42db1cd --- /dev/null +++ b/godot_ship/scenes/Game/Setup.tscn @@ -0,0 +1,108 @@ +[gd_scene load_steps=8 format=2] + +[ext_resource path="res://assets/game/board_blue.png" type="Texture" id=1] +[ext_resource path="res://scenes/ships/3ShipB.tscn" type="PackedScene" id=4] +[ext_resource path="res://scenes/ships/3shipA.tscn" type="PackedScene" id=5] +[ext_resource path="res://scenes/ships/4Ship.tscn" type="PackedScene" id=6] +[ext_resource path="res://scenes/ships/5Ship.tscn" type="PackedScene" id=7] +[ext_resource path="res://scenes/ships/2Ship.tscn" type="PackedScene" id=8] +[ext_resource path="res://script/game/Setup.gd" type="Script" id=10] + +[node name="Setup" type="Control"] +anchor_top = 0.00123732 +anchor_right = 1.0 +anchor_bottom = 0.890237 +margin_top = -0.445435 +margin_bottom = 39.5145 +mouse_filter = 2 +script = ExtResource( 10 ) +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="board_blue" type="Sprite" parent="."] +position = Vector2( 18, 18 ) +texture = ExtResource( 1 ) +centered = false +__meta__ = { +"_edit_lock_": true +} + +[node name="ConfirmationDialog" type="ConfirmationDialog" parent="."] +margin_left = 199.156 +margin_top = 155.6 +margin_right = 458.156 +margin_bottom = 225.6 +rect_min_size = Vector2( 150, 52.5 ) +window_title = "Are you sure you'd like to forfeit?" +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="2Ship" parent="." instance=ExtResource( 8 )] +position = Vector2( 490.802, 90.7151 ) +collision_layer = 3 +contacts_reported = 1 +contact_monitor = true + +[node name="3ShipA" parent="." instance=ExtResource( 5 )] +position = Vector2( 429.236, 124.21 ) +collision_layer = 3 +contacts_reported = 1 +contact_monitor = true + +[node name="3ShipB" parent="." instance=ExtResource( 4 )] +position = Vector2( 427.216, 248.865 ) +collision_layer = 3 +contacts_reported = 1 +contact_monitor = true + +[node name="4Ship" parent="." instance=ExtResource( 6 )] +position = Vector2( 491.911, 217.599 ) +collision_layer = 3 +contacts_reported = 1 +contact_monitor = true + +[node name="5Ship" parent="." instance=ExtResource( 7 )] +position = Vector2( 557.096, 213.864 ) +collision_layer = 3 +contacts_reported = 1 +contact_monitor = true + +[node name="Confirm Placement" type="Button" parent="."] +margin_left = 409.0 +margin_top = 331.0 +margin_right = 543.0 +margin_bottom = 351.0 +text = "Confirm Placement" +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Clear" type="Button" parent="."] +margin_left = 353.0 +margin_top = 331.0 +margin_right = 406.0 +margin_bottom = 351.0 +text = "Clear" +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="PlaceShipDialog" type="AcceptDialog" parent="."] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -179.0 +margin_top = -29.0 +margin_right = 179.0 +margin_bottom = 29.0 +dialog_text = "You can't confirm placement until all ships are placed" +__meta__ = { +"_edit_use_anchors_": false +} + +[connection signal="about_to_show" from="ConfirmationDialog" to="." method="_on_ConfirmationDialog_about_to_show"] +[connection signal="pressed" from="Confirm Placement" to="." method="_on_Confirm_Placement_pressed"] +[connection signal="pressed" from="Clear" to="." method="_on_Clear_pressed"] diff --git a/godot_ship/scenes/Game/Victory.tscn b/godot_ship/scenes/Game/Victory.tscn new file mode 100644 index 0000000..3d1091c --- /dev/null +++ b/godot_ship/scenes/Game/Victory.tscn @@ -0,0 +1,51 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://script/game/Victory.gd" type="Script" id=1] +[ext_resource path="res://assets/font/Minecraft.ttf" type="DynamicFontData" id=2] + +[sub_resource type="DynamicFont" id=1] +size = 40 +font_data = ExtResource( 2 ) + +[node name="Victory" type="Control"] +anchor_right = 1.0 +anchor_bottom = 1.0 +script = ExtResource( 1 ) +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Label" type="Label" parent="."] +margin_left = 118.32 +margin_top = 44.5109 +margin_right = 260.32 +margin_bottom = 84.5109 +size_flags_vertical = 0 +custom_fonts/font = SubResource( 1 ) +text = "Victory" +align = 1 +valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Button" type="Button" parent="."] +margin_left = 541.0 +margin_top = 327.85 +margin_right = 636.0 +margin_bottom = 353.85 +text = "Exit to Main" +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Button2" type="Button" parent="."] +visible = false +margin_left = 2.22023 +margin_top = 337.41 +margin_right = 63.2202 +margin_bottom = 357.41 +text = "Restart" + +[connection signal="pressed" from="Button" to="." method="_on_Button_pressed"] +[connection signal="button_down" from="Button2" to="." method="_on_restart_button_down"] diff --git a/godot_ship/scenes/Gameplay.tscn b/godot_ship/scenes/Gameplay.tscn deleted file mode 100644 index b820cb7..0000000 --- a/godot_ship/scenes/Gameplay.tscn +++ /dev/null @@ -1,101 +0,0 @@ -[gd_scene load_steps=9 format=2] - -[ext_resource path="res://assets/game/board_blue.png" type="Texture" id=1] -[ext_resource path="res://script/title screen/Title-Screen-Background.png" type="Texture" id=2] -[ext_resource path="res://script/game/Gameplay.gd" type="Script" id=3] -[ext_resource path="res://scenes/ships/2Ship.tscn" type="PackedScene" id=4] -[ext_resource path="res://scenes/ships/5Ship.tscn" type="PackedScene" id=5] -[ext_resource path="res://scenes/ships/3ShipB.tscn" type="PackedScene" id=6] -[ext_resource path="res://scenes/ships/3shipA.tscn" type="PackedScene" id=7] -[ext_resource path="res://scenes/ships/4Ship.tscn" type="PackedScene" id=8] - -[node name="Game" type="Control"] -anchor_right = 1.0 -anchor_bottom = 0.889 -margin_left = -0.5 -margin_top = 0.740086 -margin_right = -0.5 -margin_bottom = 40.7 -script = ExtResource( 3 ) -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="board_blue" type="Sprite" parent="."] -position = Vector2( 18, 18 ) -texture = ExtResource( 1 ) -centered = false -__meta__ = { -"_edit_lock_": true -} - -[node name="Title-Screen-Background" type="Sprite" parent="."] -show_behind_parent = true -position = Vector2( 321.081, 179.931 ) -texture = ExtResource( 2 ) -flip_h = true -__meta__ = { -"_edit_lock_": true -} - -[node name="VBoxContainer" type="VBoxContainer" parent="."] -anchor_left = 0.912 -anchor_top = 0.932 -anchor_right = 0.912 -anchor_bottom = 0.932 -margin_left = 0.319946 -margin_top = 0.47998 -margin_right = 53.3199 -margin_bottom = 20.48 -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="Forfeit" type="Button" parent="VBoxContainer"] -margin_right = 53.0 -margin_bottom = 20.0 -text = "Forfeit" - -[node name="ConfirmationDialog" type="ConfirmationDialog" parent="."] -margin_left = 199.156 -margin_top = 155.6 -margin_right = 458.156 -margin_bottom = 225.6 -rect_min_size = Vector2( 150, 52.5 ) -window_title = "Are you sure you'd like to forfeit?" -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="2Ship" parent="." instance=ExtResource( 4 )] -position = Vector2( 529.802, 70.7151 ) -collision_layer = 3 -contacts_reported = 1 -contact_monitor = true - -[node name="3ShipA" parent="." instance=ExtResource( 7 )] -position = Vector2( 434.236, 114.21 ) -collision_layer = 3 -contacts_reported = 1 -contact_monitor = true - -[node name="3ShipB" parent="." instance=ExtResource( 6 )] -position = Vector2( 443.216, 266.865 ) -collision_layer = 3 -contacts_reported = 1 -contact_monitor = true - -[node name="4Ship" parent="." instance=ExtResource( 8 )] -position = Vector2( 522.911, 218.599 ) -collision_layer = 3 -contacts_reported = 1 -contact_monitor = true - -[node name="5Ship" parent="." instance=ExtResource( 5 )] -position = Vector2( 607.096, 211.864 ) -collision_layer = 3 -contacts_reported = 1 -contact_monitor = true - -[connection signal="pressed" from="VBoxContainer/Forfeit" to="." method="_on_Forfeit_pressed"] -[connection signal="about_to_show" from="ConfirmationDialog" to="." method="_on_ConfirmationDialog_about_to_show"] diff --git a/godot_ship/scenes/Main.tscn b/godot_ship/scenes/Main.tscn index a32d817..056eeb3 100644 --- a/godot_ship/scenes/Main.tscn +++ b/godot_ship/scenes/Main.tscn @@ -1,12 +1,22 @@ -[gd_scene load_steps=2 format=2] +[gd_scene load_steps=3 format=2] -[ext_resource path="res://script/game/Main.gd" type="Script" id=5] +[ext_resource path="res://assets/backgrounds/Background_Dark.png" type="Texture" id=1] +[ext_resource path="res://script/Main.gd" type="Script" id=5] [node name="Main" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 -mouse_filter = 1 +mouse_filter = 2 script = ExtResource( 5 ) __meta__ = { "_edit_use_anchors_": false } + +[node name="Background" type="TextureRect" parent="."] +margin_right = 40.0 +margin_bottom = 40.0 +texture = ExtResource( 1 ) +__meta__ = { +"_edit_lock_": true, +"_edit_use_anchors_": false +} diff --git a/godot_ship/scenes/MultiplayerController.tscn b/godot_ship/scenes/MultiplayerController.tscn deleted file mode 100644 index d39d64e..0000000 --- a/godot_ship/scenes/MultiplayerController.tscn +++ /dev/null @@ -1,6 +0,0 @@ -[gd_scene format=2] - -[node name="Control" type="Control"] -__meta__ = { -"_edit_use_anchors_": false -} diff --git a/godot_ship/scenes/Options.tscn b/godot_ship/scenes/Options.tscn index 7d58506..2ed6077 100644 --- a/godot_ship/scenes/Options.tscn +++ b/godot_ship/scenes/Options.tscn @@ -1,6 +1,5 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=2 format=2] -[ext_resource path="res://script/options/Option-Background.png" type="Texture" id=1] [ext_resource path="res://script/options/Options.gd" type="Script" id=2] [node name="Options" type="Control"] @@ -11,15 +10,6 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Background" type="TextureRect" parent="."] -margin_right = 40.0 -margin_bottom = 40.0 -texture = ExtResource( 1 ) -__meta__ = { -"_edit_lock_": true, -"_edit_use_anchors_": false -} - [node name="MenuLabel" type="RichTextLabel" parent="."] margin_left = 294.0 margin_top = 68.0 @@ -68,10 +58,9 @@ focus_neighbour_top = NodePath("../../../Back") focus_neighbour_bottom = NodePath("../../Volume Setting/Volume Slider") focus_next = NodePath("../../Volume Setting/Volume Slider") focus_previous = NodePath("../../../Back") -min_value = -25.0 -max_value = 0.0 +max_value = 1.0 +step = 0.05 tick_count = 10 -ticks_on_borders = true __meta__ = { "_edit_use_anchors_": false } @@ -100,10 +89,9 @@ focus_neighbour_top = NodePath("../../SFX Setting/SFX Slider") focus_neighbour_bottom = NodePath("../../../Buttons/Dark") focus_next = NodePath("../../../Buttons/Dark") focus_previous = NodePath("../../SFX Setting/SFX Slider") -min_value = -50.0 -max_value = 0.0 +max_value = 1.0 +step = 0.05 tick_count = 10 -ticks_on_borders = true __meta__ = { "_edit_use_anchors_": false } @@ -127,10 +115,9 @@ margin_left = 64.0 margin_top = 48.0 margin_right = 208.0 margin_bottom = 64.0 -min_value = -50.0 -max_value = 0.0 +max_value = 1.0 +step = 0.05 tick_count = 10 -ticks_on_borders = true __meta__ = { "_edit_use_anchors_": false } diff --git a/godot_ship/scenes/Title Screen.tscn b/godot_ship/scenes/Title Screen.tscn index a309212..9cc581c 100644 --- a/godot_ship/scenes/Title Screen.tscn +++ b/godot_ship/scenes/Title Screen.tscn @@ -1,7 +1,13 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=4 format=2] -[ext_resource path="res://script/title screen/Title-Screen-Background.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] + +[sub_resource type="DynamicFont" id=1] +size = 44 +outline_size = 2 +outline_color = Color( 0, 0, 0, 1 ) +font_data = ExtResource( 3 ) [node name="Title Node" type="Control"] anchor_right = 1.0 @@ -11,10 +17,6 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Title-Screen-Background" type="Sprite" parent="."] -position = Vector2( 320, 180 ) -texture = ExtResource( 1 ) - [node name="VBoxContainer" type="VBoxContainer" parent="."] anchor_left = 0.5 anchor_top = 0.5 @@ -53,6 +55,28 @@ margin_bottom = 92.0 focus_neighbour_bottom = NodePath("../Singleplayer") text = "Quit" +[node name="Label" type="Label" parent="."] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -157.0 +margin_top = -50.0 +margin_right = 157.0 +margin_bottom = -6.0 +size_flags_stretch_ratio = 0.0 +custom_fonts/font = SubResource( 1 ) +custom_colors/font_outline_modulate = Color( 0, 0, 0, 1 ) +custom_colors/font_color_shadow = Color( 0, 0, 0, 1 ) +custom_constants/shadow_offset_x = 0 +custom_constants/shadow_offset_y = 8 +text = "BOAT BATTLE" +align = 1 +valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} + [connection signal="pressed" from="VBoxContainer/Singleplayer" to="." method="_on_Singleplayer_pressed"] [connection signal="pressed" from="VBoxContainer/Multiplayer" to="." method="_on_Multiplayer_pressed"] [connection signal="pressed" from="VBoxContainer/Options" to="." method="_on_Options_pressed"] diff --git a/godot_ship/scenes/ships/2Ship.tscn b/godot_ship/scenes/ships/2Ship.tscn index 9b64cc0..4d9fe35 100644 --- a/godot_ship/scenes/ships/2Ship.tscn +++ b/godot_ship/scenes/ships/2Ship.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://script/game/moveShip.gd" type="Script" id=1] -[ext_resource path="res://assets/game/2longShipS.png" type="Texture" id=2] +[ext_resource path="res://script/game/SetupShip.gd" type="Script" id=1] +[ext_resource path="res://assets/game/2Ship.png" type="Texture" id=2] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 16, 32 ) @@ -12,16 +12,18 @@ gravity_scale = 0.0 custom_integrator = true script = ExtResource( 1 ) -[node name="2longShipS" type="Sprite" parent="."] -position = Vector2( 0, 16 ) +[node name="2Ship_Sprite" type="Sprite" parent="."] +position = Vector2( -0.00390625, 15.622 ) texture = ExtResource( 2 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] position = Vector2( 0.125, 16 ) +scale = Vector2( 0.5, 0.75 ) shape = SubResource( 1 ) [node name="Area2D" type="Area2D" parent="."] [node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"] position = Vector2( 0.125, 16 ) +scale = Vector2( 0.5, 0.75 ) shape = SubResource( 1 ) diff --git a/godot_ship/scenes/ships/3ShipB.tscn b/godot_ship/scenes/ships/3ShipB.tscn index bcbc759..4969277 100644 --- a/godot_ship/scenes/ships/3ShipB.tscn +++ b/godot_ship/scenes/ships/3ShipB.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://script/game/moveShip.gd" type="Script" id=1] -[ext_resource path="res://assets/game/3longShipBS.png" type="Texture" id=2] +[ext_resource path="res://script/game/SetupShip.gd" type="Script" id=1] +[ext_resource path="res://assets/game/3ShipB.png" type="Texture" id=2] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 16, 48 ) @@ -12,13 +12,15 @@ gravity_scale = 0.0 custom_integrator = true script = ExtResource( 1 ) -[node name="3longShipBS" type="Sprite" parent="."] +[node name="3ShipB_Sprite" type="Sprite" parent="."] texture = ExtResource( 2 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] +scale = Vector2( 0.5, 0.833 ) shape = SubResource( 1 ) [node name="Area2D" type="Area2D" parent="."] [node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"] +scale = Vector2( 0.5, 0.833 ) shape = SubResource( 1 ) diff --git a/godot_ship/scenes/ships/3shipA.tscn b/godot_ship/scenes/ships/3shipA.tscn index 6e5da1b..889544e 100644 --- a/godot_ship/scenes/ships/3shipA.tscn +++ b/godot_ship/scenes/ships/3shipA.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://script/game/moveShip.gd" type="Script" id=1] -[ext_resource path="res://assets/game/3longShipAS.png" type="Texture" id=2] +[ext_resource path="res://script/game/SetupShip.gd" type="Script" id=1] +[ext_resource path="res://assets/game/3ShipA.png" type="Texture" id=2] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 16, 48 ) @@ -12,13 +12,16 @@ gravity_scale = 0.0 custom_integrator = true script = ExtResource( 1 ) -[node name="3longShipAS" type="Sprite" parent="."] +[node name="3ShipA_Sprite" type="Sprite" parent="."] +position = Vector2( -0.0212851, 0 ) texture = ExtResource( 2 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] +scale = Vector2( 0.5, 0.875 ) shape = SubResource( 1 ) [node name="Area2D" type="Area2D" parent="."] [node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"] +scale = Vector2( 0.5, 0.833 ) shape = SubResource( 1 ) diff --git a/godot_ship/scenes/ships/4Ship.tscn b/godot_ship/scenes/ships/4Ship.tscn index 18f3a4d..8ab7397 100644 --- a/godot_ship/scenes/ships/4Ship.tscn +++ b/godot_ship/scenes/ships/4Ship.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://script/game/moveShip.gd" type="Script" id=1] -[ext_resource path="res://assets/game/4longShipS.png" type="Texture" id=2] +[ext_resource path="res://script/game/SetupShip.gd" type="Script" id=1] +[ext_resource path="res://assets/game/4Ship.png" type="Texture" id=2] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 16, 64 ) @@ -12,16 +12,18 @@ gravity_scale = 0.0 custom_integrator = true script = ExtResource( 1 ) -[node name="4longShipS" type="Sprite" parent="."] +[node name="4Ship_Sprite" type="Sprite" parent="."] position = Vector2( 0, 16 ) texture = ExtResource( 2 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( 1, 15 ) +position = Vector2( 0, 16 ) +scale = Vector2( 0.5, 0.875 ) shape = SubResource( 1 ) [node name="Area2D" type="Area2D" parent="."] [node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"] -position = Vector2( 1, 15 ) +position = Vector2( 0, 16 ) +scale = Vector2( 0.5, 0.875 ) shape = SubResource( 1 ) diff --git a/godot_ship/scenes/ships/5Ship.tscn b/godot_ship/scenes/ships/5Ship.tscn index a599393..216643a 100644 --- a/godot_ship/scenes/ships/5Ship.tscn +++ b/godot_ship/scenes/ships/5Ship.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://script/game/moveShip.gd" type="Script" id=1] -[ext_resource path="res://assets/game/5longShipS.png" type="Texture" id=2] +[ext_resource path="res://script/game/SetupShip.gd" type="Script" id=1] +[ext_resource path="res://assets/game/5Ship.png" type="Texture" id=2] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 16, 80 ) @@ -11,14 +11,15 @@ input_pickable = true custom_integrator = true script = ExtResource( 1 ) -[node name="5longShipS" type="Sprite" parent="."] +[node name="5Ship_Sprite" type="Sprite" parent="."] texture = ExtResource( 2 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -visible = false +scale = Vector2( 0.5, 0.9 ) shape = SubResource( 1 ) [node name="Area2D" type="Area2D" parent="."] [node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"] +scale = Vector2( 0.5, 0.9 ) shape = SubResource( 1 ) diff --git a/godot_ship/script/game/Main.gd b/godot_ship/script/Main.gd similarity index 66% rename from godot_ship/script/game/Main.gd rename to godot_ship/script/Main.gd index 86d5867..a3d53f9 100644 --- a/godot_ship/script/game/Main.gd +++ b/godot_ship/script/Main.gd @@ -1,10 +1,14 @@ extends Control # Scenes -onready var title_screen = preload("res://scenes/Title Screen.tscn") -onready var gameplay = preload("res://scenes/Gameplay.tscn" ) -onready var options = preload("res://scenes/Options.tscn" ) -onready var debug_menu = preload("res://scenes/Debug Menu.tscn" ) +onready var Title_Screen = preload("res://scenes/Title Screen.tscn") +onready var Game = preload("res://scenes/Game/Game.tscn" ) +onready var Options = preload("res://scenes/Options.tscn" ) +onready var Debug_Menu = preload("res://scenes/Debug Menu.tscn" ) + +# Themes +var lightmode = preload("res://assets/backgrounds/Background_Light.png"); +var darkmode = preload("res://assets/backgrounds/Background_Dark.png"); #flags var power_saving = true @@ -21,12 +25,15 @@ func _ready(): _errno += MessageBus.connect("list_scenes" , self, "_on_scene_list" ) _errno += MessageBus.connect("quit" , self, "_on_quit_request" ) _errno += MessageBus.connect("return_to_title", self, "_on_title_request" ) + _errno += OptionsController.connect("change_theme", self, "_on_change_theme" ) + # Set the theme based on the config file + _on_change_theme(OptionsController.get_theme()) # go fullscreen OS.low_processor_usage_mode = power_saving OS.low_processor_usage_mode_sleep_usec = 6800 OS.window_fullscreen = start_fullscreen if debug_enabled: - add_child(debug_menu.instance()) + add_child(Debug_Menu.instance()) # Process global keybinds func _input(event): @@ -38,27 +45,33 @@ func _input(event): # Ensure the scene doesn't become empty func _process(_delta): # Make sure there's something running + # Background counts as one child # Debug counts as one child - if get_child_count() < 1 + int(debug_enabled): + if get_child_count() < 2 + int(debug_enabled): MessageBus.emit_signal("change_scene", "Title") pass # Creates a new instance of each menu scene func _on_scene_start(scene): + var instance #print ("_on_scene_start(",scene,")") match scene: "Singleplayer": - add_child (gameplay.instance()) + instance = Game.instance() + add_child (instance) return true "Multiplayer": - add_child (gameplay.instance()) - # add_child (multiplayercontroller.instance()) + instance = Game.instance() + instance.is_multiplayer = true + add_child (instance) return true "Options": - add_child (options.instance()) + instance = Options.instance() + add_child (instance) return true "Title": - add_child (title_screen.instance()) + instance = Title_Screen.instance() + add_child (instance) return true func _on_scene_start_by_name(scene): @@ -87,3 +100,9 @@ func _on_quit_request(): # Kills the current tree and replaces it with a new one func _on_title_request(): return get_tree().change_scene("res://scenes/Main.tscn") + +func _on_change_theme(theme): + if theme == "light": + get_node("Background").set_texture(lightmode) + elif theme == "dark": + get_node("Background").set_texture(darkmode) diff --git a/godot_ship/script/game/Message Bus.gd b/godot_ship/script/Message Bus.gd similarity index 100% rename from godot_ship/script/game/Message Bus.gd rename to godot_ship/script/Message Bus.gd diff --git a/godot_ship/script/game/Audio Bus.gd b/godot_ship/script/audio controller/Audio Bus.gd similarity index 73% rename from godot_ship/script/game/Audio Bus.gd rename to godot_ship/script/audio controller/Audio Bus.gd index 4fbe1d1..dac0314 100644 --- a/godot_ship/script/game/Audio Bus.gd +++ b/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 diff --git a/godot_ship/script/audio controller/AudioController.gd b/godot_ship/script/audio controller/AudioController.gd index a128649..193e0a6 100644 --- a/godot_ship/script/audio controller/AudioController.gd +++ b/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 diff --git a/godot_ship/script/game/Border.gd b/godot_ship/script/game/Border.gd deleted file mode 100644 index ce5e6c3..0000000 --- a/godot_ship/script/game/Border.gd +++ /dev/null @@ -1,18 +0,0 @@ -extends Area2D - -# Declare member variables here. Examples: -# var a = 2 -# var b = "text" - - -# Called when the node enters the scene tree for the first time. -func _ready(): - pass # Replace with function body. - - -# Called every frame. 'delta' is the elapsed time since the previous frame. -#func _process(delta): -# pass - -func _on_Border_body_entered(body): - print(body) diff --git a/godot_ship/script/game/Gameplay.gd b/godot_ship/script/game/Gameplay.gd deleted file mode 100644 index 8b00fae..0000000 --- a/godot_ship/script/game/Gameplay.gd +++ /dev/null @@ -1,13 +0,0 @@ -extends Control - - -# Called when the node enters the scene tree for the first time. -func _ready(): - if find_next_valid_focus(): find_next_valid_focus().grab_focus() - - -func _on_Forfeit_pressed(): - AudioBus.emit_signal("button_clicked") - queue_free(); - MessageBus.emit_signal("change_scene", "Title") - diff --git a/godot_ship/script/game/Gameplay/Board.gd b/godot_ship/script/game/Gameplay/Board.gd new file mode 100644 index 0000000..de71f89 --- /dev/null +++ b/godot_ship/script/game/Gameplay/Board.gd @@ -0,0 +1,54 @@ +extends Node + +# Path to Ship class, for instantiating new Ships in code +onready var Ship = load("res://script/game/Gameplay/Ship.gd") + +var bottom_board # Player board +var top_board # Opponent board +var ships # list of Ships +var ship_count # number of 'active' (un-sunk) ships + +# a board is square. This is its side lengths +var board_len = 10 + +# Called when the node enters the scene tree for the first time. +func _ready(): + ships = [] + ship_count = 0 + +# TODO: What state? +func getState(): + pass + +# Place a ship on the board at board-space coordinates +func placeShip(in_position, in_size, in_orientation): + ships.append(Ship.new(in_position, in_size, in_orientation)) + pass + +func getBottomBoard(): + pass + +func getShipCount(): + return ship_count + +func _init(): + # Initialize the bottom_board to a 10x10 array + for _row in range(board_len): + bottom_board.append([]) + for column in bottom_board: + column.resize(10) + # Initialize the top_board to a 10x10 array + for _row in range(board_len): + top_board.append([]) + for column in top_board: + column.resize(board_len) + +# worldspace_to_boardspace: convert a Vector2 in world-space to board-space +func worldspace_to_boardspace(coordinate:Vector2): + # subtract 36 to get the position relative to (0,0) on the board, and integer divide by 32 + return Vector2(int(coordinate.x - 36) >> 5, int(coordinate.y-36) >> 5) + +# Coordinates of ship's center. Ship extends [-(size-1 >> 1), (size/2 >> 1)] +func shiptoboard(ship:Ship): + for i in range (ship.) + pass diff --git a/godot_ship/script/game/Gameplay/Crosshair.gd b/godot_ship/script/game/Gameplay/Crosshair.gd new file mode 100644 index 0000000..41ef586 --- /dev/null +++ b/godot_ship/script/game/Gameplay/Crosshair.gd @@ -0,0 +1,58 @@ +extends Sprite + + +var snapped = false #when snapped if true crosshair stops following mouse +const world_offset = Vector2(36,36) + +# Called when the node enters the scene tree for the first time. +func _ready(): + # Move the cursor to 0,0 + position = board_to_world_space(Vector2(-2,-2)) + pass # Replace with function body. + +func _physics_process(_delta): + var mousePos = get_global_mouse_position() + # If the cursor is not snapped, and the mouse is over the board + if snapped == false and validate_position(mousePos): + # Snap the crosshair to the grid, but following the mouse + position = (mousePos - world_offset).snapped(Vector2(32,32)) + world_offset + +func _input(event): + # Check if left click is being clicked and the sprite is visible (i.e only checks for inputs after ship positions are confirmed) + if event is InputEventMouseButton and event.button_index == BUTTON_LEFT and visible and not event.is_pressed(): + # Make a noise + AudioBus.emit_signal("button_clicked") + # Locks the position of the crosshair with left click release + if validate_position(position) == true: + # rounds the board position to the nearest integer + snapped = true + position.x = int(round(world_to_board_space(position).x)) + position.y = int(round(world_to_board_space(position).y)) + position = board_to_world_space(position) + # Check if left click is being clicked and the sprite is visible (i.e only checks for inputs after ship positions are confirmed) + elif event is InputEventMouseButton and event.button_index == BUTTON_LEFT and visible == true: + # Unlocks the position of the crosshair with left click + snapped = false + +func validate_position(vector): + # rounds the board position to the nearest integer + var board = world_to_board_space(vector) + # Checks if the board position is within bounds of the board + if board.x < 9.5 and board.x >= -0.5 and board.y < 9.5 and board.y >= -0.5: + # changes the position of the crosshair + return true + else: + # unlocks the crosshair if not within bounds + return false + +# Convert the world-space coordinates to positions on the board +func world_to_board_space(vector): + # Do math + var res = (vector - world_offset) / 32 # Basically Fahrenheit/Celcius conversion, but in 2D + return res + +# Inverse of the above function. +func board_to_world_space(vector): + # Do math + var res = (vector * 32) + world_offset #Invert the above function + return res #Truncate decimals diff --git a/godot_ship/script/game/Gameplay/Fire.gd b/godot_ship/script/game/Gameplay/Fire.gd new file mode 100644 index 0000000..8ad90f4 --- /dev/null +++ b/godot_ship/script/game/Gameplay/Fire.gd @@ -0,0 +1,30 @@ +extends Control + +# Called when the node enters the scene tree for the first time. +func _ready(): + pass # Replace with function body. + +# Signal to pass the fire location back to yet-unknown nodes +signal fire_at + + +func _on_Fire_pressed(): + var crosshair = get_node("Crosshair") + # hides crosshair + crosshair.visible = false + if crosshair.validate_position(crosshair.position) == true: + var crosshair_pos = crosshair.world_to_board_space(crosshair.position) + # fires at position + print("Fire at position: ", crosshair_pos) + emit_signal("fire_at", crosshair_pos) + # Close the Firing menu + queue_free() + else: + #if invalid position popup appears + var dialog = get_node("FireDialog") + dialog.popup_centered() + pass # Replace with function body. + +func _on_FireDialog_confirmed(): + get_node("Crosshair").visible = true + pass # Replace with function body. diff --git a/godot_ship/script/game/Gameplay/Game.gd b/godot_ship/script/game/Gameplay/Game.gd new file mode 100644 index 0000000..9507d43 --- /dev/null +++ b/godot_ship/script/game/Gameplay/Game.gd @@ -0,0 +1,75 @@ +extends Node + +class ShipData: + var Coor: Vector2 + var Length: int + var Orientation: bool #vertical is true, (Trueship = vertical) (Falseship = horizontal) + +# Preloaded assets, to be used later +# TODO: Move Setup into the Player. It's just here, for now, so that it can be tested and the game doesn't appear broken +onready var Setup = preload("res://scenes/Game/Setup.tscn") +# TODO: Move Fire into the Player. See above. +onready var Fire = preload("res://scenes/Game/Fire.tscn") + +# Path to Player class, for instantiating new Players in code +onready var Player = preload("res://scenes/Game/Player.tscn") + +onready var Victory = preload("res://scenes/Game/Victory.tscn") + + +# Array of instances of the Player class; stores the Players +var players # = player1, player2, ... +# turn counter +var turn = 0 +# Variable transporting hit state between players +var hit = false +# Variable tracking whether a game is multiplayer (so that the correct Player type can be spawned) +# TODO: Multiplayer +var is_multiplayer = false + +# Called when the node enters the scene tree for the first time. +func _ready(): + # TODO: Move Setup into the Player. + var setup = Setup.instance() + setup.connect("game_ready", self, "game_setup") + add_child(setup) + + get_node("ConfirmationDialog").get_ok().text = "Yes" + get_node("ConfirmationDialog").get_cancel().text = "No" + +# TODO: Move Setup into the Player. +func game_setup(_ships): + print_debug("Congrats! Setup complete.") + # TODO: Move Fire into the Player. + add_child(Fire.instance()) + +# Member functions: +# game_start: starts the game +func game_start(): + pass + +# 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(): + AudioBus.emit_signal("button_clicked") + get_node("ConfirmationDialog").popup() + +func end(): + queue_free() + +func _on_Button_button_down(): + AudioBus.emit_signal("button_clicked") + var victory = Victory.instance() + add_child(victory) + victory.connect("exit_main", self, "end") + +func _on_ConfirmationDialog_confirmed(): + end() diff --git a/godot_ship/script/game/Gameplay/Player.gd b/godot_ship/script/game/Gameplay/Player.gd new file mode 100644 index 0000000..ca89ece --- /dev/null +++ b/godot_ship/script/game/Gameplay/Player.gd @@ -0,0 +1,55 @@ +extends Node + +# Path to Board class, for instantiating new Boards in code +var Board = "res://script/game/Gameplay/Board.gd" + +# Player ID of this player +var pid +# board (an instance of the Board class) +onready var board = Board.new() + +# Called when the node enters the scene tree for the first time. +func _ready(): + pass # Replace with function body. + +# Member functions: +# hit: Called when opponent fires on us. +# Update internal state, and return bool hit/miss +func hit(): + pass + +# place_ship: called when ships are placed. +# forwards Ship locations to the Board, so that it may construct a ship +# ship: a list of ship properties {position, orientation, size} +func place_ship(_ship): + pass + +# setUp: set up the board given the placed ship locations +# translates the ship positions in the Setup UI to board-space, then places each ship +# ships: a list of lists of ship properties {{position, orientation, size}, ...} +func set_up(_ships): + pass + +# turnStart: start player's turn +# Initiates the player's turn, and blocks until the player selects a location to fire upon +# returns: fire = [player id, target coordinates] +func turnStart(): + var player_id = 0 + var target = Vector2(0,0) + return [player_id, target] + pass + +# getBoard: returns the player's board +# returns: board +func getBoard(): + return board + +# forfeit: ends game for player +# Sinks all ships +func forfeit(): + pass + +# getShipCount: get the number of ships the player has left alive +func getShipCount(): + pass + diff --git a/godot_ship/script/game/Gameplay/Ship.gd b/godot_ship/script/game/Gameplay/Ship.gd new file mode 100644 index 0000000..c6df16d --- /dev/null +++ b/godot_ship/script/game/Gameplay/Ship.gd @@ -0,0 +1,55 @@ +extends Node + +# This is the rendered element of a "ship", generated when the game transitions from the placing state to the gameplay state + +# Enum denoting the orientation (X is 1, Y is 0) +enum Orientation {X = 1, Y = 0} + +# Size of ship in board units +var size +# Coordinates of ship's center. Ship extends [-(size-1 >> 1), (size/2 >> 1)] +var position +# Variable storing whether the ship is sunk, for rendering purposes +var sunk = false +# Orientation of the ship (see enum Orientation) +var orientation = Orientation.Y + +# Ship sprite metadata +# sprite: the texture atlas containing all ship parts +var atlas # = TODO: figure out how to use one sprite for multiple textures +# texture: the offset into the texture atlas of the first part of the ship. +var texture = 0 + +# Called when the node enters the scene tree for the first time. +func _ready(): + pass # Replace with function body. + +# member functions: +# getSize: get the size of the ship, in board-units (2 for 2-ship, 3 for 3-ship, ...) +func getSize(): + return size + +# getPosition: get the position of the ship's center, in board units +func getPosition(): + return position + +# getOrientation: get the orientation of the ship (see enum Orientation) +func getOrientation(): + return orientation + +# getSunk: get whether the ship is sunk +func getSunk(): + return sunk + +# setSunk: sink the ship +func setSunk(): + sunk = true + +# _init: called on object initialization. Accepts args if called via .new(...) +# in_position: position of the ship, in board-coordinates; (0,0) by default +# in_size: size of the ship, in board-units; 2 by default +# in_orientation: orientation of the ship (see enum Orientation); vertical by default +func _init(in_position = Vector2(0,0), in_size = 2, in_orientation = Orientation.Y): + position = in_position + size = in_size + orientation = in_orientation diff --git a/godot_ship/script/game/Setup.gd b/godot_ship/script/game/Setup.gd new file mode 100644 index 0000000..4493c9f --- /dev/null +++ b/godot_ship/script/game/Setup.gd @@ -0,0 +1,55 @@ +extends Control + +signal game_ready + +onready var Ships = ["2Ship", "3ShipA", "3ShipB", "4Ship", "5Ship"] + +onready var Victory = preload("res://scenes/Game/Player.tscn") + +class ShipData: + var Position: Vector2 + var Length: int + var Orientation: bool # (True = vertical) (False = horizontal) + +# Called when the node enters the scene tree for the first time. +func _ready(): + # Moves the focus to this menu + if find_next_valid_focus(): find_next_valid_focus().grab_focus() + + +func _on_Confirm_Placement_pressed(): + # Make the button noise + AudioBus.emit_signal("button_clicked") + var valid = true + for ship in Ships: + # validate_placement returns the x-axis distance from the board + # if this is more than zero, the ship is invalid + if get_node(ship).validate_placement(): + valid = false + print ("Placement: ", valid) + if valid == false: + get_node("PlaceShipDialog").popup() + else: + #Saves the location of ships and length of ship into an array + var shipLocation = [] + for ship in Ships: + var location = ShipData.new() + location.Position = get_node(ship).position + location.Length = get_node(ship).get("ship_length") + location.Orientation = get_node(ship).get("vertical") + shipLocation.append(location) + + #print out the array for testing + for x in shipLocation: + print("Ship Length: ", x.Length, ", Ship Orientation: ", x.Orientation, ", Ship Position: ", x.Position) + + # Return the shipLocation array to those listening on game_ready + emit_signal("game_ready", shipLocation) + queue_free() + return valid # Replace with function body. + +func _on_Clear_pressed(): + AudioBus.emit_signal("button_clicked") + for ship in Ships: + get_node(ship).clear() + pass # Replace with function body. diff --git a/godot_ship/script/game/moveShip.gd b/godot_ship/script/game/SetupShip.gd similarity index 80% rename from godot_ship/script/game/moveShip.gd rename to godot_ship/script/game/SetupShip.gd index 74c2fe6..6d923a2 100644 --- a/godot_ship/script/game/moveShip.gd +++ b/godot_ship/script/game/SetupShip.gd @@ -2,21 +2,24 @@ extends RigidBody2D var held = false -var originalPos -var snapOriginalPos = false -var mousePos -var vertical = true -var startingPos +var originalPos # Position before moving the ship +var snapOriginalPos = false # Gets the original position +var mousePos # Stores the last known mouse position so the physics engine can use it +var vertical = true # Gets ship which is either vertical or horizonal +var startingPos # Starting position of ships before being placed # Ships are all named starting with their length, # So we cast from string to int, on the ship name, and get the length onready var ship_length = int(name) +# This is set when we're colliding with something var collision = false # Called when the node enters the scene tree for the first time. func _ready(): mode = MODE_KINEMATIC + contacts_reported = 64 + set_use_custom_integrator(true) # Snap the ships to the grid, so the engine won't get mad when they're moved away from the starting position every frame position = (position - offset).snapped(Vector2(32, 32)) + offset startingPos = position @@ -42,10 +45,8 @@ func _input(event): var bs_position = world_to_board_space(position) # Check whether the piece is within half a board-space of the grid (-0.5, 9.5) if not (bs_position.x > -0.5 and bs_position.x < 9.5 and bs_position.y > -0.5 and bs_position.y < 9.5): -# if not (position.x > 17.4 and position.x < 335.5) and (position.y > 20.2 and position.y < 335.5): if originalPos != null: collision = true - rotation = 0 vertical = true if event is InputEventMouseMotion and held: @@ -56,21 +57,16 @@ func _input(event): mousePos = event.position; if event.is_action_pressed("ui_rotate"): - if held: - return - if checkOriginalPos(): - return - else: - AudioBus.emit_signal("button_clicked") - if originalPos == null: - if position == originalPos: - return - elif(event.position - position).length() < click_radius: + if not held and not checkOriginalPos(): + if(event.position - position).length() < click_radius: + #Play a sound + AudioBus.emit_signal("button_clicked") # Rotation has been moved to _physics_process, # as per recommendation of godot_engine.org - #rotation = (-PI/2) vertical = not vertical - + # It takes 3 physics ticks for the rotation to update the hitboxes + # Determined imperically through testing, may work differently on different machines(?) + released = 3 # Offset from the corner of the screen to the corner of the board const offset = Vector2(36, 36) @@ -88,21 +84,17 @@ func _physics_process(_delta): # calculate whether the piece has been rotated or moved var rotated = prev_vertical != vertical var moved = prev_position != position - + # If the piece is held, move it to the mouse: if held and mousePos and mousePos != position: position = mousePos mousePos = null - + # Snap it to the grid if not held (and previously moved) if not held and moved: position = (position - offset).snapped(Vector2(32, 32)) + offset prev_position = position - - # Check collisions after released, reset if colliding - if collision and released: - position = startingPos - + # If it's been moved or rotated, snap it to the board if released or rotated: # check whether the ends of the piece are within the board @@ -114,12 +106,18 @@ func _physics_process(_delta): else: position += 32 * Vector2(linear_move, 0) pass - + + # Check collisions after released, reset if colliding + if collision and released: + position = startingPos + rotation = 0 + vertical = true + # Rotate if the piece needs to be rotated if rotated: prev_vertical = vertical rotation = -PI/2 * int(not vertical) # int(true) == 1, int(false) == 0 - + # Count down the number of physics timesteps left until the piece can stop processing if released > 0: released = released - 1 @@ -152,29 +150,36 @@ func ship_unstacked(_body): # Returns how many squares to move the ship along its orientation axis (positive or negative) func check_extents(center, orientation, length): center = world_to_board_space(center) # Convert to board-space (0-10) - print("Center: ", center) # Calculate the position of the front of the ship # Orientation is true when the ship is vertical var bow = vectorget(center, orientation) - floor((length - 1) / 2) - print("Bow: ", bow) # if out of bounds, return how much to move the ship by if bow < 0: - print("return: ", -bow) return -bow # Calculate the position of the rear of the ship var stern = vectorget(center, orientation) + floor(length / 2) - print("Stern: ", stern) # If out of bounds, return how much to move the ship by if stern >= 10: - print("return: ", -(stern - 9)) return -(stern - 9) - print("return: ", 0) return 0 +func validate_placement(): + # Checks whether the ship's center is on the board. + # As long as the ship was moved according to the rules defined in the + # _physics_process function, this should be necessary and sufficient + # to say the ship is on the board + return check_extents(position, false, 1) + +func clear(): + # ships return home on collision + # simulate a collision + collision = true + released = 1 + # Convert the world-space coordinates to positions on the board func world_to_board_space(vector): # Do math - var res = (vector - offset) / 32 # Subtract the distance between the screen corner and square (0,0) + var res = (vector - offset) / 32 # Basically Fahrenheit/Celcius conversion, but in 2D return res # Inverse of the above function. diff --git a/godot_ship/script/game/Victory.gd b/godot_ship/script/game/Victory.gd new file mode 100644 index 0000000..1e715f5 --- /dev/null +++ b/godot_ship/script/game/Victory.gd @@ -0,0 +1,30 @@ +extends Control + +signal exit_main +# Declare member variables here. Examples: +# var a = 2 +# var b = "text" + + +# Called when the node enters the scene tree for the first time. +func _ready(): + pass # Replace with function body. + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +#func _process(delta): +# pass + + +# returns player(s) back to main menu +func _on_Button_pressed(): + AudioBus.emit_signal("button_clicked") + #MessageBus.emit_signal("change_scene", "Title") + emit_signal("exit_main") + + +func _on_restart_button_down(): + AudioBus.emit_signal("button_clicked") + #MessageBus.emit_signal("change_scene", "Multiplayer") + pass # Replace with function body. + diff --git a/godot_ship/script/game/multiplayer/Multiplayer Controller.gd b/godot_ship/script/game/multiplayer/Multiplayer Controller.gd deleted file mode 100644 index 1eccaec..0000000 --- a/godot_ship/script/game/multiplayer/Multiplayer Controller.gd +++ /dev/null @@ -1,16 +0,0 @@ -extends Node - - -# Declare member variables here. Examples: -# var a = 2 -# var b = "text" - - -# Called when the node enters the scene tree for the first time. -func _ready(): - pass # Replace with function body. - - -# Called every frame. 'delta' is the elapsed time since the previous frame. -#func _process(delta): -# pass diff --git a/godot_ship/script/options/Option-Background.png.import b/godot_ship/script/options/Option-Background.png.import deleted file mode 100644 index 5e1dc21..0000000 --- a/godot_ship/script/options/Option-Background.png.import +++ /dev/null @@ -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=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 diff --git a/godot_ship/script/options/Options.gd b/godot_ship/script/options/Options.gd index 09e1bf9..d4e927b 100644 --- a/godot_ship/script/options/Options.gd +++ b/godot_ship/script/options/Options.gd @@ -10,9 +10,9 @@ onready var theme_buttons = find_node("Buttons", true, true).get_children() func _ready(): OptionsController.load_options() find_next_valid_focus().grab_focus() - master_slider.value = OptionsController.get_mas_volume() - music_slider.value = OptionsController.get_mus_volume() - sound_slider.value = OptionsController.get_sfx_volume() + master_slider.value = db2linear(OptionsController.get_mas_volume()) + music_slider.value = db2linear(OptionsController.get_mus_volume()) + sound_slider.value = db2linear(OptionsController.get_sfx_volume()) func _on_Button_pressed(): AudioBus.emit_signal("button_clicked") @@ -20,14 +20,17 @@ func _on_Button_pressed(): #MessageBus.emit_signal("change_scene", "Title") func _on_Master_Slider_value_changed(value): + value = linear2db(value) AudioBus.emit_signal("button_clicked") OptionsController.set_vol(value, "mas_vol") func _on_Music_Slider_value_changed(value): + value = linear2db(value) AudioBus.emit_signal("button_clicked") OptionsController.set_vol(value, "mus_vol") func _on_SFX_Slider_value_changed(value): + value = linear2db(value) AudioBus.emit_signal("button_clicked") OptionsController.set_vol(value, "sfx_vol") diff --git a/godot_ship/script/options/OptionsController.gd b/godot_ship/script/options/OptionsController.gd index ebc92b2..eaefae4 100644 --- a/godot_ship/script/options/OptionsController.gd +++ b/godot_ship/script/options/OptionsController.gd @@ -8,9 +8,9 @@ signal change_theme (theme) var f = File.new() var options_file = "user://options.save" var theme = "dark" -var mas_vol = 0 -var mus_vol = 0 -var sfx_vol = 0 +var mas_vol = linear2db(1) +var mus_vol = linear2db(1) +var sfx_vol = linear2db(1) func _ready(): load_options() @@ -23,6 +23,7 @@ func set_theme(theme_name): save_options() emit_signal("change_theme", theme) save_options() + func set_vol(volume, type): if type == "mas_vol": mas_vol = volume @@ -61,7 +62,7 @@ func load_options(): mus_vol = f.get_var() sfx_vol = f.get_var() f.close() - AudioServer.set_bus_volume_db(AudioServer.get_bus_index("Master"), mus_vol) + AudioServer.set_bus_volume_db(AudioServer.get_bus_index("Master"), mas_vol) AudioServer.set_bus_volume_db(AudioServer.get_bus_index("BGM"), mus_vol) AudioServer.set_bus_volume_db(AudioServer.get_bus_index("SFX"), sfx_vol) diff --git a/godot_ship/script/title screen/Title-Screen-Background.png b/godot_ship/script/title screen/Title-Screen-Background.png deleted file mode 100644 index 830ec9b..0000000 Binary files a/godot_ship/script/title screen/Title-Screen-Background.png and /dev/null differ diff --git a/godot_ship/script/title screen/Title-Screen-Background.png.import b/godot_ship/script/title screen/Title-Screen-Background.png.import deleted file mode 100644 index 2fb52fc..0000000 --- a/godot_ship/script/title screen/Title-Screen-Background.png.import +++ /dev/null @@ -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=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