Compare commits

...

2 commits

Author SHA1 Message Date
John Cooper McDonald
9f19571475
Fix Original Lakitu throw not going straight up (#663) 2025-10-24 19:16:04 +01:00
John Cooper McDonald
fcdf729e23
Fix being able to go one setting too far in Visuals (#662) 2025-10-24 19:15:08 +01:00
3 changed files with 6 additions and 5 deletions

View file

@ -447,7 +447,7 @@ size_flags_vertical = 3
theme_override_constants/separation = -4
script = ExtResource("4_avtty")
category_name = "SETTINGS_VISUALS"
options = [NodePath("ParallaxStyle"), NodePath("BGParticles"), NodePath("HUDStyle"), NodePath("RainbowEffect"), NodePath("TransformationEffect"), NodePath("TextShadows"), NodePath("BridgeDestructionAnimation"), NodePath("VisibleTimers"), NodePath("TransitionAnimation"), null, NodePath("ColourfulPipes"), NodePath("FirebarStyle"), NodePath("ExtraParticles")]
options = [NodePath("ParallaxStyle"), NodePath("BGParticles"), NodePath("HUDStyle"), NodePath("RainbowEffect"), NodePath("TransformationEffect"), NodePath("TextShadows"), NodePath("BridgeDestructionAnimation"), NodePath("VisibleTimers"), NodePath("TransitionAnimation"), NodePath("ColourfulPipes"), NodePath("FirebarStyle"), NodePath("ExtraParticles")]
[node name="Control" type="Control" parent="PanelContainer/MarginContainer/VBoxContainer/Visuals"]
custom_minimum_size = Vector2(0, 4)

View file

@ -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)

View file

@ -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: