diff options
author | whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-12-14 20:48:15 +0000 |
---|---|---|
committer | whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-12-14 20:48:15 +0000 |
commit | b167741b7a0d4f36712ec5345be5d6aa65022c46 (patch) | |
tree | 5161d24c86ab6cafbf00c98bb3d553a0bb9dbbed | |
parent | 11facb268ba723b56279638a64c1c4327d9293bb (diff) | |
download | usdx-b167741b7a0d4f36712ec5345be5d6aa65022c46.tar.gz usdx-b167741b7a0d4f36712ec5345be5d6aa65022c46.tar.xz usdx-b167741b7a0d4f36712ec5345be5d6aa65022c46.zip |
Theme for
- ScreenPartyPlayer
- ScreenPartyOptions
some fixes in UPartyPlayer
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2035 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r-- | Lua/game/themes/Deluxe.ini | 200 | ||||
-rw-r--r-- | Lua/game/themes/Deluxe/Blue.ini | 1 | ||||
-rw-r--r-- | Lua/game/themes/Deluxe/Fall.ini | 1 | ||||
-rw-r--r-- | Lua/game/themes/Deluxe/Ocean.ini | 1 | ||||
-rw-r--r-- | Lua/game/themes/Deluxe/Ribbon.ini | 2 | ||||
-rw-r--r-- | Lua/game/themes/Deluxe/Summer.ini | 1 | ||||
-rw-r--r-- | Lua/game/themes/Deluxe/Winter.ini | 1 | ||||
-rw-r--r-- | Lua/game/themes/Deluxe/[party]playerselectbg.png | bin | 0 -> 2910 bytes | |||
-rw-r--r-- | Lua/src/screens/UScreenPartyPlayer.pas | 13 |
9 files changed, 125 insertions, 95 deletions
diff --git a/Lua/game/themes/Deluxe.ini b/Lua/game/themes/Deluxe.ini index 6973ce16..8e1f097c 100644 --- a/Lua/game/themes/Deluxe.ini +++ b/Lua/game/themes/Deluxe.ini @@ -2526,7 +2526,7 @@ Color = White Font = 0 Size = 30 Align = 0 -Text = +Text = [OptionsStatic2] X = 0 @@ -4203,7 +4203,7 @@ Text = SING_LEGEND_ESC #DColor = ColorLight #TColor = White #TDColor = White - + #SBGColor = DarkBlue #SBGDColor = LightBlue #STColor = White @@ -6688,41 +6688,46 @@ Text = SING_LEGEND_CONTINUE Tex = MainBar TexSBG = SelectBG Text = PARTY_DIFFICULTY -X = 40 +X = 70 Y = 85 W = 230 -H = 70 -SkipX = 50 +H = 40 +SkipX = 10 Fields = 1 Color = ColorDark -DColor = Gray +DColor = ColorLight TColor = White TDColor = White -SBGTex = MainBar -SBGColor = ColorDark -SBGDColor = Gray + +SBGColor = DarkBlue +SBGDColor = LightBlue STColor = White STDColor = GrayDark +#TexSBG = SelectBG +#W = 230 +#H = 40 +#SkipX = 10 + [PartyOptionsSelectPlayList] Tex = MainBar TexSBG = SelectBG Text = PARTY_PLAYLIST -X = 40 +X = 70 Y = 140 W = 230 -H = 70 -SkipX = 50 +H = 40 +SkipX = 10 Fields = 1 Color = ColorDark -DColor = Gray +DColor = ColorLight TColor = White TDColor = White -SBGTex = MainBar -SBGColor = ColorDark -SBGDColor = Gray + +SBGColor = DarkBlue +SBGDColor = LightBlue STColor = White STDColor = GrayDark @@ -6730,20 +6735,20 @@ STDColor = GrayDark Tex = MainBar TexSBG = SelectBG Text = PARTY_PLAYLIST -X = 40 +X = 70 Y = 195 W = 230 -H = 70 -SkipX = 50 +H = 40 +SkipX = 10 Fields = 1 Color = ColorDark -DColor = Gray +DColor = ColorLight TColor = White TDColor = White -SBGTex = MainBar -SBGColor = ColorDark -SBGDColor = Gray + +SBGColor = DarkBlue +SBGDColor = LightBlue STColor = White STDColor = GrayDark @@ -6751,20 +6756,20 @@ STDColor = GrayDark Tex = MainBar TexSBG = SelectBG Text = PARTY_ROUNDS -X = 40 +X = 70 Y = 250 W = 230 -H = 70 -SkipX = 50 +H = 40 +SkipX = 10 Fields = 7 Color = ColorDark -DColor = Gray +DColor = ColorLight TColor = White TDColor = White -SBGTex = MainBar -SBGColor = ColorDark -SBGDColor = Gray + +SBGColor = DarkBlue +SBGDColor = LightBlue STColor = White STDColor = GrayDark @@ -6779,6 +6784,7 @@ Tex = PartyBG [PartyPlayerStatic1] X = 0 Y = 545 +Z = 0.7 W = 250 H = 30 Tex = Leiste1 @@ -6790,6 +6796,7 @@ ReflectionSpacing = 2 [PartyPlayerStatic2] X = 250 Y = 545 +Z = 0.7 W = 550 H = 30 Tex = Leiste2 @@ -6894,83 +6901,86 @@ Text = PARTY_PLAYER_LEGEND_CONTINUE Tex = MainBar TexSBG = SelectBG Text = PARTY_TEAMS -X = 40 -Y = 305 -W = 230 -H = 70 -SkipX = 50 -Fields = 7 +X = 85 +Y = 90 +W = 220 +H = 40 +SkipX = 10 +Fields = 2 Color = ColorDark -DColor = Gray +DColor = ColorLight TColor = White TDColor = White -SBGTex = MainBar -SBGColor = ColorDark -SBGDColor = Gray + +SBGColor = DarkBlue +SBGDColor = LightBlue STColor = White STDColor = GrayDark [PartyPlayerSelectPlayers1] Tex = MainBar -TexSBG = SelectBG +TexSBG = PartyPlayerSelectBG Text = PARTY_TEAMS_PLAYER1 -X = 40 -Y = 360 -W = 230 -H = 70 -SkipX = 50 -Fields = 7 +X = 405 +Y = 145 +W = 200 +SBGW = 100 +H = 40 +SkipX = 10 +Fields = 1 -Color = ColorDark -DColor = Gray +Color = P1Lightest +DColor = P1Light TColor = White TDColor = White -SBGTex = MainBar -SBGColor = ColorDark -SBGDColor = Gray + +SBGColor = P1Lightest +SBGDColor = P1Light STColor = White STDColor = GrayDark [PartyPlayerSelectPlayers2] Tex = MainBar -TexSBG = SelectBG +TexSBG = PartyPlayerSelectBG Text = PARTY_TEAMS_PLAYER2 -X = 40 -Y = 415 -W = 230 -H = 70 -SkipX = 50 -Fields = 7 +X = 405 +Y = 285 +W = 200 +SBGW = 100 +H = 40 +SkipX = 10 +Fields = 1 -Color = ColorDark -DColor = Gray +Color = P2Lightest +DColor = P2Light TColor = White TDColor = White -SBGTex = MainBar -SBGColor = ColorDark -SBGDColor = Gray + +SBGColor = P2Lightest +SBGDColor = P2Light STColor = White STDColor = GrayDark [PartyPlayerSelectPlayers3] Tex = MainBar -TexSBG = SelectBG +TexSBG = PartyPlayerSelectBG Text = PARTY_TEAMS_PLAYER3 -X = 40 -Y = 470 -W = 230 -H = 70 -SkipX = 50 -Fields = 7 +X = 405 +Y = 425 +W = 200 +SBGW = 100 +H = 40 +SkipX = 10 +Fields = 4 -Color = ColorDark -DColor = Gray +Color = P3Lightest +DColor = P3Light TColor = White TDColor = White -SBGTex = MainBar -SBGColor = ColorDark -SBGDColor = Gray + +SBGColor = P3Lightest +SBGDColor = P3Light STColor = White STDColor = GrayDark @@ -6978,7 +6988,7 @@ STDColor = GrayDark [PartyPlayerTeam1Name] Tex = PartyTeamButton2 X = 85 -Y = 100 +Y = 140 W = 310 H = 50 Type = Colorized @@ -6998,7 +7008,7 @@ Color = White [PartyPlayerPlayer1Name] Tex = Button X = 85 -Y = 160 +Y = 200 W = 150 H = 50 Type = Transparent @@ -7020,7 +7030,7 @@ Color = White [PartyPlayerPlayer2Name] Tex = Button X = 245 -Y = 160 +Y = 200 W = 150 H = 50 Type = Transparent @@ -7042,7 +7052,7 @@ Color = White [PartyPlayerPlayer3Name] Tex = Button X = 405 -Y = 160 +Y = 200 W = 150 H = 50 Type = Transparent @@ -7064,7 +7074,7 @@ Color = White [PartyPlayerPlayer4Name] Tex = Button X = 565 -Y = 160 +Y = 200 W = 150 H = 50 Type = Transparent @@ -7086,7 +7096,7 @@ Color = White [PartyPlayerTeam2Name] Tex = PartyTeamButton2 X = 85 -Y = 240 +Y = 280 W = 310 H = 50 Type = Colorized @@ -7106,7 +7116,7 @@ Color = White [PartyPlayerPlayer5Name] Tex = Button X = 85 -Y = 300 +Y = 340 W = 150 H = 50 Type = Transparent @@ -7128,7 +7138,7 @@ Color = White [PartyPlayerPlayer6Name] Tex = Button X = 245 -Y = 300 +Y = 340 W = 150 H = 50 Type = Transparent @@ -7150,7 +7160,7 @@ Color = White [PartyPlayerPlayer7Name] Tex = Button X = 405 -Y = 300 +Y = 340 W = 150 H = 50 Type = Transparent @@ -7172,7 +7182,7 @@ Color = White [PartyPlayerPlayer8Name] Tex = Button X = 565 -Y = 300 +Y = 340 W = 150 H = 50 Type = Transparent @@ -7194,10 +7204,10 @@ Color = White [PartyPlayerTeam3Name] Tex = PartyTeamButton2 X = 85 -Y = 380 +Y = 420 W = 310 H = 50 -Type = Transparent +Type = Colorized Texts = 1 Color = P3Lightest DColor = P3Dark @@ -7214,7 +7224,8 @@ Color = White [PartyPlayerPlayer9Name] Tex = Button X = 85 -Y = 440 +Y = 480 +Z = 0.6 W = 150 H = 50 Type = Transparent @@ -7236,7 +7247,8 @@ Color = White [PartyPlayerPlayer10Name] Tex = Button X = 245 -Y = 440 +Y = 480 +Z = 0.6 W = 150 H = 50 Type = Transparent @@ -7258,7 +7270,8 @@ Color = White [PartyPlayerPlayer11Name] Tex = Button X = 405 -Y = 440 +Y = 480 +Z = 0.6 W = 150 H = 50 Type = Transparent @@ -7280,7 +7293,8 @@ Color = White [PartyPlayerPlayer12Name] Tex = Button X = 565 -Y = 440 +Y = 480 +Z = 0.6 W = 150 H = 50 Type = Transparent @@ -7426,7 +7440,7 @@ Z = 0.97 # TODO: why is this here? #[SongMenuSelectSlide1] #Tex = Rectangle -#TexSBG = Top5BG +#TexSBG = Top5BG #Text =lalalalalalalala #Type #X = 524 diff --git a/Lua/game/themes/Deluxe/Blue.ini b/Lua/game/themes/Deluxe/Blue.ini index 10017fb3..79bac299 100644 --- a/Lua/game/themes/Deluxe/Blue.ini +++ b/Lua/game/themes/Deluxe/Blue.ini @@ -160,6 +160,7 @@ PartyScoreBG2 =[party]scoreBG2.png PartyWinDeco1 =[party]winDecoration.png PartyWinDeco2 =[party]winDecoration.png PartyWinDeco3 =[party]winDecoration.png +PartyPlayerSelectBG = [party]playerselectbg.png # # # S T A T S # # # diff --git a/Lua/game/themes/Deluxe/Fall.ini b/Lua/game/themes/Deluxe/Fall.ini index 38f25cdb..602a720b 100644 --- a/Lua/game/themes/Deluxe/Fall.ini +++ b/Lua/game/themes/Deluxe/Fall.ini @@ -160,6 +160,7 @@ PartyScoreBG2 =[party]scoreBG2.png PartyWinDeco1 =[party]winDecoration.png PartyWinDeco2 =[party]winDecoration.png PartyWinDeco3 =[party]winDecoration.png +PartyPlayerSelectBG = [party]playerselectbg.png # # # S T A T S # # # diff --git a/Lua/game/themes/Deluxe/Ocean.ini b/Lua/game/themes/Deluxe/Ocean.ini index d18c7a60..a7f59bad 100644 --- a/Lua/game/themes/Deluxe/Ocean.ini +++ b/Lua/game/themes/Deluxe/Ocean.ini @@ -140,6 +140,7 @@ PartyScoreBG2 =[party]scoreBG2.png PartyWinDeco1 =[party]winDecoration.png PartyWinDeco2 =[party]winDecoration.png PartyWinDeco3 =[party]winDecoration.png +PartyPlayerSelectBG = [party]playerselectbg.png # # # S T A T S # # # StatMainBG1 = [stat]mainBG1.png diff --git a/Lua/game/themes/Deluxe/Ribbon.ini b/Lua/game/themes/Deluxe/Ribbon.ini index 73cae2ab..2f61fd1c 100644 --- a/Lua/game/themes/Deluxe/Ribbon.ini +++ b/Lua/game/themes/Deluxe/Ribbon.ini @@ -160,7 +160,7 @@ PartyScoreBG2 =[party]scoreBG2.png PartyWinDeco1 =[party]winDecoration.png
PartyWinDeco2 =[party]winDecoration.png
PartyWinDeco3 =[party]winDecoration.png
-
+PartyPlayerSelectBG = [party]playerselectbg.png
# # # S T A T S # # #
StatMainBG1 = [stat]mainBG1.png
diff --git a/Lua/game/themes/Deluxe/Summer.ini b/Lua/game/themes/Deluxe/Summer.ini index 36e9f5d7..d254e14d 100644 --- a/Lua/game/themes/Deluxe/Summer.ini +++ b/Lua/game/themes/Deluxe/Summer.ini @@ -160,6 +160,7 @@ PartyScoreBG2 =[party]scoreBG2.png PartyWinDeco1 =[party]winDecoration.png PartyWinDeco2 =[party]winDecoration.png PartyWinDeco3 =[party]winDecoration.png +PartyPlayerSelectBG = [party]playerselectbg.png # # # S T A T S # # # diff --git a/Lua/game/themes/Deluxe/Winter.ini b/Lua/game/themes/Deluxe/Winter.ini index 72514a15..85173278 100644 --- a/Lua/game/themes/Deluxe/Winter.ini +++ b/Lua/game/themes/Deluxe/Winter.ini @@ -160,6 +160,7 @@ PartyScoreBG2 =[party]scoreBG2.png PartyWinDeco1 =[party]winDecoration.png PartyWinDeco2 =[party]winDecoration.png PartyWinDeco3 =[party]winDecoration.png +PartyPlayerSelectBG = [party]playerselectbg.png # # # S T A T S # # # diff --git a/Lua/game/themes/Deluxe/[party]playerselectbg.png b/Lua/game/themes/Deluxe/[party]playerselectbg.png Binary files differnew file mode 100644 index 00000000..cc608229 --- /dev/null +++ b/Lua/game/themes/Deluxe/[party]playerselectbg.png diff --git a/Lua/src/screens/UScreenPartyPlayer.pas b/Lua/src/screens/UScreenPartyPlayer.pas index 7d95bb96..8a2a2371 100644 --- a/Lua/src/screens/UScreenPartyPlayer.pas +++ b/Lua/src/screens/UScreenPartyPlayer.pas @@ -379,24 +379,35 @@ begin LoadFromTheme(Theme.PartyPlayer); + Theme.PartyPlayer.SelectTeams.oneItemOnly := true; + Theme.PartyPlayer.SelectTeams.showArrows := true; SelectTeams := AddSelectSlide(Theme.PartyPlayer.SelectTeams, CountTeams, ITeams); Team1Name := AddButton(Theme.PartyPlayer.Team1Name); + Theme.PartyPlayer.SelectPlayers1.oneItemOnly := true; + Theme.PartyPlayer.SelectPlayers1.showArrows := true; SelectPlayers[0] := AddSelectSlide(Theme.PartyPlayer.SelectPlayers1, CountPlayer[0], IPlayers); + AddButton(Theme.PartyPlayer.Player1Name); AddButton(Theme.PartyPlayer.Player2Name); AddButton(Theme.PartyPlayer.Player3Name); AddButton(Theme.PartyPlayer.Player4Name); Team2Name := AddButton(Theme.PartyPlayer.Team2Name); + Theme.PartyPlayer.SelectPlayers2.oneItemOnly := true; + Theme.PartyPlayer.SelectPlayers2.showArrows := true; SelectPlayers[1] := AddSelectSlide(Theme.PartyPlayer.SelectPlayers2, CountPlayer[1], IPlayers); + AddButton(Theme.PartyPlayer.Player5Name); AddButton(Theme.PartyPlayer.Player6Name); AddButton(Theme.PartyPlayer.Player7Name); AddButton(Theme.PartyPlayer.Player8Name); Team3Name := AddButton(Theme.PartyPlayer.Team3Name); + Theme.PartyPlayer.SelectPlayers3.oneItemOnly := true; + Theme.PartyPlayer.SelectPlayers3.showArrows := true; SelectPlayers[2] := AddSelectSlide(Theme.PartyPlayer.SelectPlayers3, CountPlayer[2], IPlayers); + AddButton(Theme.PartyPlayer.Player9Name); AddButton(Theme.PartyPlayer.Player10Name); AddButton(Theme.PartyPlayer.Player11Name); @@ -432,7 +443,7 @@ begin Button[10].Text[0].Text := Ini.NameTeam[2]; // Templates for Names Mod end - + UpdateInterface; end; procedure TScreenPartyPlayer.SetAnimationProgress(Progress: real); |