diff --git a/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeConfig.xml b/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeConfig.xml
index a38e7694..4ac70497 100644
--- a/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeConfig.xml
+++ b/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeConfig.xml
@@ -2,7 +2,7 @@
PartyScreenTicTacToeConfig
- 1
+ 2
@@ -55,7 +55,7 @@
Outline
TR_SCREENCONFIG_NUMFIELDS
-
+
75
165
0
@@ -67,21 +67,7 @@
Center
Outline
- TR_SCREENCONFIG_SONGSOURCE
-
-
- 75
- 285
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENCONFIG_GAMEMODE
+ TR_SCREENCONFIG_REFILLJOKER
@@ -201,7 +187,7 @@
Bold
3
-
+
SelectSlideArrowLeft
SelectSlideArrowRight
@@ -241,133 +227,7 @@
205.33
Outline
Bold
- 3
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 220
- 700
- 50
- 0
-
-
- 505
- 225
- 40
- 40
- 0
-
-
- 1155
- 225
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 205.33
- Outline
- Bold
- 1
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 220
- 700
- 50
- 0
-
-
- 505
- 225
- 40
- 40
- 0
-
-
- 1155
- 225
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 205.33
- Outline
- Bold
- 1
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 280
- 700
- 50
- 0
-
-
- 505
- 285
- 40
- 40
- 0
-
-
- 1155
- 285
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 205.33
- Outline
- Bold
- 1
+ 2
@@ -376,4 +236,4 @@
-
\ No newline at end of file
+
diff --git a/PartyModes/PartyModeTicTacToe/CPartyModeTicTacToe.cs b/PartyModes/PartyModeTicTacToe/CPartyModeTicTacToe.cs
index 724d26d3..2174d739 100644
--- a/PartyModes/PartyModeTicTacToe/CPartyModeTicTacToe.cs
+++ b/PartyModes/PartyModeTicTacToe/CPartyModeTicTacToe.cs
@@ -125,6 +125,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
public int[] NumJokerRandom;
public int[] NumJokerRetry;
+ public EOffOn RefillJokers;
}
public SData GameData;
@@ -162,7 +163,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe
Rounds = new List(),
Songs = new List(),
NumJokerRandom = new int[2],
- NumJokerRetry = new int[2]
+ NumJokerRetry = new int[2],
+ RefillJokers = EOffOn.TR_CONFIG_OFF
};
}
@@ -254,6 +256,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe
_Stage = EStage.Main;
GameData.Team = GameData.Team == 1 ? 0 : 1;
_UpdatePlayerList();
+ if (GameData.RefillJokers == EOffOn.TR_CONFIG_ON)
+ _SetNumJokers();
break;
default:
throw new ArgumentException("Invalid stage: " + _Stage);
diff --git a/PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeConfig.cs b/PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeConfig.cs
index a04e8e16..640fffbf 100644
--- a/PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeConfig.cs
+++ b/PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeConfig.cs
@@ -15,6 +15,7 @@
// along with Vocaluxe. If not, see .
#endregion
+using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
@@ -30,10 +31,11 @@ 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 1; }
+ get { return 2; }
}
private const string _SelectSlideNumFields = "SelectSlideNumFields";
+ private const string _SelectSlideRefillJokers = "SelectSlideRefillJokers";
private const string _ButtonNext = "ButtonNext";
private const string _ButtonBack = "ButtonBack";
@@ -128,11 +130,15 @@ namespace VocaluxeLib.PartyModes.TicTacToe
_SelectSlides[_SelectSlideNumFields].AddValue(25);
_SelectSlides[_SelectSlideNumFields].SelectedTag = _PartyMode.GameData.NumFields;
+
+ _SelectSlides[_SelectSlideRefillJokers].AddValues(Enum.GetNames(typeof(EOffOn)));
+ _SelectSlides[_SelectSlideRefillJokers].Selection = (int)_PartyMode.GameData.RefillJokers;
}
private void _UpdateSlides()
{
_PartyMode.GameData.NumFields = _SelectSlides[_SelectSlideNumFields].SelectedTag;
+ _PartyMode.GameData.RefillJokers = (EOffOn)_SelectSlides[_SelectSlideRefillJokers].Selection;
}
}
}
\ No newline at end of file