New blobby character, overhauled project structure

.vscode/launch.json

@@ -1,18 +0,0 @@
-{
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "GDScript Godot",
-      "type": "godot",
-      "request": "launch",
-      "project": "${workspaceFolder}",
-      "port": 6007,
-      "address": "127.0.0.1",
-      "launch_game_instance": true,
-      "launch_scene": false
-    }
-  ]
-}

.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-  "godot_tools.scene_file_config": "c:\\Users\\Jakob\\Documents\\Godot\\Wumper\\src\\Levels\\ApproxLevel.tscn.tmp"
-}

assets/blobby/blobby1.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/blobby1.png-a4f53cbbf18025f2df7be0d13bd4c968.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/blobby/blobby1.png"
+dest_files=[ "res://.import/blobby1.png-a4f53cbbf18025f2df7be0d13bd4c968.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

assets/blobby/blobby2.png.import

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/approx mannequin.png-e4ae377c4dcae927a088d7e01878ef98.stex"
+path="res://.import/blobby2.png-d294ac62d2147eb34557adf70d20152f.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://start-assets/approx mannequin.png"
+source_file="res://assets/blobby/blobby2.png"
-dest_files=[ "res://.import/approx mannequin.png-e4ae377c4dcae927a088d7e01878ef98.stex" ]
+dest_files=[ "res://.import/blobby2.png-d294ac62d2147eb34557adf70d20152f.stex" ]
 
 [params]
 
@@ -28,6 +28,7 @@ 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

assets/blobby/blobby3.png.import

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/Basic stone block.png-cb4ca55f71cbc16699bc7d20b5c1b78f.stex"
+path="res://.import/blobby3.png-f3049c49f8261c7d40c3ceedc1afb230.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://start-assets/Basic stone block.png"
+source_file="res://assets/blobby/blobby3.png"
-dest_files=[ "res://.import/Basic stone block.png-cb4ca55f71cbc16699bc7d20b5c1b78f.stex" ]
+dest_files=[ "res://.import/blobby3.png-f3049c49f8261c7d40c3ceedc1afb230.stex" ]
 
 [params]
 
@@ -28,6 +28,7 @@ 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

assets/contraption/bumper.png.import

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/bumper.png-e2c935794cf24ca0beff14ba53ce0fb4.stex"
+path="res://.import/bumper.png-6f60811ad9eb83b77488daccea5e68a7.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://start-assets/bumper.png"
+source_file="res://assets/contraption/bumper.png"
-dest_files=[ "res://.import/bumper.png-e2c935794cf24ca0beff14ba53ce0fb4.stex" ]
+dest_files=[ "res://.import/bumper.png-6f60811ad9eb83b77488daccea5e68a7.stex" ]
 
 [params]
 
@@ -28,6 +28,7 @@ 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

assets/contraption/portal.png.import

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/portal.png-3d0d266d5a0173717713545e4f6b6852.stex"
+path="res://.import/portal.png-16ca17fc355ef0d000362eca21f242d6.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://start-assets/portal.png"
+source_file="res://assets/contraption/portal.png"
-dest_files=[ "res://.import/portal.png-3d0d266d5a0173717713545e4f6b6852.stex" ]
+dest_files=[ "res://.import/portal.png-16ca17fc355ef0d000362eca21f242d6.stex" ]
 
 [params]
 
@@ -28,6 +28,7 @@ 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

assets/enemy/enemy.png.import

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/coin.png-b66abcdd76eda96a7416be76d32e7f3f.stex"
+path="res://.import/enemy.png-2ffb8cc70f5f247be0a6a03142f8f850.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://start-assets/coin.png"
+source_file="res://assets/enemy/enemy.png"
-dest_files=[ "res://.import/coin.png-b66abcdd76eda96a7416be76d32e7f3f.stex" ]
+dest_files=[ "res://.import/enemy.png-2ffb8cc70f5f247be0a6a03142f8f850.stex" ]
 
 [params]
 
@@ -28,6 +28,7 @@ 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

assets/environment/background/background.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/background.png-c37acf1f20aa4712a95cc903e014cf9e.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/environment/background/background.png"
+dest_files=[ "res://.import/background.png-c37acf1f20aa4712a95cc903e014cf9e.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

assets/environment/blocks/Basic stone block.png.import

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

assets/environment/blocks/approx build block.png.import

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

assets/meta/icon.png.import

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/icon.png-fc66d857429a1b59b2fa881b4c230697.stex"
+path="res://.import/icon.png-eade320076b24b97f544206fea4c6c6f.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://start-assets/icon.png"
+source_file="res://assets/meta/icon.png"
-dest_files=[ "res://.import/icon.png-fc66d857429a1b59b2fa881b4c230697.stex" ]
+dest_files=[ "res://.import/icon.png-eade320076b24b97f544206fea4c6c6f.stex" ]
 
 [params]
 
@@ -28,6 +28,7 @@ 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

assets/meta/light.png.import

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/light.png-032cd0595f1dc9a0c36b1cff34ddab1f.stex"
+path="res://.import/light.png-90b266ae7695c7c763c4fd90b49b4148.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://start-assets/light.png"
+source_file="res://assets/meta/light.png"
-dest_files=[ "res://.import/light.png-032cd0595f1dc9a0c36b1cff34ddab1f.stex" ]
+dest_files=[ "res://.import/light.png-90b266ae7695c7c763c4fd90b49b4148.stex" ]
 
 [params]
 
@@ -28,6 +28,7 @@ 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

assets/meta/new_dynamicfont.tres

@@ -1,6 +1,6 @@
 [gd_resource type="DynamicFont" load_steps=2 format=2]
 
-[ext_resource path="res://start-assets/montserrat_extrabold.otf" type="DynamicFontData" id=1]
+[ext_resource path="res://assets/meta/montserrat_extrabold.otf" type="DynamicFontData" id=1]
 
 [resource]
 size = 10

assets/meta/tileset.png.import

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/tileset.png-7d62e0550cb9afaf31af18a1fd42a92a.stex"
+path="res://.import/tileset.png-249669a2e33cfee7524dfa51f24daa21.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://start-assets/tileset.png"
+source_file="res://assets/meta/tileset.png"
-dest_files=[ "res://.import/tileset.png-7d62e0550cb9afaf31af18a1fd42a92a.stex" ]
+dest_files=[ "res://.import/tileset.png-249669a2e33cfee7524dfa51f24daa21.stex" ]
 
 [params]
 
@@ -28,6 +28,7 @@ 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

assets/meta/tileset.tres

@@ -1,6 +1,6 @@
 [gd_resource type="TileSet" load_steps=4 format=2]
 
-[ext_resource path="res://start-assets/tileset.png" type="Texture" id=1]
+[ext_resource path="res://assets/meta/tileset.png" type="Texture" id=1]
 
 [sub_resource type="ConvexPolygonShape2D" id=1]
 points = PoolVector2Array( 0, 0, 80, 0, 80, 80, 0, 80 )

assets/meta/ui_theme.tres

@@ -1,6 +1,7 @@
 [gd_resource type="Theme" load_steps=2 format=2]
 
-[ext_resource path="res://start-assets/new_dynamicfont.tres" type="DynamicFont" id=1]
+[ext_resource path="res://assets/meta/new_dynamicfont.tres" type="DynamicFont" id=1]
+
 
 [resource]
 default_font = ExtResource( 1 )

assets/neutral object/coin.png.import

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/background.png-81d2bbbda17f3da939f0efdb2d10572c.stex"
+path="res://.import/coin.png-fe8bb2aa6121a142ba566306481b879c.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://start-assets/background.png"
+source_file="res://assets/neutral object/coin.png"
-dest_files=[ "res://.import/background.png-81d2bbbda17f3da939f0efdb2d10572c.stex" ]
+dest_files=[ "res://.import/coin.png-fe8bb2aa6121a142ba566306481b879c.stex" ]
 
 [params]
 
@@ -28,6 +28,7 @@ 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

assets/player/approx mannequin.png.import

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/approx build block.png-49ad0e1ad31136d94884e26eab12689d.stex"
+path="res://.import/approx mannequin.png-6e1845e85175130a6ea95276556c5741.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://start-assets/approx build block.png"
+source_file="res://assets/player/approx mannequin.png"
-dest_files=[ "res://.import/approx build block.png-49ad0e1ad31136d94884e26eab12689d.stex" ]
+dest_files=[ "res://.import/approx mannequin.png-6e1845e85175130a6ea95276556c5741.stex" ]
 
 [params]
 
@@ -28,6 +28,7 @@ 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

assets/player/player.png.import

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/player.png-8cef2a46c175270e62c64717d7716e7f.stex"
+path="res://.import/player.png-e230e05e2d932a710303ee07f401e40f.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://start-assets/player.png"
+source_file="res://assets/player/player.png"
-dest_files=[ "res://.import/player.png-8cef2a46c175270e62c64717d7716e7f.stex" ]
+dest_files=[ "res://.import/player.png-e230e05e2d932a710303ee07f401e40f.stex" ]
 
 [params]
 
@@ -28,6 +28,7 @@ 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

assets/player/th.jpg.import

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/enemy.png-1c716757e52981306f381ad5bad394ac.stex"
+path="res://.import/th.jpg-cc137ca9b69564ee23cce46a01652543.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://start-assets/enemy.png"
+source_file="res://assets/player/th.jpg"
-dest_files=[ "res://.import/enemy.png-1c716757e52981306f381ad5bad394ac.stex" ]
+dest_files=[ "res://.import/th.jpg-cc137ca9b69564ee23cce46a01652543.stex" ]
 
 [params]
 
@@ -28,6 +28,7 @@ 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

icon.png.import

@@ -28,6 +28,7 @@ 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

project.godot

@@ -39,7 +39,7 @@ _global_script_class_icons={
 [application]
 
 config/name="Wumper"
-run/main_scene="res://src/Screens/MainScreen.tscn"
+run/main_scene="res://src/UserInterface/Screens/MainScreen.tscn"
 config/icon="res://icon.png"
 
 [autoload]
@@ -63,32 +63,32 @@ window/stretch/shrink=4.5
 move_left={
 "deadzone": 0.5,
 "events": [ Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":-1.0,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"unicode":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
 , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":14,"pressure":0.0,"pressed":false,"script":null)
  ]
 }
 move_right={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"unicode":0,"echo":false,"script":null)
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
 , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":1.0,"script":null)
 , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":15,"pressure":0.0,"pressed":false,"script":null)
  ]
 }
 jump={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null)
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
 , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":0,"pressure":0.0,"pressed":false,"script":null)
  ]
 }
 pause={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777217,"unicode":0,"echo":false,"script":null)
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777217,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
 , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":11,"pressure":0.0,"pressed":false,"script":null)
  ]
 }
 boost_move={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777237,"unicode":0,"echo":false,"script":null)
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777237,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
 , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":1,"pressure":0.0,"pressed":false,"script":null)
  ]
 }

