mirror of
https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public.git
synced 2025-10-21 15:08:12 +00:00
Added special scrolling to menu + fixes (#618)
* Added Special Scrolling to the visuals menu * Added the actual functionality for special scrolling to work with menu * Fixed PC-8801 mode if smooth transitions are enabled * Special scrolling, not-so special translations
This commit is contained in:
@@ -165,6 +165,10 @@ VISUAL_COLOURFUL_PIPES,"Enables multi-coloured pipes (green by default, if turne
|
||||
VISUAL_TRANSFORM,"Should the transformation effect on the player, be rainbow, or a simple animation swap?",Transform Style,Style Transfo.,Styl Transformacji,ctиль tpahcфopmaции,Estilo de transformación,Stile trasformazione,TRANSFORM STYLE,Style ng Pagtransform,Power-Up-Animationsstil,Dönüşüm Stİlİ,Transformasi Gaya,Estilo de Transformação,へんしんスタイル
|
||||
VISUAL_TEXT_SHADOWS,,Text Shadows,Ombre Textes,Cieniowany Tekstu,tehь tekcta,Sombras en textos,Ombre testo,TEXT SHADOWS,Anino ng Text,Textschatten,Yazı Gölgelerİ,Bayangan Teks,Sombreamento de Texto,テキストのかげ
|
||||
VISUAL_TRANSITION_EFFECT,Do we want transitions to be instant? or smooth?,Transition Style,Style de transition,Styl Tranzycji,ctиль пepexoдob,Estilo de transición,Stile transizione,TRANSITION STYLE,Style ng Transition,Übergangsstil,Geçİş Stİlİ,Gaya Transisi,Estilo de Transição,フェード・スタイル
|
||||
VISUAL_SMBS_SCROLL,Special Scrolling,Special Scrolling,Special Scrolling,Special Scrolling,Special Scrolling,Special Scrolling,Special Scrolling,Special Scrolling,Special Scrolling,Special Scrolling,Special Scrolling,Special Scrolling,Special Scrolling,Special Scrolling
|
||||
VISUAL_SMBS_SCROLL_OFF,Off,Off,Off,Off,Off,Off,Off,Off,Off,Off,Off,Off,Off,Off
|
||||
VISUAL_SMBS_SCROLL_X1,Sharp X1,Sharp X1,Sharp X1,Sharp X1,Sharp X1,Sharp X1,Sharp X1,Sharp X1,Sharp X1,Sharp X1,Sharp X1,Sharp X1,Sharp X1,Sharp X1
|
||||
VISUAL_SMBS_SCROLL_PC8801,PC-8801,PC-8801,PC-8801,PC-8801,PC-8801,PC-8801,PC-8801,PC-8801,PC-8801,PC-8801,PC-8801,PC-8801,PC-8801,PC-8801
|
||||
VISUAL_PARALLAX_NONE,,None,Aucun,Brak,het,Ninguno,No,NONE,Wala,Kein,Hİç,None,Nenhum,オフ
|
||||
VISUAL_PARALLAX_BASIC,,Basic,Basique,Podstawowe,ochobhoй,Básico,Basico,BASIC,Basic,Standard,Basİt,Dasar,Básico,ひょうじゅん
|
||||
VISUAL_PARALLAX_DETAIL,,Detailed,Détaillé,Detalowane,Дetaлизиpobahhый,Detallado,Dettagliato,DETAILED,Detalyado,Detailliert,Detaylı,Detailed,Detalhado,しょうさい
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -447,7 +447,7 @@ size_flags_vertical = 3
|
||||
theme_override_constants/separation = -4
|
||||
script = ExtResource("4_avtty")
|
||||
category_name = "SETTINGS_VISUALS"
|
||||
options = [NodePath("ParallaxStyle"), NodePath("BGParticles"), NodePath("HUDStyle"), NodePath("RainbowEffect"), NodePath("TransformationEffect"), NodePath("TextShadows"), NodePath("BridgeDestructionAnimation"), NodePath("VisibleTimers"), NodePath("TransitionAnimation"), 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("SpecialScrollingMode"), NodePath("ColourfulPipes"), NodePath("FirebarStyle"), NodePath("ExtraParticles")]
|
||||
|
||||
[node name="Control" type="Control" parent="PanelContainer/MarginContainer/VBoxContainer/Visuals"]
|
||||
custom_minimum_size = Vector2(0, 4)
|
||||
@@ -516,6 +516,13 @@ title = "VISUAL_TRANSITION_EFFECT"
|
||||
values = ["VISUAL_TRANSITION_CLASSIC", "VISUAL_TRANSITION_SMOOTH"]
|
||||
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")]
|
||||
layout_mode = 2
|
||||
option_key = "colour_pipes"
|
||||
@@ -1013,6 +1020,7 @@ 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/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/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/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"]
|
||||
|
@@ -68,6 +68,7 @@ var file := {
|
||||
"bridge_animation": 0,
|
||||
"visible_timers": 0,
|
||||
"transition_animation": 0,
|
||||
"smbs_scroll": 0,
|
||||
"colour_pipes": 1,
|
||||
"firebar_style": 0,
|
||||
"extra_particles": 0
|
||||
|
@@ -26,8 +26,9 @@ const SCROLL_DIFFERENCE := 48.0
|
||||
|
||||
var can_diff := true
|
||||
|
||||
# guzlad: old Special scrolling variables kept for reference purposes
|
||||
static var sp_screen_scroll := false
|
||||
static var sp_scroll_style := 1
|
||||
#static var sp_scroll_style := 1
|
||||
|
||||
var sp_scrolling := false
|
||||
|
||||
@@ -35,6 +36,7 @@ func _exit_tree() -> void:
|
||||
cam_locked = false
|
||||
|
||||
func _physics_process(delta: float) -> void:
|
||||
sp_screen_scroll = Settings.file.visuals.smbs_scroll > 0
|
||||
handle_camera(delta)
|
||||
last_position = global_position
|
||||
|
||||
@@ -127,11 +129,13 @@ func do_sp_scroll(direction := 1) -> void:
|
||||
process_mode = Node.PROCESS_MODE_ALWAYS
|
||||
get_tree().paused = true
|
||||
var distance = get_viewport().get_visible_rect().size.x - 32
|
||||
if sp_scroll_style == 0:
|
||||
if Settings.file.visuals.smbs_scroll == 1: #Sharp X1 (smooth)
|
||||
var tween = create_tween()
|
||||
tween.tween_property(self, "camera_position:x", camera_position.x + (distance * direction), 1)
|
||||
await tween.finished
|
||||
else:
|
||||
else: #PC-8801 (black screen)
|
||||
if Settings.file.visuals.transition_animation:
|
||||
Global.get_node("Transition").get_node("TransitionBlock").modulate.a = 1
|
||||
Global.get_node("Transition").show()
|
||||
await get_tree().create_timer(0.5).timeout
|
||||
camera_position.x += distance * direction
|
||||
|
@@ -41,6 +41,9 @@ func resource_pack_loaded(new_value := []) -> void:
|
||||
func colourful_pipes_changed(new_value := 0) -> void:
|
||||
Settings.file.visuals.colour_pipes = new_value
|
||||
|
||||
func smbs_scroll_changed(new_value := 0) -> void:
|
||||
Settings.file.visuals.smbs_scroll = new_value
|
||||
|
||||
func visible_timers_changed(new_value := 0) -> void:
|
||||
Settings.file.visuals.visible_timers = new_value
|
||||
|
||||
@@ -69,6 +72,7 @@ func set_value(value_name := "", value = null) -> void:
|
||||
"resource_packs": resource_pack_loaded,
|
||||
"bridge_animation": bridge_changed,
|
||||
"transition_animation": transform_style_changed,
|
||||
"smbs_scroll": smbs_scroll_changed,
|
||||
"colour_pipes": colourful_pipes_changed,
|
||||
"firebar_style": firebar_style_changed,
|
||||
"extra_particles": extra_particles
|
||||
|
Reference in New Issue
Block a user