GitHub/Super-Mario-Bros.-Remastered-Public
1
0
Fork 0
mirror of https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public.git synced 2025-10-26 09:20:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Original Lakitu throw not going straight up (#663)

Browse Source
This commit is contained in:
John Cooper McDonald
2025-10-24 13:16:04 -05:00
committed by GitHub
parent fcdf729e23
commit 9f19571475
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Scripts/Classes/Entities/Enemies/Lakitu.gd
View File

@@ -12,8 +12,6 @@ var lakitu_point := Vector2.ZERO
const BLOCK_DISTANCE := 64 const BLOCK_DISTANCE := 64
static var fixed_throw := true
var player: Player = null var player: Player = null
var retreat := false var retreat := false
@@ -28,7 +26,6 @@ func _ready() -> void:
can_enter = false can_enter = false
$ThrowTimer.start() $ThrowTimer.start()
lakitu_point = to_local(global_position) lakitu_point = to_local(global_position)
fixed_throw = Settings.file.difficulty.lakitu_style == 1
get_parent().move_child(self, 0) get_parent().move_child(self, 0)
func _process(_delta: float) -> void: func _process(_delta: float) -> void:
@@ -80,7 +77,7 @@ func throw_spiny() -> void:
node.set("in_egg", true) node.set("in_egg", true)
node.global_position = $Cloud/Sprite.global_position node.global_position = $Cloud/Sprite.global_position
node.velocity = Vector2(0, -150) 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.velocity.x = 50 * (sign(player.global_position.x - global_position.x))
node.set("direction", sign(node.velocity.x)) node.set("direction", sign(node.velocity.x))
add_sibling(node) add_sibling(node)

4
Scripts/Classes/Entities/Enemies/Spiny.gd
View File

@@ -9,9 +9,13 @@ func _physics_process(delta: float) -> void:
func handle_movement(_delta: float) -> void: func handle_movement(_delta: float) -> void:
if in_egg: if in_egg:
$BasicEnemyMovement.move_speed = 0
$BasicEnemyMovement.second_quest_speed = 0
if is_on_floor(): if is_on_floor():
var player = get_tree().get_first_node_in_group("Players") var player = get_tree().get_first_node_in_group("Players")
direction = sign(player.global_position.x - global_position.x) direction = sign(player.global_position.x - global_position.x)
$BasicEnemyMovement.move_speed = 32
$BasicEnemyMovement.second_quest_speed = 36
in_egg = false in_egg = false
$Sprite.play("Egg") $Sprite.play("Egg")
else: else: