diff --git a/assets/contraption/ShieldVendingMachine.aseprite b/assets/contraption/ShieldVendingMachine.aseprite index 68d9c31..a32849f 100644 Binary files a/assets/contraption/ShieldVendingMachine.aseprite and b/assets/contraption/ShieldVendingMachine.aseprite differ diff --git a/assets/contraption/ShieldVendingMachine.png b/assets/contraption/ShieldVendingMachine.png index 8c1f5a1..5cdf75a 100644 Binary files a/assets/contraption/ShieldVendingMachine.png and b/assets/contraption/ShieldVendingMachine.png differ diff --git a/src/Contraptions/VendingMachine.gd b/src/Contraptions/VendingMachine.gd index 1101e4e..2ab4830 100644 --- a/src/Contraptions/VendingMachine.gd +++ b/src/Contraptions/VendingMachine.gd @@ -9,6 +9,8 @@ export var cost := 3 var activatable = false +func _ready(): + $Sprite.frame = 0 func _process(delta): # TODO Global currency count?? Maybe just level intern currency @@ -40,3 +42,4 @@ func _on_Timer_timeout(): $Highlight.visible = false $Label.visible = false activatable = false + $Sprite.frame = 1 diff --git a/src/Contraptions/VendingMachine.tscn b/src/Contraptions/VendingMachine.tscn index ae869bd..60fca0d 100644 --- a/src/Contraptions/VendingMachine.tscn +++ b/src/Contraptions/VendingMachine.tscn @@ -50,6 +50,7 @@ text = "Orbs in wallet: 999" [node name="Sprite" type="Sprite" parent="."] position = Vector2( 0, -4 ) texture = ExtResource( 1 ) +hframes = 2 [node name="ActivatorArea" type="Area2D" parent="."] unique_name_in_owner = true diff --git a/src/Levels/Level 3.tscn b/src/Levels/Level 3.tscn index 6e4ca99..fb48063 100644 --- a/src/Levels/Level 3.tscn +++ b/src/Levels/Level 3.tscn @@ -1011,7 +1011,7 @@ position = Vector2( -88, 96 ) 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 4.tscn b/src/Levels/Level 4.tscn index 21511b4..f2849ec 100644 --- a/src/Levels/Level 4.tscn +++ b/src/Levels/Level 4.tscn @@ -119,9 +119,6 @@ unique_name_in_owner = true position = Vector2( -183, 111 ) 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 ) @@ -171,10 +168,12 @@ position = Vector2( 169, -712 ) [node name="FlyingLaserCutter2" parent="." instance=ExtResource( 13 )] position = Vector2( 514, -592 ) +avoid_crushing = true [node name="FlyingLaserCutter4" parent="." instance=ExtResource( 13 )] position = Vector2( 432, -628 ) rotation = -3.14159 +avoid_crushing = true [node name="FlyingLaserCutter5" parent="." instance=ExtResource( 13 )] position = Vector2( 603, -801 ) @@ -226,7 +225,6 @@ position = Vector2( 268, -977 ) [node name="DartingEnemy" parent="." instance=ExtResource( 14 )] position = Vector2( 408, -461 ) -mass = 1.0 killable = false [node name="Spikes" parent="." instance=ExtResource( 15 )]