Feat: Level Order, Removing Savepoints on finish

default_bus_layout.tres

@@ -31,6 +31,7 @@ resource_name = "Delay"
 resource_name = "Phaser"
 
 [resource]
+bus/0/volume_db = -80.0
 bus/1/name = "Music"
 bus/1/solo = false
 bus/1/mute = false

project.godot

@@ -172,6 +172,7 @@ interact={
 "deadzone": 0.5,
 "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":0,"physical_scancode":69,"unicode":0,"echo":false,"script":null)
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":0,"physical_scancode":16777221,"unicode":0,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":2,"pressure":0.0,"pressed":false,"script":null)
  ]
 }
 up={

src/Actors/Enemies/Beings/WhatAreFrog.gd

@@ -367,9 +367,10 @@ func consider_jumping_on_top() -> Vector2:
 	var map_position = tilemap.world_to_map(local_position)
 	var tile_position = Vector2(map_position.x + facing, map_position.y)
 	# TODO Here the climb height of frog is limited to one constantly
-	if (tilemap.get_cell(tile_position.x, tile_position.y - 1) != -1 &&
-			#TODO 9 is the navigation tile!
-			tilemap.get_cell(tile_position.x, tile_position.y - 1) != 9):
+	var cell_id = tilemap.get_cell(tile_position.x, tile_position.y - 1)
+	if (cell_id != -1 &&
+			#TODO 9 is the navigation tile, but thats subject to change!
+			cell_id != 8):
 		return Vector2(0,0)
 	var tile_upper_left_corner = tilemap.to_global(tilemap.map_to_world(tile_position))
 	var tile_upper_right_corner = Vector2(tile_upper_left_corner.x + tilemap.cell_size.x, tile_upper_left_corner.y)

src/BenefitialObjects/Coin.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=323 format=2]
 
 [ext_resource path="res://assets/neutral object/whitegold orbicle/0020 (Klein)-fs8.png" type="Texture" id=1]
-[ext_resource path="res://src/NeutralObjects/Coin.gd" type="Script" id=2]
+[ext_resource path="res://src/BenefitialObjects/Coin.gd" type="Script" id=2]
 [ext_resource path="res://assets/neutral object/whitegold orbicle/0021 (Klein)-fs8.png" type="Texture" id=3]
 [ext_resource path="res://assets/neutral object/whitegold orbicle/0023 (Klein)-fs8.png" type="Texture" id=4]
 [ext_resource path="res://assets/neutral object/whitegold orbicle/0025 (Klein)-fs8.png" type="Texture" id=5]

src/BenefitialObjects/SavePoint.tscn

@@ -3,7 +3,7 @@
 [ext_resource path="res://assets/neutral object/blobby1Flag.png" type="Texture" id=1]
 [ext_resource path="res://assets/neutral object/flagPoleAndBasePlant.png" type="Texture" id=2]
 [ext_resource path="res://src/Environment/FlagMaterial.tres" type="Material" id=3]
-[ext_resource path="res://src/NeutralObjects/SavePoint.gd" type="Script" id=4]
+[ext_resource path="res://src/BenefitialObjects/SavePoint.gd" type="Script" id=4]
 
 [sub_resource type="Animation" id=2]
 length = 0.001

src/Contraptions/Portal/Portal.gd

@@ -6,7 +6,7 @@ onready var levelState := get_tree().root.get_child(1).get_node("%LevelState")
 onready var signalManager := get_tree().root.get_child(1).get_node("%SignalManager")
 onready var levelName := get_tree().get_current_scene().get_name()
 
-export var next_scene: PackedScene
+export(String, FILE, "*.tscn") var next_scene
 
 
 func _get_configuration_warning() -> String:
@@ -20,7 +20,8 @@ func teleport() -> void:
 	anim_player.play("fade_in")
 	# TODO This doesn't pause the game but should
 	yield(anim_player, "animation_finished")
-	get_tree().change_scene_to(next_scene)
+	if ResourceLoader.exists(next_scene):
+		get_tree().change_scene(next_scene)
 
 
 func _on_body_entered(_body: Node) -> void:

src/Contraptions/Triggers/ElevatorButton.tscn

