Added winner-detection.
This commit is contained in:
1 parent
08b592f730
commit
edeb2702f8
4 files changed
+108
-26
No files matched your search
@@ -30,6 +30,7 @@
|
|||||||
<TR_SCREENMAIN_TEAM_CHOOSE>Wählt ein Feld aus.</TR_SCREENMAIN_TEAM_CHOOSE>
|
<TR_SCREENMAIN_TEAM_CHOOSE>Wählt ein Feld aus.</TR_SCREENMAIN_TEAM_CHOOSE>
|
||||||
<TR_SCREENMAIN_NEXT_PLAYER>Nächster Spieler</TR_SCREENMAIN_NEXT_PLAYER>
|
<TR_SCREENMAIN_NEXT_PLAYER>Nächster Spieler</TR_SCREENMAIN_NEXT_PLAYER>
|
||||||
<TR_SCREENMAIN_POPUP_REALLYEXIT>Challenge-Mode wirklich beenden?</TR_SCREENMAIN_POPUP_REALLYEXIT>
|
<TR_SCREENMAIN_POPUP_REALLYEXIT>Challenge-Mode wirklich beenden?</TR_SCREENMAIN_POPUP_REALLYEXIT>
|
||||||
<TR_SCREENMAIN_FINISH>Alle Runden wurden gesungen! Und der Gewinner ist...</TR_SCREENMAIN_FINISH>
|
<TR_SCREENMAIN_WINNER>Und der Gewinner ist...</TR_SCREENMAIN_WINNER>
|
||||||
|
<TR_SCREENMAIN_NOWINNER>In dieser Runde gibt es keinen Gewinner...</TR_SCREENMAIN_NOWINNER>
|
||||||
</Texts>
|
</Texts>
|
||||||
</root>
|
</root>
|
||||||
@@ -251,6 +251,35 @@
|
|||||||
<!-- <Space>: Reflection Space-->
|
<!-- <Space>: Reflection Space-->
|
||||||
<!-- <Height>: Reflection Height-->
|
<!-- <Height>: Reflection Height-->
|
||||||
</TextTeamChoosing>
|
</TextTeamChoosing>
|
||||||
|
<TextFinishMessage>
|
||||||
|
<!--<X>, <Y>: Text position-->
|
||||||
|
<X>640</X>
|
||||||
|
<Y>90</Y>
|
||||||
|
<!--<Z>: Text position-->
|
||||||
|
<Z>0,00</Z>
|
||||||
|
<!--<H>: Text height-->
|
||||||
|
<H>40</H>
|
||||||
|
<!--<MaxW>: Maximum text width (if exists)-->
|
||||||
|
<!--<Color>: Text color from ColorScheme (high priority)-->
|
||||||
|
<!--or <R>, <G>, <B>, <A> (lower priority)-->
|
||||||
|
<Color>StaticColor</Color>
|
||||||
|
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
|
||||||
|
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
|
||||||
|
<SColor>TextSColor</SColor>
|
||||||
|
<!--<Align>: Text align horizontal: Left, Center, Right-->
|
||||||
|
<Align>Center</Align>
|
||||||
|
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
|
||||||
|
<HAlign>Center</HAlign>
|
||||||
|
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
|
||||||
|
<Style>Bold</Style>
|
||||||
|
<!--<Font>: Text font name-->
|
||||||
|
<Font>Outline</Font>
|
||||||
|
<!--<Text>: Nothing or translation tag-->
|
||||||
|
<Text />
|
||||||
|
<!--<Reflection> If exists:-->
|
||||||
|
<!-- <Space>: Reflection Space-->
|
||||||
|
<!-- <Height>: Reflection Height-->
|
||||||
|
</TextFinishMessage>
|
||||||
<TextPopupReallyExit>
|
<TextPopupReallyExit>
|
||||||
<!--<X>, <Y>: Text position-->
|
<!--<X>, <Y>: Text position-->
|
||||||
<X>640</X>
|
<X>640</X>
|
||||||
|
|||||||
@@ -325,7 +325,6 @@ namespace Vocaluxe.PartyModes
|
|||||||
ToScreenMain.NumJokerRandom = GameData.NumJokerRandom;
|
ToScreenMain.NumJokerRandom = GameData.NumJokerRandom;
|
||||||
ToScreenMain.NumJokerRetry = GameData.NumJokerRetry;
|
ToScreenMain.NumJokerRetry = GameData.NumJokerRetry;
|
||||||
ToScreenMain.Team = GameData.Team;
|
ToScreenMain.Team = GameData.Team;
|
||||||
UpdateScores();
|
|
||||||
Screen.DataToScreen(ToScreenMain);
|
Screen.DataToScreen(ToScreenMain);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -336,7 +335,6 @@ namespace Vocaluxe.PartyModes
|
|||||||
_Screens.TryGetValue("PartyScreenTicTacToeMain", out Screen);
|
_Screens.TryGetValue("PartyScreenTicTacToeMain", out Screen);
|
||||||
if (_Screens != null)
|
if (_Screens != null)
|
||||||
{
|
{
|
||||||
UpdateScores();
|
|
||||||
if (GameData.Team == 1)
|
if (GameData.Team == 1)
|
||||||
GameData.Team = 0;
|
GameData.Team = 0;
|
||||||
else
|
else
|
||||||
@@ -593,11 +591,12 @@ namespace Vocaluxe.PartyModes
|
|||||||
{
|
{
|
||||||
GameData.Rounds[GameData.SingRoundNr].Winner = 1;
|
GameData.Rounds[GameData.SingRoundNr].Winner = 1;
|
||||||
}
|
}
|
||||||
else
|
/**else
|
||||||
{
|
{
|
||||||
GameData.Rounds[GameData.SingRoundNr].Finished = false;
|
GameData.Rounds[GameData.SingRoundNr].Finished = false;
|
||||||
GameData.CurrentRoundNr--;
|
GameData.CurrentRoundNr--;
|
||||||
}
|
}**/
|
||||||
|
GameData.Rounds[GameData.SingRoundNr].Winner = 1;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ namespace Vocaluxe.PartyModes
|
|||||||
|
|
||||||
const string TextPopupReallyExit = "TextPopupReallyExit";
|
const string TextPopupReallyExit = "TextPopupReallyExit";
|
||||||
const string TextTeamChoosing = "TextTeamChoosing";
|
const string TextTeamChoosing = "TextTeamChoosing";
|
||||||
|
const string TextFinishMessage = "TextFinishMessage";
|
||||||
const string TextNextPlayerT1 = "TextNextPlayerT1";
|
const string TextNextPlayerT1 = "TextNextPlayerT1";
|
||||||
const string TextNextPlayerT2 = "TextNextPlayerT2";
|
const string TextNextPlayerT2 = "TextNextPlayerT2";
|
||||||
const string TextNextPlayerNameT1 = "TextNextPlayerNameT1";
|
const string TextNextPlayerNameT1 = "TextNextPlayerNameT1";
|
||||||
@@ -65,6 +66,7 @@ namespace Vocaluxe.PartyModes
|
|||||||
private int SelectedField = -1;
|
private int SelectedField = -1;
|
||||||
private int OldSelectedField = -1;
|
private int OldSelectedField = -1;
|
||||||
|
|
||||||
|
private int[,] Possibilities;
|
||||||
private EStatus Action;
|
private EStatus Action;
|
||||||
|
|
||||||
public PartyScreenTicTacToeMain()
|
public PartyScreenTicTacToeMain()
|
||||||
@@ -76,7 +78,7 @@ namespace Vocaluxe.PartyModes
|
|||||||
base.Init();
|
base.Init();
|
||||||
|
|
||||||
_ThemeName = "PartyScreenTicTacToeMain";
|
_ThemeName = "PartyScreenTicTacToeMain";
|
||||||
_ThemeTexts = new string[] { TextPopupReallyExit, TextTeamChoosing, TextNextPlayerT1, TextNextPlayerT2, TextNextPlayerNameT1, TextNextPlayerNameT2 };
|
_ThemeTexts = new string[] { TextPopupReallyExit, TextTeamChoosing, TextFinishMessage, TextNextPlayerT1, TextNextPlayerT2, TextNextPlayerNameT1, TextNextPlayerNameT2 };
|
||||||
_ThemeButtons = new string[] { ButtonNextRound, ButtonBack, ButtonExit, ButtonPopupYes, ButtonPopupNo, ButtonField, ButtonJokerRandomT1, ButtonJokerRandomT2, ButtonJokerRetryT1, ButtonJokerRetryT2 };
|
_ThemeButtons = new string[] { ButtonNextRound, ButtonBack, ButtonExit, ButtonPopupYes, ButtonPopupNo, ButtonField, ButtonJokerRandomT1, ButtonJokerRandomT2, ButtonJokerRetryT1, ButtonJokerRetryT2 };
|
||||||
_ThemeStatics = new string[] { StaticPopupBG, StaticAvatarT1, StaticAvatarT2 };
|
_ThemeStatics = new string[] { StaticPopupBG, StaticAvatarT1, StaticAvatarT2 };
|
||||||
_ScreenVersion = ScreenVersion;
|
_ScreenVersion = ScreenVersion;
|
||||||
@@ -247,6 +249,7 @@ namespace Vocaluxe.PartyModes
|
|||||||
|
|
||||||
if (GameData.CurrentRoundNr == 1)
|
if (GameData.CurrentRoundNr == 1)
|
||||||
{
|
{
|
||||||
|
BuildWinnerPossibilities();
|
||||||
SelectedField = -1;
|
SelectedField = -1;
|
||||||
Buttons[htButtons(ButtonBack)].Visible = true;
|
Buttons[htButtons(ButtonBack)].Visible = true;
|
||||||
Buttons[htButtons(ButtonExit)].Visible = false;
|
Buttons[htButtons(ButtonExit)].Visible = false;
|
||||||
@@ -256,8 +259,8 @@ namespace Vocaluxe.PartyModes
|
|||||||
Buttons[htButtons(ButtonBack)].Visible = false;
|
Buttons[htButtons(ButtonBack)].Visible = false;
|
||||||
Buttons[htButtons(ButtonExit)].Visible = true;
|
Buttons[htButtons(ButtonExit)].Visible = true;
|
||||||
}
|
}
|
||||||
|
int Winner = GetWinner();
|
||||||
if (GameData.CurrentRoundNr <= GameData.NumFields)
|
if (GameData.CurrentRoundNr <= GameData.NumFields && Winner == 0)
|
||||||
{
|
{
|
||||||
Action = EStatus.FieldChoosing;
|
Action = EStatus.FieldChoosing;
|
||||||
UpdateTeamChoosingMessage();
|
UpdateTeamChoosingMessage();
|
||||||
@@ -272,17 +275,24 @@ namespace Vocaluxe.PartyModes
|
|||||||
Buttons[htButtons(ButtonJokerRetryT1)].Visible = false;
|
Buttons[htButtons(ButtonJokerRetryT1)].Visible = false;
|
||||||
Buttons[htButtons(ButtonJokerRetryT2)].Visible = false;
|
Buttons[htButtons(ButtonJokerRetryT2)].Visible = false;
|
||||||
Buttons[htButtons(ButtonNextRound)].Visible = false;
|
Buttons[htButtons(ButtonNextRound)].Visible = false;
|
||||||
//Texts[htTexts(TextFinishMessage)].Visible = false;
|
Texts[htTexts(TextFinishMessage)].Visible = false;
|
||||||
//Texts[htTexts(TextFinishPlayerWin)].Visible = false;
|
|
||||||
SetInteractionToButton(Buttons[htButtons(ButtonNextRound)]);
|
SetInteractionToButton(Buttons[htButtons(ButtonNextRound)]);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Action = EStatus.None;
|
Action = EStatus.None;
|
||||||
Buttons[htButtons(ButtonNextRound)].Visible = false;
|
Buttons[htButtons(ButtonNextRound)].Visible = false;
|
||||||
//Texts[htTexts(TextFinishMessage)].Visible = true;
|
Texts[htTexts(TextFinishMessage)].Visible = true;
|
||||||
//Texts[htTexts(TextFinishPlayerWin)].Visible = true;
|
if (Winner > 0)
|
||||||
//Texts[htTexts(TextFinishPlayerWin)].Text = GetPlayerWinString();
|
{
|
||||||
|
Texts[htTexts(TextFinishMessage)].Color = _Base.Theme.GetPlayerColor(Winner);
|
||||||
|
Texts[htTexts(TextFinishMessage)].Text = _Base.Language.Translate("TR_SCREENMAIN_WINNER", _PartyModeID) + " " + _Base.Language.Translate("TR_TEAM", _PartyModeID) + " " + Winner;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Texts[htTexts(TextFinishMessage)].Color = new SColorF(1, 1, 1, 1);
|
||||||
|
Texts[htTexts(TextFinishMessage)].Text = _Base.Language.Translate("TR_SCREENMAIN_NOWINNER", _PartyModeID);
|
||||||
|
}
|
||||||
SetInteractionToButton(Buttons[htButtons(ButtonExit)]);
|
SetInteractionToButton(Buttons[htButtons(ButtonExit)]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -521,6 +531,8 @@ namespace Vocaluxe.PartyModes
|
|||||||
Texts[htTexts(TextTeamChoosing)].Text = _Base.Language.Translate("TR_TEAM", _PartyModeID) + " " + (GameData.Team + 1) + "! " + _Base.Language.Translate("TR_SCREENMAIN_TEAM_CHOOSE", _PartyModeID);
|
Texts[htTexts(TextTeamChoosing)].Text = _Base.Language.Translate("TR_TEAM", _PartyModeID) + " " + (GameData.Team + 1) + "! " + _Base.Language.Translate("TR_SCREENMAIN_TEAM_CHOOSE", _PartyModeID);
|
||||||
if (Action == EStatus.JokerRetry || Action == EStatus.FieldChoosing)
|
if (Action == EStatus.JokerRetry || Action == EStatus.FieldChoosing)
|
||||||
Texts[htTexts(TextTeamChoosing)].Visible = true;
|
Texts[htTexts(TextTeamChoosing)].Visible = true;
|
||||||
|
else
|
||||||
|
Texts[htTexts(TextTeamChoosing)].Visible = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void UpdateJokerButtons()
|
private void UpdateJokerButtons()
|
||||||
@@ -574,22 +586,63 @@ namespace Vocaluxe.PartyModes
|
|||||||
_PartyMode.DataFromScreen(_ThemeName, Data);
|
_PartyMode.DataFromScreen(_ThemeName, Data);
|
||||||
}
|
}
|
||||||
|
|
||||||
private string GetPlayerWinString()
|
private int BuildWinnerPossibilities()
|
||||||
{
|
{
|
||||||
string s = "";
|
int NumOneRow = (int)Math.Sqrt((double)GameData.NumFields);
|
||||||
SProfile[] profiles = _Base.Profiles.GetProfiles();
|
Possibilities = new int[(NumOneRow * 2) + 2, NumOneRow];
|
||||||
/**
|
for (int i = 0; i < Possibilities.GetLength(0); i++)
|
||||||
for (int i = 0; i < GameState.ResultTable.Count; i++)
|
|
||||||
{
|
{
|
||||||
if (i > 0)
|
if (i < NumOneRow)
|
||||||
s += ", ";
|
{
|
||||||
if (GameState.ResultTable[i].Position == 1)
|
for(int c = 0; c < NumOneRow; c++){
|
||||||
s += profiles[GameState.ResultTable[i].PlayerID].PlayerName;
|
Possibilities[i, c] = i * NumOneRow + c;
|
||||||
else
|
}
|
||||||
break;
|
}
|
||||||
|
else if (i < NumOneRow * 2)
|
||||||
|
{
|
||||||
|
for (int c = 0; c < NumOneRow; c++)
|
||||||
|
{
|
||||||
|
Possibilities[i, c] = (i-NumOneRow) + (c*NumOneRow);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if( i == Possibilities.GetLength(0) - 2)
|
||||||
|
{
|
||||||
|
for (int c = 0; c < NumOneRow;c++)
|
||||||
|
{
|
||||||
|
Possibilities[i, c] = (NumOneRow + 1) * c;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (i == Possibilities.GetLength(0) - 1)
|
||||||
|
{
|
||||||
|
for (int c = 0; c < NumOneRow; c++)
|
||||||
|
{
|
||||||
|
Possibilities[i, c] = (NumOneRow + 1) * c + (NumOneRow - 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
**/
|
return 0;
|
||||||
return s;
|
}
|
||||||
|
|
||||||
|
private int GetWinner()
|
||||||
|
{
|
||||||
|
for (int i = 0; i < Possibilities.GetLength(0); i++)
|
||||||
|
{
|
||||||
|
List<int> Check = new List<int>();
|
||||||
|
for (int j = 0; j < Possibilities.GetLength(1); j++)
|
||||||
|
{
|
||||||
|
if (Fields[Possibilities[i, j]].Content.Winner > 0)
|
||||||
|
Check.Add(Fields[Possibilities[i, j]].Content.Winner);
|
||||||
|
}
|
||||||
|
if (Check.Count == Possibilities.GetLength(1))
|
||||||
|
{
|
||||||
|
//Check for winner
|
||||||
|
if (Check.Contains(1) && !Check.Contains(2))
|
||||||
|
return 1;
|
||||||
|
else if (Check.Contains(2) && !Check.Contains(1))
|
||||||
|
return 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user