Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PartyMode Challenge: Made the amount of jokers configurable

Browse Source
This commit is contained in:
Syrome committed 2015-08-13 10:48:26 +02:00
1 parent d96759555a
commit 970610327c
5 files changed
+77 -33
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/PartyModes/Challenge.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<Folder>Challenge</Folder>
<PartyModeFile>CPartyModeChallenge</PartyModeFile>
<PartyModeVersionMajor>0</PartyModeVersionMajor>
<PartyModeVersionMinor>1</PartyModeVersionMinor>
<PartyModeVersionMinor>2</PartyModeVersionMinor>
<TargetAudience>TR_PARTYMODE_AUDIENCE</TargetAudience>
</Info>
<PartyScreens>
Output/PartyModes/Challenge/Languages/English.xml
+1
View File
@@ -15,6 +15,7 @@
<string name="TR_SCREENCONFIG_NUMPLAYERS">Number of players</string>
<string name="TR_SCREENCONFIG_NUMMICS">Number of mics</string>
<string name="TR_SCREENCONFIG_NUMROUNDS">Number of rounds</string>
<string name="TR_SCREENCONFIG_NUMJOKERS">Number of jokers</string>
<string name="TR_SCREENNAMES_TITLE">Challenge Mode: Choose Player</string>
<string name="TR_SCREENNAMES_BUTTON_RANDOM">Select random</string>
<string name="TR_SCREENMAIN_TITLE">Challenge Mode: Overview</string>
Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeConfig.xml
+57 -1
View File
@@ -2,7 +2,7 @@
<Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Informations>
<ScreenName>PartyScreenChallengeConfig</ScreenName>
<ScreenVersion>1</ScreenVersion>
<ScreenVersion>2</ScreenVersion>
</Informations>
<Backgrounds>
<Background Name="Background1">
@@ -82,6 +82,20 @@
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_SCREENCONFIG_NUMROUNDS</Text>
</Text>
<Text Name="Text5">
<X>75</X>
<Y>285</Y>
<Z>0</Z>
<H>27</H>
<MaxW>0</MaxW>
<Color Name="StaticColor" />
<SelColor Name="TextSelColor" />
<Align>Left</Align>
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_SCREENCONFIG_NUMJOKERS</Text>
</Text>
</Texts>
<Buttons>
@@ -284,6 +298,48 @@
<TextFont>Outline</TextFont>
<TextStyle>Bold</TextStyle>
<NumVisible>10</NumVisible>
</SelectSlide>
<SelectSlide Name="SelectSlideNumJokers">
<Skin/>
<SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
<SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<Rect>
<X>500</X>
<Y>280</Y>
<W>700</W>
<H>50</H>
<Z>0</Z>
</Rect>
<RectArrowLeft>
<X>505</X>
<Y>285</Y>
<W>40</W>
<H>40</H>
<Z>0</Z>
</RectArrowLeft>
<RectArrowRight>
<X>1170</X>
<Y>285</Y>
<W>40</W>
<H>40</H>
<Z>0</Z>
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SelColor Name="SelectSlideSelColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSelColor Name="ArrowSelColor" />
<TextColor Name="TextColor" />
<TextSelColor Name="TextSelColor" />
<TextH>27</TextH>
<TextRelativeX>50</TextRelativeX>
<TextRelativeY>0</TextRelativeY>
<TextMaxW>205.33</TextMaxW>
<TextFont>Outline</TextFont>
<TextStyle>Bold</TextStyle>
<NumVisible>10</NumVisible>
</SelectSlide>
</SelectSlides>
<SingNotes />
PartyModes/PartyModeChallenge/CPartyModeChallenge.cs
+6 -29
View File
@@ -113,6 +113,7 @@ namespace VocaluxeLib.PartyModes.Challenge
public int NumPlayer;
public int NumPlayerAtOnce;
public int NumRounds;
public int NumJokers;
public List<int> ProfileIDs;
public CChallengeRounds Rounds;
@@ -147,7 +148,7 @@ namespace VocaluxeLib.PartyModes.Challenge
_ScreenSongOptions.Sorting.SearchActive = false;
_ScreenSongOptions.Sorting.DuetOptions = EDuetOptions.NoDuets;
GameData = new SData {NumPlayer = 4, NumPlayerAtOnce = 2, NumRounds = 12, CurrentRoundNr = 1, ProfileIDs = new List<int>(), CatSongIndices = null, Results = null};
GameData = new SData {NumPlayer = 4, NumPlayerAtOnce = 2, NumRounds = 12, NumJokers = 5, CurrentRoundNr = 1, ProfileIDs = new List<int>(), CatSongIndices = null, Results = null};
}
public override bool Init()
@@ -373,35 +374,11 @@ namespace VocaluxeLib.PartyModes.Challenge
private void _SetNumJokers()
{
switch (GameData.NumPlayerAtOnce)
{
case 1:
_ScreenSongOptions.Selection.NumJokers = new int[] {10};
break;
int[] jokers = new int[GameData.NumPlayerAtOnce];
for (int i = 0; i < jokers.Length; i++)
jokers[i] = GameData.NumJokers;
case 2:
_ScreenSongOptions.Selection.NumJokers = new int[] {5, 5};
break;
case 3:
_ScreenSongOptions.Selection.NumJokers = new int[] {4, 4, 4};
break;
case 4:
_ScreenSongOptions.Selection.NumJokers = new int[] {3, 3, 3, 3};
break;
case 5:
_ScreenSongOptions.Selection.NumJokers = new int[] {2, 2, 2, 2, 2};
break;
case 6:
_ScreenSongOptions.Selection.NumJokers = new int[] {2, 2, 2, 2, 2, 2};
break;
default:
_ScreenSongOptions.Selection.NumJokers = new int[] {5, 5};
break;
}
_ScreenSongOptions.Selection.NumJokers = jokers;
}
private void _SetTeamNames()
PartyModes/PartyModeChallenge/CPartyScreenChallengeConfig.cs
+12 -2
View File
@@ -27,12 +27,13 @@ namespace VocaluxeLib.PartyModes.Challenge
// 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 _SelectSlideNumPlayers = "SelectSlideNumPlayers";
private const string _SelectSlideNumMics = "SelectSlideNumMics";
private const string _SelectSlideNumRounds = "SelectSlideNumRounds";
private const string _SelectSlideNumJokers = "SelectSlideNumJokers";
private const string _ButtonNext = "ButtonNext";
private const string _ButtonBack = "ButtonBack";
@@ -43,7 +44,7 @@ namespace VocaluxeLib.PartyModes.Challenge
{
base.Init();
_ThemeSelectSlides = new string[] {_SelectSlideNumPlayers, _SelectSlideNumMics, _SelectSlideNumRounds};
_ThemeSelectSlides = new string[] {_SelectSlideNumPlayers, _SelectSlideNumMics, _SelectSlideNumRounds, _SelectSlideNumJokers};
_ThemeButtons = new string[] {_ButtonNext, _ButtonBack};
}
@@ -123,6 +124,14 @@ namespace VocaluxeLib.PartyModes.Challenge
_SelectSlides[_SelectSlideNumPlayers].AddValue(i.ToString());
_SelectSlides[_SelectSlideNumPlayers].SelectedValue = _PartyMode.GameData.NumPlayer.ToString();
// build num joker slide 1 to 10
_SelectSlides[_SelectSlideNumJokers].Clear();
for (int i = 1; i <= 10; i++)
{
_SelectSlides[_SelectSlideNumJokers].AddValue(i.ToString());
}
_SelectSlides[_SelectSlideNumJokers].SelectedValue = "5";
_UpdateMicsAtOnce();
_SetRoundSteps();
_UpdateSlideRounds();
@@ -135,6 +144,7 @@ namespace VocaluxeLib.PartyModes.Challenge
_PartyMode.GameData.NumPlayer = _SelectSlides[_SelectSlideNumPlayers].Selection + _PartyMode.MinPlayers;
_PartyMode.GameData.NumPlayerAtOnce = _SelectSlides[_SelectSlideNumMics].Selection + _PartyMode.MinPlayers;
_PartyMode.GameData.NumRounds = (_SelectSlides[_SelectSlideNumRounds].Selection + 1) * _RoundSteps;
_PartyMode.GameData.NumJokers = _SelectSlides[_SelectSlideNumJokers].Selection + 1;
_UpdateMicsAtOnce();
_SetRoundSteps();