diff --git a/Output/PartyModes/Challenge/Languages/Deutsch.xml b/Output/PartyModes/Challenge/Languages/Deutsch.xml
index 74d61366..e9fffed4 100644
--- a/Output/PartyModes/Challenge/Languages/Deutsch.xml
+++ b/Output/PartyModes/Challenge/Languages/Deutsch.xml
@@ -23,9 +23,8 @@
Challenge Modus: Übersicht
Pos
Name
- S
- U
- N
+ Runden
+ Siege
Sing-Punkte
Punkte
diff --git a/Output/PartyModes/Challenge/Languages/English.xml b/Output/PartyModes/Challenge/Languages/English.xml
index 403f4843..9663e2f6 100644
--- a/Output/PartyModes/Challenge/Languages/English.xml
+++ b/Output/PartyModes/Challenge/Languages/English.xml
@@ -23,9 +23,8 @@
Challenge Mode: Overview
Pos
Name
- W
- D
- L
+ Rounds
+ Wins
Sing Points
Score
diff --git a/Output/PartyModes/Challenge/Languages/French.xml b/Output/PartyModes/Challenge/Languages/French.xml
index af8f9136..f6474148 100644
--- a/Output/PartyModes/Challenge/Languages/French.xml
+++ b/Output/PartyModes/Challenge/Languages/French.xml
@@ -23,9 +23,8 @@
TODO: Challenge Mode: Overview
TODO: Pos
TODO: Name
- TODO: W
- TODO: D
- TODO: L
+ TODO: Rounds
+ TODO: Wins
TODO: Sing Points
TODO: Score
diff --git a/Output/PartyModes/Challenge/Languages/Spanish.xml b/Output/PartyModes/Challenge/Languages/Spanish.xml
index f16f9a61..1632f219 100644
--- a/Output/PartyModes/Challenge/Languages/Spanish.xml
+++ b/Output/PartyModes/Challenge/Languages/Spanish.xml
@@ -22,9 +22,8 @@
TODO: Challenge Mode: Overview
TODO: Name
- TODO: W
- TODO: D
- TODO: L
+ TODO: Rounds
+ TODO: Wins
TODO: Sing Points
TODO: Score
diff --git a/Output/PartyModes/Challenge/Screens/PartyScreenChallengeMain.xml b/Output/PartyModes/Challenge/Screens/PartyScreenChallengeMain.xml
index eccf108c..e5a8577f 100644
--- a/Output/PartyModes/Challenge/Screens/PartyScreenChallengeMain.xml
+++ b/Output/PartyModes/Challenge/Screens/PartyScreenChallengeMain.xml
@@ -116,7 +116,7 @@
-
+
400
100
@@ -140,69 +140,40 @@
Outline
+ TR_SCREENMAIN_TABLE_NUMPLAYED
+
+
+
+
+
+
+ 500
+ 100
+
+ 0,00
+
+ 37
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Right
+
+ Center
+
+
+
+ Outline
+
TR_SCREENMAIN_TABLE_WON
-
-
- 475
- 100
-
- 0,00
-
- 37
-
-
-
- StaticColor
-
-
- TextSColor
-
- Right
-
- Center
-
-
-
- Outline
-
- TR_SCREENMAIN_TABLE_DRAWN
-
-
-
-
-
-
- 550
- 100
-
- 0,00
-
- 37
-
-
-
- StaticColor
-
-
- TextSColor
-
- Right
-
- Center
-
-
-
- Outline
-
- TR_SCREENMAIN_TABLE_LOST
-
-
-
-
750
diff --git a/PartyModeChallenge/PartyModeChallenge.cs b/PartyModeChallenge/PartyModeChallenge.cs
index bda02000..c9082582 100644
--- a/PartyModeChallenge/PartyModeChallenge.cs
+++ b/PartyModeChallenge/PartyModeChallenge.cs
@@ -33,9 +33,8 @@ namespace Vocaluxe.PartyModes
{
public int PlayerID;
public int NumPlayed;
+ public int NumRounds;
public int NumWon;
- public int NumDrawn;
- public int NumLost;
public int SumSingPoints;
public int NumGamePoints;
@@ -128,8 +127,6 @@ namespace Vocaluxe.PartyModes
public int SingPoints;
public int GamePoints;
public int Won;
- public int Drawn;
- public int Lost;
}
private DataToScreenConfig ToScreenConfig;
@@ -514,9 +511,8 @@ namespace Vocaluxe.PartyModes
ResultTableRow row = new ResultTableRow();
row.PlayerID = GameData.ProfileIDs[i];
row.NumPlayed = 0;
+ row.NumRounds = 0;
row.NumWon = 0;
- row.NumDrawn = 0;
- row.NumLost = 0;
row.SumSingPoints = 0;
row.NumGamePoints = 0;
GameData.ResultTable.Add(row);
@@ -551,8 +547,7 @@ namespace Vocaluxe.PartyModes
row.NumPlayed++;
row.NumWon += points[i].Won;
- row.NumDrawn += points[i].Drawn;
- row.NumLost += points[i].Lost;
+ row.NumRounds += 1;
row.SumSingPoints += points[i].SingPoints;
row.NumGamePoints += points[i].GamePoints;
@@ -573,8 +568,6 @@ namespace Vocaluxe.PartyModes
stat.ProfileID = Results[i].ProfileID;
stat.SingPoints = (int)Results[i].Points;
stat.Won = 0;
- stat.Drawn = 0;
- stat.Lost = 0;
stat.GamePoints = 0;
result.Add(stat);
}
@@ -583,6 +576,7 @@ namespace Vocaluxe.PartyModes
int current = result[result.Count - 1].SingPoints;
int points = result.Count;
+ bool wonset = false;
for (int i = result.Count - 1; i >= 0; i--)
{
@@ -593,19 +587,29 @@ namespace Vocaluxe.PartyModes
if (current > res.SingPoints)
{
res.GamePoints = i * 2;
+ wonset = true;
+ points = res.GamePoints;
}
else
+ {
+ if (!wonset)
+ res.Won = 1;
res.GamePoints = points;
+ }
}
else
+ {
res.GamePoints = i * 2;
+ res.Won = 1;
+ }
current = res.SingPoints;
- points = res.GamePoints;
result[i] = res;
}
+
+
return result;
}
}
diff --git a/PartyModeChallenge/PartyScreenChallengeMain.cs b/PartyModeChallenge/PartyScreenChallengeMain.cs
index 282b0b20..34d361eb 100644
--- a/PartyModeChallenge/PartyScreenChallengeMain.cs
+++ b/PartyModeChallenge/PartyScreenChallengeMain.cs
@@ -11,9 +11,8 @@ namespace Vocaluxe.PartyModes
{
public CText Pos;
public CText Name;
+ public CText Rounds;
public CText Won;
- public CText Drawn;
- public CText Lost;
public CText SingPoints;
public CText GamePoints;
}
@@ -26,9 +25,8 @@ namespace Vocaluxe.PartyModes
const string TextPosition = "TextPosition";
const string TextPlayerName = "TextPlayerName";
+ const string TextNumPlayed = "TextNumPlayed";
const string TextWon = "TextWon";
- const string TextDrawn = "TextDrawn";
- const string TextLost = "TextLost";
const string TextSingPoints = "TextSingPoints";
const string TextGamePoints = "TextGamePoints";
@@ -50,7 +48,7 @@ namespace Vocaluxe.PartyModes
base.Init();
_ThemeName = "PartyScreenChallengeMain";
- _ThemeTexts = new string[] { TextPosition, TextPlayerName, TextWon, TextDrawn, TextLost, TextSingPoints, TextGamePoints };
+ _ThemeTexts = new string[] { TextPosition, TextPlayerName, TextNumPlayed, TextWon, TextSingPoints, TextGamePoints };
_ThemeButtons = new string[] { "ButtonNextRound" };
_ScreenVersion = ScreenVersion;
}
@@ -168,17 +166,15 @@ namespace Vocaluxe.PartyModes
row.Pos = GetNewText(Texts[htTexts(TextPosition)]);
row.Name = GetNewText(Texts[htTexts(TextPlayerName)]);
+ row.Rounds = GetNewText(Texts[htTexts(TextNumPlayed)]);
row.Won = GetNewText(Texts[htTexts(TextWon)]);
- row.Drawn = GetNewText(Texts[htTexts(TextDrawn)]);
- row.Lost = GetNewText(Texts[htTexts(TextLost)]);
row.SingPoints = GetNewText(Texts[htTexts(TextSingPoints)]);
row.GamePoints = GetNewText(Texts[htTexts(TextGamePoints)]);
row.Pos.Y += delta * (i + 1);
row.Name.Y += delta * (i + 1);
+ row.Rounds.Y += delta * (i + 1);
row.Won.Y += delta * (i + 1);
- row.Drawn.Y += delta * (i + 1);
- row.Lost.Y += delta * (i + 1);
row.SingPoints.Y += delta * (i + 1);
row.GamePoints.Y += delta * (i + 1);
@@ -186,17 +182,15 @@ namespace Vocaluxe.PartyModes
row.Pos.Visible = false;
row.Name.Visible = false;
+ row.Rounds.Visible = false;
row.Won.Visible = false;
- row.Drawn.Visible = false;
- row.Lost.Visible = false;
row.SingPoints.Visible = false;
row.GamePoints.Visible = false;
AddText(row.Pos);
AddText(row.Name);
+ AddText(row.Rounds);
AddText(row.Won);
- AddText(row.Drawn);
- AddText(row.Lost);
AddText(row.SingPoints);
AddText(row.GamePoints);
@@ -216,16 +210,14 @@ namespace Vocaluxe.PartyModes
row.Pos.Visible = true;
row.Name.Visible = true;
+ row.Rounds.Visible = true;
row.Won.Visible = true;
- row.Drawn.Visible = true;
- row.Lost.Visible = true;
row.SingPoints.Visible = true;
row.GamePoints.Visible = true;
row.Name.Text = profiles[GameState.ResultTable[i].PlayerID].PlayerName;
+ row.Rounds.Text = GameState.ResultTable[i].NumRounds.ToString();
row.Won.Text = GameState.ResultTable[i].NumWon.ToString();
- row.Drawn.Text = GameState.ResultTable[i].NumDrawn.ToString();
- row.Lost.Text = GameState.ResultTable[i].NumLost.ToString();
row.SingPoints.Text = GameState.ResultTable[i].SumSingPoints.ToString();
row.GamePoints.Text = GameState.ResultTable[i].NumGamePoints.ToString();
}