From a13a4c743872c24471054a05d00867e680e5c71c Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Wed, 1 Jan 2014 19:15:59 +0000 Subject: adjust some minor issues and prepare for moving the threshold and mic-boost options from sound to record. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3067 b956fd51-792f-4845-bead-9b4dfca2ff2c --- game/themes/Candy.ini | 116 ++++++++++++++++++------------------ game/themes/Candy/Clouds static.ini | 2 +- game/themes/Candy/Clouds.ini | 2 +- game/themes/Classic.ini | 114 +++++++++++++++++------------------ game/themes/Deluxe.ini | 116 ++++++++++++++++++------------------ game/themes/Deluxe/Ocean.ini | 2 +- game/themes/Temptation.ini | 116 ++++++++++++++++++------------------ game/themes/Verdure.ini | 114 +++++++++++++++++------------------ 8 files changed, 290 insertions(+), 292 deletions(-) (limited to 'game/themes') diff --git a/game/themes/Candy.ini b/game/themes/Candy.ini index 09f929fd..96e3823b 100755 --- a/game/themes/Candy.ini +++ b/game/themes/Candy.ini @@ -3018,7 +3018,7 @@ Text = SING_OPTIONS_SOUND_VOICEPASSTHROUGH X = 70 Y = 130 W = 250 -H = 35 +H = 40 SkipX = 10 Color = Button @@ -3038,31 +3038,9 @@ Type = Transparent TypeSBG = Transparent Text = SING_OPTIONS_SOUND_BACKGROUNDMUSIC X = 70 -Y = 170 -W = 250 -H = 35 -SkipX = 10 - -Color = Button -DColor = Light -TColor = White -TDColor = Button - -SBGColor = Button -SBGDColor = Light -STColor = White -STDColor = White - -[OptionsSoundSelectMicBoost] -Tex = Party1Bar -TexSBG = Party1Bar -Type = Transparent -TypeSBG = Transparent -Text = SING_OPTIONS_SOUND_MIC_BOOST -X = 70 -Y = 210 +Y = 180 W = 250 -H = 35 +H = 40 SkipX = 10 Color = Button @@ -3082,9 +3060,9 @@ Type = Transparent TypeSBG = Transparent Text = SING_OPTIONS_SOUND_CLICK_ASSIST X = 70 -Y = 250 +Y = 230 W = 250 -H = 35 +H = 40 SkipX = 10 Color = Button @@ -3104,31 +3082,9 @@ Type = Transparent TypeSBG = Transparent Text = SING_OPTIONS_SOUND_BEAT_CLICK X = 70 -Y = 290 -W = 250 -H = 35 -SkipX = 10 - -Color = Button -DColor = Light -TColor = White -TDColor = Button - -SBGColor = Button -SBGDColor = Light -STColor = White -STDColor = White - -[OptionsSoundSelectThreshold] -Tex = Party1Bar -TexSBG = Party1Bar -Type = Transparent -TypeSBG = Transparent -Text = SING_OPTIONS_SOUND_THRESHOLD -X = 70 -Y = 330 +Y = 280 W = 250 -H = 35 +H = 40 SkipX = 10 Color = Button @@ -3148,9 +3104,9 @@ Type = Transparent TypeSBG = Transparent Text = SING_OPTIONS_SOUND_PREVIEWVOLUME X = 70 -Y = 370 +Y = 330 W = 250 -H = 35 +H = 40 SkipX = 10 Color = Button @@ -3170,9 +3126,9 @@ Type = Transparent TypeSBG = Transparent Text = SING_OPTIONS_SOUND_PREVIEWFADING X = 70 -Y = 410 +Y = 380 W = 250 -H = 35 +H = 40 SkipX = 10 Color = Button @@ -3187,7 +3143,7 @@ STDColor = White [OptionsSoundButtonExit] X = 70 -Y = 460 +Y = 440 W = 250 H = 40 Tex = Party1Bar @@ -3614,9 +3570,53 @@ SBGDColor = Light STColor = Button STDColor = White +[OptionsRecordSelectThreshold] +Tex = Party1Bar +TexSBG = Party1Bar +Type = Transparent +TypeSBG = Transparent +Text = SING_OPTIONS_RECORD_THRESHOLD +X = 70 +Y = 367 +W = 250 +H = 40 +SkipX = 10 + +Color = Button +DColor = Light +TColor = White +TDColor = Button + +SBGColor = Button +SBGDColor = Light +STColor = White +STDColor = White + +[OptionsRecordSelectMicBoost] +Tex = Party1Bar +TexSBG = Party1Bar +Type = Transparent +TypeSBG = Transparent +Text = SING_OPTIONS_RECORD_MIC_BOOST +X = 70 +Y = 417 +W = 250 +H = 40 +SkipX = 10 + +Color = Button +DColor = Light +TColor = White +TDColor = Button + +SBGColor = Button +SBGDColor = Light +STColor = White +STDColor = White + [OptionsRecordButtonExit] X = 70 -Y = 390 +Y = 470 W = 250 H = 40 Tex = Party1Bar @@ -4128,7 +4128,6 @@ Color = White Type = Transparent [Top5StaticNumber4] -Tex = PlayerNumberBox Tex = P X = 105 Y = 342 @@ -4138,7 +4137,6 @@ Color = White Type = Transparent [Top5StaticNumber5] -Tex = PlayerNumberBox Tex = P X = 105 Y = 392 diff --git a/game/themes/Candy/Clouds static.ini b/game/themes/Candy/Clouds static.ini index d81dbfd9..0906f8d1 100755 --- a/game/themes/Candy/Clouds static.ini +++ b/game/themes/Candy/Clouds static.ini @@ -55,7 +55,7 @@ SongName = [sing]SongName.png ScoreBox = [score]box.png Scorepipe = [score]pipe.png ScoreLevel = [score]level.png -ScoreLevelRound = [score]levelround.png +ScoreLevelRound = [score]levelRound.png ScoreLevel_Dark = [score]level_dark.png ScoreLevel_Dark_Round = [score]level_dark_round.png diff --git a/game/themes/Candy/Clouds.ini b/game/themes/Candy/Clouds.ini index faa71d5a..5d851334 100755 --- a/game/themes/Candy/Clouds.ini +++ b/game/themes/Candy/Clouds.ini @@ -55,7 +55,7 @@ SongName = [sing]SongName.png ScoreBox = [score]box.png Scorepipe = [score]pipe.png ScoreLevel = [score]level.png -ScoreLevelRound = [score]levelround.png +ScoreLevelRound = [score]levelRound.png ScoreLevel_Dark = [score]level_dark.png ScoreLevel_Dark_Round = [score]level_dark_round.png diff --git a/game/themes/Classic.ini b/game/themes/Classic.ini index d9a1ac6d..21468f15 100644 --- a/game/themes/Classic.ini +++ b/game/themes/Classic.ini @@ -3105,7 +3105,7 @@ Text = SING_OPTIONS_SOUND_VOICEPASSTHROUGH X = 70 Y = 130 W = 250 -H = 35 +H = 40 SkipX = 10 Color = ColorDark @@ -3125,31 +3125,9 @@ TexSBG = SelectBG TypeSBG = Transparent Text = SING_OPTIONS_SOUND_BACKGROUNDMUSIC X = 70 -Y = 170 -W = 250 -H = 35 -SkipX = 10 - -Color = ColorDark -DColor = Gray -TColor = White -TDColor = White -SBGTex = MainBar -SBGColor = ColorDark -SBGDColor = Gray -STColor = White -STDColor = GrayDark - -[OptionsSoundSelectMicBoost] -Tex = MainBar -Type = Transparent -TexSBG = SelectBG -TypeSBG = Transparent -Text = SING_OPTIONS_SOUND_MIC_BOOST -X = 70 -Y = 210 +Y = 180 W = 250 -H = 35 +H = 40 SkipX = 10 Color = ColorDark @@ -3169,9 +3147,9 @@ TexSBG = SelectBG TypeSBG = Transparent Text = SING_OPTIONS_SOUND_CLICK_ASSIST X = 70 -Y = 250 +Y = 230 W = 250 -H = 35 +H = 40 SkipX = 10 Color = ColorDark @@ -3191,31 +3169,9 @@ TexSBG = SelectBG TypeSBG = Transparent Text = SING_OPTIONS_SOUND_BEAT_CLICK X = 70 -Y = 290 -W = 250 -H = 35 -SkipX = 10 - -Color = ColorDark -DColor = Gray -TColor = White -TDColor = White -SBGTex = MainBar -SBGColor = ColorDark -SBGDColor = Gray -STColor = White -STDColor = GrayDark - -[OptionsSoundSelectThreshold] -Tex = MainBar -Type = Transparent -TexSBG = SelectBG -TypeSBG = Transparent -Text = SING_OPTIONS_SOUND_THRESHOLD -X = 70 -Y = 330 +Y = 280 W = 250 -H = 35 +H = 40 SkipX = 10 Color = ColorDark @@ -3235,9 +3191,9 @@ TexSBG = SelectBG TypeSBG = Transparent Text = SING_OPTIONS_SOUND_PREVIEWVOLUME X = 70 -Y = 370 +Y = 330 W = 250 -H = 35 +H = 40 SkipX = 10 Color = ColorDark @@ -3257,9 +3213,9 @@ TexSBG = SelectBG TypeSBG = Transparent Text = SING_OPTIONS_SOUND_PREVIEWFADING X = 70 -Y = 410 +Y = 380 W = 250 -H = 35 +H = 40 SkipX = 10 Color = ColorDark @@ -3274,7 +3230,7 @@ STDColor = GrayDark [OptionsSoundButtonExit] X = 70 -Y = 460 +Y = 440 W = 250 H = 40 Tex = MainBar @@ -3714,9 +3670,53 @@ SBGDColor = Gray STColor = White STDColor = GrayDark +[OptionsRecordSelectThreshold] +Tex = MainBar +Type = Transparent +TexSBG = SelectBG +TypeSBG = Transparent +Text = SING_OPTIONS_RECORD_THRESHOLD +X = 70 +Y = 367 +W = 250 +H = 40 +SkipX = 10 + +Color = ColorDark +DColor = Gray +TColor = White +TDColor = White +SBGTex = MainBar +SBGColor = ColorDark +SBGDColor = Gray +STColor = White +STDColor = GrayDark + +[OptionsRecordSelectMicBoost] +Tex = MainBar +Type = Transparent +TexSBG = SelectBG +TypeSBG = Transparent +Text = SING_OPTIONS_RECORD_MIC_BOOST +X = 70 +Y = 417 +W = 250 +H = 40 +SkipX = 10 + +Color = ColorDark +DColor = Gray +TColor = White +TDColor = White +SBGTex = MainBar +SBGColor = ColorDark +SBGDColor = Gray +STColor = White +STDColor = GrayDark + [OptionsRecordButtonExit] X = 70 -Y = 390 +Y = 470 W = 250 H = 40 Tex = MainBar diff --git a/game/themes/Deluxe.ini b/game/themes/Deluxe.ini index 53b4b6b0..22ce9e17 100644 --- a/game/themes/Deluxe.ini +++ b/game/themes/Deluxe.ini @@ -3536,7 +3536,7 @@ Text = SING_OPTIONS_SOUND_VOICEPASSTHROUGH X = 70 Y = 130 W = 250 -H = 35 +H = 40 SkipX = 10 Color = ColorDark @@ -3556,31 +3556,9 @@ TexSBG = SelectBG TypeSBG = Colorized Text = SING_OPTIONS_SOUND_BACKGROUNDMUSIC X = 70 -Y = 170 -W = 250 -H = 35 -SkipX = 10 - -Color = ColorDark -DColor = ColorLight -TColor = White -TDColor = White - -SBGColor = ColorDark -SBGDColor = ColorLight -STColor = White -STDColor = GrayDark - -[OptionsSoundSelectMicBoost] -Tex = MainBar -Type = Colorized -TexSBG = SelectBG -TypeSBG = Colorized -Text = SING_OPTIONS_SOUND_MIC_BOOST -X = 70 -Y = 210 +Y = 180 W = 250 -H = 35 +H = 40 SkipX = 10 Color = ColorDark @@ -3600,9 +3578,9 @@ TexSBG = SelectBG TypeSBG = Colorized Text = SING_OPTIONS_SOUND_CLICK_ASSIST X = 70 -Y = 250 +Y = 230 W = 250 -H = 35 +H = 40 SkipX = 10 Color = ColorDark @@ -3622,31 +3600,9 @@ TexSBG = SelectBG TypeSBG = Colorized Text = SING_OPTIONS_SOUND_BEAT_CLICK X = 70 -Y = 290 -W = 250 -H = 35 -SkipX = 10 - -Color = ColorDark -DColor = ColorLight -TColor = White -TDColor = White - -SBGColor = ColorDark -SBGDColor = ColorLight -STColor = White -STDColor = GrayDark - -[OptionsSoundSelectThreshold] -Tex = MainBar -Type = Colorized -TexSBG = SelectBG -TypeSBG = Colorized -Text = SING_OPTIONS_SOUND_THRESHOLD -X = 70 -Y = 330 +Y = 280 W = 250 -H = 35 +H = 40 SkipX = 10 Color = ColorDark @@ -3666,9 +3622,9 @@ TexSBG = SelectBG TypeSBG = Colorized Text = SING_OPTIONS_SOUND_PREVIEWVOLUME X = 70 -Y = 370 +Y = 330 W = 250 -H = 35 +H = 40 SkipX = 10 Color = ColorDark @@ -3688,9 +3644,9 @@ TexSBG = SelectBG TypeSBG = Colorized Text = SING_OPTIONS_SOUND_PREVIEWFADING X = 70 -Y = 410 +Y = 380 W = 250 -H = 35 +H = 40 SkipX = 10 Color = ColorDark @@ -3705,9 +3661,9 @@ STDColor = GrayDark [OptionsSoundButtonExit] X = 70 -Y = 460 +Y = 440 W = 250 -H = 35 +H = 40 Tex = Button Color = ColorLight DColor = ColorDark @@ -4237,9 +4193,53 @@ SBGDColor = ColorLight STColor = White STDColor = GrayDark +[OptionsRecordSelectThreshold] +Tex = MainBar +Type = Colorized +TexSBG = SelectBG +TypeSBG = Colorized +Text = SING_OPTIONS_RECORD_THRESHOLD +X = 70 +Y = 367 +W = 250 +H = 40 +SkipX = 10 + +Color = ColorDark +DColor = ColorLight +TColor = White +TDColor = White + +SBGColor = ColorDark +SBGDColor = ColorLight +STColor = White +STDColor = GrayDark + +[OptionsRecordSelectMicBoost] +Tex = MainBar +Type = Colorized +TexSBG = SelectBG +TypeSBG = Colorized +Text = SING_OPTIONS_RECORD_MIC_BOOST +X = 70 +Y = 417 +W = 250 +H = 40 +SkipX = 10 + +Color = ColorDark +DColor = ColorLight +TColor = White +TDColor = White + +SBGColor = ColorDark +SBGDColor = ColorLight +STColor = White +STDColor = GrayDark + [OptionsRecordButtonExit] X = 70 -Y = 390 +Y = 470 W = 250 H = 40 Tex = Button diff --git a/game/themes/Deluxe/Ocean.ini b/game/themes/Deluxe/Ocean.ini index a998874a..1a5d840e 100644 --- a/game/themes/Deluxe/Ocean.ini +++ b/game/themes/Deluxe/Ocean.ini @@ -103,7 +103,7 @@ SongName = [sing]SongName.png ScoreBox = [score]box.png ScoreGlassBox = [score]glass_box.png ScoreLevel = [score]level.png -ScoreLevelRound = [score]levelround.png +ScoreLevelRound = [score]levelRound.png ScoreLevel_Dark = [score]level_dark.png ScoreLevel_Dark_Round = [score]level_dark_round.png diff --git a/game/themes/Temptation.ini b/game/themes/Temptation.ini index 9206d83f..e49c051c 100755 --- a/game/themes/Temptation.ini +++ b/game/themes/Temptation.ini @@ -3543,7 +3543,7 @@ Text = SING_OPTIONS_SOUND_VOICEPASSTHROUGH X = 70 Y = 130 W = 250 -H = 35 +H = 40 SkipX = 10 Color = ColorDark @@ -3563,31 +3563,9 @@ TexSBG = SelectBG TypeSBG = Colorized Text = SING_OPTIONS_SOUND_BACKGROUNDMUSIC X = 70 -Y = 170 -W = 250 -H = 35 -SkipX = 10 - -Color = ColorDark -DColor = ColorLight -TColor = White -TDColor = White - -SBGColor = ColorDark -SBGDColor = ColorLight -STColor = White -STDColor = GrayDark - -[OptionsSoundSelectMicBoost] -Tex = MainBar -Type = Transparent -TexSBG = SelectBG -TypeSBG = Colorized -Text = SING_OPTIONS_SOUND_MIC_BOOST -X = 70 -Y = 210 +Y = 180 W = 250 -H = 35 +H = 40 SkipX = 10 Color = ColorDark @@ -3607,9 +3585,9 @@ TexSBG = SelectBG TypeSBG = Colorized Text = SING_OPTIONS_SOUND_CLICK_ASSIST X = 70 -Y = 250 +Y = 230 W = 250 -H = 35 +H = 40 SkipX = 10 Color = ColorDark @@ -3629,31 +3607,9 @@ TexSBG = SelectBG TypeSBG = Colorized Text = SING_OPTIONS_SOUND_BEAT_CLICK X = 70 -Y = 290 -W = 250 -H = 35 -SkipX = 10 - -Color = ColorDark -DColor = ColorLight -TColor = White -TDColor = White - -SBGColor = ColorDark -SBGDColor = ColorLight -STColor = White -STDColor = GrayDark - -[OptionsSoundSelectThreshold] -Tex = MainBar -Type = Transparent -TexSBG = SelectBG -TypeSBG = Colorized -Text = SING_OPTIONS_SOUND_THRESHOLD -X = 70 -Y = 330 +Y = 280 W = 250 -H = 35 +H = 40 SkipX = 10 Color = ColorDark @@ -3673,9 +3629,9 @@ TexSBG = SelectBG TypeSBG = Colorized Text = SING_OPTIONS_SOUND_PREVIEWVOLUME X = 70 -Y = 370 +Y = 330 W = 250 -H = 35 +H = 40 SkipX = 10 Color = ColorDark @@ -3695,9 +3651,9 @@ TexSBG = SelectBG TypeSBG = Colorized Text = SING_OPTIONS_SOUND_PREVIEWFADING X = 70 -Y = 410 +Y = 380 W = 250 -H = 35 +H = 40 SkipX = 10 Color = ColorDark @@ -3712,9 +3668,9 @@ STDColor = GrayDark [OptionsSoundButtonExit] X = 70 -Y = 460 +Y = 440 W = 250 -H = 35 +H = 40 Tex = MainBar Color = ColorDark DColor = ColorLight @@ -4262,9 +4218,53 @@ SBGDColor = ColorLight STColor = White STDColor = GrayDark +[OptionsRecordSelectThreshold] +Tex = MainBar +Type = Transparent +TexSBG = SelectBG +TypeSBG = Colorized +Text = SING_OPTIONS_RECORD_THRESHOLD +X = 70 +Y = 367 +W = 250 +H = 40 +SkipX = 10 + +Color = ColorDark +DColor = ColorLight +TColor = White +TDColor = White + +SBGColor = ColorDark +SBGDColor = ColorLight +STColor = White +STDColor = GrayDark + +[OptionsRecordSelectMicBoost] +Tex = MainBar +Type = Transparent +TexSBG = SelectBG +TypeSBG = Colorized +Text = SING_OPTIONS_RECORD_MIC_BOOST +X = 70 +Y = 417 +W = 250 +H = 40 +SkipX = 10 + +Color = ColorDark +DColor = ColorLight +TColor = White +TDColor = White + +SBGColor = ColorDark +SBGDColor = ColorLight +STColor = White +STDColor = GrayDark + [OptionsRecordButtonExit] X = 70 -Y = 390 +Y = 470 W = 250 H = 40 Tex = MainBar diff --git a/game/themes/Verdure.ini b/game/themes/Verdure.ini index c4a5232f..bebbd542 100644 --- a/game/themes/Verdure.ini +++ b/game/themes/Verdure.ini @@ -3661,7 +3661,7 @@ Text = SING_OPTIONS_SOUND_VOICEPASSTHROUGH X = 70 Y = 130 W = 250 -H = 35 +H = 40 SkipX = 10 Type = Transparent TypeSBG = Transparent @@ -3681,31 +3681,9 @@ Tex = MainBar TexSBG = SelectBG Text = SING_OPTIONS_SOUND_BACKGROUNDMUSIC X = 70 -Y = 170 -W = 250 -H = 35 -SkipX = 10 -Type = Transparent -TypeSBG = Transparent - -Color = ColorLight -DColor = ColorDark -TColor = White -TDColor = White - -SBGColor = ColorLight -SBGDColor = ColorDark -STColor = White -STDColor = GrayDark - -[OptionsSoundSelectMicBoost] -Tex = MainBar -TexSBG = SelectBG -Text = SING_OPTIONS_SOUND_MIC_BOOST -X = 70 -Y = 210 +Y = 180 W = 250 -H = 35 +H = 40 SkipX = 10 Type = Transparent TypeSBG = Transparent @@ -3725,9 +3703,9 @@ Tex = MainBar TexSBG = SelectBG Text = SING_OPTIONS_SOUND_CLICK_ASSIST X = 70 -Y = 250 +Y = 230 W = 250 -H = 35 +H = 40 SkipX = 10 Type = Transparent TypeSBG = Transparent @@ -3747,31 +3725,9 @@ Tex = MainBar TexSBG = SelectBG Text = SING_OPTIONS_SOUND_BEAT_CLICK X = 70 -Y = 290 -W = 250 -H = 35 -SkipX = 10 -Type = Transparent -TypeSBG = Transparent - -Color = ColorLight -DColor = ColorDark -TColor = White -TDColor = White - -SBGColor = ColorLight -SBGDColor = ColorDark -STColor = White -STDColor = GrayDark - -[OptionsSoundSelectThreshold] -Tex = MainBar -TexSBG = SelectBG -Text = SING_OPTIONS_SOUND_THRESHOLD -X = 70 -Y = 330 +Y = 280 W = 250 -H = 35 +H = 40 SkipX = 10 Type = Transparent TypeSBG = Transparent @@ -3791,9 +3747,9 @@ Tex = MainBar TexSBG = SelectBG Text = SING_OPTIONS_SOUND_PREVIEWVOLUME X = 70 -Y = 370 +Y = 330 W = 250 -H = 35 +H = 40 SkipX = 10 Type = Transparent TypeSBG = Transparent @@ -3813,9 +3769,9 @@ Tex = MainBar TexSBG = SelectBG Text = SING_OPTIONS_SOUND_PREVIEWFADING X = 70 -Y = 410 +Y = 380 W = 250 -H = 35 +H = 40 SkipX = 10 Type = Transparent TypeSBG = Transparent @@ -3832,7 +3788,7 @@ STDColor = GrayDark [OptionsSoundButtonExit] X = 70 -Y = 460 +Y = 440 W = 250 H = 40 Tex = Button @@ -4424,9 +4380,53 @@ SBGDColor = ColorDark STColor = White STDColor = GrayDark +[OptionsRecordSelectThreshold] +Tex = MainBar +TexSBG = SelectBG +Text = SING_OPTIONS_RECORD_THRESHOLD +X = 70 +Y = 367 +W = 250 +H = 40 +SkipX = 10 +Type = Transparent +TypeSBG = Transparent + +Color = ColorLight +DColor = ColorDark +TColor = White +TDColor = White + +SBGColor = ColorLight +SBGDColor = ColorDark +STColor = White +STDColor = GrayDark + +[OptionsRecordSelectMicBoost] +Tex = MainBar +TexSBG = SelectBG +Text = SING_OPTIONS_RECORD_MIC_BOOST +X = 70 +Y = 417 +W = 250 +H = 40 +SkipX = 10 +Type = Transparent +TypeSBG = Transparent + +Color = ColorLight +DColor = ColorDark +TColor = White +TDColor = White + +SBGColor = ColorLight +SBGDColor = ColorDark +STColor = White +STDColor = GrayDark + [OptionsRecordButtonExit] X = 70 -Y = 390 +Y = 470 W = 250 H = 40 Tex = Button -- cgit v1.2.3