diff --git a/.vscode/launch.json b/.vscode/launch.json index 90a4365..6328e81 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -8,7 +8,7 @@ "name": "GDScript Godot", "type": "godot", "request": "launch", - "project": "C:\\Users\\Jakob\\Documents\\Godot\\Wumper", + "project": "C:\\Users\\Jakob\\Documents\\Godot\\Blobby", "port": 6007, "address": "127.0.0.1", "launch_game_instance": true, diff --git a/assets/environment/decor/Beispiel-Busch.aseprite.import b/assets/environment/decor/Beispiel-Busch.aseprite.import deleted file mode 100644 index 78ef18b..0000000 --- a/assets/environment/decor/Beispiel-Busch.aseprite.import +++ /dev/null @@ -1,26 +0,0 @@ -[remap] - -importer="aseprite.wizard.plugin" -type="SpriteFrames" -path="res://.import/Beispiel-Busch.aseprite-e4b7724fea18978e42f11f3729f9d1a8.res" - -[deps] - -source_file="res://assets/environment/decor/Beispiel-Busch.aseprite" -dest_files=[ "res://.import/Beispiel-Busch.aseprite-e4b7724fea18978e42f11f3729f9d1a8.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/environment/decor/bent_straw.aseprite.import b/assets/environment/decor/bent_straw.aseprite.import deleted file mode 100644 index 23e9ee4..0000000 --- a/assets/environment/decor/bent_straw.aseprite.import +++ /dev/null @@ -1,26 +0,0 @@ -[remap] - -importer="aseprite.wizard.plugin" -type="SpriteFrames" -path="res://.import/bent_straw.aseprite-e42038488046e460e799823506d46bb8.res" - -[deps] - -source_file="res://assets/environment/decor/bent_straw.aseprite" -dest_files=[ "res://.import/bent_straw.aseprite-e42038488046e460e799823506d46bb8.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/environment/decor/bent_straw.png b/assets/environment/decor/bent_straw.png index 3bd5bba..c8ff896 100644 Binary files a/assets/environment/decor/bent_straw.png and b/assets/environment/decor/bent_straw.png differ diff --git a/assets/environment/decor/bent_straw_2.aseprite.import b/assets/environment/decor/bent_straw_2.aseprite.import deleted file mode 100644 index cc7afdf..0000000 --- a/assets/environment/decor/bent_straw_2.aseprite.import +++ /dev/null @@ -1,26 +0,0 @@ -[remap] - -importer="aseprite.wizard.plugin" -type="SpriteFrames" -path="res://.import/bent_straw_2.aseprite-533c943446b43f78ec49a9f7e64d2cbb.res" - -[deps] - -source_file="res://assets/environment/decor/bent_straw_2.aseprite" -dest_files=[ "res://.import/bent_straw_2.aseprite-533c943446b43f78ec49a9f7e64d2cbb.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/environment/decor/bent_straw_2.png b/assets/environment/decor/bent_straw_2.png new file mode 100644 index 0000000..893cee3 Binary files /dev/null and b/assets/environment/decor/bent_straw_2.png differ diff --git a/assets/environment/decor/bent_straw_2.png.import b/assets/environment/decor/bent_straw_2.png.import new file mode 100644 index 0000000..3559a64 --- /dev/null +++ b/assets/environment/decor/bent_straw_2.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/bent_straw_2.png-06cf9f311cb17db2aaae1e44b39a93f4.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/environment/decor/bent_straw_2.png" +dest_files=[ "res://.import/bent_straw_2.png-06cf9f311cb17db2aaae1e44b39a93f4.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/environment/decor/bent_straw_left_2.png b/assets/environment/decor/bent_straw_left_2.png new file mode 100644 index 0000000..3753c57 Binary files /dev/null and b/assets/environment/decor/bent_straw_left_2.png differ diff --git a/assets/environment/decor/bent_straw_left_2.png.import b/assets/environment/decor/bent_straw_left_2.png.import new file mode 100644 index 0000000..5cc1c84 --- /dev/null +++ b/assets/environment/decor/bent_straw_left_2.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/bent_straw_left_2.png-fdd66b1aa4d5827c3bd59fde835cf245.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/environment/decor/bent_straw_left_2.png" +dest_files=[ "res://.import/bent_straw_left_2.png-fdd66b1aa4d5827c3bd59fde835cf245.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/environment/decor/bent_straw_leftt.png b/assets/environment/decor/bent_straw_leftt.png new file mode 100644 index 0000000..6cf4c11 Binary files /dev/null and b/assets/environment/decor/bent_straw_leftt.png differ diff --git a/assets/environment/decor/bent_straw_leftt.png.import b/assets/environment/decor/bent_straw_leftt.png.import new file mode 100644 index 0000000..ef177ca --- /dev/null +++ b/assets/environment/decor/bent_straw_leftt.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/bent_straw_leftt.png-cd64eb7293fffda2fa93cf3eca0198bb.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/environment/decor/bent_straw_leftt.png" +dest_files=[ "res://.import/bent_straw_leftt.png-cd64eb7293fffda2fa93cf3eca0198bb.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/environment/decor/short_straw.aseprite.import b/assets/environment/decor/short_straw.aseprite.import deleted file mode 100644 index c41bef8..0000000 --- a/assets/environment/decor/short_straw.aseprite.import +++ /dev/null @@ -1,26 +0,0 @@ -[remap] - -importer="aseprite.wizard.plugin" -type="SpriteFrames" -path="res://.import/short_straw.aseprite-dc5d8347b9d6d5e161cbd2f672a5b8c7.res" - -[deps] - -source_file="res://assets/environment/decor/short_straw.aseprite" -dest_files=[ "res://.import/short_straw.aseprite-dc5d8347b9d6d5e161cbd2f672a5b8c7.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/environment/decor/short_straw.png b/assets/environment/decor/short_straw.png index ac1b640..67aadb6 100644 Binary files a/assets/environment/decor/short_straw.png and b/assets/environment/decor/short_straw.png differ diff --git a/assets/environment/decor/straight_straw.aseprite.import b/assets/environment/decor/straight_straw.aseprite.import deleted file mode 100644 index 5a0c443..0000000 --- a/assets/environment/decor/straight_straw.aseprite.import +++ /dev/null @@ -1,26 +0,0 @@ -[remap] - -importer="aseprite.wizard.plugin" -type="SpriteFrames" -path="res://.import/straight_straw.aseprite-95acb695229b4f32fa48786e91411e1d.res" - -[deps] - -source_file="res://assets/environment/decor/straight_straw.aseprite" -dest_files=[ "res://.import/straight_straw.aseprite-95acb695229b4f32fa48786e91411e1d.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/environment/decor/straight_straw.png b/assets/environment/decor/straight_straw.png index 8240ce5..2fe9922 100644 Binary files a/assets/environment/decor/straight_straw.png and b/assets/environment/decor/straight_straw.png differ diff --git a/src/Actors/Blobby/Blobby.gd b/src/Actors/Blobby/Blobby.gd index b10d20f..8650d20 100644 --- a/src/Actors/Blobby/Blobby.gd +++ b/src/Actors/Blobby/Blobby.gd @@ -385,12 +385,11 @@ func execute_movement() -> void: rotation = calculate_slope_rotation(onfloor) # rotate related to floor slope # Convert velocity back to local space. - velocity = velocity.rotated(-floor_rot*1.1) if snap_possible else velocity + # TODO: Downward velocity should be increased by gravity + velocity = velocity.rotated(-floor_rot) if snap_possible else velocity func calculate_slope_rotation(onfloor: bool) -> float: var angle = 0 - # var distance_to_slope_left = abs($SlopeRaycastLeft.global_position.distance_to($SlopeRaycastLeft.get_collision_point())) - # var distance_to_slope_right = abs($SlopeRaycastRight.global_position.distance_to($SlopeRaycastRight.get_collision_point())) var slope_angle_left = $SlopeRaycastLeft.get_collision_normal().rotated(PI/2).angle() var slope_angle_right = $SlopeRaycastRight.get_collision_normal().rotated(PI/2).angle() # avoid invalid angles and stay in rotation when touching ground completely @@ -399,9 +398,8 @@ func calculate_slope_rotation(onfloor: bool) -> float: || (abs(slope_angle_left) - abs(slope_angle_right) == 0 && onfloor)): return previous_rotation if abs(previous_rotation) > 0.1 else 0.0 # downturn - # print(abs(slope_angle_left) > abs(slope_angle_right) && distance_to_slope_right > distance_to_slope_left) - if(abs(slope_angle_left) > abs(slope_angle_right) || - abs(slope_angle_right) > abs(slope_angle_left)): + if(abs(slope_angle_left) > abs(slope_angle_right) && velocity.x < -10|| + abs(slope_angle_right) > abs(slope_angle_left) && velocity.x > 10): var length_vector: Vector2 = $SlopeRaycastRight.get_collision_point() - $SlopeRaycastLeft.get_collision_point() angle = length_vector.angle() # upturn diff --git a/src/Actors/Blobby/BlobbyCam.gd b/src/Actors/Blobby/BlobbyCam.gd index 3226815..69442ed 100644 --- a/src/Actors/Blobby/BlobbyCam.gd +++ b/src/Actors/Blobby/BlobbyCam.gd @@ -17,7 +17,7 @@ func _ready(): _set_boundaries() self.position = blobby.global_position prev_camera_pos = get_camera_screen_center() - offset.x = -camera_horizontal_shift + offset.x = -camera_horizontal_shift if zoom.x == original_x_zoom else 0 func _physics_process(_delta: float) -> void: if(!GlobalState.is_dead): @@ -32,19 +32,19 @@ func _set_boundaries(): # This is ok, because it only happens on initialization # But it is also quite fickle var tilemap = get_node("../TileMap") - # TODO This goes wrong when overwriting old tiles with new sprites + # TODO: This goes wrong when overwriting old tiles with new sprites # New pngs -> completely new tiles and rebuild map var rect = tilemap.get_used_rect() var cell_size = tilemap.cell_size limit_right = rect.end.x * cell_size.x - camera_horizontal_shift limit_left = rect.position.x * cell_size.x + camera_horizontal_shift - # TODO When vertical scrolling is fixed + # TODO: When vertical scrolling is fixed limit_top = rect.position.y * cell_size.y #+ camera_vertical_shift limit_bottom = rect.end.y * cell_size.y #- camera_vertical_shift var screen_size = get_viewport_rect() var h_pixels = limit_right - limit_left var v_pixels = limit_bottom - limit_top - #TODO Fix that it can zoom both? + # TODO: Fix that it can zoom both? if screen_size.end.x * original_x_zoom - h_pixels > 0: zoom.x = h_pixels / screen_size.end.x zoom.y = zoom.x @@ -71,7 +71,7 @@ func _adapt_to_movement(): # print(target_offset) # tween_v = true - if (tween_h || tween_v): + if ((tween_h || tween_v ) && zoom == Vector2(original_x_zoom, original_y_zoom)): #TODO Motion may be too complex tween.interpolate_property( self, diff --git a/src/Actors/BlobbyCam.tscn b/src/Actors/BlobbyCam.tscn index 67c7792..b63fdf4 100644 --- a/src/Actors/BlobbyCam.tscn +++ b/src/Actors/BlobbyCam.tscn @@ -96,13 +96,25 @@ tracks/7/path = NodePath(".:position") tracks/7/interp = 1 tracks/7/loop_wrap = true tracks/7/imported = false -tracks/7/enabled = false +tracks/7/enabled = true tracks/7/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, "values": [ Vector2( 0, 0 ) ] } +tracks/8/type = "value" +tracks/8/path = NodePath(".:offset") +tracks/8/interp = 1 +tracks/8/loop_wrap = true +tracks/8/imported = false +tracks/8/enabled = true +tracks/8/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ Vector2( 0, 0 ) ] +} [sub_resource type="Animation" id=6] resource_name = "deathCam" @@ -237,10 +249,10 @@ zoom = Vector2( 0.75, 0.75 ) process_mode = 0 drag_margin_h_enabled = true drag_margin_v_enabled = true -drag_margin_left = 0.05 -drag_margin_top = 0.05 -drag_margin_right = 0.05 -drag_margin_bottom = 0.05 +drag_margin_left = 0.01 +drag_margin_top = 0.01 +drag_margin_right = 0.01 +drag_margin_bottom = 0.01 editor_draw_screen = false script = ExtResource( 1 ) @@ -254,18 +266,21 @@ anims/deathCam = SubResource( 6 ) scroll_base_offset = Vector2( 320, 180 ) [node name="ParallaxLayer" type="ParallaxLayer" parent="ParallaxBackground"] +z_index = -1 motion_scale = Vector2( 0, 0 ) [node name="Sprite" type="Sprite" parent="ParallaxBackground/ParallaxLayer"] texture = ExtResource( 4 ) [node name="ParallaxLayer2" type="ParallaxLayer" parent="ParallaxBackground"] +z_index = -1 motion_scale = Vector2( 0, 0 ) [node name="Sprite" type="Sprite" parent="ParallaxBackground/ParallaxLayer2"] texture = ExtResource( 3 ) [node name="ParallaxLayer3" type="ParallaxLayer" parent="ParallaxBackground"] +z_index = -1 motion_scale = Vector2( 0.001, 0.001 ) [node name="Sprite" type="Sprite" parent="ParallaxBackground/ParallaxLayer3"] diff --git a/src/Environment/ShaderGrass.gd b/src/Environment/ShaderGrass.gd index 772f5eb..d57afe7 100644 --- a/src/Environment/ShaderGrass.gd +++ b/src/Environment/ShaderGrass.gd @@ -1,6 +1,6 @@ extends Node2D -onready var blobby = get_node("../Blobby") +onready var blobby = get_node("%Blobby") var last_distance: Vector2 = Vector2(100,100) diff --git a/src/Environment/ShaderGrass.tscn b/src/Environment/ShaderGrass.tscn index 355d2c6..a22acd6 100644 --- a/src/Environment/ShaderGrass.tscn +++ b/src/Environment/ShaderGrass.tscn @@ -1,67 +1,71 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=9 format=2] +[ext_resource path="res://assets/environment/decor/straight_straw.png" type="Texture" id=1] [ext_resource path="res://src/Environment/ShaderGrass.gd" type="Script" id=2] [ext_resource path="res://src/Environment/ShaderGrass.tres" type="Material" id=3] - -[sub_resource type="StreamTexture" id=3] -load_path = "res://.import/short_straw.png-74a4a080ce5e7e7272200d0d4a93bc94.stex" - -[sub_resource type="StreamTexture" id=17] -load_path = "res://.import/short_straw.png-74a4a080ce5e7e7272200d0d4a93bc94.stex" - -[sub_resource type="StreamTexture" id=18] -load_path = "res://.import/bent_straw.png-34af1874e71c7c7b0749bdc0374dc29d.stex" - -[sub_resource type="StreamTexture" id=9] -load_path = "res://.import/bent_straw.png-34af1874e71c7c7b0749bdc0374dc29d.stex" - -[sub_resource type="StreamTexture" id=2] -load_path = "res://.import/straight_straw.png-de19826f989d2481c31d92ac559e94ef.stex" +[ext_resource path="res://assets/environment/decor/short_straw.png" type="Texture" id=4] +[ext_resource path="res://assets/environment/decor/bent_straw.png" type="Texture" id=5] +[ext_resource path="res://assets/environment/decor/bent_straw_2.png" type="Texture" id=6] +[ext_resource path="res://assets/environment/decor/bent_straw_leftt.png" type="Texture" id=7] +[ext_resource path="res://assets/environment/decor/bent_straw_left_2.png" type="Texture" id=8] [node name="ShaderGrass" type="Node2D"] script = ExtResource( 2 ) -[node name="ShortStrawPolygon2" type="Polygon2D" parent="."] +[node name="StraightStraw" type="Polygon2D" parent="."] material = ExtResource( 3 ) -position = Vector2( -2.30669, 0 ) -texture = SubResource( 3 ) -polygon = PoolVector2Array( 4.8599, 12.1162, 4.84375, 7.21094, 4.91575, 2.9375, 5.84277, 2.85904, 5.84375, 1.88281, 6.96094, 1.90625, 6.999, 2.89845, 7.97825, 2.9375, 7.98438, 7.09375, 7.98528, 12.1279 ) -uv = PoolVector2Array( 4.47825, 12.125, 4.35325, 7.25, 4.41575, 2.6875, 5.66575, 2.5625, 5.66575, 1.3125, 7.16575, 1.3125, 7.22825, 2.5625, 8.54075, 2.625, 8.54075, 7.1875, 8.47825, 12.3125 ) -polygons = [ PoolIntArray( 0, 9, 1 ), PoolIntArray( 8, 1, 9 ), PoolIntArray( 8, 2, 1 ), PoolIntArray( 8, 2, 3, 4, 5, 6, 7 ) ] +position = Vector2( -2, 0 ) +texture = ExtResource( 1 ) +polygon = PoolVector2Array( 4.9375, 4.5625, 5, 1.6875, 8.125, 1.6875, 8.0625, 4.875, 8.0625, 8.4375, 8.125, 12.125, 4.8125, 12.0625, 4.8125, 8.5 ) +uv = PoolVector2Array( 4.9375, 4.5625, 5, 1.6875, 8.125, 1.6875, 8.0625, 4.875, 8.0625, 8.4375, 8.125, 12.125, 4.8125, 12.0625, 4.8125, 8.5 ) +polygons = [ PoolIntArray( 1, 3, 0 ), PoolIntArray( 2, 3, 1 ), PoolIntArray( 0, 4, 3 ), PoolIntArray( 0, 7, 4 ), PoolIntArray( 6, 7, 5 ), PoolIntArray( 4, 5, 7 ) ] -[node name="ShortStrawPolygon3" type="Polygon2D" parent="."] +[node name="ShortStraw" type="Polygon2D" parent="."] material = ExtResource( 3 ) -position = Vector2( 1.24897, 0.113895 ) -texture = SubResource( 17 ) -polygon = PoolVector2Array( 4.8599, 12.1162, 4.84375, 7.21094, 4.91575, 2.9375, 5.84277, 2.85904, 5.84375, 1.88281, 6.96094, 1.90625, 6.999, 2.89845, 7.97825, 2.9375, 7.98438, 7.09375, 7.98528, 12.1279 ) -uv = PoolVector2Array( 4.47825, 12.125, 4.35325, 7.25, 4.41575, 2.6875, 5.66575, 2.5625, 5.66575, 1.3125, 7.16575, 1.3125, 7.22825, 2.5625, 8.54075, 2.625, 8.54075, 7.1875, 8.47825, 12.3125 ) -polygons = [ PoolIntArray( 0, 9, 1 ), PoolIntArray( 8, 1, 9 ), PoolIntArray( 8, 2, 1 ), PoolIntArray( 8, 2, 3, 4, 5, 6, 7 ) ] +position = Vector2( -4, -1 ) +texture = ExtResource( 4 ) +polygon = PoolVector2Array( 5, 12.0625, 4.9375, 10.0625, 4.875, 8, 5.0625, 5.9375, 8.1875, 6, 8.0625, 8.0625, 8.0625, 10.1875, 8.0625, 12.125 ) +uv = PoolVector2Array( 5, 12.0625, 4.9375, 10.0625, 4.875, 8, 5.0625, 5.9375, 8.1875, 6, 8.0625, 8.0625, 8.0625, 10.1875, 8.0625, 12.125 ) +polygons = [ PoolIntArray( 3, 5, 4 ), PoolIntArray( 2, 3, 5 ), PoolIntArray( 1, 2, 6 ), PoolIntArray( 5, 6, 2 ), PoolIntArray( 6, 0, 7 ), PoolIntArray( 6, 1, 0 ) ] -[node name="BentStrawPolygon" type="Polygon2D" parent="."] +[node name="ShortStraw2" type="Polygon2D" parent="."] material = ExtResource( 3 ) -position = Vector2( 6.58748, 0.206984 ) -texture = SubResource( 18 ) -polygon = PoolVector2Array( 1.00644, 12.0961, 1.03124, 8.84688, 2.2466, 7.82995, 4.05723, 5.74649, 5.89266, 5.69688, 7.8273, 5.79609, 8.47219, 6.21775, 8.4375, 7.4375, 5.49581, 9.39255, 4.03242, 12.0465 ) -uv = PoolVector2Array( 0.562501, 11.875, 0.875001, 8.5625, 2.25, 6.375, 4.5, 3.9375, 6.125, 3.1875, 8.25, 3.5, 9.0625, 4.4375, 9.1875, 6.3125, 6.125, 9.25, 4.5625, 11.875 ) -polygons = [ PoolIntArray( 0, 9, 1 ), PoolIntArray( 8, 1, 9 ), PoolIntArray( 8, 2, 1 ), PoolIntArray( 8, 2, 3, 4, 5, 6, 7 ) ] +position = Vector2( 1, -2 ) +texture = ExtResource( 4 ) +polygon = PoolVector2Array( 5, 12.0625, 4.9375, 10.0625, 4.875, 8, 5.0625, 5.9375, 8.1875, 6, 8.0625, 8.0625, 8.0625, 10.1875, 8.0625, 12.125 ) +uv = PoolVector2Array( 5, 12.0625, 4.9375, 10.0625, 4.875, 8, 5.0625, 5.9375, 8.1875, 6, 8.0625, 8.0625, 8.0625, 10.1875, 8.0625, 12.125 ) +polygons = [ PoolIntArray( 3, 5, 4 ), PoolIntArray( 2, 3, 5 ), PoolIntArray( 1, 2, 6 ), PoolIntArray( 5, 6, 2 ), PoolIntArray( 6, 0, 7 ), PoolIntArray( 6, 1, 0 ) ] -[node name="BentStrawInversePolygon" type="Polygon2D" parent="."] -visible = false +[node name="BentStrawRight" type="Polygon2D" parent="."] material = ExtResource( 3 ) -position = Vector2( 5.15028, 0.0923641 ) -scale = Vector2( -0.807856, 1 ) -texture = SubResource( 9 ) -polygon = PoolVector2Array( 1.00644, 12.0961, 1.03124, 8.84688, 2.2466, 7.82995, 4.05723, 5.74649, 5.89266, 5.69688, 7.8273, 5.79609, 8.47219, 6.21775, 8.4375, 7.4375, 5.49581, 9.39255, 4.03242, 12.0465 ) -uv = PoolVector2Array( 0.562501, 11.875, 0.875001, 8.5625, 2.25, 6.375, 4.5, 3.9375, 6.125, 3.1875, 8.25, 3.5, 9.0625, 4.4375, 9.1875, 6.3125, 6.125, 9.25, 4.5625, 11.875 ) -polygons = [ PoolIntArray( 0, 9, 1 ), PoolIntArray( 8, 1, 9 ), PoolIntArray( 8, 2, 1 ), PoolIntArray( 8, 2, 3, 4, 5, 6, 7 ) ] +position = Vector2( 5, 0 ) +texture = ExtResource( 5 ) +polygon = PoolVector2Array( 1, 12, 0.9375, 9.0625, 2.75, 7.0625, 5, 5.75, 9.1875, 5.75, 9.125, 9.1875, 6, 10, 5.0625, 12.0625 ) +uv = PoolVector2Array( 1, 12, 0.9375, 9.0625, 2.75, 7.0625, 5, 5.75, 9.1875, 5.75, 9.125, 9.1875, 6, 10, 5.0625, 12.0625 ) +polygons = [ PoolIntArray( 1, 7, 0 ), PoolIntArray( 2, 7, 1 ), PoolIntArray( 6, 7, 2 ), PoolIntArray( 6, 3, 2 ), PoolIntArray( 3, 5, 6 ), PoolIntArray( 3, 4, 5 ) ] -[node name="StraigtStrawPolygon" type="Polygon2D" parent="."] +[node name="BentStraw2Right" type="Polygon2D" parent="."] material = ExtResource( 3 ) -position = Vector2( -0.57621, 0.03125 ) -texture = SubResource( 2 ) -polygon = PoolVector2Array( 4.8599, 12.1162, 4.84375, 7.21094, 4.91575, 2.9375, 5.84277, 2.85904, 5.84375, 1.88281, 6.96094, 1.90625, 6.999, 2.89845, 7.97825, 2.9375, 7.98438, 7.09375, 7.98528, 12.1279 ) -uv = PoolVector2Array( 4.47825, 12.125, 4.35325, 7.25, 4.41575, 2.6875, 5.66575, 2.5625, 5.66575, 1.3125, 7.16575, 1.3125, 7.22825, 2.5625, 8.54075, 2.625, 8.54075, 7.1875, 8.47825, 12.3125 ) -polygons = [ PoolIntArray( 0, 9, 1 ), PoolIntArray( 8, 1, 9 ), PoolIntArray( 8, 2, 1 ), PoolIntArray( 8, 2, 3, 4, 5, 6, 7 ) ] +position = Vector2( 4, 0 ) +texture = ExtResource( 6 ) +polygon = PoolVector2Array( 0.875, 12, 0.875, 7.9375, 2.13287, 6.45765, 3, 5.4375, 4.625, 3.6875, 6.9375, 1.6875, 9.375, 4.25, 7, 6.25, 5.5625, 7.5, 4.75, 8.25, 4.6875, 11.875 ) +uv = PoolVector2Array( 0.875, 12, 0.875, 7.9375, 3, 5.4375, 4.625, 3.6875, 6.9375, 1.6875, 9.375, 4.25, 7, 6.25, 5.5625, 7.5, 4.75, 8.25, 4.6875, 11.8125 ) + +[node name="BentStrawLeft" type="Polygon2D" parent="."] +material = ExtResource( 3 ) +position = Vector2( -6, 0 ) +texture = ExtResource( 7 ) +polygon = PoolVector2Array( 5.0625, 11.9375, 3.9375, 10, 1, 8.9375, 0.875, 5.8125, 5.1875, 5.6875, 6.8125, 7.25, 8.9375, 8.6875, 8.875, 11.9375 ) +uv = PoolVector2Array( 5.0625, 11.9375, 3.9375, 10, 1, 8.9375, 0.875, 5.8125, 5.1875, 5.6875, 6.8125, 7.25, 8.9375, 8.6875, 8.875, 11.9375 ) +polygons = [ PoolIntArray( 0, 6, 7 ), PoolIntArray( 1, 6, 0 ), PoolIntArray( 1, 5, 6 ), PoolIntArray( 1, 4, 5 ), PoolIntArray( 2, 1, 4 ), PoolIntArray( 3, 4, 2 ) ] + +[node name="BentStraw2Left" type="Polygon2D" parent="."] +material = ExtResource( 3 ) +position = Vector2( -4, 0 ) +texture = ExtResource( 8 ) +polygon = PoolVector2Array( 4.9375, 11.875, 5, 8.8125, 2.8125, 7, -0.375, 4.0625, 2.25, 1.9375, 4.75, 4.625, 8.0625, 7.9375, 8, 12.0625 ) +uv = PoolVector2Array( 4.9375, 11.875, 5, 8.8125, 2.8125, 7, -0.375, 4.0625, 2.25, 1.9375, 4.75, 4.625, 8.0625, 7.9375, 8, 12.0625 ) +polygons = [ PoolIntArray( 0, 6, 7 ), PoolIntArray( 0, 1, 6 ), PoolIntArray( 1, 5, 6 ), PoolIntArray( 1, 2, 5 ), PoolIntArray( 2, 4, 5 ), PoolIntArray( 2, 3, 4 ) ] [node name="Timer" type="Timer" parent="."] wait_time = 4.0 diff --git a/src/Levels/01 Level.tscn b/src/Levels/01 Level.tscn index 174ed95..d290f17 100644 --- a/src/Levels/01 Level.tscn +++ b/src/Levels/01 Level.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=14 format=2] +[gd_scene load_steps=15 format=2] [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] @@ -12,6 +12,7 @@ [ext_resource path="res://src/Utilities/GameplaySignalManager.gd" type="Script" id=10] [ext_resource path="res://src/Contraptions/Platform/DropThroughPlatform.tscn" type="PackedScene" id=11] [ext_resource path="res://src/Actors/BlobbyCam.tscn" type="PackedScene" id=12] +[ext_resource path="res://src/Environment/ShaderGrass.tscn" type="PackedScene" id=13] [sub_resource type="AnimationNodeStateMachinePlayback" id=4] @@ -27,26 +28,48 @@ __meta__ = { wait_time = 20.0 [node name="BlobbyCam" parent="." instance=ExtResource( 12 )] - -[node name="ParallaxBackground" parent="BlobbyCam" index="2"] -visible = false +drag_margin_h_enabled = false +drag_margin_v_enabled = false [node name="Blobby" parent="." instance=ExtResource( 2 )] unique_name_in_owner = true -position = Vector2( 89, -24 ) +position = Vector2( -70, -1.90735e-06 ) scale = Vector2( 0.878906, 0.936025 ) [node name="AnimationTree" parent="Blobby/BlobbySprite" index="0"] parameters/playback = SubResource( 4 ) +[node name="Decor" type="Node2D" parent="."] + +[node name="ShaderGrass" parent="Decor" instance=ExtResource( 13 )] +position = Vector2( 118, -35 ) + +[node name="ShaderGrass3" parent="Decor" instance=ExtResource( 13 )] +position = Vector2( 129, -35 ) + +[node name="ShaderGrass2" parent="Decor" instance=ExtResource( 13 )] +position = Vector2( 124, -36 ) +z_index = -1 + +[node name="ShaderGrass4" parent="Decor" instance=ExtResource( 13 )] +position = Vector2( 325, -11 ) + +[node name="ShaderGrass5" parent="Decor" instance=ExtResource( 13 )] +position = Vector2( 339, -11 ) + +[node name="ShaderGrass6" parent="Decor" instance=ExtResource( 13 )] +position = Vector2( 332, -12 ) +z_index = -1 + [node name="Collectibles" type="Node2D" parent="."] +z_index = -1 [node name="Coin" parent="Collectibles" instance=ExtResource( 6 )] position = Vector2( 336, -60 ) scale = Vector2( 0.133, 0.133 ) [node name="Coin2" parent="Collectibles" instance=ExtResource( 6 )] -position = Vector2( 324, -11 ) +position = Vector2( 336, -7 ) scale = Vector2( 0.133, 0.133 ) [node name="Coin3" parent="Collectibles" instance=ExtResource( 6 )] @@ -73,7 +96,7 @@ cell_custom_transform = Transform2D( 24, 0, 0, 24, 0, 0 ) collision_layer = 8 collision_mask = 8 format = 1 -tile_data = PoolIntArray( -851975, 3, 0, -851974, 3, 0, -851973, 3, 0, -851972, 3, 0, -851971, 3, 0, -851970, 3, 0, -851969, 3, 0, -917504, 3, 0, -917503, 3, 0, -917502, 3, 0, -917501, 3, 0, -917500, 3, 0, -917499, 3, 0, -917498, 3, 0, -917497, 3, 0, -917496, 3, 0, -917495, 3, 0, -917494, 3, 0, -917493, 3, 0, -917492, 3, 0, -917491, 3, 0, -917490, 3, 0, -917489, 3, 0, -917488, 3, 0, -917487, 3, 0, -917486, 3, 0, -917485, 3, 0, -917484, 3, 0, -917483, 3, 0, -917482, 3, 0, -917481, 3, 0, -917480, 3, 0, -917479, 3, 0, -917478, 3, 0, -917477, 3, 0, -917476, 3, 0, -917475, 3, 0, -917474, 3, 0, -917473, 3, 0, -917472, 3, 0, -917471, 3, 0, -917470, 3, 0, -917469, 3, 0, -917468, 3, 0, -917467, 3, 0, -917466, 3, 0, -917465, 3, 0, -917464, 3, 0, -917463, 3, 0, -917462, 3, 0, -917461, 3, 0, -917460, 3, 0, -917459, 3, 0, -917458, 3, 0, -917457, 3, 0, -917456, 3, 0, -917455, 3, 0, -917454, 3, 0, -917453, 3, 0, -917452, 3, 0, -917451, 3, 0, -917450, 3, 0, -917449, 3, 0, -917448, 3, 0, -917447, 3, 0, -917446, 3, 0, -917445, 3, 0, -917444, 3, 0, -917443, 3, 0, -917442, 3, 0, -786439, 3, 0, -786438, -1610612735, 0, -786437, 1610612738, 0, -786436, 1610612738, 0, -786435, 1610612736, 0, -786434, 1610612738, 0, -786433, 1610612738, 0, -851968, 1610612736, 0, -851967, 1610612738, 0, -851966, 1610612738, 0, -851965, 1610612736, 0, -851964, 1610612738, 0, -851963, 1610612738, 0, -851962, 1610612736, 0, -851961, 1610612738, 0, -851960, 1610612738, 0, -851959, 1610612736, 0, -851958, 1610612738, 0, -851957, 1610612738, 0, -851956, 1610612736, 0, -851955, 1610612738, 0, -851954, 1610612738, 0, -851953, 1610612736, 0, -851952, 1610612738, 0, -851951, 1610612738, 0, -851950, 1610612736, 0, -851949, 1610612738, 0, -851948, 1610612738, 0, -851947, 1610612736, 0, -851946, 1610612738, 0, -851945, 1610612738, 0, -851944, 1610612736, 0, -851943, 1610612738, 0, -851942, 1610612738, 0, -851941, 1610612736, 0, -851940, 1610612738, 0, -851939, 1610612738, 0, -851938, 1610612736, 0, -851937, 1610612738, 0, -851936, 1610612738, 0, -851935, 3, 0, -851934, 1610612738, 0, -851933, 1610612738, 0, -851932, 1610612736, 0, -851931, 1610612738, 0, -851930, 1610612738, 0, -851929, 1610612736, 0, -851928, 1610612738, 0, -851927, 1610612738, 0, -851926, 1610612736, 0, -851925, 1610612738, 0, -851924, 1610612738, 0, -851923, 1610612736, 0, -851922, 1610612738, 0, -851921, 1610612738, 0, -851920, 1610612736, 0, -851919, 1610612738, 0, -851918, 1610612738, 0, -851917, 1610612736, 0, -851916, 1610612738, 0, -851915, 1610612738, 0, -851914, 1610612736, 0, -851913, 1610612738, 0, -851912, 1610612738, 0, -851911, 1610612736, 0, -851910, 1610612738, 0, -851909, 1610612738, 0, -851908, 1610612736, 0, -851907, 3, 0, -851906, 3, 0, -720903, 3, 0, -720902, -1610612734, 0, -786371, -1073741822, 0, -786370, 3, 0, -655367, 3, 0, -655366, -1610612734, 0, -720835, -1073741824, 0, -720834, 3, 0, -589831, 3, 0, -589830, -1610612736, 0, -655299, -1073741822, 0, -655298, 3, 0, -524295, 3, 0, -524294, -1610612734, 0, -589763, -1073741822, 0, -589762, 3, 0, -458759, 3, 0, -458758, -1610612734, 0, -524227, -1073741824, 0, -524226, 3, 0, -393223, 3, 0, -393222, -1610612736, 0, -458691, -1073741822, 0, -458690, 3, 0, -327687, 3, 0, -327686, -1610612734, 0, -393155, -1073741822, 0, -393154, 3, 0, -262151, 3, 0, -262150, -1610612734, 0, -327619, -1073741824, 0, -327618, 3, 0, -196615, 3, 0, -196614, -1610612736, 0, -262088, 0, 0, -262087, 2, 0, -262086, 2, 0, -262085, 0, 0, -262084, 2, 0, -262083, 1610612739, 0, -262082, 3, 0, -131079, 3, 0, -131078, -1610612734, 0, -196570, 6, 0, -196568, 0, 0, -196567, 2, 0, -196566, 2, 0, -196565, 0, 0, -196564, 2, 0, -196563, 2, 0, -196562, 0, 0, -196559, 2, 0, -196556, 2, 0, -196555, 0, 0, -196554, 2, 0, -196553, 2, 0, -196552, 1610612739, 0, -196551, 1610612739, 0, -196550, 1610612739, 0, -196549, 1610612739, 0, -196548, 1610612739, 0, -196547, 3, 0, -196546, 3, 0, -65543, 3, 0, -65542, -1610612734, 0, -131065, 5, 0, -131064, 0, 0, -131063, 2, 0, -131059, -1073741822, 0, -131058, -1610612734, 0, -131054, 2, 0, -131053, 2, 0, -131052, 0, 0, -131051, 2, 0, -131050, 536870918, 0, -131036, 6, 0, -131034, 3, 0, -131033, 3, 0, -131032, 1610612739, 0, -131031, 1610612739, 0, -131030, 1610612739, 0, -131029, 1610612739, 0, -131028, 1610612739, 0, -131027, 1610612739, 0, -131026, 1610612739, 0, -131020, 1610612739, 0, -131019, 1610612739, 0, -131018, 1610612739, 0, -131017, 1610612739, 0, -131016, 1, 0, -131015, 1610612739, 0, -131014, 1610612739, 0, -131013, 1, 0, -131012, 1610612739, 0, -131011, 3, 0, -131010, 3, 0, -7, 3, 0, -6, -1610612736, 0, -5, -1610612731, 0, -65534, 6, 0, -65532, 2, 0, -65531, 0, 0, -65530, 2, 0, -65529, 3, 0, -65528, 1610612739, 0, -65527, 1610612739, 0, -65526, 2, 0, -65519, 0, 0, -65518, 1610612739, 0, -65517, 1610612739, 0, -65516, 1610612739, 0, -65515, 1610612739, 0, -65514, 3, 0, -65513, 3, 0, -65512, 536870918, 0, -65502, 6, 0, -65500, 3, 0, -65499, 1, 0, -65498, 3, 0, -65497, 3, 0, -65496, 1, 0, -65495, 1610612739, 0, -65494, 1610612739, 0, -65493, 1, 0, -65492, 1610612739, 0, -65491, 1610612739, 0, -65490, 1, 0, -65489, 2, 0, -65488, 2, 0, -65487, 2, 0, -65486, 2, 0, -65485, 2, 0, -65484, 1610612739, 0, -65483, 1, 0, -65482, 1610612739, 0, -65481, 1610612739, 0, -65480, 1610612739, 0, -65479, 1610612739, 0, -65478, 1610612739, 0, -65477, 1610612739, 0, -65476, 1610612739, 0, -65475, 3, 0, -65474, 3, 0, 65529, 3, 0, 65530, 3, 0, 65531, 3, 0, 65532, 2, 0, 65533, 2, 0, 65534, 2, 0, 65535, 0, 0, 0, 2, 0, 1, 2, 0, 2, 1, 0, 3, 3, 0, 4, 1610612739, 0, 5, 1610612739, 0, 6, 1610612739, 0, 7, 1610612739, 0, 8, 1610612739, 0, 9, 1610612739, 0, 10, 1610612739, 0, 11, 0, 0, 12, 2, 0, 13, 2, 0, 14, 0, 0, 15, 2, 0, 16, 2, 0, 17, 1610612739, 0, 18, 1610612739, 0, 19, 1610612739, 0, 20, 1610612739, 0, 21, 1610612739, 0, 22, 1610612739, 0, 23, 3, 0, 24, 3, 0, 25, 3, 0, 26, 0, 0, 27, 2, 0, 30, 2, 0, 31, 0, 0, 32, 2, 0, 33, 2, 0, 34, 1, 0, 35, 1610612739, 0, 36, 1610612739, 0, 37, 1610612739, 0, 38, 1610612739, 0, 39, 1610612739, 0, 40, 1610612739, 0, 41, 1610612739, 0, 42, 1610612739, 0, 43, 1610612739, 0, 44, 1610612739, 0, 45, 1610612739, 0, 46, 1610612739, 0, 47, 1610612739, 0, 48, 1610612739, 0, 49, 1610612739, 0, 50, 1610612739, 0, 51, 1610612739, 0, 52, 1610612739, 0, 53, 1610612739, 0, 54, 1610612739, 0, 55, 1610612739, 0, 56, 1, 0, 57, 1610612739, 0, 58, 1610612739, 0, 59, 1, 0, 60, 1610612739, 0, 61, 1610612739, 0, 62, 3, 0, 131065, 3, 0, 131066, 3, 0, 131067, 3, 0, 131068, 3, 0, 131069, 3, 0, 131070, 3, 0, 131071, 3, 0, 65536, 3, 0, 65537, 3, 0, 65538, 3, 0, 65539, 3, 0, 65540, 3, 0, 65541, 3, 0, 65542, 3, 0, 65543, 3, 0, 65544, 3, 0, 65545, 3, 0, 65546, 3, 0, 65547, 3, 0, 65548, 3, 0, 65549, 3, 0, 65550, 3, 0, 65551, 3, 0, 65552, 3, 0, 65553, 3, 0, 65554, 3, 0, 65555, 3, 0, 65556, 3, 0, 65557, 3, 0, 65558, 3, 0, 65559, 3, 0, 65560, 3, 0, 65561, 3, 0, 65562, 3, 0, 65563, 3, 0, 65564, 3, 0, 65565, 3, 0, 65566, 3, 0, 65567, 3, 0, 65568, 3, 0, 65569, 3, 0, 65570, 3, 0, 65571, 3, 0, 65572, 3, 0, 65573, 3, 0, 65574, 3, 0, 65575, 3, 0, 65576, 3, 0, 65577, 3, 0, 65578, 3, 0, 65579, 3, 0, 65580, 3, 0, 65581, 3, 0, 65582, 3, 0, 65583, 3, 0, 65584, 3, 0, 65585, 3, 0, 65586, 3, 0, 65587, 3, 0, 65588, 3, 0, 65589, 3, 0, 65590, 3, 0, 65591, 3, 0, 65592, 3, 0, 65593, 3, 0, 65594, 3, 0, 65595, 3, 0, 65596, 3, 0, 65597, 3, 0, 65598, 3, 0 ) +tile_data = PoolIntArray( -851975, 3, 0, -851974, 3, 0, -851973, 3, 0, -851972, 3, 0, -851971, 3, 0, -851970, 3, 0, -851969, 3, 0, -917504, 3, 0, -917503, 3, 0, -917502, 3, 0, -917501, 3, 0, -917500, 3, 0, -917499, 3, 0, -917498, 3, 0, -917497, 3, 0, -917496, 3, 0, -917495, 3, 0, -917494, 3, 0, -917493, 3, 0, -917492, 3, 0, -917491, 3, 0, -917490, 3, 0, -917489, 3, 0, -917488, 3, 0, -917487, 3, 0, -917486, 3, 0, -917485, 3, 0, -917484, 3, 0, -917483, 3, 0, -917482, 3, 0, -917481, 3, 0, -917480, 3, 0, -917479, 3, 0, -917478, 3, 0, -917477, 3, 0, -917476, 3, 0, -917475, 3, 0, -917474, 3, 0, -917473, 3, 0, -917472, 3, 0, -917471, 3, 0, -917470, 3, 0, -917469, 3, 0, -917468, 3, 0, -917467, 3, 0, -917466, 3, 0, -917465, 3, 0, -917464, 3, 0, -917463, 3, 0, -917462, 3, 0, -917461, 3, 0, -917460, 3, 0, -917459, 3, 0, -917458, 3, 0, -917457, 3, 0, -917456, 3, 0, -917455, 3, 0, -917454, 3, 0, -917453, 3, 0, -917452, 3, 0, -917451, 3, 0, -917450, 3, 0, -917449, 3, 0, -917448, 3, 0, -917447, 3, 0, -917446, 3, 0, -917445, 3, 0, -917444, 3, 0, -917443, 3, 0, -917442, 3, 0, -786439, 3, 0, -786438, -1610612735, 0, -786437, 1610612738, 0, -786436, 1610612738, 0, -786435, 1610612736, 0, -786434, 1610612738, 0, -786433, 1610612738, 0, -851968, 1610612736, 0, -851967, 1610612738, 0, -851966, 1610612738, 0, -851965, 1610612736, 0, -851964, 1610612738, 0, -851963, 1610612738, 0, -851962, 1610612736, 0, -851961, 1610612738, 0, -851960, 1610612738, 0, -851959, 1610612736, 0, -851958, 1610612738, 0, -851957, 1610612738, 0, -851956, 1610612736, 0, -851955, 1610612738, 0, -851954, 1610612738, 0, -851953, 1610612736, 0, -851952, 1610612738, 0, -851951, 1610612738, 0, -851950, 1610612736, 0, -851949, 1610612738, 0, -851948, 1610612738, 0, -851947, 1610612736, 0, -851946, 1610612738, 0, -851945, 1610612738, 0, -851944, 1610612736, 0, -851943, 1610612738, 0, -851942, 1610612738, 0, -851941, 1610612736, 0, -851940, 1610612738, 0, -851939, 1610612738, 0, -851938, 1610612736, 0, -851937, 1610612738, 0, -851936, 1610612738, 0, -851935, 3, 0, -851934, 1610612738, 0, -851933, 1610612738, 0, -851932, 1610612736, 0, -851931, 1610612738, 0, -851930, 1610612738, 0, -851929, 1610612736, 0, -851928, 1610612738, 0, -851927, 1610612738, 0, -851926, 1610612736, 0, -851925, 1610612738, 0, -851924, 1610612738, 0, -851923, 1610612736, 0, -851922, 1610612738, 0, -851921, 1610612738, 0, -851920, 1610612736, 0, -851919, 1610612738, 0, -851918, 1610612738, 0, -851917, 1610612736, 0, -851916, 1610612738, 0, -851915, 1610612738, 0, -851914, 1610612736, 0, -851913, 1610612738, 0, -851912, 1610612738, 0, -851911, 1610612736, 0, -851910, 1610612738, 0, -851909, 1610612738, 0, -851908, 1610612736, 0, -851907, 3, 0, -851906, 3, 0, -720903, 3, 0, -720902, -1610612734, 0, -786371, -1073741822, 0, -786370, 3, 0, -655367, 3, 0, -655366, -1610612734, 0, -720835, -1073741824, 0, -720834, 3, 0, -589831, 3, 0, -589830, -1610612736, 0, -655299, -1073741822, 0, -655298, 3, 0, -524295, 3, 0, -524294, -1610612734, 0, -589763, -1073741822, 0, -589762, 3, 0, -458759, 3, 0, -458758, -1610612734, 0, -524227, -1073741824, 0, -524226, 3, 0, -393223, 3, 0, -393222, -1610612736, 0, -458691, -1073741822, 0, -458690, 3, 0, -327687, 3, 0, -327686, -1610612734, 0, -393155, -1073741822, 0, -393154, 3, 0, -262151, 3, 0, -262150, -1610612734, 0, -327619, -1073741824, 0, -327618, 3, 0, -196615, 3, 0, -196614, -1610612736, 0, -262088, 0, 0, -262087, 2, 0, -262086, 2, 0, -262085, 0, 0, -262084, 2, 0, -262083, 1610612739, 0, -262082, 3, 0, -131079, 3, 0, -131078, -1610612734, 0, -196570, 6, 0, -196568, 0, 0, -196567, 2, 0, -196566, 2, 0, -196565, 0, 0, -196564, 2, 0, -196563, 2, 0, -196562, 0, 0, -196559, 2, 0, -196556, 2, 0, -196555, 0, 0, -196554, 2, 0, -196553, 2, 0, -196552, 1610612739, 0, -196551, 1610612739, 0, -196550, 1610612739, 0, -196549, 1610612739, 0, -196548, 1610612739, 0, -196547, 3, 0, -196546, 3, 0, -65543, 3, 0, -65542, -1610612734, 0, -131064, 0, 0, -131063, 2, 0, -131059, -1073741822, 0, -131058, -1610612734, 0, -131054, 2, 0, -131053, 2, 0, -131052, 0, 0, -131051, 2, 0, -131036, 6, 0, -131034, 4, 0, -131033, 4, 0, -131032, 1610612739, 0, -131031, 1610612739, 0, -131030, 1610612739, 0, -131029, 1610612739, 0, -131028, 1610612739, 0, -131027, 1610612739, 0, -131026, 1610612739, 0, -131020, 1610612739, 0, -131019, 1610612739, 0, -131018, 1610612739, 0, -131017, 1610612739, 0, -131016, 1, 0, -131015, 1610612739, 0, -131014, 1610612739, 0, -131013, 1, 0, -131012, 1610612739, 0, -131011, 3, 0, -131010, 3, 0, -7, 3, 0, -6, -1610612736, 0, -65532, 2, 0, -65531, 0, 0, -65530, 2, 0, -65529, 4, 0, -65528, 1610612739, 0, -65527, 1610612739, 0, -65526, 2, 0, -65519, 0, 0, -65518, 1610612739, 0, -65517, 1610612739, 0, -65516, 1610612739, 0, -65515, 1610612739, 0, -65514, 4, 0, -65513, 0, 0, -65502, 6, 0, -65500, 4, 0, -65499, 0, 0, -65498, 3, 0, -65497, 3, 0, -65496, 1, 0, -65495, 1610612739, 0, -65494, 1610612739, 0, -65493, 1, 0, -65492, 1610612739, 0, -65491, 1610612739, 0, -65490, 1, 0, -65489, 2, 0, -65488, 2, 0, -65487, 2, 0, -65486, 2, 0, -65485, 2, 0, -65484, 1610612739, 0, -65483, 1, 0, -65482, 1610612739, 0, -65481, 1610612739, 0, -65480, 1610612739, 0, -65479, 1610612739, 0, -65478, 1610612739, 0, -65477, 1610612739, 0, -65476, 1610612739, 0, -65475, 3, 0, -65474, 3, 0, 65529, 3, 0, 65530, 3, 0, 65531, 4, 0, 65532, 0, 0, 65533, 2, 0, 65534, 2, 0, 65535, 0, 0, 0, 2, 0, 1, 2, 0, 2, 0, 0, 3, 4, 0, 4, 1610612739, 0, 5, 1610612739, 0, 6, 1610612739, 0, 7, 1610612739, 0, 8, 1610612739, 0, 9, 1610612739, 0, 10, 1610612739, 0, 11, 0, 0, 12, 2, 0, 13, 2, 0, 14, 0, 0, 15, 2, 0, 16, 2, 0, 17, 1610612739, 0, 18, 1610612739, 0, 19, 1610612739, 0, 20, 1610612739, 0, 21, 1610612739, 0, 22, 1610612739, 0, 23, 3, 0, 24, 3, 0, 25, 3, 0, 26, 0, 0, 27, 2, 0, 30, 2, 0, 31, 0, 0, 32, 2, 0, 33, 2, 0, 34, 0, 0, 35, 4, 0, 36, 1610612739, 0, 37, 1610612739, 0, 38, 1610612739, 0, 39, 1610612739, 0, 40, 1610612739, 0, 41, 1610612739, 0, 42, 1610612739, 0, 43, 1610612739, 0, 44, 1610612739, 0, 45, 1610612739, 0, 46, 1610612739, 0, 47, 1610612739, 0, 48, 1610612739, 0, 49, 1610612739, 0, 50, 1610612739, 0, 51, 1610612739, 0, 52, 1610612739, 0, 53, 1610612739, 0, 54, 1610612739, 0, 55, 1610612739, 0, 56, 1, 0, 57, 1610612739, 0, 58, 1610612739, 0, 59, 1, 0, 60, 1610612739, 0, 61, 1610612739, 0, 62, 3, 0, 131065, 3, 0, 131066, 3, 0, 131067, 3, 0, 131068, 3, 0, 131069, 3, 0, 131070, 3, 0, 131071, 3, 0, 65536, 3, 0, 65537, 3, 0, 65538, 3, 0, 65539, 3, 0, 65540, 3, 0, 65541, 3, 0, 65542, 3, 0, 65543, 3, 0, 65544, 3, 0, 65545, 3, 0, 65546, 3, 0, 65547, 3, 0, 65548, 3, 0, 65549, 3, 0, 65550, 3, 0, 65551, 3, 0, 65552, 3, 0, 65553, 3, 0, 65554, 3, 0, 65555, 3, 0, 65556, 3, 0, 65557, 3, 0, 65558, 3, 0, 65559, 3, 0, 65560, 3, 0, 65561, 3, 0, 65562, 3, 0, 65563, 3, 0, 65564, 3, 0, 65565, 3, 0, 65566, 3, 0, 65567, 3, 0, 65568, 3, 0, 65569, 3, 0, 65570, 3, 0, 65571, 3, 0, 65572, 3, 0, 65573, 3, 0, 65574, 3, 0, 65575, 3, 0, 65576, 3, 0, 65577, 3, 0, 65578, 3, 0, 65579, 3, 0, 65580, 3, 0, 65581, 3, 0, 65582, 3, 0, 65583, 3, 0, 65584, 3, 0, 65585, 3, 0, 65586, 3, 0, 65587, 3, 0, 65588, 3, 0, 65589, 3, 0, 65590, 3, 0, 65591, 3, 0, 65592, 3, 0, 65593, 3, 0, 65594, 3, 0, 65595, 3, 0, 65596, 3, 0, 65597, 3, 0, 65598, 3, 0 ) [node name="Spikes" parent="TileMap" instance=ExtResource( 3 )] position = Vector2( 708, 12 ) diff --git a/src/Levels/Grass Test Level.tscn b/src/Levels/Grass Test Level.tscn index 7e7ae11..b77a3f5 100644 --- a/src/Levels/Grass Test Level.tscn +++ b/src/Levels/Grass Test Level.tscn @@ -1,20 +1,16 @@ -[gd_scene load_steps=13 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://src/Environment/AlienShipTileSet.tres" type="TileSet" id=1] [ext_resource path="res://src/Utilities/GameplaySignalManager.gd" type="Script" id=2] -[ext_resource path="res://src/Contraptions/Triggers/ThreeWhyButtons.tscn" type="PackedScene" id=3] -[ext_resource path="res://src/NeutralObjects/Coin.tscn" type="PackedScene" id=4] [ext_resource path="res://src/Environment/ShaderGrass.tscn" type="PackedScene" id=5] [ext_resource path="res://src/UserInterface/UserInterface.tscn" type="PackedScene" id=6] -[ext_resource path="res://src/Contraptions/Portal/Portal.tscn" type="PackedScene" id=7] -[ext_resource path="res://src/Contraptions/Triggers/ElevatorButton.tscn" type="PackedScene" id=8] -[ext_resource path="res://src/Levels/Enemy Test Level.tscn" type="PackedScene" id=9] [ext_resource path="res://src/Actors/Blobby/Blobby.tscn" type="PackedScene" id=10] [ext_resource path="res://src/Actors/BlobbyCam.tscn" type="PackedScene" id=11] [sub_resource type="AnimationNodeStateMachinePlayback" id=4] [node name="LevelTemplate" type="Node2D"] +position = Vector2( 16, -10 ) __meta__ = { "_edit_horizontal_guides_": [ 464.0 ], "_edit_vertical_guides_": [ 2880.0 ] @@ -31,7 +27,18 @@ margin_top = 0.456848 margin_right = 3.15375 margin_bottom = 0.456848 +[node name="TileMap" type="TileMap" parent="."] +position = Vector2( -16, 10 ) +tile_set = ExtResource( 1 ) +cell_size = Vector2( 24, 24 ) +collision_layer = 8 +collision_mask = 8 +format = 1 +tile_data = PoolIntArray( -262152, 3, 0, -262151, 3, 0, -262150, 3, 0, -262149, 3, 0, -262148, 3, 0, -262147, 3, 0, -262146, 3, 0, -262145, 3, 0, -327680, 3, 0, -327679, 3, 0, -327678, 3, 0, -327677, 3, 0, -327676, 3, 0, -327675, 3, 0, -196616, 3, 0, -262139, 3, 0, -131080, 3, 0, -196603, 3, 0, -65544, 3, 0, -131067, 3, 0, -8, 3, 0, -65531, 3, 0, 65528, 3, 0, 65529, 3, 0, 65530, 3, 0, 65531, 3, 0, 65532, 3, 0, 65533, 4, 0, 65534, 4, 0, 65535, 4, 0, 0, 4, 0, 1, 4, 0, 2, 4, 0, 3, 4, 0, 4, 4, 0, 5, 4, 0 ) + [node name="BlobbyCam" parent="." instance=ExtResource( 11 )] +drag_margin_h_enabled = false +drag_margin_v_enabled = false [node name="Blobby" parent="." instance=ExtResource( 10 )] unique_name_in_owner = true @@ -41,70 +48,6 @@ scale = Vector2( 0.878906, 0.936025 ) [node name="AnimationTree" parent="Blobby/BlobbySprite" index="0"] parameters/playback = SubResource( 4 ) -[node name="TileMap" type="TileMap" parent="."] -position = Vector2( -109, -327 ) -tile_set = ExtResource( 1 ) -cell_size = Vector2( 24, 24 ) -cell_quadrant_size = 3 -cell_custom_transform = Transform2D( 24, 0, 0, 24, 0, 0 ) -collision_layer = 8 -collision_mask = 8 -format = 1 -tile_data = PoolIntArray( 655360, 2, 0, 655361, 2, 0, 655362, 2, 0, 655363, 2, 0, 655364, 2, 0, 655365, 2, 0, 655366, 2, 0, 655367, 2, 0, 655368, 2, 0, 720896, 2, 0, 720904, 2, 0, 786432, 2, 0, 786440, 2, 0, 851968, 2, 0, 851976, 2, 0, 917504, 2, 0, 917505, 2, 0, 917506, 2, 0, 917507, 2, 0, 917508, 2, 0, 917509, 2, 0, 917510, 2, 0, 917511, 2, 0, 917512, 2, 0 ) - -[node name="Collectibles" type="Node2D" parent="."] -visible = false - -[node name="Coin" parent="Collectibles" instance=ExtResource( 4 )] -position = Vector2( 336, -60 ) -scale = Vector2( 0.133, 0.133 ) - -[node name="Coin2" parent="Collectibles" instance=ExtResource( 4 )] -position = Vector2( 324, -11 ) -scale = Vector2( 0.133, 0.133 ) - -[node name="Coin3" parent="Collectibles" instance=ExtResource( 4 )] -position = Vector2( 1188, -84 ) -scale = Vector2( 0.133, 0.133 ) - -[node name="Coin4" parent="Collectibles" instance=ExtResource( 4 )] -position = Vector2( 1236, -108 ) -scale = Vector2( 0.133, 0.133 ) - -[node name="Coin5" parent="Collectibles" instance=ExtResource( 4 )] -position = Vector2( 1140, -108 ) -scale = Vector2( 0.133, 0.133 ) - -[node name="Coin6" parent="Collectibles" instance=ExtResource( 4 )] -position = Vector2( 696, -48 ) -scale = Vector2( 0.133, 0.133 ) - -[node name="TreeWhyButtons" parent="." instance=ExtResource( 3 )] -visible = false -position = Vector2( -108, -7 ) - -[node name="WhyButton1" parent="TreeWhyButtons" index="0"] -position = Vector2( -12, -49 ) -rotation = 1.5708 - -[node name="WhyButton2" parent="TreeWhyButtons" index="1"] -position = Vector2( 444, -17 ) -rotation = 3.14159 - -[node name="WhyButton3" parent="TreeWhyButtons" index="2"] -position = Vector2( 1452, -77 ) -rotation = -1.5708 - -[node name="ElevatorButton" parent="." instance=ExtResource( 8 )] -visible = false -position = Vector2( 1452, -96 ) - -[node name="Portal" parent="ElevatorButton" instance=ExtResource( 7 )] -visible = false -position = Vector2( -1464, 84 ) -monitoring = false -next_scene = ExtResource( 9 ) - [node name="GameplaySignalManager" type="Node2D" parent="."] script = ExtResource( 2 ) @@ -331,8 +274,5 @@ z_index = -1 [editable path="UserInterface"] [editable path="UserInterface/HUD"] +[editable path="BlobbyCam"] [editable path="Blobby"] -[editable path="TreeWhyButtons"] -[editable path="TreeWhyButtons/WhyButton1"] -[editable path="TreeWhyButtons/WhyButton2"] -[editable path="TreeWhyButtons/WhyButton3"]