actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

PercentageDisplay: Fix ShowDancePointsNotPercentage() (#1474)

Browse Source 
Remove legacy setting DancePointsForOni

Fixes: #1473
This commit is contained in:
Tyler Brekke
2017-06-07 06:20:48 -07:00
committed by Colby Klein
parent f4fd4f91d8
commit 9b5746f505
14 changed files with 3 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/_fallback/Languages/de.ini
-2
View File
@@ -383,7 +383,6 @@ CourseSortOrder=Determines how courses are sorted.
CreateNew=
Create New Course=Create a new course.
Create New Profile=Create a new player profile.
DancePointsForOni=Toggle whether the score in Oni mode displays Dance Points or the Percent Score.
DefaultFailType=IMMEDIATE stops play when all players run out of life. 30 MISSES stops play after 30 consecutive misses. END OF SONG stops play at the end of the song if all players have run out of life. OFF disables fail.
DefaultFailTypeNoOff=IMMEDIATE stops play when all players run out of life. 30 MISSES stops play after 30 consecutive misses. END OF SONG stops play at the end of the song if all players have run out of life.
DefaultNoteSkin=Choose the default noteskin to use when playing.
@@ -1013,7 +1012,6 @@ Create New Course=Create New
Create New Profile=Create Profile
Credit=Credit
Cut=Cut
DancePointsForOni=Oni Score Display
DefaultFailType=Default Fail Type
DefaultFailTypeNoOff=Default Fail Type
DefaultNoteSkin=Default NoteSkin
Themes/_fallback/Languages/en.ini
-2
View File
@@ -389,7 +389,6 @@ CustomSongsMaxMegabytes=If a custom song is larger than this (MB), disable it.
CreateNew=
Create New Course=Create a new course.
Create New Profile=Create a new player profile.
DancePointsForOni=Toggle whether the score in Oni mode displays Dance Points or the Percent Score.
DefaultFailType=IMMEDIATE stops play when all players run out of life. IMMEDIATE CONTINUE fails players when they run out of life, but allows play to continue. END OF SONG evaluates pass/fail at the end of the current stage. OFF disables fail.
DefaultFailTypeNoOff=IMMEDIATE stops play when all players run out of life. IMMEDIATE CONTINUE fails players when they run out of life, but allows play to continue. END OF SONG evaluates pass/fail at the end of the current stage.
DefaultNoteSkin=Choose the default noteskin to use when playing.
@@ -1039,7 +1038,6 @@ CustomSongsLoadTimeout=Custom Song Load Timeout
CustomSongsMaxSeconds=Custom Song Length Limit
CustomSongsMaxMegabytes=Custom Song Size Limit
Cut=Cut
DancePointsForOni=Oni Score Display
DefaultFailType=Default Fail Type
DefaultFailTypeNoOff=Default Fail Type
DefaultNoteSkin=Default NoteSkin
Themes/_fallback/Languages/es.ini
-2
View File
@@ -375,7 +375,6 @@ CourseSortOrder=Determina cuántos cursos se organizan.
CreateNew=
Create New Course=Crear un curso nuevo.
Create New Profile=Crear un perfil de jugador nuevo.
DancePointsForOni=Activa si la puntuación en el modo Oni muestra Puntos de baile (DP) o puntuación en porcentaje.
DefaultFailType=Cuando los jugadores se quedan sin vida, INMEDIATO detiene el juego inmediatamente; FIN DE CANCIÓN al final, y APAGADO desactiva la pantalla de fallo.
DefaultFailTypeNoOff=Cuando los jugadores se quedan sin vida, INMEDIATO detiene el juego inmediatamente, y FIN DE CANCIÓN al final.
DefaultNoteSkin=Elige el diseño de las flechas que se muestra por defecto al jugar.
@@ -991,7 +990,6 @@ Create New Course=Crear nuevo curso
Create New Profile=Crear un perfil
Credit=Crédito
Cut=Cortar
DancePointsForOni=Puntuación Oni
DefaultFailType=Fallo por defecto
DefaultFailTypeNoOff=Fallo por defecto
DefaultNoteSkin=Diseño por defecto
Themes/_fallback/Languages/fr.ini
-2
View File
@@ -381,7 +381,6 @@ CourseSortOrder=Détermine comment les parcours sont triés.
CreateNew=
Create New Course=Create a new course.
Create New Profile=Create a new player profile.
DancePointsForOni=Toggle whether the score in Oni mode displays Dance Points or the Percent Score.
DefaultFailType=IMMEDIATE stops play when all players run out of life. 30 MISSES stops play after 30 consecutive misses. END OF SONG stops play at the end of the song if all players have run out of life. OFF disables fail.
DefaultFailTypeNoOff=IMMEDIATE stops play when all players run out of life. 30 MISSES stops play after 30 consecutive misses. END OF SONG stops play at the end of the song if all players have run out of life.
DefaultNoteSkin=Choose the default noteskin to use when playing.
@@ -1007,7 +1006,6 @@ Connection=Connection
Scoreboard=Scoreboard
# UI Options
Center1Player=Centrer le  Joueur 1
DancePointsForOni=Affichage du Score Oni
MenuTimer=Chrono du Menu
MusicWheelUsesSections=Sections de Roulette
ShowBanners=Montrer les Bannières
Themes/_fallback/Languages/ja.ini
-2
View File
@@ -526,7 +526,6 @@ Scoreboard=オンラインプレイのスコアボードの表示を設定しま
//メニュー→オプション→UI
Center1Player=&oq;On&cq;にして1人プレイを行うと、レーンが中央に寄ります。
DancePointsForOni=Oniモードでのスコア表示をダンスポイントかパーセンテージから選択します。
MenuTimer=&oq;On&cq;に設定すると、ゲーム中の各シーンの操作に制限時間が発生します。
MusicWheelUsesSections=&oq;Always&cq;ではグループフォルダ+ABC順で表示します。\n&oq;Never&cq;ではフォルダを使用しません。&oq;Title Only&cq;ではABC順で表示します。
ShowBanners=バナーの表示を設定します。
@@ -1085,7 +1084,6 @@ Create New Course=Create New
Create New Profile=Create Profile
Credit=権利表記
Cut=選択範囲を切り取り
DancePointsForOni=Oni Score Display
DefaultFailType=Default Fail Type
DefaultFailTypeNoOff=Default Fail Type
DefaultNoteSkin=Default NoteSkin
Themes/_fallback/Languages/nl.ini
-2
View File
@@ -383,7 +383,6 @@ CourseSortOrder=Bepaald hoe Parkoers worden gesorteerd.
Create New Course=Maak nieuw parkoers.
Create New Profile=Maak nieuw spelerprofiel.
CreateNew=
DancePointsForOni=Schakel tussen de weergave van Dans Punten of Procenten voor de score in Oni mode.
DefaultFailType=METEEN stopt het spelen als alle spelers door hun leven zijn. 30 MISSEN stopt als er 30 keer achtereenvolgend word gemist. EIND VAN NUMMER stopt aan het eind van een nummer als de spelers geen leven meer hebben. UIT maakt falen onmogelijk.
DefaultFailTypeNoOff=METEEN stopt het spelen als alle spelers door hun leven zijn. 30 MISSEN stopt als er 30 keer achtereenvolgend word gemist. EIND VAN NUMMER stopt aan het eind van een nummer als de spelers geen leven meer hebben.
DefaultNoteSkin=Kies een standaard uiterlijk van de noten voor tijdens het spelen.
@@ -995,7 +994,6 @@ Create New Profile=Creëer Profiel
Create New=Creëer Nieuw
Credit=Krediet
Cut=Knippen
DancePointsForOni=Oni Score Weergave
DefaultFailType=Standaard Faaltype
DefaultFailTypeNoOff=Standaard Faaltype
DefaultNoteSkin=Standaard NootUiterlijk
Themes/_fallback/Languages/pl.ini
+1 -3
View File
@@ -380,7 +380,6 @@ CourseSortOrder=Określa sposób sortowania Maratonów.
CreateNew=
Create New Course=Utwórz nowy Maraton.
Create New Profile=Utwórz nowy profil gracza.
DancePointsForOni=Decyduje czy w trybie Oni wyświetlane są punkty czy procenty.
DefaultFailType=NATYCHMIAST przerywa grę kiedy graczowi skończy się energia. 30 spudłowań przerywa grę po następujących po sobie 30 niezaliczonych strzałkach. NA KONIEC PIOSENKI przerywa grę dopiero na koniec piosenki nawet jeśli graczowi skończy się wcześniej energia. OFF wyłącza przerywanie gry.
DefaultFailTypeNoOff=NATYCHMIAST przerywa grę kiedy graczowi skończy się energia. 30 spudłowań przerywa grę po następujących po sobie 30 niezaliczonych strzałkach. NA KONIEC PIOSENKI przerywa grę dopiero na koniec piosenki nawet jeśli graczowi skończy się wcześniej energia.
DefaultNoteSkin=Ustala domyślny wygląd strzałek używanych podczas gry.
@@ -992,7 +991,6 @@ Create New Course=Stwórz Nowy
Create New Profile=Stwórz Nowy Profil
Credit=Kredyt
Cut=Wytnij
DancePointsForOni=Wyświetlanie Punktów w Oni
DefaultFailType=Domyślny tryb Porażki
DefaultFailTypeNoOff=Domyślny tryb Porażki
DefaultNoteSkin=Domyślny NoteSkin
@@ -2761,4 +2759,4 @@ UnknownPreference=Nieznane ustawienie "%s"
ChoicesSizeMismatch=Opcje i Wartości mają różne rozmiary (%d, %d)
NoDefaultInValues=Ustawienie "%s" nie posiada wartości odpowiadającej domyślnej.
TypeMismatch=Niezgodność typów pomiędzy domyślną (%s) i wartością %d (%s)
>>>>>>> inne
>>>>>>> inne
Themes/_fallback/Languages/zh.ini
-2
View File
@@ -385,7 +385,6 @@ CourseSortOrder=組曲排序設定.
CreateNew=建立新的譜面.
Create New Course=建立新的組曲.
Create New Profile=建立新的個人檔案.
DancePointsForOni=鬼組曲成績顯示類型設定.
DefaultFailType=選擇遊戲結束的方式.
DefaultFailTypeNoOff=選擇多人遊玩時遊戲結束的方式.
DefaultNoteSkin=選擇預設箭頭樣式.
@@ -1016,7 +1015,6 @@ Create New Course=建立組曲
Create New Profile=建立個人資料
Credit=Credit
Cut=剪下
DancePointsForOni=挑戰模式 分數表示
DefaultFailType=失敗方式
DefaultFailTypeNoOff=預設 失敗方式
DefaultNoteSkin=預設 箭頭樣式
Themes/_fallback/base._ini
+1 -2
View File
@@ -2810,14 +2810,13 @@ Line19="conf,EnableMineHitSound"
[ScreenAppearanceOptions]
Fallback="ScreenOptionsServiceChild"
LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19"
LineNames="1,2,3,4,5,6,8,9,10,11,12,13,14,15,16,17,18,19"
Line1="conf,Language"
Line2="conf,Announcer"
Line3="conf,Theme"
Line4="conf,DefaultNoteSkin"
Line5="conf,ShowInstructions"
Line6="conf,ShowCaution"
Line7="conf,DancePointsForOni"
Line8="conf,ShowSelectGroup"
Line9="conf,MusicWheelUsesSections"
Line10="conf,CourseSortOrder"
Themes/_fallback/metrics.ini
+1 -2
View File
@@ -3132,9 +3132,8 @@ Line19="conf,NumBackgrounds"
Fallback="ScreenOptionsServiceChild"
NextScreen="ScreenOptionsDisplaySub"
PrevScreen="ScreenOptionsDisplaySub"
LineNames="1,3,4,6,7,8,9,10,11,12,14"
LineNames="1,4,6,7,8,9,10,11,12,14"
Line1="conf,Center1Player"
Line3="conf,DancePointsForOni"
Line4="conf,MenuTimer"
Line6="conf,MusicWheelUsesSections"
Line7="conf,ShowBanners"
src/PercentageDisplay.cpp
-3
View File
@@ -201,9 +201,6 @@ bool PercentageDisplay::ShowDancePointsNotPercentage() const
return true;
}
if( PREFSMAN->m_bDancePointsForOni )
return true;
return false;
}
src/PrefsManager.cpp
-1
View File
@@ -228,7 +228,6 @@ PrefsManager::PrefsManager() :
m_AllowMultipleToasties ("AllowMultipleToasties", true ),
m_MinTNSToHideNotes ("MinTNSToHideNotes", TNS_W3 ),
m_ShowSongOptions ( "ShowSongOptions", Maybe_NO ),
m_bDancePointsForOni ( "DancePointsForOni", true ),
m_bPercentageScoring ( "PercentageScoring", false ),
// Wow, these preference names are *seriously* long -Colby
m_fMinPercentageForMachineSongHighScore ( "MinPercentageForMachineSongHighScore", 0.0001f ), // This is for home, who cares how bad you do?
src/PrefsManager.h
-1
View File
@@ -220,7 +220,6 @@ public:
Preference<bool> m_AllowMultipleToasties;
Preference<TapNoteScore> m_MinTNSToHideNotes;
Preference<Maybe> m_ShowSongOptions;
Preference<bool> m_bDancePointsForOni;
Preference<bool> m_bPercentageScoring;
Preference<float> m_fMinPercentageForMachineSongHighScore;
Preference<float> m_fMinPercentageForMachineCourseHighScore;
src/ScreenOptionsMasterPrefs.cpp
-1
View File
@@ -761,7 +761,6 @@ static void InitializeConfOptions()
ADD( ConfOption( "DefaultNoteSkin", DefaultNoteSkin, DefaultNoteSkinChoices ) );
ADD( ConfOption( "ShowInstructions", MovePref<bool>, "Skip","Show") );
ADD( ConfOption( "ShowCaution", MovePref<bool>, "Skip","Show") );
ADD( ConfOption( "DancePointsForOni", MovePref<bool>, "Percent","Dance Points") );
ADD( ConfOption( "MusicWheelUsesSections", MovePref<MusicWheelUsesSections>, "Never","Always","Title Only") );
ADD( ConfOption( "CourseSortOrder", MovePref<CourseSortOrders>, "Num Songs","Average Feet","Total Feet","Ranking") );
ADD( ConfOption( "MoveRandomToEnd", MovePref<bool>, "No","Yes") );