Merged with Time Limit

This commit is contained in:
KirbyKidJ
2025-09-23 12:24:51 -07:00
parent 6ae94074e5
commit fce9fbc9ff
19 changed files with 7 additions and 22 deletions

View File

@@ -537,7 +537,7 @@ size_flags_vertical = 3
theme_override_constants/separation = -4
script = ExtResource("4_avtty")
category_name = "SETTINGS_DIFFICULTY"
options = [NodePath("DamageStyle"), NodePath("Checkpoints"), NodePath("ExtraCheckpoints"), NodePath("Lives"), NodePath("FlagpoleLives"), NodePath("GameOverStyle"), NodePath("LevelDesign"), NodePath("BackScroll"), NodePath("TimeLimit"), NodePath("TimerStyle"), NodePath("LakituStyle")]
options = [NodePath("DamageStyle"), NodePath("Checkpoints"), NodePath("ExtraCheckpoints"), NodePath("Lives"), NodePath("FlagpoleLives"), NodePath("GameOverStyle"), NodePath("LevelDesign"), NodePath("BackScroll"), NodePath("TimeLimit"), NodePath("LakituStyle")]
description_node = NodePath("Description/AutoScrollContainer/MarginContainer/Desc")
[node name="Control" type="Control" parent="PanelContainer/MarginContainer/VBoxContainer/Difficulty"]
@@ -612,16 +612,8 @@ settings_category = "difficulty"
layout_mode = 2
option_key = "time_limit"
title = "DIFFI_TIME"
value_descs = Array[String](["DESC_TIME_0", "DESC_TIME_1"])
values = ["SETTING_OFF", "SETTING_ON"]
settings_category = "difficulty"
[node name="TimerStyle" parent="PanelContainer/MarginContainer/VBoxContainer/Difficulty" groups=["Options"] instance=ExtResource("3_dl6kk")]
layout_mode = 2
option_key = "timer_style"
title = "DIFFI_SECS"
value_descs = Array[String](["DESC_SECS_0", "DESC_SECS_1"])
values = ["SETTINGS_CLASSIC", "SETTINGS_MODERN"]
value_descs = Array[String](["DESC_TIME_0", "DESC_TIME_1", "DESC_TIME_2"])
values = ["SETTING_OFF", "SETTINGS_CLASSIC", "SETTINGS_MODERN"]
settings_category = "difficulty"
[node name="LakituStyle" parent="PanelContainer/MarginContainer/VBoxContainer/Difficulty" groups=["Options"] instance=ExtResource("3_dl6kk")]
@@ -643,7 +635,7 @@ size_flags_vertical = 3
theme_override_styles/panel = SubResource("StyleBoxEmpty_ksnto")
[node name="AutoScrollContainer" type="ScrollContainer" parent="PanelContainer/MarginContainer/VBoxContainer/Difficulty/Description"]
custom_minimum_size = Vector2(0, 40)
custom_minimum_size = Vector2(0, 48)
layout_mode = 2
horizontal_scroll_mode = 0
vertical_scroll_mode = 3
@@ -928,7 +920,6 @@ script = ExtResource("19_k6yev")
[connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Difficulty/LevelDesign" to="PanelContainer/MarginContainer/VBoxContainer/Difficulty/DifficultySetter" method="level_design_changed"]
[connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Difficulty/BackScroll" to="PanelContainer/MarginContainer/VBoxContainer/Difficulty/DifficultySetter" method="backscroll_changed"]
[connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Difficulty/TimeLimit" to="PanelContainer/MarginContainer/VBoxContainer/Difficulty/DifficultySetter" method="time_limit_changed"]
[connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Difficulty/TimerStyle" to="PanelContainer/MarginContainer/VBoxContainer/Difficulty/DifficultySetter" method="timer_style_changed"]
[connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Difficulty/LakituStyle" to="PanelContainer/MarginContainer/VBoxContainer/Difficulty/DifficultySetter" method="lakitu_style_changed"]
[connection signal="deleted" from="PanelContainer/MarginContainer/VBoxContainer/Data/CampaignData" to="PanelContainer/MarginContainer/VBoxContainer/Data/DataDeletion" method="delete_story"]
[connection signal="deleted" from="PanelContainer/MarginContainer/VBoxContainer/Data/ChallengeModeData" to="PanelContainer/MarginContainer/VBoxContainer/Data/DataDeletion" method="delete_challenge"]