From bfe080537731c724cb469794e6d1d67ea9f789d3 Mon Sep 17 00:00:00 2001 From: Jakob Feldmann Date: Thu, 18 Jan 2024 14:07:51 +0100 Subject: [PATCH] fix: generous black borders around levels --- assets/blobby/blobby-spritesheet.png | Bin 6128 -> 6096 bytes .../Spaceship-Wall-Glass-Layer.aseprite | Bin 0 -> 6479 bytes .../environment/background/Spaceship-Wall.png | Bin 5945 -> 4546 bytes .../blocks/Alien-Ship-Ground-Inner-Black.png | Bin 109 -> 109 bytes project.godot | 2 +- src/Actors/Blobby/Blobby.tscn | 2 +- src/Environment/GlassAndRoots.tscn | 17 ++- src/Levels/Level 0.1.tscn | 4 +- src/Levels/Level 0.2.tscn | 4 +- src/Levels/Level 0.3.tscn | 11 +- src/Levels/Level 0.4.tscn | 8 +- src/Levels/Level 0.5.tscn | 9 +- src/Levels/Level 0.6.tscn | 9 +- src/Levels/Level 1.tscn | 7 +- src/Levels/Level 2.tscn | 11 +- src/Levels/Level 3.tscn | 8 +- src/Levels/Level 4.tscn | 25 +++-- src/Levels/Level 5.tscn | 2 +- src/Platforms/Spring/Spring.tscn | 1 - src/Platforms/Spring/SpringPhysics.gd | 104 +++++++++--------- src/Platforms/Spring/SpringPlatform.tscn | 4 +- src/Sounds/default_bus_layout.tres | 2 +- .../Screens/MainMenu/MainScreen.tscn | 3 +- 23 files changed, 138 insertions(+), 95 deletions(-) create mode 100644 assets/environment/background/Spaceship-Wall-Glass-Layer.aseprite diff --git a/assets/blobby/blobby-spritesheet.png b/assets/blobby/blobby-spritesheet.png index d96d1642e785db73940be64a954722dc8d71be78..807a53a3830486a315f995dd8fc641d533e66d14 100644 GIT binary patch literal 6096 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 literal 6128 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 diff --git a/assets/environment/background/Spaceship-Wall-Glass-Layer.aseprite b/assets/environment/background/Spaceship-Wall-Glass-Layer.aseprite new file mode 100644 index 0000000000000000000000000000000000000000..591804bc17a7a480c6f82348ba406edc8d827e6b GIT binary patch literal 6479 zcmeHLdr*_twhvm5W4)C#BqZP63D|b#{BiHxx%W)ZoPL?? zBzv#*`>nP1x4*Tr!j~ZsBb5$_oOy{3D-aF{1R@^1f4M$JIM^l;e*~}pkBk3j1j016 zz|Oh=5IBSP!WDMPU(rQ?@5@$vJU6rGS1TXBZeEXs5s2MEK43f$vJ;F)BSOG<_Uu_O zmX(!(v8AO2j8EC6V1&W-8BqSn=CchL003>E3iN;y&;a5#Sr~S;$*q|GfeL&A0K@`B zXk5n0^GkpO3s%go!SiN65%zF?QKp3c<3YUW@a4F;Er?Y&Ax6mcE29oC;y*1?EWyRO zbvrD+wh?#i&uNK&U3+9CSIAuH<#BZQE7pJrvzLBJk!Bh|!2$TlS7F&xL!_D4OIx4v zvyHWIgV}GynRw5kKu(Sjucn~-5S?1|I%Pp9JuxTVR8g3YW`uk1+)5PeTx~!m} zk}6{hZ_UPvJ1A2@mj~53s?TP_-EYw6<_A2*SWUivYQ`^Y#fM*VW!s`ZajWf^ zVPm@{V8m;~cN@jFZP0aF4NFND-;e6yb1o@hJ1R2M;UNp;EDdrpyDMkayv));E_P*m zhvpI77gh>3s2atAm6CJstxFQ&H-EAtorD9(mV9!eZNm#K>QH@9*uDK=2M4> zvG9Y;=2+dNyRkz_D%(}+-C|H(c2$t{JVH!PY-?~*MO1+ZR*(#hhyXd+r(`w7!nfkj zEPhBvC6z}NC?)U!OziUDS!;;OTQZ}VnV~l-N$(DtDsCj8)1O=M{RR?8A0&mJG}+Zf zg=T3}I+>s^U8iq~oYC;D*^!n^vpacqwI8fwJJW^wDXV&Pn7pJ$49Nc}nkFD78bgYXj;)*Ls}E%}c>vg-rkte?g7JdFt6e$j5P2<`=hvygxg*!JHj?0*F_ zV0ay%nP;bA!BoDrW05^3-Bvux?C$x(=F3*I)Tkhp?WD8&)^{pM7+6=Oxbce#L1t;& zhVR1W9OYOs#m|00!NQ!T1+UO^s`eeH&Jp|%myk-5^aPBHycP2IAg8~#`cgmmDe^GW zT_5s0Gz7*6MmN#o@$}t`A6~ZyD6nPu3;A>BV+-xxn!B@i7DuuXYKA@Frue>j;2{TY zhfwwI#HN zu*lLPOE$c5Rb=GsSx_%x>&BfAyUM|%0D(J9N8-dH$%R$U)@?f15?olmWIi-Rjbv8cI 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 TM4Pq3GhlPp{!EpX_s#zRpyqlf diff --git a/assets/environment/blocks/Alien-Ship-Ground-Inner-Black.png b/assets/environment/blocks/Alien-Ship-Ground-Inner-Black.png index ef3e6bd7d638ef9f0f629a566a6052492b92016e..9622cf1cb7bbb517a504552843335b2c8244b39d 100644 GIT binary patch delta 33 ncmd1JonXl#A|&>2qOFX`>m7{gNB*0AWdH(CS3j3^P6 void: - start_y = self.position.y + start_y = self.position.y # TODO Limit spring deformation func _physics_process(delta: float) -> void: - var bc = _body_contact() - if !bc: - shock_ready = true - if bc && shock_ready: - _Kinematic_Body_on_Spring() + var bc = _body_contact() + if !bc: + shock_ready = true + if bc && shock_ready: + _Kinematic_Body_on_Spring() - var spring_force = spring_k * (self.position.y - self.start_y) - if coupled_body != null: - coupled_mass = mass + coupled_body.mass - else: - coupled_mass = mass + var spring_force = spring_k * (self.start_y - self.position.y) + if coupled_body != null: + coupled_mass = mass + coupled_body.mass + else: + coupled_mass = mass - var weight_force = coupled_mass * PhysicsConst.gravity - var result_force = weight_force + spring_force - y_velocity = PhysicsFunc.two_step_euler( - y_velocity, result_force, coupled_mass, delta - ) + var weight_force = coupled_mass * PhysicsConst.gravity + var result_force = weight_force + spring_force + y_velocity = PhysicsFunc.two_step_euler( + y_velocity, result_force, coupled_mass, delta + ) - y_velocity *= friction + y_velocity *= friction - self.position.y += y_velocity * delta + self.position.y += y_velocity * delta func _body_contact() -> bool: - var areas: Array = $SpringSkin.get_overlapping_areas() - for i in range(0, areas.size()): - if ["BlobbySkin","EnemySkin"].has(areas[i].name): - coupled_body = areas[i].get_parent() - return true - coupled_body = null - return false + var areas: Array = $SpringSkin.get_overlapping_areas() + for i in range(0, areas.size()): + coupled_body = areas[i].get_parent() + return true + coupled_body = null + return false func _Kinematic_Body_on_Spring() -> void: - var a_velocity = stored_incoming_velocity - var a_mass = coupled_body.mass - var b_velocity = y_velocity - var b_mass = mass - y_velocity += PhysicsFunc.complete_unelastic_shock( - a_velocity, b_velocity, a_mass, b_mass - ) - stored_incoming_velocity = 0 - shock_ready = false + var a_velocity = stored_incoming_velocity + var a_mass = coupled_body.mass + var b_velocity = y_velocity + var b_mass = mass + y_velocity += PhysicsFunc.complete_unelastic_shock( + a_velocity, b_velocity, a_mass, b_mass + ) + stored_incoming_velocity = 0 + shock_ready = false func _on_SpringSkin_area_exited(_area: Area2D) -> void: - var displacement = self.position.y - self.start_y - var potential_spring_energy = spring_k * 0.5 * pow(displacement, 2) - var mass_ratio = 1 - mass / coupled_mass - var transferred_kinetic_energy = potential_spring_energy * mass_ratio - var kinetic_energy_in_velocity = ( - -sign(displacement) - * sqrt( - abs( - 2 * transferred_kinetic_energy / max(coupled_mass - mass, 0.001) - ) - ) - ) - if coupled_body != null: - coupled_body.velocity.y += kinetic_energy_in_velocity + var displacement = self.position.y - self.start_y + var potential_spring_energy = spring_k * 0.5 * pow(displacement, 2) + var mass_ratio = 1 - mass / coupled_mass + var transferred_kinetic_energy = potential_spring_energy * mass_ratio + var kinetic_energy_in_velocity = ( + -sign(displacement) + * sqrt( + 2 * transferred_kinetic_energy / max(coupled_mass - mass, 0.001) + ) + ) + if coupled_body != null: + coupled_body.velocity.y += kinetic_energy_in_velocity func _on_EnteringVelocityDetector_area_entered(area: Area2D) -> void: - if area.name == "BlobbySkin": - if area.get_parent().velocity.y > 0: - stored_incoming_velocity = area.get_parent().velocity.y + if area.get_parent().velocity.y > 0: + stored_incoming_velocity = area.get_parent().velocity.y func _on_EnteringVelocityDetector_area_exited(area: Area2D) -> void: - if coupled_body == null: - $SpringSound.play() + if coupled_body == null: + $SpringSound.play() diff --git a/src/Platforms/Spring/SpringPlatform.tscn b/src/Platforms/Spring/SpringPlatform.tscn index e60a466..8465ec4 100644 --- a/src/Platforms/Spring/SpringPlatform.tscn +++ b/src/Platforms/Spring/SpringPlatform.tscn @@ -22,6 +22,7 @@ texture = ExtResource( 2 ) [node name="SpringSkin" type="Area2D" parent="."] collision_layer = 32 collision_mask = 3 +monitorable = false [node name="CollisionShape2D" type="CollisionShape2D" parent="SpringSkin"] position = Vector2( -0.0412841, -1.27843 ) @@ -39,7 +40,8 @@ one_way_collision = true [node name="EnteringVelocityDetector" type="Area2D" parent="."] position = Vector2( 0, -3.04889 ) collision_layer = 32 -collision_mask = 43 +collision_mask = 3 +monitorable = false [node name="CollisionShape2D" type="CollisionShape2D" parent="EnteringVelocityDetector"] position = Vector2( 0.00395775, -1.07744 ) diff --git a/src/Sounds/default_bus_layout.tres b/src/Sounds/default_bus_layout.tres index 2ecad21..d2631aa 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 = inf_neg +bus/0/volume_db = -10.4576 bus/1/name = "Music" bus/1/solo = false bus/1/mute = false diff --git a/src/UserInterface/Screens/MainMenu/MainScreen.tscn b/src/UserInterface/Screens/MainMenu/MainScreen.tscn index d2cd399..985c832 100644 --- a/src/UserInterface/Screens/MainMenu/MainScreen.tscn +++ b/src/UserInterface/Screens/MainMenu/MainScreen.tscn @@ -226,8 +226,7 @@ scroll_horizontal_enabled = false script = ExtResource( 11 ) [node name="VBoxContainer" type="VBoxContainer" parent="MenuContainer/Panel/LevelList"] -margin_right = 123.0 -margin_bottom = 102.0 +margin_right = 119.0 grow_horizontal = 2 grow_vertical = 2 size_flags_horizontal = 3