From 5e449c7b011299b99686410f9019854a4479beb3 Mon Sep 17 00:00:00 2001
From: McSchneidar <262792195+McSchneidar@users.noreply.github.com>
Date: Sun, 18 Oct 2026 06:18:20 +0200
Subject: [PATCH] Improve tic-tac-toe party mode (#912)

- A won field pops up and fades into the color of the winning team
- At the end, the winning line pulses while all other fields are dimmed
- The jokers are labeled ("New song", "Replay a field"), so it's clear what they do
- Darker panels behind the team areas and more room between the board and the title
- Long player names no longer reach into the board

Co-authored-by: Florian Ostertag <flokuep@users.noreply.github.com>
---
 Output/PartyModes/TicTacToe/Languages/de.xml  |   2 +
 Output/PartyModes/TicTacToe/Languages/en.xml  |   2 +
 .../Screens/PartyScreenTicTacToeMain.xml      |  94 +++++++++++-
 .../PartyModeTicTacToe/CPartyModeTicTacToe.cs |   4 +
 .../CPartyScreenTicTacToeMain.cs              | 145 +++++++++++++++++-
 5 files changed, 240 insertions(+), 7 deletions(-)

diff --git a/Output/PartyModes/TicTacToe/Languages/de.xml b/Output/PartyModes/TicTacToe/Languages/de.xml
index 1a990381..9ecbdd5b 100644
--- a/Output/PartyModes/TicTacToe/Languages/de.xml
+++ b/Output/PartyModes/TicTacToe/Languages/de.xml
@@ -28,6 +28,8 @@
   <string name="TR_SCREENNAMES_HELPMESSAGE">Füge mindestens einen Spieler zu beiden Teams hinzu! / Zum Hinzufügen den Spieleravatar auf die Liste der ausgewählten Spieler ziehen! / Zum Entfernen den Spieleravatar mit rechter Maustaste anklicken!</string>
   <string name="TR_SCREENMAIN_TITLE">Tic-Tac-Toe</string>
   <string name="TR_SCREENMAIN_TEAM_CHOOSE">Wählt ein Feld aus.</string>
+  <string name="TR_SCREENMAIN_JOKER_RANDOM">Neuer Song</string>
+  <string name="TR_SCREENMAIN_JOKER_RETRY">Feld neu spielen</string>
   <string name="TR_SCREENMAIN_NEXT_PLAYER">Nächster Spieler</string>
   <string name="TR_SCREENMAIN_POPUP_REALLYEXIT">Tic-Tac-Toe wirklich beenden?</string>
   <string name="TR_SCREENMAIN_WINNER">Und der Gewinner ist...</string>
diff --git a/Output/PartyModes/TicTacToe/Languages/en.xml b/Output/PartyModes/TicTacToe/Languages/en.xml
index 49e44511..d7b18bcf 100644
--- a/Output/PartyModes/TicTacToe/Languages/en.xml
+++ b/Output/PartyModes/TicTacToe/Languages/en.xml
@@ -28,6 +28,8 @@
   <string name="TR_SCREENNAMES_HELPMESSAGE">Add at least one player to both teams! / Drag player avatars to add them to the selected players list! / Right click avatar of selected players to remove them!</string>
   <string name="TR_SCREENMAIN_TITLE">Tic-Tac-Toe</string>
   <string name="TR_SCREENMAIN_TEAM_CHOOSE">Choose a field.</string>
+  <string name="TR_SCREENMAIN_JOKER_RANDOM">New song</string>
+  <string name="TR_SCREENMAIN_JOKER_RETRY">Replay a field</string>
   <string name="TR_SCREENMAIN_NEXT_PLAYER">Next player</string>
   <string name="TR_SCREENMAIN_POPUP_REALLYEXIT">Really exit Tic-Tac-Toe?</string>
   <string name="TR_SCREENMAIN_WINNER">And the winner is...</string>
diff --git a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeMain.xml b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeMain.xml
index 6d7bda6b..22388a73 100644
--- a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeMain.xml
+++ b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeMain.xml
@@ -2,7 +2,7 @@
 <Screen>
   <Informations>
     <ScreenName>PartyScreenTicTacToeMain</ScreenName>
-    <ScreenVersion>2</ScreenVersion>
+    <ScreenVersion>3</ScreenVersion>
   </Informations>
   <Backgrounds>
     <Background Name="Background1">
@@ -80,6 +80,38 @@
         <Z>-2</Z>
       </Rect>
     </Static>
+    <Static Name="StaticTeamPanel1">
+      <Skin />
+      <Color>
+        <R>0.1</R>
+        <G>0.09</G>
+        <B>0.25</B>
+        <A>0.75</A>
+      </Color>
+      <Rect>
+        <X>5</X>
+        <Y>210</Y>
+        <W>485</W>
+        <H>470</H>
+        <Z>0.8</Z>
+      </Rect>
+    </Static>
+    <Static Name="StaticTeamPanel2">
+      <Skin />
+      <Color>
+        <R>0.1</R>
+        <G>0.09</G>
+        <B>0.25</B>
+        <A>0.75</A>
+      </Color>
+      <Rect>
+        <X>1430</X>
+        <Y>210</Y>
+        <W>485</W>
+        <H>470</H>
+        <Z>0.8</Z>
+      </Rect>
+    </Static>
   </Statics>
   <Texts>
     <Text Name="TextTitle">
@@ -171,7 +203,7 @@
       <Y>300</Y>
       <Z>0</Z>
       <H>52.5</H>
-      <MaxW>0</MaxW>
+      <MaxW>300</MaxW>
       <Color Name="Player1" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
@@ -185,7 +217,7 @@
       <Y>300</Y>
       <Z>0</Z>
       <H>60</H>
-      <MaxW>0</MaxW>
+      <MaxW>300</MaxW>
       <Color Name="Player2" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
@@ -194,6 +226,62 @@
       <Font>Outline</Font>
       <Text />
     </Text>
+    <Text Name="TextJokerRandomT1">
+      <X>90</X>
+      <Y>640</Y>
+      <Z>0</Z>
+      <H>26</H>
+      <MaxW>150</MaxW>
+      <Color Name="TextColor" />
+      <SelColor Name="TextSelColor" />
+      <Align>Center</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Bold</Style>
+      <Font>Outline</Font>
+      <Text>TR_SCREENMAIN_JOKER_RANDOM</Text>
+    </Text>
+    <Text Name="TextJokerRetryT1">
+      <X>240</X>
+      <Y>640</Y>
+      <Z>0</Z>
+      <H>26</H>
+      <MaxW>150</MaxW>
+      <Color Name="TextColor" />
+      <SelColor Name="TextSelColor" />
+      <Align>Center</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Bold</Style>
+      <Font>Outline</Font>
+      <Text>TR_SCREENMAIN_JOKER_RETRY</Text>
+    </Text>
+    <Text Name="TextJokerRandomT2">
+      <X>1830</X>
+      <Y>640</Y>
+      <Z>0</Z>
+      <H>26</H>
+      <MaxW>150</MaxW>
+      <Color Name="TextColor" />
+      <SelColor Name="TextSelColor" />
+      <Align>Center</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Bold</Style>
+      <Font>Outline</Font>
+      <Text>TR_SCREENMAIN_JOKER_RANDOM</Text>
+    </Text>
+    <Text Name="TextJokerRetryT2">
+      <X>1680</X>
+      <Y>640</Y>
+      <Z>0</Z>
+      <H>26</H>
+      <MaxW>150</MaxW>
+      <Color Name="TextColor" />
+      <SelColor Name="TextSelColor" />
+      <Align>Center</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Bold</Style>
+      <Font>Outline</Font>
+      <Text>TR_SCREENMAIN_JOKER_RETRY</Text>
+    </Text>
   </Texts>
   <Buttons>
     <Button Name="ButtonNextRound">
diff --git a/PartyModes/PartyModeTicTacToe/CPartyModeTicTacToe.cs b/PartyModes/PartyModeTicTacToe/CPartyModeTicTacToe.cs
index eb0a7aea..000a7da9 100644
--- a/PartyModes/PartyModeTicTacToe/CPartyModeTicTacToe.cs
+++ b/PartyModes/PartyModeTicTacToe/CPartyModeTicTacToe.cs
@@ -120,6 +120,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
 
             public int CurrentRoundNr;
             public int FieldNr;
+            public int LastWonField;
 
             public int[] NumJokerRandom;
             public int[] NumJokerRetry;
@@ -246,6 +247,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
                     GameData.Team = CBase.Game.GetRandom(100) < 50 ? 0 : 1;
                     CBase.Songs.ResetSongSung();
                     GameData.CurrentRoundNr = 1;
+                    GameData.LastWonField = -1;
                     _CreateRounds();
                     _SetNumJokers();
                     break;
@@ -479,6 +481,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
             GameData.Rounds[GameData.FieldNr].PointsTeam1 = (int)Math.Round(results[0].Points);
             GameData.Rounds[GameData.FieldNr].PointsTeam2 = (int)Math.Round(results[1].Points);
             GameData.Rounds[GameData.FieldNr].Finished = true;
+            GameData.LastWonField = GameData.FieldNr;
             if (GameData.Rounds[GameData.FieldNr].PointsTeam1 < GameData.Rounds[GameData.FieldNr].PointsTeam2)
             {
                 GameData.Rounds[GameData.FieldNr].Winner = 2;
@@ -490,6 +493,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
             else
             {
                 GameData.Rounds[GameData.FieldNr].Finished = false;
+                GameData.LastWonField = -1;
                 GameData.CurrentRoundNr--;
             }
         }
diff --git a/PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeMain.cs b/PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeMain.cs
index daf6d6e2..bdfa5b67 100644
--- a/PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeMain.cs
+++ b/PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeMain.cs
@@ -17,6 +17,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Windows.Forms;
 using VocaluxeLib.Menu;
 
@@ -37,7 +38,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
         // Version number for theme files. Increment it, if you've changed something on the theme files!
         protected override int _ScreenVersion
         {
-            get { return 2; }
+            get { return 3; }
         }
 
         private const string _TextPopupReallyExit = "TextPopupReallyExit";
@@ -47,6 +48,10 @@ namespace VocaluxeLib.PartyModes.TicTacToe
         private const string _TextNextPlayerT2 = "TextNextPlayerT2";
         private const string _TextNextPlayerNameT1 = "TextNextPlayerNameT1";
         private const string _TextNextPlayerNameT2 = "TextNextPlayerNameT2";
+        private const string _TextJokerRandomT1 = "TextJokerRandomT1";
+        private const string _TextJokerRandomT2 = "TextJokerRandomT2";
+        private const string _TextJokerRetryT1 = "TextJokerRetryT1";
+        private const string _TextJokerRetryT2 = "TextJokerRetryT2";
 
         private const string _ButtonNextRound = "ButtonNextRound";
         private const string _ButtonBack = "ButtonBack";
@@ -90,12 +95,21 @@ namespace VocaluxeLib.PartyModes.TicTacToe
         private int[,] _Possibilities;
         private EStatus _Status;
 
+        private const float _FieldWonDuration = 700f;
+        private readonly Stopwatch _AnimTimer = new Stopwatch();
+        private readonly List<SRectF> _FieldRects = new List<SRectF>();
+        private int _AnimatedField = -1;
+        private int _WinningLine = -1;
+
         public override void Init()
         {
             base.Init();
 
             _ThemeTexts = new string[]
-                { _TextPopupReallyExit, _TextTeamChoosing, _TextFinishMessage, _TextNextPlayerT1, _TextNextPlayerT2, _TextNextPlayerNameT1, _TextNextPlayerNameT2 };
+                {
+                    _TextPopupReallyExit, _TextTeamChoosing, _TextFinishMessage, _TextNextPlayerT1, _TextNextPlayerT2, _TextNextPlayerNameT1, _TextNextPlayerNameT2,
+                    _TextJokerRandomT1, _TextJokerRandomT2, _TextJokerRetryT1, _TextJokerRetryT2
+                };
             _ThemeButtons = new string[]
             {
                 _ButtonNextRound, _ButtonBack, _ButtonExit, _ButtonPopupYes, _ButtonPopupNo, _ButtonField, _ButtonJokerRandomT1, _ButtonJokerRandomT2, _ButtonJokerRetryT1,
@@ -411,7 +425,14 @@ namespace VocaluxeLib.PartyModes.TicTacToe
             _UpdateFields();
             _UpdateFieldContents();
 
+            _AnimatedField = _PartyMode.GameData.LastWonField;
+            _PartyMode.GameData.LastWonField = -1;
+            _AnimTimer.Reset();
+            _AnimTimer.Start();
+
             var winner = _GetWinner();
+            _WinningLine = winner > 0 ? _GetWinningLine() : -1;
+            _SetJokerLabelsVisible(false);
             if (_PartyMode.GameData.CurrentRoundNr <= _PartyMode.GameData.NumFields && winner == 0)
             {
                 _UpdateTeamChoosingMessage();
@@ -442,6 +463,11 @@ namespace VocaluxeLib.PartyModes.TicTacToe
                 _Texts[_TextTeamChoosing].Visible = false;
                 if (winner > 0)
                 {
+                    if (_WinningLine >= 0)
+                    {
+                        _DimFieldsOutsideWinningLine();
+                    }
+
                     _Texts[_TextFinishMessage].Color = CBase.Themes.GetPlayerColor(winner);
                     _Texts[_TextFinishMessage].Text = CBase.Language.Translate("TR_SCREENMAIN_WINNER", PartyModeId) + " " + CBase.Language.Translate("TR_TEAM", PartyModeId) + " " +
                                                       winner;
@@ -460,6 +486,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe
 
         public override bool UpdateGame()
         {
+            _UpdateFieldAnimations();
+
             if (!_Equalizers[_EqualizerTeam[0]].Visible)
             {
                 return true;
@@ -474,6 +502,88 @@ namespace VocaluxeLib.PartyModes.TicTacToe
             return true;
         }
 
+        private static float _EaseOutBack(float t)
+        {
+            const float c1 = 1.70158f;
+            const float c3 = c1 + 1f;
+            return 1f + c3 * (float)Math.Pow(t - 1f, 3) + c1 * (float)Math.Pow(t - 1f, 2);
+        }
+
+        private void _SetFieldScale(int field, float scale)
+        {
+            var rect = _FieldRects[field];
+            var w = rect.W * scale;
+            var h = rect.H * scale;
+            _Fields[field].X = rect.X + (rect.W - w) / 2;
+            _Fields[field].Y = rect.Y + (rect.H - h) / 2;
+            _Fields[field].W = w;
+            _Fields[field].H = h;
+        }
+
+        private void _UpdateFieldAnimations()
+        {
+            var time = _AnimTimer.ElapsedMilliseconds;
+
+            if (_AnimatedField >= 0 && _AnimatedField < _FieldRects.Count)
+            {
+                var progress = Math.Min(1f, time / _FieldWonDuration);
+                _SetFieldScale(_AnimatedField, 1.25f - 0.25f * _EaseOutBack(progress));
+
+                var teamColor = CBase.Themes.GetPlayerColor(_PartyMode.GameData.Rounds[_AnimatedField].Winner);
+                var color = new SColorF(1f + (teamColor.R - 1f) * progress, 1f + (teamColor.G - 1f) * progress, 1f + (teamColor.B - 1f) * progress, teamColor.A);
+                _Fields[_AnimatedField].Color = color;
+                _Fields[_AnimatedField].SelColor = color;
+
+                if (progress >= 1f)
+                {
+                    _SetFieldScale(_AnimatedField, 1f);
+                    _AnimatedField = -1;
+                }
+
+                return;
+            }
+
+            if (_WinningLine < 0)
+            {
+                return;
+            }
+
+            var pulse = 1f + 0.04f * (float)Math.Sin(time / 1000.0 * Math.PI * 1.4);
+            for (var c = 0; c < _Possibilities.GetLength(1); c++)
+            {
+                _SetFieldScale(_Possibilities[_WinningLine, c], pulse);
+            }
+        }
+
+        private void _DimFieldsOutsideWinningLine()
+        {
+            var inLine = new List<int>();
+            for (var c = 0; c < _Possibilities.GetLength(1); c++)
+            {
+                inLine.Add(_Possibilities[_WinningLine, c]);
+            }
+
+            for (var i = 0; i < _PartyMode.GameData.Rounds.Count; i++)
+            {
+                if (inLine.Contains(i))
+                {
+                    continue;
+                }
+
+                var color = _Fields[i].Color;
+                _Fields[i].Color = new SColorF(color.R, color.G, color.B, color.A * 0.35f);
+                _Fields[i].SelColor = _Fields[i].Color;
+            }
+        }
+
+        private void _SetJokerLabelsVisible(bool visible)
+        {
+            _Texts[_TextJokerRandomT1].Visible = visible;
+            _Texts[_TextJokerRandomT2].Visible = visible;
+            _Texts[_TextJokerRetryT1].Visible = visible;
+            _Texts[_TextJokerRetryT2].Visible = visible;
+        }
+
         private void _CreateFields()
         {
             for (var i = 0; i < 25; i++)
@@ -488,15 +598,16 @@ namespace VocaluxeLib.PartyModes.TicTacToe
         private void _UpdateFields()
         {
             var numOneRow = (int)Math.Sqrt(_PartyMode.GameData.NumFields);
-            var fieldSizeY = ((float)CBase.Settings.GetRenderH() - 150 - numOneRow * _FieldSpace) / numOneRow;
+            var fieldSizeY = ((float)CBase.Settings.GetRenderH() - 210 - numOneRow * _FieldSpace) / numOneRow;
             var fieldSizeX = ((float)CBase.Settings.GetRenderW() - 300 - numOneRow * _FieldSpace) / numOneRow;
             _FieldSize = Math.Min(fieldSizeX, fieldSizeY);
             _FieldFirstX = (float)CBase.Settings.GetRenderW() / 2 - (numOneRow * _FieldSize + (numOneRow - 1) * _FieldSpace) / 2;
-            _FieldFirstY = 140 + (CBase.Settings.GetRenderH() - 140) / 2 - (numOneRow * _FieldSize + numOneRow * _FieldSpace) / 2;
+            _FieldFirstY = 200 + (CBase.Settings.GetRenderH() - 200) / 2 - (numOneRow * _FieldSize + numOneRow * _FieldSpace) / 2;
             var row = 0;
             var column = 0;
             var x = _FieldFirstX;
             var y = _FieldFirstY;
+            _FieldRects.Clear();
             for (var i = 0; i < _Fields.Count; i++)
             {
                 if (i < _PartyMode.GameData.NumFields)
@@ -507,6 +618,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
                     _Fields[i].Y = y;
                     _Fields[i].Visible = true;
                     _Fields[i].Selectable = true;
+                    _FieldRects.Add(new SRectF(x, y, _FieldSize, _FieldSize, _Fields[i].Rect.Z));
                     column++;
                     if (i + 1 >= numOneRow * (row + 1))
                     {
@@ -746,6 +858,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
             _Buttons[_ButtonJokerRandomT2].Selectable = _PartyMode.GameData.NumJokerRandom[1] > 0;
             _Buttons[_ButtonJokerRetryT1].Visible = true;
             _Buttons[_ButtonJokerRetryT2].Visible = true;
+            _SetJokerLabelsVisible(true);
             _Buttons[_ButtonJokerRetryT1].Text.Text = _PartyMode.GameData.NumJokerRetry[0].ToString();
             _Buttons[_ButtonJokerRetryT2].Text.Text = _PartyMode.GameData.NumJokerRetry[1].ToString();
             _Buttons[_ButtonJokerRetryT1].Selectable = _PartyMode.GameData.NumJokerRetry[0] > 0 && _PartyMode.GameData.CurrentRoundNr > 1;
@@ -828,6 +941,30 @@ namespace VocaluxeLib.PartyModes.TicTacToe
             }
         }
 
+        private int _GetWinningLine()
+        {
+            var winner = _GetWinner();
+            for (var i = 0; i < _Possibilities.GetLength(0); i++)
+            {
+                var complete = true;
+                for (var j = 0; j < _Possibilities.GetLength(1); j++)
+                {
+                    if (_PartyMode.GameData.Rounds[_Possibilities[i, j]].Winner != winner)
+                    {
+                        complete = false;
+                        break;
+                    }
+                }
+
+                if (complete)
+                {
+                    return i;
+                }
+            }
+
+            return -1;
+        }
+
         private int _GetWinner()
         {
             for (var i = 0; i < _Possibilities.GetLength(0); i++)