diff --git a/assets/blobby/walk/neu-blobby-proto-walk-anm-test.aseprite b/assets/blobby/walk/neu-blobby-proto-walk-anm-test.aseprite deleted file mode 100644 index 5667ae0..0000000 Binary files a/assets/blobby/walk/neu-blobby-proto-walk-anm-test.aseprite and /dev/null differ diff --git a/assets/blobby/walk/neu-blobby-proto-walk-anm-test.aseprite.import b/assets/blobby/walk/neu-blobby-proto-walk-anm-test.aseprite.import deleted file mode 100644 index a72decd..0000000 --- a/assets/blobby/walk/neu-blobby-proto-walk-anm-test.aseprite.import +++ /dev/null @@ -1,26 +0,0 @@ -[remap] - -importer="aseprite.wizard.plugin" -type="SpriteFrames" -path="res://.import/neu-blobby-proto-walk-anm-test.aseprite-d81d15d3e33a50344468dd958b4174fe.res" - -[deps] - -source_file="res://assets/blobby/walk/neu-blobby-proto-walk-anm-test.aseprite" -dest_files=[ "res://.import/neu-blobby-proto-walk-anm-test.aseprite-d81d15d3e33a50344468dd958b4174fe.res" ] - -[params] - -split_layers=false -exclude_layers_pattern="" -only_visible_layers=false -sheet_type="Packed" -sprite_filename_pattern="{basename}.{layer}.{extension}" -texture_strip/import_texture_strip=false -texture_strip/filename_pattern="{basename}.{layer}.Strip.{extension}" -texture_atlas/import_texture_atlas=false -texture_atlas/filename_pattern="{basename}.{layer}.Atlas.{extension}" -texture_atlas/frame_filename_pattern="{basename}.{layer}.{animation}.{frame}.Atlas.{extension}" -animated_texture/import_animated_texture=false -animated_texture/filename_pattern="{basename}.{layer}.{animation}.Texture.{extension}" -animated_texture/frame_filename_pattern="{basename}.{layer}.{animation}.{frame}.Texture.{extension}" diff --git a/assets/blobby/walk/neu-blobby-proto-walk-anm-test.png b/assets/blobby/walk/neu-blobby-proto-walk-anm-test.png deleted file mode 100644 index fc3d243..0000000 Binary files a/assets/blobby/walk/neu-blobby-proto-walk-anm-test.png and /dev/null differ diff --git a/assets/blobby/walk/neu-blobby-proto-walk-anm-test.png.import b/assets/blobby/walk/neu-blobby-proto-walk-anm-test.png.import deleted file mode 100644 index 584fe40..0000000 --- a/assets/blobby/walk/neu-blobby-proto-walk-anm-test.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/neu-blobby-proto-walk-anm-test.png-5402131ce2ea57bd684ef66788556811.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/blobby/walk/neu-blobby-proto-walk-anm-test.png" -dest_files=[ "res://.import/neu-blobby-proto-walk-anm-test.png-5402131ce2ea57bd684ef66788556811.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/contraption/floating_platform_test.aseprite b/assets/contraption/floating_platform_test.aseprite new file mode 100644 index 0000000..9f8d184 Binary files /dev/null and b/assets/contraption/floating_platform_test.aseprite differ diff --git a/assets/contraption/floating_platform_test.png b/assets/contraption/floating_platform_test.png new file mode 100644 index 0000000..5beca52 Binary files /dev/null and b/assets/contraption/floating_platform_test.png differ diff --git a/assets/neutral object/coin.png.import b/assets/contraption/floating_platform_test.png.import similarity index 66% rename from assets/neutral object/coin.png.import rename to assets/contraption/floating_platform_test.png.import index 941828a..031d8b0 100644 --- a/assets/neutral object/coin.png.import +++ b/assets/contraption/floating_platform_test.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/coin.png-fe8bb2aa6121a142ba566306481b879c.stex" +path="res://.import/floating_platform_test.png-c6221f3121b32f0e4fe3fc3926807750.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/neutral object/coin.png" -dest_files=[ "res://.import/coin.png-fe8bb2aa6121a142ba566306481b879c.stex" ] +source_file="res://assets/contraption/floating_platform_test.png" +dest_files=[ "res://.import/floating_platform_test.png-c6221f3121b32f0e4fe3fc3926807750.stex" ] [params] diff --git a/assets/environment/background/background.png b/assets/environment/background/background.png deleted file mode 100644 index ad7e8ba..0000000 Binary files a/assets/environment/background/background.png and /dev/null differ diff --git a/assets/environment/background/cyberpunk-street.png b/assets/environment/background/cyberpunk-street.png deleted file mode 100644 index 3b1b474..0000000 Binary files a/assets/environment/background/cyberpunk-street.png and /dev/null differ diff --git a/assets/environment/blocks/basic_tileset_blobb-jakob-remix.png b/assets/environment/blocks/basic_tileset_blobb-jakob-remix.png deleted file mode 100644 index dc32037..0000000 Binary files a/assets/environment/blocks/basic_tileset_blobb-jakob-remix.png and /dev/null differ diff --git a/assets/for testing/Adventurer Sprite Sheet v1.1.aseprite b/assets/for testing/Adventurer Sprite Sheet v1.1.aseprite deleted file mode 100644 index 1648827..0000000 Binary files a/assets/for testing/Adventurer Sprite Sheet v1.1.aseprite and /dev/null differ diff --git a/assets/for testing/Adventurer Sprite Sheet v1.1.aseprite.import b/assets/for testing/Adventurer Sprite Sheet v1.1.aseprite.import deleted file mode 100644 index ba3f6c8..0000000 --- a/assets/for testing/Adventurer Sprite Sheet v1.1.aseprite.import +++ /dev/null @@ -1,26 +0,0 @@ -[remap] - -importer="aseprite.wizard.plugin" -type="SpriteFrames" -path="res://.import/Adventurer Sprite Sheet v1.1.aseprite-e5dc0c0668f082f0763ad9e71e527beb.res" - -[deps] - -source_file="res://assets/for testing/Adventurer Sprite Sheet v1.1.aseprite" -dest_files=[ "res://.import/Adventurer Sprite Sheet v1.1.aseprite-e5dc0c0668f082f0763ad9e71e527beb.res" ] - -[params] - -split_layers=false -exclude_layers_pattern="" -only_visible_layers=false -sheet_type="Packed" -sprite_filename_pattern="{basename}.{layer}.{extension}" -texture_strip/import_texture_strip=false -texture_strip/filename_pattern="{basename}.{layer}.Strip.{extension}" -texture_atlas/import_texture_atlas=false -texture_atlas/filename_pattern="{basename}.{layer}.Atlas.{extension}" -texture_atlas/frame_filename_pattern="{basename}.{layer}.{animation}.{frame}.Atlas.{extension}" -animated_texture/import_animated_texture=false -animated_texture/filename_pattern="{basename}.{layer}.{animation}.Texture.{extension}" -animated_texture/frame_filename_pattern="{basename}.{layer}.{animation}.{frame}.Texture.{extension}" diff --git a/assets/for testing/Adventurer Sprite Sheet v1.1.png b/assets/for testing/Adventurer Sprite Sheet v1.1.png deleted file mode 100644 index d9706ec..0000000 Binary files a/assets/for testing/Adventurer Sprite Sheet v1.1.png and /dev/null differ diff --git a/assets/for testing/Adventurer Sprite Sheet v1.1.png.import b/assets/for testing/Adventurer Sprite Sheet v1.1.png.import deleted file mode 100644 index 0091a03..0000000 --- a/assets/for testing/Adventurer Sprite Sheet v1.1.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/Adventurer Sprite Sheet v1.1.png-71711e6458571f99a58991af28a49bb4.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/for testing/Adventurer Sprite Sheet v1.1.png" -dest_files=[ "res://.import/Adventurer Sprite Sheet v1.1.png-71711e6458571f99a58991af28a49bb4.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/for testing/cyberpunk-street.png b/assets/for testing/cyberpunk-street.png deleted file mode 100644 index 3b1b474..0000000 Binary files a/assets/for testing/cyberpunk-street.png and /dev/null differ diff --git a/assets/for testing/cyberpunk-street.png.import b/assets/for testing/cyberpunk-street.png.import deleted file mode 100644 index 440a0dd..0000000 --- a/assets/for testing/cyberpunk-street.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/cyberpunk-street.png-5a99a1dd01dc19f3f60fde360a744a5f.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/for testing/cyberpunk-street.png" -dest_files=[ "res://.import/cyberpunk-street.png-5a99a1dd01dc19f3f60fde360a744a5f.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/meta/icon.png b/assets/meta/icon.png deleted file mode 100644 index 7fe74fa..0000000 Binary files a/assets/meta/icon.png and /dev/null differ diff --git a/assets/meta/icon.png.import b/assets/meta/icon.png.import deleted file mode 100644 index b527f75..0000000 --- a/assets/meta/icon.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/icon.png-eade320076b24b97f544206fea4c6c6f.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/meta/icon.png" -dest_files=[ "res://.import/icon.png-eade320076b24b97f544206fea4c6c6f.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 -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/assets/meta/new_dynamicfont.tres b/assets/meta/new_dynamicfont.tres index be354f7..df71000 100644 --- a/assets/meta/new_dynamicfont.tres +++ b/assets/meta/new_dynamicfont.tres @@ -3,5 +3,4 @@ [ext_resource path="res://assets/meta/montserrat_extrabold.otf" type="DynamicFontData" id=1] [resource] -size = 10 font_data = ExtResource( 1 ) diff --git a/assets/neutral object/coin.png b/assets/neutral object/coin.png deleted file mode 100644 index 553d17e..0000000 Binary files a/assets/neutral object/coin.png and /dev/null differ diff --git a/assets/obstacle object/speiku.aseprite b/assets/obstacle object/speiku.aseprite deleted file mode 100644 index d26753b..0000000 Binary files a/assets/obstacle object/speiku.aseprite and /dev/null differ diff --git a/assets/obstacle object/speiku.gif b/assets/obstacle object/speiku.gif deleted file mode 100644 index c39bb90..0000000 Binary files a/assets/obstacle object/speiku.gif and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku1.png b/assets/obstacle object/speiku/speiku1.png deleted file mode 100644 index c52dd2f..0000000 Binary files a/assets/obstacle object/speiku/speiku1.png and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku1.png.import b/assets/obstacle object/speiku/speiku1.png.import deleted file mode 100644 index f6068b7..0000000 --- a/assets/obstacle object/speiku/speiku1.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speiku1.png-d68931974aaf6a1b94805e6b3a5167c6.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/speiku/speiku1.png" -dest_files=[ "res://.import/speiku1.png-d68931974aaf6a1b94805e6b3a5167c6.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/obstacle object/speiku/speiku10.png b/assets/obstacle object/speiku/speiku10.png deleted file mode 100644 index c52dd2f..0000000 Binary files a/assets/obstacle object/speiku/speiku10.png and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku10.png.import b/assets/obstacle object/speiku/speiku10.png.import deleted file mode 100644 index a5d39d4..0000000 --- a/assets/obstacle object/speiku/speiku10.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speiku10.png-d5ae6e464c466ec272e9a94d90521173.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/speiku/speiku10.png" -dest_files=[ "res://.import/speiku10.png-d5ae6e464c466ec272e9a94d90521173.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/obstacle object/speiku/speiku11.png b/assets/obstacle object/speiku/speiku11.png deleted file mode 100644 index c52dd2f..0000000 Binary files a/assets/obstacle object/speiku/speiku11.png and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku11.png.import b/assets/obstacle object/speiku/speiku11.png.import deleted file mode 100644 index 25e4cc3..0000000 --- a/assets/obstacle object/speiku/speiku11.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speiku11.png-57a0ed5ff7a1eb94ae11c36342b91824.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/speiku/speiku11.png" -dest_files=[ "res://.import/speiku11.png-57a0ed5ff7a1eb94ae11c36342b91824.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/obstacle object/speiku/speiku12.png b/assets/obstacle object/speiku/speiku12.png deleted file mode 100644 index c52dd2f..0000000 Binary files a/assets/obstacle object/speiku/speiku12.png and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku12.png.import b/assets/obstacle object/speiku/speiku12.png.import deleted file mode 100644 index 02e88a9..0000000 --- a/assets/obstacle object/speiku/speiku12.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speiku12.png-321103ccc698c130046dfd1fa5569719.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/speiku/speiku12.png" -dest_files=[ "res://.import/speiku12.png-321103ccc698c130046dfd1fa5569719.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/obstacle object/speiku/speiku13.png b/assets/obstacle object/speiku/speiku13.png deleted file mode 100644 index c52dd2f..0000000 Binary files a/assets/obstacle object/speiku/speiku13.png and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku13.png.import b/assets/obstacle object/speiku/speiku13.png.import deleted file mode 100644 index 704ee8f..0000000 --- a/assets/obstacle object/speiku/speiku13.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speiku13.png-f9f63122e90573d9888f1cb3edeaa011.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/speiku/speiku13.png" -dest_files=[ "res://.import/speiku13.png-f9f63122e90573d9888f1cb3edeaa011.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/obstacle object/speiku/speiku14.png b/assets/obstacle object/speiku/speiku14.png deleted file mode 100644 index c52dd2f..0000000 Binary files a/assets/obstacle object/speiku/speiku14.png and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku14.png.import b/assets/obstacle object/speiku/speiku14.png.import deleted file mode 100644 index 39625e9..0000000 --- a/assets/obstacle object/speiku/speiku14.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speiku14.png-06fdbb2beaa1bd3241443d8e486dd0ca.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/speiku/speiku14.png" -dest_files=[ "res://.import/speiku14.png-06fdbb2beaa1bd3241443d8e486dd0ca.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/obstacle object/speiku/speiku15.png b/assets/obstacle object/speiku/speiku15.png deleted file mode 100644 index c52dd2f..0000000 Binary files a/assets/obstacle object/speiku/speiku15.png and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku15.png.import b/assets/obstacle object/speiku/speiku15.png.import deleted file mode 100644 index fa5e038..0000000 --- a/assets/obstacle object/speiku/speiku15.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speiku15.png-92cafc204ad038bf05ee376ead9b02c9.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/speiku/speiku15.png" -dest_files=[ "res://.import/speiku15.png-92cafc204ad038bf05ee376ead9b02c9.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/obstacle object/speiku/speiku17.png b/assets/obstacle object/speiku/speiku17.png deleted file mode 100644 index c52dd2f..0000000 Binary files a/assets/obstacle object/speiku/speiku17.png and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku17.png.import b/assets/obstacle object/speiku/speiku17.png.import deleted file mode 100644 index 52d74df..0000000 --- a/assets/obstacle object/speiku/speiku17.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speiku17.png-75095462d80726e80d45308c42cc7236.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/speiku/speiku17.png" -dest_files=[ "res://.import/speiku17.png-75095462d80726e80d45308c42cc7236.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/obstacle object/speiku/speiku18.png b/assets/obstacle object/speiku/speiku18.png deleted file mode 100644 index c52dd2f..0000000 Binary files a/assets/obstacle object/speiku/speiku18.png and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku18.png.import b/assets/obstacle object/speiku/speiku18.png.import deleted file mode 100644 index cad8b4c..0000000 --- a/assets/obstacle object/speiku/speiku18.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speiku18.png-d06926207d38c901a86e7e85cb18254d.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/speiku/speiku18.png" -dest_files=[ "res://.import/speiku18.png-d06926207d38c901a86e7e85cb18254d.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/obstacle object/speiku/speiku19.png b/assets/obstacle object/speiku/speiku19.png deleted file mode 100644 index c52dd2f..0000000 Binary files a/assets/obstacle object/speiku/speiku19.png and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku19.png.import b/assets/obstacle object/speiku/speiku19.png.import deleted file mode 100644 index 4e04a4b..0000000 --- a/assets/obstacle object/speiku/speiku19.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speiku19.png-6d6cad854cca7c944b2850622a83b90e.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/speiku/speiku19.png" -dest_files=[ "res://.import/speiku19.png-6d6cad854cca7c944b2850622a83b90e.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/obstacle object/speiku/speiku2.png b/assets/obstacle object/speiku/speiku2.png deleted file mode 100644 index c52dd2f..0000000 Binary files a/assets/obstacle object/speiku/speiku2.png and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku2.png.import b/assets/obstacle object/speiku/speiku2.png.import deleted file mode 100644 index 627c237..0000000 --- a/assets/obstacle object/speiku/speiku2.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speiku2.png-ec6852efc84033efbe766cd897f51bc4.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/speiku/speiku2.png" -dest_files=[ "res://.import/speiku2.png-ec6852efc84033efbe766cd897f51bc4.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/obstacle object/speiku/speiku20.png b/assets/obstacle object/speiku/speiku20.png deleted file mode 100644 index c52dd2f..0000000 Binary files a/assets/obstacle object/speiku/speiku20.png and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku20.png.import b/assets/obstacle object/speiku/speiku20.png.import deleted file mode 100644 index bb38b76..0000000 --- a/assets/obstacle object/speiku/speiku20.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speiku20.png-1bdafea8adf98863f4406e123e7c5955.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/speiku/speiku20.png" -dest_files=[ "res://.import/speiku20.png-1bdafea8adf98863f4406e123e7c5955.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/obstacle object/speiku/speiku21.png b/assets/obstacle object/speiku/speiku21.png deleted file mode 100644 index c52dd2f..0000000 Binary files a/assets/obstacle object/speiku/speiku21.png and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku21.png.import b/assets/obstacle object/speiku/speiku21.png.import deleted file mode 100644 index c4ad5ff..0000000 --- a/assets/obstacle object/speiku/speiku21.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speiku21.png-93c22cc0261e75b047e116697d19b3b0.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/speiku/speiku21.png" -dest_files=[ "res://.import/speiku21.png-93c22cc0261e75b047e116697d19b3b0.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/obstacle object/speiku/speiku22.png b/assets/obstacle object/speiku/speiku22.png deleted file mode 100644 index c52dd2f..0000000 Binary files a/assets/obstacle object/speiku/speiku22.png and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku22.png.import b/assets/obstacle object/speiku/speiku22.png.import deleted file mode 100644 index fd7139c..0000000 --- a/assets/obstacle object/speiku/speiku22.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speiku22.png-b394bac85ff91bbc8acdc46bacc78999.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/speiku/speiku22.png" -dest_files=[ "res://.import/speiku22.png-b394bac85ff91bbc8acdc46bacc78999.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/obstacle object/speiku/speiku23.png b/assets/obstacle object/speiku/speiku23.png deleted file mode 100644 index c52dd2f..0000000 Binary files a/assets/obstacle object/speiku/speiku23.png and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku23.png.import b/assets/obstacle object/speiku/speiku23.png.import deleted file mode 100644 index f2adca1..0000000 --- a/assets/obstacle object/speiku/speiku23.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speiku23.png-0cbe50f06782f4f9889202dd7bdbe9da.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/speiku/speiku23.png" -dest_files=[ "res://.import/speiku23.png-0cbe50f06782f4f9889202dd7bdbe9da.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/obstacle object/speiku/speiku24.png b/assets/obstacle object/speiku/speiku24.png deleted file mode 100644 index c52dd2f..0000000 Binary files a/assets/obstacle object/speiku/speiku24.png and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku24.png.import b/assets/obstacle object/speiku/speiku24.png.import deleted file mode 100644 index 1a96ab6..0000000 --- a/assets/obstacle object/speiku/speiku24.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speiku24.png-519d40e4d02f80aca3e0baa6a9462b44.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/speiku/speiku24.png" -dest_files=[ "res://.import/speiku24.png-519d40e4d02f80aca3e0baa6a9462b44.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/obstacle object/speiku/speiku25.png b/assets/obstacle object/speiku/speiku25.png deleted file mode 100644 index c52dd2f..0000000 Binary files a/assets/obstacle object/speiku/speiku25.png and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku25.png.import b/assets/obstacle object/speiku/speiku25.png.import deleted file mode 100644 index 8c966e2..0000000 --- a/assets/obstacle object/speiku/speiku25.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speiku25.png-3dbba7e53e8cd3104f0cf0d2fc310e45.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/speiku/speiku25.png" -dest_files=[ "res://.import/speiku25.png-3dbba7e53e8cd3104f0cf0d2fc310e45.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/obstacle object/speiku/speiku26.png b/assets/obstacle object/speiku/speiku26.png deleted file mode 100644 index c52dd2f..0000000 Binary files a/assets/obstacle object/speiku/speiku26.png and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku26.png.import b/assets/obstacle object/speiku/speiku26.png.import deleted file mode 100644 index aa572c4..0000000 --- a/assets/obstacle object/speiku/speiku26.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speiku26.png-53fdf50106cf522243ce8cdfb998b4cc.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/speiku/speiku26.png" -dest_files=[ "res://.import/speiku26.png-53fdf50106cf522243ce8cdfb998b4cc.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/obstacle object/speiku/speiku27.png b/assets/obstacle object/speiku/speiku27.png deleted file mode 100644 index c52dd2f..0000000 Binary files a/assets/obstacle object/speiku/speiku27.png and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku27.png.import b/assets/obstacle object/speiku/speiku27.png.import deleted file mode 100644 index 26e7b2f..0000000 --- a/assets/obstacle object/speiku/speiku27.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speiku27.png-1910d2c0e2663991257d48c5caad4b8d.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/speiku/speiku27.png" -dest_files=[ "res://.import/speiku27.png-1910d2c0e2663991257d48c5caad4b8d.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/obstacle object/speiku/speiku28.png b/assets/obstacle object/speiku/speiku28.png deleted file mode 100644 index c52dd2f..0000000 Binary files a/assets/obstacle object/speiku/speiku28.png and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku28.png.import b/assets/obstacle object/speiku/speiku28.png.import deleted file mode 100644 index 60474c9..0000000 --- a/assets/obstacle object/speiku/speiku28.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speiku28.png-affc849f539268e600eb35f9f915f25a.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/speiku/speiku28.png" -dest_files=[ "res://.import/speiku28.png-affc849f539268e600eb35f9f915f25a.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/obstacle object/speiku/speiku29.png b/assets/obstacle object/speiku/speiku29.png deleted file mode 100644 index c52dd2f..0000000 Binary files a/assets/obstacle object/speiku/speiku29.png and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku29.png.import b/assets/obstacle object/speiku/speiku29.png.import deleted file mode 100644 index 535076d..0000000 --- a/assets/obstacle object/speiku/speiku29.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speiku29.png-bb9b43436dafbd29114e0365a1aa4399.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/speiku/speiku29.png" -dest_files=[ "res://.import/speiku29.png-bb9b43436dafbd29114e0365a1aa4399.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/obstacle object/speiku/speiku3.png b/assets/obstacle object/speiku/speiku3.png deleted file mode 100644 index c52dd2f..0000000 Binary files a/assets/obstacle object/speiku/speiku3.png and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku3.png.import b/assets/obstacle object/speiku/speiku3.png.import deleted file mode 100644 index 39bdc19..0000000 --- a/assets/obstacle object/speiku/speiku3.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speiku3.png-1bcda0ea600cbdab9ea2ee55730c542e.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/speiku/speiku3.png" -dest_files=[ "res://.import/speiku3.png-1bcda0ea600cbdab9ea2ee55730c542e.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/obstacle object/speiku/speiku30.png b/assets/obstacle object/speiku/speiku30.png deleted file mode 100644 index c52dd2f..0000000 Binary files a/assets/obstacle object/speiku/speiku30.png and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku30.png.import b/assets/obstacle object/speiku/speiku30.png.import deleted file mode 100644 index a75f18f..0000000 --- a/assets/obstacle object/speiku/speiku30.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speiku30.png-35839d51603706792b361cf93b6a9efd.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/speiku/speiku30.png" -dest_files=[ "res://.import/speiku30.png-35839d51603706792b361cf93b6a9efd.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/obstacle object/speiku/speiku31.png b/assets/obstacle object/speiku/speiku31.png deleted file mode 100644 index c52dd2f..0000000 Binary files a/assets/obstacle object/speiku/speiku31.png and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku31.png.import b/assets/obstacle object/speiku/speiku31.png.import deleted file mode 100644 index 5f6d151..0000000 --- a/assets/obstacle object/speiku/speiku31.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speiku31.png-6768871dc82fa95f1b6d990369f0d1d2.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/speiku/speiku31.png" -dest_files=[ "res://.import/speiku31.png-6768871dc82fa95f1b6d990369f0d1d2.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/obstacle object/speiku/speiku32.png b/assets/obstacle object/speiku/speiku32.png deleted file mode 100644 index c52dd2f..0000000 Binary files a/assets/obstacle object/speiku/speiku32.png and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku32.png.import b/assets/obstacle object/speiku/speiku32.png.import deleted file mode 100644 index ec972b9..0000000 --- a/assets/obstacle object/speiku/speiku32.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speiku32.png-6fef52f0966e59ab19cd043e967b48a5.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/speiku/speiku32.png" -dest_files=[ "res://.import/speiku32.png-6fef52f0966e59ab19cd043e967b48a5.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/obstacle object/speiku/speiku4.png b/assets/obstacle object/speiku/speiku4.png deleted file mode 100644 index c52dd2f..0000000 Binary files a/assets/obstacle object/speiku/speiku4.png and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku4.png.import b/assets/obstacle object/speiku/speiku4.png.import deleted file mode 100644 index 6674619..0000000 --- a/assets/obstacle object/speiku/speiku4.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speiku4.png-f799a9506b7bc85da27891c8c15a045f.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/speiku/speiku4.png" -dest_files=[ "res://.import/speiku4.png-f799a9506b7bc85da27891c8c15a045f.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/obstacle object/speiku/speiku5.png b/assets/obstacle object/speiku/speiku5.png deleted file mode 100644 index c52dd2f..0000000 Binary files a/assets/obstacle object/speiku/speiku5.png and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku5.png.import b/assets/obstacle object/speiku/speiku5.png.import deleted file mode 100644 index e3379b8..0000000 --- a/assets/obstacle object/speiku/speiku5.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speiku5.png-4e170bbbe486396b86b7e031bd91635a.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/speiku/speiku5.png" -dest_files=[ "res://.import/speiku5.png-4e170bbbe486396b86b7e031bd91635a.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/obstacle object/speiku/speiku6.png b/assets/obstacle object/speiku/speiku6.png deleted file mode 100644 index c52dd2f..0000000 Binary files a/assets/obstacle object/speiku/speiku6.png and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku6.png.import b/assets/obstacle object/speiku/speiku6.png.import deleted file mode 100644 index d010a46..0000000 --- a/assets/obstacle object/speiku/speiku6.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speiku6.png-40cfdd8c45f71cd70cf857b1a04333a0.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/speiku/speiku6.png" -dest_files=[ "res://.import/speiku6.png-40cfdd8c45f71cd70cf857b1a04333a0.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/obstacle object/speiku/speiku7.png b/assets/obstacle object/speiku/speiku7.png deleted file mode 100644 index c52dd2f..0000000 Binary files a/assets/obstacle object/speiku/speiku7.png and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku7.png.import b/assets/obstacle object/speiku/speiku7.png.import deleted file mode 100644 index 75f61e6..0000000 --- a/assets/obstacle object/speiku/speiku7.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speiku7.png-f506c3694c5242c3b0086aa493ccdb2c.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/speiku/speiku7.png" -dest_files=[ "res://.import/speiku7.png-f506c3694c5242c3b0086aa493ccdb2c.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/obstacle object/speiku/speiku8.png b/assets/obstacle object/speiku/speiku8.png deleted file mode 100644 index c52dd2f..0000000 Binary files a/assets/obstacle object/speiku/speiku8.png and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku8.png.import b/assets/obstacle object/speiku/speiku8.png.import deleted file mode 100644 index 2abd8f6..0000000 --- a/assets/obstacle object/speiku/speiku8.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speiku8.png-342cb08f4e32e0727d24a23322331a31.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/speiku/speiku8.png" -dest_files=[ "res://.import/speiku8.png-342cb08f4e32e0727d24a23322331a31.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/obstacle object/speiku/speiku9.png b/assets/obstacle object/speiku/speiku9.png deleted file mode 100644 index c52dd2f..0000000 Binary files a/assets/obstacle object/speiku/speiku9.png and /dev/null differ diff --git a/assets/obstacle object/speiku/speiku9.png.import b/assets/obstacle object/speiku/speiku9.png.import deleted file mode 100644 index a7a8223..0000000 --- a/assets/obstacle object/speiku/speiku9.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speiku9.png-7480f4d9ba4f9062d7890c80c241b0ec.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/speiku/speiku9.png" -dest_files=[ "res://.import/speiku9.png-7480f4d9ba4f9062d7890c80c241b0ec.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/obstacle object/spikesiguess.aseprite b/assets/obstacle object/spikesiguess.aseprite deleted file mode 100644 index c709bcc..0000000 Binary files a/assets/obstacle object/spikesiguess.aseprite and /dev/null differ diff --git a/assets/obstacle object/spikesiguess.aseprite.import b/assets/obstacle object/spikesiguess.aseprite.import deleted file mode 100644 index d9edb2f..0000000 --- a/assets/obstacle object/spikesiguess.aseprite.import +++ /dev/null @@ -1,26 +0,0 @@ -[remap] - -importer="aseprite.wizard.plugin" -type="SpriteFrames" -path="res://.import/spikesiguess.aseprite-49a6562634d2194b332527973f528b29.res" - -[deps] - -source_file="res://assets/obstacle object/spikesiguess.aseprite" -dest_files=[ "res://.import/spikesiguess.aseprite-49a6562634d2194b332527973f528b29.res" ] - -[params] - -split_layers=false -exclude_layers_pattern="" -only_visible_layers=false -sheet_type="Packed" -sprite_filename_pattern="{basename}.{layer}.{extension}" -texture_strip/import_texture_strip=false -texture_strip/filename_pattern="{basename}.{layer}.Strip.{extension}" -texture_atlas/import_texture_atlas=false -texture_atlas/filename_pattern="{basename}.{layer}.Atlas.{extension}" -texture_atlas/frame_filename_pattern="{basename}.{layer}.{animation}.{frame}.Atlas.{extension}" -animated_texture/import_animated_texture=false -animated_texture/filename_pattern="{basename}.{layer}.{animation}.Texture.{extension}" -animated_texture/frame_filename_pattern="{basename}.{layer}.{animation}.{frame}.Texture.{extension}" diff --git a/assets/obstacle object/spikesiguess.png b/assets/obstacle object/spikesiguess.png deleted file mode 100644 index 10ab451..0000000 Binary files a/assets/obstacle object/spikesiguess.png and /dev/null differ diff --git a/assets/obstacle object/spikesiguess.png.import b/assets/obstacle object/spikesiguess.png.import deleted file mode 100644 index 71fad4d..0000000 --- a/assets/obstacle object/spikesiguess.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/spikesiguess.png-dfee592274c493a519dd900ed55b2b35.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/obstacle object/spikesiguess.png" -dest_files=[ "res://.import/spikesiguess.png-dfee592274c493a519dd900ed55b2b35.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=false -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/assets/player/approx mannequin.png b/assets/player/approx mannequin.png deleted file mode 100644 index c523017..0000000 Binary files a/assets/player/approx mannequin.png and /dev/null differ diff --git a/assets/player/player.png b/assets/player/player.png deleted file mode 100644 index 8eeebe2..0000000 Binary files a/assets/player/player.png and /dev/null differ diff --git a/assets/player/player.png.import b/assets/player/player.png.import deleted file mode 100644 index 30036e3..0000000 --- a/assets/player/player.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/player.png-e230e05e2d932a710303ee07f401e40f.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/player/player.png" -dest_files=[ "res://.import/player.png-e230e05e2d932a710303ee07f401e40f.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 -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/assets/player/th.jpg b/assets/player/th.jpg deleted file mode 100644 index 29b6b03..0000000 Binary files a/assets/player/th.jpg and /dev/null differ diff --git a/assets/player/th.jpg.import b/assets/player/th.jpg.import deleted file mode 100644 index 39892d8..0000000 --- a/assets/player/th.jpg.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/th.jpg-cc137ca9b69564ee23cce46a01652543.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/player/th.jpg" -dest_files=[ "res://.import/th.jpg-cc137ca9b69564ee23cce46a01652543.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 -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/assets/ui/fonts/Kenney Space.ttf b/assets/ui/fonts/Kenney Space.ttf new file mode 100644 index 0000000..d80dd88 Binary files /dev/null and b/assets/ui/fonts/Kenney Space.ttf differ diff --git a/assets/ui/fonts/Kenney Thick.ttf b/assets/ui/fonts/Kenney Thick.ttf new file mode 100644 index 0000000..4868b76 Binary files /dev/null and b/assets/ui/fonts/Kenney Thick.ttf differ diff --git a/assets/ui/fonts/kenny_space.tres b/assets/ui/fonts/kenny_space.tres new file mode 100644 index 0000000..30d68d0 --- /dev/null +++ b/assets/ui/fonts/kenny_space.tres @@ -0,0 +1,4 @@ +[gd_resource type="DynamicFont" format=2] + +[resource] +size = 10 diff --git a/assets/ui/fonts/kenny_thick.tres b/assets/ui/fonts/kenny_thick.tres new file mode 100644 index 0000000..f604a53 --- /dev/null +++ b/assets/ui/fonts/kenny_thick.tres @@ -0,0 +1,8 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[sub_resource type="DynamicFontData" id=1] +font_path = "res://assets/ui/fonts/Kenney Thick.ttf" + +[resource] +size = 8 +font_data = SubResource( 1 ) diff --git a/assets/ui/sci-fi-godot-theme.zip b/assets/ui/sci-fi-godot-theme.zip new file mode 100644 index 0000000..a21517c Binary files /dev/null and b/assets/ui/sci-fi-godot-theme.zip differ diff --git a/assets/ui/sci-fi-godot-theme/Pixel Square 10.ttf b/assets/ui/sci-fi-godot-theme/Pixel Square 10.ttf new file mode 100644 index 0000000..3dc2ce3 Binary files /dev/null and b/assets/ui/sci-fi-godot-theme/Pixel Square 10.ttf differ diff --git a/assets/ui/sci-fi-godot-theme/sci-fi-pixel.tres b/assets/ui/sci-fi-godot-theme/sci-fi-pixel.tres new file mode 100644 index 0000000..f27a86a --- /dev/null +++ b/assets/ui/sci-fi-godot-theme/sci-fi-pixel.tres @@ -0,0 +1,7 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[ext_resource path="res://assets/ui/sci-fi-godot-theme/Pixel Square 10.ttf" type="DynamicFontData" id=1] + +[resource] +size = 10 +font_data = ExtResource( 1 ) diff --git a/assets/ui/sci-fi-godot-theme/sci-fi-theme.tres b/assets/ui/sci-fi-godot-theme/sci-fi-theme.tres new file mode 100644 index 0000000..277fc67 --- /dev/null +++ b/assets/ui/sci-fi-godot-theme/sci-fi-theme.tres @@ -0,0 +1,887 @@ +[gd_resource type="Theme" load_steps=98 format=2] + +[ext_resource path="res://assets/ui/sci-fi-godot-theme/Pixel Square 10.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://assets/ui/sci-fi-godot-theme/sci-fi.png" type="Texture" id=2] +[ext_resource path="res://assets/ui/fonts/kenny_thick.tres" type="DynamicFont" id=3] +[ext_resource path="res://assets/ui/sci-fi-godot-theme/sci-fi-pixel.tres" type="DynamicFont" id=4] + +[sub_resource type="StyleBoxTexture" id=1] +texture = ExtResource( 2 ) +region_rect = Rect2( 49, 17, 22, 14 ) +margin_left = 7.45371 +margin_right = 6.68263 +margin_top = 6.68263 +margin_bottom = 6.68263 + +[sub_resource type="StyleBoxTexture" id=93] +texture = ExtResource( 2 ) +region_rect = Rect2( 73, 17, 22, 14 ) +margin_left = 7.0 +margin_right = 6.0 +margin_top = 6.0 +margin_bottom = 7.0 + +[sub_resource type="StyleBoxTexture" id=3] +content_margin_left = 7.0 +content_margin_right = 7.0 +content_margin_top = 5.0 +content_margin_bottom = 5.0 +texture = ExtResource( 2 ) +region_rect = Rect2( 73, 17, 22, 14 ) +margin_left = 7.45371 +margin_right = 6.42561 +margin_top = 6.42561 +margin_bottom = 6.68263 + +[sub_resource type="StyleBoxTexture" id=4] +content_margin_left = 7.0 +content_margin_right = 7.0 +content_margin_top = 5.0 +content_margin_bottom = 5.0 +texture = ExtResource( 2 ) +region_rect = Rect2( 49, 1, 22, 14 ) +margin_left = 7.45371 +margin_right = 6.42561 +margin_top = 6.42561 +margin_bottom = 6.68263 + +[sub_resource type="StyleBoxTexture" id=5] +content_margin_left = 7.0 +content_margin_right = 7.0 +content_margin_top = 5.0 +content_margin_bottom = 5.0 +texture = ExtResource( 2 ) +region_rect = Rect2( 73, 1, 22, 14 ) +margin_left = 7.45371 +margin_right = 6.42561 +margin_top = 6.42561 +margin_bottom = 6.68263 + +[sub_resource type="AtlasTexture" id=6] +atlas = ExtResource( 2 ) +region = Rect2( 100, 4, 7, 8 ) + +[sub_resource type="AtlasTexture" id=7] +atlas = ExtResource( 2 ) +region = Rect2( 100, 36, 8, 8 ) + +[sub_resource type="AtlasTexture" id=8] +atlas = ExtResource( 2 ) +region = Rect2( 100, 52, 8, 8 ) + +[sub_resource type="AtlasTexture" id=9] +atlas = ExtResource( 2 ) +region = Rect2( 100, 20, 7, 8 ) + +[sub_resource type="StyleBoxEmpty" id=10] + +[sub_resource type="StyleBoxEmpty" id=11] + +[sub_resource type="StyleBoxEmpty" id=12] + +[sub_resource type="StyleBoxEmpty" id=13] + +[sub_resource type="StyleBoxEmpty" id=14] + +[sub_resource type="StyleBoxEmpty" id=15] + +[sub_resource type="AtlasTexture" id=16] +atlas = ExtResource( 2 ) +region = Rect2( 1, 116, 14, 9 ) + +[sub_resource type="AtlasTexture" id=17] +atlas = ExtResource( 2 ) +region = Rect2( 33, 116, 14, 9 ) + +[sub_resource type="AtlasTexture" id=18] +atlas = ExtResource( 2 ) +region = Rect2( 17, 116, 14, 9 ) + +[sub_resource type="AtlasTexture" id=19] +atlas = ExtResource( 2 ) +region = Rect2( 49, 116, 14, 9 ) + +[sub_resource type="StyleBoxEmpty" id=20] + +[sub_resource type="StyleBoxEmpty" id=21] + +[sub_resource type="StyleBoxEmpty" id=22] + +[sub_resource type="StyleBoxFlat" id=23] +bg_color = Color( 0.6, 0.6, 0.6, 0 ) +border_width_left = 1 +border_width_top = 1 +border_width_right = 1 +border_width_bottom = 1 +border_color = Color( 0.243137, 0.890196, 0.717647, 1 ) + +[sub_resource type="StyleBoxEmpty" id=24] + +[sub_resource type="StyleBoxEmpty" id=25] + +[sub_resource type="StyleBoxTexture" id=26] +texture = ExtResource( 2 ) +region_rect = Rect2( 33, 97, 14, 14 ) +margin_left = 2.0 +margin_right = 2.0 +margin_top = 2.0 +margin_bottom = 2.0 + +[sub_resource type="StyleBoxEmpty" id=27] + +[sub_resource type="StyleBoxTexture" id=28] +texture = ExtResource( 2 ) +region_rect = Rect2( 17, 97, 14, 14 ) +margin_left = 2.0 +margin_right = 2.0 +margin_top = 2.0 +margin_bottom = 2.0 + +[sub_resource type="StyleBoxTexture" id=29] +texture = ExtResource( 2 ) +region_rect = Rect2( 1, 97, 14, 14 ) +margin_left = 2.0 +margin_right = 2.0 +margin_top = 2.0 +margin_bottom = 2.0 + +[sub_resource type="StyleBoxTexture" id=30] +texture = ExtResource( 2 ) +region_rect = Rect2( 150, 86, 6, 4 ) +margin_left = 1.0 +margin_right = 1.0 +margin_top = 1.0 +margin_bottom = 1.0 +axis_stretch_horizontal = 1 +axis_stretch_vertical = 1 + +[sub_resource type="StyleBoxTexture" id=31] +texture = ExtResource( 2 ) +region_rect = Rect2( 150, 70, 6, 4 ) +margin_left = 1.0 +margin_right = 1.0 +margin_top = 1.0 +margin_bottom = 1.0 +axis_stretch_horizontal = 1 +axis_stretch_vertical = 1 + +[sub_resource type="StyleBoxTexture" id=32] +texture = ExtResource( 2 ) +region_rect = Rect2( 149, 54, 6, 4 ) +margin_left = 1.0 +margin_right = 1.0 +margin_top = 1.0 +margin_bottom = 1.0 +axis_stretch_horizontal = 1 +axis_stretch_vertical = 1 + +[sub_resource type="StyleBoxTexture" id=33] +texture = ExtResource( 2 ) +region_rect = Rect2( 146, 22, 12, 4 ) +margin_left = 1.0 +margin_right = 1.0 +margin_top = 1.0 +margin_bottom = 1.0 + +[sub_resource type="StyleBoxTexture" id=34] +texture = ExtResource( 2 ) +region_rect = Rect2( 146, 38, 12, 4 ) +margin_left = 1.0 +margin_right = 1.0 +margin_top = 1.0 +margin_bottom = 1.0 + +[sub_resource type="StyleBoxLine" id=35] +color = Color( 0.0705882, 0.627451, 0.780392, 1 ) + +[sub_resource type="AtlasTexture" id=36] +atlas = ExtResource( 2 ) +region = Rect2( 69, 68, 5, 7 ) + +[sub_resource type="AtlasTexture" id=37] +atlas = ExtResource( 2 ) +region = Rect2( 69, 101, 5, 7 ) + +[sub_resource type="AtlasTexture" id=38] +atlas = ExtResource( 2 ) +region = Rect2( 69, 84, 5, 7 ) + +[sub_resource type="StyleBoxTexture" id=39] +texture = ExtResource( 2 ) +region_rect = Rect2( 49, 70, 3, 3 ) +margin_left = 2.31322 +margin_right = 1.67066 +margin_top = 1.15661 +margin_bottom = 1.15661 +expand_margin_left = 1.0 + +[sub_resource type="StyleBoxTexture" id=40] +texture = ExtResource( 2 ) +region_rect = Rect2( 49, 86, 3, 3 ) +margin_left = 2.31322 +margin_right = 1.67066 +margin_top = 1.15661 +margin_bottom = 1.15661 +expand_margin_left = 1.0 + +[sub_resource type="StyleBoxTexture" id=41] +texture = ExtResource( 2 ) +region_rect = Rect2( 80, 70, 15, 3 ) +margin_right = 1.41363 +margin_top = 1.28512 +margin_bottom = 1.0281 + +[sub_resource type="StyleBoxTexture" id=42] +content_margin_left = 5.0 +content_margin_right = 0.0 +content_margin_top = 5.0 +content_margin_bottom = 3.0 +texture = ExtResource( 2 ) +region_rect = Rect2( 17, 97, 14, 14 ) +margin_left = 2.0 +margin_right = 2.0 +margin_top = 2.0 +margin_bottom = 2.0 + +[sub_resource type="StyleBoxTexture" id=43] +content_margin_left = 5.0 +content_margin_right = 0.0 +content_margin_top = 5.0 +content_margin_bottom = 3.0 +texture = ExtResource( 2 ) +region_rect = Rect2( 1, 97, 14, 14 ) +margin_left = 2.0 +margin_right = 2.0 +margin_top = 2.0 +margin_bottom = 2.0 + +[sub_resource type="StyleBoxTexture" id=44] +content_margin_left = 5.0 +content_margin_right = 0.0 +content_margin_top = 5.0 +content_margin_bottom = 3.0 +texture = ExtResource( 2 ) +region_rect = Rect2( 33, 97, 14, 14 ) +margin_left = 2.0 +margin_right = 2.0 +margin_top = 2.0 +margin_bottom = 2.0 + +[sub_resource type="StyleBoxTexture" id=45] +content_margin_left = 3.0 +content_margin_right = 3.0 +content_margin_top = 3.0 +content_margin_bottom = 3.0 +texture = ExtResource( 2 ) +region_rect = Rect2( 33, 97, 14, 14 ) +margin_left = 2.0 +margin_right = 2.0 +margin_top = 2.0 +margin_bottom = 2.0 + +[sub_resource type="StyleBoxEmpty" id=46] + +[sub_resource type="StyleBoxTexture" id=47] +content_margin_left = 3.0 +content_margin_right = 3.0 +content_margin_top = 3.0 +content_margin_bottom = 3.0 +texture = ExtResource( 2 ) +region_rect = Rect2( 17, 97, 14, 14 ) +margin_left = 2.0 +margin_right = 2.0 +margin_top = 2.0 +margin_bottom = 2.0 + +[sub_resource type="StyleBoxTexture" id=48] +content_margin_left = 3.0 +content_margin_right = 3.0 +content_margin_top = 3.0 +content_margin_bottom = 3.0 +texture = ExtResource( 2 ) +region_rect = Rect2( 1, 97, 14, 14 ) +margin_left = 2.0 +margin_right = 2.0 +margin_top = 2.0 +margin_bottom = 2.0 + +[sub_resource type="StyleBoxTexture" id=49] +content_margin_left = 3.0 +content_margin_right = 3.0 +content_margin_top = 3.0 +content_margin_bottom = 3.0 +texture = ExtResource( 2 ) +region_rect = Rect2( 17, 97, 14, 14 ) +margin_left = 2.0 +margin_right = 2.0 +margin_top = 2.0 +margin_bottom = 2.0 + +[sub_resource type="AtlasTexture" id=50] +atlas = ExtResource( 2 ) +region = Rect2( 66, 120, 11, 6 ) + +[sub_resource type="StyleBoxTexture" id=51] +texture = ExtResource( 2 ) +region_rect = Rect2( 33, 97, 14, 14 ) +margin_left = 2.0 +margin_right = 2.0 +margin_top = 2.0 +margin_bottom = 2.0 + +[sub_resource type="StyleBoxEmpty" id=52] + +[sub_resource type="StyleBoxTexture" id=53] +texture = ExtResource( 2 ) +region_rect = Rect2( 17, 97, 14, 14 ) +margin_left = 2.0 +margin_right = 2.0 +margin_top = 2.0 +margin_bottom = 2.0 + +[sub_resource type="StyleBoxTexture" id=54] +texture = ExtResource( 2 ) +region_rect = Rect2( 1, 97, 14, 14 ) +margin_left = 2.0 +margin_right = 2.0 +margin_top = 2.0 +margin_bottom = 2.0 + +[sub_resource type="StyleBoxTexture" id=55] +content_margin_left = 15.0 +content_margin_right = 16.0 +content_margin_top = 16.0 +content_margin_bottom = 17.0 +texture = ExtResource( 2 ) +region_rect = Rect2( 1, 49, 46, 46 ) +margin_left = 15.3636 +margin_right = 15.5896 +margin_top = 16.0414 +margin_bottom = 17.1711 + +[sub_resource type="StyleBoxTexture" id=94] +texture = ExtResource( 2 ) +region_rect = Rect2( 1, 1, 46, 46 ) +margin_left = 15.0 +margin_right = 16.0 +margin_top = 16.0 +margin_bottom = 17.0 + +[sub_resource type="DynamicFont" id=92] +size = 8 +extra_spacing_top = 1 +extra_spacing_bottom = -1 +extra_spacing_space = -2 +font_data = ExtResource( 1 ) + +[sub_resource type="AtlasTexture" id=56] +atlas = ExtResource( 2 ) +region = Rect2( 100, 5, 7, 7 ) + +[sub_resource type="AtlasTexture" id=57] +atlas = ExtResource( 2 ) +region = Rect2( 100, 37, 7, 7 ) + +[sub_resource type="AtlasTexture" id=58] +atlas = ExtResource( 2 ) +region = Rect2( 100, 53, 7, 7 ) + +[sub_resource type="AtlasTexture" id=59] +atlas = ExtResource( 2 ) +region = Rect2( 89, 116, 4, 7 ) + +[sub_resource type="AtlasTexture" id=60] +atlas = ExtResource( 2 ) +region = Rect2( 100, 21, 7, 7 ) + +[sub_resource type="StyleBoxFlat" id=61] +bg_color = Color( 0.0705882, 0.627451, 0.780392, 0.32549 ) + +[sub_resource type="StyleBoxTexture" id=62] +content_margin_left = 5.0 +content_margin_right = 5.0 +content_margin_top = 5.0 +content_margin_bottom = 5.0 +texture = ExtResource( 2 ) +region_rect = Rect2( 17, 97, 14, 14 ) +margin_left = 2.0 +margin_right = 2.0 +margin_top = 2.0 +margin_bottom = 2.0 +expand_margin_top = 1.0 + +[sub_resource type="StyleBoxTexture" id=63] +texture = ExtResource( 2 ) +region_rect = Rect2( 33, 97, 14, 14 ) +margin_left = 2.0 +margin_right = 2.0 +margin_top = 2.0 +margin_bottom = 2.0 + +[sub_resource type="StyleBoxLine" id=64] +color = Color( 0.243137, 0.890196, 0.717647, 1 ) + +[sub_resource type="StyleBoxTexture" id=65] +texture = ExtResource( 2 ) +region_rect = Rect2( 146, 38, 12, 4 ) +margin_left = 1.0 +margin_right = 1.0 +margin_top = 1.0 +margin_bottom = 1.0 +expand_margin_left = 2.0 +expand_margin_right = 2.0 +expand_margin_top = 2.0 +expand_margin_bottom = 2.0 + +[sub_resource type="StyleBoxTexture" id=66] +texture = ExtResource( 2 ) +region_rect = Rect2( 151, 71, 4, 2 ) +margin_top = 1.54215 +margin_bottom = 1.67066 +axis_stretch_horizontal = 1 + +[sub_resource type="AtlasTexture" id=67] +atlas = ExtResource( 2 ) +region = Rect2( 67, 115, 9, 10 ) + +[sub_resource type="StyleBoxTexture" id=68] +texture = ExtResource( 2 ) +region_rect = Rect2( 17, 97, 14, 14 ) +margin_left = 2.0 +margin_right = 2.0 +margin_top = 2.0 +margin_bottom = 2.0 + +[sub_resource type="StyleBoxTexture" id=69] +content_margin_left = 4.0 +content_margin_right = 4.0 +content_margin_top = 4.0 +content_margin_bottom = 0.0 +texture = ExtResource( 2 ) +region_rect = Rect2( 113, 114, 14, 8 ) +margin_left = 2.0 +margin_right = 1.0 +margin_top = 2.0 + +[sub_resource type="StyleBoxTexture" id=70] +content_margin_left = 4.0 +content_margin_right = 4.0 +content_margin_top = 4.0 +content_margin_bottom = 0.0 +texture = ExtResource( 2 ) +region_rect = Rect2( 129, 114, 14, 8 ) +margin_left = 2.0 +margin_right = 1.0 +margin_top = 2.0 + +[sub_resource type="StyleBoxTexture" id=71] +content_margin_left = 4.0 +content_margin_right = 4.0 +content_margin_top = 4.0 +content_margin_bottom = 0.0 +texture = ExtResource( 2 ) +region_rect = Rect2( 97, 114, 14, 10 ) +margin_left = 2.0 +margin_right = 2.0 +margin_top = 3.0 +margin_bottom = 2.00323 +expand_margin_top = 2.0 +expand_margin_bottom = 2.0 + +[sub_resource type="StyleBoxTexture" id=72] +content_margin_left = 15.0 +content_margin_right = 16.0 +content_margin_top = 0.0 +content_margin_bottom = 15.0 +texture = ExtResource( 2 ) +region_rect = Rect2( 2, 2, 45, 45 ) +margin_left = 14.836 +margin_right = 15.6848 +margin_top = 14.0424 +margin_bottom = 15.0359 +axis_stretch_horizontal = 1 +axis_stretch_vertical = 1 + +[sub_resource type="AtlasTexture" id=73] +atlas = ExtResource( 2 ) +region = Rect2( 66, 119, 11, 8 ) + +[sub_resource type="AtlasTexture" id=74] +atlas = ExtResource( 2 ) +region = Rect2( 88, 115, 6, 9 ) + +[sub_resource type="AtlasTexture" id=75] +atlas = ExtResource( 2 ) +region = Rect2( 99, 4, 9, 9 ) + +[sub_resource type="AtlasTexture" id=76] +atlas = ExtResource( 2 ) +region = Rect2( 99, 20, 9, 9 ) + +[sub_resource type="AtlasTexture" id=77] +atlas = ExtResource( 2 ) +region = Rect2( 67, 114, 9, 12 ) + +[sub_resource type="StyleBoxTexture" id=78] +texture = ExtResource( 2 ) +region_rect = Rect2( 1, 49, 46, 46 ) +margin_left = 14.7703 +margin_right = 15.5213 +margin_top = 14.2696 +margin_bottom = 14.52 + +[sub_resource type="StyleBoxFlat" id=79] +bg_color = Color( 0.0705882, 0.627451, 0.780392, 0.32549 ) + +[sub_resource type="StyleBoxTexture" id=80] +texture = ExtResource( 2 ) +region_rect = Rect2( 134, 20, 4, 6 ) +margin_left = 1.33217 +margin_right = 1.0 +margin_top = 1.16608 +margin_bottom = 1.0 +axis_stretch_horizontal = 1 +axis_stretch_vertical = 1 + +[sub_resource type="StyleBoxTexture" id=81] +texture = ExtResource( 2 ) +region_rect = Rect2( 134, 36, 4, 6 ) +margin_left = 1.0 +margin_right = 1.0 +margin_top = 1.0 +margin_bottom = 1.0 +axis_stretch_horizontal = 1 +axis_stretch_vertical = 1 + +[sub_resource type="StyleBoxTexture" id=82] +texture = ExtResource( 2 ) +region_rect = Rect2( 134, 53, 4, 6 ) +margin_left = 1.0 +margin_right = 1.0 +margin_top = 1.0 +margin_bottom = 1.0 +axis_stretch_horizontal = 1 +axis_stretch_vertical = 1 + +[sub_resource type="StyleBoxTexture" id=83] +texture = ExtResource( 2 ) +region_rect = Rect2( 134, 2, 4, 12 ) +margin_left = 1.0 +margin_right = 1.0 +margin_top = 1.0 +margin_bottom = 1.0 + +[sub_resource type="StyleBoxTexture" id=84] +texture = ExtResource( 2 ) +region_rect = Rect2( 150, 2, 4, 12 ) +margin_left = 1.0 +margin_top = 1.0 +margin_bottom = 1.0 + +[sub_resource type="StyleBoxLine" id=85] +color = Color( 0, 0.6, 0.764706, 1 ) +vertical = true + +[sub_resource type="AtlasTexture" id=86] +atlas = ExtResource( 2 ) +region = Rect2( 100, 86, 7, 5 ) + +[sub_resource type="AtlasTexture" id=87] +atlas = ExtResource( 2 ) +region = Rect2( 133, 86, 7, 5 ) + +[sub_resource type="AtlasTexture" id=88] +atlas = ExtResource( 2 ) +region = Rect2( 116, 86, 7, 5 ) + +[sub_resource type="StyleBoxTexture" id=89] +texture = ExtResource( 2 ) +region_rect = Rect2( 102, 109, 3, 2 ) +margin_left = 1.28512 +margin_right = 1.15661 +margin_top = 1.0 +margin_bottom = 1.41363 +expand_margin_bottom = 2.0 + +[sub_resource type="StyleBoxTexture" id=90] +texture = ExtResource( 2 ) +region_rect = Rect2( 118, 108, 3, 3 ) +margin_left = 1.0281 +margin_right = 1.15661 +margin_top = 0.642561 +margin_bottom = 1.41363 +expand_margin_bottom = 2.0 + +[sub_resource type="StyleBoxTexture" id=91] +texture = ExtResource( 2 ) +region_rect = Rect2( 102, 65, 3, 3 ) +margin_left = 1.28512 +margin_right = 1.15661 +margin_top = 1.28512 + +[resource] +default_font = SubResource( 92 ) +Button/colors/font_color = Color( 1, 1, 1, 1 ) +Button/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) +Button/colors/font_color_focus = Color( 0.658824, 0.658824, 0.658824, 1 ) +Button/colors/font_color_hover = Color( 0.654902, 0.654902, 0.654902, 1 ) +Button/colors/font_color_pressed = Color( 1, 1, 1, 1 ) +Button/constants/hseparation = 0 +Button/fonts/font = ExtResource( 3 ) +Button/styles/disabled = SubResource( 1 ) +Button/styles/focus = SubResource( 93 ) +Button/styles/hover = SubResource( 3 ) +Button/styles/normal = SubResource( 4 ) +Button/styles/pressed = SubResource( 5 ) +CheckBox/colors/font_color = Color( 0.596078, 0.596078, 0.596078, 1 ) +CheckBox/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) +CheckBox/colors/font_color_focus = Color( 1, 1, 1, 1 ) +CheckBox/colors/font_color_hover = Color( 0.294118, 0.898039, 0.737255, 1 ) +CheckBox/colors/font_color_hover_pressed = Color( 0.243137, 0.890196, 0.717647, 1 ) +CheckBox/colors/font_color_pressed = Color( 1, 1, 1, 1 ) +CheckBox/constants/check_vadjust = 0 +CheckBox/constants/hseparation = 3 +CheckBox/fonts/font = ExtResource( 4 ) +CheckBox/icons/checked = SubResource( 6 ) +CheckBox/icons/radio_checked = SubResource( 7 ) +CheckBox/icons/radio_unchecked = SubResource( 8 ) +CheckBox/icons/unchecked = SubResource( 9 ) +CheckBox/styles/disabled = SubResource( 10 ) +CheckBox/styles/focus = SubResource( 11 ) +CheckBox/styles/hover = SubResource( 12 ) +CheckBox/styles/hover_pressed = SubResource( 13 ) +CheckBox/styles/normal = SubResource( 14 ) +CheckBox/styles/pressed = SubResource( 15 ) +CheckButton/colors/font_color = Color( 0.88, 0.88, 0.88, 1 ) +CheckButton/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) +CheckButton/colors/font_color_hover = Color( 0, 0.764706, 0.560784, 1 ) +CheckButton/colors/font_color_hover_pressed = Color( 0, 0.764706, 0.560784, 1 ) +CheckButton/colors/font_color_pressed = Color( 0, 0.6, 0.764706, 1 ) +CheckButton/constants/check_vadjust = 0 +CheckButton/constants/hseparation = 4 +CheckButton/fonts/font = ExtResource( 3 ) +CheckButton/icons/off = SubResource( 16 ) +CheckButton/icons/off_disabled = SubResource( 17 ) +CheckButton/icons/on = SubResource( 18 ) +CheckButton/icons/on_disabled = SubResource( 19 ) +CheckButton/styles/disabled = SubResource( 20 ) +CheckButton/styles/focus = SubResource( 21 ) +CheckButton/styles/hover = SubResource( 22 ) +CheckButton/styles/hover_pressed = SubResource( 23 ) +CheckButton/styles/normal = SubResource( 24 ) +CheckButton/styles/pressed = SubResource( 25 ) +ColorPickerButton/colors/font_color = Color( 1, 1, 1, 1 ) +ColorPickerButton/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.3 ) +ColorPickerButton/colors/font_color_hover = Color( 0.376471, 0.909804, 0.768627, 1 ) +ColorPickerButton/colors/font_color_pressed = Color( 0.8, 0.8, 0.8, 1 ) +ColorPickerButton/constants/hseparation = 2 +ColorPickerButton/fonts/font = ExtResource( 3 ) +ColorPickerButton/icons/bg = null +ColorPickerButton/styles/disabled = SubResource( 26 ) +ColorPickerButton/styles/focus = SubResource( 27 ) +ColorPickerButton/styles/hover = SubResource( 28 ) +ColorPickerButton/styles/normal = SubResource( 29 ) +ColorPickerButton/styles/pressed = SubResource( 28 ) +HScrollBar/icons/decrement = null +HScrollBar/icons/decrement_highlight = null +HScrollBar/icons/increment = null +HScrollBar/icons/increment_highlight = null +HScrollBar/styles/grabber = SubResource( 30 ) +HScrollBar/styles/grabber_highlight = SubResource( 31 ) +HScrollBar/styles/grabber_pressed = SubResource( 32 ) +HScrollBar/styles/scroll = SubResource( 33 ) +HScrollBar/styles/scroll_focus = SubResource( 34 ) +HSeparator/constants/separation = 4 +HSeparator/styles/separator = SubResource( 35 ) +HSlider/icons/grabber = SubResource( 36 ) +HSlider/icons/grabber_disabled = SubResource( 37 ) +HSlider/icons/grabber_highlight = SubResource( 38 ) +HSlider/icons/tick = null +HSlider/styles/grabber_area = SubResource( 39 ) +HSlider/styles/grabber_area_highlight = SubResource( 40 ) +HSlider/styles/slider = SubResource( 41 ) +Label/colors/font_color = Color( 1, 1, 1, 1 ) +Label/colors/font_color_shadow = Color( 0, 0, 0, 0 ) +Label/colors/font_outline_modulate = Color( 1, 1, 1, 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 = ExtResource( 3 ) +Label/styles/normal = null +LineEdit/colors/clear_button_color = Color( 0.88, 0.88, 0.88, 1 ) +LineEdit/colors/clear_button_color_pressed = Color( 1, 1, 1, 1 ) +LineEdit/colors/cursor_color = Color( 0.133333, 0.654902, 0.796078, 0.447059 ) +LineEdit/colors/font_color = Color( 0.88, 0.88, 0.88, 1 ) +LineEdit/colors/font_color_selected = Color( 0.0156863, 0.0627451, 0.14902, 1 ) +LineEdit/colors/font_color_uneditable = Color( 0.88, 0.88, 0.88, 0.5 ) +LineEdit/colors/selection_color = Color( 0.0705882, 0.780392, 0.592157, 1 ) +LineEdit/constants/minimum_spaces = 12 +LineEdit/fonts/font = ExtResource( 3 ) +LineEdit/icons/clear = null +LineEdit/styles/focus = SubResource( 42 ) +LineEdit/styles/normal = SubResource( 43 ) +LineEdit/styles/read_only = SubResource( 44 ) +MenuButton/colors/font_color = Color( 0.88, 0.88, 0.88, 1 ) +MenuButton/colors/font_color_disabled = Color( 1, 1, 1, 0.3 ) +MenuButton/colors/font_color_hover = Color( 0.294118, 0.898039, 0.737255, 1 ) +MenuButton/colors/font_color_pressed = Color( 1, 1, 1, 1 ) +MenuButton/constants/hseparation = 3 +MenuButton/fonts/font = ExtResource( 3 ) +MenuButton/styles/disabled = SubResource( 45 ) +MenuButton/styles/focus = SubResource( 46 ) +MenuButton/styles/hover = SubResource( 47 ) +MenuButton/styles/normal = SubResource( 48 ) +MenuButton/styles/pressed = SubResource( 49 ) +OptionButton/colors/font_color = Color( 0.88, 0.88, 0.88, 1 ) +OptionButton/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) +OptionButton/colors/font_color_hover = Color( 0.376471, 0.909804, 0.768627, 1 ) +OptionButton/colors/font_color_pressed = Color( 1, 1, 1, 1 ) +OptionButton/constants/arrow_margin = 2 +OptionButton/constants/hseparation = 2 +OptionButton/fonts/font = ExtResource( 3 ) +OptionButton/icons/arrow = SubResource( 50 ) +OptionButton/styles/disabled = SubResource( 51 ) +OptionButton/styles/focus = SubResource( 52 ) +OptionButton/styles/hover = SubResource( 53 ) +OptionButton/styles/normal = SubResource( 54 ) +OptionButton/styles/pressed = SubResource( 53 ) +Panel/styles/panel = SubResource( 55 ) +Panel2/base_type = "Panel" +Panel2/styles/panel = SubResource( 94 ) +PopupMenu/colors/font_color = Color( 0.88, 0.88, 0.88, 1 ) +PopupMenu/colors/font_color_accel = Color( 0.7, 0.7, 0.7, 0.8 ) +PopupMenu/colors/font_color_disabled = Color( 0.4, 0.4, 0.4, 0.8 ) +PopupMenu/colors/font_color_hover = Color( 0.88, 0.88, 0.88, 1 ) +PopupMenu/constants/hseparation = 4 +PopupMenu/constants/vseparation = 8 +PopupMenu/fonts/font = SubResource( 92 ) +PopupMenu/icons/checked = SubResource( 56 ) +PopupMenu/icons/radio_checked = SubResource( 57 ) +PopupMenu/icons/radio_unchecked = SubResource( 58 ) +PopupMenu/icons/submenu = SubResource( 59 ) +PopupMenu/icons/unchecked = SubResource( 60 ) +PopupMenu/styles/hover = SubResource( 61 ) +PopupMenu/styles/labeled_separator_left = null +PopupMenu/styles/labeled_separator_right = null +PopupMenu/styles/panel = SubResource( 62 ) +PopupMenu/styles/panel_disabled = SubResource( 63 ) +PopupMenu/styles/separator = SubResource( 64 ) +ProgressBar/colors/font_color = Color( 0.180392, 0.0784314, 0.623529, 1 ) +ProgressBar/colors/font_color_shadow = Color( 0.376471, 0.909804, 0.768627, 1 ) +ProgressBar/fonts/font = SubResource( 92 ) +ProgressBar/styles/bg = SubResource( 65 ) +ProgressBar/styles/fg = SubResource( 66 ) +SpinBox/icons/updown = SubResource( 67 ) +TabContainer/colors/font_color_bg = Color( 0.69, 0.69, 0.69, 1 ) +TabContainer/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) +TabContainer/colors/font_color_fg = Color( 0.376471, 0.909804, 0.768627, 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 = SubResource( 92 ) +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 = SubResource( 68 ) +TabContainer/styles/tab_bg = SubResource( 69 ) +TabContainer/styles/tab_disabled = SubResource( 70 ) +TabContainer/styles/tab_fg = SubResource( 71 ) +TextEdit/colors/background_color = Color( 0, 0, 0, 0 ) +TextEdit/colors/bookmark_color = Color( 0.08, 0.49, 0.98, 1 ) +TextEdit/colors/brace_mismatch_color = Color( 1, 0.2, 0.2, 1 ) +TextEdit/colors/breakpoint_color = Color( 0.8, 0.8, 0.4, 0.2 ) +TextEdit/colors/caret_background_color = Color( 0, 0, 0, 1 ) +TextEdit/colors/caret_color = Color( 0.243137, 0.890196, 0.717647, 1 ) +TextEdit/colors/code_folding_color = Color( 0.8, 0.8, 0.8, 0.8 ) +TextEdit/colors/completion_background_color = Color( 0.17, 0.16, 0.2, 1 ) +TextEdit/colors/completion_existing_color = Color( 0.87, 0.87, 0.87, 0.13 ) +TextEdit/colors/completion_font_color = Color( 0.67, 0.67, 0.67, 1 ) +TextEdit/colors/completion_scroll_color = Color( 1, 1, 1, 1 ) +TextEdit/colors/completion_selected_color = Color( 0.26, 0.26, 0.27, 1 ) +TextEdit/colors/current_line_color = Color( 0.25, 0.25, 0.26, 0.8 ) +TextEdit/colors/executing_line_color = Color( 0.2, 0.8, 0.2, 0.4 ) +TextEdit/colors/font_color = Color( 0.878431, 0.878431, 0.878431, 1 ) +TextEdit/colors/font_color_readonly = Color( 0.878431, 0.878431, 0.878431, 1 ) +TextEdit/colors/font_color_selected = Color( 0, 0, 0, 1 ) +TextEdit/colors/function_color = Color( 0.4, 0.64, 0.81, 1 ) +TextEdit/colors/line_number_color = Color( 0.67, 0.67, 0.67, 0.4 ) +TextEdit/colors/mark_color = Color( 1, 0.4, 0.4, 0.4 ) +TextEdit/colors/member_variable_color = Color( 0.9, 0.31, 0.35, 1 ) +TextEdit/colors/number_color = Color( 0.92, 0.58, 0.2, 1 ) +TextEdit/colors/safe_line_number_color = Color( 0.67, 0.78, 0.67, 0.6 ) +TextEdit/colors/selection_color = Color( 0.243137, 0.890196, 0.717647, 1 ) +TextEdit/colors/symbol_color = Color( 0.94, 0.94, 0.94, 1 ) +TextEdit/colors/word_highlighted_color = Color( 0.8, 0.901961, 0.901961, 0.14902 ) +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 = SubResource( 92 ) +TextEdit/icons/fold = null +TextEdit/icons/folded = null +TextEdit/icons/space = null +TextEdit/icons/tab = null +TextEdit/styles/completion = SubResource( 72 ) +TextEdit/styles/focus = SubResource( 72 ) +TextEdit/styles/normal = SubResource( 72 ) +TextEdit/styles/read_only = SubResource( 72 ) +Tree/colors/custom_button_font_highlight = Color( 0.94, 0.94, 0.94, 1 ) +Tree/colors/drop_position_color = Color( 0.180392, 0.0784314, 0.623529, 1 ) +Tree/colors/font_color = Color( 0.69, 0.69, 0.69, 1 ) +Tree/colors/font_color_selected = Color( 0.941176, 0.811765, 0.239216, 1 ) +Tree/colors/guide_color = Color( 0.0705882, 0.627451, 0.780392, 0 ) +Tree/colors/relationship_line_color = Color( 0.964706, 0.886275, 0.498039, 1 ) +Tree/colors/title_button_color = Color( 0.88, 0.88, 0.88, 1 ) +Tree/constants/button_margin = 4 +Tree/constants/draw_guides = 1 +Tree/constants/draw_relationship_lines = 1 +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 = ExtResource( 4 ) +Tree/fonts/title_button_font = ExtResource( 3 ) +Tree/icons/arrow = SubResource( 73 ) +Tree/icons/arrow_collapsed = SubResource( 74 ) +Tree/icons/checked = SubResource( 75 ) +Tree/icons/select_arrow = SubResource( 73 ) +Tree/icons/unchecked = SubResource( 76 ) +Tree/icons/updown = SubResource( 77 ) +Tree/styles/bg = SubResource( 78 ) +Tree/styles/bg_focus = SubResource( 78 ) +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/selected = SubResource( 79 ) +Tree/styles/selected_focus = SubResource( 61 ) +Tree/styles/title_button_hover = null +Tree/styles/title_button_normal = null +Tree/styles/title_button_pressed = null +VScrollBar/icons/decrement = null +VScrollBar/icons/decrement_highlight = null +VScrollBar/icons/increment = null +VScrollBar/icons/increment_highlight = null +VScrollBar/styles/grabber = SubResource( 80 ) +VScrollBar/styles/grabber_highlight = SubResource( 81 ) +VScrollBar/styles/grabber_pressed = SubResource( 82 ) +VScrollBar/styles/scroll = SubResource( 83 ) +VScrollBar/styles/scroll_focus = SubResource( 84 ) +VSeparator/constants/separation = 4 +VSeparator/styles/separator = SubResource( 85 ) +VSlider/icons/grabber = SubResource( 86 ) +VSlider/icons/grabber_disabled = SubResource( 87 ) +VSlider/icons/grabber_highlight = SubResource( 88 ) +VSlider/icons/tick = null +VSlider/styles/grabber_area = SubResource( 89 ) +VSlider/styles/grabber_area_highlight = SubResource( 90 ) +VSlider/styles/slider = SubResource( 91 ) diff --git a/assets/ui/sci-fi-godot-theme/sci-fi.png b/assets/ui/sci-fi-godot-theme/sci-fi.png new file mode 100644 index 0000000..c7ab545 Binary files /dev/null and b/assets/ui/sci-fi-godot-theme/sci-fi.png differ diff --git a/assets/player/approx mannequin.png.import b/assets/ui/sci-fi-godot-theme/sci-fi.png.import similarity index 66% rename from assets/player/approx mannequin.png.import rename to assets/ui/sci-fi-godot-theme/sci-fi.png.import index f3d2b5f..b3e25a6 100644 --- a/assets/player/approx mannequin.png.import +++ b/assets/ui/sci-fi-godot-theme/sci-fi.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/approx mannequin.png-6e1845e85175130a6ea95276556c5741.stex" +path="res://.import/sci-fi.png-70718dbf199ccb0353738133c42952e4.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/player/approx mannequin.png" -dest_files=[ "res://.import/approx mannequin.png-6e1845e85175130a6ea95276556c5741.stex" ] +source_file="res://assets/ui/sci-fi-godot-theme/sci-fi.png" +dest_files=[ "res://.import/sci-fi.png-70718dbf199ccb0353738133c42952e4.stex" ] [params] @@ -31,5 +31,5 @@ process/invert_color=false process/normal_map_invert_y=false stream=false size_limit=0 -detect_3d=true +detect_3d=false svg/scale=1.0 diff --git a/assets/ui/ui color palette.aseprite b/assets/ui/ui color palette.aseprite new file mode 100644 index 0000000..3d8a8c9 Binary files /dev/null and b/assets/ui/ui color palette.aseprite differ diff --git a/src/Actors/Blobby/Blobby.tscn b/src/Actors/Blobby/Blobby.tscn index 18a7e24..9a269e4 100644 --- a/src/Actors/Blobby/Blobby.tscn +++ b/src/Actors/Blobby/Blobby.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://assets/effects/blobby-effects-spritesheet.png" type="Texture" id=1] [ext_resource path="res://src/Actors/Blobby/DeathShader.tres" type="Material" id=2] -[ext_resource path="res://src/Actors/Blobby/BlobbyStateMachine.gd" type="Script" id=3] +[ext_resource path="res://src/StateMachines/BlobbyStateMachine.gd" type="Script" id=3] [ext_resource path="res://src/Actors/Blobby/Blobby.gd" type="Script" id=4] [ext_resource path="res://assets/meta/new_dynamicfont.tres" type="DynamicFont" id=5] [ext_resource path="res://src/ThirdParty/Demo/IridescenceBall.tscn" type="PackedScene" id=6] diff --git a/src/Actors/Enemies/Beings/Caterpillar.gd b/src/Actors/Enemies/Beings/Caterpillar.gd index 989db2b..9526d24 100644 --- a/src/Actors/Enemies/Beings/Caterpillar.gd +++ b/src/Actors/Enemies/Beings/Caterpillar.gd @@ -10,19 +10,19 @@ var time = 0 var snap = Vector2.DOWN * block_size func _ready() -> void: - velocity.x = -120 + velocity.x = -120 -func _physics_process(delta: float) -> void: - # rotation - var movement = max(0,sign(sin(time*15))) - if(left_src.is_colliding() && right_src.is_colliding() && !left_wrc.is_colliding() && !right_wrc.is_colliding()): - pass - elif(left_wrc.is_colliding() || (!right_src.is_colliding() && left_src.is_colliding())): - rotation += delta * 7 * movement - else: - rotation += sign(velocity.x) * delta * 7 * movement - - # velocity - var v = Vector2(velocity.x * movement, 0) - time += delta - move_and_slide_with_snap(v.rotated(rotation), snap.rotated(rotation), FLOOR_NORMAL, false, 4, PI, false) +func execute_movement(delta: float) -> void: + # rotation + var movement = max(0,sign(sin(time*15))) + if(left_src.is_colliding() && right_src.is_colliding() && !left_wrc.is_colliding() && !right_wrc.is_colliding()): + pass + elif(left_wrc.is_colliding() || (!right_src.is_colliding() && left_src.is_colliding())): + rotation += delta * 7 * movement + else: + rotation += sign(velocity.x) * delta * 7 * movement + + # velocity + var v = Vector2(velocity.x * movement, 0) + time += delta + move_and_slide_with_snap(v.rotated(rotation), snap.rotated(rotation), FLOOR_NORMAL, false, 4, PI, false) diff --git a/src/Actors/Enemies/Beings/Caterpillar.tscn b/src/Actors/Enemies/Beings/Caterpillar.tscn index d39b364..932ebb3 100644 --- a/src/Actors/Enemies/Beings/Caterpillar.tscn +++ b/src/Actors/Enemies/Beings/Caterpillar.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://assets/enemy/enemy.png" type="Texture" id=1] [ext_resource path="res://src/Actors/Enemies/Beings/Caterpillar.gd" type="Script" id=2] +[ext_resource path="res://src/StateMachines/CaterpillarStateMachine.gd" type="Script" id=3] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 14.7108, 7.85442 ) @@ -78,5 +79,8 @@ collision_mask = 126 [node name="CollisionPolygon2D" type="CollisionShape2D" parent="EnemySkin"] shape = SubResource( 3 ) +[node name="StateMachine" type="Node2D" parent="."] +script = ExtResource( 3 ) + [connection signal="body_entered" from="StompDetector" to="." method="_on_StompDetector_body_entered"] [connection signal="area_entered" from="EnemySkin" to="." method="_on_EnemySkin_area_entered"] diff --git a/src/Actors/Enemies/Beings/Flyer.tscn b/src/Actors/Enemies/Beings/Flyer.tscn index 9055d79..43eb494 100644 --- a/src/Actors/Enemies/Beings/Flyer.tscn +++ b/src/Actors/Enemies/Beings/Flyer.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=23 format=2] [ext_resource path="res://src/Actors/Enemies/Beings/Flyer.gd" type="Script" id=1] -[ext_resource path="res://src/Actors/Enemies/Beings/FlyerStateMachine.gd" type="Script" id=2] +[ext_resource path="res://src/StateMachines/FlyerStateMachine.gd" type="Script" id=2] [ext_resource path="res://assets/meta/new_dynamicfont.tres" type="DynamicFont" id=3] [ext_resource path="res://assets/enemy/flyer-sheet.png" type="Texture" id=4] diff --git a/src/Actors/Enemies/Beings/WhatAreFrog.tscn b/src/Actors/Enemies/Beings/WhatAreFrog.tscn index 31f3453..a1c8826 100644 --- a/src/Actors/Enemies/Beings/WhatAreFrog.tscn +++ b/src/Actors/Enemies/Beings/WhatAreFrog.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://assets/enemy/froshler.png" type="Texture" id=1] [ext_resource path="res://src/Actors/Enemies/Beings/WhatAreFrog.gd" type="Script" id=2] -[ext_resource path="res://src/Actors/Enemies/Beings/WhatAreFrogStateMachine.gd" type="Script" id=3] +[ext_resource path="res://src/StateMachines/WhatAreFrogStateMachine.gd" type="Script" id=3] [ext_resource path="res://assets/meta/new_dynamicfont.tres" type="DynamicFont" id=4] [ext_resource path="res://assets/meta/digits.png" type="Texture" id=5] [ext_resource path="res://assets/enemy/leash-hook.png" type="Texture" id=6] diff --git a/src/Contraptions/GateBlock.gd b/src/Contraptions/GateBlock.gd index 0f17194..b7c74d6 100644 --- a/src/Contraptions/GateBlock.gd +++ b/src/Contraptions/GateBlock.gd @@ -7,15 +7,15 @@ export var locked := true # Called when the node enters the scene tree for the first time. func _ready() -> void: - signalManager.connect("unlocked", self, "unlock") - # if locked: - # $CollisionShape2D.enabled = true - # visible = true + signalManager.connect("unlocked", self, "unlock") + # if locked: + # $CollisionShape2D.enabled = true + # visible = true func unlock(key: String) -> void: - if key.to_lower() == "gateblock": - $CollisionShape2D.disabled = true - visible = false + if key.to_lower() == "gateblock": + $CollisionShape2D.disabled = true + visible = false diff --git a/src/Contraptions/VendingMachine.gd b/src/Contraptions/VendingMachine.gd index 17a6ec5..187162d 100644 --- a/src/Contraptions/VendingMachine.gd +++ b/src/Contraptions/VendingMachine.gd @@ -11,28 +11,28 @@ var activatable = false func _process(delta): - # TODO Global currency count?? Maybe just level intern currency - if activatable && Input.is_action_just_released("interact"): - if(levelState.spend_currency(cost)): - signalManager.emit_signal("currency_updated") - selfActivate() + # TODO Global currency count?? Maybe just level intern currency + if activatable && Input.is_action_just_released("interact"): + if(levelState.spend_currency(cost)): + signalManager.emit_signal("currency_updated") + selfActivate() func selfActivate(): - #TODO Is a event for blobby himself - #blobby.get_node("BubbleShieldViewport/IridescenceBall").visible = true - signalManager.emit_signal("power_up_collected", "shield") - #TODO dis importante - activatorArea.set_deferred("monitoring", false) + #TODO Is a event for blobby himself + #blobby.get_node("BubbleShieldViewport/IridescenceBall").visible = true + signalManager.emit_signal("power_up_collected", "shield") + #TODO dis importante + activatorArea.set_deferred("monitoring", false) func _on_ActivatorArea_area_entered(area:Area2D) -> void: - $Label.visible = true - activatable = true + $Label.visible = true + activatable = true func _on_ActivatorArea_area_exited(area:Area2D) -> void: - unactivatable_timer.start() + unactivatable_timer.start() func _on_Timer_timeout(): - if($ActivatorArea.get_overlapping_bodies().size() == 0): - $Label.visible = false - activatable = false + if($ActivatorArea.get_overlapping_bodies().size() == 0): + $Label.visible = false + activatable = false diff --git a/src/Contraptions/DropThroughPlatforms.tres b/src/Environment/DropThroughPlatforms.tres similarity index 100% rename from src/Contraptions/DropThroughPlatforms.tres rename to src/Environment/DropThroughPlatforms.tres diff --git a/src/Environment/AlienGreenhouseTileSet.tres b/src/Environment/Legacy/AlienGreenhouseTileSet.tres similarity index 94% rename from src/Environment/AlienGreenhouseTileSet.tres rename to src/Environment/Legacy/AlienGreenhouseTileSet.tres index 3d4eec2..b121b5b 100644 --- a/src/Environment/AlienGreenhouseTileSet.tres +++ b/src/Environment/Legacy/AlienGreenhouseTileSet.tres @@ -1,13 +1,13 @@ [gd_resource type="TileSet" load_steps=17 format=2] -[ext_resource path="res://assets/environment/blocks/GreenhouseInnerEdge.png" type="Texture" id=1] -[ext_resource path="res://assets/environment/blocks/GreenhouseOuteredge.png" type="Texture" id=2] -[ext_resource path="res://assets/environment/blocks/GreenhouseHorizontal.png" type="Texture" id=3] +[ext_resource path="res://assets/environment/blocks/Alien-Ship-Ground-Edge-Outer.png" type="Texture" id=1] +[ext_resource path="res://assets/environment/blocks/GreenhouseInnerEdge.png" type="Texture" id=2] +[ext_resource path="res://assets/environment/blocks/GreenhouseOuteredge.png" type="Texture" id=3] [ext_resource path="res://assets/environment/blocks/GreenhouseVertical.png" type="Texture" id=4] -[ext_resource path="res://assets/environment/blocks/Alien-Ship-Ground-Edge.png" type="Texture" id=5] -[ext_resource path="res://assets/environment/blocks/Alien-Ship-Ground-Edge-Outer.png" type="Texture" id=6] +[ext_resource path="res://assets/environment/blocks/Empty-Navigation-Tile.png" type="Texture" id=5] +[ext_resource path="res://assets/environment/blocks/GreenhouseHorizontal.png" type="Texture" id=6] [ext_resource path="res://assets/environment/blocks/Alien-Ship-Ground-Inner.png" type="Texture" id=7] -[ext_resource path="res://assets/environment/blocks/Empty-Navigation-Tile.png" type="Texture" id=8] +[ext_resource path="res://assets/environment/blocks/Alien-Ship-Ground-Edge.png" type="Texture" id=8] [sub_resource type="ConvexPolygonShape2D" id=1] points = PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 ) @@ -37,7 +37,7 @@ outlines = [ PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 ) ] [resource] 0/name = "GreenhouseHorizontal.png 0" -0/texture = ExtResource( 3 ) +0/texture = ExtResource( 6 ) 0/tex_offset = Vector2( 0, 0 ) 0/modulate = Color( 1, 1, 1, 1 ) 0/region = Rect2( 0, 0, 24, 24 ) @@ -58,7 +58,7 @@ outlines = [ PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 ) ] } ] 0/z_index = 0 1/name = "GreenhouseInnerEdge.png 1" -1/texture = ExtResource( 1 ) +1/texture = ExtResource( 2 ) 1/tex_offset = Vector2( 0, 0 ) 1/modulate = Color( 1, 1, 1, 1 ) 1/region = Rect2( 0, 0, 24, 24 ) @@ -79,7 +79,7 @@ outlines = [ PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 ) ] } ] 1/z_index = 0 2/name = "GreenhouseOuteredge.png 2" -2/texture = ExtResource( 2 ) +2/texture = ExtResource( 3 ) 2/tex_offset = Vector2( 0, 0 ) 2/modulate = Color( 1, 1, 1, 1 ) 2/region = Rect2( 0, 0, 24, 24 ) @@ -121,7 +121,7 @@ outlines = [ PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 ) ] } ] 3/z_index = 0 4/name = "Alien-Ship-Ground-Edge.png 4" -4/texture = ExtResource( 5 ) +4/texture = ExtResource( 8 ) 4/tex_offset = Vector2( 0, 0 ) 4/modulate = Color( 1, 1, 1, 1 ) 4/region = Rect2( 0, 0, 24, 24 ) @@ -142,7 +142,7 @@ outlines = [ PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 ) ] } ] 4/z_index = 0 5/name = "Alien-Ship-Ground-Edge-Outer.png 5" -5/texture = ExtResource( 6 ) +5/texture = ExtResource( 1 ) 5/tex_offset = Vector2( 0, 0 ) 5/modulate = Color( 1, 1, 1, 1 ) 5/region = Rect2( 0, 0, 24, 24 ) @@ -198,7 +198,7 @@ outlines = [ PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 ) ] } ] 7/z_index = 0 8/name = "Empty-Navigation-Tile.png 8" -8/texture = ExtResource( 8 ) +8/texture = ExtResource( 5 ) 8/tex_offset = Vector2( 0, 0 ) 8/modulate = Color( 1, 1, 1, 1 ) 8/region = Rect2( 0, 0, 24, 24 ) diff --git a/src/Environment/AlienShipTileSet.tres b/src/Environment/Legacy/AlienShipTileSet.tres similarity index 91% rename from src/Environment/AlienShipTileSet.tres rename to src/Environment/Legacy/AlienShipTileSet.tres index b3bfabd..676d40b 100644 --- a/src/Environment/AlienShipTileSet.tres +++ b/src/Environment/Legacy/AlienShipTileSet.tres @@ -1,20 +1,20 @@ [gd_resource type="TileSet" load_steps=31 format=2] -[ext_resource path="res://assets/environment/blocks/Slope-45.png" type="Texture" id=1] -[ext_resource path="res://assets/environment/blocks/Alien-Ship-Ground-Inner.png" type="Texture" id=2] -[ext_resource path="res://assets/environment/blocks/alienShip1EdgePartTile/alienShip1EdgePartTile.tres" type="Texture" id=3] -[ext_resource path="res://assets/environment/blocks/alienShip1innerPartTile/alienShip1InnerPart.tres" type="Texture" id=4] -[ext_resource path="res://assets/environment/blocks/Alien-Ship-Ground-Edge.png" type="Texture" id=5] -[ext_resource path="res://assets/environment/blocks/Slope-22,5.png" type="Texture" id=6] -[ext_resource path="res://assets/environment/blocks/alienShipSeethroughPipeEdgeOuter/alienShipSeethroughPipeEdgeOuter.tres" type="Texture" id=7] -[ext_resource path="res://assets/environment/blocks/Alien-Ship-Ground-Edge-Outer.png" type="Texture" id=8] -[ext_resource path="res://assets/environment/blocks/Empty-Navigation-Tile.png" type="Texture" id=9] -[ext_resource path="res://assets/environment/blocks/Alien-Ship-Ground-Inner-Fade.png" type="Texture" id=10] -[ext_resource path="res://assets/environment/blocks/Alien-Ship-Ground-Inner-Black.png" type="Texture" id=11] -[ext_resource path="res://assets/environment/blocks/alienShip1innerPartTileFade/alienShip1innerPartTileFadee.tres" type="Texture" id=12] +[ext_resource path="res://assets/environment/blocks/alienShip1EdgePartTile/alienShip1EdgePartTile.tres" type="Texture" id=1] +[ext_resource path="res://assets/environment/blocks/alienShip1innerPartTileFade/alienShip1innerPartTileFadee.tres" type="Texture" id=2] +[ext_resource path="res://assets/environment/blocks/Alien-Ship-Ground-Inner-Black.png" type="Texture" id=3] +[ext_resource path="res://assets/environment/blocks/Alien-Ship-Ground-Inner-Corner-Fade.png" type="Texture" id=4] +[ext_resource path="res://assets/environment/blocks/Alien-Ship-Ground-Edge-Outer.png" type="Texture" id=5] +[ext_resource path="res://assets/environment/blocks/Alien-Ship-Ground-Inner-Fade.png" type="Texture" id=6] +[ext_resource path="res://assets/environment/blocks/Empty-Navigation-Tile.png" type="Texture" id=7] +[ext_resource path="res://assets/environment/blocks/Alien-Ship-Ground-Inner-Corner-Black.png" type="Texture" id=8] +[ext_resource path="res://assets/environment/blocks/Slope-45.png" type="Texture" id=9] +[ext_resource path="res://assets/environment/blocks/Alien-Ship-Ground-Inner.png" type="Texture" id=10] +[ext_resource path="res://assets/environment/blocks/Alien-Ship-Ground-Edge.png" type="Texture" id=11] +[ext_resource path="res://assets/environment/blocks/Slope-22,5.png" type="Texture" id=12] [ext_resource path="res://assets/environment/blocks/alienShip1innerPartTileBlack/alienShip1innerPartTileBlack.tres" type="Texture" id=13] -[ext_resource path="res://assets/environment/blocks/Alien-Ship-Ground-Inner-Corner-Fade.png" type="Texture" id=14] -[ext_resource path="res://assets/environment/blocks/Alien-Ship-Ground-Inner-Corner-Black.png" type="Texture" id=15] +[ext_resource path="res://assets/environment/blocks/alienShipSeethroughPipeEdgeOuter/alienShipSeethroughPipeEdgeOuter.tres" type="Texture" id=14] +[ext_resource path="res://assets/environment/blocks/alienShip1innerPartTile/alienShip1InnerPart.tres" type="Texture" id=15] [sub_resource type="OccluderPolygon2D" id=16] polygon = PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 ) @@ -65,7 +65,7 @@ outlines = [ PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 ) ] [resource] 0/name = "alienShip1EdgePartTile.tres 0" -0/texture = ExtResource( 3 ) +0/texture = ExtResource( 1 ) 0/tex_offset = Vector2( 0, 0 ) 0/modulate = Color( 1, 1, 1, 1 ) 0/region = Rect2( 0, 0, 24, 24 ) @@ -87,7 +87,7 @@ outlines = [ PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 ) ] } ] 0/z_index = 0 1/name = "alienShip1InnerPart.tres 1" -1/texture = ExtResource( 4 ) +1/texture = ExtResource( 15 ) 1/tex_offset = Vector2( 0, 0 ) 1/modulate = Color( 1, 1, 1, 1 ) 1/region = Rect2( 0, 0, 24, 24 ) @@ -109,7 +109,7 @@ outlines = [ PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 ) ] } ] 1/z_index = 0 2/name = "Alien-ship1-Edge-Unanimated.png 2" -2/texture = ExtResource( 5 ) +2/texture = ExtResource( 11 ) 2/tex_offset = Vector2( 0, 0 ) 2/modulate = Color( 1, 1, 1, 1 ) 2/region = Rect2( 0, 0, 24, 24 ) @@ -131,7 +131,7 @@ outlines = [ PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 ) ] } ] 2/z_index = 0 3/name = "Alien-ship1-innerPart-Unanimated.png 3" -3/texture = ExtResource( 2 ) +3/texture = ExtResource( 10 ) 3/tex_offset = Vector2( 0, 0 ) 3/modulate = Color( 1, 1, 1, 1 ) 3/region = Rect2( 0, 0, 24, 24 ) @@ -153,7 +153,7 @@ outlines = [ PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 ) ] } ] 3/z_index = 0 5/name = "SlopeTest.png 5" -5/texture = ExtResource( 1 ) +5/texture = ExtResource( 9 ) 5/tex_offset = Vector2( 0, 0 ) 5/modulate = Color( 1, 1, 1, 1 ) 5/region = Rect2( 0, 0, 24, 24 ) @@ -174,7 +174,7 @@ outlines = [ PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 ) ] } ] 5/z_index = 0 6/name = "SlopeTestSlow.png 6" -6/texture = ExtResource( 6 ) +6/texture = ExtResource( 12 ) 6/tex_offset = Vector2( 0, 0 ) 6/modulate = Color( 1, 1, 1, 1 ) 6/region = Rect2( 0, 0, 48, 24 ) @@ -195,7 +195,7 @@ outlines = [ PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 ) ] } ] 6/z_index = 0 7/name = "Alien-Ship-Ground-Edge-Outer.png 7" -7/texture = ExtResource( 8 ) +7/texture = ExtResource( 5 ) 7/tex_offset = Vector2( 0, 0 ) 7/modulate = Color( 1, 1, 1, 1 ) 7/region = Rect2( 0, 0, 24, 24 ) @@ -217,7 +217,7 @@ outlines = [ PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 ) ] } ] 7/z_index = 0 8/name = "alienShipSeethroughPipeEdgeOuter.tres 8" -8/texture = ExtResource( 7 ) +8/texture = ExtResource( 14 ) 8/tex_offset = Vector2( 0, 0 ) 8/modulate = Color( 1, 1, 1, 1 ) 8/region = Rect2( 0, 0, 24, 24 ) @@ -239,7 +239,7 @@ outlines = [ PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 ) ] } ] 8/z_index = 0 9/name = "Empty-Navigation-Tile.png 9" -9/texture = ExtResource( 9 ) +9/texture = ExtResource( 7 ) 9/tex_offset = Vector2( 0, 0 ) 9/modulate = Color( 1, 1, 1, 1 ) 9/region = Rect2( 0, 0, 24, 24 ) @@ -254,7 +254,7 @@ outlines = [ PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 ) ] 9/shapes = [ ] 9/z_index = 0 10/name = "Alien-Ship-Ground-Inner-Fade.png 10" -10/texture = ExtResource( 10 ) +10/texture = ExtResource( 6 ) 10/tex_offset = Vector2( 0, 0 ) 10/modulate = Color( 1, 1, 1, 1 ) 10/region = Rect2( 0, 0, 24, 24 ) @@ -268,7 +268,7 @@ outlines = [ PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 ) ] 10/shapes = [ ] 10/z_index = 0 11/name = "Alien-Ship-Ground-Inner-Black.png 11" -11/texture = ExtResource( 11 ) +11/texture = ExtResource( 3 ) 11/tex_offset = Vector2( 0, 0 ) 11/modulate = Color( 1, 1, 1, 1 ) 11/region = Rect2( 0, 0, 24, 24 ) @@ -282,7 +282,7 @@ outlines = [ PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 ) ] 11/shapes = [ ] 11/z_index = 0 12/name = "alienShip1innerPartTileFadee.tres 12" -12/texture = ExtResource( 12 ) +12/texture = ExtResource( 2 ) 12/tex_offset = Vector2( 0, 0 ) 12/modulate = Color( 1, 1, 1, 1 ) 12/region = Rect2( 0, 0, 24, 24 ) @@ -310,7 +310,7 @@ outlines = [ PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 ) ] 13/shapes = [ ] 13/z_index = 0 14/name = "Alien-Ship-Ground-Inner-Corner-Fade.png 14" -14/texture = ExtResource( 14 ) +14/texture = ExtResource( 4 ) 14/tex_offset = Vector2( 0, 0 ) 14/modulate = Color( 1, 1, 1, 1 ) 14/region = Rect2( 0, 0, 24, 24 ) @@ -324,7 +324,7 @@ outlines = [ PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 ) ] 14/shapes = [ ] 14/z_index = 0 15/name = "Alien-Ship-Ground-Inner-Corner-Black.png 15" -15/texture = ExtResource( 15 ) +15/texture = ExtResource( 8 ) 15/tex_offset = Vector2( 0, 0 ) 15/modulate = Color( 1, 1, 1, 1 ) 15/region = Rect2( 0, 0, 24, 24 ) diff --git a/src/Environment/Greenhouse.tscn b/src/Environment/Legacy/Greenhouse.tscn similarity index 84% rename from src/Environment/Greenhouse.tscn rename to src/Environment/Legacy/Greenhouse.tscn index efcb9b9..3be5d9d 100644 --- a/src/Environment/Greenhouse.tscn +++ b/src/Environment/Legacy/Greenhouse.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://src/Environment/AlienGreenhouseTileSet.tres" type="TileSet" id=1] +[ext_resource path="res://src/Environment/Legacy/AlienGreenhouseTileSet.tres" type="TileSet" id=1] [ext_resource path="res://src/Environment/RootsAndLeavesTiles.tres" type="TileSet" id=2] [node name="Greenhouse" type="TileMap"] diff --git a/src/Levels/1 Tutorial Level.tscn b/src/Levels/1 Tutorial Level.tscn index f51c560..858d0a5 100644 --- a/src/Levels/1 Tutorial Level.tscn +++ b/src/Levels/1 Tutorial Level.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://src/Levels/Templates/LevelTemplate.gd" type="Script" id=1] [ext_resource path="res://src/Environment/GreenHouseTiles.tres" type="TileSet" id=2] [ext_resource path="res://src/Environment/GreenhousePlatformPlants.tres" type="TileSet" id=3] -[ext_resource path="res://src/Contraptions/DropThroughPlatforms.tres" type="TileSet" id=4] +[ext_resource path="res://src/Environment/DropThroughPlatforms.tres" type="TileSet" id=4] [ext_resource path="res://src/UserInterface/UserInterface.tscn" type="PackedScene" id=5] [ext_resource path="res://src/Utilities/LevelState.tscn" type="PackedScene" id=6] [ext_resource path="res://src/Actors/Blobby/Blobby.tscn" type="PackedScene" id=7] @@ -18,6 +18,7 @@ [sub_resource type="AnimationNodeStateMachinePlayback" id=5] [node name="1 Tutorial Level" type="Node2D"] +physics_interpolation_mode = 2 script = ExtResource( 1 ) __meta__ = { "_edit_horizontal_guides_": [ 464.0 ], @@ -32,18 +33,22 @@ unique_name_in_owner = true [node name="UserInterface" parent="." instance=ExtResource( 5 )] unique_name_in_owner = true +[node name="HUD" parent="UserInterface" index="0"] +visible = false + [node name="Timer" parent="UserInterface/HUD/HUDOverlay/GetBackTimer" index="0"] wait_time = 20.0 [node name="BlobbyCam" parent="." instance=ExtResource( 9 )] +physics_interpolation_mode = 2 unique_name_in_owner = true -drag_margin_bottom = 0.3 +process_mode = 1 [node name="AnimatedSprite" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="4"] -frame = 11 +frame = 1 [node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"] -frame = 10 +frame = 0 [node name="Blobby" parent="." instance=ExtResource( 7 )] unique_name_in_owner = true @@ -74,7 +79,7 @@ collision_layer = 8 collision_mask = 8 bake_navigation = true format = 1 -tile_data = PoolIntArray( -720908, 5, 524293, -720907, 5, 524293, -720906, 5, 524293, -720905, 5, 524293, -720904, 5, 524293, -720903, 5, 524293, -720902, 5, 524293, -720901, 5, 524293, -720900, 5, 524293, -720899, 5, 524293, -720898, 5, 524293, -720897, 5, 524293, -786432, 5, 524293, -786431, 5, 524293, -786430, 5, 524293, -786429, 5, 524293, -786428, 5, 524293, -786427, 5, 524293, -786426, 5, 524293, -786425, 5, 524293, -786424, 5, 524293, -786423, 5, 524293, -786422, 5, 524293, -786421, 5, 524293, -786420, 5, 524293, -786419, 5, 524293, -786418, 5, 524293, -786417, 5, 524293, -786416, 5, 524293, -786415, 5, 524293, -786414, 5, 524293, -786413, 5, 524293, -786412, 5, 524293, -786411, 5, 524293, -786410, 5, 524293, -786409, 5, 524293, -786408, 5, 524293, -786407, 5, 524293, -786406, 5, 524293, -786405, 5, 524293, -786404, 5, 524293, -786403, 5, 524293, -786402, 5, 524293, -786401, 5, 524293, -786400, 5, 524293, -786399, 5, 524293, -786398, 1610612741, 524291, -786397, -1610612731, 458760, -786396, -1610612731, 458760, -786395, -1610612731, 458760, -786394, -1610612731, 458760, -786393, -1610612731, 458760, -786392, -1610612731, 458760, -786391, -1610612731, 458760, -786390, -1610612731, 458760, -786389, -1610612731, 458760, -786388, -1610612731, 458760, -786387, -1610612731, 458760, -786386, -1610612731, 458760, -786385, -1610612731, 458760, -786384, -1610612731, 458760, -786383, -1610612731, 458760, -786382, -1610612731, 458760, -786381, -1610612731, 458760, -786380, -1610612731, 458760, -786379, -1610612731, 458760, -786378, -1610612731, 458760, -786377, -1610612731, 458760, -786376, -1610612731, 458760, -786375, -1610612731, 458760, -786374, -1610612731, 458760, -786373, -1610612731, 458760, -786372, -1610612731, 458760, -786371, -1610612731, 458760, -786370, -1610612731, 458760, -786369, -1610612731, 458760, -786368, 1610612741, 524292, -655372, -1610612731, 524293, -655371, 1610612741, 524291, -655370, -1610612731, 458760, -655369, -1610612731, 458760, -655368, -1610612731, 458760, -655367, -1610612731, 458760, -655366, -1610612731, 458760, -655365, -1610612731, 458760, -655364, -1610612731, 458760, -655363, -1610612731, 458760, -655362, -1610612731, 458760, -655361, -1610612731, 458760, -720896, -1610612731, 458760, -720895, -1610612731, 458760, -720894, 5, 458759, -720893, 5, 458759, -720892, 5, 458759, -720891, 5, 458759, -720890, 5, 458759, -720889, 5, 458759, -720888, 5, 458759, -720887, 5, 458759, -720886, 5, 458759, -720885, 5, 458759, -720884, 5, 458759, -720883, 5, 458759, -720882, 5, 458759, -720881, 5, 458759, -720880, 5, 458759, -720879, 5, 458759, -720878, 5, 458759, -720877, 5, 458759, -720876, 5, 458759, -720875, 5, 458759, -720874, 5, 458759, -720873, 5, 458759, -720872, 5, 458759, -720871, 5, 458759, -720870, 5, 458759, -720869, 5, 458759, -720868, 5, 458759, -720867, 5, 458759, -720866, 5, 458759, -720865, 5, 458759, -720864, 5, 458759, -720863, 5, 458759, -720862, 5, 458756, -720861, -536870907, 196615, -720860, -1073741819, 196611, -720859, -1073741819, 196611, -720858, -1073741819, 196611, -720857, -1073741819, 196611, -720856, -1073741819, 196611, -720855, -1073741819, 196611, -720854, -1073741819, 196611, -720853, -1073741819, 196611, -720852, -1073741819, 196611, -720851, -1073741819, 196611, -720850, -1073741819, 196611, -720849, -1073741819, 196611, -720848, -1073741819, 196611, -720847, -1073741819, 196611, -720846, -1073741819, 196611, -720845, -1073741819, 196611, -720844, -1073741819, 196611, -720843, -1073741819, 196611, -720842, -1073741819, 196611, -720841, -1073741819, 196611, -720840, -1073741819, 196611, -720839, -1073741819, 196611, -720838, -1073741819, 196611, -720837, -1073741819, 196611, -720836, -1073741819, 196611, -720835, -1073741819, 196611, -720834, -1073741819, 196609, -720833, -1073741819, 131073, -720832, 1610612741, 458760, -589836, -1610612731, 524293, -589835, 5, 458760, -589834, 1610612741, 196609, -589833, -1073741819, 196611, -589832, -1073741819, 196611, -589831, -1073741819, 196611, -589830, -1073741819, 196611, -589829, -1073741819, 196611, -589828, -1073741819, 196611, -589827, -1073741819, 196611, -589826, -1073741819, 196611, -589825, -1073741819, 196611, -655360, -1073741819, 196611, -655359, 1073741829, 196615, -655358, -536870907, 196615, -655357, -1073741819, 196611, -655356, -1073741819, 196611, -655355, -1073741819, 196611, -655354, -1073741819, 196611, -655353, -1073741819, 196611, -655352, -1073741819, 196611, -655351, -1073741819, 196611, -655350, -1073741819, 196611, -655349, -1073741819, 196611, -655348, -1073741819, 196611, -655347, -1073741819, 196611, -655346, -1073741819, 196611, -655345, -1073741819, 196611, -655344, -1073741819, 196611, -655343, -1073741819, 196611, -655342, -1073741819, 196611, -655341, -1073741819, 196611, -655340, -1073741819, 196611, -655339, -1073741819, 196611, -655338, -1073741819, 196611, -655337, -1073741819, 196611, -655336, -1073741819, 196611, -655335, -1073741819, 196611, -655334, -1073741819, 196611, -655333, -1073741819, 196611, -655332, -1073741819, 196611, -655331, -1073741819, 196611, -655330, -1073741819, 196611, -655329, -1073741819, 196611, -655328, -1073741819, 196611, -655327, -1073741819, 196611, -655326, -1073741819, 196611, -655325, -536870907, 131080, -655324, 1610612741, 65539, -655323, 1610612741, 2, -655322, 1610612741, 2, -655321, 1610612741, 2, -655320, 1610612741, 2, -655319, 1610612741, 2, -655318, 1610612741, 2, -655317, 1610612741, 2, -655316, 1610612741, 2, -655315, 1610612741, 2, -655314, 1610612741, 2, -655313, 1610612741, 2, -655312, 1610612741, 2, -655311, 1610612741, 2, -655310, 1610612741, 2, -655309, 1610612741, 2, -655308, 1610612741, 2, -655307, 1610612741, 2, -655306, 1610612741, 2, -655305, 1610612741, 2, -655304, 1610612741, 2, -655303, 1610612741, 2, -655302, 1610612741, 2, -655301, 1610612741, 2, -655300, 1610612741, 2, -655299, 1610612741, 65538, -655298, 5, 196611, -655297, -1073741819, 65546, -655296, 1610612741, 458760, -524300, -1610612731, 524293, -524299, 5, 458760, -524298, -1610612731, 196610, -524297, 5, 65540, -524296, 5, 10, -524295, 5, 10, -524294, 5, 10, -524293, 5, 10, -524292, 5, 10, -524291, 5, 10, -524290, 5, 10, -524289, 5, 10, -589824, 5, 65541, -589823, 5, 196611, -589822, 1073741829, 196612, -589821, -1073741819, 131080, -589820, 536870917, 262150, -589819, 1073741829, 196618, -589818, 536870917, 262144, -589817, 536870917, 196618, -589816, 1073741829, 196618, -589815, -1073741819, 65545, -589814, 5, 262144, -589813, 536870917, 327687, -589812, 536870917, 262144, -589811, 1073741829, 196612, -589810, 1073741829, 196617, -589809, -2147483643, 196612, -589808, -2147483643, 196617, -589807, 1073741829, 196618, -589806, 536870917, 196612, -589805, -536870907, 131082, -589804, 1073741829, 196618, -589803, 1073741829, 131075, -589802, 536870917, 196618, -589801, 1073741829, 196618, -589800, -1073741819, 131082, -589799, 536870917, 196618, -589798, -536870907, 196616, -589797, -2147483643, 196616, -589796, 536870917, 196618, -589795, 1073741829, 196617, -589794, -2147483643, 196612, -589793, -2147483643, 196617, -589792, 1073741829, 196618, -589791, -2147483643, 131077, -589790, 1073741829, 196618, -589789, 1610612741, 196611, -589788, 5, 7, -589787, 7, 0, -589786, 7, 0, -589785, 7, 0, -589784, 7, 0, -589783, 7, 0, -589782, 7, 0, -589781, 7, 0, -589780, 7, 0, -589779, 7, 0, -589778, 7, 0, -589777, 7, 0, -589776, 536870917, 0, -589775, 7, 0, -589774, 7, 0, -589773, 7, 0, -589772, 7, 0, -589771, 7, 0, -589770, 7, 0, -589769, 7, 0, -589768, 7, 0, -589767, 7, 0, -589766, 7, 0, -589765, 7, 0, -589764, 7, 0, -589763, 5, 6, -589762, 5, 196611, -589761, -1073741819, 65546, -589760, 1610612741, 458760, -458764, -1610612731, 524293, -458763, 5, 458760, -458762, -1610612731, 196610, -458761, 5, 7, -458757, 0, 1, -458756, 0, 393217, -458755, 0, 2, -458754, 0, 327686, -524288, 1610612741, 7, -524287, 5, 196611, -524286, 1073741829, 196612, -524285, 1610612741, 196612, -524284, -2147483643, 131074, -524283, 1073741829, 196618, -524282, 536870917, 262144, -524281, 536870917, 196618, -524280, 1073741829, 196618, -524279, 5, 196611, -524278, 5, 262144, -524277, -536870907, 65545, -524276, 536870917, 262144, -524275, 1073741829, 196612, -524274, 1073741829, 196612, -524273, 536870917, 262151, -524272, 536870917, 196612, -524271, 1073741829, 196618, -524270, -2147483643, 131079, -524269, 1073741829, 196612, -524268, 1073741829, 196618, -524267, 1073741829, 196612, -524266, 536870917, 196618, -524265, 1073741829, 196618, -524264, 5, 196611, -524263, 536870917, 196618, -524262, -536870907, 196616, -524261, -2147483643, 196616, -524260, 536870917, 196618, -524259, 1073741829, 196612, -524258, 536870917, 393220, -524257, 536870917, 196612, -524256, 1073741829, 196618, -524255, 536870917, 196611, -524254, 1073741829, 196618, -524253, 1610612741, 196611, -524252, 5, 7, -524251, 7, 0, -524250, 7, 0, -524249, 7, 0, -524248, 7, 0, -524247, 7, 0, -524246, 7, 0, -524245, 7, 0, -524244, 7, 0, -524243, 7, 0, -524242, 7, 0, -524241, 7, 0, -524240, 7, 0, -524239, 7, 0, -524238, 7, 0, -524237, 7, 0, -524236, 7, 0, -524235, 7, 0, -524234, 7, 0, -524233, 7, 0, -524232, 7, 0, -524231, 7, 0, -524230, 7, 0, -524229, 7, 0, -524228, 7, 0, -524227, 5, 6, -524226, 5, 196611, -524225, -1073741819, 196613, -524224, 1610612741, 458760, -393228, -1610612731, 524293, -393227, 5, 458760, -393226, -1610612731, 196610, -393225, 5, 7, -458752, 1610612741, 7, -458751, 5, 196611, -458750, 1073741829, 196612, -458749, -536870907, 131077, -458748, 536870917, 393221, -458747, 1073741829, 196618, -458746, 536870917, 262144, -458745, 536870917, 196618, -458744, 1073741829, 196618, -458743, -2147483643, 65545, -458742, 5, 262144, -458741, 536870917, 327687, -458740, 536870917, 262144, -458739, 1073741829, 196612, -458738, -536870907, 196617, -458737, -536870907, 196612, -458736, 536870917, 196617, -458735, 1073741829, 196618, -458734, 536870917, 196612, -458733, 1073741829, 196612, -458732, 1073741829, 196618, -458731, 536870917, 262153, -458730, 536870917, 196618, -458729, 1073741829, 196618, -458728, -1610612731, 131078, -458727, 536870917, 196618, -458726, -536870907, 196616, -458725, -2147483643, 196616, -458724, 536870917, 196618, -458723, -536870907, 196617, -458722, -536870907, 196612, -458721, 536870917, 196617, -458720, 1073741829, 196618, -458719, 536870917, 131077, -458718, 1073741829, 196618, -458717, 1610612741, 196611, -458716, 5, 7, -458715, 7, 0, -458714, 7, 0, -458713, 7, 0, -458712, 7, 0, -458711, 7, 0, -458710, 7, 0, -458709, 7, 0, -458708, 7, 0, -458707, 7, 0, -458706, 7, 0, -458705, 7, 0, -458704, 7, 0, -458703, 7, 0, -458702, 7, 0, -458701, 7, 0, -458700, 7, 0, -458699, 7, 0, -458698, 7, 0, -458697, 7, 0, -458696, 7, 0, -458695, 7, 0, -458694, 7, 0, -458693, 7, 0, -458692, 7, 0, -458691, 5, 6, -458690, 5, 196611, -458689, -2147483643, 131075, -458688, 1610612741, 458760, -327692, -1610612731, 524293, -327691, 5, 458760, -327690, -1610612731, 196610, -327689, 5, 7, -327685, 0, 4, -327684, 1, 393223, -327683, 1, 458753, -327682, 0, 5, -393216, 1610612741, 7, -393215, 5, 196611, -393214, 536870917, 196615, -393213, 536870917, 196610, -393212, 536870917, 196610, -393211, 1073741829, 131078, -393210, 536870917, 196610, -393209, 536870917, 196610, -393208, 536870917, 196610, -393207, 536870917, 196610, -393206, 1073741829, 131078, -393205, 536870917, 196610, -393204, 536870917, 196610, -393203, 536870917, 196610, -393202, 536870917, 196610, -393201, 536870917, 196610, -393200, 536870917, 196610, -393199, 536870917, 196610, -393198, 536870917, 196610, -393197, 536870917, 196610, -393196, 536870917, 196610, -393195, 536870917, 196610, -393194, 536870917, 196610, -393193, 536870917, 196610, -393192, 536870917, 196610, -393191, 1073741829, 131078, -393190, 536870917, 196610, -393189, 536870917, 196610, -393188, 536870917, 196610, -393187, 536870917, 196610, -393186, 536870917, 196610, -393185, 536870917, 196610, -393184, 536870917, 196610, -393183, 536870917, 327688, -393182, 536870917, 196610, -393181, 536870917, 196617, -393180, 5, 7, -393179, 7, 0, -393178, 7, 0, -393177, 7, 0, -393176, 7, 0, -393175, 7, 0, -393174, 7, 0, -393173, 7, 0, -393172, 7, 0, -393171, 7, 0, -393170, 7, 0, -393169, 7, 0, -393168, 7, 0, -393167, 7, 0, -393166, 7, 0, -393165, 7, 0, -393164, 7, 0, -393163, 7, 0, -393162, 7, 0, -393161, 7, 0, -393160, 7, 0, -393159, 7, 0, -393158, 7, 0, -393157, 7, 0, -393156, 7, 0, -393155, 5, 6, -393154, 5, 196611, -393153, 1073741829, 196612, -393152, 1610612741, 458760, -262156, -1610612731, 524293, -262155, 5, 458760, -262154, -1610612731, 196610, -262153, 5, 7, -262149, 0, 6, -262148, 0, 7, -262147, 0, 7, -262146, 0, 65536, -327680, 1610612741, 7, -327679, 1073741829, 131076, -327678, -1073741819, 196611, -327677, -1073741819, 196611, -327676, 5, 131078, -327675, -1073741819, 196611, -327674, -1073741819, 196611, -327673, 1610612741, 131082, -327672, 5, 131078, -327671, -1073741819, 196611, -327670, -1073741819, 196611, -327669, -1073741819, 196611, -327668, -1073741819, 196611, -327667, 1610612741, 131082, -327666, 1610612741, 131082, -327665, -1073741819, 196611, -327664, 1610612741, 131079, -327663, -1073741819, 196611, -327662, -1073741819, 196611, -327661, 1610612741, 131079, -327660, 1610612741, 131082, -327659, -1073741819, 196611, -327658, -1073741819, 196611, -327657, -1073741819, 196611, -327656, -1073741819, 196611, -327655, -1073741819, 196611, -327654, 536870917, 327688, -327653, -1073741819, 196611, -327652, -1073741819, 196611, -327651, -1073741819, 196611, -327650, -1073741819, 196611, -327649, 536870917, 131078, -327648, -1073741819, 196611, -327647, -1073741819, 196611, -327646, -1073741819, 196611, -327645, -536870907, 131076, -327644, 5, 7, -327643, 7, 0, -327642, 7, 0, -327641, 7, 0, -327640, 7, 0, -327639, 7, 0, -327638, 7, 0, -327637, 7, 0, -327636, 7, 0, -327635, 7, 0, -327634, 7, 0, -327633, 7, 0, -327632, 7, 0, -327631, 7, 0, -327630, 7, 0, -327629, 7, 0, -327628, 7, 0, -327627, 7, 0, -327626, 7, 0, -327625, 7, 0, -327624, 7, 0, -327623, 7, 0, -327622, 7, 0, -327621, 7, 0, -327620, 7, 0, -327619, 5, 6, -327618, 5, 196611, -327617, -536870907, 393220, -327616, 1610612741, 458760, -196620, -1610612731, 524293, -196619, 5, 458760, -196618, -1610612731, 196610, -196617, 5, 7, -262144, 5, 9, -262143, 5, 10, -262142, 5, 10, -262141, 5, 10, -262140, 5, 10, -262139, 5, 10, -262138, 5, 10, -262137, 5, 10, -262136, 5, 10, -262135, 5, 10, -262134, 5, 10, -262133, 5, 10, -262132, 5, 10, -262131, 5, 10, -262130, 5, 10, -262129, 5, 10, -262128, 5, 10, -262127, 5, 10, -262126, 5, 10, -262125, 5, 10, -262124, 5, 10, -262123, 5, 10, -262122, 5, 10, -262121, 5, 10, -262120, 5, 10, -262119, 5, 10, -262118, 5, 10, -262117, 5, 10, -262116, 5, 10, -262115, 5, 10, -262114, 5, 10, -262113, 5, 10, -262112, 5, 10, -262111, 5, 10, -262110, 5, 10, -262109, 5, 10, -262108, 5, 65536, -262107, 7, 0, -262106, 7, 0, -262105, 7, 0, -262104, 7, 0, -262103, 7, 0, -262102, 7, 0, -262101, 7, 0, -262100, 7, 0, -262099, 7, 0, -262098, 7, 0, -262097, 7, 0, -262096, 7, 0, -262095, 7, 0, -262094, 7, 0, -262093, 7, 0, -262092, 7, 0, -262091, 7, 0, -262090, 7, 0, -262089, 7, 0, -262088, 7, 0, -262087, 7, 0, -262086, 7, 0, -262085, 7, 0, -262084, 7, 0, -262083, 5, 6, -262082, 5, 196611, -262081, 1073741829, 196612, -262080, 1610612741, 458760, -131084, -1610612731, 524293, -131083, 5, 458760, -131082, -1610612731, 196610, -131081, 5, 7, -196603, 1, 6, -196602, 1, 7, -196601, 1, 7, -196600, 1, 7, -196599, 1, 7, -196598, 1, 65536, -196591, 1, 4, -196590, -1610612735, 196614, -196589, 1, 393216, -196588, 1, 2, -196587, 1, 2, -196586, 1, 2, -196585, 1, 3, -196579, 7, 0, -196578, 7, 0, -196577, 7, 0, -196576, 7, 0, -196575, 7, 0, -196574, 7, 0, -196573, 7, 0, -196572, 7, 0, -196571, 7, 0, -196570, 7, 0, -196569, 7, 0, -196568, 7, 0, -196567, 7, 0, -196566, 7, 0, -196565, 7, 0, -196564, 7, 0, -196563, 7, 0, -196562, 7, 0, -196561, 7, 0, -196560, 7, 0, -196559, 7, 0, -196558, 7, 0, -196557, 7, 0, -196556, 7, 0, -196555, 7, 0, -196554, 7, 0, -196553, 7, 0, -196552, 7, 0, -196551, 7, 0, -196550, 7, 0, -196549, 7, 0, -196548, 7, 0, -196547, 5, 6, -196546, 5, 196611, -196545, 1073741829, 196612, -196544, 1610612741, 458760, -65548, -1610612731, 524293, -65547, 5, 458760, -65546, -1610612731, 196610, -65545, 5, 7, -131055, 1, 4, -131054, -1610612735, 196614, -131053, 1, 393218, -131052, 1, 393219, -131051, 1, 393219, -131050, 1, 393220, -131049, 1, 5, -131043, 7, 0, -131042, 7, 0, -131041, 7, 0, -131040, 7, 0, -131039, 7, 0, -131038, 7, 0, -131037, 7, 0, -131036, 7, 0, -131035, 7, 0, -131034, 7, 0, -131033, 7, 0, -131032, 7, 0, -131031, 7, 0, -131030, 7, 0, -131029, 5, 65542, -131028, 5, 65543, -131027, 5, 65544, -131024, 7, 0, -131023, 7, 0, -131022, 7, 0, -131021, 7, 0, -131020, 7, 0, -131019, 7, 0, -131018, 7, 0, -131017, 7, 0, -131016, 7, 0, -131015, 7, 0, -131014, 7, 0, -131013, 7, 0, -131012, 7, 0, -131011, 5, 6, -131010, 5, 196611, -131009, 1073741829, 327688, -131008, 1610612741, 458760, -12, -1610612731, 524293, -11, 5, 458760, -10, -1610612731, 196610, -9, 5, 7, -65519, 1, 4, -65518, -1610612735, 196614, -65514, 1, 393222, -65513, 1, 393216, -65512, 1, 2, -65511, 1, 2, -65510, 1, 327686, -65507, 7, 0, -65506, 7, 0, -65505, 7, 0, -65504, 7, 0, -65503, 7, 0, -65502, 7, 0, -65501, 7, 0, -65500, 7, 0, -65499, 7, 0, -65498, 7, 0, -65497, 7, 0, -65496, 7, 0, -65495, 7, 0, -65494, 7, 0, -65493, 7, 0, -65492, 7, 0, -65491, 7, 0, -65490, 7, 0, -65489, 7, 0, -65488, 7, 0, -65487, 7, 0, -65486, 7, 0, -65485, 7, 0, -65484, 7, 0, -65483, 7, 0, -65482, 5, 1, -65481, 5, 3, -65480, 5, 3, -65479, 5, 3, -65478, 5, 3, -65477, 5, 3, -65476, 5, 3, -65475, 5, 65539, -65474, 5, 196611, -65473, -1073741819, 196613, -65472, 1610612741, 458760, 65524, -1610612731, 524293, 65525, 5, 458760, 65526, -1610612731, 196610, 65527, 5, 65538, 65528, 5, 2, 65529, 5, 2, 65530, 5, 2, 65531, 5, 2, 65532, 5, 2, 65533, 5, 2, 65534, 5, 2, 65535, 5, 2, 0, 5, 3, 1, 5, 3, 2, 5, 3, 3, 5, 3, 4, 5, 3, 5, 5, 3, 6, 5, 3, 7, 5, 3, 8, 5, 3, 9, 5, 3, 10, 5, 3, 11, 5, 3, 12, 5, 3, 13, 5, 3, 14, 5, 3, 15, 5, 2, 16, 5, 2, 17, 5, 2, 18, 5, 2, 19, 5, 2, 20, 5, 2, 21, 5, 2, 22, 5, 2, 23, 5, 2, 24, 5, 2, 25, 5, 2, 26, 5, 2, 27, 5, 2, 28, 5, 2, 29, 5, 2, 30, 5, 2, 31, 5, 2, 32, 5, 2, 33, 5, 2, 34, 5, 2, 35, 5, 2, 36, 5, 2, 37, 5, 5, 38, 7, 0, 39, 7, 0, 40, 7, 0, 41, 7, 0, 42, 7, 0, 43, 7, 0, 44, 7, 0, 45, 7, 0, 46, 7, 0, 47, 7, 0, 48, 7, 0, 49, 7, 0, 50, 7, 0, 51, 7, 0, 52, 7, 0, 53, 7, 0, 54, 5, 6, 55, 5, 131076, 56, -1610612731, 196611, 57, -1610612731, 196611, 58, -1610612731, 196611, 59, -1610612731, 196611, 60, -1610612731, 196611, 61, -1610612731, 196611, 62, 5, 196609, 63, -1073741819, 196613, 64, 1610612741, 458760, 131060, -1610612731, 524293, 131061, 5, 458760, 131062, -1610612731, 196609, 131063, -1610612731, 196611, 131064, -1610612731, 196611, 131065, -1610612731, 196611, 131066, -1610612731, 196611, 131067, -1610612731, 196611, 131068, -1610612731, 196611, 131069, -1610612731, 196611, 131070, -1610612731, 196611, 131071, -1610612731, 196611, 65536, -1610612731, 196611, 65537, -1610612731, 196611, 65538, -1610612731, 196611, 65539, -1610612731, 196611, 65540, -1610612731, 196611, 65541, -1610612731, 196611, 65542, -1610612731, 196611, 65543, -1610612731, 196611, 65544, -1610612731, 196611, 65545, -1610612731, 196611, 65546, -1610612731, 196611, 65547, -1610612731, 196611, 65548, -1610612731, 196611, 65549, -1610612731, 196611, 65550, -1610612731, 196611, 65551, -1610612731, 196611, 65552, -1610612731, 196611, 65553, -1610612731, 196611, 65554, -1610612731, 196611, 65555, -1610612731, 196611, 65556, -1610612731, 196611, 65557, -1610612731, 196611, 65558, -1610612731, 196611, 65559, -1610612731, 196611, 65560, -1610612731, 196611, 65561, -1610612731, 196611, 65562, -1610612731, 196611, 65563, -1610612731, 196611, 65564, -1610612731, 196611, 65565, -1610612731, 196611, 65566, 1610612741, 196613, 65567, 1610612741, 196613, 65568, 1610612741, 196613, 65569, -1610612731, 196611, 65570, -1610612731, 196611, 65571, -1610612731, 196611, 65572, -1610612731, 131076, 65573, 5, 8, 65574, 7, 0, 65575, 7, 0, 65576, 7, 0, 65577, 7, 0, 65578, 7, 0, 65579, 7, 0, 65580, 7, 0, 65581, 7, 0, 65582, 7, 0, 65583, 7, 0, 65584, 7, 0, 65585, 7, 0, 65586, 5, 1, 65587, 5, 3, 65588, 5, 3, 65589, 5, 3, 65590, 5, 65539, 65591, 5, 196611, 65592, -1073741819, 196618, 65593, -1073741819, 196618, 65594, -1073741819, 196618, 65595, -1073741819, 196618, 65596, -1073741819, 196618, 65597, -1073741819, 196618, 65598, -1073741819, 196618, 65599, -1073741819, 196613, 65600, 1610612741, 458760, 196596, -1610612731, 524293, 196597, 5, 458760, 196598, 536870917, 196610, 196599, 536870917, 196610, 196600, 536870917, 196610, 196601, 536870917, 196610, 196602, 536870917, 196610, 196603, 536870917, 196610, 196604, 536870917, 196610, 196605, 536870917, 196610, 196606, 536870917, 196610, 196607, 536870917, 196610, 131072, 536870917, 196610, 131073, 536870917, 196610, 131074, -1610612731, 589830, 131075, -1610612731, 589828, 131076, -1610612731, 589828, 131077, -1610612731, 589828, 131078, 5, 589827, 131079, 1610612741, 196614, 131080, -1073741819, 196614, 131081, 5, 524298, 131082, -1610612731, 589828, 131083, -1610612731, 589828, 131084, -1610612731, 589828, 131085, -1610612731, 589828, 131086, 5, 589827, 131087, 1610612741, 196612, 131088, -1073741819, 589827, 131089, -1610612731, 589828, 131090, -1610612731, 589828, 131091, -1610612731, 589828, 131092, -1610612731, 589828, 131093, -1610612731, 589828, 131094, -1610612731, 589828, 131095, -1610612731, 589828, 131096, 5, 589827, 131097, 1610612741, 196614, 131098, -1073741819, 196614, 131099, 5, 524298, 131100, -1610612731, 589828, 131101, -1610612731, 589828, 131102, -1610612731, 589828, 131103, -1610612731, 589828, 131104, -1610612731, 589828, 131105, -1610612731, 589828, 131106, 1610612741, 589830, 131107, 536870917, 262152, 131108, 1610612741, 196611, 131109, 5, 8, 131110, 7, 0, 131111, 7, 0, 131112, 7, 0, 131113, 7, 0, 131114, 7, 0, 131115, 7, 0, 131116, 7, 0, 131117, 7, 0, 131118, 7, 0, 131119, 7, 0, 131120, 7, 0, 131121, 7, 0, 131122, 5, 6, 131123, -1610612731, 131077, 131124, -1610612731, 196611, 131125, -1610612731, 196611, 131126, -1610612731, 196611, 131127, 5, 196609, 131128, 1610612741, 196613, 131129, 1610612741, 196613, 131130, 1610612741, 196613, 131131, 1610612741, 196613, 131132, 1610612741, 196613, 131133, 1610612741, 196613, 131134, 1610612741, 196613, 131135, 5, 196614, 131136, 1610612741, 458760, 262132, -1610612731, 524293, 262133, 5, 458760, 262134, 1073741829, 196610, 262135, 1073741829, 196610, 262136, 1073741829, 196610, 262137, 1073741829, 196610, 262138, 1073741829, 196610, 262139, 1073741829, 196610, 262140, 1073741829, 196610, 262141, 1073741829, 196610, 262142, 1073741829, 196610, 262143, 1073741829, 196610, 196608, 1073741829, 196610, 196609, 1073741829, 196610, 196610, 536870917, 589832, 196611, -1073741819, 589828, 196612, -1073741819, 589828, 196613, -1073741819, 589828, 196614, 1610612741, 524298, 196615, -1610612731, 196614, 196616, 5, 196614, 196617, 5, 589830, 196618, -1073741819, 589828, 196619, -1073741819, 589828, 196620, -1073741819, 589828, 196621, -1073741819, 589828, 196622, 5, 589832, 196623, 1610612741, 196612, 196624, 1610612741, 589827, 196625, -1073741819, 589828, 196626, -1073741819, 589828, 196627, -1073741819, 589828, 196628, -1073741819, 589828, 196629, -1073741819, 589828, 196630, -1073741819, 589828, 196631, -1073741819, 589828, 196632, 1610612741, 524298, 196633, -1610612731, 196614, 196634, 5, 196614, 196635, 5, 589830, 196636, -1073741819, 589828, 196637, -1073741819, 589828, 196638, -1073741819, 589828, 196639, -1073741819, 589828, 196640, -1073741819, 589828, 196641, -1073741819, 589828, 196642, 1610612741, 524298, 196643, -2147483643, 131074, 196644, 1610612741, 196611, 196645, 5, 65538, 196646, 5, 2, 196647, 5, 2, 196648, 5, 2, 196649, 5, 2, 196650, 5, 2, 196651, 5, 2, 196652, 5, 2, 196653, 5, 2, 196654, 5, 2, 196655, 5, 2, 196656, 5, 2, 196657, 5, 2, 196658, 5, 65539, 196659, -1610612731, 196613, 196660, 1073741829, 327688, 196661, -2147483643, 131074, 196662, -1073741819, 458753, 196663, -1073741819, 458760, 196664, -1073741819, 458760, 196665, -1073741819, 458760, 196666, -1073741819, 458760, 196667, -1073741819, 458760, 196668, -1073741819, 458760, 196669, -1073741819, 458760, 196670, -1073741819, 458760, 196671, -1073741819, 458760, 196672, -1073741819, 524292, 327668, -1610612731, 524293, 327669, 5, 458760, 327670, -2147483643, 196618, 327671, -2147483643, 196618, 327672, -2147483643, 196618, 327673, -2147483643, 196618, 327674, -2147483643, 196618, 327675, -2147483643, 196618, 327676, -2147483643, 196618, 327677, -2147483643, 196618, 327678, -2147483643, 196618, 327679, -2147483643, 196618, 262144, -2147483643, 196618, 262145, -2147483643, 196618, 262146, -2147483643, 196618, 262147, -2147483643, 196618, 262148, -2147483643, 196618, 262149, -2147483643, 196618, 262150, -2147483643, 327688, 262151, -2147483643, 196618, 262152, -2147483643, 196618, 262153, -2147483643, 196618, 262154, -2147483643, 196618, 262155, -2147483643, 196618, 262156, -2147483643, 196618, 262157, -2147483643, 196618, 262158, -2147483643, 327688, 262159, -2147483643, 196618, 262160, -2147483643, 196618, 262161, -2147483643, 196618, 262162, -2147483643, 196618, 262163, -2147483643, 196618, 262164, -2147483643, 196618, 262165, -2147483643, 196618, 262166, -2147483643, 196618, 262167, -2147483643, 196618, 262168, -2147483643, 327688, 262169, -2147483643, 196618, 262170, -2147483643, 196618, 262171, -2147483643, 196618, 262172, -2147483643, 196618, 262173, -2147483643, 196618, 262174, -2147483643, 196618, 262175, -2147483643, 196618, 262176, -2147483643, 196618, 262177, -2147483643, 196618, 262178, -2147483643, 327688, 262179, -536870907, 131076, 262180, -1610612731, 196609, 262181, -1610612731, 196611, 262182, -1610612731, 196611, 262183, -1610612731, 196611, 262184, -1610612731, 196611, 262185, -1610612731, 196611, 262186, -1610612731, 196611, 262187, 536870917, 131082, 262188, -1610612731, 196611, 262189, 1073741829, 131078, 262190, -1610612731, 196611, 262191, -1610612731, 196611, 262192, -1610612731, 196611, 262193, -1610612731, 196611, 262194, 1610612741, 196613, 262195, 5, 196609, 262196, 1073741829, 327688, 262197, -2147483643, 131075, 262198, 1610612741, 458760, 262199, -1610612731, 524293, 262200, -1610612731, 524293, 262201, -1610612731, 524293, 262202, -1610612731, 524293, 262203, -1610612731, 524293, 262204, -1610612731, 524293, 262205, -1610612731, 524293, 262206, -1610612731, 524293, 262207, -1610612731, 524293, 262208, -1610612731, 524293, 393204, -1610612731, 524293, 393205, -1610612731, 524291, 393206, -1073741819, 458760, 393207, -1073741819, 458760, 393208, -1073741819, 458760, 393209, -1073741819, 458760, 393210, -1073741819, 458760, 393211, -1073741819, 458760, 393212, -1073741819, 458760, 393213, -1073741819, 458760, 393214, -1073741819, 458760, 393215, -1073741819, 458760, 327680, -1073741819, 458760, 327681, -1073741819, 458760, 327682, -1073741819, 458760, 327683, -1073741819, 458760, 327684, -1073741819, 458760, 327685, -1073741819, 458760, 327686, -1073741819, 458760, 327687, -1073741819, 458760, 327688, -1073741819, 458760, 327689, -1073741819, 458760, 327690, -1073741819, 458760, 327691, -1073741819, 458760, 327692, -1073741819, 458760, 327693, -1073741819, 458760, 327694, -1073741819, 458760, 327695, -1073741819, 458760, 327696, -1073741819, 458760, 327697, -1073741819, 458760, 327698, -1073741819, 458760, 327699, -1073741819, 458760, 327700, -1073741819, 458760, 327701, -1073741819, 458760, 327702, -1073741819, 458760, 327703, -1073741819, 458760, 327704, -1073741819, 458760, 327705, -1073741819, 458760, 327706, -1073741819, 458760, 327707, -1073741819, 458760, 327708, -1073741819, 458760, 327709, -1073741819, 458760, 327710, -1073741819, 458760, 327711, -1073741819, 458760, 327712, -1073741819, 458760, 327713, -1073741819, 458760, 327714, -1073741819, 458760, 327715, -1073741819, 458760, 327716, -1073741819, 458760, 327717, -1073741819, 458760, 327718, -1073741819, 458760, 327719, -1073741819, 458760, 327720, -1073741819, 458760, 327721, -1073741819, 458760, 327722, -1073741819, 458760, 327723, -1073741819, 458760, 327724, -1073741819, 458760, 327725, -1073741819, 458760, 327726, -1073741819, 458760, 327727, -1073741819, 458760, 327728, -1073741819, 458760, 327729, -1073741819, 458760, 327730, -1073741819, 458760, 327731, -1073741819, 458760, 327732, -1073741819, 458760, 327733, -1073741819, 458760, 327734, -1073741819, 524292, 327735, -1610612731, 524293, 327736, -1610612731, 524293, 327737, -1610612731, 524293, 327738, -1610612731, 524293, 327739, -1610612731, 524293, 327740, -1610612731, 524293, 327741, -1610612731, 524293, 327742, -1610612731, 524293, 327743, -1610612731, 524293, 327744, -1610612731, 524293 ) +tile_data = PoolIntArray( -720908, 5, 524293, -720907, 5, 524293, -720906, 5, 524293, -720905, 5, 524293, -720904, 5, 524293, -720903, 5, 524293, -720902, 5, 524293, -720901, 5, 524293, -720900, 5, 524293, -720899, 5, 524293, -720898, 5, 524293, -720897, 5, 524293, -786432, 5, 524293, -786431, 5, 524293, -786430, 5, 524293, -786429, 5, 524293, -786428, 5, 524293, -786427, 5, 524293, -786426, 5, 524293, -786425, 5, 524293, -786424, 5, 524293, -786423, 5, 524293, -786422, 5, 524293, -786421, 5, 524293, -786420, 5, 524293, -786419, 5, 524293, -786418, 5, 524293, -786417, 5, 524293, -786416, 5, 524293, -786415, 5, 524293, -786414, 5, 524293, -786413, 5, 524293, -786412, 5, 524293, -786411, 5, 524293, -786410, 5, 524293, -786409, 5, 524293, -786408, 5, 524293, -786407, 5, 524293, -786406, 5, 524293, -786405, 5, 524293, -786404, 5, 524293, -786403, 5, 524293, -786402, 5, 524293, -786401, 5, 524293, -786400, 5, 524293, -786399, 5, 524293, -786398, 1610612741, 524291, -786397, -1610612731, 458760, -786396, -1610612731, 458760, -786395, -1610612731, 458760, -786394, -1610612731, 458760, -786393, -1610612731, 458760, -786392, -1610612731, 458760, -786391, -1610612731, 458760, -786390, -1610612731, 458760, -786389, -1610612731, 458760, -786388, -1610612731, 458760, -786387, -1610612731, 458760, -786386, -1610612731, 458760, -786385, -1610612731, 458760, -786384, -1610612731, 458760, -786383, -1610612731, 458760, -786382, -1610612731, 458760, -786381, -1610612731, 458760, -786380, -1610612731, 458760, -786379, -1610612731, 458760, -786378, -1610612731, 458760, -786377, -1610612731, 458760, -786376, -1610612731, 458760, -786375, -1610612731, 458760, -786374, -1610612731, 458760, -786373, -1610612731, 458760, -786372, -1610612731, 458760, -786371, -1610612731, 458760, -786370, -1610612731, 458760, -786369, -1610612731, 458760, -786368, 1610612741, 524292, -655372, -1610612731, 524293, -655371, 1610612741, 524291, -655370, -1610612731, 458760, -655369, -1610612731, 458760, -655368, -1610612731, 458760, -655367, -1610612731, 458760, -655366, -1610612731, 458760, -655365, -1610612731, 458760, -655364, -1610612731, 458760, -655363, -1610612731, 458760, -655362, -1610612731, 458760, -655361, -1610612731, 458760, -720896, -1610612731, 458760, -720895, -1610612731, 458760, -720894, 5, 458759, -720893, 5, 458759, -720892, 5, 458759, -720891, 5, 458759, -720890, 5, 458759, -720889, 5, 458759, -720888, 5, 458759, -720887, 5, 458759, -720886, 5, 458759, -720885, 5, 458759, -720884, 5, 458759, -720883, 5, 458759, -720882, 5, 458759, -720881, 5, 458759, -720880, 5, 458759, -720879, 5, 458759, -720878, 5, 458759, -720877, 5, 458759, -720876, 5, 458759, -720875, 5, 458759, -720874, 5, 458759, -720873, 5, 458759, -720872, 5, 458759, -720871, 5, 458759, -720870, 5, 458759, -720869, 5, 458759, -720868, 5, 458759, -720867, 5, 458759, -720866, 5, 458759, -720865, 5, 458759, -720864, 5, 458759, -720863, 5, 458759, -720862, 5, 458756, -720861, -536870907, 196615, -720860, -1073741819, 196611, -720859, -1073741819, 196611, -720858, -1073741819, 196611, -720857, -1073741819, 196611, -720856, -1073741819, 196611, -720855, -1073741819, 196611, -720854, -1073741819, 196611, -720853, -1073741819, 196611, -720852, -1073741819, 196611, -720851, -1073741819, 196611, -720850, -1073741819, 196611, -720849, -1073741819, 196611, -720848, -1073741819, 196611, -720847, -1073741819, 196611, -720846, -1073741819, 196611, -720845, -1073741819, 196611, -720844, -1073741819, 196611, -720843, -1073741819, 196611, -720842, -1073741819, 196611, -720841, -1073741819, 196611, -720840, -1073741819, 196611, -720839, -1073741819, 196611, -720838, -1073741819, 196611, -720837, -1073741819, 196611, -720836, -1073741819, 196611, -720835, -1073741819, 196611, -720834, -1073741819, 196609, -720833, -1073741819, 131073, -720832, 1610612741, 458760, -589836, -1610612731, 524293, -589835, 5, 458760, -589834, 1610612741, 196609, -589833, -1073741819, 196611, -589832, -1073741819, 196611, -589831, -1073741819, 196611, -589830, -1073741819, 196611, -589829, -1073741819, 196611, -589828, -1073741819, 196611, -589827, -1073741819, 196611, -589826, -1073741819, 196611, -589825, -1073741819, 196611, -655360, -1073741819, 196611, -655359, 1073741829, 196615, -655358, -536870907, 196615, -655357, -1073741819, 196611, -655356, -1073741819, 196611, -655355, -1073741819, 196611, -655354, -1073741819, 196611, -655353, -1073741819, 196611, -655352, -1073741819, 196611, -655351, -1073741819, 196611, -655350, -1073741819, 196611, -655349, -1073741819, 196611, -655348, -1073741819, 196611, -655347, -1073741819, 196611, -655346, -1073741819, 196611, -655345, -1073741819, 196611, -655344, -1073741819, 196611, -655343, -1073741819, 196611, -655342, -1073741819, 196611, -655341, -1073741819, 196611, -655340, -1073741819, 196611, -655339, -1073741819, 196611, -655338, -1073741819, 196611, -655337, -1073741819, 196611, -655336, -1073741819, 196611, -655335, -1073741819, 196611, -655334, -1073741819, 196611, -655333, -1073741819, 196611, -655332, -1073741819, 196611, -655331, -1073741819, 196611, -655330, -1073741819, 196611, -655329, -1073741819, 196611, -655328, -1073741819, 196611, -655327, -1073741819, 196611, -655326, -1073741819, 196611, -655325, -536870907, 131080, -655324, 1610612741, 65539, -655323, 1610612741, 2, -655322, 1610612741, 2, -655321, 1610612741, 2, -655320, 1610612741, 2, -655319, 1610612741, 2, -655318, 1610612741, 2, -655317, 1610612741, 2, -655316, 1610612741, 2, -655315, 1610612741, 2, -655314, 1610612741, 2, -655313, 1610612741, 2, -655312, 1610612741, 2, -655311, 1610612741, 2, -655310, 1610612741, 2, -655309, 1610612741, 2, -655308, 1610612741, 2, -655307, 1610612741, 2, -655306, 1610612741, 2, -655305, 1610612741, 2, -655304, 1610612741, 2, -655303, 1610612741, 2, -655302, 1610612741, 2, -655301, 1610612741, 2, -655300, 1610612741, 2, -655299, 1610612741, 65538, -655298, 5, 196611, -655297, -1073741819, 65546, -655296, 1610612741, 458760, -524300, -1610612731, 524293, -524299, 5, 458760, -524298, -1610612731, 196610, -524297, 5, 65540, -524296, 5, 10, -524295, 5, 10, -524294, 5, 10, -524293, 5, 10, -524292, 5, 10, -524291, 5, 10, -524290, 5, 10, -524289, 5, 10, -589824, 5, 65541, -589823, 5, 196611, -589822, 1073741829, 196612, -589821, -1073741819, 131080, -589820, 536870917, 262150, -589819, 1073741829, 196618, -589818, 536870917, 262144, -589817, 536870917, 196618, -589816, 1073741829, 196618, -589815, -1073741819, 65545, -589814, 5, 262144, -589813, 536870917, 327687, -589812, 536870917, 262144, -589811, 1073741829, 196612, -589810, 1073741829, 196617, -589809, -2147483643, 196612, -589808, -2147483643, 196617, -589807, 1073741829, 196618, -589806, 536870917, 196612, -589805, -536870907, 131082, -589804, 1073741829, 196618, -589803, 1073741829, 131075, -589802, 536870917, 196618, -589801, 1073741829, 196618, -589800, -1073741819, 131082, -589799, 536870917, 196618, -589798, -536870907, 196616, -589797, -2147483643, 196616, -589796, 536870917, 196618, -589795, 1073741829, 196617, -589794, -2147483643, 196612, -589793, -2147483643, 196617, -589792, 1073741829, 196618, -589791, -2147483643, 131077, -589790, 1073741829, 196618, -589789, 1610612741, 196611, -589788, 5, 7, -589787, 7, 0, -589786, 7, 0, -589785, 7, 0, -589784, 7, 0, -589783, 7, 0, -589782, 7, 0, -589781, 7, 0, -589780, 7, 0, -589779, 7, 0, -589778, 7, 0, -589777, 7, 0, -589776, 536870917, 0, -589775, 7, 0, -589774, 7, 0, -589773, 7, 0, -589772, 7, 0, -589771, 7, 0, -589770, 7, 0, -589769, 7, 0, -589768, 7, 0, -589767, 7, 0, -589766, 7, 0, -589765, 7, 0, -589764, 7, 0, -589763, 5, 6, -589762, 5, 196611, -589761, -1073741819, 65546, -589760, 1610612741, 458760, -458764, -1610612731, 524293, -458763, 5, 458760, -458762, -1610612731, 196610, -458761, 5, 7, -458757, 0, 1, -458756, 0, 393217, -458755, 0, 2, -458754, 0, 327686, -524288, 1610612741, 7, -524287, 5, 196611, -524286, 1073741829, 196612, -524285, 1610612741, 196612, -524284, -2147483643, 131074, -524283, 1073741829, 196618, -524282, 536870917, 262144, -524281, 536870917, 196618, -524280, 1073741829, 196618, -524279, 5, 196611, -524278, 5, 262144, -524277, -536870907, 65545, -524276, 536870917, 262144, -524275, 1073741829, 196612, -524274, 1073741829, 196612, -524273, 536870917, 262151, -524272, 536870917, 196612, -524271, 1073741829, 196618, -524270, -2147483643, 131079, -524269, 1073741829, 196612, -524268, 1073741829, 196618, -524267, 1073741829, 196612, -524266, 536870917, 196618, -524265, 1073741829, 196618, -524264, 5, 196611, -524263, 536870917, 196618, -524262, -536870907, 196616, -524261, -2147483643, 196616, -524260, 536870917, 196618, -524259, 1073741829, 196612, -524258, 536870917, 393220, -524257, 536870917, 196612, -524256, 1073741829, 196618, -524255, 536870917, 196611, -524254, 1073741829, 196618, -524253, 1610612741, 196611, -524252, 5, 7, -524251, 7, 0, -524250, 7, 0, -524249, 7, 0, -524248, 7, 0, -524247, 7, 0, -524246, 7, 0, -524245, 7, 0, -524244, 7, 0, -524243, 7, 0, -524242, 7, 0, -524241, 7, 0, -524240, 7, 0, -524239, 7, 0, -524238, 7, 0, -524237, 7, 0, -524236, 7, 0, -524235, 7, 0, -524234, 7, 0, -524233, 7, 0, -524232, 7, 0, -524231, 7, 0, -524230, 7, 0, -524229, 7, 0, -524228, 7, 0, -524227, 5, 6, -524226, 5, 196611, -524225, -1073741819, 196613, -524224, 1610612741, 458760, -393228, -1610612731, 524293, -393227, 5, 458760, -393226, -1610612731, 196610, -393225, 5, 7, -458752, 1610612741, 7, -458751, 5, 196611, -458750, 1073741829, 196612, -458749, -536870907, 131077, -458748, 536870917, 393221, -458747, 1073741829, 196618, -458746, 536870917, 262144, -458745, 536870917, 196618, -458744, 1073741829, 196618, -458743, -2147483643, 65545, -458742, 5, 262144, -458741, 536870917, 327687, -458740, 536870917, 262144, -458739, 1073741829, 196612, -458738, -536870907, 196617, -458737, -536870907, 196612, -458736, 536870917, 196617, -458735, 1073741829, 196618, -458734, 536870917, 196612, -458733, 1073741829, 196612, -458732, 1073741829, 196618, -458731, 536870917, 262153, -458730, 536870917, 196618, -458729, 1073741829, 196618, -458728, -1610612731, 131078, -458727, 536870917, 196618, -458726, -536870907, 196616, -458725, -2147483643, 196616, -458724, 536870917, 196618, -458723, -536870907, 196617, -458722, -536870907, 196612, -458721, 536870917, 196617, -458720, 1073741829, 196618, -458719, 536870917, 131077, -458718, 1073741829, 196618, -458717, 1610612741, 196611, -458716, 5, 7, -458715, 7, 0, -458714, 7, 0, -458713, 7, 0, -458712, 7, 0, -458711, 7, 0, -458710, 7, 0, -458709, 7, 0, -458708, 7, 0, -458707, 7, 0, -458706, 7, 0, -458705, 7, 0, -458704, 7, 0, -458703, 7, 0, -458702, 7, 0, -458701, 7, 0, -458700, 7, 0, -458699, 7, 0, -458698, 7, 0, -458697, 7, 0, -458696, 7, 0, -458695, 7, 0, -458694, 7, 0, -458693, 7, 0, -458692, 7, 0, -458691, 5, 6, -458690, 5, 196611, -458689, -2147483643, 131075, -458688, 1610612741, 458760, -327692, -1610612731, 524293, -327691, 5, 458760, -327690, -1610612731, 196610, -327689, 5, 7, -327685, 0, 4, -327684, 1, 393223, -327683, 1, 458753, -327682, 0, 5, -393216, 1610612741, 7, -393215, 5, 196611, -393214, 536870917, 196615, -393213, 536870917, 196610, -393212, 536870917, 196610, -393211, 1073741829, 131078, -393210, 536870917, 196610, -393209, 536870917, 196610, -393208, 536870917, 196610, -393207, 536870917, 196610, -393206, 1073741829, 131078, -393205, 536870917, 196610, -393204, 536870917, 196610, -393203, 536870917, 196610, -393202, 536870917, 196610, -393201, 536870917, 196610, -393200, 536870917, 196610, -393199, 536870917, 196610, -393198, 536870917, 196610, -393197, 536870917, 196610, -393196, 536870917, 196610, -393195, 536870917, 196610, -393194, 536870917, 196610, -393193, 536870917, 196610, -393192, 536870917, 196610, -393191, 1073741829, 131078, -393190, 536870917, 196610, -393189, 536870917, 196610, -393188, 536870917, 196610, -393187, 536870917, 196610, -393186, 536870917, 196610, -393185, 536870917, 196610, -393184, 536870917, 196610, -393183, 536870917, 327688, -393182, 536870917, 196610, -393181, 536870917, 196617, -393180, 5, 7, -393179, 7, 0, -393178, 7, 0, -393177, 7, 0, -393176, 7, 0, -393175, 7, 0, -393174, 7, 0, -393173, 7, 0, -393172, 7, 0, -393171, 7, 0, -393170, 7, 0, -393169, 7, 0, -393168, 7, 0, -393167, 7, 0, -393166, 7, 0, -393165, 7, 0, -393164, 7, 0, -393163, 7, 0, -393162, 7, 0, -393161, 7, 0, -393160, 7, 0, -393159, 7, 0, -393158, 7, 0, -393157, 7, 0, -393156, 7, 0, -393155, 5, 6, -393154, 5, 196611, -393153, 1073741829, 196612, -393152, 1610612741, 458760, -262156, -1610612731, 524293, -262155, 5, 458760, -262154, -1610612731, 196610, -262153, 5, 7, -262149, 0, 6, -262148, 0, 7, -262147, 0, 7, -262146, 0, 65536, -327680, 1610612741, 7, -327679, 1073741829, 131076, -327678, -1073741819, 196611, -327677, -1073741819, 196611, -327676, 5, 131078, -327675, -1073741819, 196611, -327674, -1073741819, 196611, -327673, 1610612741, 131082, -327672, 5, 131078, -327671, -1073741819, 196611, -327670, -1073741819, 196611, -327669, -1073741819, 196611, -327668, -1073741819, 196611, -327667, 1610612741, 131082, -327666, 1610612741, 131082, -327665, -1073741819, 196611, -327664, 1610612741, 131079, -327663, -1073741819, 196611, -327662, -1073741819, 196611, -327661, 1610612741, 131079, -327660, 1610612741, 131082, -327659, -1073741819, 196611, -327658, -1073741819, 196611, -327657, -1073741819, 196611, -327656, -1073741819, 196611, -327655, -1073741819, 196611, -327654, 536870917, 327688, -327653, -1073741819, 196611, -327652, -1073741819, 196611, -327651, -1073741819, 196611, -327650, -1073741819, 196611, -327649, 536870917, 131078, -327648, -1073741819, 196611, -327647, -1073741819, 196611, -327646, -1073741819, 196611, -327645, -536870907, 131076, -327644, 5, 7, -327643, 7, 0, -327642, 7, 0, -327641, 7, 0, -327640, 7, 0, -327639, 7, 0, -327638, 7, 0, -327637, 7, 0, -327636, 7, 0, -327635, 7, 0, -327634, 7, 0, -327633, 7, 0, -327632, 7, 0, -327631, 7, 0, -327630, 7, 0, -327629, 7, 0, -327628, 7, 0, -327627, 7, 0, -327626, 7, 0, -327625, 7, 0, -327624, 7, 0, -327623, 7, 0, -327622, 7, 0, -327621, 7, 0, -327620, 7, 0, -327619, 5, 6, -327618, 5, 196611, -327617, -536870907, 393220, -327616, 1610612741, 458760, -196620, -1610612731, 524293, -196619, 5, 458760, -196618, -1610612731, 196610, -196617, 5, 7, -262144, 5, 9, -262143, 5, 10, -262142, 5, 10, -262141, 5, 10, -262140, 5, 10, -262139, 5, 10, -262138, 5, 10, -262137, 5, 10, -262136, 5, 10, -262135, 5, 10, -262134, 5, 10, -262133, 5, 10, -262132, 5, 10, -262131, 5, 10, -262130, 5, 10, -262129, 5, 10, -262128, 5, 10, -262127, 5, 10, -262126, 5, 10, -262125, 5, 10, -262124, 5, 10, -262123, 5, 10, -262122, 5, 10, -262121, 5, 10, -262120, 5, 10, -262119, 5, 10, -262118, 5, 10, -262117, 5, 10, -262116, 5, 10, -262115, 5, 10, -262114, 5, 10, -262113, 5, 10, -262112, 5, 10, -262111, 5, 10, -262110, 5, 10, -262109, 5, 10, -262108, 5, 65536, -262107, 7, 0, -262106, 7, 0, -262105, 7, 0, -262104, 7, 0, -262103, 7, 0, -262102, 7, 0, -262101, 7, 0, -262100, 7, 0, -262099, 7, 0, -262098, 7, 0, -262097, 7, 0, -262096, 7, 0, -262095, 7, 0, -262094, 7, 0, -262093, 7, 0, -262092, 7, 0, -262091, 7, 0, -262090, 7, 0, -262089, 7, 0, -262088, 7, 0, -262087, 7, 0, -262086, 7, 0, -262085, 7, 0, -262084, 7, 0, -262083, 5, 6, -262082, 5, 196611, -262081, 1073741829, 196612, -262080, 1610612741, 458760, -131084, -1610612731, 524293, -131083, 5, 458760, -131082, -1610612731, 196610, -131081, 5, 7, -196603, 1, 6, -196602, 1, 7, -196601, 1, 7, -196600, 1, 7, -196599, 1, 7, -196598, 1, 65536, -196591, 1, 4, -196590, -1610612735, 196614, -196589, 1, 393216, -196588, 1, 2, -196587, 1, 2, -196586, 1, 2, -196585, 1, 3, -196579, 7, 0, -196578, 7, 0, -196577, 7, 0, -196576, 7, 0, -196575, 7, 0, -196574, 7, 0, -196573, 7, 0, -196572, 7, 0, -196571, 7, 0, -196570, 7, 0, -196569, 7, 0, -196568, 7, 0, -196567, 7, 0, -196566, 7, 0, -196565, 7, 0, -196564, 7, 0, -196563, 7, 0, -196562, 7, 0, -196561, 7, 0, -196560, 7, 0, -196559, 7, 0, -196558, 7, 0, -196557, 7, 0, -196556, 7, 0, -196555, 7, 0, -196554, 7, 0, -196553, 7, 0, -196552, 7, 0, -196551, 7, 0, -196550, 7, 0, -196549, 7, 0, -196548, 7, 0, -196547, 5, 6, -196546, 5, 196611, -196545, 1073741829, 196612, -196544, 1610612741, 458760, -65548, -1610612731, 524293, -65547, 5, 458760, -65546, -1610612731, 196610, -65545, 5, 7, -131055, 1, 4, -131054, -1610612735, 196614, -131053, 1, 393218, -131052, 1, 393219, -131051, 1, 393219, -131050, 1, 393220, -131049, 1, 5, -131043, 7, 0, -131042, 7, 0, -131041, 7, 0, -131040, 7, 0, -131039, 7, 0, -131038, 7, 0, -131037, 7, 0, -131036, 7, 0, -131035, 7, 0, -131034, 7, 0, -131033, 7, 0, -131032, 7, 0, -131031, 7, 0, -131030, 7, 0, -131029, 5, 65542, -131028, 5, 65543, -131027, 5, 65544, -131024, 7, 0, -131023, 7, 0, -131022, 7, 0, -131021, 7, 0, -131020, 7, 0, -131019, 7, 0, -131018, 7, 0, -131017, 7, 0, -131016, 7, 0, -131015, 7, 0, -131014, 7, 0, -131013, 7, 0, -131012, 7, 0, -131011, 5, 6, -131010, 5, 196611, -131009, 1073741829, 327688, -131008, 1610612741, 458760, -12, -1610612731, 524293, -11, 5, 458760, -10, -1610612731, 196610, -9, 5, 7, -65519, 1, 4, -65518, -1610612735, 196614, -65514, 1, 393222, -65513, 1, 393216, -65512, 1, 2, -65511, 1, 2, -65510, 1, 327686, -65507, 7, 0, -65506, 7, 0, -65505, 7, 0, -65504, 7, 0, -65503, 7, 0, -65502, 7, 0, -65501, 7, 0, -65500, 7, 0, -65499, 7, 0, -65498, 7, 0, -65497, 7, 0, -65496, 7, 0, -65495, 7, 0, -65494, 7, 0, -65493, 7, 0, -65492, 7, 0, -65491, 7, 0, -65490, 7, 0, -65489, 7, 0, -65488, 7, 0, -65487, 7, 0, -65486, 7, 0, -65485, 7, 0, -65484, 7, 0, -65483, 7, 0, -65482, 5, 1, -65481, 5, 3, -65480, 5, 3, -65479, 5, 3, -65478, 5, 3, -65477, 5, 3, -65476, 5, 3, -65475, 5, 65539, -65474, 5, 196611, -65473, -1073741819, 196613, -65472, 1610612741, 458760, 65524, -1610612731, 524293, 65525, 5, 458760, 65526, -1610612731, 196610, 65527, 5, 65538, 65528, 5, 2, 65529, 5, 2, 65530, 5, 2, 65531, 5, 2, 65532, 5, 2, 65533, 5, 2, 65534, 5, 2, 65535, 5, 2, 0, 5, 3, 1, 5, 3, 2, 5, 3, 3, 5, 3, 4, 5, 3, 5, 5, 3, 6, 5, 3, 7, 5, 3, 8, 5, 3, 9, 5, 3, 10, 5, 3, 11, 5, 3, 12, 5, 3, 13, 5, 3, 14, 5, 3, 15, 5, 2, 16, 5, 2, 17, 5, 2, 18, 5, 2, 19, 5, 2, 20, 5, 2, 21, 5, 2, 22, 5, 2, 23, 5, 2, 24, 5, 2, 25, 5, 2, 26, 5, 2, 27, 5, 2, 28, 5, 2, 29, 5, 2, 30, 5, 2, 31, 5, 2, 32, 5, 2, 33, 5, 2, 34, 5, 2, 35, 5, 2, 36, 5, 2, 37, 5, 5, 38, 7, 0, 39, 7, 0, 40, 7, 0, 41, 7, 0, 42, 7, 0, 43, 7, 0, 44, 7, 0, 45, 7, 0, 46, 7, 0, 47, 7, 0, 48, 7, 0, 49, 7, 0, 50, 7, 0, 51, 7, 0, 52, 7, 0, 53, 7, 0, 54, 5, 6, 55, 5, 131076, 56, -1610612731, 196611, 57, -1610612731, 196611, 58, -1610612731, 196611, 59, -1610612731, 196611, 60, -1610612731, 196611, 61, -1610612731, 196611, 62, 5, 196609, 63, -1073741819, 196613, 64, 1610612741, 458760, 131060, -1610612731, 524293, 131061, 5, 458760, 131062, -1610612731, 196609, 131063, -1610612731, 196611, 131064, -1610612731, 196611, 131065, -1610612731, 196611, 131066, -1610612731, 196611, 131067, -1610612731, 196611, 131068, -1610612731, 196611, 131069, -1610612731, 196611, 131070, -1610612731, 196611, 131071, -1610612731, 196611, 65536, -1610612731, 196611, 65537, -1610612731, 196611, 65538, -1610612731, 196611, 65539, -1610612731, 196611, 65540, -1610612731, 196611, 65541, -1610612731, 196611, 65542, -1610612731, 196611, 65543, -1610612731, 196611, 65544, -1610612731, 196611, 65545, -1610612731, 196611, 65546, -1610612731, 196611, 65547, -1610612731, 196611, 65548, -1610612731, 196611, 65549, -1610612731, 196611, 65550, -1610612731, 196611, 65551, -1610612731, 196611, 65552, -1610612731, 196611, 65553, -1610612731, 196611, 65554, -1610612731, 196611, 65555, -1610612731, 196611, 65556, -1610612731, 196611, 65557, -1610612731, 196611, 65558, -1610612731, 196611, 65559, -1610612731, 196611, 65560, -1610612731, 196611, 65561, -1610612731, 196611, 65562, -1610612731, 196611, 65563, -1610612731, 196611, 65564, -1610612731, 196611, 65565, -1610612731, 196611, 65566, 1610612741, 196613, 65567, 1610612741, 196613, 65568, 1610612741, 196613, 65569, -1610612731, 196611, 65570, -1610612731, 196611, 65571, -1610612731, 196611, 65572, -1610612731, 131076, 65573, 5, 8, 65574, 7, 0, 65575, 7, 0, 65576, 7, 0, 65577, 7, 0, 65578, 7, 0, 65579, 7, 0, 65580, 7, 0, 65581, 7, 0, 65582, 7, 0, 65583, 7, 0, 65584, 7, 0, 65585, 7, 0, 65586, 5, 1, 65587, 5, 3, 65588, 5, 3, 65589, 5, 3, 65590, 5, 65539, 65591, 5, 196611, 65592, -1073741819, 196618, 65593, -1073741819, 196618, 65594, -1073741819, 196618, 65595, -1073741819, 196618, 65596, -1073741819, 196618, 65597, -1073741819, 196618, 65598, -1073741819, 196618, 65599, -1073741819, 196613, 65600, 1610612741, 458760, 196596, -1610612731, 524293, 196597, 5, 524292, 196598, 5, 458761, 196599, 5, 458761, 196600, 5, 458761, 196601, 5, 458761, 196602, 5, 458761, 196603, 5, 458761, 196604, 5, 458761, 196605, 5, 458761, 196606, 5, 458761, 196607, 5, 458761, 131072, -1073741819, 458756, 131073, 536870917, 196610, 131074, -1610612731, 589830, 131075, -1610612731, 589828, 131076, -1610612731, 589828, 131077, -1610612731, 589828, 131078, 5, 589827, 131079, 1610612741, 196614, 131080, -1073741819, 196614, 131081, 5, 524298, 131082, -1610612731, 589828, 131083, -1610612731, 589828, 131084, -1610612731, 589828, 131085, -1610612731, 589828, 131086, 5, 589827, 131087, 1610612741, 196612, 131088, -1073741819, 589827, 131089, -1610612731, 589828, 131090, -1610612731, 589828, 131091, -1610612731, 589828, 131092, -1610612731, 589828, 131093, -1610612731, 589828, 131094, -1610612731, 589828, 131095, -1610612731, 589828, 131096, 5, 589827, 131097, 1610612741, 196614, 131098, -1073741819, 196614, 131099, 5, 524298, 131100, -1610612731, 589828, 131101, -1610612731, 589828, 131102, -1610612731, 589828, 131103, -1610612731, 589828, 131104, -1610612731, 589828, 131105, -1610612731, 589828, 131106, 1610612741, 589830, 131107, 536870917, 262152, 131108, 1610612741, 196611, 131109, 5, 8, 131110, 7, 0, 131111, 7, 0, 131112, 7, 0, 131113, 7, 0, 131114, 7, 0, 131115, 7, 0, 131116, 7, 0, 131117, 7, 0, 131118, 7, 0, 131119, 7, 0, 131120, 7, 0, 131121, 7, 0, 131122, 5, 6, 131123, -1610612731, 131077, 131124, -1610612731, 196611, 131125, -1610612731, 196611, 131126, -1610612731, 196611, 131127, 5, 196609, 131128, 1610612741, 196613, 131129, 1610612741, 196613, 131130, 1610612741, 196613, 131131, 1610612741, 196613, 131132, 1610612741, 196613, 131133, 1610612741, 196613, 131134, 1610612741, 196613, 131135, 5, 196614, 131136, 1610612741, 458760, 262132, -1610612731, 524293, 262133, 5, 524293, 262134, 5, 524293, 262135, 5, 524293, 262136, 5, 524293, 262137, 5, 524293, 262138, 5, 524293, 262139, 5, 524293, 262140, 5, 524293, 262141, 5, 524293, 262142, 5, 524293, 262143, 5, 524293, 196608, 5, 458760, 196609, 1073741829, 196610, 196610, 536870917, 589832, 196611, -1073741819, 589828, 196612, -1073741819, 589828, 196613, -1073741819, 589828, 196614, 1610612741, 524298, 196615, -1610612731, 196614, 196616, 5, 196614, 196617, 5, 589830, 196618, -1073741819, 589828, 196619, -1073741819, 589828, 196620, -1073741819, 589828, 196621, -1073741819, 589828, 196622, 5, 589832, 196623, 1610612741, 196612, 196624, 1610612741, 589827, 196625, -1073741819, 589828, 196626, -1073741819, 589828, 196627, -1073741819, 589828, 196628, -1073741819, 589828, 196629, -1073741819, 589828, 196630, -1073741819, 589828, 196631, -1073741819, 589828, 196632, 1610612741, 524298, 196633, -1610612731, 196614, 196634, 5, 196614, 196635, 5, 589830, 196636, -1073741819, 589828, 196637, -1073741819, 589828, 196638, -1073741819, 589828, 196639, -1073741819, 589828, 196640, -1073741819, 589828, 196641, -1073741819, 589828, 196642, 1610612741, 524298, 196643, -2147483643, 131074, 196644, 1610612741, 196611, 196645, 5, 65538, 196646, 5, 2, 196647, 5, 2, 196648, 5, 2, 196649, 5, 2, 196650, 5, 2, 196651, 5, 2, 196652, 5, 2, 196653, 5, 2, 196654, 5, 2, 196655, 5, 2, 196656, 5, 2, 196657, 5, 2, 196658, 5, 65539, 196659, -1610612731, 196613, 196660, 1073741829, 327688, 196661, -2147483643, 131074, 196662, -1073741819, 458753, 196663, -1073741819, 458760, 196664, -1073741819, 458760, 196665, -1073741819, 458760, 196666, -1073741819, 458760, 196667, -1073741819, 458760, 196668, -1073741819, 458760, 196669, -1073741819, 458760, 196670, -1073741819, 458760, 196671, -1073741819, 458760, 196672, -1073741819, 524292, 327668, -1610612731, 524293, 327669, 5, 524293, 327670, 5, 524293, 327671, 5, 524293, 327672, 5, 524293, 327673, 5, 524293, 327674, 5, 524293, 327675, 5, 524293, 327676, 5, 524293, 327677, 5, 524293, 327678, 5, 524293, 327679, 5, 524293, 262144, 5, 458760, 262145, -2147483643, 196618, 262146, -2147483643, 196618, 262147, -2147483643, 196618, 262148, -2147483643, 196618, 262149, -2147483643, 196618, 262150, -2147483643, 327688, 262151, -2147483643, 196618, 262152, -2147483643, 196618, 262153, -2147483643, 196618, 262154, -2147483643, 196618, 262155, -2147483643, 196618, 262156, -2147483643, 196618, 262157, -2147483643, 196618, 262158, -2147483643, 327688, 262159, -2147483643, 196618, 262160, -2147483643, 196618, 262161, -2147483643, 196618, 262162, -2147483643, 196618, 262163, -2147483643, 196618, 262164, -2147483643, 196618, 262165, -2147483643, 196618, 262166, -2147483643, 196618, 262167, -2147483643, 196618, 262168, -2147483643, 327688, 262169, -2147483643, 196618, 262170, -2147483643, 196618, 262171, -2147483643, 196618, 262172, -2147483643, 196618, 262173, -2147483643, 196618, 262174, -2147483643, 196618, 262175, -2147483643, 196618, 262176, -2147483643, 196618, 262177, -2147483643, 196618, 262178, -2147483643, 327688, 262179, -536870907, 131076, 262180, -1610612731, 196609, 262181, -1610612731, 196611, 262182, -1610612731, 196611, 262183, -1610612731, 196611, 262184, -1610612731, 196611, 262185, -1610612731, 196611, 262186, -1610612731, 196611, 262187, 536870917, 131082, 262188, -1610612731, 196611, 262189, 1073741829, 131078, 262190, -1610612731, 196611, 262191, -1610612731, 196611, 262192, -1610612731, 196611, 262193, -1610612731, 196611, 262194, 1610612741, 196613, 262195, 5, 196609, 262196, 1073741829, 327688, 262197, -2147483643, 131075, 262198, 1610612741, 458760, 262199, -1610612731, 524293, 262200, -1610612731, 524293, 262201, -1610612731, 524293, 262202, -1610612731, 524293, 262203, -1610612731, 524293, 262204, -1610612731, 524293, 262205, -1610612731, 524293, 262206, -1610612731, 524293, 262207, -1610612731, 524293, 262208, -1610612731, 524293, 393204, -1610612731, 524293, 393205, 5, 524293, 393206, 5, 524293, 393207, 5, 524293, 393208, 5, 524293, 393209, 5, 524293, 393210, 5, 524293, 393211, 5, 524293, 393212, 5, 524293, 393213, 5, 524293, 393214, 5, 524293, 393215, 5, 524293, 327680, 5, 524292, 327681, 1610612741, 458759, 327682, -1073741819, 458760, 327683, -1073741819, 458760, 327684, -1073741819, 458760, 327685, -1073741819, 458760, 327686, -1073741819, 458760, 327687, -1073741819, 458760, 327688, -1073741819, 458760, 327689, -1073741819, 458760, 327690, -1073741819, 458760, 327691, -1073741819, 458760, 327692, -1073741819, 458760, 327693, -1073741819, 458760, 327694, -1073741819, 458760, 327695, -1073741819, 458760, 327696, -1073741819, 458760, 327697, -1073741819, 458760, 327698, -1073741819, 458760, 327699, -1073741819, 458760, 327700, -1073741819, 458760, 327701, -1073741819, 458760, 327702, -1073741819, 458760, 327703, -1073741819, 458760, 327704, -1073741819, 458760, 327705, -1073741819, 458760, 327706, -1073741819, 458760, 327707, -1073741819, 458760, 327708, -1073741819, 458760, 327709, -1073741819, 458760, 327710, -1073741819, 458760, 327711, -1073741819, 458760, 327712, -1073741819, 458760, 327713, -1073741819, 458760, 327714, -1073741819, 458760, 327715, -1073741819, 458760, 327716, -1073741819, 458760, 327717, -1073741819, 458760, 327718, -1073741819, 458760, 327719, -1073741819, 458760, 327720, -1073741819, 458760, 327721, -1073741819, 458760, 327722, -1073741819, 458760, 327723, -1073741819, 458760, 327724, -1073741819, 458760, 327725, -1073741819, 458760, 327726, -1073741819, 458760, 327727, -1073741819, 458760, 327728, -1073741819, 458760, 327729, -1073741819, 458760, 327730, -1073741819, 458760, 327731, -1073741819, 458760, 327732, -1073741819, 458760, 327733, -1073741819, 458760, 327734, -1073741819, 524292, 327735, -1610612731, 524293, 327736, -1610612731, 524293, 327737, -1610612731, 524293, 327738, -1610612731, 524293, 327739, -1610612731, 524293, 327740, -1610612731, 524293, 327741, -1610612731, 524293, 327742, -1610612731, 524293, 327743, -1610612731, 524293, 327744, -1610612731, 524293 ) [node name="TileMap2" type="TileMap" parent="."] tile_set = ExtResource( 4 ) @@ -90,7 +95,7 @@ format = 1 [node name="Portal" parent="." instance=ExtResource( 8 )] position = Vector2( 952, -32 ) -next_scene = "res://src/Levels/Actual Level 1.tscn" +next_scene = "res://src/Levels/2 Tutorial Level.tscn" [node name="Decor" type="Node2D" parent="."] diff --git a/src/Levels/2 Tutorial Level.tscn b/src/Levels/2 Tutorial Level.tscn index 2d9f80a..d5ce42d 100644 --- a/src/Levels/2 Tutorial Level.tscn +++ b/src/Levels/2 Tutorial Level.tscn @@ -1,9 +1,9 @@ -[gd_scene load_steps=15 format=2] +[gd_scene load_steps=16 format=2] [ext_resource path="res://src/Levels/Templates/LevelTemplate.gd" type="Script" id=1] [ext_resource path="res://assets/environment/decor/platform-plants.png" type="Texture" id=2] [ext_resource path="res://src/Environment/GreenHouseTiles.tres" type="TileSet" id=3] -[ext_resource path="res://src/Contraptions/DropThroughPlatforms.tres" type="TileSet" id=4] +[ext_resource path="res://src/Environment/DropThroughPlatforms.tres" type="TileSet" id=4] [ext_resource path="res://src/UserInterface/UserInterface.tscn" type="PackedScene" id=5] [ext_resource path="res://src/Contraptions/Portal/Portal.tscn" type="PackedScene" id=6] [ext_resource path="res://src/Actors/BlobbyCam.tscn" type="PackedScene" id=7] @@ -12,6 +12,7 @@ [ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=10] [ext_resource path="res://src/ObstacleObjects/Spikes.tscn" type="PackedScene" id=11] [ext_resource path="res://src/Contraptions/Triggers/ElevatorButton.tscn" type="PackedScene" id=12] +[ext_resource path="res://src/ObstacleObjects/PitArea.tscn" type="PackedScene" id=13] [sub_resource type="AnimationNodeStateMachinePlayback" id=4] @@ -58,13 +59,12 @@ wait_time = 20.0 [node name="BlobbyCam" parent="." instance=ExtResource( 7 )] unique_name_in_owner = true -drag_margin_bottom = 0.3 [node name="AnimatedSprite" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="4"] -frame = 7 +frame = 11 [node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"] -frame = 6 +frame = 10 [node name="Blobby" parent="." instance=ExtResource( 8 )] unique_name_in_owner = true @@ -74,6 +74,9 @@ scale = Vector2( 0.878906, 0.936025 ) [node name="AnimationTree" parent="Blobby/BlobbySprite" index="0"] parameters/playback = SubResource( 4 ) +[node name="PitArea" parent="." instance=ExtResource( 13 )] +position = Vector2( 416, 170 ) + [node name="TileMap" type="TileMap" parent="."] unique_name_in_owner = true tile_set = ExtResource( 3 ) @@ -84,7 +87,7 @@ collision_layer = 8 collision_mask = 8 bake_navigation = true format = 1 -tile_data = PoolIntArray( -655365, 5, 65540, -655364, 1610612741, 2, -655363, 1610612741, 2, -655362, 1610612741, 2, -655361, 1610612741, 2, -720896, 1610612741, 2, -720895, 1610612741, 2, -720894, 1610612741, 2, -720893, 1610612741, 2, -720892, 1610612741, 2, -720891, 1610612741, 2, -720890, 1610612741, 2, -720889, 1610612741, 2, -720888, 1610612741, 2, -720887, 1610612741, 2, -720886, 1610612741, 2, -720885, 1610612741, 2, -720884, 1610612741, 2, -720883, 1610612741, 2, -720882, 1610612741, 2, -720881, 1610612741, 2, -720880, 1610612741, 2, -720879, 1610612741, 2, -720878, 1610612741, 2, -720877, 1610612741, 2, -720876, 1610612741, 2, -720875, 1610612741, 2, -720874, 1610612741, 2, -720873, 1610612741, 2, -720872, 1610612741, 2, -720871, 1610612741, 2, -720870, 1610612741, 2, -720869, 1610612741, 2, -720868, 1610612741, 2, -720867, 1610612741, 2, -720866, 1610612741, 2, -720865, 1610612741, 2, -720864, 1610612741, 2, -720863, 1610612741, 2, -720862, 1610612741, 2, -720861, 1610612741, 2, -720860, 1610612741, 2, -720859, 1610612741, 2, -720858, 1610612741, 2, -720857, 1610612741, 2, -720856, 1610612741, 2, -720855, 1610612741, 2, -720854, 1610612741, 2, -720853, 1610612741, 2, -720852, 1610612741, 2, -720851, 1610612741, 2, -720850, 1610612741, 2, -720849, 1610612741, 2, -720848, 1610612741, 2, -720847, 1610612741, 2, -720846, 1610612741, 2, -720845, 1610612741, 2, -720844, 1610612741, 2, -720843, 1610612741, 2, -720842, 1610612741, 2, -720841, 1610612741, 2, -720840, 1610612741, 2, -720839, 1610612741, 2, -720838, 1610612741, 2, -720837, 1610612741, 2, -720836, 1610612741, 2, -720835, 1610612741, 2, -720834, 1610612741, 2, -720833, 1610612741, 2, -720832, 1610612741, 2, -720831, 1610612741, 2, -720830, 1610612741, 2, -720829, 1610612741, 2, -720828, 1610612741, 2, -720827, 1610612741, 65538, -589829, 1610612741, 6, -655291, 5, 6, -524293, 1610612741, 6, -589755, 5, 6, -458757, 1610612741, 6, -524219, 5, 6, -393230, 1610612741, 65539, -393229, 1610612741, 3, -393228, 1610612741, 3, -393227, 1610612741, 3, -393226, 1610612741, 3, -393225, 1610612741, 3, -393224, 1610612741, 3, -393223, 1073741829, 2, -393222, 5, 65541, -393221, 1610612741, 6, -458683, 5, 6, -327694, 5, 7, -327686, 5, 6, -327685, 5, 8, -393147, 5, 6, -262158, 5, 7, -262150, 5, 6, -262149, 5, 8, -327611, 5, 6, -196622, 5, 7, -196614, 5, 6, -196613, 5, 8, -262075, 5, 6, -131086, 5, 7, -131078, 5, 6, -131077, 5, 65538, -131076, 5, 3, -131075, 5, 3, -131074, 5, 3, -131073, 5, 3, -196608, 5, 3, -196607, 5, 4, -196539, 5, 6, -65550, 5, 7, -65542, 5, 9, -65541, 5, 10, -65540, 5, 10, -65539, 5, 10, -65538, 5, 10, -65537, 5, 10, -131072, 5, 65541, -131071, 5, 7, -131003, 5, 6, -14, 5, 7, -65536, 5, 6, -65535, 5, 7, -65528, 5, 1, -65527, 5, 2, -65526, 5, 2, -65525, 5, 2, -65524, 5, 4, -65467, 5, 6, 65522, 5, 7, 0, 5, 6, 1, 5, 7, 8, 5, 9, 9, 5, 10, 10, 5, 10, 11, 5, 65541, 12, 5, 7, 69, 5, 6, 131058, 5, 7, 65536, 5, 6, 65537, 5, 7, 65538, 5, 65542, 65539, 5, 65543, 65540, 5, 65544, 65547, 5, 6, 65548, 5, 7, 65605, 5, 6, 196594, 5, 7, 131072, 5, 9, 131073, 5, 65536, 131083, 5, 6, 131084, 5, 7, 131090, 5, 1, 131091, 5, 2, 131092, 5, 2, 131093, 5, 2, 131094, 5, 2, 131095, 5, 2, 131096, 5, 2, 131097, 5, 2, 131098, 5, 2, 131099, 5, 2, 131100, 5, 2, 131101, 5, 2, 131102, 5, 2, 131103, 5, 5, 131108, 5, 65542, 131109, 5, 65543, 131110, 5, 65543, 131111, 5, 65544, 131116, 5, 1, 131117, 5, 2, 131118, 5, 2, 131119, 5, 2, 131120, 5, 2, 131121, 5, 2, 131122, 5, 2, 131123, 5, 2, 131124, 5, 2, 131125, 5, 2, 131126, 5, 2, 131127, 5, 2, 131128, 5, 2, 131129, 5, 2, 131130, 5, 2, 131131, 5, 2, 131132, 5, 2, 131133, 5, 2, 131134, 5, 2, 131135, 5, 2, 131136, 5, 2, 131137, 5, 2, 131138, 5, 2, 131139, 5, 2, 131140, 5, 2, 131141, 5, 65539, 262130, 5, 7, 196619, 5, 6, 196620, 5, 7, 196626, 5, 6, 196639, 5, 7, 196652, 5, 6, 327666, 5, 7, 262150, 5, 1, 262151, 5, 2, 262152, 5, 2, 262153, 5, 2, 262154, 5, 2, 262155, 5, 65539, 262156, 5, 7, 262162, 5, 6, 262175, 5, 7, 262188, 5, 6, 393202, 5, 7, 327686, 5, 6, 327692, 5, 7, 327698, 5, 6, 327711, 5, 7, 327724, 5, 6, 458738, 5, 7, 393222, 5, 6, 393228, 5, 7, 393234, 5, 6, 393247, 5, 7, 393260, 5, 6, 524274, 5, 65538, 524275, 5, 2, 524276, 5, 2, 524277, 5, 2, 524278, 5, 2, 524279, 536870917, 2, 524280, 536870917, 2, 524281, 536870917, 2, 524282, 536870917, 2, 524283, 536870917, 2, 524284, 536870917, 2, 524285, 536870917, 2, 524286, 536870917, 2, 524287, 536870917, 2, 458752, 536870917, 2, 458753, 5, 3, 458754, 5, 3, 458755, 5, 3, 458756, 5, 3, 458757, 5, 3, 458758, 5, 65539, 458764, 5, 7, 458770, 5, 6, 458783, 5, 65538, 458784, 5, 2, 458785, 5, 2, 458786, 5, 2, 458787, 5, 2, 458788, 5, 2, 458789, 5, 2, 458790, 5, 2, 458791, 5, 2, 458792, 5, 2, 458793, 5, 2, 458794, 5, 2, 458795, 5, 2, 458796, 5, 65539, 524300, 5, 8, 524306, 5, 6, 589836, 5, 8, 589842, 5, 6 ) +tile_data = PoolIntArray( -720912, 5, 524293, -655376, 5, 524293, -589840, 5, 524293, -589835, 1610612741, 196609, -589834, 5, 196613, -589833, -1073741819, 196609, -589829, 1610612741, 6, -655291, 5, 6, -655289, 5, 524293, -524304, 5, 524293, -524299, -1073741819, 196616, -524298, 5, 393221, -524297, -1073741819, 196610, -524293, 1610612741, 6, -589755, 5, 6, -589753, 5, 524293, -458768, 5, 524293, -458763, -1610612731, 196609, -458762, 5, 196610, -458761, 5, 196609, -458758, -1073741819, 262150, -458757, 1610612741, 6, -524219, 5, 6, -524217, 5, 524293, -393232, 5, 524293, -393230, 1610612741, 65539, -393229, 1610612741, 3, -393228, 1610612741, 3, -393227, 1610612741, 3, -393226, 1610612741, 3, -393225, 1610612741, 3, -393224, 1610612741, 3, -393223, 1073741829, 2, -393222, 5, 65541, -393221, 1610612741, 6, -458683, 5, 6, -458681, 5, 524293, -327696, 5, 524293, -327694, 5, 7, -327686, 5, 6, -327685, 5, 8, -393147, 5, 6, -393145, 5, 524293, -262160, 5, 524293, -262158, 5, 7, -262150, 5, 6, -262149, 5, 8, -327611, 5, 6, -327609, 5, 524293, -196624, 5, 524293, -196622, 5, 7, -196614, 5, 6, -196613, 5, 8, -262130, 5, 1, -262129, 5, 4, -262125, 5, 1, -262124, 5, 3, -262123, 5, 3, -262122, 5, 4, -262075, 5, 6, -262073, 5, 524293, -131088, 5, 524293, -131086, 5, 7, -131078, 5, 6, -131077, 5, 65538, -131076, 5, 4, -131073, 5, 1, -196608, 5, 3, -196607, 5, 4, -196595, 5, 1, -196594, 5, 65539, -196593, 5, 7, -196589, 5, 6, -196586, 5, 7, -196539, 5, 6, -196537, 5, 524293, -65552, 5, 524293, -65550, 5, 7, -65542, 5, 9, -65541, 5, 65541, -65540, 5, 7, -65537, 1610612741, 8, -131072, 5, 196614, -131071, 5, 7, -131060, 5, 1, -131059, 5, 65539, -131058, -1073741819, 65545, -131057, 5, 7, -131053, 5, 6, -131050, 5, 7, -131003, 5, 6, -131001, 5, 524293, -16, 5, 524293, -14, 5, 7, -5, 5, 6, -4, 5, 8, -1, 1610612741, 8, -65536, 5, 196614, -65535, 5, 7, -65528, 5, 1, -65527, 5, 2, -65526, 5, 2, -65525, 5, 2, -65524, 5, 65539, -65523, 5, 196612, -65522, -1073741819, 65545, -65521, 5, 7, -65517, 5, 6, -65514, 5, 7, -65467, 5, 6, -65465, 5, 524293, 65520, 5, 524293, 65522, 5, 7, 65531, 5, 6, 65532, 5, 65538, 65533, 5, 2, 65534, 5, 2, 65535, 5, 65539, 0, 5, 196614, 1, 5, 7, 8, 5, 9, 9, 5, 10, 10, 5, 10, 11, 5, 65541, 12, -1073741819, 131074, 13, 5, 196612, 14, 1610612741, 196612, 15, 5, 65538, 16, 5, 3, 17, 5, 3, 18, 5, 3, 19, 5, 65539, 22, 5, 7, 69, 5, 6, 71, 5, 524293, 131056, 5, 524293, 131058, 5, 7, 131067, 5, 9, 131068, 5, 10, 131069, 5, 10, 131070, 5, 10, 131071, 5, 10, 65536, 5, 65541, 65537, 5, 7, 65539, 5, 65542, 65540, 5, 65544, 65547, 5, 6, 65558, 5, 7, 65564, 5, 1, 65565, 5, 2, 65566, 5, 2, 65567, 5, 5, 65605, 5, 6, 65607, 5, 524293, 196592, 5, 524293, 196594, 5, 7, 131072, 5, 9, 131073, 5, 65536, 131083, 5, 6, 131094, 5, 7, 131100, 5, 6, 131103, 5, 7, 131108, 5, 65542, 131109, 5, 65543, 131110, 5, 65543, 131111, 5, 65544, 131116, 5, 1, 131117, 5, 2, 131118, 5, 2, 131119, 5, 2, 131120, 5, 2, 131121, 5, 2, 131122, 5, 2, 131123, 5, 2, 131124, 5, 2, 131125, 5, 2, 131126, 5, 2, 131127, 5, 2, 131128, 5, 2, 131129, 5, 2, 131130, 5, 2, 131131, 5, 2, 131132, 5, 2, 131133, 5, 2, 131134, 5, 2, 131135, 5, 2, 131136, 5, 2, 131137, 5, 2, 131138, 5, 2, 131139, 5, 2, 131140, 5, 2, 131141, 5, 65539, 131143, 5, 524293, 262128, 5, 524293, 262130, 5, 7, 196619, 5, 6, 196630, 5, 7, 196636, 5, 6, 196639, 5, 7, 196652, 5, 6, 196679, 5, 524293, 327664, 5, 524293, 327666, 5, 7, 262150, 5, 1, 262151, 5, 2, 262152, 5, 2, 262153, 5, 2, 262154, 5, 2, 262155, 5, 65539, 262166, 5, 7, 262172, 5, 6, 262173, 5, 327687, 262175, 5, 7, 262188, 5, 6, 262215, 5, 524293, 393200, 5, 524293, 393202, 5, 7, 327686, 5, 6, 327702, 5, 7, 327708, 5, 6, 327711, 5, 7, 327724, 5, 6, 327751, 5, 524293, 458736, 5, 524293, 458738, 5, 7, 393222, 5, 6, 393238, 5, 7, 393244, 5, 6, 393247, 5, 7, 393260, 5, 6, 393287, 5, 524293, 524272, 5, 524293, 524274, 5, 65538, 524275, 5, 2, 524276, 5, 2, 524277, 5, 2, 524278, 5, 2, 524279, 536870917, 2, 524280, 536870917, 2, 524281, 536870917, 2, 524282, 536870917, 2, 524283, 536870917, 2, 524284, 536870917, 2, 524285, 536870917, 2, 524286, 536870917, 2, 524287, 536870917, 2, 458752, 536870917, 2, 458753, 5, 3, 458754, 5, 3, 458755, 5, 3, 458756, 5, 3, 458757, 5, 3, 458758, 5, 65539, 458774, 5, 7, 458780, 5, 6, 458783, 5, 65538, 458784, 5, 2, 458785, 5, 2, 458786, 5, 2, 458787, 5, 2, 458788, 5, 2, 458789, 5, 2, 458790, 5, 2, 458791, 5, 2, 458792, 5, 2, 458793, 5, 2, 458794, 5, 2, 458795, 5, 2, 458796, 5, 65539, 458823, 5, 524293, 589808, 5, 524293, 524310, 5, 8, 524316, 5, 6, 524359, 5, 524293, 655344, 5, 524293, 655345, 5, 524293, 655346, 5, 524293, 655347, 5, 524293, 655348, 5, 524293, 655349, 5, 524293, 655350, 5, 524293, 655351, 5, 524293, 655352, 5, 524293, 655353, 5, 524293, 655354, 5, 524293, 655355, 5, 524293, 655356, 5, 524293, 655357, 5, 524293, 655358, 5, 524293, 655359, 5, 524293, 589824, 5, 524293, 589825, 5, 524293, 589826, 5, 524293, 589827, 5, 524293, 589828, 5, 524293, 589829, 5, 524293, 589830, 5, 524293, 589831, 5, 524293, 589832, 5, 524293, 589833, 5, 524293, 589834, 5, 524293, 589835, 5, 524293, 589836, 5, 524293, 589837, 5, 524293, 589838, 5, 524293, 589839, 5, 524293, 589840, 5, 524293, 589841, 5, 524293, 589842, 5, 524293, 589843, 5, 524293, 589844, 5, 524293, 589845, 5, 524293, 589846, 5, 8, 589852, 5, 6, 589853, 5, 524293, 589854, 5, 524293, 589855, 5, 524293, 589856, 5, 524293, 589857, 5, 524293, 589858, 5, 524293, 589859, 5, 524293, 589860, 5, 524293, 589861, 5, 524293, 589862, 5, 524293, 589863, 5, 524293, 589864, 5, 524293, 589865, 5, 524293, 589866, 5, 524293, 589867, 5, 524293, 589868, 5, 524293, 589869, 5, 524293, 589870, 5, 524293, 589871, 5, 524293, 589872, 5, 524293, 589873, 5, 524293, 589874, 5, 524293, 589875, 5, 524293, 589876, 5, 524293, 589877, 5, 524293, 589878, 5, 524293, 589879, 5, 524293, 589880, 5, 524293, 589881, 5, 524293, 589882, 5, 524293, 589883, 5, 524293, 589884, 5, 524293, 589885, 5, 524293, 589886, 5, 524293, 589887, 5, 524293, 589888, 5, 524293, 589889, 5, 524293, 589890, 5, 524293, 589891, 5, 524293, 589892, 5, 524293, 589893, 5, 524293, 589894, 5, 524293, 589895, 5, 524293 ) [node name="DropThroughPlatforms" type="TileMap" parent="."] tile_set = ExtResource( 4 ) diff --git a/src/Levels/3 Tutorial Level.tscn b/src/Levels/3 Tutorial Level.tscn new file mode 100644 index 0000000..d24f962 --- /dev/null +++ b/src/Levels/3 Tutorial Level.tscn @@ -0,0 +1,187 @@ +[gd_scene load_steps=19 format=2] + +[ext_resource path="res://assets/environment/decor/platform-plants.png" type="Texture" id=1] +[ext_resource path="res://src/Contraptions/Triggers/ElevatorButton.tscn" type="PackedScene" id=2] +[ext_resource path="res://src/ObstacleObjects/PitArea.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/Contraptions/Portal/Portal.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/ObstacleObjects/Spikes.tscn" type="PackedScene" id=5] +[ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/UserInterface/UserInterface.tscn" type="PackedScene" id=7] +[ext_resource path="res://src/Utilities/LevelState.tscn" type="PackedScene" id=8] +[ext_resource path="res://src/Actors/BlobbyCam.tscn" type="PackedScene" id=9] +[ext_resource path="res://src/Actors/Blobby/Blobby.tscn" type="PackedScene" id=10] +[ext_resource path="res://src/Levels/Templates/LevelTemplate.gd" type="Script" id=11] +[ext_resource path="res://src/Environment/GreenHouseTiles.tres" type="TileSet" id=12] +[ext_resource path="res://src/Environment/DropThroughPlatforms.tres" type="TileSet" id=13] +[ext_resource path="res://src/Platforms/FlyingPlatform.tscn" type="PackedScene" id=14] +[ext_resource path="res://src/Actors/Enemies/Beings/Caterpillar.tscn" type="PackedScene" id=15] + +[sub_resource type="AnimationNodeStateMachinePlayback" id=4] + +[sub_resource type="TileSet" id=5] +0/name = "platform-plants.png 0" +0/texture = ExtResource( 1 ) +0/tex_offset = Vector2( 0, 0 ) +0/modulate = Color( 1, 1, 1, 1 ) +0/region = Rect2( 16, 0, 256, 16 ) +0/tile_mode = 2 +0/autotile/icon_coordinate = Vector2( 5, 0 ) +0/autotile/tile_size = Vector2( 16, 16 ) +0/autotile/spacing = 0 +0/autotile/occluder_map = [ ] +0/autotile/navpoly_map = [ ] +0/autotile/priority_map = [ ] +0/autotile/z_index_map = [ ] +0/occluder_offset = Vector2( 0, 0 ) +0/navigation_offset = Vector2( 0, 0 ) +0/shape_offset = Vector2( 0, 0 ) +0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +0/shape_one_way = false +0/shape_one_way_margin = 0.0 +0/shapes = [ ] +0/z_index = 0 + +[sub_resource type="Animation" id=6] +resource_name = "Path" +length = 6.0 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath("KinematicBody2D:position") +tracks/0/interp = 2 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 3 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 0, +"values": [ Vector2( 0, 0 ), Vector2( 0, -64 ) ] +} + +[node name="LevelTemplate" type="Node2D"] +script = ExtResource( 11 ) +__meta__ = { +"_edit_horizontal_guides_": [ 464.0 ], +"_edit_vertical_guides_": [ 2880.0 ] +} + +[node name="SignalManager" parent="." instance=ExtResource( 6 )] + +[node name="LevelState" parent="." instance=ExtResource( 8 )] +unique_name_in_owner = true + +[node name="UserInterface" parent="." instance=ExtResource( 7 )] +unique_name_in_owner = true + +[node name="Timer" parent="UserInterface/HUD/HUDOverlay/GetBackTimer" index="0"] +wait_time = 20.0 + +[node name="BlobbyCam" parent="." instance=ExtResource( 9 )] +unique_name_in_owner = true + +[node name="AnimatedSprite" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="4"] +frame = 2 + +[node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"] +frame = 1 + +[node name="Blobby" parent="." instance=ExtResource( 10 )] +unique_name_in_owner = true +position = Vector2( -180, 112 ) +scale = Vector2( 0.878906, 0.936025 ) + +[node name="AnimationTree" parent="Blobby/BlobbySprite" index="0"] +parameters/playback = SubResource( 4 ) + +[node name="PitArea" parent="." instance=ExtResource( 3 )] +position = Vector2( 416, 170 ) + +[node name="Caterpillar" parent="." instance=ExtResource( 15 )] +position = Vector2( 254, -134 ) + +[node name="Caterpillar2" parent="." instance=ExtResource( 15 )] +position = Vector2( 104, -88 ) +rotation = 3.14159 +scale = Vector2( 0.743861, 0.536024 ) + +[node name="TileMap" type="TileMap" parent="."] +unique_name_in_owner = true +tile_set = ExtResource( 12 ) +cell_size = Vector2( 16, 16 ) +cell_quadrant_size = 3 +cell_custom_transform = Transform2D( 24, 0, 0, 24, 0, 0 ) +collision_layer = 8 +collision_mask = 8 +bake_navigation = true +format = 1 +tile_data = PoolIntArray( -1638414, 5, 65540, -1638413, 5, 10, -1638412, 5, 10, -1638411, 5, 10, -1638410, 5, 10, -1638409, 5, 10, -1638408, 5, 10, -1638407, 5, 10, -1638406, 5, 10, -1638405, 5, 10, -1638404, 5, 10, -1638403, 5, 10, -1638402, 5, 10, -1638401, 5, 10, -1703936, 5, 10, -1703935, 5, 10, -1703934, 5, 10, -1703933, 5, 10, -1703932, 5, 10, -1703931, 5, 10, -1703930, 5, 10, -1703929, 5, 10, -1703928, 5, 10, -1703927, 5, 10, -1703926, 5, 10, -1703925, 5, 10, -1703924, 5, 10, -1703923, 5, 10, -1703922, 5, 10, -1703921, 5, 10, -1703920, 5, 10, -1703919, 5, 10, -1703918, 5, 10, -1703917, 5, 10, -1703916, 5, 10, -1703915, 5, 10, -1703914, 5, 10, -1703913, 5, 10, -1703912, 5, 10, -1703911, 5, 10, -1703910, 5, 10, -1703909, 5, 10, -1703908, 5, 10, -1703907, 5, 10, -1703906, 5, 10, -1703905, 5, 10, -1703904, 5, 10, -1703903, 5, 10, -1703902, 5, 10, -1703901, 5, 10, -1703900, 5, 10, -1703899, 5, 10, -1703898, 5, 10, -1703897, 5, 10, -1703896, 5, 10, -1703895, 5, 10, -1703894, 5, 10, -1703893, 5, 10, -1703892, 5, 10, -1703891, 5, 10, -1703890, 5, 65541, -1572878, 5, 7, -1638354, 5, 6, -1507342, 5, 7, -1572818, 5, 6, -1441806, 5, 7, -1507282, 5, 6, -1376270, 5, 7, -1441746, 5, 6, -1310734, 5, 7, -1376210, 5, 6, -1245198, 5, 7, -1310674, 5, 6, -1179662, 5, 7, -1245138, 5, 6, -1114126, 5, 7, -1179648, 5, 1, -1179647, 5, 2, -1179646, 5, 2, -1179645, 5, 2, -1179644, 5, 2, -1179643, 5, 2, -1179642, 5, 2, -1179641, 5, 2, -1179640, 5, 2, -1179639, 5, 2, -1179638, 5, 5, -1179629, 5, 1, -1179628, 5, 3, -1179627, 5, 3, -1179626, 5, 3, -1179625, 5, 3, -1179624, 5, 3, -1179623, 5, 3, -1179622, 5, 4, -1179602, 5, 6, -1048590, 5, 7, -1114112, 5, 6, -1114111, 5, 524298, -1114110, 5, 589824, -1114109, 5, 589824, -1114108, 5, 589824, -1114107, 5, 589824, -1114106, 5, 589824, -1114105, 5, 589824, -1114104, 5, 589824, -1114103, 5, 524297, -1114102, 5, 8, -1114093, 5, 9, -1114092, 5, 10, -1114091, 5, 10, -1114090, 5, 10, -1114089, 5, 10, -1114088, 5, 10, -1114087, 5, 10, -1114086, 5, 65536, -1114066, 5, 6, -983054, 5, 7, -1048576, 5, 6, -1048575, 5, 589828, -1048567, 5, 589829, -1048566, 5, 8, -1048530, 5, 6, -917518, 5, 7, -983040, 5, 6, -983039, 5, 589830, -983038, 5, 589831, -983037, 5, 589831, -983036, 5, 589831, -983035, 5, 589831, -983034, 5, 589831, -983033, 5, 589831, -983032, 5, 589831, -983031, 5, 589832, -983030, 5, 8, -982994, 5, 6, -851982, 5, 7, -917504, 5, 9, -917503, 5, 10, -917502, 5, 10, -917501, 5, 10, -917500, 5, 10, -917499, 5, 10, -917498, 5, 10, -917497, 5, 10, -917496, 5, 10, -917495, 5, 10, -917494, 5, 65536, -917458, 5, 6, -786446, 5, 65538, -786445, 5, 3, -786444, 5, 3, -786443, 5, 4, -851922, 5, 6, -720910, 5, 65540, -720909, 5, 10, -720908, 5, 10, -720907, 5, 65536, -786386, 5, 6, -655376, 5, 524293, -655374, 5, 7, -720850, 5, 6, -589840, 5, 524293, -589838, 5, 7, -655314, 5, 6, -524304, 5, 524293, -524302, 5, 7, -589798, 5, 1, -589797, 5, 3, -589796, 5, 3, -589795, 5, 3, -589794, 5, 3, -589793, 5, 3, -589792, 5, 3, -589791, 5, 3, -589790, 5, 3, -589789, 5, 3, -589788, 5, 3, -589787, 5, 3, -589786, 5, 5, -589778, 5, 6, -458768, 5, 524293, -458766, 5, 7, -524285, 5, 1, -524284, 5, 3, -524283, 5, 3, -524282, 5, 3, -524281, 5, 3, -524280, 5, 3, -524279, 5, 3, -524278, 5, 3, -524277, 5, 3, -524276, 5, 3, -524275, 5, 3, -524274, 5, 3, -524273, 5, 3, -524272, 5, 5, -524262, 5, 9, -524261, 5, 10, -524260, 5, 10, -524259, 5, 10, -524258, 5, 10, -524257, 5, 10, -524256, 5, 10, -524255, 5, 10, -524254, 5, 10, -524253, 5, 10, -524252, 5, 10, -524251, 5, 10, -524250, 5, 65536, -524242, 5, 6, -393232, 5, 524293, -393230, 5, 7, -458749, 5, 9, -458748, 5, 10, -458747, 5, 10, -458746, 5, 10, -458745, 5, 10, -458744, 5, 10, -458743, 5, 10, -458742, 5, 10, -458741, 5, 10, -458740, 5, 10, -458739, 5, 10, -458738, 5, 10, -458737, 5, 10, -458736, 5, 65536, -458706, 5, 6, -327696, 5, 524293, -327694, 5, 7, -393170, 5, 6, -262160, 5, 524293, -262158, 5, 7, -327634, 5, 6, -196624, 5, 524293, -196622, 5, 7, -262098, 5, 6, -131088, 5, 524293, -131086, 5, 7, -196562, 5, 6, -65552, 5, 524293, -65550, 5, 7, -131026, 5, 6, -16, 5, 524293, -14, 5, 7, -65490, 5, 6, 65520, 5, 524293, 65522, 5, 7, 46, 5, 6, 131056, 5, 524293, 131058, 5, 7, 65565, 5, 1, 65566, 5, 3, 65567, 5, 3, 65568, 5, 3, 65569, 5, 3, 65570, 5, 3, 65571, 5, 3, 65572, 5, 3, 65573, 5, 3, 65574, 5, 3, 65575, 5, 5, 65582, 5, 6, 196592, 5, 524293, 196594, 5, 7, 131101, 5, 6, 131102, 5, 196616, 131103, 5, 196616, 131104, 5, 196616, 131105, 5, 196616, 131106, 5, 196616, 131107, 5, 196616, 131108, 5, 196616, 131109, 5, 196616, 131110, 5, 196616, 131111, 5, 8, 131118, 5, 6, 262128, 5, 524293, 262130, 5, 7, 196617, 5, 1, 196618, 5, 3, 196619, 5, 3, 196620, 5, 3, 196621, 5, 3, 196622, 5, 3, 196623, 5, 3, 196624, 5, 3, 196625, 5, 3, 196626, 5, 3, 196627, 5, 3, 196628, 5, 5, 196637, 5, 9, 196638, 5, 10, 196639, 5, 10, 196640, 5, 10, 196641, 5, 10, 196642, 5, 10, 196643, 5, 10, 196644, 5, 10, 196645, 5, 10, 196646, 5, 10, 196647, 5, 65536, 196654, 5, 6, 327664, 5, 524293, 327666, 5, 7, 262153, 5, 9, 262154, 5, 10, 262155, 5, 10, 262156, 5, 10, 262157, 5, 10, 262158, 5, 10, 262159, 5, 10, 262160, 5, 10, 262161, 5, 10, 262162, 5, 10, 262163, 5, 10, 262164, 5, 65536, 262187, 5, 1, 262188, 5, 3, 262189, 5, 3, 262190, 5, 65539, 393200, 5, 524293, 393202, 5, 7, 327723, 5, 6, 458736, 5, 524293, 458738, 5, 7, 393259, 5, 6, 524272, 5, 524293, 524274, 5, 65538, 524275, 5, 2, 524276, 5, 2, 524277, 5, 2, 524278, 5, 2, 524279, 536870917, 2, 524280, 536870917, 2, 524281, 536870917, 2, 524282, 536870917, 2, 524283, 536870917, 2, 524284, 536870917, 2, 524285, 536870917, 2, 524286, 536870917, 2, 524287, 536870917, 2, 458752, 536870917, 2, 458753, 5, 3, 458754, 5, 3, 458755, 5, 3, 458756, 5, 3, 458757, 5, 3, 458758, 5, 3, 458759, 5, 3, 458760, 5, 3, 458761, 5, 3, 458762, 5, 3, 458763, 5, 3, 458764, 5, 3, 458765, 5, 3, 458766, 5, 3, 458767, 5, 3, 458768, 5, 3, 458769, 5, 3, 458770, 5, 3, 458771, 5, 3, 458772, 5, 3, 458773, 5, 3, 458774, 5, 3, 458775, 5, 3, 458776, 5, 3, 458777, 5, 3, 458778, 5, 3, 458779, 5, 3, 458780, 5, 3, 458781, 5, 3, 458782, 5, 3, 458783, 5, 3, 458784, 5, 3, 458785, 5, 3, 458786, 5, 3, 458787, 5, 3, 458788, 5, 3, 458789, 5, 3, 458790, 5, 3, 458791, 5, 3, 458792, 5, 3, 458793, 5, 3, 458794, 5, 3, 458795, 5, 65539, 589808, 5, 524293, 655344, 5, 524293, 655345, 5, 524293, 655346, 5, 524293, 655347, 5, 524293, 655348, 5, 524293, 655349, 5, 524293, 655350, 5, 524293, 655351, 5, 524293, 655352, 5, 524293, 655353, 5, 524293, 655354, 5, 524293, 655355, 5, 524293, 655356, 5, 524293, 655357, 5, 524293, 655358, 5, 524293, 655359, 5, 524293, 589824, 5, 524293, 589825, 5, 524293, 589826, 5, 524293, 589827, 5, 524293, 589828, 5, 524293, 589829, 5, 524293 ) + +[node name="DropThroughPlatforms" type="TileMap" parent="."] +tile_set = ExtResource( 13 ) +cell_size = Vector2( 16, 16 ) +format = 1 + +[node name="PlatformPlants" type="TileMap" parent="."] +tile_set = SubResource( 5 ) +cell_size = Vector2( 16, 16 ) +format = 1 + +[node name="ElevatorButton" parent="." instance=ExtResource( 2 )] +position = Vector2( 366, -288 ) + +[node name="Portal" parent="ElevatorButton" instance=ExtResource( 4 )] +position = Vector2( 113, 64 ) +scale = Vector2( 0.5, 0.5 ) +next_scene = "res://src/Levels/Actual Level 1.tscn" + +[node name="Obstacles" type="Node2D" parent="."] +position = Vector2( -56, 274 ) + +[node name="Spikes" parent="Obstacles" instance=ExtResource( 5 )] +position = Vector2( 524, 100 ) + +[node name="Spikes2" parent="Obstacles" instance=ExtResource( 5 )] +position = Vector2( 548, 100 ) + +[node name="Spikes3" parent="Obstacles" instance=ExtResource( 5 )] +position = Vector2( 572, 100 ) + +[node name="Spikes4" parent="Obstacles" instance=ExtResource( 5 )] +position = Vector2( 596, 100 ) + +[node name="Spikes5" parent="Obstacles" instance=ExtResource( 5 )] +position = Vector2( 620, 100 ) + +[node name="Spikes6" parent="Obstacles" instance=ExtResource( 5 )] +position = Vector2( 644, 100 ) + +[node name="Spikes7" parent="Obstacles" instance=ExtResource( 5 )] +position = Vector2( 668, 100 ) + +[node name="Spikes8" parent="Obstacles" instance=ExtResource( 5 )] +position = Vector2( 692, 100 ) + +[node name="FlyingPlatform2" parent="." instance=ExtResource( 14 )] +position = Vector2( -32, -127 ) + +[node name="anim" parent="FlyingPlatform2" index="0"] +autoplay = "Path" + +[node name="FlyingPlatform3" parent="." instance=ExtResource( 14 )] +position = Vector2( 688, -32 ) +scale = Vector2( 0.75, 1 ) + +[node name="anim" parent="FlyingPlatform3" index="0"] +autoplay = "Path" +anims/Path = SubResource( 6 ) + +[connection signal="body_exited" from="Blobby/BlobbySkin" to="Blobby" method="_on_BlobbySkin_body_exited"] + +[editable path="SignalManager"] +[editable path="LevelState"] +[editable path="UserInterface"] +[editable path="UserInterface/HUD"] +[editable path="BlobbyCam"] +[editable path="Blobby"] +[editable path="FlyingPlatform2"] +[editable path="FlyingPlatform3"] diff --git a/src/Levels/Actual Level 1.tscn b/src/Levels/Actual Level 1.tscn index 44fea4d..56f6e54 100644 --- a/src/Levels/Actual Level 1.tscn +++ b/src/Levels/Actual Level 1.tscn @@ -18,7 +18,7 @@ [ext_resource path="res://src/Contraptions/Portal/Portal.tscn" type="PackedScene" id=17] [ext_resource path="res://src/Levels/Templates/LevelTemplate.gd" type="Script" id=19] [ext_resource path="res://src/Environment/Grass/ShaderGrass.tscn" type="PackedScene" id=20] -[ext_resource path="res://src/Environment/Greenhouse.tscn" type="PackedScene" id=21] +[ext_resource path="res://src/Environment/Legacy/Greenhouse.tscn" type="PackedScene" id=21] [sub_resource type="AnimationNodeStateMachinePlayback" id=4] diff --git a/src/Levels/Actual Level 2.tscn b/src/Levels/Actual Level 2.tscn index f16c021..97ec6c0 100644 --- a/src/Levels/Actual Level 2.tscn +++ b/src/Levels/Actual Level 2.tscn @@ -6,7 +6,7 @@ [ext_resource path="res://src/UserInterface/UserInterface.tscn" type="PackedScene" id=4] [ext_resource path="res://src/Actors/Blobby/Blobby.tscn" type="PackedScene" id=5] [ext_resource path="res://src/Contraptions/Portal/Portal.tscn" type="PackedScene" id=7] -[ext_resource path="res://src/Environment/AlienShipTileSet.tres" type="TileSet" id=8] +[ext_resource path="res://src/Environment/Legacy/AlienShipTileSet.tres" type="TileSet" id=8] [ext_resource path="res://src/Levels/Templates/LevelTemplate.gd" type="Script" id=9] [ext_resource path="res://src/Actors/Enemies/Beings/SimpleEnemy.tscn" type="PackedScene" id=10] [ext_resource path="res://src/Actors/Enemies/Beings/Flyer.tscn" type="PackedScene" id=11] @@ -18,7 +18,7 @@ [ext_resource path="res://src/Platforms/FlyingPlatformClean.tscn" type="PackedScene" id=17] [ext_resource path="res://src/BenefitialObjects/Coin.tscn" type="PackedScene" id=18] [ext_resource path="res://src/Environment/Grass/ShaderGrass.tscn" type="PackedScene" id=19] -[ext_resource path="res://src/Environment/Greenhouse.tscn" type="PackedScene" id=20] +[ext_resource path="res://src/Environment/Legacy/Greenhouse.tscn" type="PackedScene" id=20] [sub_resource type="AnimationNodeStateMachinePlayback" id=4] diff --git a/src/Levels/Actual Level 3.tscn b/src/Levels/Actual Level 3.tscn index 1a01454..bb74977 100644 --- a/src/Levels/Actual Level 3.tscn +++ b/src/Levels/Actual Level 3.tscn @@ -18,7 +18,7 @@ [ext_resource path="res://src/Contraptions/VendingMachine.tscn" type="PackedScene" id=17] [ext_resource path="res://src/ObstacleObjects/Spikes.tscn" type="PackedScene" id=18] [ext_resource path="res://src/BenefitialObjects/SavePoint.tscn" type="PackedScene" id=19] -[ext_resource path="res://src/Environment/Greenhouse.tscn" type="PackedScene" id=20] +[ext_resource path="res://src/Environment/Legacy/Greenhouse.tscn" type="PackedScene" id=20] [sub_resource type="AnimationNodeStateMachinePlayback" id=4] diff --git a/src/Levels/Falling Level.tscn b/src/Levels/Falling Level.tscn index 7dab661..fe8b548 100644 --- a/src/Levels/Falling Level.tscn +++ b/src/Levels/Falling Level.tscn @@ -8,7 +8,7 @@ [ext_resource path="res://src/Levels/x02 Level.tscn" type="PackedScene" id=6] [ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=7] [ext_resource path="res://src/Contraptions/Portal/Portal.tscn" type="PackedScene" id=8] -[ext_resource path="res://src/Environment/AlienShipTileSet.tres" type="TileSet" id=9] +[ext_resource path="res://src/Environment/Legacy/AlienShipTileSet.tres" type="TileSet" id=9] [sub_resource type="AnimationNodeStateMachinePlayback" id=4] diff --git a/src/Levels/Legacy/1 Tut Level.tscn b/src/Levels/Legacy/1 Tut Level.tscn index b07ca25..f74f1e9 100644 --- a/src/Levels/Legacy/1 Tut Level.tscn +++ b/src/Levels/Legacy/1 Tut Level.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=11 format=2] -[ext_resource path="res://src/Environment/AlienShipTileSet.tres" type="TileSet" id=1] +[ext_resource path="res://src/Environment/Legacy/AlienShipTileSet.tres" type="TileSet" id=1] [ext_resource path="res://src/Levels/Level 1.gd" type="Script" id=2] [ext_resource path="res://src/UserInterface/UserInterface.tscn" type="PackedScene" id=3] [ext_resource path="res://src/Utilities/LevelState.tscn" type="PackedScene" id=4] diff --git a/src/Levels/Legacy/2 Tut Level.tscn b/src/Levels/Legacy/2 Tut Level.tscn index 1989a0a..22659c6 100644 --- a/src/Levels/Legacy/2 Tut Level.tscn +++ b/src/Levels/Legacy/2 Tut Level.tscn @@ -14,7 +14,7 @@ [ext_resource path="res://src/BenefitialObjects/SavePoint.tscn" type="PackedScene" id=12] [ext_resource path="res://src/Contraptions/Triggers/ElevatorButton.tscn" type="PackedScene" id=13] [ext_resource path="res://src/Platforms/DropThroughPlatform.tscn" type="PackedScene" id=14] -[ext_resource path="res://src/Environment/AlienShipTileSet.tres" type="TileSet" id=15] +[ext_resource path="res://src/Environment/Legacy/AlienShipTileSet.tres" type="TileSet" id=15] [ext_resource path="res://src/Levels/Level 2.gd" type="Script" id=16] [sub_resource type="AnimationNodeStateMachinePlayback" id=4] @@ -44,10 +44,10 @@ unique_name_in_owner = true drag_margin_bottom = 0.3 [node name="AnimatedSprite" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="4"] -frame = 6 +frame = 11 [node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"] -frame = 11 +frame = 2 [node name="Blobby" parent="." instance=ExtResource( 6 )] unique_name_in_owner = true @@ -228,20 +228,14 @@ position = Vector2( 756, -15 ) z_index = -1 [node name="AnimatedSprite" parent="Coin" index="2"] -frame = 100 +frame = 27 [node name="Coin2" parent="." instance=ExtResource( 7 )] position = Vector2( 744, -120 ) -[node name="AnimatedSprite" parent="Coin2" index="2"] -frame = 31 - [node name="Coin3" parent="." instance=ExtResource( 7 )] position = Vector2( 1320, -282 ) -[node name="AnimatedSprite" parent="Coin3" index="2"] -frame = 31 - [node name="Coin4" parent="." instance=ExtResource( 7 )] position = Vector2( 2340, -156 ) diff --git a/src/Levels/3 Tut Level.tscn b/src/Levels/Legacy/3 Tut Level.tscn similarity index 99% rename from src/Levels/3 Tut Level.tscn rename to src/Levels/Legacy/3 Tut Level.tscn index d0fd444..eebcf45 100644 --- a/src/Levels/3 Tut Level.tscn +++ b/src/Levels/Legacy/3 Tut Level.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=17 format=2] -[ext_resource path="res://src/Environment/AlienShipTileSet.tres" type="TileSet" id=2] +[ext_resource path="res://src/Environment/Legacy/AlienShipTileSet.tres" type="TileSet" id=2] [ext_resource path="res://src/Contraptions/VendingMachine.tscn" type="PackedScene" id=3] [ext_resource path="res://src/BenefitialObjects/Coin.tscn" type="PackedScene" id=7] [ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=36] diff --git a/src/Levels/Level 4.tscn b/src/Levels/Level 4.tscn index 2efffe6..c469b32 100644 --- a/src/Levels/Level 4.tscn +++ b/src/Levels/Level 4.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=28 format=2] -[ext_resource path="res://src/Environment/AlienShipTileSet.tres" type="TileSet" id=1] +[ext_resource path="res://src/Environment/Legacy/AlienShipTileSet.tres" type="TileSet" id=1] [ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=2] [ext_resource path="res://src/Utilities/LevelState.tscn" type="PackedScene" id=3] [ext_resource path="res://src/Actors/BlobbyCam.tscn" type="PackedScene" id=4] diff --git a/src/Levels/Level 5.tscn b/src/Levels/Level 5.tscn index 8de1039..6de2e48 100644 --- a/src/Levels/Level 5.tscn +++ b/src/Levels/Level 5.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=11 format=2] -[ext_resource path="res://src/Environment/AlienShipTileSet.tres" type="TileSet" id=1] +[ext_resource path="res://src/Environment/Legacy/AlienShipTileSet.tres" type="TileSet" id=1] [ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=2] [ext_resource path="res://src/Utilities/LevelState.tscn" type="PackedScene" id=3] [ext_resource path="res://src/Actors/BlobbyCam.tscn" type="PackedScene" id=4] diff --git a/src/Levels/Templates/Template.tscn b/src/Levels/Templates/Template.tscn index 18670f1..f25d06e 100644 --- a/src/Levels/Templates/Template.tscn +++ b/src/Levels/Templates/Template.tscn @@ -5,7 +5,7 @@ [ext_resource path="res://src/Utilities/LevelState.tscn" type="PackedScene" id=3] [ext_resource path="res://src/Actors/BlobbyCam.tscn" type="PackedScene" id=4] [ext_resource path="res://src/Contraptions/Portal/Portal.tscn" type="PackedScene" id=5] -[ext_resource path="res://src/Contraptions/DropThroughPlatforms.tres" type="TileSet" id=6] +[ext_resource path="res://src/Environment/DropThroughPlatforms.tres" type="TileSet" id=6] [ext_resource path="res://src/Actors/Blobby/Blobby.tscn" type="PackedScene" id=7] [ext_resource path="res://src/UserInterface/UserInterface.tscn" type="PackedScene" id=8] [ext_resource path="res://src/Levels/Templates/LevelTemplate.gd" type="Script" id=9] diff --git a/src/Levels/x01 Level.tscn b/src/Levels/x01 Level.tscn index 8a191c1..adc57d6 100644 --- a/src/Levels/x01 Level.tscn +++ b/src/Levels/x01 Level.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=15 format=2] -[ext_resource path="res://src/Environment/AlienShipTileSet.tres" type="TileSet" id=1] +[ext_resource path="res://src/Environment/Legacy/AlienShipTileSet.tres" type="TileSet" id=1] [ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=2] [ext_resource path="res://src/Utilities/LevelState.tscn" type="PackedScene" id=3] [ext_resource path="res://src/BenefitialObjects/Coin.tscn" type="PackedScene" id=4] diff --git a/src/Levels/x02 Level.tscn b/src/Levels/x02 Level.tscn index 96de5d9..db086ad 100644 --- a/src/Levels/x02 Level.tscn +++ b/src/Levels/x02 Level.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=19 format=2] -[ext_resource path="res://src/Environment/AlienShipTileSet.tres" type="TileSet" id=1] +[ext_resource path="res://src/Environment/Legacy/AlienShipTileSet.tres" type="TileSet" id=1] [ext_resource path="res://assets/contraption/FlyingPlatformClean.png" type="Texture" id=2] [ext_resource path="res://src/Platforms/FlyingPlatform.gd" type="Script" id=3] [ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=4] diff --git a/src/Levels/x03 Level.tscn b/src/Levels/x03 Level.tscn index 3d38604..298d1c4 100644 --- a/src/Levels/x03 Level.tscn +++ b/src/Levels/x03 Level.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=54 format=2] [ext_resource path="res://src/Platforms/SpringPhysics.gd" type="Script" id=1] -[ext_resource path="res://src/Environment/AlienShipTileSet.tres" type="TileSet" id=2] +[ext_resource path="res://src/Environment/Legacy/AlienShipTileSet.tres" type="TileSet" id=2] [ext_resource path="res://assets/contraption/SpringHolder/SpringHolder10.png" type="Texture" id=3] [ext_resource path="res://assets/contraption/SpringHolder/SpringHolder25.png" type="Texture" id=4] [ext_resource path="res://assets/contraption/SpringHolder/SpringHolder21.png" type="Texture" id=5] diff --git a/src/Levels/xFlyer Test Level.tscn b/src/Levels/xFlyer Test Level.tscn index 5085b74..64f39d4 100644 --- a/src/Levels/xFlyer Test Level.tscn +++ b/src/Levels/xFlyer Test Level.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=14 format=2] -[ext_resource path="res://src/Environment/AlienShipTileSet.tres" type="TileSet" id=1] +[ext_resource path="res://src/Environment/Legacy/AlienShipTileSet.tres" type="TileSet" id=1] [ext_resource path="res://src/Contraptions/Triggers/ElevatorButton.tscn" type="PackedScene" id=3] [ext_resource path="res://src/Actors/BlobbyCam.tscn" type="PackedScene" id=4] [ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=5] diff --git a/src/Levels/xFroggy Test Level.tscn b/src/Levels/xFroggy Test Level.tscn index 09346d0..f28f7a0 100644 --- a/src/Levels/xFroggy Test Level.tscn +++ b/src/Levels/xFroggy Test Level.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=19 format=2] -[ext_resource path="res://src/Environment/AlienShipTileSet.tres" type="TileSet" id=1] +[ext_resource path="res://src/Environment/Legacy/AlienShipTileSet.tres" type="TileSet" id=1] [ext_resource path="res://src/Contraptions/Triggers/ElevatorButton.tscn" type="PackedScene" id=3] [ext_resource path="res://src/Actors/BlobbyCam.tscn" type="PackedScene" id=4] [ext_resource path="res://src/BenefitialObjects/Coin.tscn" type="PackedScene" id=5] diff --git a/src/Levels/xGrass Test Level.tscn b/src/Levels/xGrass Test Level.tscn index de20294..2dad0e9 100644 --- a/src/Levels/xGrass Test Level.tscn +++ b/src/Levels/xGrass Test Level.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=9 format=2] -[ext_resource path="res://src/Environment/AlienShipTileSet.tres" type="TileSet" id=1] +[ext_resource path="res://src/Environment/Legacy/AlienShipTileSet.tres" type="TileSet" id=1] [ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=3] [ext_resource path="res://src/Utilities/LevelState.tscn" type="PackedScene" id=4] [ext_resource path="res://src/Environment/Grass/ShaderGrass.tscn" type="PackedScene" id=5] diff --git a/src/ObstacleObjects/Bullet.gd b/src/ObstacleObjects/Bullet.gd index 33694ba..eda8490 100644 --- a/src/ObstacleObjects/Bullet.gd +++ b/src/ObstacleObjects/Bullet.gd @@ -7,12 +7,12 @@ extends Area2D # Called when the node enters the scene tree for the first time. func _ready() -> void: - pass # Replace with function body. + pass # Replace with function body. func _physics_process(delta: float) -> void: - position += transform.y * 666 * delta + position += transform.y * 666 * delta func _on_Bullet_body_entered(_body: Node) -> void: - queue_free() + queue_free() diff --git a/src/ObstacleObjects/Mine.gd b/src/ObstacleObjects/Mine.gd index 2496dac..b42731d 100644 --- a/src/ObstacleObjects/Mine.gd +++ b/src/ObstacleObjects/Mine.gd @@ -8,15 +8,15 @@ export var is_locked = true func _ready() -> void: - $Area2D.remove_from_group("harmful") - $Sprite/AnimationPlayer.play("locked") + $Area2D.remove_from_group("harmful") + $Sprite/AnimationPlayer.play("locked") func _on_Area2D_area_exited(area: Area2D) -> void: - $Timer.start() + $Timer.start() func _on_Timer_timeout() -> void: - is_locked = true - $Area2D.add_to_group("harmful") - $Sprite/AnimationPlayer.play("unlocked") + is_locked = true + $Area2D.add_to_group("harmful") + $Sprite/AnimationPlayer.play("unlocked") diff --git a/src/Platforms/FlyingLaserCutter.gd b/src/Platforms/FlyingLaserCutter.gd index 9da431a..c5e886d 100644 --- a/src/Platforms/FlyingLaserCutter.gd +++ b/src/Platforms/FlyingLaserCutter.gd @@ -19,35 +19,35 @@ var mass = 10 # Maybe keep returning paths free and crush player when in the way func _ready() -> void: - $FlyingLaserCutterBody/Sprite/AnimationPlayer.play("default") + $FlyingLaserCutterBody/Sprite/AnimationPlayer.play("default") func _physics_process(delta: float) -> void: - if !flyoff_triggered: - for ray in trigger_rays: - # When player has been hit on the way - if (has_hit_player && body.position.x > 0): - break - if ray.is_colliding(): - var collider = ray.get_collider() - if collider.is_in_group("player"): - flyoff_triggered = true - body.set("motion/sync_to_physics", false) - break - if body.position.x > 0: - velocity=1 - body.position.x += (max_velocity/3)*-1*delta - elif body.position.x == 0: - has_hit_player = false - if flyoff_triggered: - velocity = PhysicsFunc.two_step_euler( - velocity, acceleration_force, mass, delta - ) - velocity = clamp(velocity, 0, max_velocity) - var collision = body.move_and_collide(velocity*global_facing*delta,true) - if collision != null: - if !collision.collider.is_in_group("player"): - body.set("motion/sync_to_physics", true) - else: - has_hit_player = true - flyoff_triggered = false + if !flyoff_triggered: + for ray in trigger_rays: + # When player has been hit on the way + if (has_hit_player && body.position.x > 0): + break + if ray.is_colliding(): + var collider = ray.get_collider() + if collider.is_in_group("player"): + flyoff_triggered = true + body.set("motion/sync_to_physics", false) + break + if body.position.x > 0: + velocity=1 + body.position.x += (max_velocity/3)*-1*delta + elif body.position.x == 0: + has_hit_player = false + if flyoff_triggered: + velocity = PhysicsFunc.two_step_euler( + velocity, acceleration_force, mass, delta + ) + velocity = clamp(velocity, 0, max_velocity) + var collision = body.move_and_collide(velocity*global_facing*delta,true) + if collision != null: + if !collision.collider.is_in_group("player"): + body.set("motion/sync_to_physics", true) + else: + has_hit_player = true + flyoff_triggered = false diff --git a/src/Platforms/FlyingPlatform.gd b/src/Platforms/FlyingPlatform.gd index 4b178bd..a7ee17e 100644 --- a/src/Platforms/FlyingPlatform.gd +++ b/src/Platforms/FlyingPlatform.gd @@ -8,7 +8,7 @@ onready var slide_friction = 2 # Called when the node enters the scene tree for the first time. func _ready() -> void: - $anim.play("Horizontal") + $anim.play("Horizontal") # Called every frame. 'delta' is the elapsed time since the previous frame. diff --git a/src/Platforms/FlyingPlatform.tscn b/src/Platforms/FlyingPlatform.tscn index 569a172..c39900e 100644 --- a/src/Platforms/FlyingPlatform.tscn +++ b/src/Platforms/FlyingPlatform.tscn @@ -1,13 +1,10 @@ [gd_scene load_steps=5 format=2] [ext_resource path="res://src/Platforms/FlyingPlatform.gd" type="Script" id=1] -[ext_resource path="res://assets/contraption/FlyingPlatform.png" type="Texture" id=2] +[ext_resource path="res://assets/contraption/floating_platform_test.png" type="Texture" id=2] -[sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 24, 6 ) - -[sub_resource type="Animation" id=2] -resource_name = "Horizontal" +[sub_resource type="Animation" id=3] +resource_name = "Path" length = 6.0 loop = true tracks/0/type = "value" @@ -18,27 +15,46 @@ tracks/0/imported = false tracks/0/enabled = true tracks/0/keys = { "times": PoolRealArray( 0, 3 ), -"transitions": PoolRealArray( 1.33, 1.33 ), +"transitions": PoolRealArray( 1, 0.965936 ), "update": 0, -"values": [ Vector2( 0, 0 ), Vector2( 30, 0 ) ] +"values": [ Vector2( 0, 0 ), Vector2( -48, -40 ) ] +} + +[sub_resource type="Animation" id=4] +length = 0.001 +tracks/0/type = "value" +tracks/0/path = NodePath("KinematicBody2D:position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ Vector2( 0, 0 ) ] } [node name="FlyingPlatform" type="Node2D"] script = ExtResource( 1 ) -[node name="KinematicBody2D" type="KinematicBody2D" parent="."] -collision_layer = 16 -collision_mask = 0 -motion/sync_to_physics = true - -[node name="Sprite" type="Sprite" parent="KinematicBody2D"] -texture = ExtResource( 2 ) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="KinematicBody2D"] -visible = false -shape = SubResource( 1 ) - [node name="anim" type="AnimationPlayer" parent="."] pause_mode = 2 playback_process_mode = 0 -anims/Horizontal = SubResource( 2 ) +anims/Path = SubResource( 3 ) +anims/RESET = SubResource( 4 ) + +[node name="KinematicBody2D" type="KinematicBody2D" parent="."] +collision_layer = 8 +collision_mask = 0 + +[node name="Sprite" type="Sprite" parent="KinematicBody2D"] +position = Vector2( 0, 8 ) +texture = ExtResource( 2 ) +vframes = 8 +frame = 1 + +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="KinematicBody2D"] +position = Vector2( 0, 4 ) +scale = Vector2( 4, 0.4 ) +polygon = PoolVector2Array( -10, -10, 10, -10, 9.5, 0, 9.25, 5, -9.25, 5, -9.5, 0 ) diff --git a/src/Platforms/FlyingPlatformClean.tscn b/src/Platforms/FlyingPlatformClean.tscn index 28771a5..71b8cb3 100644 --- a/src/Platforms/FlyingPlatformClean.tscn +++ b/src/Platforms/FlyingPlatformClean.tscn @@ -38,6 +38,6 @@ texture = ExtResource( 1 ) shape = SubResource( 1 ) [node name="anim" type="AnimationPlayer" parent="."] -pause_mode = 2 +physics_interpolation_mode = 2 playback_process_mode = 0 anims/Horizontal = SubResource( 2 ) diff --git a/src/Platforms/FlyingPlatformShape.tres b/src/Platforms/FlyingPlatformShape.tres new file mode 100644 index 0000000..9c43b2a --- /dev/null +++ b/src/Platforms/FlyingPlatformShape.tres @@ -0,0 +1,4 @@ +[gd_resource type="ConvexPolygonShape2D" format=2] + +[resource] +points = PoolVector2Array( -40, 0, 40, 0, 37, 6, 32, 6, -32, 6, -37, 6 ) diff --git a/src/Platforms/Simple.tscn b/src/Platforms/Simple.tscn deleted file mode 100644 index 4b9cc41..0000000 --- a/src/Platforms/Simple.tscn +++ /dev/null @@ -1,16 +0,0 @@ -[gd_scene load_steps=3 format=2] - -[ext_resource path="res://assets/environment/blocks/Basic stone block.png" type="Texture" id=1] - -[sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 8, 8 ) - -[node name="Simple Platform" type="StaticBody2D"] -collision_layer = 8 -collision_mask = 0 - -[node name="Sprite" type="Sprite" parent="."] -texture = ExtResource( 1 ) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] -shape = SubResource( 1 ) diff --git a/src/Platforms/Spring.tscn b/src/Platforms/Spring.tscn index 37d49be..5483154 100644 --- a/src/Platforms/Spring.tscn +++ b/src/Platforms/Spring.tscn @@ -51,5 +51,5 @@ scale = Vector2( 1.5, 1 ) position = Vector2( 0, 1.5 ) z_index = -1 frames = SubResource( 1 ) -frame = 1 +frame = 24 playing = true diff --git a/src/Actors/Blobby/BlobbyStateMachine.gd b/src/StateMachines/BlobbyStateMachine.gd similarity index 100% rename from src/Actors/Blobby/BlobbyStateMachine.gd rename to src/StateMachines/BlobbyStateMachine.gd diff --git a/src/StateMachines/CaterpillarStateMachine.gd b/src/StateMachines/CaterpillarStateMachine.gd new file mode 100644 index 0000000..49a131e --- /dev/null +++ b/src/StateMachines/CaterpillarStateMachine.gd @@ -0,0 +1,32 @@ +extends StateMachine + +func _ready() -> void: + add_state("robbing") + state = states.robbing + set_state(states.robbing) + for state in states: + if state_matching_method_exists(state): + continue + else: + printerr("StateMachine -> State: " + state + " has no matching method in parent.") + push_error("StateMachine -> State: " + state + " has no matching method in parent.") + # _animation_logic() + + +# Game logic consequences of state +func _state_logic(delta): + #var state_action_ref = funcref(parent, self.state) + #parent.velocity = state_action_ref.call_func() + parent.execute_movement(delta) + + +func _get_transition(_delta): + return null + + +func _enter_state(_new_state, _previous_state): + pass + + +func _exit_state(_previous_state, _new_state): + pass diff --git a/src/Actors/Enemies/Beings/FlyerStateMachine.gd b/src/StateMachines/FlyerStateMachine.gd similarity index 100% rename from src/Actors/Enemies/Beings/FlyerStateMachine.gd rename to src/StateMachines/FlyerStateMachine.gd diff --git a/src/Actors/Enemies/Beings/WhatAreFrogStateMachine.gd b/src/StateMachines/WhatAreFrogStateMachine.gd similarity index 100% rename from src/Actors/Enemies/Beings/WhatAreFrogStateMachine.gd rename to src/StateMachines/WhatAreFrogStateMachine.gd diff --git a/src/UserInterface/Buttons/PlayButton.gd b/src/UserInterface/Buttons/PlayButton.gd index ec9a19e..0b348d8 100644 --- a/src/UserInterface/Buttons/PlayButton.gd +++ b/src/UserInterface/Buttons/PlayButton.gd @@ -4,15 +4,15 @@ export(String, FILE) var next_scene_path: = "" onready var selected_level_base_path: String = "res://src/Levels/" func _ready(): - self.grab_focus() + self.grab_focus() func _on_button_up() -> void: - get_tree().change_scene(next_scene_path) - get_tree().get_current_scene().queue_free() - get_tree().paused = false + get_tree().change_scene(next_scene_path) + get_tree().get_current_scene().queue_free() + get_tree().paused = false func _get_configuration_warning() -> String: - return "next_scene_path must be set for the button to work" if next_scene_path == "" else "" + return "next_scene_path must be set for the button to work" if next_scene_path == "" else "" func _level_selection_changed(button): - next_scene_path = selected_level_base_path + button.text + ".tscn" + next_scene_path = selected_level_base_path + button.text + ".tscn" diff --git a/src/UserInterface/Buttons/QuitButton.gd b/src/UserInterface/Buttons/QuitButton.gd index 3ade0a5..59a53b6 100644 --- a/src/UserInterface/Buttons/QuitButton.gd +++ b/src/UserInterface/Buttons/QuitButton.gd @@ -1,4 +1,4 @@ extends Button func _on_button_up() -> void: - get_tree().quit() + get_tree().quit() diff --git a/src/UserInterface/Buttons/QuitButton.tscn b/src/UserInterface/Buttons/QuitButton.tscn index a0e010f..ed8a01f 100644 --- a/src/UserInterface/Buttons/QuitButton.tscn +++ b/src/UserInterface/Buttons/QuitButton.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=2 format=2] +[gd_scene load_steps=3 format=2] [ext_resource path="res://src/UserInterface/Buttons/QuitButton.gd" type="Script" id=1] +[ext_resource path="res://assets/ui/sci-fi-godot-theme/sci-fi-theme.tres" type="Theme" id=2] [node name="QuitButton" type="Button"] anchor_left = 0.5 @@ -9,10 +10,8 @@ margin_left = -69.5 margin_right = 69.5 margin_bottom = 79.0 size_flags_vertical = 3 +theme = ExtResource( 2 ) text = "End" script = ExtResource( 1 ) -__meta__ = { -"_edit_use_anchors_": false -} [connection signal="button_up" from="." to="." method="_on_button_up"] diff --git a/src/UserInterface/Buttons/Titel.tscn b/src/UserInterface/Buttons/Titel.tscn index b67388f..0f81ce6 100644 --- a/src/UserInterface/Buttons/Titel.tscn +++ b/src/UserInterface/Buttons/Titel.tscn @@ -1,16 +1,12 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=2 format=2] -[ext_resource path="res://assets/meta/montserrat_extrabold.otf" type="DynamicFontData" id=1] - -[sub_resource type="DynamicFont" id=1] -size = 69 -font_data = ExtResource( 1 ) +[ext_resource path="res://assets/ui/fonts/kenny_thick.tres" type="DynamicFont" id=1] [node name="Titel" type="Label"] margin_right = 57.0 margin_bottom = 31.0 size_flags_vertical = 0 -custom_fonts/font = SubResource( 1 ) +custom_fonts/font = ExtResource( 1 ) text = "Title" align = 1 valign = 1 diff --git a/src/UserInterface/Screens/HUD.gd b/src/UserInterface/Screens/HUD.gd index 06b2ea4..6d2f9b6 100644 --- a/src/UserInterface/Screens/HUD.gd +++ b/src/UserInterface/Screens/HUD.gd @@ -12,36 +12,36 @@ onready var signalManager := get_tree().root.get_child(3).get_node("%SignalManag func _ready(): - #TODO Connect what HOW? - signalManager.connect("currency_updated", self, "update_interface") - signalManager.connect("kills_updated", self, "update_interface") - signalManager.connect("frees_updated", self, "update_interface") - signalManager.connect("terminal_activated", self, "start_timer") - update_interface() + #TODO Connect what HOW? + signalManager.connect("currency_updated", self, "update_interface") + signalManager.connect("kills_updated", self, "update_interface") + signalManager.connect("frees_updated", self, "update_interface") + signalManager.connect("terminal_activated", self, "start_timer") + update_interface() func _process(delta): - if timer.visible: - timer.text = String(round($HUDOverlay/GetBackTimer/Timer.time_left)) + if timer.visible: + timer.text = String(round($HUDOverlay/GetBackTimer/Timer.time_left)) func start_timer(time): - timer.visible = true - $HUDOverlay/GetBackTimer/Timer.wait_time = time - $HUDOverlay/GetBackTimer/Timer.start() - $HUDOverlay/GetBackTimer/AnimationPlayer.play("Redlight") - _zoom_timer() + timer.visible = true + $HUDOverlay/GetBackTimer/Timer.wait_time = time + $HUDOverlay/GetBackTimer/Timer.start() + $HUDOverlay/GetBackTimer/AnimationPlayer.play("Redlight") + _zoom_timer() func _zoom_timer() -> void: - var tween := create_tween() - tween.tween_property(timer, "rect_scale", Vector2(1,1), 1.0) + var tween := create_tween() + tween.tween_property(timer, "rect_scale", Vector2(1,1), 1.0) func update_interface() -> void: - var wallet = GlobalState.gsr.wallet - if levelState != null: - wallet += levelState.currency - kills.text = "Kills: %s" % levelState.kills - frees.text = "Freed: %s" % levelState.frees + var wallet = GlobalState.gsr.wallet + if levelState != null: + wallet += levelState.currency + kills.text = "Kills: %s" % levelState.kills + frees.text = "Freed: %s" % levelState.frees - currency.text = "Orbs: %s" % wallet + currency.text = "Orbs: %s" % wallet diff --git a/src/UserInterface/Screens/HUD.tscn b/src/UserInterface/Screens/HUD.tscn index e503b0b..e8bc497 100644 --- a/src/UserInterface/Screens/HUD.tscn +++ b/src/UserInterface/Screens/HUD.tscn @@ -49,12 +49,19 @@ margin_right = 640.0 margin_bottom = 360.0 color = Color( 0, 0, 0, 0 ) +[node name="Panel" type="Panel" parent="HUDOverlay"] +visible = false +margin_left = 3.0 +margin_top = 291.0 +margin_right = 216.0 +margin_bottom = 354.0 + [node name="Currency" type="Label" parent="HUDOverlay"] unique_name_in_owner = true margin_left = 3.0 margin_top = 291.0 -margin_right = 174.0 -margin_bottom = 304.0 +margin_right = 247.0 +margin_bottom = 312.0 rect_scale = Vector2( 0.590909, 0.627907 ) text = "Orbs: 100000000000000000" @@ -62,8 +69,8 @@ text = "Orbs: 100000000000000000" unique_name_in_owner = true margin_left = 3.0 margin_top = 315.0 -margin_right = 224.0 -margin_bottom = 328.0 +margin_right = 357.0 +margin_bottom = 336.0 rect_scale = Vector2( 0.590909, 0.627907 ) text = "Destroyed Beings: 100000000000000000" @@ -71,8 +78,8 @@ text = "Destroyed Beings: 100000000000000000" unique_name_in_owner = true margin_left = 3.0 margin_top = 339.0 -margin_right = 200.0 -margin_bottom = 352.0 +margin_right = 317.0 +margin_bottom = 360.0 rect_scale = Vector2( 0.590909, 0.627907 ) text = "Freed Beings: 100000000000000000" @@ -82,8 +89,8 @@ visible = false anchor_left = 0.5 anchor_right = 0.5 margin_left = 45.0 -margin_right = 63.0 -margin_bottom = 13.0 +margin_right = 73.0 +margin_bottom = 21.0 rect_scale = Vector2( 5, 5 ) text = "100" align = 2 diff --git a/src/UserInterface/Screens/InGameMenu/Continue.gd b/src/UserInterface/Screens/InGameMenu/Continue.gd index b142f24..931afda 100644 --- a/src/UserInterface/Screens/InGameMenu/Continue.gd +++ b/src/UserInterface/Screens/InGameMenu/Continue.gd @@ -1,6 +1,7 @@ extends Button onready var levelState := get_tree().root.get_child(3).get_node("%LevelState") +onready var signalManager := get_tree().root.get_child(3).get_node("%SignalManager") func _on_button_up() -> void: - get_parent().get_parent().get_parent().set_paused(false) + signalManager.emit_signal("game_paused", false) diff --git a/src/UserInterface/Screens/InGameMenu/ControlsMenuIngame.gd b/src/UserInterface/Screens/InGameMenu/ControlsMenuIngame.gd index c6f4b63..6b2cb8f 100644 --- a/src/UserInterface/Screens/InGameMenu/ControlsMenuIngame.gd +++ b/src/UserInterface/Screens/InGameMenu/ControlsMenuIngame.gd @@ -4,41 +4,53 @@ onready var _action_list = $"%ActionKeyList" onready var changes_made := false onready var changes_saved := false +var block_ui_cancel = false + func _ready() -> void: - $InputMapper.connect('profile_changed', self, 'rebuild') - $InputMapper.initialize_profiles() - $ProfilesMenu.initialize($InputMapper) - $InputMapper.change_profile($ProfilesMenu.selected) + $InputMapper.connect('profile_changed', self, 'rebuild') + $InputMapper.initialize_profiles() + $"%ProfilesMenu".initialize($InputMapper) + $InputMapper.change_profile($"%ProfilesMenu".selected) + +func _input(event: InputEvent) -> void: + # TODO Static quit button esc + if !event.is_action("ui_cancel"): + return + if block_ui_cancel: + block_ui_cancel = false + return + get_tree().set_input_as_handled() + $"%Back"._on_button_up() func rebuild(input_profile): - _action_list.clear() - var first = true - for input_action in input_profile.keys(): - if(input_action.ends_with("_old") || input_action.begins_with(("ui_"))): - continue - var line = _action_list.add_input_line(input_action, input_profile[input_action]) - if first: - $ProfilesMenu.focus_neighbour_bottom = line.get_child(2).get_path() - $Back.focus_neighbour_top = line.get_child(2).get_path() - $Save.focus_neighbour_top = line.get_child(2).get_path() - $Reset.focus_neighbour_top = line.get_child(2).get_path() - first = false - line.get_child(2).focus_neighbour_left = $Back.get_path() - line.get_child(2).focus_neighbour_right = $Save.get_path() - line.connect('change_button_pressed', self, '_on_InputLine_change_button_pressed', [input_action, line]) + _action_list.clear() + var first = true + for input_action in input_profile.keys(): + if(input_action.ends_with("_old") || input_action.begins_with(("ui_"))): + continue + var line = _action_list.add_input_line(input_action, input_profile[input_action]) + if first: + $"%ProfilesMenu".focus_neighbour_bottom = line.get_child(2).get_path() + $"%Back".focus_neighbour_top = line.get_child(2).get_path() + $"%Save".focus_neighbour_top = line.get_child(2).get_path() + $"%Reset".focus_neighbour_top = line.get_child(2).get_path() + first = false + line.get_child(2).focus_neighbour_left = $"%Back".get_path() + line.get_child(2).focus_neighbour_right = $"%Save".get_path() + line.connect('change_button_pressed', self, '_on_InputLine_change_button_pressed', [input_action, line]) func close(): - self.visible = false - $"%PauseOverlay".visible = true - $"%PauseOverlay/VBoxContainer/Continue".grab_focus() + self.visible = false + $"%PauseOverlay".visible = true + $"%Continue".grab_focus() func _on_InputLine_change_button_pressed(action_name, line): - var old_event = $InputMapper.get_selected_profile()[action_name] - $"%KeySelectMenu".open() - var event = yield($"%KeySelectMenu", "key_selected") - if event == null: - return - if($InputMapper.change_action_key(action_name, event, old_event)): - changes_made = true - changes_saved = false - line.update_key(event) + var old_event = $InputMapper.get_selected_profile()[action_name] + $"%KeySelectMenu".open() + var event = yield($"%KeySelectMenu", "key_selected") + if event == null: + return + if($InputMapper.change_action_key(action_name, event, old_event)): + changes_made = true + changes_saved = false + line.update_key(event) diff --git a/src/UserInterface/Screens/InGameMenu/PauseScreen.gd b/src/UserInterface/Screens/InGameMenu/PauseScreen.gd index 52dc4f1..8191da4 100644 --- a/src/UserInterface/Screens/InGameMenu/PauseScreen.gd +++ b/src/UserInterface/Screens/InGameMenu/PauseScreen.gd @@ -1,6 +1,7 @@ extends Control # Smart ist es die notwendigen Resourcen vor dem Skriptstart zu laden +onready var signalManager := get_tree().root.get_child(3).get_node("%SignalManager") onready var current_scene := get_tree().get_current_scene() onready var pause_overlay: ColorRect = get_node("PauseOverlay") onready var pause_title: Label = get_node("PauseOverlay/Title") @@ -10,6 +11,7 @@ var paused := false setget set_paused func _ready(): #signalManager.connect("player_died", self, "_on_GlobalState_player_died") $ControlsMenu.visible = false + signalManager.connect("game_paused", self, "set_paused") pass @@ -32,10 +34,10 @@ func set_paused(value: bool) -> void: get_tree().paused = value pause_overlay.visible = value if value == true: - $PauseOverlay/VBoxContainer/Continue.grab_focus() + $"%Continue".grab_focus() func _on_Controls_button_up() -> void: $ControlsMenu.visible = true $PauseOverlay.visible = false - $ControlsMenu/ProfilesMenu.grab_focus() + $"%ProfilesMenu".grab_focus() diff --git a/src/UserInterface/Screens/InGameMenu/PauseScreen.tscn b/src/UserInterface/Screens/InGameMenu/PauseScreen.tscn index 738bc6c..f7e51f8 100644 --- a/src/UserInterface/Screens/InGameMenu/PauseScreen.tscn +++ b/src/UserInterface/Screens/InGameMenu/PauseScreen.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=27 format=2] +[gd_scene load_steps=30 format=2] [ext_resource path="res://assets/meta/ui_theme.tres" type="Theme" id=1] +[ext_resource path="res://assets/ui/sci-fi-godot-theme/sci-fi-theme.tres" type="Theme" id=2] [ext_resource path="res://src/UserInterface/Buttons/ChangeSceneButton.tscn" type="PackedScene" id=3] [ext_resource path="res://src/UserInterface/Buttons/RetryButton.tscn" type="PackedScene" id=4] [ext_resource path="res://src/UserInterface/Screens/InGameMenu/PauseScreen.gd" type="Script" id=5] @@ -16,6 +17,8 @@ [ext_resource path="res://src/UserInterface/Screens/MainMenu/ControlsMenu/Reset.gd" type="Script" id=15] [ext_resource path="res://src/UserInterface/Screens/MainMenu/ControlsMenu/SaveButton.gd" type="Script" id=16] [ext_resource path="res://src/UserInterface/Screens/MainMenu/ControlsMenu/ProfilesMenu.gd" type="Script" id=17] +[ext_resource path="res://assets/ui/fonts/Kenney Thick.ttf" type="DynamicFontData" id=18] +[ext_resource path="res://assets/ui/fonts/kenny_thick.tres" type="DynamicFont" id=19] [ext_resource path="res://assets/sounds/EpsonStart.ogg" type="AudioStream" id=20] [ext_resource path="res://assets/ui/Screenshot 2023-05-23 160521.png" type="Texture" id=21] [ext_resource path="res://assets/meta/montserrat_extrabold.otf" type="DynamicFontData" id=22] @@ -28,14 +31,13 @@ font_data = ExtResource( 22 ) shader = ExtResource( 7 ) shader_param/transparency = 0.1 -[sub_resource type="DynamicFont" id=2] -font_data = ExtResource( 22 ) +[sub_resource type="DynamicFont" id=10] +size = 10 +font_data = ExtResource( 18 ) -[sub_resource type="DynamicFont" id=3] -font_data = ExtResource( 22 ) - -[sub_resource type="DynamicFont" id=4] -font_data = ExtResource( 22 ) +[sub_resource type="DynamicFont" id=11] +size = 10 +font_data = ExtResource( 18 ) [sub_resource type="ShaderMaterial" id=8] shader = ExtResource( 7 ) @@ -45,19 +47,22 @@ shader_param/transparency = 0.778 size = 20 font_data = ExtResource( 22 ) +[sub_resource type="DynamicFont" id=9] +size = 20 +font_data = ExtResource( 18 ) + [node name="PauseScreen" type="Control"] pause_mode = 2 anchor_right = 1.0 anchor_bottom = 1.0 mouse_filter = 2 -theme = ExtResource( 1 ) +theme = ExtResource( 2 ) script = ExtResource( 5 ) [node name="ControlsMenu" type="Control" parent="."] pause_mode = 2 physics_interpolation_mode = 1 unique_name_in_owner = true -visible = false anchor_right = 1.0 anchor_bottom = 1.0 input_pass_on_modal_close_click = false @@ -75,21 +80,6 @@ color = Color( 0, 0, 0, 0.156863 ) unique_name_in_owner = true script = ExtResource( 13 ) -[node name="ProfilesMenu" type="OptionButton" parent="ControlsMenu"] -unique_name_in_owner = true -anchor_left = 0.5 -anchor_top = 0.165 -anchor_right = 0.5 -anchor_bottom = 0.165 -margin_left = -14.5 -margin_right = 14.5 -margin_bottom = 19.0 -grow_horizontal = 2 -grow_vertical = 2 -focus_neighbour_top = NodePath("../Back") -focus_neighbour_bottom = NodePath("../KeymapViewer/ScrollContainer") -script = ExtResource( 17 ) - [node name="Titel" type="Label" parent="ControlsMenu"] anchor_left = 0.5 anchor_right = 0.5 @@ -117,61 +107,86 @@ margin_bottom = 265.0 rect_scale = Vector2( 0.0627026, 0.0522158 ) texture = ExtResource( 21 ) -[node name="KeymapViewer" type="VBoxContainer" parent="ControlsMenu"] -anchor_left = 0.1 -anchor_top = 0.3 -anchor_right = 0.9 -anchor_bottom = 0.75 -margin_left = -20.0 -margin_top = -20.0 -margin_right = 20.0 -margin_bottom = 20.0 +[node name="Panel" type="Panel" parent="ControlsMenu"] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -314.0 +margin_top = -133.0 +margin_right = 312.0 +margin_bottom = 174.0 +theme = ExtResource( 2 ) + +[node name="ProfilesMenu" type="OptionButton" parent="ControlsMenu/Panel"] +unique_name_in_owner = true +anchor_left = 0.5 +anchor_right = 0.5 +margin_left = -14.5 +margin_top = 15.0 +margin_right = 14.5 +margin_bottom = 34.0 +grow_horizontal = 2 +grow_vertical = 2 +focus_neighbour_top = NodePath("../Back") +focus_neighbour_bottom = NodePath("../KeymapViewer/ScrollContainer") +script = ExtResource( 17 ) + +[node name="KeymapViewer" type="VBoxContainer" parent="ControlsMenu/Panel"] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -300.0 +margin_top = -110.5 +margin_right = 299.0 +margin_bottom = 118.5 grow_horizontal = 2 grow_vertical = 2 -[node name="Headers" type="HBoxContainer" parent="ControlsMenu/KeymapViewer"] -margin_right = 552.0 -margin_bottom = 21.0 +[node name="Headers" type="HBoxContainer" parent="ControlsMenu/Panel/KeymapViewer"] +margin_right = 599.0 +margin_bottom = 12.0 size_flags_horizontal = 3 -[node name="Action" type="Label" parent="ControlsMenu/KeymapViewer/Headers"] -margin_right = 242.0 -margin_bottom = 21.0 +[node name="Action" type="Label" parent="ControlsMenu/Panel/KeymapViewer/Headers"] +margin_right = 264.0 +margin_bottom = 12.0 grow_horizontal = 2 size_flags_horizontal = 3 size_flags_vertical = 0 -custom_fonts/font = SubResource( 2 ) +custom_fonts/font = SubResource( 10 ) text = "Action" valign = 1 -[node name="Control" type="Label" parent="ControlsMenu/KeymapViewer/Headers"] -margin_left = 246.0 -margin_right = 305.0 -margin_bottom = 21.0 +[node name="Control" type="Label" parent="ControlsMenu/Panel/KeymapViewer/Headers"] +margin_left = 268.0 +margin_right = 330.0 +margin_bottom = 12.0 grow_horizontal = 2 size_flags_horizontal = 0 size_flags_vertical = 0 -custom_fonts/font = SubResource( 3 ) +custom_fonts/font = SubResource( 11 ) text = "Button" align = 1 valign = 1 -[node name="Change" type="Label" parent="ControlsMenu/KeymapViewer/Headers"] -margin_left = 309.0 -margin_right = 552.0 -margin_bottom = 21.0 +[node name="Change" type="Label" parent="ControlsMenu/Panel/KeymapViewer/Headers"] +margin_left = 334.0 +margin_right = 599.0 +margin_bottom = 9.0 grow_horizontal = 2 size_flags_horizontal = 3 size_flags_vertical = 0 -custom_fonts/font = SubResource( 4 ) +custom_fonts/font = ExtResource( 19 ) text = "Edit" align = 2 valign = 1 -[node name="ScrollContainer" type="ScrollContainer" parent="ControlsMenu/KeymapViewer"] -margin_top = 25.0 -margin_right = 552.0 -margin_bottom = 202.0 +[node name="ScrollContainer" type="ScrollContainer" parent="ControlsMenu/Panel/KeymapViewer"] +margin_top = 16.0 +margin_right = 599.0 +margin_bottom = 229.0 focus_neighbour_top = NodePath("../../ProfilesMenu") focus_neighbour_bottom = NodePath("../../Save") focus_previous = NodePath("../../Back") @@ -179,22 +194,20 @@ size_flags_horizontal = 3 size_flags_vertical = 3 follow_focus = true -[node name="ActionKeyList" type="VBoxContainer" parent="ControlsMenu/KeymapViewer/ScrollContainer"] +[node name="ActionKeyList" type="VBoxContainer" parent="ControlsMenu/Panel/KeymapViewer/ScrollContainer"] unique_name_in_owner = true -margin_right = 552.0 -margin_bottom = 177.0 +margin_right = 599.0 +margin_bottom = 213.0 size_flags_horizontal = 3 size_flags_vertical = 3 script = ExtResource( 9 ) -[node name="Back" type="Button" parent="ControlsMenu"] +[node name="Back" type="Button" parent="ControlsMenu/Panel"] unique_name_in_owner = true anchor_left = 0.05 anchor_top = 0.95 anchor_right = 0.05 anchor_bottom = 0.95 -margin_top = -25.0 -margin_right = 75.0 grow_horizontal = 2 grow_vertical = 2 rect_min_size = Vector2( 40, 20 ) @@ -208,15 +221,16 @@ size_flags_vertical = 0 text = "Back" script = ExtResource( 14 ) -[node name="Reset" type="Button" parent="ControlsMenu"] +[node name="Reset" type="Button" parent="ControlsMenu/Panel"] unique_name_in_owner = true anchor_left = 0.5 anchor_top = 0.95 anchor_right = 0.5 anchor_bottom = 0.95 -margin_left = -37.5 -margin_top = -25.0 -margin_right = 37.5 +margin_left = -45.0 +margin_top = -18.0 +margin_right = 45.0 +margin_bottom = 8.0 grow_horizontal = 2 grow_vertical = 2 rect_min_size = Vector2( 40, 20 ) @@ -225,19 +239,17 @@ focus_neighbour_top = NodePath("../KeymapViewer/ScrollContainer") focus_neighbour_right = NodePath("../Save") focus_neighbour_bottom = NodePath("../ProfilesMenu") input_pass_on_modal_close_click = false -size_flags_horizontal = 0 -size_flags_vertical = 0 +size_flags_horizontal = 3 +size_flags_vertical = 3 text = "Reset" script = ExtResource( 15 ) -[node name="Save" type="Button" parent="ControlsMenu"] +[node name="Save" type="Button" parent="ControlsMenu/Panel"] unique_name_in_owner = true anchor_left = 0.95 anchor_top = 0.95 anchor_right = 0.95 anchor_bottom = 0.95 -margin_left = -75.0 -margin_top = -25.0 grow_horizontal = 2 grow_vertical = 2 rect_min_size = Vector2( 40, 20 ) @@ -347,8 +359,8 @@ size_flags_vertical = 0 alignment = 1 [node name="SaveNQuit" type="Button" parent="ControlsMenu/ReallyQuitMenu/VBoxContainer"] -margin_right = 101.0 -margin_bottom = 20.0 +margin_right = 156.0 +margin_bottom = 27.0 grow_horizontal = 2 grow_vertical = 2 rect_min_size = Vector2( 40, 20 ) @@ -362,9 +374,9 @@ icon_align = 1 script = ExtResource( 11 ) [node name="ContinueEdit" type="Button" parent="ControlsMenu/ReallyQuitMenu/VBoxContainer"] -margin_top = 24.0 -margin_right = 101.0 -margin_bottom = 43.0 +margin_top = 31.0 +margin_right = 156.0 +margin_bottom = 58.0 focus_neighbour_left = NodePath(".") focus_neighbour_top = NodePath("../SaveNQuit") focus_neighbour_right = NodePath(".") @@ -377,9 +389,9 @@ size_flags_vertical = 7 text = "Continue Editing" [node name="QuitDontSave" type="Button" parent="ControlsMenu/ReallyQuitMenu/VBoxContainer"] -margin_top = 47.0 -margin_right = 101.0 -margin_bottom = 67.0 +margin_top = 62.0 +margin_right = 156.0 +margin_bottom = 89.0 grow_horizontal = 2 grow_vertical = 2 rect_min_size = Vector2( 40, 20 ) @@ -406,9 +418,20 @@ color = Color( 0, 0, 0, 0.235294 ) [node name="Title" type="Label" parent="PauseOverlay"] margin_right = 170.0 margin_bottom = 45.0 -text = "BOBBI!" +text = "Blobby, The" -[node name="VBoxContainer" type="VBoxContainer" parent="PauseOverlay"] +[node name="Panel" type="Panel" parent="PauseOverlay"] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -119.5 +margin_top = -138.5 +margin_right = 119.5 +margin_bottom = 138.5 +theme = ExtResource( 2 ) + +[node name="VBoxContainer" type="VBoxContainer" parent="PauseOverlay/Panel"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -419,7 +442,8 @@ margin_right = 111.0 margin_bottom = 125.0 focus_mode = 2 -[node name="Continue" type="Button" parent="PauseOverlay/VBoxContainer"] +[node name="Continue" type="Button" parent="PauseOverlay/Panel/VBoxContainer"] +unique_name_in_owner = true margin_right = 222.0 margin_bottom = 59.0 focus_neighbour_top = NodePath("../MainMenuButton") @@ -428,7 +452,7 @@ size_flags_vertical = 3 text = "Continue" script = ExtResource( 6 ) -[node name="Controls" type="Button" parent="PauseOverlay/VBoxContainer"] +[node name="Controls" type="Button" parent="PauseOverlay/Panel/VBoxContainer"] margin_top = 63.0 margin_right = 222.0 margin_bottom = 123.0 @@ -437,14 +461,14 @@ focus_neighbour_bottom = NodePath("../RetryButton") size_flags_vertical = 3 text = "Controls" -[node name="RetryButton" parent="PauseOverlay/VBoxContainer" instance=ExtResource( 4 )] +[node name="RetryButton" parent="PauseOverlay/Panel/VBoxContainer" instance=ExtResource( 4 )] margin_top = 127.0 margin_right = 222.0 margin_bottom = 186.0 focus_neighbour_top = NodePath("../Controls") focus_neighbour_bottom = NodePath("../MainMenuButton") -[node name="MainMenuButton" parent="PauseOverlay/VBoxContainer" instance=ExtResource( 3 )] +[node name="MainMenuButton" parent="PauseOverlay/Panel/VBoxContainer" instance=ExtResource( 3 )] margin_top = 190.0 margin_right = 222.0 margin_bottom = 250.0 @@ -456,20 +480,23 @@ next_scene_path = "res://src/UserInterface/Screens/MainMenu/MainScreen.tscn" [node name="PauseLabel" type="Label" parent="PauseOverlay"] anchor_left = 0.5 anchor_right = 0.5 -margin_left = -19.0 -margin_right = 19.0 -margin_bottom = 15.0 +margin_left = -63.0 +margin_top = 7.0 +margin_right = 63.0 +margin_bottom = 30.0 size_flags_horizontal = 0 size_flags_vertical = 0 -text = "Pause" +theme = ExtResource( 2 ) +custom_fonts/font = SubResource( 9 ) +text = "Paused" -[connection signal="focus_entered" from="ControlsMenu/KeymapViewer/ScrollContainer" to="ControlsMenu/KeymapViewer/ScrollContainer" method="_on_focus_entered"] -[connection signal="button_up" from="ControlsMenu/Back" to="ControlsMenu/Back" method="_on_button_up"] -[connection signal="button_up" from="ControlsMenu/Reset" to="ControlsMenu/Reset" method="_on_button_up"] -[connection signal="button_up" from="ControlsMenu/Save" to="ControlsMenu/Save" method="_on_button_up"] +[connection signal="focus_entered" from="ControlsMenu/Panel/KeymapViewer/ScrollContainer" to="ControlsMenu/Panel/KeymapViewer/ScrollContainer" method="_on_focus_entered"] +[connection signal="button_up" from="ControlsMenu/Panel/Back" to="ControlsMenu/Panel/Back" method="_on_button_up"] +[connection signal="button_up" from="ControlsMenu/Panel/Reset" to="ControlsMenu/Panel/Reset" method="_on_button_up"] +[connection signal="button_up" from="ControlsMenu/Panel/Save" to="ControlsMenu/Panel/Save" method="_on_button_up"] [connection signal="timeout" from="ControlsMenu/KeySelectMenu/Timer" to="ControlsMenu/KeySelectMenu" method="close_on_timeout"] [connection signal="button_up" from="ControlsMenu/ReallyQuitMenu/VBoxContainer/SaveNQuit" to="ControlsMenu/ReallyQuitMenu/VBoxContainer/SaveNQuit" method="_on_button_up"] [connection signal="button_up" from="ControlsMenu/ReallyQuitMenu/VBoxContainer/ContinueEdit" to="ControlsMenu/ReallyQuitMenu" method="close"] [connection signal="button_up" from="ControlsMenu/ReallyQuitMenu/VBoxContainer/QuitDontSave" to="ControlsMenu" method="close"] -[connection signal="button_up" from="PauseOverlay/VBoxContainer/Continue" to="PauseOverlay/VBoxContainer/Continue" method="_on_button_up"] -[connection signal="button_up" from="PauseOverlay/VBoxContainer/Controls" to="." method="_on_Controls_button_up"] +[connection signal="button_up" from="PauseOverlay/Panel/VBoxContainer/Continue" to="PauseOverlay/Panel/VBoxContainer/Continue" method="_on_button_up"] +[connection signal="button_up" from="PauseOverlay/Panel/VBoxContainer/Controls" to="." method="_on_Controls_button_up"] diff --git a/src/UserInterface/Screens/InGameMenu/SavedCheckBackIngameButton.gd b/src/UserInterface/Screens/InGameMenu/SavedCheckBackIngameButton.gd index 2d1d26d..b7eae87 100644 --- a/src/UserInterface/Screens/InGameMenu/SavedCheckBackIngameButton.gd +++ b/src/UserInterface/Screens/InGameMenu/SavedCheckBackIngameButton.gd @@ -1,8 +1,8 @@ extends Button func _on_button_up() -> void: - if(!get_parent().changes_made || get_parent().changes_saved): - $"%ControlsMenu".close() - else: - set_process_input(false) - $"%ReallyQuitMenu".open() + if(!$"../..".changes_made || $"../..".changes_saved): + $"%ControlsMenu".close() + else: + set_process_input(false) + $"%ReallyQuitMenu".open() diff --git a/src/UserInterface/Screens/MainMenu/ControlsMenu/ActionKeyList.gd b/src/UserInterface/Screens/MainMenu/ControlsMenu/ActionKeyList.gd index c27e3f1..f685f79 100644 --- a/src/UserInterface/Screens/MainMenu/ControlsMenu/ActionKeyList.gd +++ b/src/UserInterface/Screens/MainMenu/ControlsMenu/ActionKeyList.gd @@ -4,14 +4,14 @@ const InputLine = preload("res://src/UserInterface/Screens/MainMenu/ControlsMenu var prev_line = null func clear(): - for child in get_children(): - child.free() + for child in get_children(): + child.free() func add_input_line(action_name, event) -> Control: - var line = InputLine.instance() - add_child(line) - line.initialize(action_name, event) - #!if prev_line != null: - # line.get_child(2).focus_neighbour_top = prev_line.get_child(2).get_path() - prev_line = line - return line + var line = InputLine.instance() + add_child(line) + line.initialize(action_name, event) + #!if prev_line != null: + # line.get_child(2).focus_neighbour_top = prev_line.get_child(2).get_path() + prev_line = line + return line diff --git a/src/UserInterface/Screens/MainMenu/ControlsMenu/ControlsMenu.gd b/src/UserInterface/Screens/MainMenu/ControlsMenu/ControlsMenu.gd index 883160b..8cc049e 100644 --- a/src/UserInterface/Screens/MainMenu/ControlsMenu/ControlsMenu.gd +++ b/src/UserInterface/Screens/MainMenu/ControlsMenu/ControlsMenu.gd @@ -4,6 +4,8 @@ onready var _action_list = $"%ActionKeyList" onready var changes_made := false onready var changes_saved := false +var block_ui_cancel = false + func _ready(): $InputMapper.connect('profile_changed', self, 'rebuild') $InputMapper.initialize_profiles() @@ -11,6 +13,16 @@ func _ready(): $ProfilesMenu.grab_focus() $InputMapper.change_profile($ProfilesMenu.selected) +func _input(event: InputEvent) -> void: + # TODO Static quit button esc + if !event.is_action("ui_cancel"): + return + if block_ui_cancel: + block_ui_cancel = false + return + get_tree().set_input_as_handled() + $"%Back"._on_button_up() + func rebuild(input_profile): _action_list.clear() var first = true @@ -20,12 +32,12 @@ func rebuild(input_profile): var line = _action_list.add_input_line(input_action, input_profile[input_action]) if first: $ProfilesMenu.focus_neighbour_bottom = line.get_child(2).get_path() - $Back.focus_neighbour_top = line.get_child(2).get_path() - $Save.focus_neighbour_top = line.get_child(2).get_path() - $Reset.focus_neighbour_top = line.get_child(2).get_path() + $"%Back".focus_neighbour_top = line.get_child(2).get_path() + $"%Save".focus_neighbour_top = line.get_child(2).get_path() + $"%Reset".focus_neighbour_top = line.get_child(2).get_path() first = false - line.get_child(2).focus_neighbour_left = $Back.get_path() - line.get_child(2).focus_neighbour_right = $Save.get_path() + line.get_child(2).focus_neighbour_left = $"%Back".get_path() + line.get_child(2).focus_neighbour_right = $"%Save".get_path() line.connect('change_button_pressed', self, '_on_InputLine_change_button_pressed', [input_action, line]) func _on_InputLine_change_button_pressed(action_name, line): diff --git a/src/UserInterface/Screens/MainMenu/ControlsMenu/ControlsMenu.tscn b/src/UserInterface/Screens/MainMenu/ControlsMenu/ControlsMenu.tscn index 891256e..1e9469a 100644 --- a/src/UserInterface/Screens/MainMenu/ControlsMenu/ControlsMenu.tscn +++ b/src/UserInterface/Screens/MainMenu/ControlsMenu/ControlsMenu.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=27 format=2] +[gd_scene load_steps=28 format=2] [ext_resource path="res://src/UserInterface/Screens/MainMenu/ControlsMenu/SaveButton.gd" type="Script" id=1] [ext_resource path="res://src/UserInterface/Screens/MainMenu/ControlsMenu/SavedCheckBackButton.gd" type="Script" id=2] @@ -7,7 +7,6 @@ [ext_resource path="res://src/UserInterface/Screens/MainMenu/ControlsMenu/ControlsMenu.gd" type="Script" id=5] [ext_resource path="res://src/UserInterface/Screens/MainMenu/ControlsMenu/ReallyQuitMenu.gd" type="Script" id=6] [ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=7] -[ext_resource path="res://assets/meta/ui_theme.tres" type="Theme" id=8] [ext_resource path="res://assets/environment/background/Spaceship-Wall.png" type="Texture" id=9] [ext_resource path="res://assets/environment/background/starry-space.png" type="Texture" id=10] [ext_resource path="res://assets/sounds/EpsonStart.ogg" type="AudioStream" id=11] @@ -19,6 +18,9 @@ [ext_resource path="res://assets/effects/transparency.gdshader" type="Shader" id=17] [ext_resource path="res://assets/meta/montserrat_extrabold.otf" type="DynamicFontData" id=18] [ext_resource path="res://src/UserInterface/Buttons/MenuNavigationButton.gd" type="Script" id=19] +[ext_resource path="res://assets/ui/sci-fi-godot-theme/sci-fi-theme.tres" type="Theme" id=20] +[ext_resource path="res://assets/ui/fonts/Kenney Thick.ttf" type="DynamicFontData" id=21] +[ext_resource path="res://assets/ui/fonts/kenny_thick.tres" type="DynamicFont" id=22] [sub_resource type="DynamicFont" id=1] size = 42 @@ -28,14 +30,9 @@ font_data = ExtResource( 18 ) shader = ExtResource( 17 ) shader_param/transparency = 0.1 -[sub_resource type="DynamicFont" id=2] -font_data = ExtResource( 18 ) - -[sub_resource type="DynamicFont" id=3] -font_data = ExtResource( 18 ) - -[sub_resource type="DynamicFont" id=4] -font_data = ExtResource( 18 ) +[sub_resource type="DynamicFont" id=9] +size = 8 +font_data = ExtResource( 21 ) [sub_resource type="ShaderMaterial" id=8] shader = ExtResource( 17 ) @@ -45,6 +42,10 @@ shader_param/transparency = 0.778 size = 20 font_data = ExtResource( 18 ) +[sub_resource type="DynamicFont" id=10] +size = 8 +font_data = ExtResource( 21 ) + [node name="ControlsMenu" type="Control"] pause_mode = 1 anchor_right = 1.0 @@ -52,7 +53,7 @@ anchor_bottom = 1.0 input_pass_on_modal_close_click = false size_flags_horizontal = 0 size_flags_vertical = 0 -theme = ExtResource( 8 ) +theme = ExtResource( 20 ) script = ExtResource( 5 ) [node name="SignalManager" parent="." instance=ExtResource( 7 )] @@ -77,21 +78,6 @@ texture = ExtResource( 9 ) expand = true stretch_mode = 1 -[node name="ProfilesMenu" type="OptionButton" parent="."] -unique_name_in_owner = true -anchor_left = 0.5 -anchor_top = 0.165 -anchor_right = 0.5 -anchor_bottom = 0.165 -margin_left = -14.5 -margin_right = 14.5 -margin_bottom = 19.0 -grow_horizontal = 2 -grow_vertical = 2 -focus_neighbour_top = NodePath("../Back") -focus_neighbour_bottom = NodePath("../KeymapViewer/ScrollContainer") -script = ExtResource( 13 ) - [node name="Titel" type="Label" parent="."] anchor_left = 0.5 anchor_right = 0.5 @@ -119,139 +105,178 @@ margin_bottom = 265.0 rect_scale = Vector2( 0.0627026, 0.0522158 ) texture = ExtResource( 12 ) -[node name="KeymapViewer" type="VBoxContainer" parent="."] -anchor_left = 0.1 -anchor_top = 0.3 -anchor_right = 0.9 -anchor_bottom = 0.75 -margin_left = -20.0 -margin_top = -20.0 -margin_right = 20.0 -margin_bottom = 20.0 +[node name="Panel" type="Panel" parent="."] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -313.0 +margin_top = -128.0 +margin_right = 315.0 +margin_bottom = 173.0 grow_horizontal = 2 grow_vertical = 2 +focus_mode = 2 +size_flags_horizontal = 5 +size_flags_vertical = 5 +theme = ExtResource( 20 ) -[node name="Headers" type="HBoxContainer" parent="KeymapViewer"] -margin_right = 552.0 -margin_bottom = 21.0 -size_flags_horizontal = 3 - -[node name="Action" type="Label" parent="KeymapViewer/Headers"] -margin_right = 242.0 -margin_bottom = 21.0 -grow_horizontal = 2 -size_flags_horizontal = 3 -size_flags_vertical = 0 -custom_fonts/font = SubResource( 2 ) -text = "Action" -valign = 1 - -[node name="Control" type="Label" parent="KeymapViewer/Headers"] -margin_left = 246.0 -margin_right = 305.0 -margin_bottom = 21.0 -grow_horizontal = 2 -size_flags_horizontal = 0 -size_flags_vertical = 0 -custom_fonts/font = SubResource( 3 ) -text = "Button" -align = 1 -valign = 1 - -[node name="Change" type="Label" parent="KeymapViewer/Headers"] -margin_left = 309.0 -margin_right = 552.0 -margin_bottom = 21.0 -grow_horizontal = 2 -size_flags_horizontal = 3 -size_flags_vertical = 0 -custom_fonts/font = SubResource( 4 ) -text = "Edit" -align = 2 -valign = 1 - -[node name="ScrollContainer" type="ScrollContainer" parent="KeymapViewer"] -margin_top = 25.0 -margin_right = 552.0 -margin_bottom = 202.0 -focus_neighbour_top = NodePath("../../ProfilesMenu") -focus_neighbour_bottom = NodePath("../../Save") -focus_previous = NodePath("../../Back") -size_flags_horizontal = 3 -size_flags_vertical = 3 -follow_focus = true - -[node name="ActionKeyList" type="VBoxContainer" parent="KeymapViewer/ScrollContainer"] +[node name="Back" type="Button" parent="Panel"] unique_name_in_owner = true -size_flags_horizontal = 3 -size_flags_vertical = 3 -script = ExtResource( 14 ) - -[node name="Back" type="Button" parent="."] -unique_name_in_owner = true -anchor_left = 0.05 -anchor_top = 0.95 -anchor_right = 0.05 -anchor_bottom = 0.95 -margin_top = -25.0 -margin_right = 75.0 +margin_left = 23.0 +margin_top = 265.0 +margin_right = 98.0 +margin_bottom = 290.0 grow_horizontal = 2 grow_vertical = 2 rect_min_size = Vector2( 40, 20 ) focus_neighbour_left = NodePath("../Save") focus_neighbour_top = NodePath("../KeymapViewer/ScrollContainer") focus_neighbour_right = NodePath("../Reset") -focus_neighbour_bottom = NodePath("../ProfilesMenu") +focus_neighbour_bottom = NodePath("../../ProfilesMenu") input_pass_on_modal_close_click = false size_flags_horizontal = 0 size_flags_vertical = 0 +theme = ExtResource( 20 ) text = "Back" script = ExtResource( 2 ) next_screen_path = "res://src/UserInterface/Screens/MainMenu/MainScreen.tscn" -[node name="Reset" type="Button" parent="."] +[node name="Reset" type="Button" parent="Panel"] unique_name_in_owner = true anchor_left = 0.5 anchor_top = 0.95 anchor_right = 0.5 anchor_bottom = 0.95 -margin_left = -37.5 -margin_top = -25.0 -margin_right = 37.5 +margin_left = -39.5 +margin_top = -20.95 +margin_right = 35.5 +margin_bottom = 4.05002 grow_horizontal = 2 grow_vertical = 2 rect_min_size = Vector2( 40, 20 ) focus_neighbour_left = NodePath("../Back") focus_neighbour_top = NodePath("../KeymapViewer/ScrollContainer") focus_neighbour_right = NodePath("../Save") -focus_neighbour_bottom = NodePath("../ProfilesMenu") +focus_neighbour_bottom = NodePath("../../ProfilesMenu") input_pass_on_modal_close_click = false size_flags_horizontal = 0 size_flags_vertical = 0 +theme = ExtResource( 20 ) text = "Reset" script = ExtResource( 16 ) -[node name="Save" type="Button" parent="."] +[node name="Save" type="Button" parent="Panel"] unique_name_in_owner = true anchor_left = 0.95 anchor_top = 0.95 anchor_right = 0.95 anchor_bottom = 0.95 -margin_left = -75.0 -margin_top = -25.0 +margin_left = -70.7 +margin_top = -20.95 +margin_right = 4.29999 +margin_bottom = 4.05002 grow_horizontal = 2 grow_vertical = 2 rect_min_size = Vector2( 40, 20 ) focus_neighbour_left = NodePath("../Reset") focus_neighbour_top = NodePath("../KeymapViewer/ScrollContainer") focus_neighbour_right = NodePath("../Back") -focus_neighbour_bottom = NodePath("../ProfilesMenu") +focus_neighbour_bottom = NodePath("../../ProfilesMenu") input_pass_on_modal_close_click = false size_flags_horizontal = 0 size_flags_vertical = 0 +theme = ExtResource( 20 ) text = "Save" script = ExtResource( 1 ) +[node name="KeymapViewer" type="VBoxContainer" parent="Panel"] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -300.0 +margin_top = -109.5 +margin_right = 300.0 +margin_bottom = 92.5 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="Headers" type="HBoxContainer" parent="Panel/KeymapViewer"] +margin_right = 600.0 +margin_bottom = 9.0 +size_flags_horizontal = 3 + +[node name="Action" type="Label" parent="Panel/KeymapViewer/Headers"] +margin_right = 271.0 +margin_bottom = 9.0 +grow_horizontal = 2 +size_flags_horizontal = 3 +size_flags_vertical = 0 +theme = ExtResource( 20 ) +custom_fonts/font = SubResource( 9 ) +text = "Action" +valign = 1 + +[node name="Control" type="Label" parent="Panel/KeymapViewer/Headers"] +margin_left = 275.0 +margin_right = 325.0 +margin_bottom = 9.0 +grow_horizontal = 2 +size_flags_horizontal = 0 +size_flags_vertical = 0 +custom_fonts/font = ExtResource( 22 ) +text = "Button" +align = 1 +valign = 1 + +[node name="Change" type="Label" parent="Panel/KeymapViewer/Headers"] +margin_left = 329.0 +margin_right = 600.0 +margin_bottom = 9.0 +grow_horizontal = 2 +size_flags_horizontal = 3 +size_flags_vertical = 0 +custom_fonts/font = ExtResource( 22 ) +text = "Edit" +align = 2 +valign = 1 + +[node name="ScrollContainer" type="ScrollContainer" parent="Panel/KeymapViewer"] +margin_top = 13.0 +margin_right = 600.0 +margin_bottom = 202.0 +focus_neighbour_top = NodePath("../../../ProfilesMenu") +focus_neighbour_bottom = NodePath("../../Save") +focus_previous = NodePath("../../Back") +size_flags_horizontal = 3 +size_flags_vertical = 3 +follow_focus = true + +[node name="ActionKeyList" type="VBoxContainer" parent="Panel/KeymapViewer/ScrollContainer"] +unique_name_in_owner = true +margin_right = 600.0 +margin_bottom = 189.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +script = ExtResource( 14 ) + +[node name="ProfilesMenu" type="OptionButton" parent="."] +unique_name_in_owner = true +anchor_left = 0.5 +anchor_top = 0.17 +anchor_right = 0.5 +anchor_bottom = 0.17 +margin_left = -14.5 +margin_right = 14.5 +margin_bottom = 19.0 +grow_horizontal = 2 +grow_vertical = 2 +focus_neighbour_top = NodePath("../Panel/Back") +focus_neighbour_bottom = NodePath("../Panel/KeymapViewer/ScrollContainer") +theme = ExtResource( 20 ) +script = ExtResource( 13 ) + [node name="KeySelectMenu" type="Panel" parent="."] pause_mode = 2 unique_name_in_owner = true @@ -311,33 +336,41 @@ focus_mode = 2 input_pass_on_modal_close_click = false script = ExtResource( 6 ) -[node name="Prompt" type="Label" parent="ReallyQuitMenu"] +[node name="Panel" type="Panel" parent="ReallyQuitMenu"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -margin_left = -334.0 -margin_top = -26.0 -margin_right = 335.0 -margin_bottom = 26.0 +margin_left = -78.0 +margin_right = 78.0 +theme = ExtResource( 20 ) + +[node name="Prompt" type="Label" parent="ReallyQuitMenu/Panel"] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -334.5 +margin_top = -27.5 +margin_right = 334.5 +margin_bottom = 27.5 grow_horizontal = 2 mouse_filter = 0 size_flags_horizontal = 0 size_flags_vertical = 0 -custom_fonts/font = SubResource( 7 ) +custom_fonts/font = SubResource( 10 ) text = "Unsaved changes were made. Go back anyway?" align = 1 valign = 1 -[node name="VBoxContainer" type="VBoxContainer" parent="ReallyQuitMenu"] +[node name="VBoxContainer" type="VBoxContainer" parent="ReallyQuitMenu/Panel"] anchor_left = 0.5 -anchor_top = 0.85 anchor_right = 0.5 -anchor_bottom = 0.85 -margin_left = -50.5 -margin_top = -67.0 -margin_right = 50.5 +margin_left = -78.0 +margin_top = 81.0 +margin_right = 78.0 +margin_bottom = 82.0 grow_horizontal = 2 grow_vertical = 2 mouse_filter = 0 @@ -346,8 +379,9 @@ size_flags_horizontal = 0 size_flags_vertical = 0 alignment = 1 -[node name="SaveNQuit" type="Button" parent="ReallyQuitMenu/VBoxContainer"] -margin_right = 101.0 +[node name="SaveNQuit" type="Button" parent="ReallyQuitMenu/Panel/VBoxContainer"] +unique_name_in_owner = true +margin_right = 156.0 margin_bottom = 20.0 grow_horizontal = 2 grow_vertical = 2 @@ -357,15 +391,19 @@ focus_neighbour_bottom = NodePath("../ContinueEdit") input_pass_on_modal_close_click = false size_flags_horizontal = 7 size_flags_vertical = 4 +theme = ExtResource( 20 ) text = "Save And Quit" icon_align = 1 script = ExtResource( 4 ) next_screen_path = "res://src/UserInterface/Screens/MainMenu/MainScreen.tscn" -[node name="ContinueEdit" type="Button" parent="ReallyQuitMenu/VBoxContainer"] +[node name="ContinueEdit" type="Button" parent="ReallyQuitMenu/Panel/VBoxContainer"] +unique_name_in_owner = true margin_top = 24.0 -margin_right = 101.0 +margin_right = 156.0 margin_bottom = 43.0 +grow_horizontal = 2 +grow_vertical = 2 focus_neighbour_left = NodePath(".") focus_neighbour_top = NodePath("../SaveNQuit") focus_neighbour_right = NodePath(".") @@ -373,13 +411,13 @@ focus_neighbour_bottom = NodePath("../QuitDontSave") focus_next = NodePath(".") focus_previous = NodePath(".") input_pass_on_modal_close_click = false -size_flags_horizontal = 7 -size_flags_vertical = 7 +size_flags_vertical = 5 text = "Continue Editing" -[node name="QuitDontSave" type="Button" parent="ReallyQuitMenu/VBoxContainer"] +[node name="QuitDontSave" type="Button" parent="ReallyQuitMenu/Panel/VBoxContainer"] +unique_name_in_owner = true margin_top = 47.0 -margin_right = 101.0 +margin_right = 156.0 margin_bottom = 67.0 grow_horizontal = 2 grow_vertical = 2 @@ -399,11 +437,11 @@ volume_db = -10.065 autoplay = true bus = "Music" -[connection signal="focus_entered" from="KeymapViewer/ScrollContainer" to="KeymapViewer/ScrollContainer" method="_on_focus_entered"] -[connection signal="button_up" from="Back" to="Back" method="_on_button_up"] -[connection signal="button_up" from="Reset" to="Reset" method="_on_button_up"] -[connection signal="button_up" from="Save" to="Save" method="_on_button_up"] +[connection signal="button_up" from="Panel/Back" to="Panel/Back" method="_on_button_up"] +[connection signal="button_up" from="Panel/Reset" to="Panel/Reset" method="_on_button_up"] +[connection signal="button_up" from="Panel/Save" to="Panel/Save" method="_on_button_up"] +[connection signal="focus_entered" from="Panel/KeymapViewer/ScrollContainer" to="Panel/KeymapViewer/ScrollContainer" method="_on_focus_entered"] [connection signal="timeout" from="KeySelectMenu/Timer" to="KeySelectMenu" method="close_on_timeout"] -[connection signal="button_up" from="ReallyQuitMenu/VBoxContainer/SaveNQuit" to="ReallyQuitMenu/VBoxContainer/SaveNQuit" method="_on_button_up"] -[connection signal="button_up" from="ReallyQuitMenu/VBoxContainer/ContinueEdit" to="ReallyQuitMenu" method="close"] -[connection signal="button_up" from="ReallyQuitMenu/VBoxContainer/QuitDontSave" to="ReallyQuitMenu/VBoxContainer/QuitDontSave" method="_on_button_up"] +[connection signal="button_up" from="ReallyQuitMenu/Panel/VBoxContainer/SaveNQuit" to="ReallyQuitMenu/Panel/VBoxContainer/SaveNQuit" method="_on_button_up"] +[connection signal="button_up" from="ReallyQuitMenu/Panel/VBoxContainer/ContinueEdit" to="ReallyQuitMenu" method="close"] +[connection signal="button_up" from="ReallyQuitMenu/Panel/VBoxContainer/QuitDontSave" to="ReallyQuitMenu/Panel/VBoxContainer/QuitDontSave" method="_on_button_up"] diff --git a/src/UserInterface/Screens/MainMenu/ControlsMenu/InputLine.gd b/src/UserInterface/Screens/MainMenu/ControlsMenu/InputLine.gd index 76958d8..d1d0d2c 100644 --- a/src/UserInterface/Screens/MainMenu/ControlsMenu/InputLine.gd +++ b/src/UserInterface/Screens/MainMenu/ControlsMenu/InputLine.gd @@ -23,6 +23,9 @@ func create_controller_button(event) -> ControllerButton: controller_button.mouse_filter = MOUSE_FILTER_IGNORE controller_button.rect_size = button_size controller_button.expand_icon = true + controller_button.grow_horizontal = Control.GROW_DIRECTION_BOTH + controller_button.grow_vertical = Control.GROW_DIRECTION_BOTH + controller_button.size_flags_horizontal return controller_button func _on_ChangeButton_pressed(): diff --git a/src/UserInterface/Screens/MainMenu/ControlsMenu/InputLine.tscn b/src/UserInterface/Screens/MainMenu/ControlsMenu/InputLine.tscn index 875086c..7843daa 100644 --- a/src/UserInterface/Screens/MainMenu/ControlsMenu/InputLine.tscn +++ b/src/UserInterface/Screens/MainMenu/ControlsMenu/InputLine.tscn @@ -24,6 +24,8 @@ valign = 1 margin_left = 305.0 margin_right = 335.0 margin_bottom = 30.0 +grow_horizontal = 2 +grow_vertical = 2 rect_min_size = Vector2( 30, 30 ) [node name="ChangeButton" type="Button" parent="."] diff --git a/src/UserInterface/Screens/MainMenu/ControlsMenu/KeySelectMenu.gd b/src/UserInterface/Screens/MainMenu/ControlsMenu/KeySelectMenu.gd index de67139..6c495d7 100644 --- a/src/UserInterface/Screens/MainMenu/ControlsMenu/KeySelectMenu.gd +++ b/src/UserInterface/Screens/MainMenu/ControlsMenu/KeySelectMenu.gd @@ -4,39 +4,41 @@ signal key_selected(scancode) var prev_focus func _ready() -> void: - set_process_input(false) - + set_process_input(false) + func _process(delta: float) -> void: - $Prompt2.text = ("(ESC to cancel or wait: %s" % round($Timer.time_left)) + " sec)" + $Prompt2.text = ("(ESC to cancel or wait: %s" % round($Timer.time_left)) + " sec)" func _input(event: InputEvent) -> void: - if !self.visible || !event.is_pressed(): - return - # TODO Static quit button esc - if "scancode" in event && event.scancode == 16777217: - event = null - accept_event() - get_tree().set_input_as_handled() - emit_signal("key_selected", event) - close() + if !self.visible || !event.is_pressed(): + return + # TODO Static quit button esc + if "scancode" in event && event.scancode == 16777217: + event = null + accept_event() + get_tree().set_input_as_handled() + emit_signal("key_selected", event) + close() func open(): - show() - $Timer.start() - prev_focus = get_focus_owner() - self.grab_focus() - set_process_input(true) + show() + $Timer.start() + prev_focus = get_focus_owner() + self.grab_focus() + set_process_input(true) + $"..".block_ui_cancel = true func close(): - hide() - $Timer.stop() - self.release_focus() - prev_focus.grab_focus() - set_process_input(false) - + hide() + $Timer.stop() + self.release_focus() + prev_focus.grab_focus() + set_process_input(false) + func close_on_timeout(): - hide() - self.release_focus() - prev_focus.grab_focus() - set_process_input(false) - emit_signal("key_selected", null) + hide() + self.release_focus() + prev_focus.grab_focus() + set_process_input(false) + emit_signal("key_selected", null) + $"..".block_ui_cancel = false diff --git a/src/UserInterface/Screens/MainMenu/ControlsMenu/ReallyQuitMenu.gd b/src/UserInterface/Screens/MainMenu/ControlsMenu/ReallyQuitMenu.gd index f054033..e253ecf 100644 --- a/src/UserInterface/Screens/MainMenu/ControlsMenu/ReallyQuitMenu.gd +++ b/src/UserInterface/Screens/MainMenu/ControlsMenu/ReallyQuitMenu.gd @@ -3,22 +3,22 @@ extends Panel var prev_focus func open(): - show() - prev_focus = get_focus_owner() - mitigate_ui_navigation_spill_over(true) - $"VBoxContainer/SaveNQuit".grab_focus() + show() + prev_focus = get_focus_owner() + mitigate_ui_navigation_spill_over(true) + $"%SaveNQuit".grab_focus() func mitigate_ui_navigation_spill_over(var value: bool): - var mode = Control.FOCUS_NONE if value else Control.FOCUS_ALL - $"%ProfilesMenu".focus_mode = mode - $"%Back".focus_mode = mode - $"%Reset".focus_mode = mode - $"%Save".focus_mode = mode - for line in $"../KeymapViewer/ScrollContainer/ActionKeyList".get_children(): - line.get_node("ChangeButton").focus_mode = mode + var mode = Control.FOCUS_NONE if value else Control.FOCUS_ALL + $"%ProfilesMenu".focus_mode = mode + $"%Back".focus_mode = mode + $"%Reset".focus_mode = mode + $"%Save".focus_mode = mode + for line in $"%ActionKeyList".get_children(): + line.get_node("ChangeButton").focus_mode = mode func close(): - hide() - mitigate_ui_navigation_spill_over(false) - self.release_focus() - prev_focus.grab_focus() + hide() + mitigate_ui_navigation_spill_over(false) + self.release_focus() + prev_focus.grab_focus() diff --git a/src/UserInterface/Screens/MainMenu/ControlsMenu/SaveButton.gd b/src/UserInterface/Screens/MainMenu/ControlsMenu/SaveButton.gd index 59eb4cf..f362b6e 100644 --- a/src/UserInterface/Screens/MainMenu/ControlsMenu/SaveButton.gd +++ b/src/UserInterface/Screens/MainMenu/ControlsMenu/SaveButton.gd @@ -1,9 +1,10 @@ extends Button onready var mapper := $"%InputMapper" +onready var controllsMenu := get_tree().get_current_scene() func _on_button_up() -> void: - mapper.commit_to_changes() - SaveManager.save_default() - get_parent().changes_saved = true - get_parent().changes_made = false + mapper.commit_to_changes() + SaveManager.save_default() + controllsMenu.changes_saved = true + controllsMenu.changes_made = false diff --git a/src/UserInterface/Screens/MainMenu/ControlsMenu/SavedCheckBackButton.gd b/src/UserInterface/Screens/MainMenu/ControlsMenu/SavedCheckBackButton.gd index a1d938b..f56f1fc 100644 --- a/src/UserInterface/Screens/MainMenu/ControlsMenu/SavedCheckBackButton.gd +++ b/src/UserInterface/Screens/MainMenu/ControlsMenu/SavedCheckBackButton.gd @@ -4,13 +4,13 @@ export(String, FILE) var next_screen_path: = "" onready var selected_screen_base_path: String = "res://src/UserInterface/Screens" func _on_button_up() -> void: - if(!get_parent().changes_made || get_parent().changes_saved): - get_tree().change_scene(next_screen_path) - get_tree().get_current_scene().queue_free() - get_tree().paused = false - else: - set_process_input(false) - $"%ReallyQuitMenu".open() + if(!get_tree().get_current_scene().changes_made || get_tree().get_current_scene().changes_saved): + get_tree().change_scene(next_screen_path) + get_tree().get_current_scene().queue_free() + get_tree().paused = false + else: + set_process_input(false) + $"%ReallyQuitMenu".open() func _get_configuration_warning() -> String: - return "next_scene_path must be set for the button to work" if next_screen_path == "" else "" + return "next_scene_path must be set for the button to work" if next_screen_path == "" else "" diff --git a/src/UserInterface/Screens/MainMenu/LevelList.gd b/src/UserInterface/Screens/MainMenu/LevelList.gd index 59acbeb..293eb68 100644 --- a/src/UserInterface/Screens/MainMenu/LevelList.gd +++ b/src/UserInterface/Screens/MainMenu/LevelList.gd @@ -5,36 +5,36 @@ onready var BUTTON_GROUP : ButtonGroup = load("res://src/UserInterface/Screens/M onready var vbox: VBoxContainer = $VBoxContainer func _ready() -> void: - BUTTON_GROUP.connect("pressed", get_node('../Buttons/PlayButton'), "_level_selection_changed") - _fill_level_list() + BUTTON_GROUP.connect("pressed", $"%PlayButton", "_level_selection_changed") + _fill_level_list() func _fill_level_list(): - var levels = [] - var dir = Directory.new() - if dir.open(LEVELS_PATH) == OK: - dir.list_dir_begin() - while true: - var file_name = dir.get_next() - if file_name == "": - break - else: - if(file_name.ends_with(".tscn")): - levels.append(file_name) - if levels.size() != 0: - _spawn_level_options(levels) + var levels = [] + var dir = Directory.new() + if dir.open(LEVELS_PATH) == OK: + dir.list_dir_begin() + while true: + var file_name = dir.get_next() + if file_name == "": + break + else: + if(file_name.ends_with(".tscn")): + levels.append(file_name) + if levels.size() != 0: + _spawn_level_options(levels) func _spawn_level_options(levels: Array): - var first = true - for level in levels: - var check_box = CheckBox.new() - check_box.focus_mode = Control.FOCUS_ALL - check_box.focus_neighbour_left = $"%PlayButton".get_path() - check_box.text = level.trim_suffix(".tscn") - check_box.set_button_group(BUTTON_GROUP) - vbox.add_child(check_box) - if first: - $"%PlayButton".focus_neighbour_right = check_box.get_path() - $"%Controlls".focus_neighbour_right = check_box.get_path() - $"%QuitButton".focus_neighbour_right = check_box.get_path() - first = false - return + var first = true + for level in levels: + var check_box = CheckBox.new() + check_box.focus_mode = Control.FOCUS_ALL + check_box.focus_neighbour_left = $"%PlayButton".get_path() + check_box.text = level.trim_suffix(".tscn") + check_box.set_button_group(BUTTON_GROUP) + vbox.add_child(check_box) + if first: + $"%PlayButton".focus_neighbour_right = check_box.get_path() + $"%Controlls".focus_neighbour_right = check_box.get_path() + $"%QuitButton".focus_neighbour_right = check_box.get_path() + first = false + return diff --git a/src/UserInterface/Screens/MainMenu/MainScreen.tscn b/src/UserInterface/Screens/MainMenu/MainScreen.tscn index 4a3a53a..a155f28 100644 --- a/src/UserInterface/Screens/MainMenu/MainScreen.tscn +++ b/src/UserInterface/Screens/MainMenu/MainScreen.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=14 format=2] +[gd_scene load_steps=15 format=2] [ext_resource path="res://src/UserInterface/Buttons/QuitButton.tscn" type="PackedScene" id=1] [ext_resource path="res://src/UserInterface/Buttons/Titel.tscn" type="PackedScene" id=2] @@ -12,9 +12,10 @@ [ext_resource path="res://assets/meta/montserrat_extrabold.otf" type="DynamicFontData" id=10] [ext_resource path="res://src/UserInterface/Screens/MainMenu/LevelList.gd" type="Script" id=11] [ext_resource path="res://src/UserInterface/Buttons/MenuNavigationButton.gd" type="Script" id=12] +[ext_resource path="res://assets/ui/sci-fi-godot-theme/sci-fi-theme.tres" type="Theme" id=13] [sub_resource type="DynamicFont" id=1] -size = 69 +size = 60 font_data = ExtResource( 10 ) [node name="MainScreen" type="Control"] @@ -43,49 +44,70 @@ texture = ExtResource( 6 ) expand = true stretch_mode = 1 -[node name="Titel" parent="." instance=ExtResource( 2 )] +[node name="MarginContainer" type="MarginContainer" parent="."] anchor_left = 0.5 +anchor_top = 0.02 anchor_right = 0.5 -margin_left = -162.5 -margin_right = 162.5 +anchor_bottom = 0.02 +margin_left = -130.0 +margin_right = 130.0 +margin_bottom = 85.0 +theme = ExtResource( 13 ) + +[node name="Panel" type="Panel" parent="MarginContainer"] +margin_right = 260.0 margin_bottom = 85.0 grow_horizontal = 2 -size_flags_horizontal = 2 -size_flags_vertical = 2 +grow_vertical = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +theme = ExtResource( 13 ) +theme_type_variation = "Panel2" + +[node name="Titel" parent="MarginContainer" instance=ExtResource( 2 )] +margin_right = 260.0 +margin_bottom = 85.0 +grow_horizontal = 2 +grow_vertical = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +theme = ExtResource( 13 ) custom_fonts/font = SubResource( 1 ) -text = "bobbi" +text = "Blobby" [node name="MenuContainer" type="HBoxContainer" parent="."] -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -margin_left = -144.0 -margin_top = -12.0 -margin_right = 156.0 -margin_bottom = 88.0 +anchor_left = 0.45 +anchor_top = 0.75 +anchor_right = 0.45 +anchor_bottom = 0.75 +margin_left = -120.0 +margin_top = -85.0 +margin_right = 192.0 +margin_bottom = 50.0 [node name="Buttons" type="VBoxContainer" parent="MenuContainer"] -margin_right = 296.0 -margin_bottom = 100.0 +margin_right = 154.0 +margin_bottom = 135.0 focus_mode = 2 size_flags_horizontal = 3 [node name="PlayButton" parent="MenuContainer/Buttons" instance=ExtResource( 3 )] unique_name_in_owner = true -margin_right = 296.0 -margin_bottom = 30.0 +margin_right = 154.0 +margin_bottom = 42.0 focus_neighbour_top = NodePath("../QuitButton") focus_neighbour_bottom = NodePath("../Controlls") +theme = ExtResource( 13 ) next_scene_path = "res://src/Levels/1 Tutorial Level.tscn" [node name="Controlls" parent="MenuContainer/Buttons" instance=ExtResource( 3 )] unique_name_in_owner = true -margin_top = 34.0 -margin_right = 296.0 -margin_bottom = 65.0 +margin_top = 46.0 +margin_right = 154.0 +margin_bottom = 88.0 focus_neighbour_top = NodePath("../PlayButton") focus_neighbour_bottom = NodePath("../QuitButton") +theme = ExtResource( 13 ) text = "Controls" script = ExtResource( 12 ) next_screen_path = "res://src/UserInterface/Screens/MainMenu/ControlsMenu/ControlsMenu.tscn" @@ -95,29 +117,59 @@ unique_name_in_owner = true anchor_left = 0.0 anchor_right = 0.0 margin_left = 0.0 -margin_top = 69.0 -margin_right = 296.0 -margin_bottom = 100.0 +margin_top = 92.0 +margin_right = 154.0 +margin_bottom = 135.0 focus_neighbour_top = NodePath("../Controlls") focus_neighbour_bottom = NodePath("../PlayButton") -[node name="LevelList" type="ScrollContainer" parent="MenuContainer"] -margin_left = 300.0 -margin_right = 300.0 -margin_bottom = 100.0 +[node name="Panel" type="Panel" parent="MenuContainer"] +margin_left = 158.0 +margin_right = 312.0 +margin_bottom = 135.0 +grow_horizontal = 2 +grow_vertical = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +theme = ExtResource( 13 ) + +[node name="LevelList" type="ScrollContainer" parent="MenuContainer/Panel"] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -65.0 +margin_top = -54.5 +margin_right = 65.0 +margin_bottom = 55.5 +grow_horizontal = 2 +grow_vertical = 2 focus_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +theme = ExtResource( 13 ) follow_focus = true scroll_horizontal_enabled = false script = ExtResource( 11 ) -[node name="VBoxContainer" type="VBoxContainer" parent="MenuContainer/LevelList"] +[node name="VBoxContainer" type="VBoxContainer" parent="MenuContainer/Panel/LevelList"] +margin_right = 130.0 +margin_bottom = 110.0 +grow_horizontal = 2 +grow_vertical = 2 focus_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 -[node name="InvisibleCunt" type="CheckBox" parent="MenuContainer/LevelList/VBoxContainer"] +[node name="InvisibleCunt" type="CheckBox" parent="MenuContainer/Panel/LevelList/VBoxContainer"] visible = false -margin_right = 24.0 -margin_bottom = 24.0 -focus_neighbour_left = NodePath("../../../Buttons/PlayButton") +margin_right = 154.0 +margin_bottom = 135.0 +grow_horizontal = 2 +grow_vertical = 2 +focus_neighbour_left = NodePath("../../../../Buttons/PlayButton") +size_flags_horizontal = 3 +size_flags_vertical = 3 group = ExtResource( 9 ) [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] diff --git a/src/UserInterface/TutorialThingy.gd b/src/UserInterface/TutorialThingy.gd index d516958..2977531 100644 --- a/src/UserInterface/TutorialThingy.gd +++ b/src/UserInterface/TutorialThingy.gd @@ -1,5 +1,7 @@ extends Node2D export var action = "move_right" +export var action_combination = "" +export var combination_required = false export var velocity = Vector2(0.309,0.309) export var press_limit = 3 @@ -12,6 +14,7 @@ var tex_size: Vector2 var screen_stretch_factor: Vector2 func _unhandled_input(event: InputEvent) -> void: + print(event.as_text()) if(ControllerIcons.parse_event(event) == button.texture): press_limit -= 1 if press_limit < -1: @@ -61,3 +64,7 @@ func _on_Area_area_entered(area: Area2D) -> void: func _lesson_learned() -> void: levelState.absolved_tutorial(action) queue_free() + + +func _on_StartTutorialArea_area_entered(area: Area2D) -> void: + pass diff --git a/src/UserInterface/TutorialThingy.tscn b/src/UserInterface/TutorialThingy.tscn index 6ca4837..6f0a6b3 100644 --- a/src/UserInterface/TutorialThingy.tscn +++ b/src/UserInterface/TutorialThingy.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=9 format=2] [ext_resource path="res://assets/effects/pixelDissolve.tres" type="Material" id=1] [ext_resource path="res://src/UserInterface/TutorialThingy.gd" type="Script" id=2] @@ -52,8 +52,12 @@ tracks/1/keys = { } ] } +[sub_resource type="RectangleShape2D" id=6] +extents = Vector2( 86, 71 ) + [node name="TutorialThingy" type="Node2D"] script = ExtResource( 2 ) +action = "jump" [node name="Button" type="Sprite" parent="."] material = ExtResource( 1 ) @@ -66,7 +70,6 @@ margin_bottom = 20.0 script = ExtResource( 3 ) [node name="Label" type="Label" parent="."] -visible = false margin_left = -34.0 margin_top = -49.0 margin_right = 99.0 @@ -80,6 +83,7 @@ text = "Move Right: uppercase = true [node name="Area" type="Area2D" parent="."] +visible = false collision_layer = 512 collision_mask = 512 @@ -94,4 +98,11 @@ anims/cease_4_exist = SubResource( 5 ) visible = false texture = ExtResource( 4 ) +[node name="StartTutorialArea" type="Area2D" parent="."] +monitorable = false + +[node name="CollisionShape2D" type="CollisionShape2D" parent="StartTutorialArea"] +shape = SubResource( 6 ) + [connection signal="area_entered" from="Area" to="." method="_on_Area_area_entered"] +[connection signal="area_entered" from="StartTutorialArea" to="." method="_on_StartTutorialArea_area_entered"] diff --git a/src/Utilities/SignalManager.gd b/src/Utilities/SignalManager.gd index 5aa1d0f..0af894b 100644 --- a/src/Utilities/SignalManager.gd +++ b/src/Utilities/SignalManager.gd @@ -13,6 +13,7 @@ signal power_up_collected(kind) signal got_stomped() signal unlocked(key) signal savemanager_saved() +signal game_paused(value) func _on_Timer_timeout() -> void: - emit_signal("getback_timer_up") + emit_signal("getback_timer_up")