Hidden medley icon on duets

ultrastares · Nov 22, 2018 · 53bf4a9 · 53bf4a9
1 parent f7464ed
commit 53bf4a9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/game/themes/Fantasy.ini b/game/themes/Fantasy.ini
@@ -2037,7 +2037,7 @@ Reflection = 0
 ReflectionSpacing = 22
 
 [SongRouletteDuetIcon]
-X = 451
+X = 335
 Y = 475
 W = 20
 H = 24
@@ -2920,7 +2920,7 @@ Reflection = 0
 ReflectionSpacing = 22
 
 [SongChessboardDuetIcon]
-X = 146
+X = 40
 Y = 430
 W = 18
 H = 22
@@ -3715,7 +3715,7 @@ Reflection = 0
 ReflectionSpacing = 22
 
 [SongCarouselDuetIcon]
-X = 451
+X = 335
 Y = 475
 W = 20
 H = 24
@@ -4534,7 +4534,7 @@ Tex = icon_song_video
 Type = Transparent
 
 [SongSlotMachineDuetIcon]
-X = 387
+X = 315
 Y = 350
 W = 25
 H = 30
@@ -5349,7 +5349,7 @@ Reflection = 0
 ReflectionSpacing = 22
 
 [SongSlideDuetIcon]
-X = 443
+X = 335
 Y = 475
 W = 20
 H = 24
@@ -6249,7 +6249,7 @@ Type = Transparent
 Reflection = 0
 
 [SongListDuetIcon]
-X = 464
+X = 490
 Y = 122
 W = 22
 H = 24
@@ -7107,7 +7107,7 @@ ReflectionSpacing = 0
 
 [SongMosaicDuetIcon]
 X = 500
-Y = 457
+Y = 428
 W = 22
 H = 24
 Z = 1

diff --git a/game/themes/Party.ini b/game/themes/Party.ini
@@ -2038,7 +2038,7 @@ Reflection = 0
 ReflectionSpacing = 22
 
 [SongRouletteDuetIcon]
-X = 451
+X = 335
 Y = 475
 W = 20
 H = 24
@@ -2921,7 +2921,7 @@ Reflection = 0
 ReflectionSpacing = 22
 
 [SongChessboardDuetIcon]
-X = 146
+X = 40
 Y = 430
 W = 18
 H = 22
@@ -3716,7 +3716,7 @@ Reflection = 0
 ReflectionSpacing = 22
 
 [SongCarouselDuetIcon]
-X = 451
+X = 335
 Y = 475
 W = 20
 H = 24
@@ -4535,7 +4535,7 @@ Tex = icon_song_video
 Type = Transparent
 
 [SongSlotMachineDuetIcon]
-X = 387
+X = 315
 Y = 350
 W = 25
 H = 30
@@ -5350,7 +5350,7 @@ Reflection = 0
 ReflectionSpacing = 22
 
 [SongSlideDuetIcon]
-X = 443
+X = 490
 Y = 475
 W = 20
 H = 24
@@ -6250,7 +6250,7 @@ Type = Transparent
 Reflection = 0
 
 [SongListDuetIcon]
-X = 464
+X = 490
 Y = 122
 W = 22
 H = 24
@@ -7108,7 +7108,7 @@ ReflectionSpacing = 0
 
 [SongMosaicDuetIcon]
 X = 500
-Y = 457
+Y = 428
 W = 22
 H = 24
 Z = 1

diff --git a/src/screens/UScreenSong.pas b/src/screens/UScreenSong.pas
@@ -1577,8 +1577,8 @@ procedure TScreenSong.SetScroll(force: boolean = false);
       Statics[VideoIcon].Visible := CatSongs.Song[Interaction].Video.IsSet;
 
       // Set visibility of medley icons
-      Statics[MedleyIcon].Visible := (CatSongs.Song[Interaction].Medley.Source = msTag);
-      Statics[CalcMedleyIcon].Visible := (CatSongs.Song[Interaction].Medley.Source = msCalculated);
+      Statics[MedleyIcon].Visible := (CatSongs.Song[Interaction].Medley.Source = msTag) and not CatSongs.Song[Interaction].isDuet;
+      Statics[CalcMedleyIcon].Visible := (CatSongs.Song[Interaction].Medley.Source = msCalculated) and not CatSongs.Song[Interaction].isDuet;
 
       //Set Visibility of Duet Icon
       Statics[DuetIcon].Visible := CatSongs.Song[Interaction].isDuet;
@@ -2055,9 +2055,9 @@ procedure TScreenSong.SetListScroll;
         Self.Statics[ListVideoIcon[I]].Texture.Alpha := Alpha;
         Self.Statics[ListVideoIcon[I]].Visible := USongs.CatSongs.Song[B].Video.IsSet;
         Self.Statics[ListMedleyIcon[I]].Texture.Alpha := Alpha;
-        Self.Statics[ListMedleyIcon[I]].Visible := (USongs.CatSongs.Song[B].Medley.Source = msTag);
+        Self.Statics[ListMedleyIcon[I]].Visible := (USongs.CatSongs.Song[B].Medley.Source = msTag) and not CatSongs.Song[Interaction].isDuet;
         Self.Statics[ListCalcMedleyIcon[I]].Texture.Alpha := Alpha;
-        Self.Statics[ListCalcMedleyIcon[I]].Visible := (USongs.CatSongs.Song[B].Medley.Source = msCalculated);
+        Self.Statics[ListCalcMedleyIcon[I]].Visible := (USongs.CatSongs.Song[B].Medley.Source = msCalculated) and not CatSongs.Song[Interaction].isDuet;
         Self.Statics[ListDuetIcon[I]].Texture.Alpha := Alpha;
         Self.Statics[ListDuetIcon[I]].Visible := USongs.CatSongs.Song[B].isDuet;
         Self.Statics[ListRapIcon[I]].Texture.Alpha := Alpha;