src/Actor/Blobby.gd

@@ -10,6 +10,13 @@ onready var init_boost_type = player_state_machine.init_boost_type
 onready var camera_tween = $Camera2D/ShiftTween
 onready var camera = $Camera2D
 
+# TODO Midair Boost sometimes to far
+# TODO Stuck to Wallslide on input
+# TODO Too much speed reduction on landings
+# TODO Too much speed through midair boosting
+# TODO Mini hopping through jump buffer(rare wallslide)
+# TODO 
+
 
 func _on_EnemyDetector_area_entered(area: Area2D) -> void:
 	_velocity = calculate_stomp_velocity(_velocity, stomp_feedback)

src/Actor/Blobby.tscn

@@ -1,30 +1,31 @@
-[gd_scene load_steps=7 format=2]
+[gd_scene load_steps=6 format=2]
 
-[ext_resource path="res://start-assets/approx mannequin.png" type="Texture" id=1]
+[ext_resource path="res://assets/blobby/blobby1.png" type="Texture" id=1]
 [ext_resource path="res://src/Actor/PlayerStateMachine.gd" type="Script" id=2]
 [ext_resource path="res://src/Actor/Blobby.gd" type="Script" id=5]
 [ext_resource path="res://src/Actor/Camera2D.gd" type="Script" id=6]
 
-[sub_resource type="RectangleShape2D" id=1]
-extents = Vector2( 10.6846, 20.1701 )
-
 [sub_resource type="RectangleShape2D" id=2]
 extents = Vector2( 11.2458, 19.4685 )
 
 [node name="Blobby" type="KinematicBody2D"]
 collision_mask = 8
 script = ExtResource( 5 )
-jump_buffer_filled = null
 
 [node name="Player" type="Sprite" parent="."]
+position = Vector2( -0.00490093, 0.00763269 )
+scale = Vector2( 0.668819, 1.21494 )
 texture = ExtResource( 1 )
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+[node name="AnimationPlayer" type="AnimationPlayer" parent="Player"]
-shape = SubResource( 1 )
+
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
+polygon = PoolVector2Array( -6.76445, -3.27282, -2.66045, -7.27159, 3.75863, -7.44698, 7.45577, -2.58186, 7.97746, -1.86331, 7.99487, 8.61092, 4.14448, 8.72349, -3.67768, 8.75857, -6.62144, 8.69444 )
 
 [node name="Camera2D" type="Camera2D" parent="."]
 position = Vector2( 80, 0 )
 current = true
+zoom = Vector2( 2, 2 )
 limit_left = 0
 limit_top = 0
 limit_smoothed = true
@@ -41,8 +42,8 @@ script = ExtResource( 6 )
 [node name="ShiftTween" type="Tween" parent="Camera2D"]
 
 [node name="EnemyDetector" type="Area2D" parent="."]
-monitorable = false
 collision_mask = 2
+monitorable = false
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="EnemyDetector"]
 modulate = Color( 0.2, 0, 0.494118, 1 )
@@ -68,13 +69,11 @@ custom_colors/font_color = Color( 0, 0, 0, 1 )
 text = "Ihre Werbung"
 align = 1
 valign = 1
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="WallRaycasts" type="Node2D" parent="."]
 
 [node name="LeftWallRaycast" type="Node2D" parent="WallRaycasts"]
+position = Vector2( 3.95827, 5.64054 )
 
 [node name="Left_Wallcast1" type="RayCast2D" parent="WallRaycasts/LeftWallRaycast"]
 position = Vector2( -10.706, -8.03844 )
@@ -83,7 +82,7 @@ cast_to = Vector2( -2, 0 )
 collision_mask = 9
 
 [node name="Left_Wallcast2" type="RayCast2D" parent="WallRaycasts/LeftWallRaycast"]
-position = Vector2( -10.706, 14.8466 )
+position = Vector2( -10.706, -1.9261 )
 enabled = true
 cast_to = Vector2( -2, 0 )
 collision_mask = 9
@@ -91,13 +90,13 @@ collision_mask = 9
 [node name="RightWallRaycast" type="Node2D" parent="WallRaycasts"]
 
 [node name="Right_Wallcast1" type="RayCast2D" parent="WallRaycasts/RightWallRaycast"]
-position = Vector2( 10.6962, -8.03844 )
+position = Vector2( 7.97737, -0.838908 )
 enabled = true
 cast_to = Vector2( 2, 0 )
 collision_mask = 9
 
 [node name="Right_Wallcast2" type="RayCast2D" parent="WallRaycasts/RightWallRaycast"]
-position = Vector2( 11, 14.8466 )
+position = Vector2( 8.0633, 3.84536 )
 enabled = true
 cast_to = Vector2( 2, 0 )
 collision_mask = 9

src/Actor/Enemy.gd

@@ -16,7 +16,7 @@ func _on_StompDetector_body_entered(body: Node) -> void:
 
 
 func _physics_process(delta: float) -> void:
-	_velocity.y += gravity * delta
+	_velocity.y += _gravity * delta
 	if is_on_wall():
 		_velocity.x *= -1.0
 	_velocity.y = move_and_slide(_velocity, FLOOR_NORMAL).y

src/Actor/Enemy.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=5 format=2]
 
-[ext_resource path="res://start-assets/enemy.png" type="Texture" id=1]
+[ext_resource path="res://assets/enemy/enemy.png" type="Texture" id=1]
 [ext_resource path="res://src/Actor/Enemy.gd" type="Script" id=2]
 
 [sub_resource type="RectangleShape2D" id=1]
@@ -38,4 +38,5 @@ collision_layer = 2
 [node name="CollisionShape2D2" type="CollisionShape2D" parent="StompDetector"]
 position = Vector2( 0.44545, -13 )
 shape = SubResource( 2 )
+
 [connection signal="body_entered" from="StompDetector" to="." method="_on_StompDetector_body_entered"]

src/Actor/Turret.tscn

@@ -0,0 +1,23 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://assets/contraption/bumper.png" type="Texture" id=1]
+
+[sub_resource type="RectangleShape2D" id=1]
+extents = Vector2( 108.869, 37.2448 )
+
+[node name="Turret" type="KinematicBody2D"]
+collision_layer = 2
+collision_mask = 3
+
+[node name="Sprite" type="Sprite" parent="."]
+scale = Vector2( 0.612294, 1 )
+texture = ExtResource( 1 )
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+scale = Vector2( 0.310271, 1.02855 )
+shape = SubResource( 1 )
+
+[node name="RayCast2D" type="RayCast2D" parent="."]
+enabled = true
+collision_mask = 0
+collide_with_bodies = false

src/Contraptions/Platform/AnimationPlayer.gd

@@ -0,0 +1,16 @@
+extends AnimationPlayer
+
+
+# Declare member variables here. Examples:
+# var a: int = 2
+# var b: String = "text"
+
+
+# Called when the node enters the scene tree for the first time.
+func _ready() -> void:
+	play()
+
+
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+#func _process(delta: float) -> void:
+#	pass

src/Contraptions/Platform/Track.gd

@@ -0,0 +1,15 @@
+extends Node2D
+
+# Declare member variables here. Examples:
+# var a: int = 2
+# var b: String = "text"
+
+
+# Called when the node enters the scene tree for the first time.
+func _ready() -> void:
+	$anim.play("Horizontal")
+
+
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+#func _process(delta: float) -> void:
+#	pass

src/Contraptions/Platform/Track.tscn

@@ -0,0 +1,47 @@
+[gd_scene load_steps=5 format=2]
+
+[ext_resource path="res://assets/environment/blocks/Basic stone block.png" type="Texture" id=1]
+[ext_resource path="res://src/Contraptions/Platform/Track.gd" type="Script" id=2]
+
+[sub_resource type="RectangleShape2D" id=1]
+extents = Vector2( 19.0405, 7.97217 )
+
+[sub_resource type="Animation" id=2]
+resource_name = "Horizontal"
+length = 2.5
+loop = true
+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, 1.3 ),
+"transitions": PoolRealArray( 1, 1 ),
+"update": 0,
+"values": [ Vector2( 0, 0 ), Vector2( 30, 0 ) ]
+}
+
+[node name="Track" type="Node2D"]
+script = ExtResource( 2 )
+
+[node name="KinematicBody2D" type="KinematicBody2D" parent="."]
+position = Vector2( 19.2307, 0 )
+collision_layer = 8
+collision_mask = 8
+motion/sync_to_physics = true
+
+[node name="Sprite" type="Sprite" parent="KinematicBody2D"]
+position = Vector2( -0.0275421, 0.0656414 )
+scale = Vector2( 2.38059, 1 )
+texture = ExtResource( 1 )
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="KinematicBody2D"]
+position = Vector2( -0.00535583, 0.0656414 )
+shape = SubResource( 1 )
+
+[node name="anim" type="AnimationPlayer" parent="."]
+pause_mode = 2
+playback_process_mode = 0
+anims/Horizontal = SubResource( 2 )

src/Contraptions/Portal/Portal.tscn

@@ -1,7 +1,8 @@
 [gd_scene load_steps=6 format=2]
 
-[ext_resource path="res://start-assets/portal.png" type="Texture" id=1]
+[ext_resource path="res://assets/contraption/portal.png" type="Texture" id=1]
-[ext_resource path="res://src/Objects/Portal.gd" type="Script" id=2]
+[ext_resource path="res://src/Contraptions/Portal/Portal.gd" type="Script" id=2]
+
 
 [sub_resource type="CapsuleShape2D" id=1]
 radius = 39.0

src/Levels/Level02.tscn

@@ -1,10 +1,10 @@
 [gd_scene load_steps=8 format=2]
 
 [ext_resource path="res://src/Actor/Blobby.tscn" type="PackedScene" id=1]
-[ext_resource path="res://start-assets/tileset.png" type="Texture" id=2]
+[ext_resource path="res://assets/meta/tileset.png" type="Texture" id=2]
 [ext_resource path="res://src/Actor/Enemy.tscn" type="PackedScene" id=3]
-[ext_resource path="res://start-assets/background.png" type="Texture" id=4]
+[ext_resource path="res://assets/environment/background/background.png" type="Texture" id=4]
-[ext_resource path="res://src/Objects/Coin.tscn" type="PackedScene" id=5]
+[ext_resource path="res://src/Neutral Objects/Coin.tscn" type="PackedScene" id=5]
 
 [sub_resource type="ConvexPolygonShape2D" id=1]
 points = PoolVector2Array( 0, 0, 80, 0, 80, 80, 0, 80 )
@@ -44,9 +44,6 @@ margin_bottom = 76.0
 texture = ExtResource( 4 )
 expand = true
 stretch_mode = 1
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="TileMap" type="TileMap" parent="."]
 tile_set = SubResource( 2 )
@@ -57,13 +54,16 @@ format = 1
 tile_data = PoolIntArray( 0, 0, 0, 65536, 0, 0, 131072, 0, 0, 196608, 0, 0, 262144, 0, 0, 262145, 0, 0, 262146, 0, 0, 262153, 0, 0, 262154, 0, 0, 327680, 0, 0, 327686, 0, 0, 327702, 0, 0, 327703, 0, 0, 393216, 0, 0, 393221, 0, 0, 393222, 0, 0, 393237, 0, 0, 393238, 0, 0, 393239, 0, 0, 393247, 0, 0, 393248, 0, 0, 458752, 0, 0, 458753, 0, 0, 458754, 0, 0, 458755, 0, 0, 458756, 0, 0, 458757, 0, 0, 458758, 0, 0, 458759, 0, 0, 458760, 0, 0, 458761, 0, 0, 458762, 0, 0, 458763, 0, 0, 458764, 0, 0, 458765, 0, 0, 458766, 0, 0, 458767, 0, 0, 458768, 0, 0, 458769, 0, 0, 458770, 0, 0, 458771, 0, 0, 458772, 0, 0, 458773, 0, 0, 458774, 0, 0, 458775, 0, 0, 458776, 0, 0, 458777, 0, 0, 458778, 0, 0, 458779, 0, 0, 458780, 0, 0, 458781, 0, 0, 458782, 0, 0, 458783, 0, 0, 458784, 0, 0, 458785, 0, 0, 458786, 0, 0, 458787, 0, 0, 458788, 0, 0, 458789, 0, 0, 458790, 0, 0, 458791, 0, 0, 458792, 0, 0, 458793, 0, 0, 458794, 0, 0, 458795, 0, 0, 458796, 0, 0, 458797, 0, 0, 458798, 0, 0, 458799, 0, 0, 458800, 0, 0, 458801, 0, 0, 458802, 0, 0, 458803, 0, 0, 458804, 0, 0, 458805, 0, 0, 458806, 0, 0, 458807, 0, 0, 458808, 0, 0, 458809, 0, 0, 458810, 0, 0, 458811, 0, 0, 458812, 0, 0, 458813, 0, 0, 458814, 0, 0, 458815, 0, 0, 458816, 0, 0, 458817, 0, 0, 458818, 0, 0, 458819, 0, 0, 458820, 0, 0, 458821, 0, 0, 458822, 0, 0, 458823, 0, 0, 458824, 0, 0, 458825, 0, 0, 458826, 0, 0, 458827, 0, 0, 458828, 0, 0, 458829, 0, 0, 458830, 0, 0, 458831, 0, 0, 458832, 0, 0, 458833, 0, 0, 458834, 0, 0, 458835, 0, 0, 458836, 0, 0, 458837, 0, 0, 458838, 0, 0, 524288, 0, 0, 524289, 0, 0, 524290, 0, 0, 524291, 0, 0, 524292, 0, 0, 524293, 0, 0, 524294, 0, 0, 524295, 0, 0, 524296, 0, 0, 524297, 0, 0, 524298, 0, 0, 524299, 0, 0, 524300, 0, 0, 524301, 0, 0, 524302, 0, 0, 524303, 0, 0, 524304, 0, 0, 524305, 0, 0, 524306, 0, 0, 524307, 0, 0, 524308, 0, 0, 524309, 0, 0, 524310, 0, 0, 524311, 0, 0, 524312, 0, 0, 524313, 0, 0, 524314, 0, 0, 524315, 0, 0, 524316, 0, 0, 524317, 0, 0, 524318, 0, 0, 524319, 0, 0, 524320, 0, 0, 524321, 0, 0, 524322, 0, 0, 524323, 0, 0, 524324, 0, 0, 524325, 0, 0, 524326, 0, 0, 524327, 0, 0, 524328, 0, 0, 524329, 0, 0, 524330, 0, 0, 524331, 0, 0, 524332, 0, 0, 524333, 0, 0, 524334, 0, 0, 524335, 0, 0, 524336, 0, 0, 524337, 0, 0, 524338, 0, 0, 524339, 0, 0, 524340, 0, 0, 524341, 0, 0, 524342, 0, 0, 524343, 0, 0, 524344, 0, 0, 524345, 0, 0, 524346, 0, 0, 524347, 0, 0, 524348, 0, 0, 524349, 0, 0, 524350, 0, 0, 524351, 0, 0, 524352, 0, 0, 524353, 0, 0, 524354, 0, 0, 524355, 0, 0, 524356, 0, 0, 524357, 0, 0, 524358, 0, 0, 524359, 0, 0, 524360, 0, 0, 524361, 0, 0, 524362, 0, 0, 524363, 0, 0, 524364, 0, 0, 524365, 0, 0, 524366, 0, 0, 524367, 0, 0, 524368, 0, 0, 524369, 0, 0, 524370, 0, 0, 524371, 0, 0, 524372, 0, 0, 524373, 0, 0, 524374, 0, 0, 589824, 0, 0, 589825, 0, 0, 589826, 0, 0, 589827, 0, 0, 589828, 0, 0, 589829, 0, 0, 589830, 0, 0, 589831, 0, 0, 589832, 0, 0, 589833, 0, 0, 589834, 0, 0, 589835, 0, 0, 589836, 0, 0, 589837, 0, 0, 589838, 0, 0, 589839, 0, 0, 589840, 0, 0, 589841, 0, 0, 589842, 0, 0, 589843, 0, 0, 589844, 0, 0, 589845, 0, 0, 589846, 0, 0, 589847, 0, 0, 589848, 0, 0, 589849, 0, 0, 589850, 0, 0, 589851, 0, 0, 589852, 0, 0, 589853, 0, 0, 589854, 0, 0, 589855, 0, 0, 589856, 0, 0, 589857, 0, 0, 589858, 0, 0, 589859, 0, 0, 589860, 0, 0, 589861, 0, 0, 589862, 0, 0, 589863, 0, 0, 589864, 0, 0, 589865, 0, 0, 589866, 0, 0, 589867, 0, 0, 589868, 0, 0, 589869, 0, 0, 589870, 0, 0, 589871, 0, 0, 589872, 0, 0, 589873, 0, 0, 589874, 0, 0, 589875, 0, 0, 589876, 0, 0, 589877, 0, 0, 589878, 0, 0, 589879, 0, 0, 589880, 0, 0, 589881, 0, 0, 589882, 0, 0, 589883, 0, 0, 589884, 0, 0, 589885, 0, 0, 589886, 0, 0, 589887, 0, 0, 589888, 0, 0, 589889, 0, 0, 589890, 0, 0, 589891, 0, 0, 589892, 0, 0, 589893, 0, 0, 589894, 0, 0, 589895, 0, 0, 589896, 0, 0, 589897, 0, 0, 589898, 0, 0, 589899, 0, 0, 589900, 0, 0, 589901, 0, 0, 589902, 0, 0, 589903, 0, 0, 589904, 0, 0, 589905, 0, 0, 589906, 0, 0, 589907, 0, 0, 589908, 0, 0, 589909, 0, 0, 589910, 0, 0 )
 
 [node name="Blobby" parent="." instance=ExtResource( 1 )]
