From 9f19571475117d751ad90c32976fe09fcbb40aa4 Mon Sep 17 00:00:00 2001
From: John Cooper McDonald <mario.pikmin.zelda@gmail.com>
Date: Fri, 24 Oct 2025 13:16:04 -0500
Subject: [PATCH] Fix Original Lakitu throw not going straight up (#663)

---
 Scripts/Classes/Entities/Enemies/Lakitu.gd | 5 +----
 Scripts/Classes/Entities/Enemies/Spiny.gd  | 4 ++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Scripts/Classes/Entities/Enemies/Lakitu.gd b/Scripts/Classes/Entities/Enemies/Lakitu.gd
index aef36653..e250b4f0 100644
--- a/Scripts/Classes/Entities/Enemies/Lakitu.gd
+++ b/Scripts/Classes/Entities/Enemies/Lakitu.gd
@@ -12,8 +12,6 @@ var lakitu_point := Vector2.ZERO
 
 const BLOCK_DISTANCE := 64
 
-static var fixed_throw := true
-
 var player: Player = null
 
 var retreat := false
@@ -28,7 +26,6 @@ func _ready() -> void:
 	can_enter = false
 	$ThrowTimer.start()
 	lakitu_point = to_local(global_position)
-	fixed_throw = Settings.file.difficulty.lakitu_style == 1
 	get_parent().move_child(self, 0)
 
 func _process(_delta: float) -> void:
@@ -80,7 +77,7 @@ func throw_spiny() -> void:
 	node.set("in_egg", true)
 	node.global_position = $Cloud/Sprite.global_position
 	node.velocity = Vector2(0, -150)
-	if fixed_throw:
+	if Settings.file.difficulty.lakitu_style == 1:
 		node.velocity.x = 50 * (sign(player.global_position.x - global_position.x))
 		node.set("direction", sign(node.velocity.x))
 	add_sibling(node)
diff --git a/Scripts/Classes/Entities/Enemies/Spiny.gd b/Scripts/Classes/Entities/Enemies/Spiny.gd
index 78aec408..ce65ae31 100755
--- a/Scripts/Classes/Entities/Enemies/Spiny.gd
+++ b/Scripts/Classes/Entities/Enemies/Spiny.gd
@@ -9,9 +9,13 @@ func _physics_process(delta: float) -> void:
 
 func handle_movement(_delta: float) -> void:
 	if in_egg:
+		$BasicEnemyMovement.move_speed = 0
+		$BasicEnemyMovement.second_quest_speed = 0
 		if is_on_floor():
 			var player = get_tree().get_first_node_in_group("Players")
 			direction = sign(player.global_position.x - global_position.x)
+			$BasicEnemyMovement.move_speed = 32
+			$BasicEnemyMovement.second_quest_speed = 36
 			in_egg = false
 		$Sprite.play("Egg")
 	else: