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-24 00:10:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into custom-level-loading-rewrite

Browse Source
This commit is contained in:
JHDev2006
2025-10-17 21:12:58 +01:00
parent 7feff48380 9a0d61d1e1
commit 46508e55db
200 changed files with 19511 additions and 16655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Scripts/Classes/Entities/Objects/BobOmbHeld.gd
View File

@@ -24,6 +24,7 @@ func explode() -> void:
func kick(object: Node2D) -> void:
AudioManager.play_sfx("kick", global_position)
object.kick_anim()
var kick_dir = sign(global_position.x - object.global_position.x)
velocity.x = 150 * kick_dir
direction = kick_dir

4
Scripts/Classes/Entities/Objects/Burner.gd
View File

@@ -10,9 +10,9 @@ func do_cycle() -> void:
AudioManager.play_sfx("burner", global_position)
do_animation()
await get_tree().create_timer(0.25, false).timeout
%Hitbox.set_deferred("disabled", false)
%Shape.set_deferred("disabled", false)
await get_tree().create_timer(1.5, false).timeout
%Hitbox.set_deferred("disabled", true)
%Shape.set_deferred("disabled", true)
$Timer.start()
func do_animation() -> void:

11
Scripts/Classes/Entities/Objects/Explosion.gd
View File

@@ -1,18 +1,9 @@
class_name Explosion
extends Node2D
extends Enemy
const destructable_tiles := {Vector2i(4, 0): Rect2(32, 160, 16, 16), Vector2i(4, 2): Rect2(48, 160, 16, 16)}
const BLOCK_DESTRUCTION_PARTICLES = preload("uid://cyw7kk1em8h16")
func on_body_entered(body: Node2D) -> void:
if body is Block:
if body.destructable: body.destroy()
if body is Player:
body.damage()
func on_area_entered(area: Area2D) -> void:
if area.owner is Player:
area.owner.damage()

2
Scripts/Classes/Entities/Objects/SpikeBall.gd
View File

@@ -43,7 +43,7 @@ func on_area_entered(area: Area2D) -> void:
if area.owner.has_node("ShellDetection"):
area.owner.die_from_object(self)
elif area.owner is Player:
if area.owner.is_invincible:
if area.owner.is_invincible or area.name == "HammerHitbox":
destroy()
else:
area.owner.damage()