aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Game/Code/Classes/UThemes.pas12
-rw-r--r--Game/Code/Screens/UScreenPartyScore.pas29
-rw-r--r--Languages/English.ini3
-rw-r--r--Languages/German.ini5
-rw-r--r--Skins/Deluxe/Blue.ini4
-rw-r--r--Skins/Deluxe/W&C-Summer.ini4
-rw-r--r--Skins/Deluxe/W&C-Winter.ini4
-rw-r--r--Skins/Deluxe/[party]scoreBG1.jpgbin0 -> 1226 bytes
-rw-r--r--Skins/Deluxe/[party]scoreBG2.jpgbin0 -> 653 bytes
-rw-r--r--Skins/Deluxe/[party]teamPoints.jpgbin0 -> 729 bytes
-rw-r--r--Skins/Deluxe/x_W&C-Autum.ini6
-rw-r--r--Skins/Deluxe/x_[party]scoreDecoration.jpgbin0 -> 6179 bytes
-rw-r--r--Themes/Deluxe.ini214
13 files changed, 223 insertions, 58 deletions
diff --git a/Game/Code/Classes/UThemes.pas b/Game/Code/Classes/UThemes.pas
index 7f4763c3..ea2328f9 100644
--- a/Game/Code/Classes/UThemes.pas
+++ b/Game/Code/Classes/UThemes.pas
@@ -559,8 +559,14 @@ type
TextNameTeam2: TThemeText;
TextNameTeam3: TThemeText;
StaticTeam1: TThemeStatic;
+ StaticTeam1BG: TThemeStatic;
+ StaticTeam1Deco: TThemeStatic;
StaticTeam2: TThemeStatic;
+ StaticTeam2BG: TThemeStatic;
+ StaticTeam2Deco: TThemeStatic;
StaticTeam3: TThemeStatic;
+ StaticTeam3BG: TThemeStatic;
+ StaticTeam3Deco: TThemeStatic;
TextWinner: TThemeText;
end;
@@ -1280,8 +1286,14 @@ begin
ThemeLoadText (PartyScore.TextNameTeam3, 'PartyScoreTextNameTeam3');
ThemeLoadStatic (PartyScore.StaticTeam1, 'PartyScoreStaticTeam1');
+ ThemeLoadStatic (PartyScore.StaticTeam1BG, 'PartyScoreStaticTeam1BG');
+ ThemeLoadStatic (PartyScore.StaticTeam1Deco, 'PartyScoreStaticTeam1Deco');
ThemeLoadStatic (PartyScore.StaticTeam2, 'PartyScoreStaticTeam2');
+ ThemeLoadStatic (PartyScore.StaticTeam2BG, 'PartyScoreStaticTeam2BG');
+ ThemeLoadStatic (PartyScore.StaticTeam2Deco, 'PartyScoreStaticTeam2Deco');
ThemeLoadStatic (PartyScore.StaticTeam3, 'PartyScoreStaticTeam3');
+ ThemeLoadStatic (PartyScore.StaticTeam3BG, 'PartyScoreStaticTeam3BG');
+ ThemeLoadStatic (PartyScore.StaticTeam3Deco, 'PartyScoreStaticTeam3Deco');
ThemeLoadText (PartyScore.TextWinner, 'PartyScoreTextWinner');
diff --git a/Game/Code/Screens/UScreenPartyScore.pas b/Game/Code/Screens/UScreenPartyScore.pas
index 805525a1..4afaee09 100644
--- a/Game/Code/Screens/UScreenPartyScore.pas
+++ b/Game/Code/Screens/UScreenPartyScore.pas
@@ -15,8 +15,14 @@ type
TextNameTeam2: Cardinal;
TextNameTeam3: Cardinal;
StaticTeam1: Cardinal;
+ StaticTeam1BG: Cardinal;
+ StaticTeam1Deco: Cardinal;
StaticTeam2: Cardinal;
+ StaticTeam2BG: Cardinal;
+ StaticTeam2Deco: Cardinal;
StaticTeam3: Cardinal;
+ StaticTeam3BG: Cardinal;
+ StaticTeam3Deco: Cardinal;
TextWinner: Cardinal;
MaxScore: Word;
@@ -80,8 +86,14 @@ begin
TextNameTeam3 := AddText (Theme.PartyScore.TextNameTeam3);
StaticTeam1 := AddStatic (Theme.PartyScore.StaticTeam1);
+ StaticTeam1BG := AddStatic (Theme.PartyScore.StaticTeam1BG);
+ StaticTeam1Deco := AddStatic (Theme.PartyScore.StaticTeam1Deco);
StaticTeam2 := AddStatic (Theme.PartyScore.StaticTeam2);
+ StaticTeam2BG := AddStatic (Theme.PartyScore.StaticTeam2BG);
+ StaticTeam2Deco := AddStatic (Theme.PartyScore.StaticTeam2Deco);
StaticTeam3 := AddStatic (Theme.PartyScore.StaticTeam3);
+ StaticTeam3BG := AddStatic (Theme.PartyScore.StaticTeam3BG);
+ StaticTeam3Deco := AddStatic (Theme.PartyScore.StaticTeam3Deco);
TextWinner := AddText (Theme.PartyScore.TextWinner);
@@ -105,6 +117,11 @@ begin
Static[StaticTeam2].Texture.ScaleW := ScreenSingModi.PlayerInfo.Playerinfo[1].Percentage / 100;
Static[StaticTeam3].Texture.ScaleW := ScreenSingModi.PlayerInfo.Playerinfo[2].Percentage / 100;
+ //fix: prevents static from drawn out of bounds.
+ if Static[StaticTeam1].Texture.ScaleW > 99 then Static[StaticTeam1].Texture.ScaleW := 99;
+ if Static[StaticTeam2].Texture.ScaleW > 99 then Static[StaticTeam2].Texture.ScaleW := 99;
+ if Static[StaticTeam3].Texture.ScaleW > 99 then Static[StaticTeam3].Texture.ScaleW := 99;
+
//End Last Round
PartySession.EndRound;
@@ -119,12 +136,16 @@ begin
Text[TextScoreTeam1].Visible := True;
Text[TextNameTeam1].Visible := True;
Static[StaticTeam1].Visible := True;
+ Static[StaticTeam1BG].Visible := True;
+ Static[StaticTeam1Deco].Visible := True;
end
else
begin
Text[TextScoreTeam1].Visible := False;
Text[TextNameTeam1].Visible := False;
Static[StaticTeam1].Visible := False;
+ Static[StaticTeam1BG].Visible := False;
+ Static[StaticTeam1Deco].Visible := False;
end;
if (ScreenSingModi.PlayerInfo.NumPlayers >= 2) then
@@ -135,12 +156,16 @@ begin
Text[TextScoreTeam2].Visible := True;
Text[TextNameTeam2].Visible := True;
Static[StaticTeam2].Visible := True;
+ Static[StaticTeam2BG].Visible := True;
+ Static[StaticTeam2Deco].Visible := True;
end
else
begin
Text[TextScoreTeam2].Visible := False;
Text[TextNameTeam2].Visible := False;
Static[StaticTeam2].Visible := False;
+ Static[StaticTeam2BG].Visible := False;
+ Static[StaticTeam2Deco].Visible := False;
end;
if (ScreenSingModi.PlayerInfo.NumPlayers >= 3) then
@@ -151,12 +176,16 @@ begin
Text[TextScoreTeam3].Visible := True;
Text[TextNameTeam3].Visible := True;
Static[StaticTeam3].Visible := True;
+ Static[StaticTeam3BG].Visible := True;
+ Static[StaticTeam3Deco].Visible := True;
end
else
begin
Text[TextScoreTeam3].Visible := False;
Text[TextNameTeam3].Visible := False;
Static[StaticTeam3].Visible := False;
+ Static[StaticTeam3BG].Visible := False;
+ Static[StaticTeam3Deco].Visible := False;
end;
diff --git a/Languages/English.ini b/Languages/English.ini
index 74862e3a..e23b29b6 100644
--- a/Languages/English.ini
+++ b/Languages/English.ini
@@ -231,7 +231,8 @@ PARTY_NOBODY=nobody
NEXT_ROUND=Next round:
PARTY_DISMISSED=Dismissed!
-PARTY_SCORE_WINS=%s wins!
+PARTY_SCORE_WINS=%s
+PARTY_SCORE_WINS2=wins!
PLUGIN_HDL_NAME=Hold the Line
PLUGIN_HDL_DESC=Don't get worse than the pointer at the rating bar shows you.
diff --git a/Languages/German.ini b/Languages/German.ini
index 80b01647..324a8c9e 100644
--- a/Languages/German.ini
+++ b/Languages/German.ini
@@ -40,7 +40,7 @@ SING_OPTIONS_GAME_DESC=Allgemeine Spiel Einstellungen
SING_OPTIONS_GAME_PLAYERS=Spieler
SING_OPTIONS_GAME_DIFFICULTY=Schwierigkeit
SING_OPTIONS_GAME_LANGUAGE=Sprache
-SING_OPTIONS_GAME_TABS=Tabs
+SING_OPTIONS_GAME_TABS=Ordner
SING_OPTIONS_GAME_SORTING=Sortierung
SING_OPTIONS_GAME_DEBUG=Debug
@@ -230,7 +230,8 @@ PARTY_NOBODY=Niemand
NEXT_ROUND=Nächste Runde:
PARTY_DISMISSED=Ausgeschieden
-PARTY_SCORE_WINS=Team %s hat gewonnen!
+PARTY_SCORE_WINS=%s
+PARTY_SCORE_WINS2=hat gewonnen!
PLUGIN_HDL_NAME=Balken halten
PLUGIN_HDL_DESC=Halte die Bewertugnsanzeige im angezeigten Bereich
diff --git a/Skins/Deluxe/Blue.ini b/Skins/Deluxe/Blue.ini
index b2d26e05..83784051 100644
--- a/Skins/Deluxe/Blue.ini
+++ b/Skins/Deluxe/Blue.ini
@@ -91,6 +91,10 @@ PartyRoundBG2 =[party]roundBG2.jpg
PartyRoundBG3 =[party]roundBG3.jpg
PartyRoundBG4 =[party]roundBG4.jpg
HDL_Pointer =[party]pointer.bmp
+PartyTeamPoints =[party]teamPoints.jpg
+PartyScoreDeco =x_[party]scoreDecoration.jpg
+PartyScoreBG1 =[party]scoreBG1.jpg
+PartyScoreBG2 =[party]scoreBG2.jpg
# # # N A V I # # #
diff --git a/Skins/Deluxe/W&C-Summer.ini b/Skins/Deluxe/W&C-Summer.ini
index 3251ff8e..af9f6147 100644
--- a/Skins/Deluxe/W&C-Summer.ini
+++ b/Skins/Deluxe/W&C-Summer.ini
@@ -91,6 +91,10 @@ PartyRoundBG2 =[party]roundBG2.jpg
PartyRoundBG3 =[party]roundBG3.jpg
PartyRoundBG4 =[party]roundBG4.jpg
HDL_Pointer =[party]pointer.bmp
+PartyTeamPoints =[party]teamPoints.jpg
+PartyScoreDeco =x_[party]scoreDecoration.jpg
+PartyScoreBG1 =[party]scoreBG1.jpg
+PartyScoreBG2 =[party]scoreBG2.jpg
# # # N A V I # # #
diff --git a/Skins/Deluxe/W&C-Winter.ini b/Skins/Deluxe/W&C-Winter.ini
index 5fb65c28..e91b87f7 100644
--- a/Skins/Deluxe/W&C-Winter.ini
+++ b/Skins/Deluxe/W&C-Winter.ini
@@ -91,6 +91,10 @@ PartyRoundBG2 =[party]roundBG2.jpg
PartyRoundBG3 =[party]roundBG3.jpg
PartyRoundBG4 =[party]roundBG4.jpg
HDL_Pointer =[party]pointer.bmp
+PartyTeamPoints =[party]teamPoints.jpg
+PartyScoreDeco =x_[party]scoreDecoration.jpg
+PartyScoreBG1 =[party]scoreBG1.jpg
+PartyScoreBG2 =[party]scoreBG2.jpg
# # # N A V I # # #
diff --git a/Skins/Deluxe/[party]scoreBG1.jpg b/Skins/Deluxe/[party]scoreBG1.jpg
new file mode 100644
index 00000000..f558425d
--- /dev/null
+++ b/Skins/Deluxe/[party]scoreBG1.jpg
Binary files differ
diff --git a/Skins/Deluxe/[party]scoreBG2.jpg b/Skins/Deluxe/[party]scoreBG2.jpg
new file mode 100644
index 00000000..47239d85
--- /dev/null
+++ b/Skins/Deluxe/[party]scoreBG2.jpg
Binary files differ
diff --git a/Skins/Deluxe/[party]teamPoints.jpg b/Skins/Deluxe/[party]teamPoints.jpg
new file mode 100644
index 00000000..96855bc9
--- /dev/null
+++ b/Skins/Deluxe/[party]teamPoints.jpg
Binary files differ
diff --git a/Skins/Deluxe/x_W&C-Autum.ini b/Skins/Deluxe/x_W&C-Autum.ini
index f8062c3c..3666fadf 100644
--- a/Skins/Deluxe/x_W&C-Autum.ini
+++ b/Skins/Deluxe/x_W&C-Autum.ini
@@ -91,7 +91,10 @@ PartyRoundBG2 =[party]roundBG2.jpg
PartyRoundBG3 =[party]roundBG3.jpg
PartyRoundBG4 =[party]roundBG4.jpg
HDL_Pointer =[party]pointer.bmp
-
+PartyTeamPoints =[party]teamPoints.jpg
+PartyScoreDeco =x_[party]scoreDecoration.jpg
+PartyScoreBG1 =[party]scoreBG1.jpg
+PartyScoreBG2 =[party]scoreBG2.jpg
# # # N A V I # # #
ButtonP = [button]p.jpg
@@ -101,6 +104,7 @@ ButtonAlt = [button]alt.jpg
ButtonAZ = [button]az.jpg
ButtonEnter = [button]enter.jpg
ButtonNavi = [button]navi.jpg
+ButtonEsc = [button]esc.jpg
Leiste1 = [special]bar1.jpg
Leiste2 = [special]bar2.jpg
diff --git a/Skins/Deluxe/x_[party]scoreDecoration.jpg b/Skins/Deluxe/x_[party]scoreDecoration.jpg
new file mode 100644
index 00000000..49204e19
--- /dev/null
+++ b/Skins/Deluxe/x_[party]scoreDecoration.jpg
Binary files differ
diff --git a/Themes/Deluxe.ini b/Themes/Deluxe.ini
index 1320f2a2..dbdec115 100644
--- a/Themes/Deluxe.ini
+++ b/Themes/Deluxe.ini
@@ -28,7 +28,9 @@ Gray = 127 127 127
GrayDark = 63 63 63
Black = 0 0 0
GrayPopup = 51 51 51
-
+Gold = 255 223 31
+Silver = 223 223 223
+Bronze = 205 127 50
[Loading]
Texts =2
@@ -5370,7 +5372,7 @@ Align=1
[PartyScore]
-Texts=4
+Texts=5
[PartyScoreBackground]
Tex=PartyBG
@@ -5453,98 +5455,202 @@ Size =7
Align=0
Text=PARTY_LEGEND_CONTINUE
+[PartyScoreStatic5]
+Tex =PartyScoreBG1
+X =50
+Y =100
+W = 700
+H = 80
+Int=1
+Color =DarkBlue
+Type=Font Black
+
+[PartyScoreStatic6]
+Tex =PartyScoreBG2
+X =50
+Y =495
+W = 700
+H = 20
+Int=1
+Color =LightBlue
+Type=Font Black
+
+[PartyScoreText5]
+X =400
+Y =136
+Color =White
+Font =0
+Size =15
+Text =PARTY_SCORE_WINS2
+Align=1
+
[PartyScoreTextWinner]
-X =150
-Y =20
+X =400
+Y =98
Color =White
-Font =1
-Size =14
+Font =0
+Size =18
Text =The Winner is...
-Align=0
+Align=1
[PartyScoreTextScoreTeam1]
-X =280
-Y =100
+X =568
+Y =198
Color =White
-Font =1
-Size =13
+Font =0
+Size =12
Text =3000
-Align=0
+Align=2
[PartyScoreTextScoreTeam2]
-X =280
-Y =250
+X =568
+Y =298
Color =White
-Font =1
-Size =13
+Font =0
+Size =12
Text =2000
-Align=0
+Align=2
[PartyScoreTextScoreTeam3]
-X =280
-Y =400
+X =568
+Y =398
Color =White
-Font =1
-Size =13
+Font =0
+Size =12
Text =1000
-Align=0
+Align=2
[PartyScoreTextNameTeam1]
-X =80
-Y =100
-Color =White
-Font =1
-Size =13
-Text =Team 1
+X =188
+Y =198
+Font=0
+Size=12
Align=0
+Text=Team 1
+Color=White
[PartyScoreTextNameTeam2]
-X =80
-Y =250
+X =188
+Y =298
Color =White
-Font =1
-Size =13
+Font =0
+Size =12
Text =Team 2
Align=0
[PartyScoreTextNameTeam3]
-X =80
-Y =400
+X =188
+Y =398
Color =White
-Font =1
-Size =13
+Font =0
+Size =12
Text =Team 3
Align=0
[PartyScoreStaticTeam1]
-X =380
-Y =100
-W =300
-H =30
-Tex=Leiste1
-Color =P1Light
+X =188
+Y =230
+W =380
+H =16
+Z =1
+Tex=PartyTeamPoints
+Color =P1Dark
Int = 1
Type=Font Black
+Reflection=1
+ReflectionSpacing=12
+
+[PartyScoreStaticTeam1BG]
+Tex=PartyTeamButton2
+X=178
+Y=200
+W=400
+H=50
+Type=Font Black
+Color =P1Dark
+Reflection=1
+ReflectionSpacing=2
+
+[PartyScoreStaticTeam1Deco]
+Tex =PartyScoreDeco
+X = 563
+Y = 191
+W = 64
+H = 64
+Type =Font Black
+Color =Gold
+Reflection=1
+ReflectionSpacing=-5
[PartyScoreStaticTeam2]
-X =380
-Y =250
-W =300
-H =30
-Tex=Leiste1
-Color =P2Light
+X =188
+Y =330
+W =380
+H =15
+Z =1
+Tex=PartyTeamPoints
+Color =P2Dark
Int = 1
Type=Font Black
+Reflection=1
+ReflectionSpacing=12
+
+[PartyScoreStaticTeam2BG]
+Tex=PartyTeamButton2
+X=178
+Y=300
+W=400
+H=50
+Type=Font Black
+Color =P2Dark
+Reflection=1
+ReflectionSpacing=2
+
+[PartyScoreStaticTeam2Deco]
+Tex =PartyScoreDeco
+X = 563
+Y = 291
+W = 64
+H = 64
+Type =Font Black
+Color =Gold
+Reflection=1
+ReflectionSpacing=-5
[PartyScoreStaticTeam3]
-X =380
-Y =400
-W =300
-H =30
-Tex=Leiste1
-Color =P3Light
+X =188
+Y =430
+W =380
+H =15
+Z =1
+Tex=PartyTeamPoints
+Color =P3Dark
Int = 1
Type=Font Black
+Reflection=1
+ReflectionSpacing=12
+
+[PartyScoreStaticTeam3BG]
+Tex=PartyTeamButton2
+X=178
+Y=400
+W=400
+H=50
+Type=Font Black
+Color =P3Dark
+Reflection=1
+ReflectionSpacing=2
+
+[PartyScoreStaticTeam3Deco]
+Tex =PartyScoreDeco
+X = 563
+Y = 391
+W = 64
+H = 64
+Type =Font Black
+Color =Gold
+Reflection=1
+ReflectionSpacing=-5
[PartyWin]
Texts=4
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 18:23:06 +0000