diff --git a/game/config.ini b/game/config.ini deleted file mode 100644 index 9f70f30d4..000000000 --- a/game/config.ini +++ /dev/null @@ -1,200 +0,0 @@ -[Game] -Players=6 -Difficulty=Easy -Language=English -Tabs=Off -SongMenu=Roulette -Sorting=Artist -ShowScores=On -Debug=Off -AVDelay=0 -MicDelay=140 - -[Graphics] -Screens=1 -Split=Off -FullScreen=Off -Visualization=Off -Resolution=1024x768 -Depth=32 bit -TextureSize=256 -Oscilloscope=On -MovieSize=Full [BG+Vid] -VideoPreview=On -VideoEnabled=On -MaxFramerate=60 -ResolutionFullscreen=1920x1080 -PositionX=0 -PositionY=0 - -[Sound] -ClickAssist=Off -BeatClick=Off -AudioOutputBufferSize=Auto -BackgroundMusic=On -PreviewVolume=70% -PreviewFading=3 Secs -SavePlayback=Off -VoicePassthrough=Off -MusicAutoGain=Off - -[Lyrics] -LyricsFont=Noto Sans -LyricsStyle=Outline -LyricsEffect=Slide -NoteLines=On -Encoding=Auto - -[Themes] -Theme=Modern -Skin=Blue -Color=Blue - -[Record] -MicBoost=+12dB -Threshold=15% -DeviceName[1]=Mikrofon (2- Realtek High Definition Audio) -Input[1]=0 -Latency[1]=-1 -Channel1[1]=1 -Channel2[1]=2 -DeviceName[2]=Mikrofon (Realtek High Definition Audio) -Input[2]=0 -Latency[2]=-1 -Channel1[2]=0 -Channel2[2]=0 -DeviceName[3]=Mikrofon (USBMIC Serial# 101113608 ) -Input[3]=0 -Latency[3]=-1 -Channel1[3]=1 -Channel2[3]=2 -DeviceName[4]=CABLE Output (VB-Audio Virtual Cable) -Input[4]=0 - -[Advanced] -LoadAnimation=On -EffectSing=On -ScreenFade=On -AskbeforeDel=On -OnSongClick=Sing -LineBonus=On -PartyPopup=On -SingScores=On -TopScores=All -SyncTo=Music -SingTimebarMode=Remaining -JukeboxTimebarMode=Current - -[Controller] -Joypad=Off -Mouse=Game - -[Directories] -WebScoresDir= -SongDir1= - -[Jukebox] -LyricsFont=Noto Sans -LyricsStyle=Outline -LyricsEffect=Slide -LyricsAlpha=0.90 -SingLineColor=FFFF00 -ActualLineColor=FFFFFF -NextLineColor=D6D6D6 -SingLineOColor=000000 -ActualLineOColor=000000 -NextLineOColor=000000 - -[Name] -P1=USDXstyle -P2=Player2 -P3=Player3 -P4=Player4 -P5=Player5 -P6=Player6 -P7=Player7 -P8=Player8 -P9=Player9 -P10=Player10 -P11=Player11 -P12=Player12 -P13= -P14= -P15= -P16= - -[NameTeam] -T1=Team1 -T2=Team2 -T3=Team3 - -[NameTemplate] -Name1=Template1 -Name2=Template2 -Name3=Template3 -Name4=Template4 -Name5=Template5 -Name6=Template6 -Name7=Template7 -Name8=Template8 -Name9=Template9 -Name10=Template10 -Name11=Template11 -Name12=Template12 - -[PlayerColor] -P1=1 -P2=4 -P3=3 -P4=2 -P5=5 -P6=6 -P7=7 -P8=8 -P9=9 -P10=10 -P11=11 -P12=12 - -[PlayerAvatar] -P1= -P2= -P3= -P4= -P5= -P6= -P7= -P8= -P9= -P10= -P11= -P12= - -[PlayerLevel] -P1=0 -P2=0 -P3=0 -P4=0 -P5=0 -P6=0 -P7=0 -P8=0 -P9=0 -P10=0 -P11=0 -P12=0 - -[Webcam] -ID=1 -Resolution=800x600 -FPS=30 -Flip=On -Brightness=0 -Saturation=0 -Hue=0 -Effect=0 - -[TeamColor] -T1=1 -T2=2 -T3=3 diff --git a/src/base/UIni.pas b/src/base/UIni.pas index 8bc4f5044..207c01661 100644 --- a/src/base/UIni.pas +++ b/src/base/UIni.pas @@ -1412,6 +1412,11 @@ procedure TIni.Load(); PlayerLevel[I] := IniFile.ReadInteger('PlayerLevel', 'P'+IntToStr(I+1), 0); end; + // Switch colors for players 2 and 4, since player 2 line color is used + // for the second part in duet, and yellow (4) looks better than red (2) + PlayerColor[1] := IniFile.ReadInteger('PlayerColor', 'P'+IntToStr(I+1), 4); + PlayerColor[3] := IniFile.ReadInteger('PlayerColor', 'P'+IntToStr(I+1), 2); + // Color Team for I := 0 to 2 do TeamColor[I] := IniFile.ReadInteger('TeamColor', 'T'+IntToStr(I+1), I + 1); @@ -1441,7 +1446,7 @@ procedure TIni.Load(); TabsAtStartup := Tabs; //Tabs at Startup fix // Song Sorting - Sorting := ReadArrayIndex(ISorting, IniFile, 'Game', 'Sorting', Ord(sEdition)); + Sorting := ReadArrayIndex(ISorting, IniFile, 'Game', 'Sorting', Ord(sArtist)); // Show Score ShowScores := ReadArrayIndex(IShowScores, IniFile, 'Game', 'ShowScores', IGNORE_INDEX, 'On'); @@ -1483,7 +1488,7 @@ procedure TIni.Load(); TextureSize := ReadArrayIndex(ITextureSize, IniFile, 'Graphics', 'TextureSize', IGNORE_INDEX, '256'); // Oscilloscope - Oscilloscope := ReadArrayIndex(IOscilloscope, IniFile, 'Graphics', 'Oscilloscope', 0); + Oscilloscope := ReadArrayIndex(IOscilloscope, IniFile, 'Graphics', 'Oscilloscope', 1); // Spectrum //Spectrum := ReadArrayIndex(ISpectrum, IniFile, 'Graphics', 'Spectrum', IGNORE_INDEX, 'Off'); @@ -1515,7 +1520,7 @@ procedure TIni.Load(); AudioOutputBufferSizeIndex := ReadArrayIndex(IAudioOutputBufferSize, IniFile, 'Sound', 'AudioOutputBufferSize', 0); //Preview Volume - PreviewVolume := ReadArrayIndex(IPreviewVolume, IniFile, 'Sound', 'PreviewVolume', 7); + PreviewVolume := ReadArrayIndex(IPreviewVolume, IniFile, 'Sound', 'PreviewVolume', 5); //Preview Fading PreviewFading := ReadArrayIndex(IPreviewFading, IniFile, 'Sound', 'PreviewFading', 3); @@ -1534,7 +1539,7 @@ procedure TIni.Load(); // Lyrics Style LyricsStyle := ReadArrayIndex(ILyricsStyleCompat, IniFile, 'Lyrics', 'LyricsStyle', -1); if (LyricsStyle = -1) then - LyricsStyle := ReadArrayIndex(ILyricsStyle, IniFile, 'Lyrics', 'LyricsStyle', 0); + LyricsStyle := ReadArrayIndex(ILyricsStyle, IniFile, 'Lyrics', 'LyricsStyle', 2); // Lyrics Effect LyricsEffect := ReadArrayIndex(ILyricsEffect, IniFile, 'Lyrics', 'LyricsEffect', 2); @@ -1622,8 +1627,8 @@ procedure TIni.Load(); // Jukebox JukeboxFont := ReadArrayIndex(ILyricsFont, IniFile, 'Jukebox', 'LyricsFont', 0); - JukeboxStyle := ReadArrayIndex(ILyricsStyle, IniFile, 'Jukebox', 'LyricsStyle', 0); - JukeboxEffect := ReadArrayIndex(ILyricsEffect, IniFile, 'Jukebox', 'LyricsEffect', 1); + JukeboxStyle := ReadArrayIndex(ILyricsStyle, IniFile, 'Jukebox', 'LyricsStyle', 2); + JukeboxEffect := ReadArrayIndex(ILyricsEffect, IniFile, 'Jukebox', 'LyricsEffect', 2); JukeboxAlpha := ReadArrayIndex(ILyricsAlpha, IniFile, 'Jukebox', 'LyricsAlpha', 20); JukeboxSongMenu := ReadArrayIndex(IJukeboxSongMenu, IniFile, 'Jukebox', 'SongMenu', IGNORE_INDEX, 'On'); @@ -1636,7 +1641,7 @@ procedure TIni.Load(); begin JukeboxSingLineColor := High(IHexSingColor); - HexColor := IniFile.ReadString('Jukebox', 'SingLineColor', IHexSingColor[0]); + HexColor := IniFile.ReadString('Jukebox', 'SingLineColor', '47B3FF'); Col := HexToRGB(HexColor); Ini.JukeboxSingLineOtherColorR := Round(Col.R);