Merged with Time Limit

Resources/Locale/locale.csv

@@ -184,7 +184,6 @@ DIFFI_FLAG_LIVES,"Does hitting the top of the flagpole, give an extra life",Flag
 DIFFI_GAME_OVER,What happens when hitting a game over? back to start of world? level? game?,Game Over,Game Over,Koniec Gry,Игpa okohчeha,Fin del juego,Game over,ＧＡＭＥ ＯＶＥＲ,Game over,Game Over,Oyun Bİttİ,Game Over,Game Over,ゲームオーバー
 DIFFI_LEVEL_DESIGN,Adjusts level design to actually be fair,Level Design,Conception des niveaux,Zarys Poziomu,Дизaйh Уpobhя,Diseño de niveles,Design dei livelli,ＬＥＶＥＬ ＤＥＳＩＧＮ,Design ng Lebel,Leveldesign,Level Tasarımı,Desain Level,Design de Nível,ステージデザイン
 DIFFI_TIME,Enables the time limit,Time Limit,Limite de temps,Limit Czasu,Лиmиt bpemehи,Tiempo Limite,Limite di tempo,ＴＩＭＥ ＬＩＭＩＴ,Limit ng Oras,Zeitlimit,Zaman Lİmİtİ,Batas waktu,Tempo Limite,せいげん　じかん
-DIFFI_SECS,Runs the timer in seconds or 0.4x seconds,Timer Style,Style de Timeur,Styl Czasomierz,ctиль taйmep,Minutero Estilo,Stile Timer,ＴＩＭＥＲ ＳＴＹＬＥ,Style ng Timer,Timer-Stil,Zamanlayıcısı Stİlİ,Gaya Pengatur Waktu,Stile Timer,タイマースタイル
 DIFFI_LAKITU,,Lakitu Style,Style de Lakitu,Styl Lakitu,ctиль ЛakиtУ,Estilo Lakitu,Stile lakitu,ＬＡＫＩＴＵ ＳＴＹＬＥ,Style ng Lakitu,Lakitu-Modus,Lakİtu Stİlİ,Gaya Lakitu,Estilo de Lakitu,ジュゲム・スタイル
 DIFFI_BACKSCROLL,"Allows you to move backwards in all levels, unless a custom level says no",Back Scroll,Retour Arrière,Przewijanie Wsteczne,ПpokpУtka haзaд,Scroll hacia atras,Back Scroll,ＢＡＣＫ ＳＣＲＯＬＬ,Free Camera,Freie Kamera,Gerİ Kaydırma,Scroll Kembali,Rolagem Para Trás,スクロールかいじょ
 DIFFI_GAME_OVER_LVL,,Start of Level,Début du niveau,Początek Poziomu,haчatь c Уpobhя,Inicio del nivel,Inizio del livello,ＳＴＡＲＴ ＯＦ ＬＥＶＥＬ,Start ng Lebel,Levelanfang,Level Başlangıçı,Awal Level,Começo do Nível,ステージから　かいし
@@ -214,8 +213,7 @@ DESC_LEVEL_DESIGN_0,,"Level design is the same as the original, can be unfair at
 DESC_LEVEL_DESIGN_1,,Level design is adjusted to be much fairer.,Les niveaux sont conçus d'une manière plus juste et agréable.,Zarys poziomów zmieniony na sprawiedliwszy.,Дизaйh Уpobheй ctaл бoлee cпpabeдлиbыm.,El diseño de los niveles se ha ajustado para que sea mucho más justo.,I design dei livelli sono modificati per essere più equilibrati.,ＬＥＶＥＬ ＤＥＳＩＧＮ ＩＳ ＡＤＪＵＳＴＥＤ ＴＯ ＢＥ ＭＵＣＨ ＦＡＩＲＥＲ.,Patas na design ng level,Das Leveldesign wird für ein faireres Spielerlebnis angepasst.,Level tasarımı daha adİl olacak şekİlde ayarlanmıştır.,Desain level disesuaikan agar lebih adil.,O design dos níveis é ajustado para ser muito mais justo.,もうすこし　こうへい。
 DESC_TIME_0,,There is no time limit in levels.,Il n'y a pas de limite de temps dans ce niveau,Nie ma limitu czasu w poziomach.,ha Уpobhяx hetУ лиmиta bpemehи.,No hay límite de tiempo en los niveles.,Non ci saranno limiti di tempo nei livelli.,ＴＨＥＲＥ ＩＳ ＮＯ ＴＩＭＥ ＬＩＭＩＴ ＩＮ ＬＥＶＥＬＳ.,Walang time limit sa mga lebel,Bei Leveln ist kein Zeitlimit vorhanden.,Levellerde zaman lİmİtİ yok.,Tidak ada batasan waktu dalam level.,Não tem tempo limite nos níveis.,ステージに　じかんせいげんは　ない。
 DESC_TIME_1,,There is a time limit in all levels.,Il y a une limite de temps dans ce niveau,Jest limit czasu w poziomach.,ha Уpobhяx ectь лиmиt bpemehи.,Hay un límite de tiempo en todos los niveles.,Ci saranno limiti di tempo nei livelli.,ＴＨＥＲＥ ＩＳ Ａ ＴＩＭＥ ＬＩＭＩＴ ＩＮ ＡＬＬ ＬＥＶＥＬＳ.,May time limit sa mga lebel,Bei Leveln gibt es ein Zeitlimit.,Tüm levellerde zaman lİmİtİ var.,Ada batas waktu di semua level.,Tem tempo limite nos níveis.,ステージに　じかんせいげんは　ある。