@@ -55,6 +55,8 @@ tracks/0/keys = {
 radius = 18.0
 
 [node name="ElevatorButton" type="Node2D"]
+scale = Vector2( 2, 2 )
+z_index = 2
 script = ExtResource( 1 )
 elevator_time = 3
 
@@ -89,6 +91,7 @@ anims/onning = SubResource( 13 )
 [node name="ActivatorArea" type="Area2D" parent="."]
 unique_name_in_owner = true
 position = Vector2( 0, -6 )
+scale = Vector2( 0.5, 0.5 )
 collision_layer = 24
 monitorable = false
 

src/Environment/AlienGreenhouseTileSet.tres

@@ -1,9 +1,13 @@
-[gd_resource type="TileSet" load_steps=9 format=2]
+[gd_resource type="TileSet" load_steps=17 format=2]
 
 [ext_resource path="res://assets/environment/blocks/GreenhouseInnerEdge.png" type="Texture" id=1]
 [ext_resource path="res://assets/environment/blocks/GreenhouseOuteredge.png" type="Texture" id=2]
 [ext_resource path="res://assets/environment/blocks/GreenhouseHorizontal.png" type="Texture" id=3]
 [ext_resource path="res://assets/environment/blocks/GreenhouseVertical.png" type="Texture" id=4]
+[ext_resource path="res://assets/environment/blocks/Alien-Ship-Ground-Edge.png" type="Texture" id=5]
+[ext_resource path="res://assets/environment/blocks/Alien-Ship-Ground-Edge-Outer.png" type="Texture" id=6]
+[ext_resource path="res://assets/environment/blocks/Alien-Ship-Ground-Inner.png" type="Texture" id=7]
+[ext_resource path="res://assets/environment/blocks/Empty-Navigation-Tile.png" type="Texture" id=8]
 
 [sub_resource type="ConvexPolygonShape2D" id=1]
 points = PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 )
@@ -17,6 +21,20 @@ points = PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 )
 [sub_resource type="ConvexPolygonShape2D" id=4]
 points = PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 )
 
+[sub_resource type="ConvexPolygonShape2D" id=5]
+points = PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 )
+
+[sub_resource type="ConvexPolygonShape2D" id=6]
+points = PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 )
+
+[sub_resource type="ConvexPolygonShape2D" id=7]
+points = PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 )
+
+[sub_resource type="NavigationPolygon" id=8]
+vertices = PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 )
+polygons = [ PoolIntArray( 0, 1, 2, 3 ) ]
+outlines = [ PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 ) ]
+
 [resource]
 0/name = "GreenhouseHorizontal.png 0"
 0/texture = ExtResource( 3 )
@@ -102,3 +120,95 @@ points = PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 )
 "shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
 } ]
 3/z_index = 0
+4/name = "Alien-Ship-Ground-Edge.png 4"
+4/texture = ExtResource( 5 )
+4/tex_offset = Vector2( 0, 0 )
+4/modulate = Color( 1, 1, 1, 1 )
+4/region = Rect2( 0, 0, 24, 24 )
+4/tile_mode = 0
+4/occluder_offset = Vector2( 0, 0 )
+4/navigation_offset = Vector2( 0, 0 )
+4/shape_offset = Vector2( 0, 0 )
+4/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+4/shape = SubResource( 5 )
+4/shape_one_way = false
+4/shape_one_way_margin = 1.0
+4/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 5 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
+4/z_index = 0
+5/name = "Alien-Ship-Ground-Edge-Outer.png 5"
+5/texture = ExtResource( 6 )
+5/tex_offset = Vector2( 0, 0 )
+5/modulate = Color( 1, 1, 1, 1 )
+5/region = Rect2( 0, 0, 24, 24 )
+5/tile_mode = 0
+5/occluder_offset = Vector2( 0, 0 )
+5/navigation_offset = Vector2( 0, 0 )
+5/shape_offset = Vector2( 0, 0 )
+5/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+5/shape = SubResource( 6 )
+5/shape_one_way = false
+5/shape_one_way_margin = 1.0
+5/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 6 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
+5/z_index = 0
+6/name = "Alien-Ship-Ground-Inner.png 6"
+6/texture = ExtResource( 7 )
+6/tex_offset = Vector2( 0, 0 )
+6/modulate = Color( 1, 1, 1, 1 )
+6/region = Rect2( 0, 0, 24, 24 )
+6/tile_mode = 0
+6/occluder_offset = Vector2( 0, 0 )
+6/navigation_offset = Vector2( 0, 0 )
+6/shape_offset = Vector2( 0, 0 )
+6/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+6/shape_one_way = false
+6/shape_one_way_margin = 0.0
+6/shapes = [  ]
+6/z_index = 0
+7/name = "Alien-Ship-Ground-Inner.png 7"
+7/texture = ExtResource( 7 )
+7/tex_offset = Vector2( 0, 0 )
+7/modulate = Color( 1, 1, 1, 1 )
+7/region = Rect2( 0, 0, 24, 24 )
+7/tile_mode = 0
+7/occluder_offset = Vector2( 0, 0 )
+7/navigation_offset = Vector2( 0, 0 )
+7/shape_offset = Vector2( 0, 0 )
+7/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+7/shape = SubResource( 7 )
+7/shape_one_way = false
+7/shape_one_way_margin = 1.0
+7/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 7 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
+7/z_index = 0
+8/name = "Empty-Navigation-Tile.png 8"
+8/texture = ExtResource( 8 )
+8/tex_offset = Vector2( 0, 0 )
+8/modulate = Color( 1, 1, 1, 1 )
+8/region = Rect2( 0, 0, 24, 24 )
+8/tile_mode = 0
+8/occluder_offset = Vector2( 0, 0 )
+8/navigation_offset = Vector2( 0, 0 )
+8/navigation = SubResource( 8 )
+8/shape_offset = Vector2( 0, 0 )
+8/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+8/shape_one_way = false
+8/shape_one_way_margin = 0.0
+8/shapes = [  ]
+8/z_index = 0

src/Levels/3 Tut Level.tscn

@@ -1,8 +1,8 @@
-[gd_scene load_steps=16 format=2]
+[gd_scene load_steps=17 format=2]
 
-[ext_resource path="res://src/Levels/Level 4.tscn" type="PackedScene" id=1]
 [ext_resource path="res://src/Environment/AlienShipTileSet.tres" type="TileSet" id=2]
-[ext_resource path="res://src/NeutralObjects/Coin.tscn" type="PackedScene" id=7]
+[ext_resource path="res://src/Contraptions/VendingMachine.tscn" type="PackedScene" id=3]
+[ext_resource path="res://src/BenefitialObjects/Coin.tscn" type="PackedScene" id=7]
 [ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=36]
 [ext_resource path="res://src/Utilities/LevelState.tscn" type="PackedScene" id=37]
 [ext_resource path="res://src/Actors/BlobbyCam.tscn" type="PackedScene" id=38]
@@ -18,6 +18,23 @@
 
 [sub_resource type="AnimationNodeStateMachinePlayback" id=6]
 
+[sub_resource type="Animation" id=7]
+resource_name = "Horizontal"
+length = 6.0
+loop = true
+tracks/0/type = "value"
+tracks/0/path = NodePath("KinematicBody2D:position")
+tracks/0/interp = 2
+tracks/0/loop_wrap = true
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/keys = {
+"times": PoolRealArray( 0, 3 ),
+"transitions": PoolRealArray( 1.33, 1.33 ),
+"update": 0,
+"values": [ Vector2( 0, 0 ), Vector2( 0, 48 ) ]
+}
+
 [node name="Level 3" type="Node2D"]
 script = ExtResource( 48 )
 __meta__ = {
@@ -47,31 +64,9 @@ margin_bottom = 0.456848
 unique_name_in_owner = true
 position = Vector2( 63, 336 )
 
-[node name="CollisionPolygon2D" parent="Blobby/BlobbySkin" index="0"]
-position = Vector2( 0.0286326, -10.0053 )
-
-[node name="BlobbySprite" parent="Blobby" index="3"]
-scale = Vector2( -1, 1 )
-frame = 5
-
 [node name="AnimationTree" parent="Blobby/BlobbySprite" index="0"]
 parameters/playback = SubResource( 4 )
 
-[node name="BlobbyBody" parent="Blobby" index="8"]
-position = Vector2( 0.0392303, -10.002 )
-
-[node name="Left_Wallcast1" parent="Blobby/WallRaycasts/LeftWallRaycast" index="0"]
-position = Vector2( -11.9763, -5 )
-
-[node name="Left_Wallcast2" parent="Blobby/WallRaycasts/LeftWallRaycast" index="1"]
-position = Vector2( -11.9763, 5 )
-
-[node name="Right_Wallcast1" parent="Blobby/WallRaycasts/RightWallRaycast" index="0"]
-position = Vector2( 12.0551, -5 )
-
-[node name="Right_Wallcast2" parent="Blobby/WallRaycasts/RightWallRaycast" index="1"]
-position = Vector2( 12.0551, 5 )
-
 [node name="JumpBufferTimer" parent="Blobby/BlobbyStateMachine" index="0"]
 process_mode = 0
 wait_time = 0.605
@@ -79,9 +74,12 @@ wait_time = 0.605
 [node name="CoyoteTimer" parent="Blobby/BlobbyStateMachine" index="1"]
 process_mode = 0
 
+[node name="VendingMachine" parent="." instance=ExtResource( 3 )]
+position = Vector2( 204, 276 )
+
 [node name="Portal" parent="." instance=ExtResource( 41 )]
 position = Vector2( 745, 312 )
-next_scene = ExtResource( 1 )
+next_scene = "res://src/Levels/Actual Level 1.tscn"
 
 [node name="Coin" parent="." instance=ExtResource( 7 )]
 position = Vector2( 204, 207 )
@@ -90,7 +88,7 @@ position = Vector2( 204, 207 )
 position = Vector2( 745, 126 )
 
 [node name="Coin3" parent="." instance=ExtResource( 7 )]
-position = Vector2( 384, 99 )
+position = Vector2( 360, 111 )
 
 [node name="TileMap" type="TileMap" parent="."]
 unique_name_in_owner = true
@@ -115,8 +113,11 @@ weight = 0.2
 [node name="AnimationTree" parent="Flyer/FlyerSprite" index="1"]
 parameters/playback = SubResource( 6 )
 
-[node name="FlyingPlatformClean" parent="." instance=ExtResource( 40 )]
-position = Vector2( 384, 168 )
+[node name="FlyingPlatformClean3" parent="." instance=ExtResource( 40 )]
+position = Vector2( 360, 171 )
+
+[node name="anim" parent="FlyingPlatformClean3" index="1"]
+anims/Horizontal = SubResource( 7 )
 
 [connection signal="body_exited" from="Blobby/BlobbySkin" to="Blobby" method="_on_BlobbySkin_body_exited"]
 
@@ -124,4 +125,4 @@ position = Vector2( 384, 168 )
 [editable path="UserInterface/HUD"]
 [editable path="Blobby"]
 [editable path="Flyer"]
-[editable path="FlyingPlatformClean"]
+[editable path="FlyingPlatformClean3"]

src/Levels/Falling Level.tscn

@@ -36,7 +36,10 @@ drag_margin_top = 0.38
 drag_margin_bottom = 0.0
 
 [node name="AnimatedSprite" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="4"]
-frame = 8
+frame = 13
+
+[node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"]
+frame = 11
 
 [node name="Blobby" parent="." instance=ExtResource( 3 )]
 unique_name_in_owner = true

src/Levels/Level 4.tscn

@@ -6,7 +6,7 @@
 [ext_resource path="res://src/Actors/BlobbyCam.tscn" type="PackedScene" id=4]
 [ext_resource path="res://src/Actors/Enemies/Beings/BoundFrog.tscn" type="PackedScene" id=5]
 [ext_resource path="res://src/Actors/Enemies/Beings/Flyer.tscn" type="PackedScene" id=6]
-[ext_resource path="res://src/NeutralObjects/Coin.tscn" type="PackedScene" id=7]
+[ext_resource path="res://src/BenefitialObjects/Coin.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/Contraptions/Triggers/FrogFreeButton.tscn" type="PackedScene" id=10]
@@ -214,10 +214,10 @@ drag_margin_top = 0.13
 drag_margin_bottom = 0.3
 
 [node name="AnimatedSprite" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="4"]
-frame = 2
+frame = 0
 
 [node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"]
-frame = 2
+frame = 0
 
 [node name="Blobby" parent="." instance=ExtResource( 8 )]
 unique_name_in_owner = true
@@ -226,31 +226,9 @@ position = Vector2( 21, -9 )
 [node name="StateLabel" parent="Blobby" index="0"]
 visible = true
 
-[node name="CollisionPolygon2D" parent="Blobby/BlobbySkin" index="0"]
-position = Vector2( 0.0286326, -10.0053 )
-
-[node name="BlobbySprite" parent="Blobby" index="3"]
-scale = Vector2( -1, 1 )
-frame = 5
-
 [node name="AnimationTree" parent="Blobby/BlobbySprite" index="0"]
 parameters/playback = SubResource( 4 )
 
-[node name="BlobbyBody" parent="Blobby" index="8"]
-position = Vector2( 0.0392303, -10.002 )
-
-[node name="Left_Wallcast1" parent="Blobby/WallRaycasts/LeftWallRaycast" index="0"]
-position = Vector2( -11.9763, -5 )
-
-[node name="Left_Wallcast2" parent="Blobby/WallRaycasts/LeftWallRaycast" index="1"]
-position = Vector2( -11.9763, 5 )
-
-[node name="Right_Wallcast1" parent="Blobby/WallRaycasts/RightWallRaycast" index="0"]
-position = Vector2( 12.0551, -5 )
-
-[node name="Right_Wallcast2" parent="Blobby/WallRaycasts/RightWallRaycast" index="1"]
-position = Vector2( 12.0551, 5 )
-
 [node name="Coin" parent="." instance=ExtResource( 7 )]
 position = Vector2( 216, -216 )
 

src/Levels/Level 5.tscn

@@ -4,7 +4,7 @@
 [ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=2]
 [ext_resource path="res://src/Utilities/LevelState.tscn" type="PackedScene" id=3]
 [ext_resource path="res://src/Actors/BlobbyCam.tscn" type="PackedScene" id=4]
-[ext_resource path="res://src/NeutralObjects/Coin.tscn" type="PackedScene" id=7]
+[ext_resource path="res://src/BenefitialObjects/Coin.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/Contraptions/Portal/Portal.tscn" type="PackedScene" id=11]
@@ -42,10 +42,10 @@ drag_margin_top = 0.13
 drag_margin_bottom = 0.3
 
 [node name="AnimatedSprite" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="4"]
-frame = 3
+frame = 13
 
 [node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"]
-frame = 3
+frame = 13
 
 [node name="Blobby" parent="." instance=ExtResource( 8 )]
 unique_name_in_owner = true

src/Levels/x01 Level.tscn

@@ -3,7 +3,7 @@
 [ext_resource path="res://src/Environment/AlienShipTileSet.tres" type="TileSet" id=1]
 [ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=2]
 [ext_resource path="res://src/Utilities/LevelState.tscn" type="PackedScene" id=3]
-[ext_resource path="res://src/NeutralObjects/Coin.tscn" type="PackedScene" id=4]
+[ext_resource path="res://src/BenefitialObjects/Coin.tscn" type="PackedScene" id=4]
 [ext_resource path="res://src/Platforms/FlyingLaserCutter.tscn" type="PackedScene" id=5]
 [ext_resource path="res://src/Actors/BlobbyCam.tscn" type="PackedScene" id=6]
 [ext_resource path="res://src/Contraptions/Portal/Portal.tscn" type="PackedScene" id=7]
@@ -44,40 +44,18 @@ wait_time = 20.0
 drag_margin_bottom = 0.3
 
 [node name="AnimatedSprite" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="4"]
-frame = 2
+frame = 8
 
 [node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"]
-frame = 8
+frame = 0
 
 [node name="Blobby" parent="." instance=ExtResource( 12 )]
 unique_name_in_owner = true
 position = Vector2( -70, -1.90735e-06 )
 
-[node name="CollisionPolygon2D" parent="Blobby/BlobbySkin" index="0"]
-position = Vector2( 0.0286326, -10.0053 )
-
-[node name="BlobbySprite" parent="Blobby" index="3"]
-scale = Vector2( -1, 1 )
-frame = 5
-
 [node name="AnimationTree" parent="Blobby/BlobbySprite" index="0"]
 parameters/playback = SubResource( 4 )
 
-[node name="BlobbyBody" parent="Blobby" index="8"]
-position = Vector2( 0.0392303, -10.002 )
-
-[node name="Left_Wallcast1" parent="Blobby/WallRaycasts/LeftWallRaycast" index="0"]
-position = Vector2( -11.9763, -5 )
-
-[node name="Left_Wallcast2" parent="Blobby/WallRaycasts/LeftWallRaycast" index="1"]
-position = Vector2( -11.9763, 5 )
-
-[node name="Right_Wallcast1" parent="Blobby/WallRaycasts/RightWallRaycast" index="0"]
-position = Vector2( 12.0551, -5 )
-
-[node name="Right_Wallcast2" parent="Blobby/WallRaycasts/RightWallRaycast" index="1"]
-position = Vector2( 12.0551, 5 )
-
 [node name="PitArea" parent="." instance=ExtResource( 9 )]
 position = Vector2( 540, 162 )
 

src/Levels/x02 Level.tscn

@@ -89,10 +89,10 @@ wait_time = 20.0
 [node name="BlobbyCam" parent="." instance=ExtResource( 6 )]
 
 [node name="AnimatedSprite" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="4"]
-frame = 1
+frame = 7
 
 [node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"]
-frame = 6
+frame = 12
 
 [node name="Blobby" parent="." instance=ExtResource( 12 )]
 unique_name_in_owner = true

src/Levels/x03 Level.tscn

@@ -140,7 +140,6 @@ shape = SubResource( 3 )
 position = Vector2( 0, 1.5 )
 z_index = -1
 frames = SubResource( 5 )
-frame = 4
 playing = true
 
 [node name="Terminal" parent="." instance=ExtResource( 44 )]

src/Levels/xFroggy Test Level.tscn

@@ -3,7 +3,7 @@
 [ext_resource path="res://src/Environment/AlienShipTileSet.tres" type="TileSet" id=1]
 [ext_resource path="res://src/Contraptions/Triggers/ElevatorButton.tscn" type="PackedScene" id=3]
 [ext_resource path="res://src/Actors/BlobbyCam.tscn" type="PackedScene" id=4]
-[ext_resource path="res://src/NeutralObjects/Coin.tscn" type="PackedScene" id=5]
+[ext_resource path="res://src/BenefitialObjects/Coin.tscn" type="PackedScene" id=5]
 [ext_resource path="res://src/Contraptions/Portal/Portal.tscn" type="PackedScene" id=6]
 [ext_resource path="res://src/Levels/xEnemy Test Level.tscn" type="PackedScene" id=7]
 [ext_resource path="res://src/Platforms/FlyingLaserCutter.tscn" type="PackedScene" id=8]

src/Levels/xGrass Test Level.tscn

@@ -219,10 +219,10 @@ position = Vector2( 210, -15 )
 [node name="BlobbyCam" parent="." instance=ExtResource( 11 )]
 
 [node name="AnimatedSprite" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="4"]
-frame = 4
+frame = 6
 
 [node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"]
-frame = 9
+frame = 11
 
 [node name="Blobby" parent="." instance=ExtResource( 10 )]
 unique_name_in_owner = true

src/UserInterface/Screens/HUD.gd

@@ -40,6 +40,6 @@ func update_interface() -> void:
 	
 	var wallet = GlobalState.wallet + levelState.currency
 
-	currency.text = "Wallet: %s Orbicles" % wallet
+	currency.text = "Orbs: %s" % wallet
 	kills.text = "Kills: %s" % levelState.kills
 	frees.text = "Freed: %s" % levelState.frees

src/UserInterface/Screens/HUD.tscn

@@ -56,7 +56,7 @@ margin_top = 291.0
 margin_right = 174.0
 margin_bottom = 304.0
 rect_scale = Vector2( 0.590909, 0.627907 )
-text = "Orbicles: 100000000000000000"
+text = "Orbs: 100000000000000000"
 
 [node name="Kills" type="Label" parent="HUDOverlay"]
 unique_name_in_owner = true

src/Utilities/LevelState.gd

@@ -74,10 +74,11 @@ func update_global_state() -> void:
 		progress_dict[levelName]["kills"] = GlobalState.get_property_value(levelName,"kills") + kills
 		progress_dict[levelName]["deaths"] = GlobalState.get_property_value(levelName,"deaths") + deaths
 		progress_dict[levelName]["frees"] = GlobalState.get_property_value(levelName,"frees") + frees
+		# TODO This is not the best place for this
+		progress_dict[levelName].erase("savepoint")
 	
 	GlobalState.set_wallet(GlobalState.wallet + currency)
 
-
 	GlobalState.set_progress(progress_dict)
 
 func player_dying(animation_number: int = 0) -> void: