Level Cleanup, new basic alien ship tiles

assets/environment/blocks/Alien-ship1-Edge-Unanimated.png.import

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

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

src/Actors/Blobby/Blobby.tscn

@@ -270,7 +270,7 @@ states/jumpToFall/position = Vector2( 1795.54, 311.009 )
 states/jumping/node = SubResource( 125 )
 states/jumping/position = Vector2( 1375.54, 129.009 )
 states/runToJump/node = SubResource( 146 )
-states/runToJump/position = Vector2( 1258.54, 27 )
+states/runToJump/position = Vector2( 1191.54, 36 )
 states/running/node = SubResource( 122 )
 states/running/position = Vector2( 2266.54, -54 )
 states/turnToRun/node = SubResource( 130 )
@@ -283,7 +283,7 @@ states/wallsliding/node = SubResource( 96 )
 states/wallsliding/position = Vector2( 1788.54, 501.009 )
 transitions = [ "falling", "wallsliding", SubResource( 138 ), "wallsliding", "idling", SubResource( 139 ), "wallsliding", "wallslideToJump", SubResource( 140 ), "wallslideToJump", "jumping", SubResource( 141 ), "idling", "jumping", SubResource( 147 ), "runToJump", "jumping", SubResource( 148 ), "ducking", "jumping", SubResource( 149 ), "jumping", "jumpToFall", SubResource( 150 ), "jumpToFall", "falling", SubResource( 151 ), "ducking", "duckTurn", SubResource( 152 ), "duckTurn", "ducking", SubResource( 153 ), "falling", "ducking", SubResource( 154 ), "ducking", "falling", SubResource( 155 ), "ducking", "walking", SubResource( 156 ), "walking", "ducking", SubResource( 157 ), "idling", "ducking", SubResource( 158 ), "ducking", "idling", SubResource( 159 ), "ducking", "running", SubResource( 160 ), "running", "ducking", SubResource( 161 ), "running", "falling", SubResource( 162 ), "falling", "running", SubResource( 163 ), "walking", "falling", SubResource( 164 ), "falling", "walking", SubResource( 165 ), "falling", "idling", SubResource( 166 ), "idling", "walking", SubResource( 167 ), "walking", "idling", SubResource( 168 ), "walking", "turnToRun", SubResource( 169 ), "turnToRun", "walking", SubResource( 170 ), "running", "turnToRun", SubResource( 171 ), "turnToRun", "running", SubResource( 172 ), "idling", "idleTurn", SubResource( 173 ), "walking", "idleTurn", SubResource( 174 ), "idleTurn", "walking", SubResource( 175 ), "idling", "turnToRun", SubResource( 176 ), "turnToRun", "idling", SubResource( 177 ), "running", "runToJump", SubResource( 178 ), "wallsliding", "falling", SubResource( 137 ) ]
 start_node = "idling"
-graph_offset = Vector2( 1038.54, -170.991 )
+graph_offset = Vector2( 996.54, -125.991 )
 
 [sub_resource type="AnimationNodeStateMachinePlayback" id=48]
 
@@ -3678,7 +3678,7 @@ tracks/11/keys = {
 }
 
 [sub_resource type="Animation" id=73]
-length = 0.3
+length = 0.2
 loop = true
 tracks/0/type = "value"
 tracks/0/path = NodePath(".:frame")