-DESC_SECS_0,,Timer ticks down 0.4x a second.,,,,,,,,,,,,
+DESC_TIME_2,,"There is a time limit in all levels, but it ticks every second.",Il y a une limite de temps dans ce niveau,Jest limit czasu w poziomach.,ha Уpobhяx ectь лиmиt bpemehи.,Hay un límite de tiempo en todos los niveles.,Ci saranno limiti di tempo nei livelli.,"ＴＨＥＲＥ ＩＳ Ａ ＴＩＭＥ ＬＩＭＩＴ ＩＮ ＡＬＬ ＬＥＶＥＬＳ, ＢＵＴ ＩＴ ＴＩＣＫＳ ＥＶＥＲ ＳＥＣＯＮＤ.",May time limit sa mga lebel,Bei Leveln gibt es ein Zeitlimit.,Tüm levellerde zaman lİmİtİ var.,Ada batas waktu di semua level.,Tem tempo limite nos níveis.,ステージに　じかんせいげんは　ある。
-DESC_SECS_1,,Timer ticks down every full second.,,,,,,,,,,,,
 DESC_BACKSCROLL_0,,"You cannot move backwards in levels (unless a custom level allows it), Intended Experience",Vous ne pouvez pas retournez en arrière (sauf si un niveau custom vous l'autorise). Expérience prévue,Nie możesz iść do tyłu (chyba że poziom użytnikowa na to pozwala) Domyślny styl gry,"bы he moжete дbигatьcя haзaд ha Уpobhяx (kpome, ecли пoльзobateльckий Уpobehь пoзboляet), пpeдпoлaгaemый oпыt","No puedes retroceder en los niveles (a menos que un nivel personalizado lo permita), Experiencia prevista","Non puoi tornare indietro nei livelli (a meno che un livello creato dall'utente lo consente), l'esperienza originale.","ＹＯＵ ＣＡＮＮＯＴ ＭＯＶＥ ＢＡＣＫＷＡＲＤＳ ＩＮ ＬＥＶＥＬＳ (ＵＮＬＥＳＳ Ａ ＣＵＳＴＯＭ ＬＥＶＥＬ ＡＬＬＯＷＳ ＩＴ), ＩＮＴＥＮＤＥＤ ＥＸＰＥＲＩＥＮＣＥ","Walang backscroll, maliban kung pwede sa custom game, klasik na experience","Die Kamera bewegt sich nicht nach links, wie bei den Originalspielen, ausser wenn ein Nutzererstelltes Level es erlaubt.","Levellerde gerİye doğru hareket edemezsİnİz (özel bİr level buna İzİn vermedİğİ sürece), Amaçlanan Deneyİm","Anda tidak dapat bergerak mundur dalam level (kecuali level kustom mengizinkannya), Pengalaman yang Diinginkan","Você não pode andar para trás nos níveis (a menos que um nível customizado o permita), Experiência recomendada.",デフォルトステージモード：もどることはできない。
 DESC_BACKSCROLL_1,,You can move backwards in all levels (unless a custom level prevents it),Vous pouvez retournez en arrière (sauf si un niveau custom vous l'en empêche),Możesz iść do tyłu (chyba że poziom użytnikowa na to nie pozwala) ,"bы moжete дbигatьcя haзaд ha Уpobhяx (kpome, ecли пoльзobateльckий Уpobehь he пoзboляet)",Puedes retroceder en todos los niveles (a menos que un nivel personalizado lo impida).,Puoi tornare indietro nei livelli (a meno che un livello creato dall'utente non lo consente).,ＹＯＵ ＣＡＮ ＭＯＶＥ ＢＡＣＫＷＡＲＤＳ ＩＮ ＡＬＬ ＬＥＶＥＬＳ (ＵＮＬＥＳＳ Ａ ＣＵＳＴＯＭ ＬＥＶＥＬ ＰＲＥＶＥＮＴＳ ＩＴ),"Free Camera, maliban kung pinagbawal sa custom games","Die Kamera kann sich auch nach links bewegen, ausser wenn ein nutzererstelltes Level es nicht erlaubt.",Tüm levellerde gerİye doğru hareket edebİlİrsİnİz (özel bİr level bunu engellemedİğİ sürece),Anda dapat bergerak mundur di semua level (kecuali level kustom mencegahnya),"Você pode andar para trás em todos os níveis (a menos que um nível customizado não o permita), Experiência recomendada.",デフォルトステージモード：もどることはできる。
 DESC_LAKITU_0,,"Lakitu will throw spiny's straight upwards, exactly like in the original games. (was due to a bug)","Lakitu jettera des Hériss en ligne droite verticale, comme il le faisait dans les jeux originaux (à cause d'un bug)","Lakitu rzuca kolczastych prosto w górę, dokładnie jak w oryginale. (Oryginalnie niezamierzane)","ЛakиtУ бУдet пoдбpacыbatь koлючkУ пpяmo bbepx, b toчhoctи kak b opигиhaльhыx игpax. (эto пpoизoшлo из-зa oшибkи)","Lakitu lanzará a los Spiny directamente hacia arriba, exactamente igual que en los juegos originales. (debido a un error)","Lakitu lancerà i koopistrici verticalmente verso l'alto, esattamente come nel gioco originale (questo era a causa di un bug).","ＬＡＫＩＴＵ ＷＩＬＬ ＴＨＲＯＷ ＳＰＩＮＹ'Ｓ ＳＴＲＡＩＧＨＴ ＵＰＷＡＲＤＳ, ＥＸＡＣＴＬＹ ＬＩＫＥ ＩＮ ＴＨＥ ＯＲＩＧＩＮＡＬ ＧＡＭＥＳ. (ＷＡＳ ＤＵＥ ＴＯ Ａ ＢＵＧ)","Pataas, Klasik na pagtapon ng Lakitu ng spiny","Lakitu wirft Stachis senkrecht nach oben, wie bei den Originalspielen. (Dies passierte aufgrund eines Bugs)",Lakİtu orİjİnal oyunlardakİ gİbİ Spİny'lerİ dümdüz yukarı doğru fırlatacak. (bİr hata nedenİyle),"Lakitu akan melemparkan spiny lurus ke atas, persis seperti di game aslinya. (disebabkan oleh bug)","Lakitus vão arremessar spinys direto para cima, que nem no jogo original.",トゲゾーが　うえに　なげられる。

