diff --git a/src/Actors/Blobby/Blobby.tscn b/src/Actors/Blobby/Blobby.tscn index d724a78..4401f7f 100644 --- a/src/Actors/Blobby/Blobby.tscn +++ b/src/Actors/Blobby/Blobby.tscn @@ -4590,7 +4590,6 @@ wait_time = 0.067 one_shot = true [node name="StateLabel" type="Label" parent="."] -visible = false show_behind_parent = true margin_left = -37.0 margin_top = -44.0 diff --git a/src/Actors/BlobbyCam.gd b/src/Actors/BlobbyCam.gd index 96f8833..01e1736 100644 --- a/src/Actors/BlobbyCam.gd +++ b/src/Actors/BlobbyCam.gd @@ -13,7 +13,7 @@ var camera_is_panning: bool = false var target_offset: Vector2 = Vector2(0,0) export var camera_horizontal_shift = 60 -export var offset_reset_seconds := 0.8 +export var offset_reset_seconds := 0.9 export var offset_adapt_seconds := 0.7 onready var shiftLeft = $CameraAnimationPlayer.get_animation("shiftingLeft") @@ -44,14 +44,18 @@ func _physics_process(delta: float) -> void: if(!GlobalState.is_dead): var player_vel = (blobby.position - prev_pos)/delta # TODO Take average of velocity here - if(abs(player_vel.x) >= blobby.max_velocity["walk"] * 0.9): + if(abs(player_vel.x) >= blobby.max_velocity["walk"] * 0.97): move_time += delta slow_time = 0 - elif(!anim_player.is_playing() && abs(player_vel.x) <= blobby.max_velocity["walk"] * 0.1): + elif(abs(player_vel.x) <= blobby.max_velocity["walk"] * 0.05 + || sign(player_vel.x) != sign(target_offset.x) ): slow_time += delta move_time = 0 + else: + move_time = max(0, move_time - delta) - _adapt_to_movement(player_vel) + if(!anim_player.is_playing()): + _adapt_to_movement(player_vel) position = blobby.position prev_pos = position #TODO Do this via a event or let it be to track blobbies movement better @@ -121,7 +125,7 @@ func _adapt_to_movement(velocity: Vector2) -> void: shiftRight.track_set_key_value(limit_right_track, 1, new_limit_right) print("shiftright") anim_player.play("shiftingRight") - elif(slow_time >= offset_reset_seconds && !anim_player.is_playing()): + elif(slow_time >= offset_reset_seconds): target_offset.x = 0 if(offset == target_offset): return diff --git a/src/Actors/BlobbyCam.tscn b/src/Actors/BlobbyCam.tscn index 63b02e0..0e3a3ed 100644 --- a/src/Actors/BlobbyCam.tscn +++ b/src/Actors/BlobbyCam.tscn @@ -305,7 +305,7 @@ tracks/9/keys = { [sub_resource type="Animation" id=11] resource_name = "shiftingCenter" -length = 0.8 +length = 0.6 tracks/0/type = "value" tracks/0/path = NodePath(".:offset") tracks/0/interp = 1 @@ -313,8 +313,8 @@ tracks/0/loop_wrap = true tracks/0/imported = false tracks/0/enabled = true tracks/0/keys = { -"times": PoolRealArray( 0, 0.8 ), -"transitions": PoolRealArray( 1, 1.6 ), +"times": PoolRealArray( 0, 0.6 ), +"transitions": PoolRealArray( 1, 0.5 ), "update": 0, "values": [ Vector2( 0, 0 ), Vector2( 0, 0 ) ] } @@ -325,8 +325,8 @@ tracks/1/loop_wrap = true tracks/1/imported = false tracks/1/enabled = true tracks/1/keys = { -"times": PoolRealArray( 0, 0.8 ), -"transitions": PoolRealArray( 1, 1.6 ), +"times": PoolRealArray( 0, 0.6 ), +"transitions": PoolRealArray( 1, 1.2 ), "update": 0, "values": [ -10000000, -10000000 ] } @@ -337,8 +337,8 @@ tracks/2/loop_wrap = true tracks/2/imported = false tracks/2/enabled = true tracks/2/keys = { -"times": PoolRealArray( 0, 0.8 ), -"transitions": PoolRealArray( 1, 1.6 ), +"times": PoolRealArray( 0, 0.6 ), +"transitions": PoolRealArray( 1, 1.2 ), "update": 0, "values": [ -10000000, -10000000 ] } @@ -349,8 +349,8 @@ tracks/3/loop_wrap = true tracks/3/imported = false tracks/3/enabled = true tracks/3/keys = { -"times": PoolRealArray( 0, 0.8 ), -"transitions": PoolRealArray( 1, 1.6 ), +"times": PoolRealArray( 0, 0.6 ), +"transitions": PoolRealArray( 1, 1.2 ), "update": 0, "values": [ 10000000, 10000000 ] } @@ -361,8 +361,8 @@ tracks/4/loop_wrap = true tracks/4/imported = false tracks/4/enabled = true tracks/4/keys = { -"times": PoolRealArray( 0, 0.8 ), -"transitions": PoolRealArray( 1, 0.6 ), +"times": PoolRealArray( 0, 0.6 ), +"transitions": PoolRealArray( 1, 1.2 ), "update": 0, "values": [ 10000000, 10000000 ] } @@ -378,7 +378,7 @@ tracks/0/imported = false tracks/0/enabled = true tracks/0/keys = { "times": PoolRealArray( 0, 0.6 ), -"transitions": PoolRealArray( 1, 0.6 ), +"transitions": PoolRealArray( 1, 0.5 ), "update": 0, "values": [ Vector2( 0, 0 ), Vector2( 0, 0 ) ] } @@ -390,7 +390,7 @@ tracks/1/imported = false tracks/1/enabled = true tracks/1/keys = { "times": PoolRealArray( 0, 0.6 ), -"transitions": PoolRealArray( 1, 0.6 ), +"transitions": PoolRealArray( 1, 0.8 ), "update": 0, "values": [ -10000000, -10000000 ] } @@ -406,7 +406,7 @@ tracks/0/imported = false tracks/0/enabled = true tracks/0/keys = { "times": PoolRealArray( 0, 0.6 ), -"transitions": PoolRealArray( 1, 0.6 ), +"transitions": PoolRealArray( 1, 0.5 ), "update": 0, "values": [ Vector2( 0, 0 ), Vector2( 0, 0 ) ] } @@ -418,7 +418,7 @@ tracks/1/imported = false tracks/1/enabled = true tracks/1/keys = { "times": PoolRealArray( 0, 0.6 ), -"transitions": PoolRealArray( 1, 0.6 ), +"transitions": PoolRealArray( 1, 0.8 ), "update": 0, "values": [ 10000000, 10000000 ] } @@ -532,6 +532,7 @@ drag_margin_v_enabled = true drag_margin_left = 0.05 drag_margin_top = 0.0 drag_margin_right = 0.05 +drag_margin_bottom = 0.33 editor_draw_drag_margin = true script = ExtResource( 1 ) @@ -631,10 +632,10 @@ texture = ExtResource( 8 ) [node name="AnimatedSprite" type="AnimatedSprite" parent="ParallaxBackground/ParallaxLayer5"] visible = false frames = SubResource( 7 ) -frame = 10 +frame = 5 playing = true [node name="AnimatedSprite2" type="AnimatedSprite" parent="ParallaxBackground/ParallaxLayer5"] frames = SubResource( 8 ) -frame = 1 +frame = 10 playing = true diff --git a/src/Contraptions/Platform/FlyingPlatformClean.tscn b/src/Contraptions/Platform/FlyingPlatformClean.tscn index b46e199..9d10067 100644 --- a/src/Contraptions/Platform/FlyingPlatformClean.tscn +++ b/src/Contraptions/Platform/FlyingPlatformClean.tscn @@ -35,7 +35,6 @@ motion/sync_to_physics = true texture = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="KinematicBody2D"] -visible = false shape = SubResource( 1 ) [node name="anim" type="AnimationPlayer" parent="."] diff --git a/src/Levels/02 Level.tscn b/src/Levels/02 Level.tscn index 0d76cfa..a7bd9b7 100644 --- a/src/Levels/02 Level.tscn +++ b/src/Levels/02 Level.tscn @@ -80,10 +80,10 @@ wait_time = 20.0 [node name="BlobbyCam" parent="." instance=ExtResource( 12 )] [node name="AnimatedSprite" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="4"] -frame = 10 +frame = 7 [node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"] -frame = 1 +frame = 12 [node name="Blobby" parent="." instance=ExtResource( 2 )] unique_name_in_owner = true @@ -93,9 +93,6 @@ scale = Vector2( 0.878906, 0.936025 ) [node name="AnimationTree" parent="Blobby/BlobbySprite" index="0"] parameters/playback = SubResource( 4 ) -[node name="StateLabel" parent="Blobby" index="6"] -visible = false - [node name="Portal" parent="." instance=ExtResource( 6 )] position = Vector2( 744, -288 )