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-21 23:18:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

shell kick scoring changes, duplicate 10k fix

Browse Source
This commit is contained in:
jdaster64
2025-09-23 15:56:25 -04:00
parent 775104be13
commit 8a62b37798
1 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Scripts/Classes/Entities/ShellClass.gd
View File

@@ -15,7 +15,7 @@ var can_kick := false
var player: Player = null var player: Player = null
const COMBO_VALS := [500, 800, 1000, 2000, 4000, 5000, 8000, null] const COMBO_VALS := [100, 200, 400, 500, 800, 1000, 2000, 4000, 5000, 8000, null]
var wake_meter := 0.0 ## SMB1R IS WOKE var wake_meter := 0.0 ## SMB1R IS WOKE
@@ -40,7 +40,7 @@ func on_player_stomped_on(stomped_player: Player) -> void:
return return
if not moving: if not moving:
direction = sign(global_position.x - stomped_player.global_position.x) direction = sign(global_position.x - stomped_player.global_position.x)
kick() kick(stomped_player)
else: else:
DiscoLevel.combo_meter += 10 DiscoLevel.combo_meter += 10
moving = false moving = false
@@ -59,18 +59,41 @@ func on_player_hit(hit_player: Player) -> void:
return return
if not moving: if not moving:
direction = sign(global_position.x - hit_player.global_position.x ) direction = sign(global_position.x - hit_player.global_position.x )
kick() kick(hit_player)
else: else:
hit_player.damage() hit_player.damage()
func award_score(award_level: int) -> void:
if award_level >= 10:
if Global.current_game_mode == Global.GameMode.CHALLENGE or Settings.file.difficulty.inf_lives:
$ScoreNoteSpawner.spawn_note(10000)
else:
AudioManager.play_global_sfx("1_up")
Global.lives += 1
$ScoreNoteSpawner.spawn_one_up_note()
else:
$ScoreNoteSpawner.spawn_note(COMBO_VALS[award_level])
func get_kick_award(hit_player: Player) -> int:
var award_level = hit_player.stomp_combo + 2
if wake_meter > 6.96:
award_level = 9
elif wake_meter > 6.75:
award_level = 5
elif wake_meter > 6.25:
award_level = 3
if award_level > 10:
award_level = 10
return award_level
func kick() -> void: func kick(hit_player: Player) -> void:
update_hitbox() update_hitbox()
DiscoLevel.combo_meter += 25 DiscoLevel.combo_meter += 25
moving = true moving = true
if can_air_kick: if can_air_kick:
$ScoreNoteSpawner.spawn_note(8000) $ScoreNoteSpawner.spawn_note(8000)
else: else:
$ScoreNoteSpawner.spawn_note(400) award_score(get_kick_award(hit_player))
AudioManager.play_sfx("kick", global_position) AudioManager.play_sfx("kick", global_position)
func _physics_process(delta: float) -> void: func _physics_process(delta: float) -> void:
@@ -105,16 +128,8 @@ func handle_block_collision() -> void:
i.shell_block_hit.emit(self) i.shell_block_hit.emit(self)
func add_combo() -> void: func add_combo() -> void:
if combo >= 7: award_score(combo + 3)
if Global.current_game_mode == Global.GameMode.CHALLENGE or Settings.file.difficulty.inf_lives: if combo < 7:
Global.score += 10000
$ScoreNoteSpawner.spawn_note(10000)
else:
AudioManager.play_global_sfx("1_up")
Global.lives += 1
$ScoreNoteSpawner.spawn_one_up_note()
else:
$ScoreNoteSpawner.spawn_note(COMBO_VALS[combo])
combo += 1 combo += 1
func update_hitbox() -> void: func update_hitbox() -> void: