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-22 15:38:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modern transformation animation now actually looks like mario maker now, rejoice

Browse Source
This commit is contained in:
JHDev2006
2025-09-21 23:01:41 +01:00
parent 873ef53dfd
commit ebdd1795b2
4 changed files with 2725 additions and 2315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Scripts/Classes/Entities/Player.gd
View File

@@ -21,7 +21,7 @@ var WALK_SPEED := 96.0
var CEILING_BUMP_SPEED := 45.0
@onready var camera_center_joint: Node2D = $CameraCenterJoint
@onready var sprite: AnimatedSprite2D = $Sprite
@onready var sprite: AnimatedSprite2D = %Sprite
@onready var camera: Camera2D = $Camera
@onready var score_note_spawner: ScoreNoteSpawner = $ScoreNoteSpawner
@@ -266,7 +266,7 @@ func _process(delta: float) -> void:
handle_invincible_palette()
if is_invincible:
DiscoLevel.combo_meter = 100
$Sprite/Hammer.visible = has_hammer
%Hammer.visible = has_hammer
func apply_gravity(delta: float) -> void:
if in_water or flight_meter > 0:
@@ -411,9 +411,9 @@ func stop_all_timers() -> void:
func handle_invincible_palette() -> void:
sprite.material.set_shader_parameter("mode", !Settings.file.visuals.rainbow_style)
$Sprite.material.set_shader_parameter("player_palette", $PlayerPalette.texture)
$Sprite.material.set_shader_parameter("palette_size", colour_palette.get_width())
$Sprite.material.set_shader_parameter("invincible_palette", $InvinciblePalette.texture)
sprite.material.set_shader_parameter("player_palette", $PlayerPalette.texture)
sprite.material.set_shader_parameter("palette_size", colour_palette.get_width())
sprite.material.set_shader_parameter("invincible_palette", $InvinciblePalette.texture)
sprite.material.set_shader_parameter("palette_idx", POWER_STATES.find(power_state.state_name))
sprite.material.set_shader_parameter("enabled", (is_invincible or (palette_transform and transforming)))
@@ -444,10 +444,10 @@ func handle_power_up_states(delta) -> void:
func handle_wing_flight(delta: float) -> void:
flight_meter -= delta
if flight_meter <= 0 && $Sprite/Wings.visible:
if flight_meter <= 0 && %Wings.visible:
AudioManager.stop_music_override(AudioManager.MUSIC_OVERRIDES.WING)
gravity = FALL_GRAVITY
$Sprite/Wings.visible = flight_meter >= 0
%Wings.visible = flight_meter >= 0
if flight_meter < 0:
return
%BigWing.visible = power_state.hitbox_size == "Big"
@@ -458,9 +458,9 @@ func handle_wing_flight(delta: float) -> void:
else:
i.play("Idle")
if flight_meter <= 3:
$Sprite/Wings/AnimationPlayer.play("Flash")
%Wings.get_node("AnimationPlayer").play("Flash")
else:
$Sprite/Wings/AnimationPlayer.play("RESET")
%Wings.get_node("AnimationPlayer").play("RESET")
func damage() -> void:
if can_hurt == false or is_invincible:
@@ -499,11 +499,11 @@ func passed_checkpoint() -> void:
func do_i_frames() -> void:
can_hurt = false
for i in 25:
$Sprite.hide()
sprite.hide()
if get_tree() == null:
return
await get_tree().create_timer(0.04, false).timeout
$Sprite.show()
sprite.show()
if get_tree() == null:
return
await get_tree().create_timer(0.04, false).timeout
@@ -609,18 +609,29 @@ func power_up_animation(new_power_state := "") -> void:
var old_frames = sprite.sprite_frames
var new_frames = $ResourceSetterNew.get_resource(load(get_character_sprite_path(new_power_state)))
sprite.process_mode = Node.PROCESS_MODE_ALWAYS
$Sprite.show()
sprite.show()
get_tree().paused = true
if get_node("PowerStates/" + new_power_state).hitbox_size != power_state.hitbox_size:
sprite.speed_scale = 3
sprite.play("Grow")
await get_tree().create_timer(0.4, true).timeout
sprite.sprite_frames = new_frames
sprite.play("Grow")
await get_tree().create_timer(0.4, true).timeout
transforming = false
if Settings.file.visuals.transform_style == 0:
sprite.speed_scale = 3
sprite.play("Grow")
await get_tree().create_timer(0.4, true).timeout
sprite.sprite_frames = new_frames
sprite.play("Grow")
await get_tree().create_timer(0.4, true).timeout
transforming = false
else:
sprite.speed_scale = 0
if new_power_state == "Small":
%GrowAnimation.play("Shrink")
else:
sprite.sprite_frames = new_frames
%GrowAnimation.play("Grow")
await get_tree().create_timer(0.8, true).timeout
sprite.sprite_frames = new_frames
transforming = false
else:
if not palette_transform:
if Settings.file.visuals.transform_style == 1:
for i in 6:
sprite.sprite_frames = new_frames
await get_tree().create_timer(0.05).timeout

2
Scripts/Classes/Singletons/Global.gd
View File

@@ -117,7 +117,7 @@ var can_time_tick := true:
if value == false:
pass
var player_power_states := "0000"
var player_power_states := "1000"
var connected_players := 1