diff --git a/ControlElements/Killzone.gd b/ControlElements/Killzone.gd index 325b5df..670f862 100644 --- a/ControlElements/Killzone.gd +++ b/ControlElements/Killzone.gd @@ -26,6 +26,7 @@ func moveup(): func movedown(): var _collide = move_and_collide(Vector2(0, 5)) + GameStats.set_multiplier(1) func _on_ZoneDetection_area_entered(_area): if (state == MOVEUP): diff --git a/Menu/Buttons/LevelSelectButton.gd b/Menu/Buttons/LevelSelectButton.gd index 7385040..afc6f3e 100644 --- a/Menu/Buttons/LevelSelectButton.gd +++ b/Menu/Buttons/LevelSelectButton.gd @@ -1,6 +1,7 @@ extends Button export var scene = "res://Menu/MainMenu.tscn" +export var powerup_card = "res://Pegs/Yellow/PowerupCards/ExtraBall.tscn" export var unlock_points_required = 0 func _ready(): @@ -10,3 +11,4 @@ func _ready(): func _on_SceneSelectButton_pressed(): GameStats.set_current_scene(scene) + GameStats.stage_powerup = powerup_card diff --git a/Menu/LevelList.tscn b/Menu/LevelList.tscn index b299cb9..bc852d2 100644 --- a/Menu/LevelList.tscn +++ b/Menu/LevelList.tscn @@ -28,6 +28,7 @@ margin_right = 168.0 margin_bottom = 40.0 icon = ExtResource( 2 ) scene = "res://Stages/EmptyStage.tscn" +powerup_card = "res://Pegs/Yellow/PowerupCards/Scattershot.tscn" [node name="SceneSelectButton2" parent="LevelListHBox" instance=ExtResource( 5 )] anchor_right = 0.0 diff --git a/Pegs/Green/GreenBar.tscn b/Pegs/Green/GreenBar.tscn index 4be9f73..80dde0f 100644 --- a/Pegs/Green/GreenBar.tscn +++ b/Pegs/Green/GreenBar.tscn @@ -42,7 +42,7 @@ shape = SubResource( 1 ) shape = SubResource( 2 ) [node name="GraceTimer" parent="." instance=ExtResource( 3 )] -wait_time = 0.24 +wait_time = 1.0 [node name="HitSFX" parent="." instance=ExtResource( 4 )] diff --git a/Pegs/Green/GreenPeg.tscn b/Pegs/Green/GreenPeg.tscn index 3721a89..1528b68 100644 --- a/Pegs/Green/GreenPeg.tscn +++ b/Pegs/Green/GreenPeg.tscn @@ -43,7 +43,7 @@ script = ExtResource( 5 ) [node name="HitSFX" parent="." instance=ExtResource( 6 )] [node name="GraceTimer" parent="." instance=ExtResource( 3 )] -wait_time = 0.24 +wait_time = 1.0 [node name="ScoreCounter" parent="." instance=ExtResource( 7 )] base_multiplier = 0 diff --git a/Pegs/Yellow/Powerups/Scattershot/ScattershotBall.gd b/Pegs/Yellow/Powerups/Scattershot/ScattershotBall.gd index 586404c..73470ae 100644 --- a/Pegs/Yellow/Powerups/Scattershot/ScattershotBall.gd +++ b/Pegs/Yellow/Powerups/Scattershot/ScattershotBall.gd @@ -11,7 +11,7 @@ func _ready() -> void: func _physics_process(_delta): var collider_array = get_colliding_bodies() for collider in collider_array: - set_particle_direction(collider) + set_particle_direction_for(collider) turn_pegs_green(collider) func turn_pegs_green(collider): @@ -20,10 +20,9 @@ func turn_pegs_green(collider): #if yes then do it collider.make_green() if can_be_deleted: - spawn_particles() - queue_free() + explode() -func set_particle_direction(collider): +func set_particle_direction_for(collider): if (collider.has_method("set_particle_direction")): collider.set_particle_direction(linear_velocity.normalized() * -1) @@ -39,3 +38,7 @@ func spawn_particles(): var main = get_tree().current_scene particles.global_position = global_position main.add_child(particles) + +func explode(): + spawn_particles() + queue_free() diff --git a/Stages/EmptyStage.tscn b/Stages/EmptyStage.tscn index ac2bb8d..879224a 100644 --- a/Stages/EmptyStage.tscn +++ b/Stages/EmptyStage.tscn @@ -258,4 +258,7 @@ position = Vector2( 30, 124 ) [node name="PowerupCards" parent="." instance=ExtResource( 15 )] +[node name="YellowPeg2" parent="." instance=ExtResource( 4 )] +position = Vector2( 298, 53 ) + [editable path="Ball"] diff --git a/Stages/World.gd b/Stages/World.gd index e41d92f..e7a1c9e 100644 --- a/Stages/World.gd +++ b/Stages/World.gd @@ -3,6 +3,7 @@ extends Node2D export var stage_name = "test stage" export var high_score = 0 export var already_beaten = false +export var powerup_card = "res://Pegs/Yellow/PowerupCards/ExtraBall.tscn" func _ready(): load_level()