Compare commits

...

3 Commits

Author SHA1 Message Date
John Cooper McDonald
d37910a379 Don't give points for the powerup from a checkpoint (#628) 2025-10-19 09:53:26 +01:00
JHDev2006
6011e6f63b Merge branch 'main' of https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public 2025-10-19 09:45:49 +01:00
JHDev2006
23345bbbf1 removed sp scrolling from settings menu
i coded it in about 10 minutes as a joke, and didnt really intend on it being something proper + it comes with a whole new slew of bugs which im not willing to commit to yet, soz. its still in the code so should be relatively easy to hack in, maybe itll come back in future, who knows
2025-10-19 09:45:48 +01:00
5 changed files with 220 additions and 229 deletions

View File

@@ -90,7 +90,6 @@ script/source = "extends AchievementProgressCalculator
func get_progress() -> int: func get_progress() -> int:
var medal_amount := 0 var medal_amount := 0
SpeedrunHandler.load_best_times(campaign) SpeedrunHandler.load_best_times(campaign)
print(SpeedrunHandler.best_level_warpless_times)
var world := 0 var world := 0
for x in SpeedrunHandler.best_level_warpless_times: for x in SpeedrunHandler.best_level_warpless_times:
var level := 0 var level := 0
@@ -100,7 +99,6 @@ func get_progress() -> int:
level += 1 level += 1
world += 1 world += 1
for x in SpeedrunHandler.best_level_any_times: for x in SpeedrunHandler.best_level_any_times:
print(SpeedrunHandler.best_level_any_times)
if SpeedrunHandler.best_level_any_times[x] <= SpeedrunHandler.LEVEL_GOLD_ANY_TIMES[campaign][x] * SpeedrunHandler.MEDAL_CONVERSIONS[medal_index] and SpeedrunHandler.best_level_any_times[x] > 0: if SpeedrunHandler.best_level_any_times[x] <= SpeedrunHandler.LEVEL_GOLD_ANY_TIMES[campaign][x] * SpeedrunHandler.MEDAL_CONVERSIONS[medal_index] and SpeedrunHandler.best_level_any_times[x] > 0:
medal_amount += 1 medal_amount += 1
var save = JSON.parse_string(FileAccess.open(Global.config_path.path_join(\"saves/\" + campaign + \".sav\"), FileAccess.READ).get_as_text()) var save = JSON.parse_string(FileAccess.open(Global.config_path.path_join(\"saves/\" + campaign + \".sav\"), FileAccess.READ).get_as_text())

File diff suppressed because one or more lines are too long

View File

@@ -447,7 +447,7 @@ size_flags_vertical = 3
theme_override_constants/separation = -4 theme_override_constants/separation = -4
script = ExtResource("4_avtty") script = ExtResource("4_avtty")
category_name = "SETTINGS_VISUALS" category_name = "SETTINGS_VISUALS"
options = [NodePath("ParallaxStyle"), NodePath("BGParticles"), NodePath("HUDStyle"), NodePath("RainbowEffect"), NodePath("TransformationEffect"), NodePath("TextShadows"), NodePath("BridgeDestructionAnimation"), NodePath("VisibleTimers"), NodePath("TransitionAnimation"), NodePath("SpecialScrollingMode"), NodePath("ColourfulPipes"), NodePath("FirebarStyle"), NodePath("ExtraParticles")] options = [NodePath("ParallaxStyle"), NodePath("BGParticles"), NodePath("HUDStyle"), NodePath("RainbowEffect"), NodePath("TransformationEffect"), NodePath("TextShadows"), NodePath("BridgeDestructionAnimation"), NodePath("VisibleTimers"), NodePath("TransitionAnimation"), NodePath(""), NodePath("ColourfulPipes"), NodePath("FirebarStyle"), NodePath("ExtraParticles")]
[node name="Control" type="Control" parent="PanelContainer/MarginContainer/VBoxContainer/Visuals"] [node name="Control" type="Control" parent="PanelContainer/MarginContainer/VBoxContainer/Visuals"]
custom_minimum_size = Vector2(0, 4) custom_minimum_size = Vector2(0, 4)
@@ -516,13 +516,6 @@ title = "VISUAL_TRANSITION_EFFECT"
values = ["VISUAL_TRANSITION_CLASSIC", "VISUAL_TRANSITION_SMOOTH"] values = ["VISUAL_TRANSITION_CLASSIC", "VISUAL_TRANSITION_SMOOTH"]
settings_category = "visuals" settings_category = "visuals"
[node name="SpecialScrollingMode" parent="PanelContainer/MarginContainer/VBoxContainer/Visuals" groups=["Options"] instance=ExtResource("3_dl6kk")]
layout_mode = 2
option_key = "smbs_scroll"
title = "VISUAL_SMBS_SCROLL"
values = ["VISUAL_SMBS_SCROLL_OFF", "VISUAL_SMBS_SCROLL_X1", "VISUAL_SMBS_SCROLL_PC8801"]
settings_category = "visuals"
[node name="ColourfulPipes" parent="PanelContainer/MarginContainer/VBoxContainer/Visuals" groups=["Options"] instance=ExtResource("3_dl6kk")] [node name="ColourfulPipes" parent="PanelContainer/MarginContainer/VBoxContainer/Visuals" groups=["Options"] instance=ExtResource("3_dl6kk")]
layout_mode = 2 layout_mode = 2
option_key = "colour_pipes" option_key = "colour_pipes"
@@ -1020,7 +1013,6 @@ script = ExtResource("19_k6yev")
[connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Visuals/BridgeDestructionAnimation" to="PanelContainer/MarginContainer/VBoxContainer/Visuals/VisualsSetter" method="bridge_changed"] [connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Visuals/BridgeDestructionAnimation" to="PanelContainer/MarginContainer/VBoxContainer/Visuals/VisualsSetter" method="bridge_changed"]
[connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Visuals/VisibleTimers" to="PanelContainer/MarginContainer/VBoxContainer/Visuals/VisualsSetter" method="visible_timers_changed"] [connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Visuals/VisibleTimers" to="PanelContainer/MarginContainer/VBoxContainer/Visuals/VisualsSetter" method="visible_timers_changed"]
[connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Visuals/TransitionAnimation" to="PanelContainer/MarginContainer/VBoxContainer/Visuals/VisualsSetter" method="transition_style_changed"] [connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Visuals/TransitionAnimation" to="PanelContainer/MarginContainer/VBoxContainer/Visuals/VisualsSetter" method="transition_style_changed"]
[connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Visuals/SpecialScrollingMode" to="PanelContainer/MarginContainer/VBoxContainer/Visuals/VisualsSetter" method="smbs_scroll_changed"]
[connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Visuals/ColourfulPipes" to="PanelContainer/MarginContainer/VBoxContainer/Visuals/VisualsSetter" method="colourful_pipes_changed"] [connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Visuals/ColourfulPipes" to="PanelContainer/MarginContainer/VBoxContainer/Visuals/VisualsSetter" method="colourful_pipes_changed"]
[connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Visuals/FirebarStyle" to="PanelContainer/MarginContainer/VBoxContainer/Visuals/VisualsSetter" method="firebar_style_changed"] [connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Visuals/FirebarStyle" to="PanelContainer/MarginContainer/VBoxContainer/Visuals/VisualsSetter" method="firebar_style_changed"]
[connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Visuals/ExtraParticles" to="PanelContainer/MarginContainer/VBoxContainer/Visuals/VisualsSetter" method="extra_particles"] [connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Visuals/ExtraParticles" to="PanelContainer/MarginContainer/VBoxContainer/Visuals/VisualsSetter" method="extra_particles"]

View File

@@ -698,12 +698,13 @@ func set_power_state_frame() -> void:
can_bump_fly = %Sprite.sprite_frames.has_animation("FlyBump") can_bump_fly = %Sprite.sprite_frames.has_animation("FlyBump")
can_kick_anim = %Sprite.sprite_frames.has_animation("Kick") can_kick_anim = %Sprite.sprite_frames.has_animation("Kick")
func get_power_up(power_name := "") -> void: func get_power_up(power_name := "", give_points := true) -> void:
if is_dead: if is_dead:
return return
Global.score += 1000 if give_points:
DiscoLevel.combo_amount += 1 Global.score += 1000
score_note_spawner.spawn_note(1000) DiscoLevel.combo_amount += 1
score_note_spawner.spawn_note(1000)
AudioManager.play_sfx("power_up", global_position) AudioManager.play_sfx("power_up", global_position)
if Settings.file.difficulty.damage_style == 0 and power_state.state_name != power_name: if Settings.file.difficulty.damage_style == 0 and power_state.state_name != power_name:
if power_name != "Big" and power_state.state_name != "Big": if power_name != "Big" and power_state.state_name != "Big":

View File

@@ -62,7 +62,7 @@ func on_area_entered(area: Area2D) -> void:
sublevel_id = Global.level_editor.sub_level_id sublevel_id = Global.level_editor.sub_level_id
if Settings.file.difficulty.checkpoint_style == 2 and has_meta("is_flag"): if Settings.file.difficulty.checkpoint_style == 2 and has_meta("is_flag"):
if player.power_state.state_name == "Small": if player.power_state.state_name == "Small":
player.get_power_up("Big") player.get_power_up("Big", false)
respawn_position = global_position respawn_position = global_position
crossed.emit(area.owner) crossed.emit(area.owner)