diff --git a/Assets/Buttons/ERROR.png b/Assets/Buttons/ERROR.png deleted file mode 100644 index 2822d4d..0000000 Binary files a/Assets/Buttons/ERROR.png and /dev/null differ diff --git a/Assets/Buttons/FORBIDDEN.png b/Assets/Buttons/FORBIDDEN.png deleted file mode 100644 index d6c2185..0000000 Binary files a/Assets/Buttons/FORBIDDEN.png and /dev/null differ diff --git a/Assets/Buttons/FullPressed.png b/Assets/Buttons/FullPressed.png deleted file mode 100644 index 1f4fab9..0000000 Binary files a/Assets/Buttons/FullPressed.png and /dev/null differ diff --git a/Assets/Buttons/FullPressed.png.import b/Assets/Buttons/FullPressed.png.import deleted file mode 100644 index d309217..0000000 --- a/Assets/Buttons/FullPressed.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://4c7qtuk0exng" -path="res://.godot/imported/FullPressed.png-c0a1078a7a0d22d30101653763c94f71.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Assets/Buttons/FullPressed.png" -dest_files=["res://.godot/imported/FullPressed.png-c0a1078a7a0d22d30101653763c94f71.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/Assets/Buttons/IMG_3393.png b/Assets/Buttons/IMG_3393.png new file mode 100644 index 0000000..5e8460e Binary files /dev/null and b/Assets/Buttons/IMG_3393.png differ diff --git a/Assets/Buttons/FORBIDDEN.png.import b/Assets/Buttons/IMG_3393.png.import similarity index 68% rename from Assets/Buttons/FORBIDDEN.png.import rename to Assets/Buttons/IMG_3393.png.import index 8934402..a300128 100644 --- a/Assets/Buttons/FORBIDDEN.png.import +++ b/Assets/Buttons/IMG_3393.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://chckt1ppwsjq" -path="res://.godot/imported/FORBIDDEN.png-ab7de870cf2ea37485fe159e85cf294e.ctex" +uid="uid://cdilvc7bopjtg" +path="res://.godot/imported/IMG_3393.png-f0c33a8190f4b3de99ad066a22646418.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Assets/Buttons/FORBIDDEN.png" -dest_files=["res://.godot/imported/FORBIDDEN.png-ab7de870cf2ea37485fe159e85cf294e.ctex"] +source_file="res://Assets/Buttons/IMG_3393.png" +dest_files=["res://.godot/imported/IMG_3393.png-f0c33a8190f4b3de99ad066a22646418.ctex"] [params] diff --git a/Assets/Buttons/IMG_3394.png b/Assets/Buttons/IMG_3394.png new file mode 100644 index 0000000..c8bfad6 Binary files /dev/null and b/Assets/Buttons/IMG_3394.png differ diff --git a/Assets/Buttons/PressedOut.png.import b/Assets/Buttons/IMG_3394.png.import similarity index 68% rename from Assets/Buttons/PressedOut.png.import rename to Assets/Buttons/IMG_3394.png.import index b26313b..291475e 100644 --- a/Assets/Buttons/PressedOut.png.import +++ b/Assets/Buttons/IMG_3394.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://ncd65m8iq7l0" -path="res://.godot/imported/PressedOut.png-fafb11808cd442da9cd321af11d67ce1.ctex" +uid="uid://cmnangp78o1y6" +path="res://.godot/imported/IMG_3394.png-bbd158f849afed83a24493111b1f81a5.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Assets/Buttons/PressedOut.png" -dest_files=["res://.godot/imported/PressedOut.png-fafb11808cd442da9cd321af11d67ce1.ctex"] +source_file="res://Assets/Buttons/IMG_3394.png" +dest_files=["res://.godot/imported/IMG_3394.png-bbd158f849afed83a24493111b1f81a5.ctex"] [params] diff --git a/Assets/Buttons/IMG_3395.png b/Assets/Buttons/IMG_3395.png new file mode 100644 index 0000000..ca6dcd5 Binary files /dev/null and b/Assets/Buttons/IMG_3395.png differ diff --git a/Assets/Buttons/IMG_3395.png.import b/Assets/Buttons/IMG_3395.png.import new file mode 100644 index 0000000..24bf0cd --- /dev/null +++ b/Assets/Buttons/IMG_3395.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://e40ep7k06vl7" +path="res://.godot/imported/IMG_3395.png-444125b1e8a2dd612897e8bc6d2b3513.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Buttons/IMG_3395.png" +dest_files=["res://.godot/imported/IMG_3395.png-444125b1e8a2dd612897e8bc6d2b3513.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/Buttons/IMG_3396.png b/Assets/Buttons/IMG_3396.png new file mode 100644 index 0000000..dabe0cb Binary files /dev/null and b/Assets/Buttons/IMG_3396.png differ diff --git a/Assets/Buttons/IMG_3396.png.import b/Assets/Buttons/IMG_3396.png.import new file mode 100644 index 0000000..ce59ff7 --- /dev/null +++ b/Assets/Buttons/IMG_3396.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://kuecxipho1se" +path="res://.godot/imported/IMG_3396.png-4d775e3003c4ae3fa0c9eac9f2441ec3.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Buttons/IMG_3396.png" +dest_files=["res://.godot/imported/IMG_3396.png-4d775e3003c4ae3fa0c9eac9f2441ec3.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/Buttons/IMG_3397.png b/Assets/Buttons/IMG_3397.png new file mode 100644 index 0000000..196e8c4 Binary files /dev/null and b/Assets/Buttons/IMG_3397.png differ diff --git a/Assets/Buttons/IMG_3397.png.import b/Assets/Buttons/IMG_3397.png.import new file mode 100644 index 0000000..56d70a7 --- /dev/null +++ b/Assets/Buttons/IMG_3397.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dshw20av8uo6g" +path="res://.godot/imported/IMG_3397.png-79e801120ad476720161e50730ef597c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Buttons/IMG_3397.png" +dest_files=["res://.godot/imported/IMG_3397.png-79e801120ad476720161e50730ef597c.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/Buttons/IMG_3398.png b/Assets/Buttons/IMG_3398.png new file mode 100644 index 0000000..ac8616c Binary files /dev/null and b/Assets/Buttons/IMG_3398.png differ diff --git a/Assets/Buttons/IMG_3398.png.import b/Assets/Buttons/IMG_3398.png.import new file mode 100644 index 0000000..44245aa --- /dev/null +++ b/Assets/Buttons/IMG_3398.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://3grkr8f86mj8" +path="res://.godot/imported/IMG_3398.png-43bad40ec1930ac19e3c9df00f74b8e2.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Buttons/IMG_3398.png" +dest_files=["res://.godot/imported/IMG_3398.png-43bad40ec1930ac19e3c9df00f74b8e2.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/Buttons/IMG_3399.png b/Assets/Buttons/IMG_3399.png new file mode 100644 index 0000000..e60c59b Binary files /dev/null and b/Assets/Buttons/IMG_3399.png differ diff --git a/Assets/Buttons/IMG_3399.png.import b/Assets/Buttons/IMG_3399.png.import new file mode 100644 index 0000000..b8ac577 --- /dev/null +++ b/Assets/Buttons/IMG_3399.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dodrl2mwvvqu0" +path="res://.godot/imported/IMG_3399.png-34ed4d8fb61fcb22f923ed4a9309240d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Buttons/IMG_3399.png" +dest_files=["res://.godot/imported/IMG_3399.png-34ed4d8fb61fcb22f923ed4a9309240d.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/Buttons/IMG_3400.png b/Assets/Buttons/IMG_3400.png new file mode 100644 index 0000000..dc2ad11 Binary files /dev/null and b/Assets/Buttons/IMG_3400.png differ diff --git a/Assets/Buttons/IMG_3400.png.import b/Assets/Buttons/IMG_3400.png.import new file mode 100644 index 0000000..efb2c9b --- /dev/null +++ b/Assets/Buttons/IMG_3400.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c3j2yppa4csis" +path="res://.godot/imported/IMG_3400.png-df69585a7d099302b9f27724f9763cdc.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Buttons/IMG_3400.png" +dest_files=["res://.godot/imported/IMG_3400.png-df69585a7d099302b9f27724f9763cdc.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/Buttons/IMG_3401.png b/Assets/Buttons/IMG_3401.png new file mode 100644 index 0000000..795a0ff Binary files /dev/null and b/Assets/Buttons/IMG_3401.png differ diff --git a/Assets/Buttons/IMG_3401.png.import b/Assets/Buttons/IMG_3401.png.import new file mode 100644 index 0000000..2bed8e0 --- /dev/null +++ b/Assets/Buttons/IMG_3401.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://hur5m2o1l686" +path="res://.godot/imported/IMG_3401.png-74a3a2280ff7ab850ce8dfa870bb7be4.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Buttons/IMG_3401.png" +dest_files=["res://.godot/imported/IMG_3401.png-74a3a2280ff7ab850ce8dfa870bb7be4.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/Buttons/IMG_3402.png b/Assets/Buttons/IMG_3402.png new file mode 100644 index 0000000..14fa1c5 Binary files /dev/null and b/Assets/Buttons/IMG_3402.png differ diff --git a/Assets/Buttons/IMG_3402.png.import b/Assets/Buttons/IMG_3402.png.import new file mode 100644 index 0000000..04cc376 --- /dev/null +++ b/Assets/Buttons/IMG_3402.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cqmf1i4v81bl6" +path="res://.godot/imported/IMG_3402.png-f92ca87fcc60e08496027b463e8c21d1.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Buttons/IMG_3402.png" +dest_files=["res://.godot/imported/IMG_3402.png-f92ca87fcc60e08496027b463e8c21d1.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/Buttons/IMG_3403.png b/Assets/Buttons/IMG_3403.png new file mode 100644 index 0000000..38aeefd Binary files /dev/null and b/Assets/Buttons/IMG_3403.png differ diff --git a/Assets/Buttons/IMG_3403.png.import b/Assets/Buttons/IMG_3403.png.import new file mode 100644 index 0000000..d8c2bb8 --- /dev/null +++ b/Assets/Buttons/IMG_3403.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://8ce1ggql35ki" +path="res://.godot/imported/IMG_3403.png-a780e38e297e5e2c3d232e722654960c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Buttons/IMG_3403.png" +dest_files=["res://.godot/imported/IMG_3403.png-a780e38e297e5e2c3d232e722654960c.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/Buttons/Idle.png b/Assets/Buttons/Idle.png deleted file mode 100644 index 1219c5b..0000000 Binary files a/Assets/Buttons/Idle.png and /dev/null differ diff --git a/Assets/Buttons/PressedIn1.png b/Assets/Buttons/PressedIn1.png deleted file mode 100644 index 4fd0d81..0000000 Binary files a/Assets/Buttons/PressedIn1.png and /dev/null differ diff --git a/Assets/Buttons/PressedIn1.png.import b/Assets/Buttons/PressedIn1.png.import deleted file mode 100644 index 18ea72f..0000000 --- a/Assets/Buttons/PressedIn1.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://blatwufdrwqml" -path="res://.godot/imported/PressedIn1.png-8136f4e114c56d7ef74e3cd563202045.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Assets/Buttons/PressedIn1.png" -dest_files=["res://.godot/imported/PressedIn1.png-8136f4e114c56d7ef74e3cd563202045.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/Assets/Buttons/PressedOut.png b/Assets/Buttons/PressedOut.png deleted file mode 100644 index af330cb..0000000 Binary files a/Assets/Buttons/PressedOut.png and /dev/null differ diff --git a/Assets/Explosion/IMG_3416.png b/Assets/Explosion/IMG_3416.png new file mode 100644 index 0000000..ebdfc4f Binary files /dev/null and b/Assets/Explosion/IMG_3416.png differ diff --git a/Assets/Explosion/IMG_3416.png.import b/Assets/Explosion/IMG_3416.png.import new file mode 100644 index 0000000..8b9e0a4 --- /dev/null +++ b/Assets/Explosion/IMG_3416.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://iujiv0je2v1i" +path="res://.godot/imported/IMG_3416.png-d5e3248f0d38b3837e801492cfd44893.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Explosion/IMG_3416.png" +dest_files=["res://.godot/imported/IMG_3416.png-d5e3248f0d38b3837e801492cfd44893.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/Explosion/IMG_3417.png b/Assets/Explosion/IMG_3417.png new file mode 100644 index 0000000..f604fcd Binary files /dev/null and b/Assets/Explosion/IMG_3417.png differ diff --git a/Assets/Explosion/IMG_3417.png.import b/Assets/Explosion/IMG_3417.png.import new file mode 100644 index 0000000..84aeaaa --- /dev/null +++ b/Assets/Explosion/IMG_3417.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ba0lrop3un1m5" +path="res://.godot/imported/IMG_3417.png-b0fa531c187bc53f3d8414a41c6ae7ec.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Explosion/IMG_3417.png" +dest_files=["res://.godot/imported/IMG_3417.png-b0fa531c187bc53f3d8414a41c6ae7ec.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/Explosion/IMG_3418.png b/Assets/Explosion/IMG_3418.png new file mode 100644 index 0000000..11ae53d Binary files /dev/null and b/Assets/Explosion/IMG_3418.png differ diff --git a/Assets/Explosion/IMG_3418.png.import b/Assets/Explosion/IMG_3418.png.import new file mode 100644 index 0000000..d58648a --- /dev/null +++ b/Assets/Explosion/IMG_3418.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b6vg8rn1eiako" +path="res://.godot/imported/IMG_3418.png-b6e4b7d7fff3dc70deb8ac774547b589.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Explosion/IMG_3418.png" +dest_files=["res://.godot/imported/IMG_3418.png-b6e4b7d7fff3dc70deb8ac774547b589.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/Explosion/IMG_3419.png b/Assets/Explosion/IMG_3419.png new file mode 100644 index 0000000..cec9f79 Binary files /dev/null and b/Assets/Explosion/IMG_3419.png differ diff --git a/Assets/Explosion/IMG_3419.png.import b/Assets/Explosion/IMG_3419.png.import new file mode 100644 index 0000000..d16a465 --- /dev/null +++ b/Assets/Explosion/IMG_3419.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bf4eob20ngfhc" +path="res://.godot/imported/IMG_3419.png-2d1e14b71ec9dd9e6e4e05aa4b07a31c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Explosion/IMG_3419.png" +dest_files=["res://.godot/imported/IMG_3419.png-2d1e14b71ec9dd9e6e4e05aa4b07a31c.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/Worm/1.png b/Assets/Worm/1.png index ec18014..11d8394 100644 Binary files a/Assets/Worm/1.png and b/Assets/Worm/1.png differ diff --git a/Assets/Worm/1.png.import b/Assets/Worm/1.png.import index 8a8b862..9de1f62 100644 --- a/Assets/Worm/1.png.import +++ b/Assets/Worm/1.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bjb6konwfdwma" +uid="uid://cex3sifrw1242" path="res://.godot/imported/1.png-d59e84433910eecfa2e5220e6ec5b5b4.ctex" metadata={ "vram_texture": false diff --git a/Assets/Worm/2.png b/Assets/Worm/2.png index 5f163a7..d08d19f 100644 Binary files a/Assets/Worm/2.png and b/Assets/Worm/2.png differ diff --git a/Assets/Worm/2.png.import b/Assets/Worm/2.png.import index 44313fc..7c0a69f 100644 --- a/Assets/Worm/2.png.import +++ b/Assets/Worm/2.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cowon23pejcb6" +uid="uid://dactqej8ynl64" path="res://.godot/imported/2.png-90fe91be8b8400834bfb6934ea879095.ctex" metadata={ "vram_texture": false diff --git a/Assets/Worm/2_back.png b/Assets/Worm/2_back.png new file mode 100644 index 0000000..c0f32a0 Binary files /dev/null and b/Assets/Worm/2_back.png differ diff --git a/Assets/Buttons/ERROR.png.import b/Assets/Worm/2_back.png.import similarity index 69% rename from Assets/Buttons/ERROR.png.import rename to Assets/Worm/2_back.png.import index 8e57fa3..8521bfa 100644 --- a/Assets/Buttons/ERROR.png.import +++ b/Assets/Worm/2_back.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cw6je7hakttbq" -path="res://.godot/imported/ERROR.png-bb4a153740a394e385a559c916c4984d.ctex" +uid="uid://du2p38ha0txko" +path="res://.godot/imported/2_back.png-3187bb12b4389cf6fd41b2527191b374.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Assets/Buttons/ERROR.png" -dest_files=["res://.godot/imported/ERROR.png-bb4a153740a394e385a559c916c4984d.ctex"] +source_file="res://Assets/Worm/2_back.png" +dest_files=["res://.godot/imported/2_back.png-3187bb12b4389cf6fd41b2527191b374.ctex"] [params] diff --git a/Assets/Worm/2_back_alt.png b/Assets/Worm/2_back_alt.png new file mode 100644 index 0000000..ef4e7d2 Binary files /dev/null and b/Assets/Worm/2_back_alt.png differ diff --git a/Assets/Worm/2_back_alt.png.import b/Assets/Worm/2_back_alt.png.import new file mode 100644 index 0000000..3fff285 --- /dev/null +++ b/Assets/Worm/2_back_alt.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dnwrxihviw0rk" +path="res://.godot/imported/2_back_alt.png-d0b57c264335334246eda32eb04267fb.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Worm/2_back_alt.png" +dest_files=["res://.godot/imported/2_back_alt.png-d0b57c264335334246eda32eb04267fb.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/Worm/3.png b/Assets/Worm/3.png index 6764987..f8e8136 100644 Binary files a/Assets/Worm/3.png and b/Assets/Worm/3.png differ diff --git a/Assets/Worm/3.png.import b/Assets/Worm/3.png.import index 55a8c99..5ae5d32 100644 --- a/Assets/Worm/3.png.import +++ b/Assets/Worm/3.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dl0wp6buga4d" +uid="uid://cux4bd7fifyd6" path="res://.godot/imported/3.png-0463e07c1bea2f543f4c3653457283e4.ctex" metadata={ "vram_texture": false diff --git a/Assets/Worm/3_back.png b/Assets/Worm/3_back.png new file mode 100644 index 0000000..2d9034a Binary files /dev/null and b/Assets/Worm/3_back.png differ diff --git a/Assets/Worm/3_back.png.import b/Assets/Worm/3_back.png.import new file mode 100644 index 0000000..1bbc4f4 --- /dev/null +++ b/Assets/Worm/3_back.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://brf7f6oxfgebt" +path="res://.godot/imported/3_back.png-298e1f50645b0469f25966ffdd1b3be6.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Worm/3_back.png" +dest_files=["res://.godot/imported/3_back.png-298e1f50645b0469f25966ffdd1b3be6.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/Worm/4.png b/Assets/Worm/4.png index 9ec145e..2d05408 100644 Binary files a/Assets/Worm/4.png and b/Assets/Worm/4.png differ diff --git a/Assets/Worm/4.png.import b/Assets/Worm/4.png.import index 91b58f9..8f5b4cf 100644 --- a/Assets/Worm/4.png.import +++ b/Assets/Worm/4.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://c6cj6t3538iox" +uid="uid://72t1c28fr2nl" path="res://.godot/imported/4.png-4b049625170874896147063dd9a56363.ctex" metadata={ "vram_texture": false diff --git a/Assets/Worm/4_back.png b/Assets/Worm/4_back.png new file mode 100644 index 0000000..1907669 Binary files /dev/null and b/Assets/Worm/4_back.png differ diff --git a/Assets/Worm/4_back.png.import b/Assets/Worm/4_back.png.import new file mode 100644 index 0000000..e60a985 --- /dev/null +++ b/Assets/Worm/4_back.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://uwspas3u4wv1" +path="res://.godot/imported/4_back.png-56d75c81d9d5833f2eed9100307c6967.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Worm/4_back.png" +dest_files=["res://.godot/imported/4_back.png-56d75c81d9d5833f2eed9100307c6967.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/Worm/5.png b/Assets/Worm/5.png new file mode 100644 index 0000000..f5bb6f0 Binary files /dev/null and b/Assets/Worm/5.png differ diff --git a/Assets/Buttons/Idle.png.import b/Assets/Worm/5.png.import similarity index 69% rename from Assets/Buttons/Idle.png.import rename to Assets/Worm/5.png.import index d8c4f7e..cae85e2 100644 --- a/Assets/Buttons/Idle.png.import +++ b/Assets/Worm/5.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://q85jhjrqsrxk" -path="res://.godot/imported/Idle.png-f1928d4d3971727d33c44035adc1a594.ctex" +uid="uid://cimvprnm3ca2a" +path="res://.godot/imported/5.png-760d6080c40af5259dc8f1e108e7c057.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Assets/Buttons/Idle.png" -dest_files=["res://.godot/imported/Idle.png-f1928d4d3971727d33c44035adc1a594.ctex"] +source_file="res://Assets/Worm/5.png" +dest_files=["res://.godot/imported/5.png-760d6080c40af5259dc8f1e108e7c057.ctex"] [params] diff --git a/Assets/Worm/6.png b/Assets/Worm/6.png new file mode 100644 index 0000000..53ebef3 Binary files /dev/null and b/Assets/Worm/6.png differ diff --git a/Assets/Worm/6.png.import b/Assets/Worm/6.png.import new file mode 100644 index 0000000..0d1e56e --- /dev/null +++ b/Assets/Worm/6.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://5ulqrr6hbxm8" +path="res://.godot/imported/6.png-3ee30e3c790b2c42393bfb5a0066542d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Worm/6.png" +dest_files=["res://.godot/imported/6.png-3ee30e3c790b2c42393bfb5a0066542d.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/Worm/IMG_3415.png b/Assets/Worm/IMG_3415.png new file mode 100644 index 0000000..b3bf6a4 Binary files /dev/null and b/Assets/Worm/IMG_3415.png differ diff --git a/Assets/Worm/IMG_3415.png.import b/Assets/Worm/IMG_3415.png.import new file mode 100644 index 0000000..10fe824 --- /dev/null +++ b/Assets/Worm/IMG_3415.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://clw00rsmc0rac" +path="res://.godot/imported/IMG_3415.png-a3af26fcc726dc1e7783a796d0f85606.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Worm/IMG_3415.png" +dest_files=["res://.godot/imported/IMG_3415.png-a3af26fcc726dc1e7783a796d0f85606.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/Worm/logo.png b/Assets/Worm/logo.png new file mode 100644 index 0000000..4c0a64e Binary files /dev/null and b/Assets/Worm/logo.png differ diff --git a/Assets/Worm/logo.png.import b/Assets/Worm/logo.png.import new file mode 100644 index 0000000..dcaf202 --- /dev/null +++ b/Assets/Worm/logo.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cdblq8g0f3f55" +path="res://.godot/imported/logo.png-965f53206d64ac17a8c5066582fa0478.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Worm/logo.png" +dest_files=["res://.godot/imported/logo.png-965f53206d64ac17a8c5066582fa0478.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Scenes/Button/button.gd b/Scenes/Button/button.gd index 76aa2e7..242cbad 100644 --- a/Scenes/Button/button.gd +++ b/Scenes/Button/button.gd @@ -11,9 +11,12 @@ signal enemy_killed var trans = false func _unhandled_input(event: InputEvent) -> void: + if !get_parent().game_active: + return if(event.is_action_pressed(input_name)): print_debug(input_name) $AnimatedSprite2D.play("pressed") + $Splash.play("splash") var children = get_children(false) var was_valid_input = false if(red_button): @@ -48,10 +51,11 @@ func red_out(): $AnimatedSprite2D.play("red_out") func _process(delta: float) -> void: - if(!trans): - $AnimatedSprite2D.modulate = color_mix - else: - $AnimatedSprite2D.modulate = Color(1,1,1) + match $AnimatedSprite2D.animation: + "default", "pressed": + $AnimatedSprite2D.modulate = color_mix + _: + $AnimatedSprite2D.modulate = Color(1,1,1) func spawn_enemy(): if(trans): @@ -60,11 +64,12 @@ func spawn_enemy(): return if(randi_range(0,1)==1): var enemy = ENEMY.instantiate() - print_debug(randf_range(0.0, 2.0) * PI) add_child(enemy) enemy.global_position = global_position - enemy.global_rotation=randf_range(0, 2 * PI) - enemy.look_at(global_position) + var rotated = randi_range(0, 1) + if(rotated ==1): + enemy.flip_animation() + enemy.global_rotation=rotated*PI enemy.enemy_attacked.connect(enemy_attacked) func enemy_attacked(): @@ -109,4 +114,5 @@ func _on_animated_sprite_2d_animation_finished() -> void: if(trans): if($AnimatedSprite2D.animation == "red_out"): red_button = false + $AnimatedSprite2D.play("default") trans = false diff --git a/Scenes/Button/button.tscn b/Scenes/Button/button.tscn index 733d125..3a36259 100644 --- a/Scenes/Button/button.tscn +++ b/Scenes/Button/button.tscn @@ -1,18 +1,29 @@ -[gd_scene load_steps=10 format=3 uid="uid://bhvihrt8dipll"] +[gd_scene load_steps=18 format=3 uid="uid://bhvihrt8dipll"] [ext_resource type="Script" path="res://Scenes/Button/button.gd" id="1_fkyus"] -[ext_resource type="Texture2D" uid="uid://q85jhjrqsrxk" path="res://Assets/Buttons/Idle.png" id="2_01nlj"] -[ext_resource type="Texture2D" uid="uid://blatwufdrwqml" path="res://Assets/Buttons/PressedIn1.png" id="3_180hi"] -[ext_resource type="Texture2D" uid="uid://4c7qtuk0exng" path="res://Assets/Buttons/FullPressed.png" id="4_5m7c4"] -[ext_resource type="Texture2D" uid="uid://ncd65m8iq7l0" path="res://Assets/Buttons/PressedOut.png" id="5_3xqo8"] -[ext_resource type="Texture2D" uid="uid://chckt1ppwsjq" path="res://Assets/Buttons/FORBIDDEN.png" id="6_p5821"] -[ext_resource type="Texture2D" uid="uid://cw6je7hakttbq" path="res://Assets/Buttons/ERROR.png" id="7_3w6j8"] +[ext_resource type="Texture2D" uid="uid://cmnangp78o1y6" path="res://Assets/Buttons/IMG_3394.png" id="2_jyhi7"] +[ext_resource type="Texture2D" uid="uid://8ce1ggql35ki" path="res://Assets/Buttons/IMG_3403.png" id="3_1lg6b"] +[ext_resource type="Texture2D" uid="uid://e40ep7k06vl7" path="res://Assets/Buttons/IMG_3395.png" id="4_ho636"] +[ext_resource type="Texture2D" uid="uid://cdilvc7bopjtg" path="res://Assets/Buttons/IMG_3393.png" id="5_wgvcg"] +[ext_resource type="Texture2D" uid="uid://cqmf1i4v81bl6" path="res://Assets/Buttons/IMG_3402.png" id="6_lmv6p"] +[ext_resource type="Texture2D" uid="uid://iujiv0je2v1i" path="res://Assets/Explosion/IMG_3416.png" id="7_dr88a"] +[ext_resource type="Texture2D" uid="uid://ba0lrop3un1m5" path="res://Assets/Explosion/IMG_3417.png" id="8_ysgst"] +[ext_resource type="Texture2D" uid="uid://b6vg8rn1eiako" path="res://Assets/Explosion/IMG_3418.png" id="9_gkfcp"] +[ext_resource type="Texture2D" uid="uid://bf4eob20ngfhc" path="res://Assets/Explosion/IMG_3419.png" id="10_dyy7c"] + +[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_6vho0"] + +[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_gda8k"] + +[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_y30w1"] + +[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_ej84g"] [sub_resource type="SpriteFrames" id="SpriteFrames_leuex"] animations = [{ "frames": [{ "duration": 1.0, -"texture": ExtResource("2_01nlj") +"texture": ExtResource("2_jyhi7") }], "loop": false, "name": &"default", @@ -20,16 +31,16 @@ animations = [{ }, { "frames": [{ "duration": 1.0, -"texture": ExtResource("3_180hi") +"texture": ExtResource("3_1lg6b") }, { -"duration": 3.0, -"texture": ExtResource("4_5m7c4") +"duration": 2.0, +"texture": ExtResource("4_ho636") }, { "duration": 1.0, -"texture": ExtResource("5_3xqo8") +"texture": ExtResource("3_1lg6b") }, { "duration": 1.0, -"texture": ExtResource("2_01nlj") +"texture": ExtResource("2_jyhi7") }], "loop": false, "name": &"pressed", @@ -37,71 +48,101 @@ animations = [{ }, { "frames": [{ "duration": 1.0, -"texture": ExtResource("6_p5821") +"texture": SubResource("CompressedTexture2D_6vho0") +}, { +"duration": 3.0, +"texture": SubResource("CompressedTexture2D_gda8k") +}, { +"duration": 1.0, +"texture": SubResource("CompressedTexture2D_y30w1") +}, { +"duration": 1.0, +"texture": SubResource("CompressedTexture2D_ej84g") }], -"loop": true, +"loop": false, +"name": &"pressed_old", +"speed": 15.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": ExtResource("5_wgvcg") +}], +"loop": false, "name": &"red", "speed": 5.0 }, { "frames": [{ "duration": 1.0, -"texture": ExtResource("7_3w6j8") +"texture": ExtResource("6_lmv6p") }, { "duration": 1.0, -"texture": ExtResource("2_01nlj") +"texture": ExtResource("5_wgvcg") }, { "duration": 1.0, -"texture": ExtResource("7_3w6j8") +"texture": ExtResource("6_lmv6p") }, { "duration": 1.0, -"texture": ExtResource("2_01nlj") -}, { -"duration": 1.0, -"texture": ExtResource("7_3w6j8") -}, { -"duration": 1.0, -"texture": ExtResource("2_01nlj") -}, { -"duration": 1.0, -"texture": ExtResource("6_p5821") +"texture": ExtResource("5_wgvcg") }], "loop": false, "name": &"red_in", -"speed": 3.0 +"speed": 5.0 }, { "frames": [{ "duration": 1.0, -"texture": ExtResource("7_3w6j8") +"texture": ExtResource("6_lmv6p") }, { "duration": 1.0, -"texture": ExtResource("2_01nlj") +"texture": ExtResource("5_wgvcg") }, { "duration": 1.0, -"texture": ExtResource("7_3w6j8") +"texture": ExtResource("6_lmv6p") }, { "duration": 1.0, -"texture": ExtResource("2_01nlj") -}, { -"duration": 1.0, -"texture": ExtResource("7_3w6j8") -}, { -"duration": 1.0, -"texture": ExtResource("2_01nlj") +"texture": ExtResource("5_wgvcg") }], "loop": false, "name": &"red_out", -"speed": 3.0 +"speed": 5.0 }] [sub_resource type="CircleShape2D" id="CircleShape2D_l0l4p"] radius = 10.4089 +[sub_resource type="SpriteFrames" id="SpriteFrames_va6xu"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": null +}, { +"duration": 1.0, +"texture": null +}, { +"duration": 1.0, +"texture": ExtResource("7_dr88a") +}, { +"duration": 1.0, +"texture": ExtResource("8_ysgst") +}, { +"duration": 1.0, +"texture": ExtResource("9_gkfcp") +}, { +"duration": 1.0, +"texture": ExtResource("10_dyy7c") +}, { +"duration": 1.0, +"texture": null +}], +"loop": false, +"name": &"splash", +"speed": 12.0 +}] + [node name="Button" type="Node2D"] script = ExtResource("1_fkyus") -metadata/_edit_group_ = true [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] -scale = Vector2(1.38, 1.316) +scale = Vector2(0.267899, 0.255474) sprite_frames = SubResource("SpriteFrames_leuex") [node name="Area2D" type="Area2D" parent="."] @@ -113,6 +154,12 @@ collision_mask = 2 scale = Vector2(4.74125, 4.84) shape = SubResource("CircleShape2D_l0l4p") +[node name="Splash" type="AnimatedSprite2D" parent="."] +position = Vector2(1, 31) +scale = Vector2(0.348624, 0.348624) +sprite_frames = SubResource("SpriteFrames_va6xu") +animation = &"splash" + [connection signal="animation_finished" from="AnimatedSprite2D" to="." method="_on_animated_sprite_2d_animation_finished"] [connection signal="area_entered" from="Area2D" to="." method="_on_area_2d_area_entered"] [connection signal="area_exited" from="Area2D" to="." method="_on_area_2d_area_exited"] diff --git a/Scenes/Worm/enemy.gd b/Scenes/Worm/enemy.gd index 809b98e..65016bc 100644 --- a/Scenes/Worm/enemy.gd +++ b/Scenes/Worm/enemy.gd @@ -1,21 +1,25 @@ extends Node2D signal enemy_attacked - +@export var color:Color func button_pressed(): - queue_free() + $AnimatedSprite2D.play("defeated_3") func _on_first_timer_timeout() -> void: scale = Vector2(1.2,1.2) - +func _process(delta: float) -> void: + $AnimatedSprite2D.modulate=color func _on_second_timer_timeout() -> void: scale = Vector2(1.4,1.4) func _ready() -> void: - $AnimatedSprite2D.play("new_animation") + $AnimatedSprite2D.play("attack") +func flip_animation(): + scale.y = -scale.y func _on_animated_sprite_2d_animation_finished() -> void: - enemy_attacked.emit() + if($AnimatedSprite2D.animation == "attack"): + enemy_attacked.emit() queue_free() diff --git a/Scenes/Worm/enemy.tscn b/Scenes/Worm/enemy.tscn index ad42458..bc9744a 100644 --- a/Scenes/Worm/enemy.tscn +++ b/Scenes/Worm/enemy.tscn @@ -1,14 +1,61 @@ -[gd_scene load_steps=8 format=3 uid="uid://cuvoq65ec58jk"] +[gd_scene load_steps=18 format=3 uid="uid://cuvoq65ec58jk"] [ext_resource type="Script" path="res://Scenes/Worm/enemy.gd" id="1_t2xh1"] [ext_resource type="Texture2D" uid="uid://7a1smbkaiutn" path="res://icon.svg" id="2_qu5u7"] -[ext_resource type="Texture2D" uid="uid://bjb6konwfdwma" path="res://Assets/Worm/1.png" id="3_6av35"] -[ext_resource type="Texture2D" uid="uid://cowon23pejcb6" path="res://Assets/Worm/2.png" id="4_x02e0"] -[ext_resource type="Texture2D" uid="uid://dl0wp6buga4d" path="res://Assets/Worm/3.png" id="5_eqhaj"] -[ext_resource type="Texture2D" uid="uid://c6cj6t3538iox" path="res://Assets/Worm/4.png" id="6_v8bp8"] +[ext_resource type="Texture2D" uid="uid://cex3sifrw1242" path="res://Assets/Worm/1.png" id="3_6av35"] +[ext_resource type="Texture2D" uid="uid://dactqej8ynl64" path="res://Assets/Worm/2.png" id="4_x02e0"] +[ext_resource type="Texture2D" uid="uid://cux4bd7fifyd6" path="res://Assets/Worm/3.png" id="5_eqhaj"] +[ext_resource type="Texture2D" uid="uid://72t1c28fr2nl" path="res://Assets/Worm/4.png" id="6_v8bp8"] +[ext_resource type="Texture2D" uid="uid://cimvprnm3ca2a" path="res://Assets/Worm/5.png" id="7_7om5h"] +[ext_resource type="Texture2D" uid="uid://5ulqrr6hbxm8" path="res://Assets/Worm/6.png" id="8_ehav7"] +[ext_resource type="Texture2D" uid="uid://du2p38ha0txko" path="res://Assets/Worm/2_back.png" id="9_jymta"] +[ext_resource type="Texture2D" uid="uid://brf7f6oxfgebt" path="res://Assets/Worm/3_back.png" id="10_1wx05"] +[ext_resource type="Texture2D" uid="uid://dnwrxihviw0rk" path="res://Assets/Worm/2_back_alt.png" id="11_gy0bh"] +[ext_resource type="Texture2D" uid="uid://uwspas3u4wv1" path="res://Assets/Worm/4_back.png" id="12_gpphe"] + +[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_ydqfm"] +load_path = "res://.godot/imported/1.png-d59e84433910eecfa2e5220e6ec5b5b4.ctex" + +[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_ap4lv"] +load_path = "res://.godot/imported/2.png-90fe91be8b8400834bfb6934ea879095.ctex" + +[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_prrpc"] +load_path = "res://.godot/imported/3.png-0463e07c1bea2f543f4c3653457283e4.ctex" + +[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_3mwge"] +load_path = "res://.godot/imported/4.png-4b049625170874896147063dd9a56363.ctex" [sub_resource type="SpriteFrames" id="SpriteFrames_5w8q8"] animations = [{ +"frames": [{ +"duration": 1.0, +"texture": ExtResource("3_6av35") +}, { +"duration": 2.0, +"texture": ExtResource("4_x02e0") +}, { +"duration": 2.0, +"texture": ExtResource("5_eqhaj") +}, { +"duration": 4.0, +"texture": ExtResource("6_v8bp8") +}, { +"duration": 1.0, +"texture": ExtResource("7_7om5h") +}, { +"duration": 1.0, +"texture": ExtResource("8_ehav7") +}, { +"duration": 1.0, +"texture": ExtResource("7_7om5h") +}, { +"duration": 1.0, +"texture": ExtResource("8_ehav7") +}], +"loop": false, +"name": &"attack", +"speed": 9.0 +}, { "frames": [], "loop": true, "name": &"default", @@ -16,16 +63,58 @@ animations = [{ }, { "frames": [{ "duration": 1.0, +"texture": ExtResource("9_jymta") +}, { +"duration": 1.0, "texture": ExtResource("3_6av35") +}], +"loop": false, +"name": &"defeated_2", +"speed": 8.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": ExtResource("10_1wx05") +}, { +"duration": 1.0, +"texture": ExtResource("11_gy0bh") +}, { +"duration": 1.0, +"texture": ExtResource("3_6av35") +}], +"loop": false, +"name": &"defeated_3", +"speed": 8.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": ExtResource("12_gpphe") +}, { +"duration": 1.0, +"texture": ExtResource("10_1wx05") +}, { +"duration": 1.0, +"texture": ExtResource("11_gy0bh") +}, { +"duration": 1.0, +"texture": ExtResource("3_6av35") +}], +"loop": false, +"name": &"defeated_4", +"speed": 8.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("CompressedTexture2D_ydqfm") }, { "duration": 3.0, -"texture": ExtResource("4_x02e0") +"texture": SubResource("CompressedTexture2D_ap4lv") }, { "duration": 1.0, -"texture": ExtResource("5_eqhaj") +"texture": SubResource("CompressedTexture2D_prrpc") }, { "duration": 1.0, -"texture": ExtResource("6_v8bp8") +"texture": SubResource("CompressedTexture2D_3mwge") }], "loop": false, "name": &"new_animation", @@ -33,8 +122,11 @@ animations = [{ }] [node name="Enemy" type="Node2D" groups=["enemy_group"]] +z_index = 10 +y_sort_enabled = true position = Vector2(10, 9) script = ExtResource("1_t2xh1") +color = Color(0.610846, 0.557314, 0.897917, 1) [node name="Icon" type="Sprite2D" parent="."] visible = false @@ -51,9 +143,10 @@ one_shot = true autostart = true [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] -position = Vector2(-22, -55) +position = Vector2(-66, -21) +scale = Vector2(0.282227, 0.282227) sprite_frames = SubResource("SpriteFrames_5w8q8") -animation = &"new_animation" +animation = &"defeated_4" [connection signal="timeout" from="FirstTimer" to="." method="_on_first_timer_timeout"] [connection signal="timeout" from="SecondTimer" to="." method="_on_second_timer_timeout"] diff --git a/camera_2d.gd b/camera_2d.gd new file mode 100644 index 0000000..2b994a9 --- /dev/null +++ b/camera_2d.gd @@ -0,0 +1,15 @@ +extends Camera2D +@export var randomStrength = 30.0 + +var shake_strenght = 0.0 +var shake_fade = 5.0 + +func apply_shake(): + shake_strenght = randomStrength + +func _process(delta): + if shake_strenght > 0: + shake_strenght = lerpf(shake_strenght, 0, shake_fade * delta) + offset=randomOffset() +func randomOffset(): + return Vector2(randf_range(-shake_strenght, shake_strenght),randf_range(-shake_strenght, shake_strenght)) diff --git a/game.gd b/game.gd index aa7ca82..39b797d 100644 --- a/game.gd +++ b/game.gd @@ -3,29 +3,29 @@ extends Node2D const MAX_HEALTH = 100.0 const RECOVERY_RATE = 10.0 const BAD_PRESS_DAMAGE = 20.0 -const MAX_ENEMIES = 3 +const MAX_ENEMIES = 4 const INIT_COLOR = Color(1,0,0,0) var health = MAX_HEALTH - -var spawn_interval = 1.5 -var interval_step = 0.05 -var max_out = 0.7 +var spawn_interval = 0.8 +var interval_step = 0.1 +var max_out = 0.8 var player_score = 0 - var first_time = true - +var game_active = false func _unhandled_input(event: InputEvent) -> void: if event.is_action_pressed("ui_accept"): - $SpawnTimer.paused = false + start_game() + func _ready() -> void: $Dialog.start() func start_game(): + game_active = true $SpawnTimer.start() change_red_button() first_time = false @@ -45,14 +45,17 @@ func _process(delta: float) -> void: %DamageColorOverlay.color = new_color if health < 5: $SpawnTimer.paused =true + game_active = false func bad_press(): health = maxf(health - BAD_PRESS_DAMAGE, 0) spawn_interval -= interval_step + $Camera2D.apply_shake() func ate(): health = maxf(health - BAD_PRESS_DAMAGE, 0) spawn_interval += interval_step + $Camera2D.apply_shake() func red_button_press(): health = 0 @@ -91,7 +94,7 @@ func _on_spawn_timer_timeout() -> void: return func on_enemy_killed(): player_score+=1 - print_debug(player_score) + $CanvasLayer/Label.text = str(player_score) func _on_dialog_dialogue_over() -> void: diff --git a/game.tscn b/game.tscn index 684ed5b..3648330 100644 --- a/game.tscn +++ b/game.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=5 format=3 uid="uid://decsef3jj3lt5"] +[gd_scene load_steps=6 format=3 uid="uid://decsef3jj3lt5"] [ext_resource type="Script" path="res://game.gd" id="1_bhcvq"] [ext_resource type="PackedScene" uid="uid://bhvihrt8dipll" path="res://Scenes/Button/button.tscn" id="1_j4pve"] [ext_resource type="PackedScene" uid="uid://du2jgrreaylhr" path="res://Scenes/dialog.tscn" id="3_s0nfr"] +[ext_resource type="Script" path="res://camera_2d.gd" id="4_u8t00"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_sesmb"] size = Vector2(995, 433.534) @@ -27,6 +28,20 @@ offset_bottom = 654.0 scale = Vector2(1.00712, 1.00483) color = Color(0.623529, 0.14902, 0.184314, 0.592157) +[node name="Label" type="Label" parent="CanvasLayer"] +anchors_preset = 5 +anchor_left = 0.5 +anchor_right = 0.5 +offset_left = -86.0 +offset_right = 86.0 +offset_bottom = 99.0 +grow_horizontal = 2 +size_flags_horizontal = 8 +theme_override_colors/font_color = Color(0, 0, 0, 1) +theme_override_font_sizes/font_size = 40 +text = "0" +horizontal_alignment = 1 + [node name="A" parent="." groups=["button_group"] instance=ExtResource("1_j4pve")] position = Vector2(872, 515) input_name = "A" @@ -63,9 +78,9 @@ input_name = "X" color_mix = Color(0, 0.424825, 0.812361, 1) [node name="B" parent="." groups=["button_group"] instance=ExtResource("1_j4pve")] -position = Vector2(954, 422) +position = Vector2(984, 425) input_name = "B" -color_mix = Color(0.735073, 0.468616, 3.85046e-07, 1) +color_mix = Color(0.74, 0, 0.0123331, 1) [node name="SpawnArea" type="Area2D" parent="."] scale = Vector2(1, 1.02189) @@ -81,5 +96,10 @@ wait_time = 0.5 [node name="Dialog" parent="." instance=ExtResource("3_s0nfr")] +[node name="Camera2D" type="Camera2D" parent="."] +position = Vector2(574, 326) +script = ExtResource("4_u8t00") +randomStrength = 10.0 + [connection signal="timeout" from="SpawnTimer" to="." method="_on_spawn_timer_timeout"] [connection signal="dialogue_over" from="Dialog" to="." method="_on_dialog_dialogue_over"]