-position = Vector2( 131, 560 )
+position = Vector2( 145.066, 551.48 )
 
 [node name="Camera2D" parent="Blobby" index="2"]
 limit_right = 85000
 
 [node name="CollisionShape2D" parent="Blobby/EnemyDetector" index="0"]
-position = Vector2( 0, -44 )
+position = Vector2( 0.187286, 0.0127563 )
+
+[node name="RightWallRaycast" parent="Blobby/WallRaycasts" index="1"]
+position = Vector2( 0.0715485, 0.00415039 )
 
 [node name="Enemy" parent="." instance=ExtResource( 3 )]
 position = Vector2( 2174, 560 )

src/Levels/Level03.tscn

@@ -1,13 +1,13 @@
 [gd_scene load_steps=9 format=2]
 
 [ext_resource path="res://src/Actor/Blobby.tscn" type="PackedScene" id=1]
-[ext_resource path="res://start-assets/tileset.tres" type="TileSet" id=2]
+[ext_resource path="res://assets/meta/tileset.tres" type="TileSet" id=2]
 [ext_resource path="res://src/Actor/Enemy.tscn" type="PackedScene" id=3]
-[ext_resource path="res://start-assets/background.png" type="Texture" id=4]
+[ext_resource path="res://assets/environment/background/background.png" type="Texture" id=4]
-[ext_resource path="res://src/Objects/Coin.tscn" type="PackedScene" id=5]
+[ext_resource path="res://src/Neutral Objects/Coin.tscn" type="PackedScene" id=5]
-[ext_resource path="res://src/UserInterface/UserInterface.tscn" type="PackedScene" id=6]
+[ext_resource path="res://src/UserInterface/Buttons/UserInterface.tscn" type="PackedScene" id=6]
-[ext_resource path="res://src/UserInterface/EndsScreen.tscn" type="PackedScene" id=7]
+[ext_resource path="res://src/UserInterface/Buttons/EndsScreen.tscn" type="PackedScene" id=7]
-[ext_resource path="res://src/Objects/Portal.tscn" type="PackedScene" id=8]
+[ext_resource path="res://src/Contraptions/Portal/Portal.tscn" type="PackedScene" id=8]
 
 [node name="Level03" type="Node2D"]
 
@@ -25,9 +25,6 @@ margin_right = -0.384033
 texture = ExtResource( 4 )
 expand = true
 stretch_mode = 1
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="TileMap" type="TileMap" parent="."]
 tile_set = ExtResource( 2 )
@@ -40,8 +37,11 @@ tile_data = PoolIntArray( -1048576, 0, 0, -1048564, 0, 0, -983040, 0, 0, -983028
 [node name="Blobby" parent="." instance=ExtResource( 1 )]
 position = Vector2( 131, 560 )
 
-[node name="CollisionShape2D" parent="Blobby" index="1"]
+[node name="Player" parent="Blobby" index="0"]
-position = Vector2( 0.224487, -32.0436 )
+position = Vector2( -0.476822, -29.8424 )
+
+[node name="CollisionPolygon2D" parent="Blobby" index="1"]
+position = Vector2( -1.16798, -29.1162 )
 
 [node name="Camera2D" parent="Blobby" index="2"]
 position = Vector2( 390.714, -75 )
@@ -49,8 +49,6 @@ limit_top = -10000
 limit_right = 1040
 limit_bottom = 700
 drag_margin_h_enabled = false
-smoothing_enabled = false
-editor_draw_limits = true
 
 [node name="EnemyDetector" parent="Blobby" index="3"]
 position = Vector2( 14.6832, -44.0497 )
@@ -58,6 +56,15 @@ position = Vector2( 14.6832, -44.0497 )
 [node name="CollisionShape2D" parent="Blobby/EnemyDetector" index="0"]
 position = Vector2( -15.3507, 14.3845 )
 
+[node name="StateLabel" parent="Blobby" index="5"]
+margin_left = -38.6708
+margin_top = -73.3364
+margin_right = 48.3292
+margin_bottom = -59.3364
+
+[node name="WallRaycasts" parent="Blobby" index="6"]
+position = Vector2( -0.589935, -29.85 )
+
 [node name="Enemy" parent="." instance=ExtResource( 3 )]
 position = Vector2( 715.5, 560 )
 
@@ -78,5 +85,4 @@ position = Vector2( 130.332, -461.479 )
 next_scene = ExtResource( 7 )
 
 [editable path="Blobby"]
-
 [editable path="Coin"]

src/Levels/LevelTemplate.tscn

@@ -1,14 +1,14 @@
 [gd_scene load_steps=13 format=2]
 
 [ext_resource path="res://src/Actor/Blobby.tscn" type="PackedScene" id=1]
-[ext_resource path="res://start-assets/tileset.png" type="Texture" id=2]
+[ext_resource path="res://assets/meta/tileset.png" type="Texture" id=2]
 [ext_resource path="res://src/Actor/Enemy.tscn" type="PackedScene" id=3]
-[ext_resource path="res://start-assets/background.png" type="Texture" id=4]
+[ext_resource path="res://assets/environment/background/background.png" type="Texture" id=4]
-[ext_resource path="res://src/Objects/Coin.tscn" type="PackedScene" id=5]
+[ext_resource path="res://src/Neutral Objects/Coin.tscn" type="PackedScene" id=5]
-[ext_resource path="res://src/UserInterface/UserInterface.tscn" type="PackedScene" id=6]
+[ext_resource path="res://src/UserInterface/Buttons/UserInterface.tscn" type="PackedScene" id=6]
-[ext_resource path="res://src/Objects/Portal.tscn" type="PackedScene" id=7]
+[ext_resource path="res://src/Contraptions/Portal/Portal.tscn" type="PackedScene" id=7]
-[ext_resource path="res://src/UserInterface/EndsScreen.tscn" type="PackedScene" id=8]
+[ext_resource path="res://src/UserInterface/Buttons/EndsScreen.tscn" type="PackedScene" id=8]
-[ext_resource path="res://start-assets/tileset.tres" type="TileSet" id=9]
+[ext_resource path="res://assets/meta/tileset.tres" type="TileSet" id=9]
 
 [sub_resource type="ConvexPolygonShape2D" id=1]
 points = PoolVector2Array( 0, 0, 80, 0, 80, 80, 0, 80 )

src/Levels/Plattforms Level.tscn

@@ -0,0 +1,92 @@
+[gd_scene load_steps=11 format=2]
+
+[ext_resource path="res://src/Actor/Blobby.tscn" type="PackedScene" id=1]
+[ext_resource path="res://assets/environment/blocks/Basic stone block.png" type="Texture" id=2]
+[ext_resource path="res://src/Levels/StaticBody2D.gd" type="Script" id=3]
+[ext_resource path="res://assets/environment/background/background.png" type="Texture" id=4]
+[ext_resource path="res://src/Actor/Camera2D.gd" type="Script" id=5]
+
+[sub_resource type="NavigationPolygon" id=1]
+vertices = PoolVector2Array( 16, 16, 0, 16, 0, 0, 16, 0 )
+polygons = [ PoolIntArray( 0, 1, 2, 3 ) ]
+
+[sub_resource type="OccluderPolygon2D" id=2]
+polygon = PoolVector2Array( 16, 16, 0, 16, 0, 0, 16, 0 )
+
+[sub_resource type="ConvexPolygonShape2D" id=3]
+points = PoolVector2Array( 16, 16, 0, 16, 0, 0, 16, 0 )
+
+[sub_resource type="TileSet" id=4]
+0/name = "Basic stone block.png 0"
+0/texture = ExtResource( 2 )
+0/tex_offset = Vector2( 0, 0 )
+0/modulate = Color( 1, 1, 1, 1 )
+0/region = Rect2( 0, 0, 16, 16 )
+0/tile_mode = 0
+0/occluder_offset = Vector2( 0, 0 )
+0/occluder = SubResource( 2 )
+0/navigation_offset = Vector2( 0, 0 )
+0/navigation = SubResource( 1 )
+0/shape_offset = Vector2( 0, 0 )
+0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+0/shape = SubResource( 3 )
+0/shape_one_way = false
+0/shape_one_way_margin = 1.0
+0/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 3 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
+0/z_index = 0
+
+[sub_resource type="RectangleShape2D" id=5]
+extents = Vector2( 190, 8 )
+
+[node name="LevelTemplate" type="Node2D"]
+__meta__ = {
+"_edit_horizontal_guides_": [ 464.0 ],
+"_edit_vertical_guides_": [ 2880.0 ]
+}
+
+[node name="Blobby" parent="." instance=ExtResource( 1 )]
+position = Vector2( 50.7867, 604.063 )
+
+[node name="CanvasLayer" type="CanvasLayer" parent="."]
+layer = -1
+script = ExtResource( 5 )
+
+[node name="background" type="TextureRect" parent="CanvasLayer"]
+margin_right = 426.667
+margin_bottom = 240.0
+texture = ExtResource( 4 )
+expand = true
+stretch_mode = 1
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="TileMap" type="TileMap" parent="."]
+tile_set = SubResource( 4 )
+cell_size = Vector2( 16, 16 )
+cell_quadrant_size = 32
+cell_custom_transform = Transform2D( 16, 0, 0, 16, 0, 0 )
+collision_layer = 8
+collision_mask = 2147483648
+format = 1
+tile_data = PoolIntArray( 0, 0, 0, 1, 0, 0, 2, 0, 0, 3, 0, 0, 4, 0, 0, 5, 0, 0, 6, 0, 0, 7, 0, 0, 8, 0, 0, 9, 0, 0, 10, 0, 0, 11, 0, 0, 12, 0, 0, 13, 0, 0, 14, 0, 0, 15, 0, 0, 16, 0, 0, 17, 0, 0, 18, 0, 0, 19, 0, 0, 20, 0, 0, 21, 0, 0, 22, 0, 0, 23, 0, 0, 24, 0, 0, 25, 0, 0, 26, 0, 0, 27, 0, 0, 28, 0, 0, 29, 0, 0, 30, 0, 0, 31, 0, 0, 32, 0, 0, 33, 0, 0, 34, 0, 0, 35, 0, 0, 36, 0, 0, 37, 0, 0, 38, 0, 0, 39, 0, 0, 40, 0, 0, 41, 0, 0, 42, 0, 0, 43, 0, 0, 44, 0, 0, 45, 0, 0, 46, 0, 0, 47, 0, 0, 48, 0, 0, 49, 0, 0, 50, 0, 0, 51, 0, 0, 52, 0, 0, 53, 0, 0, 54, 0, 0, 55, 0, 0, 56, 0, 0, 57, 0, 0, 58, 0, 0, 59, 0, 0, 60, 0, 0, 65536, 0, 0, 65596, 0, 0, 131072, 0, 0, 131132, 0, 0, 196608, 0, 0, 196668, 0, 0, 262144, 0, 0, 262204, 0, 0, 327680, 0, 0, 327740, 0, 0, 393216, 0, 0, 393276, 0, 0, 458752, 0, 0, 458812, 0, 0, 524288, 0, 0, 524348, 0, 0, 589824, 0, 0, 589884, 0, 0, 655360, 0, 0, 655420, 0, 0, 720896, 0, 0, 720956, 0, 0, 786432, 0, 0, 786492, 0, 0, 851968, 0, 0, 852028, 0, 0, 917504, 0, 0, 917564, 0, 0, 983040, 0, 0, 983100, 0, 0, 1048576, 0, 0, 1048636, 0, 0, 1114112, 0, 0, 1114172, 0, 0, 1179648, 0, 0, 1179708, 0, 0, 1245184, 0, 0, 1245244, 0, 0, 1310720, 0, 0, 1310780, 0, 0, 1376256, 0, 0, 1376316, 0, 0, 1441792, 0, 0, 1441852, 0, 0, 1507328, 0, 0, 1507388, 0, 0, 1572864, 0, 0, 1572924, 0, 0, 1638400, 0, 0, 1638460, 0, 0, 1703936, 0, 0, 1703996, 0, 0, 1769472, 0, 0, 1769532, 0, 0, 1835008, 0, 0, 1835068, 0, 0, 1900544, 0, 0, 1900604, 0, 0, 1966080, 0, 0, 1966140, 0, 0, 2031616, 0, 0, 2031676, 0, 0, 2097152, 0, 0, 2097212, 0, 0, 2162688, 0, 0, 2162748, 0, 0, 2228224, 0, 0, 2228284, 0, 0, 2293760, 0, 0, 2293820, 0, 0, 2359296, 0, 0, 2359356, 0, 0, 2424832, 0, 0, 2424892, 0, 0, 2490368, 0, 0, 2490428, 0, 0, 2555904, 0, 0, 2555905, 0, 0, 2555906, 0, 0, 2555907, 0, 0, 2555908, 0, 0, 2555909, 0, 0, 2555910, 0, 0, 2555911, 0, 0, 2555912, 0, 0, 2555913, 0, 0, 2555914, 0, 0, 2555915, 0, 0, 2555916, 0, 0, 2555917, 0, 0, 2555918, 0, 0, 2555919, 0, 0, 2555920, 0, 0, 2555921, 0, 0, 2555922, 0, 0, 2555923, 0, 0, 2555924, 0, 0, 2555925, 0, 0, 2555926, 0, 0, 2555927, 0, 0, 2555928, 0, 0, 2555929, 0, 0, 2555930, 0, 0, 2555931, 0, 0, 2555932, 0, 0, 2555933, 0, 0, 2555934, 0, 0, 2555935, 0, 0, 2555936, 0, 0, 2555937, 0, 0, 2555938, 0, 0, 2555939, 0, 0, 2555940, 0, 0, 2555941, 0, 0, 2555942, 0, 0, 2555943, 0, 0, 2555944, 0, 0, 2555945, 0, 0, 2555946, 0, 0, 2555947, 0, 0, 2555948, 0, 0, 2555949, 0, 0, 2555950, 0, 0, 2555951, 0, 0, 2555952, 0, 0, 2555953, 0, 0, 2555954, 0, 0, 2555955, 0, 0, 2555956, 0, 0, 2555957, 0, 0, 2555958, 0, 0, 2555959, 0, 0, 2555960, 0, 0, 2555961, 0, 0, 2555962, 0, 0, 2555963, 0, 0, 2555964, 0, 0 )
+
+[node name="StaticBody2D" type="StaticBody2D" parent="."]
+script = ExtResource( 3 )
+
+[node name="Tween" type="Tween" parent="StaticBody2D"]
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D"]
+position = Vector2( 413.838, 598.422 )
+shape = SubResource( 5 )
+
+[node name="Sprite" type="Sprite" parent="StaticBody2D/CollisionShape2D"]
+position = Vector2( -0.0883788, 0 )
+scale = Vector2( 23.7344, 1 )
+texture = ExtResource( 2 )

src/Levels/StaticBody2D.gd

@@ -0,0 +1,16 @@
+extends StaticBody2D
+
+
+# Declare member variables here. Examples:
+# var a: int = 2
+# var b: String = "text"
+
+
+# Called when the node enters the scene tree for the first time.
+func _ready() -> void:
+	pass # Replace with function body.
+
+
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+#func _process(delta: float) -> void:
+#	pass

src/Levels/Tween.gd

@@ -0,0 +1,16 @@
+extends Tween
+
+
+# Declare member variables here. Examples:
+# var a: int = 2
+# var b: String = "text"
+
+
+# Called when the node enters the scene tree for the first time.
+func _ready() -> void:
+	pass # Replace with function body.
+
+
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+#func _process(delta: float) -> void:
+#	pass

src/Neutral Objects/Coin.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=6 format=2]
 
-[ext_resource path="res://start-assets/coin.png" type="Texture" id=1]
+[ext_resource path="res://assets/neutral object/coin.png" type="Texture" id=1]
-[ext_resource path="res://src/Objects/Coin.gd" type="Script" id=2]
+[ext_resource path="res://src/Neutral Objects/Coin.gd" type="Script" id=2]
 
 [sub_resource type="CircleShape2D" id=1]
 radius = 34.0147

src/UserInterface/Buttons/ChangeSceneButton.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://src/UserInterface/PlayButton.gd" type="Script" id=1]
+[ext_resource path="res://src/UserInterface/Buttons/PlayButton.gd" type="Script" id=1]
 
 [node name="ChangeSceneButton" type="Button"]
 margin_right = 139.0
@@ -8,7 +8,5 @@ margin_bottom = 78.0
 size_flags_vertical = 3
 text = "Begin"
 script = ExtResource( 1 )
-__meta__ = {
+
-"_edit_use_anchors_": false
-}
 [connection signal="button_up" from="." to="." method="_on_button_up"]

src/UserInterface/Buttons/EndsScreen.tscn

@@ -1,13 +1,14 @@
 [gd_scene load_steps=9 format=2]
 