Scenes/Prefabs/UI/SettingsMenu.tscn

@@ -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"])
+value_descs = Array[String](["DESC_TIME_0", "DESC_TIME_1", "DESC_TIME_2"])
-values = ["SETTING_OFF", "SETTING_ON"]
+values = ["SETTING_OFF", "SETTINGS_CLASSIC", "SETTINGS_MODERN"]
-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"]
 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"]

Scripts/Classes/Singletons/SettingsManager.gd

@@ -74,7 +74,6 @@ var file := {
 		"extra_checkpoints": 0,
 		"back_scroll": 0,
 		"time_limit": 1,
-		"timer_style": 0,
 		"lakitu_style": 0
 	}
 }

Scripts/Classes/UI/GameHUD.gd

@@ -27,7 +27,7 @@ func handle_main_hud() -> void:
 	$Main/RedCoins.hide()
 	$Main/CoinCount.show()
 	%Combo.hide()
-	$Timer.paused = Settings.file.difficulty.timer_style == 1
+	$Timer.paused = Settings.file.difficulty.time_limit == 2
 	$%Time.show()
 	%Stopwatch.hide()
 	%PB.hide()
@@ -180,7 +180,7 @@ func activate_pause_menu() -> void:
 const HURRY_UP = preload("res://Assets/Audio/BGM/HurryUp.mp3")
 
 func on_timeout() -> void:
-	if Global.can_time_tick and is_instance_valid(Global.current_level) and Settings.file.difficulty.time_limit == 1:
+	if Global.can_time_tick and is_instance_valid(Global.current_level) and Settings.file.difficulty.time_limit > 0:
 		if Global.level_editor != null:
 			if Global.level_editor.current_state != LevelEditor.EditorState.PLAYTESTING:
 				return

Scripts/Parts/DifficultySetter.gd

@@ -15,9 +15,6 @@ func flag_lives_changed(new_value := 0) -> void:
 func time_limit_changed(new_value := 0) -> void:
 	Settings.file.difficulty.time_limit = new_value
 
-func timer_style_changed(new_value := 0) -> void:
-	Settings.file.difficulty.timer_style = new_value
-
 func game_over_changed(new_value := 0) -> void:
 	Settings.file.difficulty.game_over_behaviour = new_value