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

Optional Animations 2: Electric Boogaloo (#596)

Browse Source 
* Additional optional animations for water/wing power-up + extras

* Added animation fallbacks for new animations

* Kicking animation function

* Kick anim functionality for shells

* Player performs kick animation

* RunJump anims + quick fixes

new anims, including RunJump, RunJumpFall and RunJumpBump (incredible name) which play depending on the X velocity the player left the ground with.

also fixed the bob-omb to play the kick animation as well as it should

also

* Updated "FlyMove" to "WingMove" for consistency

* Update "FlyMove" to "WingMove" in animation fallbacks
This commit is contained in:
SkyanUltra
2025-10-15 07:51:38 -04:00
committed by GitHub
parent 69fb2b5005
commit 447b6d3ea7
4 changed files with 57 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,6 +52,7 @@ var input_direction := 0
var flight_meter := 0.0
var velocity_direction := 1
var velocity_x_jump_stored := 0
var total_keys := 0
@@ -74,6 +75,9 @@ var can_bump_crouch = false
var can_bump_swim = false
var can_bump_fly = false
var kicking = false
var can_kick_anim = false
@export var player_id := 0
const ONE_UP_NOTE = preload("uid://dopxwjj37gu0l")
var gravity := FALL_GRAVITY
@@ -148,7 +152,11 @@ const ANIMATION_FALLBACKS := {
"Run": "Move",
"PipeWalk": "Walk",
"LookUp": "Idle",
"WaterLookUp": "LookUp",
"WingLookUp": "WaterLookUp",
"Crouch": "Idle",
"WaterCrouch": "Crouch",
"WingCrouch": "WaterCrouch",
"CrouchFall": "Crouch",
"CrouchJump": "Crouch",
"CrouchBump": "Bump",
@@ -159,16 +167,20 @@ const ANIMATION_FALLBACKS := {
"WalkAttack": "MoveAttack",
"RunAttack": "MoveAttack",
"SkidAttack": "MoveAttack",
"FlyIdle": "SwimIdle",
"WingIdle": "WaterIdle",
"FlyUp": "SwimUp",
"FlyMove": "SwimMove",
"WingMove": "SwimMove",
"FlyAttack": "SwimAttack",
"FlyBump": "SwimBump",
"FlagSlide": "Climb",
"WaterMove": "Move",
"WaterIdle": "Idle",
"FlyIdle": "SwimIdle",
"SwimBump": "Bump",
"DieFreeze": "Die",
"RunJump": "Jump",
"RunJumpFall": "JumpFall",
"RunJumpBump": "JumpBump",
"StarJump": "Jump",
"StarFall": "JumpFall"
}
@@ -449,6 +461,11 @@ func bump_ceiling() -> void:
await get_tree().create_timer(0.1).timeout
bumping = false
func kick_anim() -> void:
kicking = true
await get_tree().create_timer(0.2).timeout
kicking = false
func super_star() -> void:
DiscoLevel.combo_meter += 1
is_invincible = true
@@ -671,6 +688,7 @@ func set_power_state_frame() -> void:
can_bump_crouch = %Sprite.sprite_frames.has_animation("CrouchBump")
can_bump_swim = %Sprite.sprite_frames.has_animation("SwimBump")
can_bump_fly = %Sprite.sprite_frames.has_animation("FlyBump")
can_kick_anim = %Sprite.sprite_frames.has_animation("Kick")
func get_power_up(power_name := "") -> void:
if is_dead:
@@ -822,6 +840,7 @@ func jump() -> void:
if spring_bouncing:
return
velocity.y = calculate_jump_height() * gravity_vector.y
velocity_x_jump_stored = velocity.x
gravity = JUMP_GRAVITY
AudioManager.play_sfx("small_jump" if power_state.hitbox_size == "Small" else "big_jump", global_position)
has_jumped = true