-[ext_resource path="res://start-assets/background.png" type="Texture" id=1]
+[ext_resource path="res://assets/environment/background/background.png" type="Texture" id=1]
-[ext_resource path="res://src/UserInterface/ChangeSceneButton.tscn" type="PackedScene" id=2]
+[ext_resource path="res://src/UserInterface/Buttons/ChangeSceneButton.tscn" type="PackedScene" id=2]
-[ext_resource path="res://src/UserInterface/QuitButton.tscn" type="PackedScene" id=3]
+[ext_resource path="res://src/UserInterface/Buttons/QuitButton.tscn" type="PackedScene" id=3]
-[ext_resource path="res://src/UserInterface/StatsLabel.tscn" type="PackedScene" id=4]
+[ext_resource path="res://src/UserInterface/Buttons/StatsLabel.tscn" type="PackedScene" id=4]
-[ext_resource path="res://src/UserInterface/StatsLabel.gd" type="Script" id=5]
+[ext_resource path="res://src/UserInterface/Buttons/StatsLabel.gd" type="Script" id=5]
-[ext_resource path="res://start-assets/ui_theme.tres" type="Theme" id=6]
+[ext_resource path="res://assets/meta/ui_theme.tres" type="Theme" id=6]
-[ext_resource path="res://src/UserInterface/Titel.tscn" type="PackedScene" id=7]
+[ext_resource path="res://src/UserInterface/Buttons/Titel.tscn" type="PackedScene" id=7]
-[ext_resource path="res://start-assets/new_dynamicfont.tres" type="DynamicFont" id=8]
+[ext_resource path="res://assets/meta/new_dynamicfont.tres" type="DynamicFont" id=8]
+
 
 [node name="EndScreen" type="Control"]
 anchor_right = 1.0

src/UserInterface/Buttons/QuitButton.tscn

@@ -1,6 +1,7 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://src/UserInterface/QuitButton.gd" type="Script" id=1]
+[ext_resource path="res://src/UserInterface/Buttons/QuitButton.gd" type="Script" id=1]
+
 
 [node name="QuitButton" type="Button"]
 anchor_left = 0.5

src/UserInterface/Buttons/RetryButton.tscn

@@ -1,6 +1,7 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://src/UserInterface/RetryButton.gd" type="Script" id=1]
+[ext_resource path="res://src/UserInterface/Buttons/RetryButton.gd" type="Script" id=1]
+
 
 [node name="RetryButton" type="Button"]
 margin_right = 139.0

src/UserInterface/Buttons/StatsLabel.tscn

@@ -1,6 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://start-assets/montserrat_extrabold.otf" type="DynamicFontData" id=1]
+[ext_resource path="res://assets/meta/montserrat_extrabold.otf" type="DynamicFontData" id=1]
+
 
 [sub_resource type="DynamicFont" id=1]
 size = 24

src/UserInterface/Buttons/Titel.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://start-assets/montserrat_extrabold.otf" type="DynamicFontData" id=1]
+[ext_resource path="res://assets/meta/montserrat_extrabold.otf" type="DynamicFontData" id=1]
 
 [sub_resource type="DynamicFont" id=1]
 size = 69
@@ -16,6 +16,3 @@ custom_fonts/font = SubResource( 1 )
 text = "Title"
 align = 1
 valign = 1
-__meta__ = {
-"_edit_use_anchors_": false
-}

src/UserInterface/Buttons/UserInterface.tscn

@@ -1,10 +1,10 @@
 [gd_scene load_steps=6 format=2]
 
-[ext_resource path="res://start-assets/ui_theme.tres" type="Theme" id=1]
+[ext_resource path="res://assets/meta/ui_theme.tres" type="Theme" id=1]
-[ext_resource path="res://src/UserInterface/QuitButton.tscn" type="PackedScene" id=2]
+[ext_resource path="res://src/UserInterface/Buttons/QuitButton.tscn" type="PackedScene" id=2]
-[ext_resource path="res://src/UserInterface/ChangeSceneButton.tscn" type="PackedScene" id=3]
+[ext_resource path="res://src/UserInterface/Buttons/ChangeSceneButton.tscn" type="PackedScene" id=3]
-[ext_resource path="res://src/UserInterface/RetryButton.tscn" type="PackedScene" id=4]
+[ext_resource path="res://src/UserInterface/Buttons/RetryButton.tscn" type="PackedScene" id=4]
-[ext_resource path="res://src/UserInterface/UserInterface.gd" type="Script" id=5]
+[ext_resource path="res://src/UserInterface/Buttons/UserInterface.gd" type="Script" id=5]
 
 [node name="UserInterface" type="Control"]
 pause_mode = 2

src/UserInterface/Screens/MainScreen.tscn

@@ -1,10 +1,10 @@
 [gd_scene load_steps=6 format=2]
 
-[ext_resource path="res://src/UserInterface/QuitButton.tscn" type="PackedScene" id=1]
+[ext_resource path="res://src/UserInterface/Buttons/QuitButton.tscn" type="PackedScene" id=1]
-[ext_resource path="res://src/UserInterface/Titel.tscn" type="PackedScene" id=2]
+[ext_resource path="res://src/UserInterface/Buttons/Titel.tscn" type="PackedScene" id=2]
-[ext_resource path="res://src/UserInterface/ChangeSceneButton.tscn" type="PackedScene" id=3]
+[ext_resource path="res://src/UserInterface/Buttons/ChangeSceneButton.tscn" type="PackedScene" id=3]
-[ext_resource path="res://start-assets/background.png" type="Texture" id=4]
+[ext_resource path="res://assets/environment/background/background.png" type="Texture" id=4]
-[ext_resource path="res://start-assets/ui_theme.tres" type="Theme" id=5]
+[ext_resource path="res://assets/meta/ui_theme.tres" type="Theme" id=5]
 
 [node name="MainScreen" type="Control"]
 anchor_right = 1.0
@@ -12,17 +12,11 @@ anchor_bottom = 1.0
 margin_right = -1493.33
 margin_bottom = -840.0
 theme = ExtResource( 5 )
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="ViewportContainer" type="ViewportContainer" parent="."]
 margin_right = 426.667
 margin_bottom = 240.0
 stretch = true
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="background" type="TextureRect" parent="ViewportContainer"]
 anchor_right = 1.0
@@ -43,7 +37,7 @@ margin_bottom = 85.0
 grow_horizontal = 2
 size_flags_horizontal = 2
 size_flags_vertical = 2
-text = "poṣa"
+text = "Very Bad Game"
 
 [node name="MenuContainer" type="VBoxContainer" parent="ViewportContainer"]
 anchor_left = 0.5
@@ -60,7 +54,7 @@ __meta__ = {
 [node name="PlayButton" parent="ViewportContainer/MenuContainer" instance=ExtResource( 3 )]
 margin_right = 97.0
 margin_bottom = 38.0
-next_scene_path = "res://src/Levels/ApproxLevel.tscn"
+next_scene_path = "res://src/Levels/Simple Level.tscn"
 
 [node name="QuitButton" parent="ViewportContainer/MenuContainer" instance=ExtResource( 1 )]
 anchor_left = 0.0