diff --git a/src/Actors/Blobby/Blobby.gd b/src/Actors/Blobby/Blobby.gd index 2368bf9..130e409 100644 --- a/src/Actors/Blobby/Blobby.gd +++ b/src/Actors/Blobby/Blobby.gd @@ -209,13 +209,26 @@ func is_touching_wall_completely() -> bool: return value +func is_crushed() -> bool: + var touching_left = false + for left_raycast in left_wall_raycasts.get_children(): + if left_raycast.is_colliding(): + touching_left = true + var touching_right = false + for right_raycast in right_wall_raycasts.get_children(): + if right_raycast.is_colliding(): + touching_right = true + return touching_left && touching_right + + # Attached to wall state is in the PlayerStateMachine func is_correct_walljump_input(direction: Vector2) -> bool: if is_touching_wall_completely(): - return( Input.is_action_pressed("jump") + return ( + Input.is_action_pressed("jump") && abs(direction.x + wall_touch_direction) < 1 && abs(direction.x + wall_touch_direction) >= 0 - ) + ) return false @@ -255,7 +268,7 @@ func calculate_jump_velocity(linear_velocity: Vector2, delta: float, direction: var y_acceleration_force = acceleration_force[state].y var x_acceleration_force = acceleration_force[state].x - + if duck_jumping: y_acceleration_force *= duck_boost.y linear_velocity.x += duck_boost.x * direction.x @@ -289,10 +302,7 @@ func calculate_jump_velocity(linear_velocity: Vector2, delta: float, direction: var divisor = 1 / max(0.1, initial_velocity_dependence) var movement_factor = absolut + abs(velocity.x) / (max_velocity["fall"].x * divisor) linear_velocity.x = PhysicsFunc.two_step_euler( - linear_velocity.x, - x_acceleration_force * movement_factor * direction.x, - mass, - delta + linear_velocity.x, x_acceleration_force * movement_factor * direction.x, mass, delta ) if is_correct_airstrafe_input(): @@ -532,6 +542,11 @@ func _on_InvincibilityTimer_timeout() -> void: die() +func _on_CrushTimer_timeout() -> void: + if is_crushed(): + die_for_real() + + func handle_grounded_movement(delta: float, direction: Vector2) -> Vector2: return calculate_grounded_velocity(velocity, delta, direction) diff --git a/src/Actors/Blobby/Blobby.tscn b/src/Actors/Blobby/Blobby.tscn index 4bd6b5c..120d8d9 100644 --- a/src/Actors/Blobby/Blobby.tscn +++ b/src/Actors/Blobby/Blobby.tscn @@ -376,7 +376,7 @@ tracks/1/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -11.9763, -5 ) ] +"values": [ Vector2( -9.5, -5 ) ] } tracks/2/type = "value" tracks/2/path = NodePath("../WallRaycasts/LeftWallRaycast/Left_Wallcast2:position") @@ -388,7 +388,7 @@ tracks/2/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -11.9763, 5 ) ] +"values": [ Vector2( -9.5, 5 ) ] } tracks/3/type = "value" tracks/3/path = NodePath("../BlobbyBody:position") @@ -424,7 +424,7 @@ tracks/5/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 12.0551, -5 ) ] +"values": [ Vector2( 9.5, -5 ) ] } tracks/6/type = "value" tracks/6/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast2:position") @@ -436,7 +436,7 @@ tracks/6/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 12.0551, 5 ) ] +"values": [ Vector2( 9.5, 5 ) ] } tracks/7/type = "value" tracks/7/path = NodePath("../BlobbySkin:position") @@ -595,7 +595,7 @@ tracks/3/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -13.9763, 8 ) ] +"values": [ Vector2( -11.5, 8 ) ] } tracks/4/type = "value" tracks/4/path = NodePath("../WallRaycasts/LeftWallRaycast/Left_Wallcast1:position") @@ -607,7 +607,7 @@ tracks/4/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -13.9763, 0.8125 ) ] +"values": [ Vector2( -11.5, 0.8125 ) ] } tracks/5/type = "value" tracks/5/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast2:position") @@ -619,7 +619,7 @@ tracks/5/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 14.9301, 7.34375 ) ] +"values": [ Vector2( 12.5, 7.34375 ) ] } tracks/6/type = "value" tracks/6/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast1:position") @@ -631,7 +631,7 @@ tracks/6/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 14.9301, 0.8125 ) ] +"values": [ Vector2( 12.5, 0.8125 ) ] } tracks/7/type = "value" tracks/7/path = NodePath(".:offset") @@ -731,7 +731,7 @@ tracks/5/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -14.9497, -8.38456 ) ] +"values": [ Vector2( -12.5, -8.38456 ) ] } tracks/6/type = "value" tracks/6/path = NodePath("../WallRaycasts/LeftWallRaycast/Left_Wallcast2:position") @@ -743,7 +743,7 @@ tracks/6/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -14.9497, -0.658789 ) ] +"values": [ Vector2( -12.5, -0.658789 ) ] } tracks/7/type = "value" tracks/7/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast1:position") @@ -755,7 +755,7 @@ tracks/7/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 14.9301, -8.38456 ) ] +"values": [ Vector2( 12.5, -8.38456 ) ] } tracks/8/type = "value" tracks/8/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast2:position") @@ -767,7 +767,7 @@ tracks/8/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 14.9301, -0.658789 ) ] +"values": [ Vector2( 12.5, -0.658789 ) ] } tracks/9/type = "value" tracks/9/path = NodePath(".:offset") @@ -867,7 +867,7 @@ tracks/5/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -15.0191, -0.767529 ) ] +"values": [ Vector2( -12.5, -0.767529 ) ] } tracks/6/type = "value" tracks/6/path = NodePath("../WallRaycasts/LeftWallRaycast/Left_Wallcast1:position") @@ -879,7 +879,7 @@ tracks/6/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -15.0191, -7.0673 ) ] +"values": [ Vector2( -12.5, -7.0673 ) ] } tracks/7/type = "value" tracks/7/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast1:position") @@ -891,7 +891,7 @@ tracks/7/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 15.0135, -7.0673 ) ] +"values": [ Vector2( 12.5, -7.0673 ) ] } tracks/8/type = "value" tracks/8/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast2:position") @@ -903,7 +903,7 @@ tracks/8/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 15.0135, -0.767529 ) ] +"values": [ Vector2( 12.5, -0.767529 ) ] } tracks/9/type = "value" tracks/9/path = NodePath(".:offset") @@ -1004,7 +1004,7 @@ tracks/5/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -15.0191, -0.767529 ) ] +"values": [ Vector2( -12.5, -0.767529 ) ] } tracks/6/type = "value" tracks/6/path = NodePath("../WallRaycasts/LeftWallRaycast/Left_Wallcast1:position") @@ -1016,7 +1016,7 @@ tracks/6/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -15.0191, -7.0673 ) ] +"values": [ Vector2( -12.5, -7.0673 ) ] } tracks/7/type = "value" tracks/7/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast1:position") @@ -1028,7 +1028,7 @@ tracks/7/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 15.0135, -7.0673 ) ] +"values": [ Vector2( 12.5, -7.0673 ) ] } tracks/8/type = "value" tracks/8/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast2:position") @@ -1040,7 +1040,7 @@ tracks/8/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 15.0135, -0.767529 ) ] +"values": [ Vector2( 12.5, -0.767529 ) ] } tracks/9/type = "value" tracks/9/path = NodePath(".:offset") @@ -1261,7 +1261,7 @@ tracks/5/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -12, -13 ) ] +"values": [ Vector2( -9.5, -13 ) ] } tracks/6/type = "value" tracks/6/path = NodePath("../WallRaycasts/LeftWallRaycast/Left_Wallcast2:position") @@ -1273,7 +1273,7 @@ tracks/6/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -12, -5 ) ] +"values": [ Vector2( -9.5, -5 ) ] } tracks/7/type = "value" tracks/7/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast1:position") @@ -1285,7 +1285,7 @@ tracks/7/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 12, -13 ) ] +"values": [ Vector2( 9.5, -13 ) ] } tracks/8/type = "value" tracks/8/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast2:position") @@ -1297,7 +1297,7 @@ tracks/8/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 12, -5 ) ] +"values": [ Vector2( 9.5, -5 ) ] } tracks/9/type = "value" tracks/9/path = NodePath(".:offset") @@ -1398,7 +1398,7 @@ tracks/5/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -12, -13 ) ] +"values": [ Vector2( -9.5, -13 ) ] } tracks/6/type = "value" tracks/6/path = NodePath("../WallRaycasts/LeftWallRaycast/Left_Wallcast2:position") @@ -1410,7 +1410,7 @@ tracks/6/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -12, -5 ) ] +"values": [ Vector2( -9.5, -5 ) ] } tracks/7/type = "value" tracks/7/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast1:position") @@ -1422,7 +1422,7 @@ tracks/7/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 12, -13 ) ] +"values": [ Vector2( 9.5, -13 ) ] } tracks/8/type = "value" tracks/8/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast2:position") @@ -1434,7 +1434,7 @@ tracks/8/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 12, -5 ) ] +"values": [ Vector2( 9.5, -5 ) ] } tracks/9/type = "value" tracks/9/path = NodePath(".:offset") @@ -1534,7 +1534,7 @@ tracks/5/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -13, -10.686 ) ] +"values": [ Vector2( -11.5, -10.686 ) ] } tracks/6/type = "value" tracks/6/path = NodePath("../WallRaycasts/LeftWallRaycast/Left_Wallcast2:position") @@ -1546,7 +1546,7 @@ tracks/6/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -13, -1.942 ) ] +"values": [ Vector2( -11.5, -1.942 ) ] } tracks/7/type = "value" tracks/7/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast2:position") @@ -1558,7 +1558,7 @@ tracks/7/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 13, -1.942 ) ] +"values": [ Vector2( 11.5, -1.942 ) ] } tracks/8/type = "value" tracks/8/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast1:position") @@ -1570,7 +1570,7 @@ tracks/8/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 13, -10.686 ) ] +"values": [ Vector2( 11.5, -10.686 ) ] } tracks/9/type = "value" tracks/9/path = NodePath(".:offset") @@ -1670,7 +1670,7 @@ tracks/5/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 14, -10.686 ) ] +"values": [ Vector2( 11.5, -10.686 ) ] } tracks/6/type = "value" tracks/6/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast2:position") @@ -1682,7 +1682,7 @@ tracks/6/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 14, -1.942 ) ] +"values": [ Vector2( 11.5, -1.942 ) ] } tracks/7/type = "value" tracks/7/path = NodePath("../WallRaycasts/LeftWallRaycast/Left_Wallcast2:position") @@ -1694,7 +1694,7 @@ tracks/7/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -12, -1.942 ) ] +"values": [ Vector2( -9.5, -1.942 ) ] } tracks/8/type = "value" tracks/8/path = NodePath("../WallRaycasts/LeftWallRaycast/Left_Wallcast1:position") @@ -1706,7 +1706,7 @@ tracks/8/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -12, -10.686 ) ] +"values": [ Vector2( -9.5, -10.686 ) ] } tracks/9/type = "value" tracks/9/path = NodePath(".:offset") @@ -1807,7 +1807,7 @@ tracks/5/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 12, -10.686 ) ] +"values": [ Vector2( 9.5, -10.686 ) ] } tracks/6/type = "value" tracks/6/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast2:position") @@ -1819,7 +1819,7 @@ tracks/6/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 12, -1.942 ) ] +"values": [ Vector2( 9.5, -1.942 ) ] } tracks/7/type = "value" tracks/7/path = NodePath("../WallRaycasts/LeftWallRaycast/Left_Wallcast2:position") @@ -1831,7 +1831,7 @@ tracks/7/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -14, -1.942 ) ] +"values": [ Vector2( -11.5, -1.942 ) ] } tracks/8/type = "value" tracks/8/path = NodePath("../WallRaycasts/LeftWallRaycast/Left_Wallcast1:position") @@ -1843,7 +1843,7 @@ tracks/8/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -13.0423, -10.6856 ) ] +"values": [ Vector2( -11.5, -10.686 ) ] } tracks/9/type = "value" tracks/9/path = NodePath(".:offset") @@ -1954,7 +1954,7 @@ tracks/1/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 12, -10.686 ) ] +"values": [ Vector2( 9.5, -10.686 ) ] } tracks/2/type = "value" tracks/2/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast2:position") @@ -1966,7 +1966,7 @@ tracks/2/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 12, -1.942 ) ] +"values": [ Vector2( 9.5, -1.942 ) ] } tracks/3/type = "value" tracks/3/path = NodePath("../WallRaycasts/LeftWallRaycast/Left_Wallcast2:position") @@ -1975,10 +1975,10 @@ tracks/3/loop_wrap = true tracks/3/imported = false tracks/3/enabled = true tracks/3/keys = { -"times": PoolRealArray( 0 ), +"times": PoolRealArray( 0.01 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -13.0423, -1.94163 ) ] +"values": [ Vector2( -9.5, -1.942 ) ] } tracks/4/type = "value" tracks/4/path = NodePath("../WallRaycasts/LeftWallRaycast/Left_Wallcast1:position") @@ -1990,7 +1990,7 @@ tracks/4/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -12, -10.686 ) ] +"values": [ Vector2( -9.5, -10.686 ) ] } tracks/5/type = "value" tracks/5/path = NodePath("../BlobbySkin/CollisionPolygon2D:shape:extents") @@ -2089,10 +2089,10 @@ tracks/1/loop_wrap = true tracks/1/imported = false tracks/1/enabled = true tracks/1/keys = { -"times": PoolRealArray( 0 ), +"times": PoolRealArray( 0.01 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 12, -10.686 ) ] +"values": [ Vector2( 9.5, -10.686 ) ] } tracks/2/type = "value" tracks/2/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast2:position") @@ -2104,7 +2104,7 @@ tracks/2/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 12, -1.942 ) ] +"values": [ Vector2( 9.5, -1.942 ) ] } tracks/3/type = "value" tracks/3/path = NodePath("../WallRaycasts/LeftWallRaycast/Left_Wallcast2:position") @@ -2116,7 +2116,7 @@ tracks/3/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -12, -1.942 ) ] +"values": [ Vector2( -9.5, -1.942 ) ] } tracks/4/type = "value" tracks/4/path = NodePath("../WallRaycasts/LeftWallRaycast/Left_Wallcast1:position") @@ -2128,7 +2128,7 @@ tracks/4/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -12, -10.686 ) ] +"values": [ Vector2( -9.5, -10.686 ) ] } tracks/5/type = "value" tracks/5/path = NodePath("../BlobbySkin/CollisionPolygon2D:shape:extents") @@ -2264,7 +2264,7 @@ tracks/4/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -12, -9.013 ) ] +"values": [ Vector2( -9.5, -9.013 ) ] } tracks/5/type = "value" tracks/5/path = NodePath("../WallRaycasts/LeftWallRaycast/Left_Wallcast2:position") @@ -2276,7 +2276,7 @@ tracks/5/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -12, -1.942 ) ] +"values": [ Vector2( -9.5, -1.942 ) ] } tracks/6/type = "value" tracks/6/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast1:position") @@ -2288,7 +2288,7 @@ tracks/6/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 12.0573, -9.0133 ) ] +"values": [ Vector2( 9.5, -9.013 ) ] } tracks/7/type = "value" tracks/7/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast2:position") @@ -2300,7 +2300,7 @@ tracks/7/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 12.0573, -1.94163 ) ] +"values": [ Vector2( 9.5, -1.942 ) ] } tracks/8/type = "value" tracks/8/path = NodePath("../BlobbySkin/CollisionPolygon2D:position") @@ -2401,7 +2401,7 @@ tracks/4/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -12, -9.013 ) ] +"values": [ Vector2( -9.5, -9.013 ) ] } tracks/5/type = "value" tracks/5/path = NodePath("../WallRaycasts/LeftWallRaycast/Left_Wallcast2:position") @@ -2413,7 +2413,7 @@ tracks/5/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -12, -1.942 ) ] +"values": [ Vector2( -9.5, -1.942 ) ] } tracks/6/type = "value" tracks/6/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast1:position") @@ -2425,7 +2425,7 @@ tracks/6/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 12.0573, -9.0133 ) ] +"values": [ Vector2( 9.5, -9.013 ) ] } tracks/7/type = "value" tracks/7/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast2:position") @@ -2437,7 +2437,7 @@ tracks/7/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 12.0573, -1.94163 ) ] +"values": [ Vector2( 9.5, -1.942 ) ] } tracks/8/type = "value" tracks/8/path = NodePath("../BlobbySkin/CollisionPolygon2D:position") @@ -2605,10 +2605,10 @@ tracks/5/loop_wrap = true tracks/5/imported = false tracks/5/enabled = true tracks/5/keys = { -"times": PoolRealArray( 0 ), +"times": PoolRealArray( 0.01 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -11, -12.849 ) ] +"values": [ Vector2( -9.5, -12.849 ) ] } tracks/6/type = "value" tracks/6/path = NodePath("../WallRaycasts/LeftWallRaycast/Left_Wallcast2:position") @@ -2620,7 +2620,7 @@ tracks/6/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -11, -5.913 ) ] +"values": [ Vector2( -9.5, -5.913 ) ] } tracks/7/type = "value" tracks/7/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast1:position") @@ -2629,10 +2629,10 @@ tracks/7/loop_wrap = true tracks/7/imported = false tracks/7/enabled = true tracks/7/keys = { -"times": PoolRealArray( 0 ), +"times": PoolRealArray( -0.01 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 10.0805, -12.8494 ) ] +"values": [ Vector2( 9.5, -12.849 ) ] } tracks/8/type = "value" tracks/8/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast2:position") @@ -2644,7 +2644,7 @@ tracks/8/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 10.0805, -5.91313 ) ] +"values": [ Vector2( 9.5, -5.913 ) ] } tracks/9/type = "value" tracks/9/path = NodePath(".:offset") @@ -2745,7 +2745,7 @@ tracks/5/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -11, -12.849 ) ] +"values": [ Vector2( -8.5, -12.849 ) ] } tracks/6/type = "value" tracks/6/path = NodePath("../WallRaycasts/LeftWallRaycast/Left_Wallcast2:position") @@ -2757,7 +2757,7 @@ tracks/6/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -11, -5.913 ) ] +"values": [ Vector2( -8.5, -5.913 ) ] } tracks/7/type = "value" tracks/7/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast1:position") @@ -2769,7 +2769,7 @@ tracks/7/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 11, -12.849 ) ] +"values": [ Vector2( 8.5, -12.849 ) ] } tracks/8/type = "value" tracks/8/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast2:position") @@ -2781,7 +2781,7 @@ tracks/8/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 11, -5.913 ) ] +"values": [ Vector2( 8.5, -5.913 ) ] } tracks/9/type = "value" tracks/9/path = NodePath(".:offset") @@ -2802,10 +2802,10 @@ tracks/10/loop_wrap = true tracks/10/imported = false tracks/10/enabled = true tracks/10/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), +"times": PoolRealArray( 0, 0.23 ), +"transitions": PoolRealArray( 1, 1 ), "update": 0, -"values": [ Vector2( -1, 1 ) ] +"values": [ Vector2( -0.75, 1 ), Vector2( -1, 1 ) ] } [sub_resource type="Animation" id=49] @@ -2883,7 +2883,7 @@ tracks/5/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -11.0727, -1.94163 ) ] +"values": [ Vector2( -8.5, -1.942 ) ] } tracks/6/type = "value" tracks/6/path = NodePath("../WallRaycasts/LeftWallRaycast/Left_Wallcast1:position") @@ -2895,7 +2895,7 @@ tracks/6/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -11.0727, -10.6856 ) ] +"values": [ Vector2( -8.5, -10.686 ) ] } tracks/7/type = "value" tracks/7/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast1:position") @@ -2907,7 +2907,7 @@ tracks/7/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 14, -10.686 ) ] +"values": [ Vector2( 11.5, -10.686 ) ] } tracks/8/type = "value" tracks/8/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast2:position") @@ -2919,7 +2919,7 @@ tracks/8/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 14, -1.942 ) ] +"values": [ Vector2( 11.5, -1.942 ) ] } tracks/9/type = "value" tracks/9/path = NodePath(".:offset") @@ -3021,7 +3021,7 @@ tracks/5/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -14, -1.942 ) ] +"values": [ Vector2( -11.5, -1.942 ) ] } tracks/6/type = "value" tracks/6/path = NodePath("../WallRaycasts/LeftWallRaycast/Left_Wallcast1:position") @@ -3033,7 +3033,7 @@ tracks/6/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -14, -10.686 ) ] +"values": [ Vector2( -11.5, -10.686 ) ] } tracks/7/type = "value" tracks/7/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast1:position") @@ -3045,7 +3045,7 @@ tracks/7/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 11, -10.686 ) ] +"values": [ Vector2( 8.5, -10.686 ) ] } tracks/8/type = "value" tracks/8/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast2:position") @@ -3057,7 +3057,7 @@ tracks/8/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 11, -1.942 ) ] +"values": [ Vector2( 8.5, -1.942 ) ] } tracks/9/type = "value" tracks/9/path = NodePath(".:offset") @@ -3109,7 +3109,7 @@ tracks/1/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 12.0945, -1.94163 ) ] +"values": [ Vector2( 9.5, -1.942 ) ] } tracks/2/type = "value" tracks/2/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast1:position") @@ -3121,7 +3121,7 @@ tracks/2/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 12.0945, -10.6856 ) ] +"values": [ Vector2( 9.5, -10.686 ) ] } tracks/3/type = "value" tracks/3/path = NodePath("../WallRaycasts/LeftWallRaycast/Left_Wallcast2:position") @@ -3133,7 +3133,7 @@ tracks/3/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -12.0389, -1.94163 ) ] +"values": [ Vector2( -9.5, -1.942 ) ] } tracks/4/type = "value" tracks/4/path = NodePath("../WallRaycasts/LeftWallRaycast/Left_Wallcast1:position") @@ -3145,7 +3145,7 @@ tracks/4/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -12.0389, -10.6856 ) ] +"values": [ Vector2( -9.5, -10.686 ) ] } tracks/5/type = "value" tracks/5/path = NodePath("../BlobbyBody:position") @@ -3246,7 +3246,7 @@ tracks/1/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 12.0945, -1.94163 ) ] +"values": [ Vector2( 9.5, -1.942 ) ] } tracks/2/type = "value" tracks/2/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast1:position") @@ -3258,7 +3258,7 @@ tracks/2/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 12.0945, -10.6856 ) ] +"values": [ Vector2( 9.5, -10.686 ) ] } tracks/3/type = "value" tracks/3/path = NodePath("../WallRaycasts/LeftWallRaycast/Left_Wallcast2:position") @@ -3270,7 +3270,7 @@ tracks/3/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -12.0389, -1.94163 ) ] +"values": [ Vector2( -9.5, -1.942 ) ] } tracks/4/type = "value" tracks/4/path = NodePath("../WallRaycasts/LeftWallRaycast/Left_Wallcast1:position") @@ -3282,7 +3282,7 @@ tracks/4/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -12.0389, -10.6856 ) ] +"values": [ Vector2( -9.5, -10.686 ) ] } tracks/5/type = "value" tracks/5/path = NodePath("../BlobbyBody:position") @@ -3383,7 +3383,7 @@ tracks/1/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -12.0389, -10.6856 ) ] +"values": [ Vector2( -9.5, -10.686 ) ] } tracks/2/type = "value" tracks/2/path = NodePath("../WallRaycasts/LeftWallRaycast/Left_Wallcast2:position") @@ -3395,7 +3395,7 @@ tracks/2/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -12.0389, -1.94163 ) ] +"values": [ Vector2( -9.5, -1.942 ) ] } tracks/3/type = "value" tracks/3/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast2:position") @@ -3407,7 +3407,7 @@ tracks/3/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 14, -1.942 ) ] +"values": [ Vector2( 11.5, -1.942 ) ] } tracks/4/type = "value" tracks/4/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast1:position") @@ -3419,7 +3419,7 @@ tracks/4/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 14, -10.686 ) ] +"values": [ Vector2( 11.5, -10.686 ) ] } tracks/5/type = "value" tracks/5/path = NodePath("../BlobbyBody:shape:extents") @@ -3488,10 +3488,10 @@ tracks/10/loop_wrap = true tracks/10/imported = false tracks/10/enabled = true tracks/10/keys = { -"times": PoolRealArray( 0, 0.25, 0.5 ), -"transitions": PoolRealArray( 1, 1, 1 ), +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 1, 1 ), Vector2( 1, 1 ), Vector2( 1, 1 ) ] +"values": [ Vector2( 1, 1 ) ] } [sub_resource type="Animation" id=99] @@ -3520,7 +3520,7 @@ tracks/1/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -14, -10.686 ) ] +"values": [ Vector2( -11.5, -10.686 ) ] } tracks/2/type = "value" tracks/2/path = NodePath("../WallRaycasts/LeftWallRaycast/Left_Wallcast2:position") @@ -3532,7 +3532,7 @@ tracks/2/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -14, -1.942 ) ] +"values": [ Vector2( -11.5, -1.942 ) ] } tracks/3/type = "value" tracks/3/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast2:position") @@ -3544,7 +3544,7 @@ tracks/3/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 12, -1.942 ) ] +"values": [ Vector2( 9.5, -1.942 ) ] } tracks/4/type = "value" tracks/4/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast1:position") @@ -3556,7 +3556,7 @@ tracks/4/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 12, -10.686 ) ] +"values": [ Vector2( 9.5, -10.686 ) ] } tracks/5/type = "value" tracks/5/path = NodePath("../BlobbyBody:shape:extents") @@ -3705,7 +3705,7 @@ tracks/5/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -13, -15 ) ] +"values": [ Vector2( -11.5, -15 ) ] } tracks/6/type = "value" tracks/6/path = NodePath("../WallRaycasts/LeftWallRaycast/Left_Wallcast2:position") @@ -3717,7 +3717,7 @@ tracks/6/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -13.0617, -7.7509 ) ] +"values": [ Vector2( -11.5, -7.751 ) ] } tracks/7/type = "value" tracks/7/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast1:position") @@ -3726,10 +3726,10 @@ tracks/7/loop_wrap = true tracks/7/imported = false tracks/7/enabled = true tracks/7/keys = { -"times": PoolRealArray( 0 ), +"times": PoolRealArray( 0.01 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 8.09441, -15.3513 ) ] +"values": [ Vector2( 5.5, -15.351 ) ] } tracks/8/type = "value" tracks/8/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast2:position") @@ -3738,10 +3738,10 @@ tracks/8/loop_wrap = true tracks/8/imported = false tracks/8/enabled = true tracks/8/keys = { -"times": PoolRealArray( 0 ), +"times": PoolRealArray( -0.02 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 8.09441, -7.7509 ) ] +"values": [ Vector2( 5.5, -7.751 ) ] } tracks/9/type = "value" tracks/9/path = NodePath(".:offset") @@ -3843,7 +3843,7 @@ tracks/5/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -8, -15 ) ] +"values": [ Vector2( -5.5, -15 ) ] } tracks/6/type = "value" tracks/6/path = NodePath("../WallRaycasts/LeftWallRaycast/Left_Wallcast2:position") @@ -3855,7 +3855,7 @@ tracks/6/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( -8, -7.751 ) ] +"values": [ Vector2( -5.5, -7.751 ) ] } tracks/7/type = "value" tracks/7/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast1:position") @@ -3864,10 +3864,10 @@ tracks/7/loop_wrap = true tracks/7/imported = false tracks/7/enabled = true tracks/7/keys = { -"times": PoolRealArray( 0 ), +"times": PoolRealArray( 0.01 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 13, -15.351 ) ] +"values": [ Vector2( 11.5, -15.351 ) ] } tracks/8/type = "value" tracks/8/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast2:position") @@ -3876,10 +3876,10 @@ tracks/8/loop_wrap = true tracks/8/imported = false tracks/8/enabled = true tracks/8/keys = { -"times": PoolRealArray( 0 ), +"times": PoolRealArray( 0.01 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 13, -7.751 ) ] +"values": [ Vector2( 11.5, -7.751 ) ] } tracks/9/type = "value" tracks/9/path = NodePath(".:offset") @@ -4068,7 +4068,7 @@ tracks/1/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 1, -15.351 ) ] +"values": [ Vector2( 3.5, -15.351 ) ] } tracks/2/type = "value" tracks/2/path = NodePath("../WallRaycasts/LeftWallRaycast/Left_Wallcast2:position") @@ -4080,7 +4080,7 @@ tracks/2/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 1, -7.751 ) ] +"values": [ Vector2( 3.5, -7.751 ) ] } tracks/3/type = "value" tracks/3/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast1:position") @@ -4092,7 +4092,7 @@ tracks/3/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 13, -15.351 ) ] +"values": [ Vector2( 11.5, -15.351 ) ] } tracks/4/type = "value" tracks/4/path = NodePath("../WallRaycasts/RightWallRaycast/Right_Wallcast2:position") @@ -4104,7 +4104,7 @@ tracks/4/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 13, -7.751 ) ] +"values": [ Vector2( 11.5, -7.751 ) ] } tracks/5/type = "value" tracks/5/path = NodePath("../BlobbyBody:shape:extents") @@ -4506,29 +4506,29 @@ position = Vector2( 0, -1 ) [node name="LeftWallRaycast" type="Node2D" parent="WallRaycasts"] [node name="Left_Wallcast1" type="RayCast2D" parent="WallRaycasts/LeftWallRaycast"] -position = Vector2( -12, -10.686 ) +position = Vector2( -9.5, -10.686 ) enabled = true -cast_to = Vector2( -2.5, 0 ) +cast_to = Vector2( -5, 0 ) collision_mask = 40 [node name="Left_Wallcast2" type="RayCast2D" parent="WallRaycasts/LeftWallRaycast"] -position = Vector2( -12, -1.942 ) +position = Vector2( -9.5, -1.942 ) enabled = true -cast_to = Vector2( -2.5, 0 ) +cast_to = Vector2( -5, 0 ) collision_mask = 40 [node name="RightWallRaycast" type="Node2D" parent="WallRaycasts"] [node name="Right_Wallcast1" type="RayCast2D" parent="WallRaycasts/RightWallRaycast"] -position = Vector2( 14, -10.686 ) +position = Vector2( 11.5, -10.686 ) enabled = true -cast_to = Vector2( 2.5, 0 ) +cast_to = Vector2( 5, 0 ) collision_mask = 40 [node name="Right_Wallcast2" type="RayCast2D" parent="WallRaycasts/RightWallRaycast"] -position = Vector2( 14, -1.942 ) +position = Vector2( 11.5, -1.942 ) enabled = true -cast_to = Vector2( 2.5, 0 ) +cast_to = Vector2( 5, 0 ) collision_mask = 40 [node name="SlopeRaycastLeft" type="RayCast2D" parent="."] @@ -4556,6 +4556,10 @@ script = ExtResource( 3 ) wait_time = 0.1 one_shot = true +[node name="CrushTimer" type="Timer" parent="BlobbyStateMachine"] +wait_time = 0.2 +one_shot = true + [node name="CoyoteTimer" type="Timer" parent="BlobbyStateMachine"] wait_time = 0.07 one_shot = true @@ -4571,6 +4575,7 @@ one_shot = true [connection signal="area_entered" from="BlobbySkin" to="." method="_on_BlobbySkin_area_entered"] [connection signal="got_grounded" from="BlobbyStateMachine" to="." method="_on_Blobby_got_grounded"] [connection signal="timeout" from="BlobbyStateMachine/JumpBufferTimer" to="BlobbyStateMachine" method="_on_JumpBufferTimer_timeout"] +[connection signal="timeout" from="BlobbyStateMachine/CrushTimer" to="." method="_on_CrushTimer_timeout"] [connection signal="timeout" from="InvincibilityTimer" to="." method="_on_InvincibilityTimer_timeout"] -[connection signal="timeout" from="PitfallTimer" to="." method="_on_PitfallTimer_timeout"] [connection signal="timeout" from="PitfallTimer" to="." method="die_for_real" binds= [ -1 ]] +[connection signal="timeout" from="PitfallTimer" to="." method="_on_PitfallTimer_timeout"] diff --git a/src/Levels/Level 0.1.tscn b/src/Levels/Level 0.1.tscn index d309603..1140d76 100644 --- a/src/Levels/Level 0.1.tscn +++ b/src/Levels/Level 0.1.tscn @@ -1322,9 +1322,13 @@ playing = true unique_name_in_owner = true position = Vector2( -70, 1 ) scale = Vector2( 0.878906, 0.936025 ) +mass = null +jump_buffer_filled = null +death_sound_1 = null +death_sound_2 = null [node name="BlobbySprite" parent="Blobby" index="5"] -frame = 9 +frame = 8 [node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"] parameters/playback = SubResource( 33 ) diff --git a/src/Levels/Level 0.2.tscn b/src/Levels/Level 0.2.tscn index 5a7ba26..ad36dad 100644 --- a/src/Levels/Level 0.2.tscn +++ b/src/Levels/Level 0.2.tscn @@ -1146,6 +1146,13 @@ drag_margin_bottom = 0.1 unique_name_in_owner = true position = Vector2( -156, -51 ) scale = Vector2( 0.878906, 0.936025 ) +mass = null +jump_buffer_filled = null +death_sound_1 = null +death_sound_2 = null + +[node name="BlobbySprite" parent="Blobby" index="5"] +frame = 8 [node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"] parameters/playback = SubResource( 6 ) diff --git a/src/Levels/Level 0.3.tscn b/src/Levels/Level 0.3.tscn index c570229..8731e45 100644 --- a/src/Levels/Level 0.3.tscn +++ b/src/Levels/Level 0.3.tscn @@ -235,6 +235,13 @@ visible = false unique_name_in_owner = true position = Vector2( -180, 113 ) scale = Vector2( 0.878906, 0.936025 ) +mass = null +jump_buffer_filled = null +death_sound_1 = null +death_sound_2 = null + +[node name="BlobbySprite" parent="Blobby" index="5"] +frame = 8 [node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"] parameters/playback = SubResource( 6 ) diff --git a/src/Levels/Level 0.4.tscn b/src/Levels/Level 0.4.tscn index 4d62188..2500d3a 100644 --- a/src/Levels/Level 0.4.tscn +++ b/src/Levels/Level 0.4.tscn @@ -124,6 +124,10 @@ drag_margin_bottom = 0.3 unique_name_in_owner = true position = Vector2( -70, 1 ) scale = Vector2( 0.878906, 0.936025 ) +mass = null +jump_buffer_filled = null +death_sound_1 = null +death_sound_2 = null [node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"] parameters/playback = SubResource( 6 ) diff --git a/src/Levels/Level 0.5.tscn b/src/Levels/Level 0.5.tscn index ff56b78..d88f954 100644 --- a/src/Levels/Level 0.5.tscn +++ b/src/Levels/Level 0.5.tscn @@ -122,6 +122,10 @@ drag_margin_bottom = 0.3 unique_name_in_owner = true position = Vector2( -186, 113 ) scale = Vector2( 0.878906, 0.936025 ) +mass = null +jump_buffer_filled = null +death_sound_1 = null +death_sound_2 = null [node name="BlobbySprite" parent="Blobby" index="5"] frame = 6 diff --git a/src/Levels/Level 0.6.tscn b/src/Levels/Level 0.6.tscn index 56dccb4..c59bbd5 100644 --- a/src/Levels/Level 0.6.tscn +++ b/src/Levels/Level 0.6.tscn @@ -127,9 +127,13 @@ drag_margin_bottom = 0.3 unique_name_in_owner = true position = Vector2( -142, 17 ) scale = Vector2( 0.878906, 0.936025 ) +mass = null +jump_buffer_filled = null +death_sound_1 = null +death_sound_2 = null [node name="BlobbySprite" parent="Blobby" index="5"] -frame = 6 +frame = 5 [node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"] parameters/playback = SubResource( 53 ) diff --git a/src/Levels/Level 1.tscn b/src/Levels/Level 1.tscn index 52c2a53..a984eb4 100644 --- a/src/Levels/Level 1.tscn +++ b/src/Levels/Level 1.tscn @@ -129,9 +129,10 @@ drag_margin_bottom = 0.3 unique_name_in_owner = true position = Vector2( -70, -1.90735e-06 ) scale = Vector2( 0.878906, 0.936025 ) - -[node name="BlobbySprite" parent="Blobby" index="5"] -frame = 9 +mass = null +jump_buffer_filled = null +death_sound_1 = null +death_sound_2 = null [node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"] parameters/playback = SubResource( 6 ) diff --git a/src/Levels/Level 4.tscn b/src/Levels/Level 4.tscn index 10d3965..865dad0 100644 --- a/src/Levels/Level 4.tscn +++ b/src/Levels/Level 4.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=17 format=2] +[gd_scene load_steps=18 format=2] [ext_resource path="res://src/Environment/GreenHouseTiles.tres" type="TileSet" id=1] [ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=2] @@ -6,6 +6,7 @@ [ext_resource path="res://src/Actors/BlobbyCam.tscn" type="PackedScene" id=4] [ext_resource path="res://src/Environment/DropThroughPlatforms.tres" type="TileSet" id=5] [ext_resource path="res://src/Utilities/SceneAudio.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/BenefitialObjects/SavePoint.tscn" type="PackedScene" id=7] [ext_resource path="res://src/Actors/Blobby/Blobby.tscn" type="PackedScene" id=8] [ext_resource path="res://src/UserInterface/UserInterface.tscn" type="PackedScene" id=9] [ext_resource path="res://src/Levels/Templates/LevelTemplate.gd" type="Script" id=10] @@ -109,21 +110,26 @@ unique_name_in_owner = true [node name="BlobbyCam" parent="." instance=ExtResource( 4 )] unique_name_in_owner = true +current = false drag_margin_bottom = 0.3 [node name="Blobby" parent="." instance=ExtResource( 8 )] unique_name_in_owner = true -position = Vector2( -180, 64 ) +position = Vector2( 1070, -51 ) scale = Vector2( 0.878906, 0.936025 ) +mass = null +jump_buffer_filled = null +death_sound_1 = null +death_sound_2 = null [node name="BlobbySprite" parent="Blobby" index="5"] -frame = 7 +frame = 6 [node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"] parameters/playback = SubResource( 6 ) [node name="Mine" parent="." instance=ExtResource( 14 )] -position = Vector2( -128, 72 ) +position = Vector2( -95, -190 ) is_armed = true [node name="TileMap" type="TileMap" parent="."] @@ -136,7 +142,7 @@ collision_layer = 8 collision_mask = 8 bake_navigation = true format = 1 -tile_data = PoolIntArray( -393232, 5, 65540, -393231, 5, 10, -393230, 5, 10, -393229, 5, 10, -393228, 5, 10, -393227, 5, 10, -393226, 5, 10, -393225, 5, 10, -393224, 5, 10, -393223, 5, 10, -393222, 5, 10, -393221, 5, 10, -393220, 5, 10, -393219, 5, 10, -393218, 5, 10, -393217, 5, 10, -458752, 5, 10, -458751, 5, 10, -458750, 5, 10, -458749, 5, 10, -458748, 5, 10, -458747, 5, 10, -458746, 5, 10, -458745, 5, 10, -458744, 5, 10, -458743, 5, 10, -458742, 5, 10, -458741, 5, 10, -458740, 5, 10, -458739, 5, 10, -458738, 5, 10, -458737, 5, 10, -458736, 5, 10, -458735, 5, 10, -458734, 5, 10, -458733, 5, 10, -458732, 5, 10, -458731, 5, 10, -458730, 5, 10, -458729, 5, 10, -458728, 5, 10, -458727, 5, 10, -458726, 5, 10, -458725, 5, 10, -458724, 5, 10, -458723, 5, 10, -458722, 5, 10, -458721, 5, 10, -458720, 5, 10, -458719, 5, 10, -458718, 5, 10, -458717, 5, 10, -458716, 5, 10, -458715, 5, 10, -458714, 5, 10, -458713, 5, 10, -458712, 5, 10, -458711, 5, 10, -458710, 5, 10, -458709, 5, 10, -458708, 5, 10, -458707, 5, 65541, -327696, 5, 7, -327692, 7, 0, -327691, 7, 0, -327690, 7, 0, -327689, 7, 0, -327688, 7, 0, -327687, 7, 0, -327686, 7, 0, -327685, 7, 0, -327684, 7, 0, -327683, 7, 0, -327682, 7, 0, -327681, 7, 0, -393216, 7, 0, -393215, 7, 0, -393214, 7, 0, -393213, 7, 0, -393212, 7, 0, -393211, 7, 0, -393210, 7, 0, -393209, 7, 0, -393208, 7, 0, -393207, 7, 0, -393206, 7, 0, -393205, 7, 0, -393204, 7, 0, -393203, 7, 0, -393202, 7, 0, -393201, 7, 0, -393200, 7, 0, -393199, 7, 0, -393198, 7, 0, -393184, 5, 3, -393183, 5, 3, -393171, 5, 6, -262160, 5, 7, -262156, 7, 0, -262155, 7, 0, -262154, 7, 0, -262153, 7, 0, -262152, 7, 0, -262151, 7, 0, -262150, 7, 0, -262149, 7, 0, -262148, 7, 0, -262147, 7, 0, -262146, 7, 0, -262145, 7, 0, -327680, 7, 0, -327679, 7, 0, -327678, 7, 0, -327677, 7, 0, -327676, 7, 0, -327675, 7, 0, -327674, 7, 0, -327673, 7, 0, -327672, 7, 0, -327671, 7, 0, -327670, 7, 0, -327669, 7, 0, -327668, 7, 0, -327667, 7, 0, -327666, 7, 0, -327665, 7, 0, -327664, 7, 0, -327663, 7, 0, -327662, 7, 0, -327648, 5, 3, -327647, 5, 3, -327635, 5, 6, -196624, 5, 7, -196620, 7, 0, -196619, 7, 0, -196618, 7, 0, -196617, 7, 0, -196616, 7, 0, -196615, 7, 0, -196614, 7, 0, -196613, 7, 0, -196612, 7, 0, -196611, 7, 0, -196610, 7, 0, -196609, 7, 0, -262144, 7, 0, -262143, 7, 0, -262142, 7, 0, -262141, 7, 0, -262140, 7, 0, -262139, 7, 0, -262138, 7, 0, -262137, 7, 0, -262136, 7, 0, -262135, 7, 0, -262134, 7, 0, -262133, 7, 0, -262132, 7, 0, -262131, 7, 0, -262130, 7, 0, -262129, 7, 0, -262128, 7, 0, -262127, 7, 0, -262126, 7, 0, -262112, 5, 3, -262111, 5, 3, -262099, 5, 6, -131088, 5, 7, -131085, 7, 0, -131084, 7, 0, -131083, 7, 0, -131082, 7, 0, -131081, 7, 0, -131080, 7, 0, -131079, 7, 0, -131078, 7, 0, -131077, 7, 0, -131076, 7, 0, -131075, 7, 0, -131074, 7, 0, -131073, 7, 0, -196608, 7, 0, -196607, 7, 0, -196606, 7, 0, -196605, 7, 0, -196604, 7, 0, -196603, 7, 0, -196602, 7, 0, -196601, 7, 0, -196600, 7, 0, -196599, 7, 0, -196598, 7, 0, -196597, 7, 0, -196596, 7, 0, -196595, 7, 0, -196594, 7, 0, -196593, 7, 0, -196592, 7, 0, -196591, 7, 0, -196590, 7, 0, -196576, 5, 3, -196575, 5, 3, -196563, 5, 6, -65552, 5, 7, -65549, 7, 0, -65548, 7, 0, -65547, 7, 0, -65546, 7, 0, -65545, 7, 0, -65544, 7, 0, -65543, 7, 0, -65542, 7, 0, -65541, 7, 0, -65540, 7, 0, -65539, 7, 0, -65538, 7, 0, -65537, 7, 0, -131072, 7, 0, -131071, 7, 0, -131070, 7, 0, -131069, 7, 0, -131068, 7, 0, -131067, 7, 0, -131066, 7, 0, -131065, 7, 0, -131064, 7, 0, -131063, 7, 0, -131062, 7, 0, -131061, 7, 0, -131060, 7, 0, -131059, 7, 0, -131058, 7, 0, -131057, 7, 0, -131056, 7, 0, -131055, 7, 0, -131054, 7, 0, -131040, 5, 3, -131039, 5, 3, -131027, 5, 6, -16, 5, 7, -13, 7, 0, -12, 7, 0, -11, 7, 0, -10, 7, 0, -9, 7, 0, -8, 7, 0, -7, 7, 0, -6, 7, 0, -5, 7, 0, -4, 7, 0, -3, 7, 0, -2, 7, 0, -1, 7, 0, -65536, 7, 0, -65535, 7, 0, -65534, 7, 0, -65533, 7, 0, -65532, 7, 0, -65531, 7, 0, -65530, 7, 0, -65529, 7, 0, -65528, 7, 0, -65527, 7, 0, -65526, 7, 0, -65525, 7, 0, -65524, 7, 0, -65523, 7, 0, -65522, 7, 0, -65521, 7, 0, -65520, 7, 0, -65519, 7, 0, -65518, 7, 0, -65504, 5, 3, -65503, 5, 3, -65491, 5, 6, 65520, 5, 7, 2, 7, 0, 3, 7, 0, 4, 7, 0, 5, 7, 0, 6, 7, 0, 7, 7, 0, 8, 7, 0, 9, 7, 0, 10, 7, 0, 11, 7, 0, 12, 7, 0, 13, 7, 0, 14, 7, 0, 15, 7, 0, 16, 7, 0, 17, 7, 0, 18, 7, 0, 26, 5, 1, 27, 5, 1, 28, 5, 1, 32, 5, 3, 33, 5, 3, 34, 5, 3, 37, 5, 3, 38, 5, 3, 39, 5, 3, 40, 5, 3, 41, 5, 3, 42, 5, 3, 43, 5, 3, 44, 5, 3, 45, 5, 6, 131056, 5, 7, 131059, 7, 0, 131060, 7, 0, 131061, 7, 0, 131062, 7, 0, 131063, 7, 0, 131064, 7, 0, 131065, 7, 0, 131066, 7, 0, 131067, 7, 0, 131068, 7, 0, 131069, 7, 0, 131070, 7, 0, 131071, 7, 0, 65536, 7, 0, 65537, 7, 0, 65538, 7, 0, 65539, 7, 0, 65540, 7, 0, 65541, 7, 0, 65542, 7, 0, 65543, 7, 0, 65544, 7, 0, 65545, 7, 0, 65546, 7, 0, 65547, 7, 0, 65548, 7, 0, 65549, 7, 0, 65550, 7, 0, 65551, 7, 0, 65552, 7, 0, 65553, 7, 0, 65554, 7, 0, 65562, 5, 1, 65563, 5, 1, 65564, 5, 1, 65568, 5, 3, 65569, 5, 3, 65570, 5, 3, 65573, 5, 3, 65574, 5, 3, 65575, 5, 3, 65576, 5, 3, 65577, 5, 3, 65578, 5, 3, 65579, 5, 3, 65580, 5, 3, 65581, 5, 6, 196592, 5, 7, 196595, 7, 0, 196596, 7, 0, 196597, 7, 0, 196598, 7, 0, 196599, 7, 0, 196600, 7, 0, 196601, 7, 0, 196602, 7, 0, 196603, 7, 0, 196604, 7, 0, 196605, 7, 0, 196606, 7, 0, 196607, 7, 0, 131072, 7, 0, 131073, 7, 0, 131074, 7, 0, 131075, 7, 0, 131076, 7, 0, 131077, 7, 0, 131078, 7, 0, 131079, 7, 0, 131080, 7, 0, 131081, 7, 0, 131082, 7, 0, 131083, 7, 0, 131084, 7, 0, 131085, 7, 0, 131086, 7, 0, 131087, 7, 0, 131088, 7, 0, 131089, 7, 0, 131090, 7, 0, 131098, 5, 1, 131099, 5, 1, 131100, 5, 1, 131117, 5, 6, 262128, 5, 7, 262131, 7, 0, 262132, 7, 0, 262133, 7, 0, 262134, 7, 0, 262135, 7, 0, 262137, 7, 0, 262138, 7, 0, 262139, 7, 0, 262140, 7, 0, 262141, 7, 0, 262142, 7, 0, 262143, 7, 0, 196608, 7, 0, 196609, 7, 0, 196610, 7, 0, 196611, 7, 0, 196612, 7, 0, 196613, 7, 0, 196614, 7, 0, 196615, 7, 0, 196616, 7, 0, 196617, 7, 0, 196618, 7, 0, 196619, 7, 0, 196620, 7, 0, 196621, 7, 0, 196622, 7, 0, 196623, 7, 0, 196624, 7, 0, 196625, 7, 0, 196626, 7, 0, 196634, 5, 1, 196635, 5, 1, 196636, 5, 1, 196653, 5, 6, 327664, 5, 7, 327667, 5, 65542, 327668, 5, 65543, 327669, 5, 65543, 327670, 5, 65544, 327671, 7, 0, 327672, 7, 0, 327673, 5, 65542, 327674, 5, 65544, 327677, 7, 0, 327678, 7, 0, 327679, 7, 0, 262144, 7, 0, 262145, 7, 0, 262146, 7, 0, 262147, 7, 0, 262148, 7, 0, 262149, 7, 0, 262150, 7, 0, 262151, 7, 0, 262152, 7, 0, 262153, 7, 0, 262154, 7, 0, 262155, 7, 0, 262156, 7, 0, 262157, 7, 0, 262158, 7, 0, 262159, 7, 0, 262160, 7, 0, 262161, 7, 0, 262162, 7, 0, 262170, 5, 1, 262171, 5, 1, 262172, 5, 1, 262173, 5, 3, 262174, 5, 3, 262175, 5, 3, 262176, 5, 3, 262177, 5, 3, 262178, 5, 3, 262179, 5, 3, 262180, 5, 3, 262181, 5, 3, 262182, 5, 3, 262183, 5, 3, 262184, 5, 3, 262185, 5, 3, 262186, 5, 3, 262187, 5, 3, 262188, 5, 3, 262189, 5, 6, 393200, 5, 7, 393203, 7, 0, 393204, 7, 0, 393205, 7, 0, 393206, 7, 0, 393207, 7, 0, 393208, 7, 0, 393209, 7, 0, 393210, 7, 0, 393211, 7, 0, 393212, 7, 0, 393213, 7, 0, 393214, 7, 0, 393215, 7, 0, 327680, 7, 0, 327681, 7, 0, 327682, 7, 0, 327683, 7, 0, 327684, 7, 0, 327685, 7, 0, 327686, 7, 0, 327687, 7, 0, 327688, 7, 0, 327689, 7, 0, 327690, 7, 0, 327691, 7, 0, 327692, 7, 0, 327693, 7, 0, 327694, 5, 1, 327695, 7, 0, 327696, 7, 0, 327697, 7, 0, 327698, 7, 0, 327706, 5, 1, 327707, 5, 1, 327708, 5, 1, 327709, 5, 3, 327710, 5, 3, 327711, 5, 3, 327712, 5, 3, 327713, 5, 3, 327714, 5, 3, 327715, 5, 3, 327716, 5, 3, 327717, 5, 3, 327718, 5, 3, 327719, 5, 3, 327720, 5, 3, 327721, 5, 3, 327722, 5, 3, 327723, 5, 3, 327724, 5, 3, 327725, 5, 6, 458736, 5, 7, 458739, 7, 0, 458740, 7, 0, 458741, 7, 0, 458742, 7, 0, 458743, 7, 0, 458744, 7, 0, 458745, 7, 0, 458746, 7, 0, 458747, 7, 0, 458748, 7, 0, 458749, 7, 0, 458750, 7, 0, 458751, 7, 0, 393216, 7, 0, 393217, 7, 0, 393218, 7, 0, 393219, 7, 0, 393220, 7, 0, 393221, 7, 0, 393222, 7, 0, 393223, 7, 0, 393224, 7, 0, 393225, 7, 0, 393226, 7, 0, 393227, 7, 0, 393228, 7, 0, 393229, 7, 0, 393230, 5, 1, 393231, 7, 0, 393232, 7, 0, 393233, 7, 0, 393234, 7, 0, 393242, 5, 1, 393243, 5, 1, 393244, 5, 1, 393245, 5, 3, 393246, 5, 3, 393247, 5, 3, 393248, 5, 3, 393249, 5, 3, 393250, 5, 3, 393251, 5, 3, 393252, 5, 3, 393253, 5, 3, 393254, 5, 3, 393255, 5, 3, 393256, 5, 3, 393257, 5, 3, 393258, 5, 3, 393259, 5, 3, 393260, 5, 3, 393261, 5, 6, 524272, 5, 65538, 524273, 5, 3, 524274, 5, 3, 524275, 5, 2, 524276, 5, 2, 524277, 5, 2, 524278, 5, 2, 524279, 5, 2, 524280, 5, 2, 524281, 5, 2, 524282, 5, 2, 524283, 5, 2, 524284, 5, 2, 524285, 5, 2, 524286, 5, 2, 524287, 5, 2, 458752, 5, 2, 458753, 5, 2, 458754, 5, 2, 458755, 5, 2, 458756, 5, 2, 458757, 5, 2, 458758, 5, 2, 458759, 5, 2, 458760, 5, 2, 458761, 5, 2, 458762, 5, 2, 458763, 5, 2, 458764, 5, 2, 458765, 5, 2, 458766, 5, 2, 458767, 5, 2, 458768, 5, 2, 458769, 5, 2, 458770, 5, 2, 458771, 5, 2, 458772, 5, 2, 458773, 5, 2, 458774, 5, 2, 458775, 5, 2, 458776, 5, 2, 458777, 5, 2, 458778, 5, 2, 458779, 5, 2, 458780, 5, 2, 458781, 5, 2, 458782, 5, 2, 458783, 5, 2, 458784, 5, 2, 458785, 5, 2, 458786, 5, 2, 458787, 5, 2, 458788, 5, 2, 458789, 5, 2, 458790, 5, 2, 458791, 5, 2, 458792, 5, 2, 458793, 5, 2, 458794, 5, 2, 458795, 5, 2, 458796, 5, 2, 458797, 5, 65539 ) +tile_data = PoolIntArray( -983032, 5, 65540, -983031, 5, 10, -983030, 5, 10, -983029, 5, 10, -983028, 5, 10, -983027, 5, 10, -983026, 5, 10, -983025, 5, 10, -983024, 5, 10, -983023, 5, 10, -983022, 5, 10, -983021, 5, 10, -983020, 5, 10, -983019, 5, 10, -983018, 5, 10, -983017, 5, 10, -983016, 5, 10, -983015, 5, 10, -983014, 5, 10, -983013, 5, 10, -983012, 5, 10, -983011, 5, 10, -983010, 5, 10, -983009, 5, 10, -983008, 5, 10, -983007, 5, 10, -983006, 5, 10, -983005, 5, 10, -983004, 5, 10, -983003, 5, 10, -983002, 5, 10, -983001, 5, 10, -983000, 5, 10, -982999, 5, 10, -982998, 5, 10, -982997, 5, 10, -982996, 5, 10, -982995, 5, 10, -982994, 5, 10, -982993, 5, 10, -917496, 5, 7, -917456, 5, 6, -851960, 5, 7, -851920, 5, 6, -786424, 5, 7, -786384, 5, 6, -720888, 5, 7, -720848, 5, 6, -655352, 5, 7, -655312, 5, 6, -589816, 5, 7, -589776, 5, 6, -524280, 5, 7, -524240, 5, 6, -393232, 5, 65540, -393231, 5, 10, -393230, 5, 10, -393229, 5, 10, -393228, 5, 10, -393227, 5, 10, -393226, 5, 10, -393225, 5, 10, -393224, 5, 10, -393223, 5, 10, -393222, 5, 10, -393221, 5, 10, -393220, 5, 10, -393219, 5, 10, -393218, 5, 10, -393217, 5, 10, -458752, 5, 10, -458751, 5, 10, -458750, 5, 10, -458749, 5, 10, -458748, 5, 10, -458747, 5, 10, -458746, 5, 10, -458745, 5, 10, -458744, 5, 65536, -458704, 5, 6, -458695, 5, 65540, -458694, 5, 10, -458693, 5, 10, -458692, 5, 10, -458691, 5, 10, -458690, 5, 10, -458689, 5, 10, -458688, 5, 10, -458687, 5, 10, -458686, 5, 10, -458685, 5, 10, -458684, 5, 10, -458683, 5, 10, -458682, 5, 10, -458681, 5, 10, -458680, 5, 65541, -327696, 5, 7, -327692, 7, 0, -327691, 7, 0, -327690, 7, 0, -327689, 7, 0, -327688, 7, 0, -327687, 7, 0, -327686, 7, 0, -327685, 7, 0, -327684, 7, 0, -327683, 7, 0, -327682, 7, 0, -327681, 7, 0, -393216, 7, 0, -393215, 7, 0, -393214, 7, 0, -393213, 7, 0, -393212, 7, 0, -393211, 7, 0, -393210, 7, 0, -393209, 7, 0, -393208, 7, 0, -393207, 7, 0, -393206, 7, 0, -393205, 7, 0, -393203, 7, 0, -393202, 7, 0, -393201, 7, 0, -393200, 7, 0, -393199, 7, 0, -393198, 7, 0, -393191, 5, 1, -393190, 5, 2, -393189, 5, 2, -393188, 5, 2, -393187, 5, 2, -393186, 5, 2, -393185, 5, 2, -393184, 5, 2, -393183, 5, 2, -393182, 5, 2, -393181, 5, 4, -393168, 5, 6, -393159, 5, 7, -393144, 5, 6, -262160, 5, 7, -262156, 7, 0, -262155, 7, 0, -262154, 7, 0, -262153, 7, 0, -262152, 7, 0, -262151, 7, 0, -262150, 7, 0, -262149, 7, 0, -262148, 7, 0, -262147, 7, 0, -262146, 7, 0, -262145, 7, 0, -327680, 7, 0, -327679, 7, 0, -327678, 7, 0, -327677, 7, 0, -327676, 7, 0, -327675, 7, 0, -327674, 7, 0, -327673, 7, 0, -327672, 7, 0, -327671, 7, 0, -327670, 7, 0, -327669, 7, 0, -327668, 7, 0, -327666, 7, 0, -327665, 7, 0, -327664, 7, 0, -327663, 7, 0, -327662, 7, 0, -327655, 5, 6, -327645, 5, 7, -327632, 5, 6, -327623, 5, 7, -327608, 5, 6, -196624, 5, 7, -196620, 7, 0, -196619, 7, 0, -196618, 7, 0, -196617, 7, 0, -196616, 7, 0, -196615, 7, 0, -196614, 7, 0, -196613, 7, 0, -196612, 7, 0, -196611, 7, 0, -196610, 7, 0, -196609, 7, 0, -262144, 7, 0, -262143, 7, 0, -262142, 7, 0, -262141, 7, 0, -262140, 7, 0, -262139, 7, 0, -262138, 7, 0, -262137, 7, 0, -262136, 7, 0, -262135, 7, 0, -262134, 7, 0, -262133, 7, 0, -262132, 7, 0, -262129, 7, 0, -262128, 7, 0, -262127, 7, 0, -262126, 7, 0, -262119, 5, 6, -262109, 5, 7, -262096, 5, 6, -262087, 5, 7, -262072, 5, 6, -131088, 5, 7, -131085, 7, 0, -131084, 7, 0, -131083, 7, 0, -131082, 7, 0, -131081, 7, 0, -131080, 7, 0, -131079, 7, 0, -131078, 7, 0, -131077, 7, 0, -131076, 7, 0, -131075, 7, 0, -131074, 7, 0, -131073, 7, 0, -196608, 7, 0, -196607, 7, 0, -196606, 7, 0, -196605, 7, 0, -196604, 7, 0, -196603, 7, 0, -196602, 7, 0, -196601, 7, 0, -196600, 7, 0, -196599, 7, 0, -196598, 7, 0, -196597, 7, 0, -196596, 7, 0, -196595, 7, 0, -196593, 7, 0, -196592, 7, 0, -196591, 7, 0, -196590, 7, 0, -196583, 5, 6, -196573, 5, 7, -196560, 5, 6, -196551, 5, 7, -196544, 5, 1, -196543, 5, 3, -196542, 5, 3, -196541, 5, 3, -196540, 5, 3, -196539, 5, 4, -196536, 5, 9, -196535, 5, 10, -196534, 5, 10, -196533, 5, 10, -196532, 5, 10, -196531, 5, 10, -196530, 5, 10, -196529, 5, 10, -196528, 5, 10, -196527, 5, 10, -196526, 5, 10, -196525, 5, 10, -196524, 5, 10, -196523, 5, 10, -196522, 5, 10, -196521, 5, 10, -196520, 5, 10, -196519, 5, 10, -196518, 5, 10, -196517, 5, 10, -196516, 5, 10, -196515, 5, 10, -196514, 5, 10, -196513, 5, 10, -196512, 5, 10, -196511, 5, 10, -196510, 5, 10, -196509, 5, 10, -196508, 5, 10, -196507, 5, 10, -196506, 5, 10, -196505, 5, 10, -196504, 5, 10, -196503, 5, 10, -196502, 5, 10, -196501, 5, 10, -196500, 5, 10, -196499, 5, 10, -196498, 5, 10, -196497, 5, 10, -196496, 5, 10, -196495, 5, 10, -196494, 5, 10, -196493, 5, 65541, -65552, 5, 7, -65549, 7, 0, -65548, 7, 0, -65547, 7, 0, -65546, 7, 0, -65545, 7, 0, -65544, 7, 0, -65543, 7, 0, -65542, 7, 0, -65541, 7, 0, -65540, 7, 0, -65539, 7, 0, -65538, 7, 0, -65537, 7, 0, -131072, 7, 0, -131071, 7, 0, -131070, 7, 0, -131069, 7, 0, -131068, 7, 0, -131067, 7, 0, -131066, 7, 0, -131065, 7, 0, -131064, 7, 0, -131063, 7, 0, -131062, 7, 0, -131061, 7, 0, -131060, 7, 0, -131059, 7, 0, -131058, 7, 0, -131056, 7, 0, -131055, 7, 0, -131054, 7, 0, -131047, 5, 6, -131037, 5, 7, -131024, 5, 6, -131015, 5, 7, -131008, 5, 6, -131003, 5, 7, -130957, 5, 6, -16, 5, 7, -13, 7, 0, -12, 7, 0, -11, 7, 0, -10, 7, 0, -9, 7, 0, -8, 7, 0, -7, 7, 0, -6, 7, 0, -5, 7, 0, -4, 7, 0, -3, 7, 0, -2, 7, 0, -1, 7, 0, -65536, 7, 0, -65535, 7, 0, -65534, 7, 0, -65533, 7, 0, -65532, 7, 0, -65531, 7, 0, -65530, 7, 0, -65529, 7, 0, -65528, 7, 0, -65527, 7, 0, -65526, 7, 0, -65525, 7, 0, -65524, 7, 0, -65523, 7, 0, -65522, 7, 0, -65520, 7, 0, -65519, 7, 0, -65518, 7, 0, -65511, 5, 6, -65501, 5, 7, -65488, 5, 9, -65487, 5, 10, -65486, 5, 10, -65485, 5, 10, -65484, 5, 10, -65483, 5, 10, -65482, 5, 10, -65481, 5, 10, -65480, 5, 10, -65479, 5, 65536, -65472, 5, 6, -65467, 5, 7, -65421, 5, 6, 65520, 5, 7, 2, 7, 0, 3, 7, 0, 4, 7, 0, 5, 7, 0, 6, 7, 0, 7, 7, 0, 8, 7, 0, 9, 7, 0, 10, 7, 0, 11, 7, 0, 12, 7, 0, 13, 7, 0, 14, 7, 0, 16, 7, 0, 17, 7, 0, 18, 7, 0, 25, 5, 6, 35, 5, 65538, 36, 5, 3, 37, 5, 3, 38, 5, 3, 39, 5, 3, 40, 5, 3, 41, 5, 3, 42, 5, 4, 64, 5, 6, 69, 5, 65538, 70, 5, 3, 71, 5, 3, 72, 5, 3, 73, 5, 3, 74, 5, 3, 75, 5, 3, 76, 5, 3, 77, 5, 3, 78, 5, 3, 79, 5, 3, 80, 5, 3, 81, 5, 5, 86, 5, 1, 87, 5, 3, 88, 5, 3, 89, 5, 3, 90, 5, 3, 91, 5, 3, 92, 5, 3, 93, 5, 3, 94, 5, 3, 95, 5, 3, 96, 5, 3, 97, 5, 3, 98, 5, 3, 99, 5, 3, 100, 5, 3, 101, 5, 3, 102, 5, 3, 103, 5, 3, 104, 5, 3, 105, 5, 3, 106, 5, 3, 107, 5, 3, 108, 5, 3, 109, 5, 3, 110, 5, 3, 111, 5, 5, 115, 5, 6, 131056, 5, 7, 131059, 7, 0, 131060, 7, 0, 131061, 7, 0, 131062, 7, 0, 131063, 7, 0, 131064, 7, 0, 131065, 7, 0, 131066, 7, 0, 131067, 7, 0, 131068, 7, 0, 131069, 7, 0, 131070, 7, 0, 131071, 7, 0, 65536, 7, 0, 65537, 7, 0, 65538, 7, 0, 65539, 7, 0, 65540, 7, 0, 65541, 7, 0, 65542, 7, 0, 65543, 7, 0, 65544, 7, 0, 65545, 7, 0, 65546, 7, 0, 65547, 7, 0, 65548, 7, 0, 65549, 7, 0, 65550, 7, 0, 65552, 7, 0, 65553, 7, 0, 65554, 7, 0, 65561, 5, 6, 65578, 5, 7, 65600, 5, 6, 65617, 5, 8, 65622, 5, 6, 65647, 5, 8, 65651, 5, 6, 196592, 5, 7, 196595, 7, 0, 196596, 7, 0, 196597, 7, 0, 196598, 7, 0, 196599, 7, 0, 196600, 7, 0, 196601, 7, 0, 196602, 7, 0, 196603, 7, 0, 196604, 7, 0, 196605, 7, 0, 196606, 7, 0, 196607, 7, 0, 131072, 7, 0, 131073, 7, 0, 131074, 7, 0, 131075, 7, 0, 131076, 7, 0, 131077, 7, 0, 131078, 7, 0, 131079, 7, 0, 131080, 7, 0, 131081, 7, 0, 131082, 7, 0, 131083, 7, 0, 131084, 7, 0, 131085, 7, 0, 131086, 7, 0, 131089, 7, 0, 131090, 7, 0, 131097, 5, 6, 131114, 5, 7, 131136, 5, 6, 131153, 5, 8, 131158, 5, 6, 131183, 5, 8, 131187, 5, 6, 262128, 5, 7, 262131, 7, 0, 262132, 7, 0, 262133, 7, 0, 262134, 7, 0, 262135, 7, 0, 262137, 7, 0, 262138, 7, 0, 262139, 7, 0, 262140, 7, 0, 262141, 7, 0, 262142, 7, 0, 262143, 7, 0, 196608, 7, 0, 196609, 7, 0, 196610, 7, 0, 196611, 7, 0, 196612, 7, 0, 196613, 7, 0, 196614, 7, 0, 196615, 7, 0, 196616, 7, 0, 196617, 7, 0, 196618, 7, 0, 196619, 7, 0, 196620, 7, 0, 196621, 5, 1, 196622, 5, 2, 196623, 5, 2, 196624, 5, 2, 196625, 5, 2, 196626, 5, 2, 196627, 5, 2, 196628, 5, 2, 196629, 5, 2, 196630, 5, 2, 196631, 5, 2, 196632, 5, 2, 196633, 5, 65539, 196650, 5, 7, 196672, 5, 6, 196689, 5, 8, 196694, 5, 6, 196719, 5, 8, 196723, 5, 6, 327664, 5, 7, 327671, 7, 0, 327672, 7, 0, 327677, 7, 0, 327678, 7, 0, 327679, 7, 0, 262144, 7, 0, 262145, 7, 0, 262146, 7, 0, 262147, 7, 0, 262148, 7, 0, 262149, 7, 0, 262150, 7, 0, 262151, 7, 0, 262152, 7, 0, 262153, 7, 0, 262154, 7, 0, 262155, 7, 0, 262156, 7, 0, 262157, 5, 6, 262158, 7, 0, 262161, 7, 0, 262162, 7, 0, 262186, 5, 7, 262208, 5, 6, 262216, 5, 65540, 262217, 5, 10, 262218, 5, 10, 262219, 5, 10, 262220, 5, 10, 262221, 5, 10, 262222, 5, 10, 262223, 5, 10, 262224, 5, 10, 262225, 5, 65536, 262230, 5, 9, 262231, 5, 10, 262232, 5, 10, 262233, 5, 10, 262234, 5, 10, 262235, 5, 10, 262236, 5, 10, 262237, 5, 10, 262238, 5, 10, 262239, 5, 10, 262240, 5, 10, 262241, 5, 10, 262242, 5, 10, 262243, 5, 10, 262244, 5, 10, 262245, 5, 10, 262246, 5, 10, 262247, 5, 10, 262248, 5, 10, 262249, 5, 10, 262250, 5, 10, 262251, 5, 10, 262252, 5, 10, 262253, 5, 10, 262254, 5, 10, 262255, 5, 65536, 262259, 5, 6, 393200, 5, 7, 393203, 7, 0, 393204, 7, 0, 393205, 7, 0, 393206, 7, 0, 393207, 7, 0, 393208, 7, 0, 393209, 7, 0, 393210, 7, 0, 327693, 5, 6, 327722, 5, 65538, 327723, 5, 3, 327724, 5, 3, 327725, 5, 3, 327726, 5, 3, 327727, 5, 3, 327728, 5, 3, 327729, 5, 3, 327730, 5, 3, 327731, 5, 3, 327732, 5, 3, 327733, 5, 3, 327734, 5, 3, 327735, 5, 3, 327736, 5, 3, 327737, 5, 3, 327738, 5, 3, 327739, 5, 3, 327740, 5, 3, 327741, 5, 3, 327742, 5, 3, 327743, 5, 3, 327744, 5, 65539, 327752, 5, 7, 327795, 5, 6, 458736, 5, 7, 458739, 7, 0, 458740, 7, 0, 458741, 7, 0, 458742, 7, 0, 458743, 7, 0, 458744, 7, 0, 458745, 7, 0, 458746, 7, 0, 458747, 7, 0, 458748, 7, 0, 458749, 7, 0, 458750, 7, 0, 458751, 7, 0, 393216, 7, 0, 393217, 7, 0, 393218, 7, 0, 393219, 7, 0, 393220, 7, 0, 393221, 7, 0, 393222, 7, 0, 393223, 7, 0, 393224, 7, 0, 393225, 7, 0, 393226, 7, 0, 393227, 7, 0, 393229, 5, 6, 393232, 7, 0, 393233, 7, 0, 393234, 7, 0, 393288, 5, 7, 393331, 5, 6, 524272, 5, 65538, 524273, 5, 3, 524274, 5, 3, 524275, 5, 2, 524276, 5, 2, 524277, 5, 2, 524278, 5, 2, 524279, 5, 2, 524280, 5, 2, 524281, 5, 2, 524282, 5, 2, 524283, 5, 2, 524284, 5, 2, 524285, 5, 2, 524286, 5, 2, 524287, 5, 2, 458752, 5, 2, 458753, 5, 2, 458754, 5, 2, 458755, 5, 2, 458756, 5, 2, 458757, 5, 2, 458758, 5, 2, 458759, 5, 2, 458760, 5, 2, 458761, 5, 3, 458762, 5, 3, 458763, 5, 3, 458764, 5, 3, 458765, 5, 65539, 458824, 5, 7, 458867, 5, 6, 524360, 5, 7, 524403, 5, 6, 589896, 5, 7, 589939, 5, 6, 655432, 5, 7, 655453, 5, 1, 655454, 5, 3, 655455, 5, 3, 655456, 5, 3, 655457, 5, 3, 655458, 5, 3, 655459, 5, 3, 655460, 5, 3, 655461, 5, 3, 655462, 5, 3, 655463, 5, 3, 655464, 5, 3, 655465, 5, 3, 655466, 5, 3, 655467, 5, 3, 655468, 5, 3, 655469, 5, 3, 655470, 5, 3, 655471, 5, 3, 655472, 5, 3, 655473, 5, 3, 655474, 5, 3, 655475, 5, 65539, 720968, 5, 7, 720989, 5, 6, 786504, 5, 7, 786525, 5, 6, 852040, 5, 7, 852061, 5, 6, 917576, 5, 7, 917595, 5, 1, 917596, 5, 3, 917597, 5, 65539, 983112, 5, 7, 983131, 5, 6, 1048648, 5, 7, 1048666, 5, 1, 1048667, 5, 65539, 1114184, 5, 7, 1114202, 5, 6, 1179720, 5, 7, 1179736, 5, 1, 1179737, 5, 2, 1179738, 5, 65539, 1245256, 5, 7, 1245272, 5, 6, 1310792, 5, 7, 1310808, 5, 6, 1376328, 5, 7, 1376344, 5, 6, 1441864, 5, 65538, 1441865, 5, 3, 1441866, 5, 3, 1441867, 5, 3, 1441868, 5, 3, 1441869, 5, 3, 1441870, 5, 3, 1441871, 5, 3, 1441872, 5, 3, 1441873, 5, 3, 1441874, 5, 3, 1441875, 5, 3, 1441876, 5, 3, 1441877, 5, 3, 1441878, 5, 3, 1441879, 5, 3, 1441880, 5, 65539 ) [node name="DropThroughPlatforms" type="TileMap" parent="."] tile_set = ExtResource( 5 ) @@ -151,29 +157,70 @@ cell_size = Vector2( 16, 16 ) format = 1 [node name="FlyingLaserCutter" parent="." instance=ExtResource( 13 )] -position = Vector2( -128, 96 ) -rotation = -1.57079 -avoid_crushing = true +position = Vector2( 49, 32 ) +rotation = 1.57079 [node name="FlyingLaserCutter2" parent="." instance=ExtResource( 13 )] -position = Vector2( 32, 41 ) +position = Vector2( 337, -31 ) rotation = 1.57079 scale = Vector2( 1, 1.00162 ) [node name="FlyingLaserCutter3" parent="." instance=ExtResource( 13 )] -position = Vector2( 108, 99 ) +position = Vector2( 784, 17 ) +rotation = 1.57079 scale = Vector2( 1, 1.00162 ) +avoid_crushing = true [node name="FlyingLaserCutter4" parent="." instance=ExtResource( 13 )] -position = Vector2( 384, 48 ) +position = Vector2( 826, 17 ) +rotation = 1.57079 +scale = Vector2( 1, 1.00162 ) +avoid_crushing = true + +[node name="FlyingLaserCutter5" parent="." instance=ExtResource( 13 )] +position = Vector2( 868, 17 ) +rotation = 1.57079 +scale = Vector2( 1, 1.00162 ) +avoid_crushing = true + +[node name="FlyingLaserCutter7" parent="." instance=ExtResource( 13 )] +position = Vector2( 910, 17 ) +rotation = 1.57079 +scale = Vector2( 1, 1.00162 ) +avoid_crushing = true + +[node name="FlyingLaserCutter9" parent="." instance=ExtResource( 13 )] +position = Vector2( 948, 17 ) rotation = 1.57079 scale = Vector2( 1, 1.00162 ) -[node name="FlyingLaserCutter5" parent="." instance=ExtResource( 13 )] -position = Vector2( 704, 48 ) +[node name="FlyingLaserCutter8" parent="." instance=ExtResource( 13 )] +position = Vector2( 1681, -16 ) rotation = 3.14159 scale = Vector2( 1, 1.00162 ) +[node name="FlyingLaserCutter10" parent="." instance=ExtResource( 13 )] +position = Vector2( 1216, 272 ) +rotation = 6.28318 +scale = Vector2( 1, 1.00162 ) +fast_retrigger = true + +[node name="FlyingLaserCutter11" parent="." instance=ExtResource( 13 )] +position = Vector2( 1247, 240 ) +rotation = 6.28318 +scale = Vector2( 1, 1.00162 ) +fast_retrigger = true + +[node name="FlyingLaserCutter12" parent="." instance=ExtResource( 13 )] +position = Vector2( 1279, 209 ) +rotation = 6.28318 +scale = Vector2( 1, 1.00162 ) +fast_retrigger = true + +[node name="SavePoint" parent="." instance=ExtResource( 7 )] +position = Vector2( 1247, 328 ) +scale = Vector2( 1, 1.00162 ) + [connection signal="body_exited" from="Blobby/BlobbySkin" to="Blobby" method="_on_BlobbySkin_body_exited"] [editable path="SignalManager"] diff --git a/src/Levels/SpringMineThomp Level 01.tscn b/src/Levels/SpringMineThomp Level 01.tscn new file mode 100644 index 0000000..c997a25 --- /dev/null +++ b/src/Levels/SpringMineThomp Level 01.tscn @@ -0,0 +1,208 @@ +[gd_scene load_steps=20 format=2] + +[ext_resource path="res://src/Environment/GreenHouseTiles.tres" type="TileSet" id=1] +[ext_resource path="res://src/Environment/DropThroughPlatforms.tres" type="TileSet" id=2] +[ext_resource path="res://assets/environment/decor/platform-plants.png" type="Texture" id=3] +[ext_resource path="res://src/Contraptions/Portal/Portal.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/Contraptions/Triggers/ElevatorButton.tscn" type="PackedScene" id=5] +[ext_resource path="res://src/Actors/Blobby/Blobby.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=7] +[ext_resource path="res://src/UserInterface/UserInterface.tscn" type="PackedScene" id=8] +[ext_resource path="res://src/Utilities/LevelState.tscn" type="PackedScene" id=9] +[ext_resource path="res://src/Actors/BlobbyCam.tscn" type="PackedScene" id=10] +[ext_resource path="res://src/Levels/Templates/LevelTemplate.gd" type="Script" id=11] +[ext_resource path="res://src/Utilities/SceneAudio.tscn" type="PackedScene" id=12] +[ext_resource path="res://src/Platforms/FlyingLaserCutter.tscn" type="PackedScene" id=13] +[ext_resource path="res://src/Platforms/Spring/Spring.tscn" type="PackedScene" id=14] +[ext_resource path="res://src/ObstacleObjects/Spikes.tscn" type="PackedScene" id=15] + +[sub_resource type="Shader" id=15] +code = "shader_type canvas_item; + +uniform vec4 in_color:hint_color; +uniform vec4 out_color:hint_color; + +uniform float in_out:hint_range(0.,1.)=0.; + +uniform float position:hint_range(-1.5,1.) = 0.856; +uniform vec2 size = vec2(16., 16.); + +void fragment(){ + + vec2 a = (1./SCREEN_PIXEL_SIZE) / size; + + vec2 uv=UV; + uv *= a; + + vec2 i_uv = floor(uv); + vec2 f_uv = fract(uv); + + float wave = max(0.,i_uv.x/(a.x) - position); + + vec2 center = f_uv*2.-1.; + float circle = length(center); + circle = 1. - step(wave,circle); + + vec4 color = mix(in_color, out_color, step(0.5, in_out)); + + COLOR=vec4(circle) * color; +}" + +[sub_resource type="ShaderMaterial" id=16] +shader = SubResource( 15 ) +shader_param/in_color = Color( 0, 0, 0, 1 ) +shader_param/out_color = Color( 0, 0, 0, 0.568627 ) +shader_param/in_out = 0.0 +shader_param/position = -1.5 +shader_param/size = Vector2( 32, 32 ) + +[sub_resource type="AnimationNodeStateMachinePlayback" id=6] + +[sub_resource type="TileSet" id=5] +0/name = "platform-plants.png 0" +0/texture = ExtResource( 3 ) +0/tex_offset = Vector2( 0, 0 ) +0/modulate = Color( 1, 1, 1, 1 ) +0/region = Rect2( 16, 0, 256, 16 ) +0/tile_mode = 2 +0/autotile/icon_coordinate = Vector2( 5, 0 ) +0/autotile/tile_size = Vector2( 16, 16 ) +0/autotile/spacing = 0 +0/autotile/occluder_map = [ ] +0/autotile/navpoly_map = [ ] +0/autotile/priority_map = [ ] +0/autotile/z_index_map = [ ] +0/occluder_offset = Vector2( 0, 0 ) +0/navigation_offset = Vector2( 0, 0 ) +0/shape_offset = Vector2( 0, 0 ) +0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +0/shape_one_way = false +0/shape_one_way_margin = 0.0 +0/shapes = [ ] +0/z_index = 0 + +[node name="SpringMineThwomp Level" type="Node2D"] +script = ExtResource( 11 ) +__meta__ = { +"_edit_horizontal_guides_": [ 464.0 ], +"_edit_vertical_guides_": [ 2880.0 ] +} + +[node name="SignalManager" parent="." instance=ExtResource( 7 )] + +[node name="SceneAudio" parent="." instance=ExtResource( 12 )] + +[node name="LevelState" parent="." instance=ExtResource( 9 )] +unique_name_in_owner = true + +[node name="TransitionLayer" type="CanvasLayer" parent="."] +visible = false + +[node name="SceneTransition" type="ColorRect" parent="TransitionLayer"] +material = SubResource( 16 ) +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 + +[node name="UserInterface" parent="." instance=ExtResource( 8 )] +unique_name_in_owner = true + +[node name="BlobbyCam" parent="." instance=ExtResource( 10 )] +unique_name_in_owner = true +drag_margin_bottom = 0.3 + +[node name="Blobby" parent="." instance=ExtResource( 6 )] +unique_name_in_owner = true +position = Vector2( 384, -304 ) +scale = Vector2( 0.878906, 0.936025 ) +mass = null +jump_buffer_filled = null +death_sound_1 = null +death_sound_2 = null + +[node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"] +parameters/playback = SubResource( 6 ) + +[node name="TileMap" type="TileMap" parent="."] +unique_name_in_owner = true +tile_set = ExtResource( 1 ) +cell_size = Vector2( 16, 16 ) +cell_quadrant_size = 3 +cell_custom_transform = Transform2D( 24, 0, 0, 24, 0, 0 ) +collision_layer = 8 +collision_mask = 8 +bake_navigation = true +format = 1 +tile_data = PoolIntArray( -1900572, 5, 7, -1835036, 5, 7, -1769500, 5, 7, -1703964, 5, 7, -1638428, 5, 7, -1703901, 5, 6, -1572892, 5, 7, -1638365, 5, 6, -1507356, 5, 7, -1572829, 5, 6, -1441820, 5, 7, -1507293, 5, 6, -1376284, 5, 7, -1441757, 5, 6, -1310748, 5, 7, -1376221, 5, 6, -1245212, 5, 7, -1310685, 5, 6, -1179676, 5, 7, -1245164, 5, 1, -1245163, 5, 2, -1245162, 5, 3, -1245161, 5, 3, -1245160, 5, 3, -1245159, 5, 3, -1245158, 5, 3, -1245157, 5, 5, -1245149, 5, 6, -1114140, 5, 7, -1179628, 5, 9, -1179627, 5, 10, -1179626, 5, 65541, -1179621, 5, 8, -1179613, 5, 6, -1048604, 5, 7, -1114090, 5, 6, -1114088, 5, 65540, -1114087, 5, 10, -1114086, 5, 10, -1114085, 5, 65536, -1114077, 5, 9, -1114076, 5, 10, -1114075, 5, 65541, -983068, 5, 7, -1048554, 5, 6, -1048552, 5, 7, -1048539, 5, 6, -917532, 5, 65538, -917531, 5, 2, -917530, 5, 2, -917529, 5, 2, -917528, 5, 2, -917527, 5, 2, -917526, 5, 2, -917525, 5, 2, -917524, 5, 2, -917523, 5, 2, -917522, 5, 2, -917521, 5, 2, -917520, 5, 2, -917519, 5, 2, -917518, 5, 2, -917517, 5, 2, -917516, 5, 2, -917515, 5, 2, -917514, 5, 2, -917513, 5, 2, -917512, 5, 2, -917511, 5, 2, -917510, 5, 2, -917509, 5, 2, -917508, 5, 2, -917507, 5, 2, -917506, 5, 2, -917505, 5, 2, -983040, 5, 2, -983039, 5, 2, -983038, 5, 2, -983037, 5, 2, -983036, 5, 2, -983035, 5, 2, -983034, 5, 2, -983033, 5, 2, -983032, 5, 2, -983031, 5, 2, -983030, 5, 2, -983029, 5, 2, -983028, 5, 2, -983027, 5, 2, -983026, 5, 2, -983025, 5, 2, -983024, 5, 2, -983023, 5, 2, -983022, 5, 2, -983021, 5, 2, -983020, 5, 2, -983019, 5, 2, -983018, 5, 65539, -983016, 5, 7, -983003, 5, 6, -917480, 5, 65538, -917479, 5, 3, -917478, 5, 3, -917477, 5, 5, -917469, 5, 1, -917468, 5, 2, -917467, 5, 65539, -786448, 5, 65540, -786447, 5, 10, -786446, 5, 10, -786445, 5, 10, -786444, 5, 10, -786443, 5, 10, -786442, 5, 10, -786441, 5, 10, -786440, 5, 10, -786439, 5, 10, -786438, 5, 10, -786437, 5, 10, -786436, 5, 10, -786435, 5, 10, -786434, 5, 10, -786433, 5, 10, -851968, 5, 10, -851967, 5, 10, -851966, 5, 10, -851965, 5, 10, -851964, 5, 10, -851963, 5, 10, -851962, 5, 10, -851961, 5, 10, -851960, 5, 10, -851959, 5, 10, -851958, 5, 10, -851957, 5, 10, -851956, 5, 10, -851955, 5, 10, -851954, 5, 10, -851953, 5, 10, -851952, 5, 10, -851951, 5, 10, -851950, 5, 10, -851949, 5, 10, -851948, 5, 10, -851947, 5, 10, -851946, 5, 10, -851945, 5, 10, -851944, 5, 10, -851943, 5, 10, -851942, 5, 10, -851941, 5, 65536, -851933, 5, 6, -720912, 5, 7, -786397, 5, 6, -655376, 5, 7, -720861, 5, 6, -589840, 5, 7, -655325, 5, 6, -524304, 5, 7, -589789, 5, 6, -458768, 5, 7, -524253, 5, 6, -393232, 5, 7, -458717, 5, 6, -327696, 5, 7, -393188, 5, 1, -393187, 5, 3, -393186, 5, 3, -393185, 5, 3, -393184, 5, 3, -393183, 5, 3, -393182, 5, 3, -393181, 5, 65539, -262160, 5, 7, -327652, 5, 6, -196624, 5, 7, -262116, 5, 6, -131088, 5, 7, -196588, 5, 1, -196587, 5, 3, -196586, 5, 3, -196585, 5, 3, -196584, 5, 3, -196583, 5, 3, -196582, 5, 3, -196581, 5, 3, -196580, 5, 65539, -65552, 5, 7, -131052, 5, 6, -16, 5, 7, -65533, 5, 1, -65532, 5, 3, -65531, 5, 3, -65530, 5, 3, -65529, 5, 3, -65528, 5, 3, -65527, 5, 3, -65526, 5, 5, -65516, 5, 6, 65520, 5, 7, 3, 5, 6, 10, 5, 7, 20, 5, 6, 131056, 5, 7, 65539, 5, 6, 65546, 5, 7, 65556, 5, 6, 196592, 5, 7, 131075, 5, 6, 131082, 5, 65538, 131083, 5, 3, 131084, 5, 3, 131085, 5, 3, 131086, 5, 3, 131087, 5, 3, 131088, 5, 3, 131089, 5, 3, 131090, 5, 3, 131091, 5, 3, 131092, 5, 65539, 262128, 5, 7, 196611, 5, 6, 327664, 5, 7, 262147, 5, 6, 393200, 5, 7, 327683, 5, 6, 458736, 5, 7, 393219, 5, 6, 524272, 5, 65538, 524273, 5, 3, 524274, 5, 3, 524275, 5, 2, 524276, 5, 2, 524277, 5, 2, 524278, 5, 2, 524279, 5, 2, 524280, 5, 2, 524281, 5, 2, 524282, 5, 2, 524283, 5, 2, 524284, 5, 2, 524285, 5, 2, 524286, 5, 2, 524287, 5, 2, 458752, 5, 2, 458753, 5, 3, 458754, 5, 3, 458755, 5, 65539 ) + +[node name="DropThroughPlatforms" type="TileMap" parent="."] +tile_set = ExtResource( 2 ) +cell_size = Vector2( 16, 16 ) +collision_layer = 128 +collision_mask = 128 +format = 1 +tile_data = PoolIntArray( -1048549, -1610612734, 0, -983013, -1610612734, 2 ) + +[node name="PlatformPlants" type="TileMap" parent="."] +tile_set = SubResource( 5 ) +cell_size = Vector2( 16, 16 ) +format = 1 + +[node name="Portal" parent="." instance=ExtResource( 4 )] +position = Vector2( 289, 203 ) +next_scene = "res://src/Levels/Actual Level 1.tscn" + +[node name="FlyingLaserCutter2" parent="." instance=ExtResource( 13 )] +position = Vector2( 420, -240 ) +avoid_crushing = true + +[node name="FlyingLaserCutter3" parent="." instance=ExtResource( 13 )] +position = Vector2( 340, -256 ) +rotation = 3.14159 +avoid_crushing = true + +[node name="FlyingLaserCutter" parent="." instance=ExtResource( 13 )] +rotation = 1.57079 + +[node name="ElevatorButton" parent="." instance=ExtResource( 5 )] +position = Vector2( 209, 209 ) +scale = Vector2( 1, 1 ) +elevator_time = 10 + +[node name="Spring2" parent="." instance=ExtResource( 14 )] +position = Vector2( 250, -14 ) + +[node name="Spring" parent="." instance=ExtResource( 14 )] +position = Vector2( 509, -146 ) + +[node name="Spikes" parent="." instance=ExtResource( 15 )] +position = Vector2( 208, -288 ) +scale = Vector2( 0.878906, 0.936025 ) + +[node name="Spikes2" parent="." instance=ExtResource( 15 )] +position = Vector2( 186, -288 ) +scale = Vector2( 0.878906, 0.936025 ) + +[node name="Spikes3" parent="." instance=ExtResource( 15 )] +position = Vector2( 96, -256 ) +scale = Vector2( 0.878906, 0.936025 ) + +[node name="Spikes4" parent="." instance=ExtResource( 15 )] +position = Vector2( 1.52588e-05, -256 ) +scale = Vector2( 0.878906, 0.936025 ) + +[node name="Spikes5" parent="." instance=ExtResource( 15 )] +position = Vector2( -32, -256 ) +scale = Vector2( 0.878906, 0.936025 ) + +[connection signal="body_exited" from="Blobby/BlobbySkin" to="Blobby" method="_on_BlobbySkin_body_exited"] + +[editable path="SignalManager"] +[editable path="LevelState"] +[editable path="UserInterface"] +[editable path="UserInterface/HUD"] +[editable path="BlobbyCam"] +[editable path="Blobby"] diff --git a/src/Levels/Templates/Template.tscn b/src/Levels/Templates/Template.tscn index 878cda4..020c440 100644 --- a/src/Levels/Templates/Template.tscn +++ b/src/Levels/Templates/Template.tscn @@ -107,20 +107,17 @@ size_flags_vertical = 3 [node name="UserInterface" parent="." instance=ExtResource( 8 )] unique_name_in_owner = true -[node name="Timer" parent="UserInterface/HUD/HUDOverlay/GetBackTimer" index="0"] -wait_time = 20.0 - [node name="BlobbyCam" parent="." instance=ExtResource( 4 )] unique_name_in_owner = true drag_margin_bottom = 0.3 [node name="Blobby" parent="." instance=ExtResource( 7 )] unique_name_in_owner = true -position = Vector2( -70, -1.90735e-06 ) +position = Vector2( -1, 112 ) scale = Vector2( 0.878906, 0.936025 ) [node name="BlobbySprite" parent="Blobby" index="5"] -frame = 7 +frame = 5 [node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"] parameters/playback = SubResource( 6 ) @@ -150,12 +147,12 @@ cell_size = Vector2( 16, 16 ) format = 1 [node name="ElevatorButton" parent="." instance=ExtResource( 11 )] -position = Vector2( 216, 112 ) +position = Vector2( 208, 102 ) +scale = Vector2( 1, 1 ) elevator_time = 10 -[node name="Portal" parent="ElevatorButton" instance=ExtResource( 5 )] -position = Vector2( 36, -8 ) -scale = Vector2( 0.5, 0.5 ) +[node name="Portal" parent="." instance=ExtResource( 5 )] +position = Vector2( 288, 96 ) next_scene = "res://src/Levels/Actual Level 1.tscn" [connection signal="body_exited" from="Blobby/BlobbySkin" to="Blobby" method="_on_BlobbySkin_body_exited"] diff --git a/src/StateMachines/BlobbyStateMachine.gd b/src/StateMachines/BlobbyStateMachine.gd index ce93d2a..1c382dc 100644 --- a/src/StateMachines/BlobbyStateMachine.gd +++ b/src/StateMachines/BlobbyStateMachine.gd @@ -150,6 +150,9 @@ func _get_transition(_delta): # + " y vel/10:" # + String(round(parent.velocity.y / 10)) var new_state + if parent.is_crushed() && $CrushTimer.is_stopped(): + print(parent.is_crushed()) + $CrushTimer.start() if !parent.is_on_floor(): if parent.velocity.y < -1: was_coyote_hanging = false