From 1d55756adeb22ffb58d1237af593757e2f4bff73 Mon Sep 17 00:00:00 2001 From: Jakob Feldmann Date: Wed, 8 Nov 2023 16:22:02 +0100 Subject: [PATCH] fix: frog jump into narrow pits, permanent coin collection --- .../background/Spaceship-Wall-Menu.png | Bin 5449 -> 5649 bytes .../environment/background/Spaceship-Wall.png | Bin 5948 -> 5945 bytes src/Actors/Friendlies/WhatAreFrog.gd | 17 +++---- src/Actors/Friendlies/WhatAreFrog.tscn | 8 ++-- src/BenefitialObjects/Coin.gd | 1 + src/Levels/Level 0.1.tscn | 2 +- src/Levels/Level 0.2.tscn | 2 +- src/Levels/Level 0.5.tscn | 2 +- src/Levels/Level 0.6.tscn | 2 +- src/Levels/Level 2.tscn | 5 +-- src/Levels/Level 5.tscn | 42 +++++++++--------- src/Sounds/default_bus_layout.tres | 2 +- .../Screens/MainMenu/AudioMenu.tscn | 4 +- .../MainMenu/ControlsMenu/ControlsMenu.tscn | 3 +- .../Screens/MainMenu/MainScreen.tscn | 5 ++- 15 files changed, 45 insertions(+), 50 deletions(-) diff --git a/assets/environment/background/Spaceship-Wall-Menu.png b/assets/environment/background/Spaceship-Wall-Menu.png index 0884a6b38ece77ce084825a21bd5e209ef5dcd63..f54247be95dff0a65be51a1fed9f4ccb049414f3 100644 GIT binary patch literal 5649 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 diff --git a/assets/environment/background/Spaceship-Wall.png b/assets/environment/background/Spaceship-Wall.png index 6c84e4951c603f5277ec36413087b87e9a05929a..72ba8a0fb6011559b724cc4eb52abdd5c0fbe487 100644 GIT binary patch literal 5945 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 TM4Pq3GhlPp{!EpX_s#zRpyqlf literal 5948 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 OIB)HEw(_*k?SBD}d64`7 diff --git a/src/Actors/Friendlies/WhatAreFrog.gd b/src/Actors/Friendlies/WhatAreFrog.gd index 5589d86..9d10b60 100644 --- a/src/Actors/Friendlies/WhatAreFrog.gd +++ b/src/Actors/Friendlies/WhatAreFrog.gd @@ -346,20 +346,14 @@ func jump(): # and let it fail if the top is dangerous for jump height or not safe v = consider_jumping_on_top() if v == zero_vector && jump_into_narrow_pit: - v = consider_jump_landing_space(v, jump_into_narrow_pit) + var default_velocity = velocity_for_jump_distance(default_jump_distance) + v = consider_jump_landing_space(default_velocity, jump_into_narrow_pit) if v == zero_vector && can_reverse_facing_direction(): reverse_facing_direction() -# if attached_player != null && v != zero_vector: -# move_with_player(v) - velocity = v -#func move_with_player(v: Vector2): -# print(v) -# attached_player.move_and_slide(v * 10) - func correct_jump_direction(v: Vector2) -> Vector2: if sign(v.x) != get_facing_direction(): @@ -401,7 +395,7 @@ func consider_jump_headspace(v: Vector2, recursive_check_count = 0, max_checks = # Check the block in jump distance for danger or height # If danger check neighboring blocks: if still danger, then jump closer (or jump over) # If height move to distance which allows 1 block high jump -func consider_jump_landing_space(v: Vector2, jump_into_narrow_pit = false) -> Vector2: +func consider_jump_landing_space(v: Vector2, into_narrow_pit = false) -> Vector2: var jump_distance = calculate_jump_distance(v) var jump_height = calculate_jump_height(v) var collider = check_feeler(Vector2(jump_distance * get_facing_direction(), -jump_height / 2)) @@ -420,9 +414,12 @@ func consider_jump_landing_space(v: Vector2, jump_into_narrow_pit = false) -> Ve v = correct_jump_direction(v) collider = check_feeler(Vector2(jump_distance * get_facing_direction(), -jump_height / 2)) if ( - (!is_jump_path_safe(v, global_position) || (collider != null && !jump_into_narrow_pit)) + (!is_jump_path_safe(v, global_position) || (collider != null && !into_narrow_pit)) && can_reverse_facing_direction() ): + print(is_jump_path_safe(v, global_position)) + print(can_reverse_facing_direction()) + print(into_narrow_pit) # Can be printed when frog would jump into a wall too print("at wall or no safe landing spot") return Vector2(0, 0) diff --git a/src/Actors/Friendlies/WhatAreFrog.tscn b/src/Actors/Friendlies/WhatAreFrog.tscn index 5a5dedb..d5b19f2 100644 --- a/src/Actors/Friendlies/WhatAreFrog.tscn +++ b/src/Actors/Friendlies/WhatAreFrog.tscn @@ -53,7 +53,7 @@ tracks/1/keys = { "values": [ Vector2( 1, 1 ) ] } -[sub_resource type="Animation" id=6] +[sub_resource type="Animation" id=61] resource_name = "idleHappyLeft" length = 1.62 loop = true @@ -321,7 +321,7 @@ animation = "idleHappyLeft" [sub_resource type="AnimationNodeAnimation" id=43] animation = "idleHappy" -[sub_resource type="AnimationNodeBlendSpace1D" id=9] +[sub_resource type="AnimationNodeBlendSpace1D" id=62] blend_point_0/node = SubResource( 42 ) blend_point_0/pos = -1.0 blend_point_1/node = SubResource( 43 ) @@ -408,7 +408,7 @@ auto_advance = true [sub_resource type="AnimationNodeStateMachineTransition" id=58] [sub_resource type="AnimationNodeStateMachine" id=10] -states/idleHappy/node = SubResource( 9 ) +states/idleHappy/node = SubResource( 62 ) states/idleHappy/position = Vector2( -58.7619, 98.0433 ) states/idleMean/node = SubResource( 20 ) states/idleMean/position = Vector2( 451.952, 98.0432 ) @@ -487,7 +487,7 @@ vframes = 4 [node name="AnimationPlayer" type="AnimationPlayer" parent="FrogSprite"] anims/RESET = SubResource( 5 ) anims/idleHappy = SubResource( 4 ) -anims/idleHappyLeft = SubResource( 6 ) +anims/idleHappyLeft = SubResource( 61 ) anims/idleMean = SubResource( 12 ) anims/idleMeanLeft = SubResource( 13 ) anims/liftOff = SubResource( 14 ) diff --git a/src/BenefitialObjects/Coin.gd b/src/BenefitialObjects/Coin.gd index 61b2c8f..fefba2f 100644 --- a/src/BenefitialObjects/Coin.gd +++ b/src/BenefitialObjects/Coin.gd @@ -17,6 +17,7 @@ func _ready() -> void: if was_collected: visible = false + level_state.set_currency(level_state.get_currency() + currencyValue) func _on_body_entered(_body: Node) -> void: if was_collected == true: diff --git a/src/Levels/Level 0.1.tscn b/src/Levels/Level 0.1.tscn index c30e9b5..89aa8a9 100644 --- a/src/Levels/Level 0.1.tscn +++ b/src/Levels/Level 0.1.tscn @@ -1329,7 +1329,7 @@ position = Vector2( -70, 1 ) scale = Vector2( 0.878906, 0.936025 ) [node name="BlobbySprite" parent="Blobby" index="5"] -frame = 9 +frame = 6 [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 995c898..dccc690 100644 --- a/src/Levels/Level 0.2.tscn +++ b/src/Levels/Level 0.2.tscn @@ -1169,7 +1169,7 @@ position = Vector2( -156, -51 ) 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 ) diff --git a/src/Levels/Level 0.5.tscn b/src/Levels/Level 0.5.tscn index e6717a3..15ec1a9 100644 --- a/src/Levels/Level 0.5.tscn +++ b/src/Levels/Level 0.5.tscn @@ -128,7 +128,7 @@ 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( 7 ) diff --git a/src/Levels/Level 0.6.tscn b/src/Levels/Level 0.6.tscn index f12e54d..0055898 100644 --- a/src/Levels/Level 0.6.tscn +++ b/src/Levels/Level 0.6.tscn @@ -191,7 +191,7 @@ death_sound_1 = null death_sound_2 = null [node name="BlobbySprite" parent="Blobby" index="5"] -frame = 7 +frame = 5 [node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"] parameters/playback = SubResource( 53 ) diff --git a/src/Levels/Level 2.tscn b/src/Levels/Level 2.tscn index a6a4c75..89991ba 100644 --- a/src/Levels/Level 2.tscn +++ b/src/Levels/Level 2.tscn @@ -128,12 +128,9 @@ drag_margin_bottom = 0.3 [node name="Blobby" parent="." instance=ExtResource( 11 )] unique_name_in_owner = true -position = Vector2( -64, -2.84217e-14 ) +position = Vector2( 857, -266 ) scale = Vector2( 0.878906, 0.936025 ) -[node name="BlobbySprite" parent="Blobby" index="5"] -frame = 7 - [node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"] parameters/playback = SubResource( 6 ) diff --git a/src/Levels/Level 5.tscn b/src/Levels/Level 5.tscn index 05a841f..90ed6a2 100644 --- a/src/Levels/Level 5.tscn +++ b/src/Levels/Level 5.tscn @@ -185,9 +185,6 @@ unique_name_in_owner = true position = Vector2( -45, -5.96046e-08 ) scale = Vector2( 0.878906, 0.936025 ) -[node name="BlobbySprite" parent="Blobby" index="5"] -frame = 9 - [node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"] parameters/playback = SubResource( 6 ) @@ -258,32 +255,32 @@ speed = 40 [node name="GateButton" parent="." instance=ExtResource( 4 )] position = Vector2( 232, -18 ) -[node name="GateBlock" parent="." instance=ExtResource( 17 )] -position = Vector2( -76, -8 ) +[node name="GateBlock" parent="GateButton" instance=ExtResource( 17 )] +position = Vector2( -308, 10 ) -[node name="GateBlock2" parent="." instance=ExtResource( 17 )] -position = Vector2( -76, -24 ) +[node name="GateBlock2" parent="GateButton" instance=ExtResource( 17 )] +position = Vector2( -308, -6 ) -[node name="GateBlock6" parent="." instance=ExtResource( 17 )] -position = Vector2( -76, -40 ) +[node name="GateBlock6" parent="GateButton" instance=ExtResource( 17 )] +position = Vector2( -308, -22 ) -[node name="GateBlock3" parent="." instance=ExtResource( 17 )] -position = Vector2( 260, -8 ) +[node name="GateBlock3" parent="GateButton" instance=ExtResource( 17 )] +position = Vector2( 28, 10 ) -[node name="GateBlock4" parent="." instance=ExtResource( 17 )] -position = Vector2( 260, -24 ) +[node name="GateBlock4" parent="GateButton" instance=ExtResource( 17 )] +position = Vector2( 28, -6 ) -[node name="GateBlock5" parent="." instance=ExtResource( 17 )] -position = Vector2( 260, -40 ) +[node name="GateBlock5" parent="GateButton" instance=ExtResource( 17 )] +position = Vector2( 28, -22 ) -[node name="GateBlock7" parent="." instance=ExtResource( 17 )] -position = Vector2( 532, 8 ) +[node name="GateBlock7" parent="GateButton" instance=ExtResource( 17 )] +position = Vector2( 300, 26 ) -[node name="GateBlock8" parent="." instance=ExtResource( 17 )] -position = Vector2( 532, -8 ) +[node name="GateBlock8" parent="GateButton" instance=ExtResource( 17 )] +position = Vector2( 300, 10 ) -[node name="GateBlock9" parent="." instance=ExtResource( 17 )] -position = Vector2( 532, -24 ) +[node name="GateBlock9" parent="GateButton" instance=ExtResource( 17 )] +position = Vector2( 300, -6 ) [node name="Mine11" parent="." instance=ExtResource( 13 )] position = Vector2( 527, 452 ) @@ -375,6 +372,9 @@ position = Vector2( 1010, -303 ) [node name="Coin3" parent="." instance=ExtResource( 11 )] position = Vector2( 1124, 242 ) +[node name="Coin4" parent="." instance=ExtResource( 11 )] +position = Vector2( 408, -1 ) + [node name="ElevatorButton" parent="." instance=ExtResource( 7 )] position = Vector2( -102, -16 ) elevator_time = 70 diff --git a/src/Sounds/default_bus_layout.tres b/src/Sounds/default_bus_layout.tres index 5355e6a..2ecad21 100644 --- a/src/Sounds/default_bus_layout.tres +++ b/src/Sounds/default_bus_layout.tres @@ -41,7 +41,7 @@ resource_name = "LowPassFilter" cutoff_hz = 3000.0 [resource] -bus/0/volume_db = -4.43698 +bus/0/volume_db = inf_neg bus/1/name = "Music" bus/1/solo = false bus/1/mute = false diff --git a/src/UserInterface/Screens/MainMenu/AudioMenu.tscn b/src/UserInterface/Screens/MainMenu/AudioMenu.tscn index 0fca44c..e4f80c3 100644 --- a/src/UserInterface/Screens/MainMenu/AudioMenu.tscn +++ b/src/UserInterface/Screens/MainMenu/AudioMenu.tscn @@ -40,13 +40,12 @@ script = ExtResource( 3 ) [node name="background" type="TextureRect" parent="."] anchor_right = 1.0 anchor_bottom = 1.0 -margin_top = 46.0 -margin_bottom = 46.0 texture = ExtResource( 10 ) expand = true stretch_mode = 1 [node name="background2" type="TextureRect" parent="."] +visible = false anchor_right = 1.0 anchor_bottom = 1.0 texture = ExtResource( 4 ) @@ -54,6 +53,7 @@ expand = true stretch_mode = 1 [node name="GradientTexture" type="TextureRect" parent="."] +visible = false anchor_right = 1.0 anchor_bottom = 1.0 texture = SubResource( 17 ) diff --git a/src/UserInterface/Screens/MainMenu/ControlsMenu/ControlsMenu.tscn b/src/UserInterface/Screens/MainMenu/ControlsMenu/ControlsMenu.tscn index 0004bbb..7539b6e 100644 --- a/src/UserInterface/Screens/MainMenu/ControlsMenu/ControlsMenu.tscn +++ b/src/UserInterface/Screens/MainMenu/ControlsMenu/ControlsMenu.tscn @@ -68,13 +68,12 @@ script = ExtResource( 15 ) [node name="background" type="TextureRect" parent="."] anchor_right = 1.0 anchor_bottom = 1.0 -margin_top = 46.0 -margin_bottom = 46.0 texture = ExtResource( 10 ) expand = true stretch_mode = 1 [node name="background2" type="TextureRect" parent="."] +visible = false anchor_right = 1.0 anchor_bottom = 1.0 texture = ExtResource( 9 ) diff --git a/src/UserInterface/Screens/MainMenu/MainScreen.tscn b/src/UserInterface/Screens/MainMenu/MainScreen.tscn index 6243b03..d2cd399 100644 --- a/src/UserInterface/Screens/MainMenu/MainScreen.tscn +++ b/src/UserInterface/Screens/MainMenu/MainScreen.tscn @@ -59,13 +59,14 @@ script = ExtResource( 14 ) [node name="background" type="TextureRect" parent="."] anchor_right = 1.0 anchor_bottom = 1.0 -margin_top = -128.0 -margin_bottom = -128.0 +margin_top = 1.0 +margin_bottom = 1.0 texture = ExtResource( 7 ) expand = true stretch_mode = 1 [node name="background2" type="TextureRect" parent="."] +visible = false anchor_right = 1.0 anchor_bottom = 1.0 texture = ExtResource( 6 )