@@ -3827,7 +3827,7 @@ tracks/11/keys = {
 
 [sub_resource type="Animation" id=101]
 resource_name = "wallslideToJumpRight"
-length = 0.3
+length = 0.2
 loop = true
 tracks/0/type = "value"
 tracks/0/path = NodePath(".:frame")
@@ -4396,6 +4396,9 @@ tracks/2/keys = {
 collision_mask = 120
 collision/safe_margin = 0.001
 script = ExtResource( 4 )
+__meta__ = {
+"_edit_vertical_guides_": [ -22.4902 ]
+}
 
 [node name="BlobbySkin" type="Area2D" parent="." groups=["player"]]
 process_priority = -1
@@ -4430,10 +4433,10 @@ parameters/idling/blend_position = 1.0
 parameters/jumpToFall/blend_position = 1.0
 parameters/jumping/blend_position = 1.0
 parameters/runToJump/blend_position = 1.0
-parameters/running/blend_position = 1.0
+parameters/running/blend_position = 1.00239
 parameters/turnToRun/blend_position = 1.0
 parameters/walking/blend_position = 1.0
-parameters/wallslideToJump/blend_position = -0.994131
+parameters/wallslideToJump/blend_position = -0.178815
 parameters/wallsliding/blend_position = 1.0
 
 [node name="BlobbymationPlayer" type="AnimationPlayer" parent="BlobbySprite"]

src/Contraptions/Portal/Portal.tscn

@@ -5,8 +5,8 @@
 [ext_resource path="res://src/UserInterface/Screens/LevelEndScreen.tscn" type="PackedScene" id=3]
 
 [sub_resource type="CapsuleShape2D" id=1]
-radius = 39.0
+radius = 22.1169
-height = 2.0
+height = 22.4675
 
 [sub_resource type="Animation" id=2]
 resource_name = "Start"
@@ -69,12 +69,11 @@ script = ExtResource( 2 )
 next_scene = ExtResource( 3 )
 
 [node name="portal" type="Sprite" parent="."]
-position = Vector2( -1.90735e-06, -65 )
+scale = Vector2( 0.1, 0.1 )
-scale = Vector2( 0.673913, 0.400498 )
 texture = ExtResource( 1 )
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
-position = Vector2( 0, -63 )
+scale = Vector2( 0.3, 0.3 )
 shape = SubResource( 1 )
 
 [node name="TransitionLayer" type="CanvasLayer" parent="."]

src/Environment/AlienShipTileSet.tres

@@ -0,0 +1,94 @@
+[gd_resource type="TileSet" load_steps=8 format=2]
+
+[ext_resource path="res://assets/environment/blocks/Alien-ship1-Edge-Unanimated.png" type="Texture" id=1]
+[ext_resource path="res://assets/environment/blocks/Alien-ship1-innerPart-Unanimated.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]
+
+[sub_resource type="ConvexPolygonShape2D" id=7]
+points = PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 )
+
+[sub_resource type="ConvexPolygonShape2D" id=8]
+points = PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 )
+
+[sub_resource type="ConvexPolygonShape2D" id=9]
+points = PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 )
+
+[resource]
+0/name = "alienShip1EdgePartTile.tres 0"
+0/texture = ExtResource( 3 )
+0/tex_offset = Vector2( 0, 0 )
+0/modulate = Color( 1, 1, 1, 1 )
+0/region = Rect2( 0, 0, 24, 24 )
+0/tile_mode = 0
+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 = SubResource( 7 )
+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( 7 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
+0/z_index = 0
+1/name = "alienShip1InnerPart.tres 1"
+1/texture = ExtResource( 4 )
+1/tex_offset = Vector2( 0, 0 )
+1/modulate = Color( 1, 1, 1, 1 )
+1/region = Rect2( 0, 0, 24, 24 )
+1/tile_mode = 0
+1/occluder_offset = Vector2( 0, 0 )
+1/navigation_offset = Vector2( 0, 0 )
+1/shape_offset = Vector2( 0, 0 )
+1/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+1/shape_one_way = false
+1/shape_one_way_margin = 0.0
+1/shapes = [  ]
+1/z_index = 0
+2/name = "Alien-ship1-Edge-Unanimated.png 2"
+2/texture = ExtResource( 1 )
+2/tex_offset = Vector2( 0, 0 )
+2/modulate = Color( 1, 1, 1, 1 )
+2/region = Rect2( 0, 0, 24, 24 )
+2/tile_mode = 0
+2/occluder_offset = Vector2( 0, 0 )
+2/navigation_offset = Vector2( 0, 0 )
+2/shape_offset = Vector2( 0, 0 )
+2/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+2/shape = SubResource( 8 )
+2/shape_one_way = false
+2/shape_one_way_margin = 1.0
+2/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 8 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
+2/z_index = 0
+3/name = "Alien-ship1-innerPart-Unanimated.png 3"
+3/texture = ExtResource( 2 )
+3/tex_offset = Vector2( 0, 0 )
+3/modulate = Color( 1, 1, 1, 1 )
+3/region = Rect2( 0, 0, 24, 24 )
+3/tile_mode = 0
+3/occluder_offset = Vector2( 0, 0 )
+3/navigation_offset = Vector2( 0, 0 )
+3/shape_offset = Vector2( 0, 0 )
+3/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+3/shape = SubResource( 9 )
+3/shape_one_way = false
+3/shape_one_way_margin = 1.0
+3/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 9 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
+3/z_index = 0

src/Levels/TLT Level.tscn

@@ -1,38 +1,14 @@
 [gd_scene load_steps=8 format=2]
 
-[ext_resource path="res://assets/environment/blocks/alienShip1EdgePartTile/alienShip1EdgePartTile.tres" type="Texture" id=1]
+[ext_resource path="res://src/Environment/AlienShipTileSet.tres" type="TileSet" id=1]
 [ext_resource path="res://src/Actors/Blobby/Blobby.tscn" type="PackedScene" id=2]
+[ext_resource path="res://src/HarmfulObjects/Spikes.tscn" type="PackedScene" id=3]
 [ext_resource path="res://src/Contraptions/Platform/FlyingLaserCutter.tscn" type="PackedScene" id=4]
+[ext_resource path="res://src/Contraptions/Portal/Portal.tscn" type="PackedScene" id=5]
 [ext_resource path="res://src/UserInterface/Buttons/UI.tscn" type="PackedScene" id=7]
 
 [sub_resource type="AnimationNodeStateMachinePlayback" id=4]
 
-[sub_resource type="ConvexPolygonShape2D" id=7]
-points = PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 )
-
-[sub_resource type="TileSet" id=6]
-0/name = "alienShip1EdgePartTile.tres 0"
-0/texture = ExtResource( 1 )
-0/tex_offset = Vector2( 0, 0 )
-0/modulate = Color( 1, 1, 1, 1 )
-0/region = Rect2( 0, 0, 24, 24 )
-0/tile_mode = 0
-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 = SubResource( 7 )
-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( 7 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-} ]
-0/z_index = 0
-
 [node name="LevelTemplate" type="Node2D"]
 __meta__ = {
 "_edit_horizontal_guides_": [ 464.0 ],
@@ -42,7 +18,6 @@ __meta__ = {
 [node name="UserInterface" parent="." instance=ExtResource( 7 )]
 
 [node name="Blobby" parent="." instance=ExtResource( 2 )]
-position = Vector2( 64.3594, 373.246 )
 scale = Vector2( 0.878906, 0.936025 )
 
 [node name="AnimationTree" parent="Blobby/BlobbySprite" index="0"]
@@ -53,15 +28,38 @@ visible = false
 position = Vector2( 80, 80 )
 rotation = 1.5708
 
+[node name="Portal" parent="." instance=ExtResource( 5 )]
+position = Vector2( 1440, -120 )
+
 [node name="TileMap" type="TileMap" parent="."]
-tile_set = SubResource( 6 )
+tile_set = ExtResource( 1 )
 cell_size = Vector2( 24, 24 )
-cell_quadrant_size = 48
+cell_quadrant_size = 3
-cell_custom_transform = Transform2D( 0, 0, 0, 0, 0, 0 )
+cell_custom_transform = Transform2D( 24, 0, 0, 24, 0, 0 )
-collision_use_kinematic = true
 collision_layer = 8
 collision_mask = 8
 format = 1
-tile_data = PoolIntArray( 655360, 0, 0, 655361, 0, 0, 655362, 0, 0, 655363, 0, 0, 655364, 0, 0, 655365, 0, 0, 655366, 0, 0, 655367, 0, 0, 655368, 0, 0, 655369, 0, 0, 655370, 0, 0, 655371, 0, 0, 655372, 0, 0, 655373, 0, 0, 655374, 0, 0, 655375, 0, 0, 655376, 0, 0, 655377, 0, 0, 655378, 0, 0, 655379, 0, 0, 655380, 0, 0, 655381, 0, 0, 655382, 0, 0, 655383, 0, 0, 655384, 0, 0, 655385, 0, 0, 655386, 0, 0, 655387, 0, 0, 655388, 0, 0, 720896, 0, 0, 720924, 0, 0, 786432, 0, 0, 786460, 0, 0, 851968, 0, 0, 851996, 0, 0, 917504, 0, 0, 917532, 0, 0, 983040, 0, 0, 983068, 0, 0, 1048576, 0, 0, 1048577, 0, 0, 1048578, 0, 0, 1048579, 0, 0, 1048580, 0, 0, 1048581, 0, 0, 1048582, 0, 0, 1048583, 0, 0, 1048584, 0, 0, 1048585, 0, 0, 1048586, 0, 0, 1048587, 0, 0, 1048588, 0, 0, 1048589, 0, 0, 1048590, 0, 0, 1048591, 0, 0, 1048592, 0, 0, 1048593, 0, 0, 1048594, 0, 0, 1048595, 0, 0, 1048596, 0, 0, 1048597, 0, 0, 1048598, 0, 0, 1048599, 0, 0, 1048600, 0, 0, 1048601, 0, 0, 1048602, 0, 0, 1048603, 0, 0, 1048604, 0, 0 )
+tile_data = PoolIntArray( -589830, -1610612734, 0, -655299, 2, 0, -524294, -1610612734, 0, -589763, 2, 0, -458758, -1610612734, 0, -524227, 2, 0, -393222, -1610612734, 0, -458691, 2, 0, -327686, -1610612734, 0, -393155, 2, 0, -262150, -1610612734, 0, -327619, 2, 0, -196614, -1610612734, 0, -262088, 2, 0, -262087, 2, 0, -262086, 2, 0, -262085, 2, 0, -262084, 2, 0, -262083, 2, 0, -131078, -1610612734, 0, -196568, 2, 0, -196567, 2, 0, -196566, 2, 0, -196565, 2, 0, -196564, 2, 0, -196563, 2, 0, -196562, 2, 0, -196559, 2, 0, -196556, 2, 0, -196555, 2, 0, -196554, 2, 0, -196553, 2, 0, -196552, 2, 0, -196551, 2, 0, -196550, 2, 0, -196549, 2, 0, -196548, 2, 0, -196547, 2, 0, -65542, -1610612734, 0, -131064, 2, 0, -131063, 2, 0, -131059, 2, 0, -131058, 2, 0, -131054, 2, 0, -131053, 2, 0, -131052, 2, 0, -131051, 2, 0, -131032, 2, 0, -131026, 2, 0, -131020, 2, 0, -131019, 2, 0, -131018, 2, 0, -131017, 2, 0, -131016, 2, 0, -131015, 2, 0, -131014, 2, 0, -131013, 2, 0, -131012, 2, 0, -131011, 2, 0, -6, -1610612734, 0, -65532, 2, 0, -65531, 2, 0, -65530, 2, 0, -65529, 2, 0, -65526, 2, 0, -65519, 2, 0, -65514, 2, 0, -65501, 2, 0, -65500, 2, 0, -65499, 2, 0, -65498, 2, 0, -65497, 2, 0, -65496, 2, 0, -65490, 2, 0, -65489, 2, 0, -65488, 2, 0, -65487, 2, 0, -65486, 2, 0, -65485, 2, 0, -65484, 2, 0, -65483, 2, 0, -65482, 2, 0, -65481, 2, 0, -65480, 2, 0, -65479, 2, 0, -65478, 2, 0, -65477, 2, 0, -65476, 2, 0, -65475, 2, 0, 65530, 3, 0, 65531, 2, 0, 65532, 2, 0, 65533, 2, 0, 65534, 2, 0, 65535, 2, 0, 0, 2, 0, 1, 2, 0, 2, 2, 0, 3, 2, 0, 4, 2, 0, 10, 2, 0, 11, 2, 0, 12, 2, 0, 13, 2, 0, 14, 2, 0, 15, 2, 0, 16, 2, 0, 17, 2, 0, 22, 2, 0, 23, 2, 0, 24, 2, 0, 25, 2, 0, 26, 2, 0, 27, 2, 0, 30, 2, 0, 31, 2, 0, 32, 2, 0, 33, 2, 0, 34, 2, 0, 35, 2, 0 )
+
+[node name="Spikes" parent="TileMap" instance=ExtResource( 3 )]
+position = Vector2( 708, 12 )
+
+[node name="Spikes2" parent="TileMap" instance=ExtResource( 3 )]
+position = Vector2( 1140, -36 )
+
+[node name="Spikes4" parent="TileMap" instance=ExtResource( 3 )]
+position = Vector2( 1164, -36 )
+
+[node name="Spikes5" parent="TileMap" instance=ExtResource( 3 )]
+position = Vector2( 1188, -36 )
+
+[node name="Spikes6" parent="TileMap" instance=ExtResource( 3 )]
+position = Vector2( 1212, -36 )
+
+[node name="Spikes7" parent="TileMap" instance=ExtResource( 3 )]
+position = Vector2( 1236, -36 )
+
+[node name="Spikes3" parent="TileMap" instance=ExtResource( 3 )]
+position = Vector2( 684, 12 )
 
 [editable path="Blobby"]