From 345a5505ed71c8ecbc7957bf0b7a00413f083d56 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Sun, 23 Dec 2007 09:05:11 +0000
Subject: [PATCH] Changed difficulty icons on gameplay to a new design and have
 them use localized strings instead of baked text

---
 .../ScreenGameplay overlay/default.lua        |  59 ++++++++++++++++++
 .../ScreenGameplay difficulty icons 2x6.png   | Bin 7637 -> 3457 bytes
 stepmania/Themes/default/Languages/en.ini     |  12 ++--
 stepmania/Themes/default/metrics.ini          |   8 +--
 4 files changed, 69 insertions(+), 10 deletions(-)

diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/default.lua b/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/default.lua
index fd0f82ef87..0311def935 100644
--- a/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/default.lua	
+++ b/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/default.lua	
@@ -1,7 +1,66 @@
 local font = LoadFont( "_zeroesthree" );
 local frame = LoadActor( "_score frame" );
 local text = GAMESTATE:GetPlayMode() == 'PlayMode_Oni' and "time" or "score";
+
+local function DifficultyLabelText(pn)
+	local yNormal = SCREEN_CENTER_Y+175;
+	local yReverse = SCREEN_CENTER_Y-189;
+	local xNormal = 286;
+	local xReverse = 310;
+
+	local diffText = font .. {
+		InitCommand=function(self)
+			-- check to see if player is using reverse and set position accordingly.
+			if GAMESTATE:PlayerIsUsingModifier(pn,"reverse") then
+				if pn == PLAYER_1 then
+					-- player 1 reverse position
+					self:x(SCREEN_CENTER_X-xReverse);
+					self:y(yReverse);
+				else
+					-- player 2 reverse position
+					self:x(SCREEN_CENTER_X+xReverse);
+					self:y(yReverse);
+				end;
+			else
+				if pn == PLAYER_1 then
+					-- player 1 normal position
+					self:x(SCREEN_CENTER_X-xNormal);
+					self:y(yNormal);
+				else
+					-- player 2 normal position
+					self:x(SCREEN_CENTER_X+xNormal);
+					self:y(yNormal);
+				end;
+			end;
+			
+			-- set align based on player
+			if pn == PLAYER_1 then self:horizalign('HorizAlign_Left');
+			else self:horizalign('HorizAlign_Right');
+			end;
+			
+			-- other commands
+			self:zoom(0.75);
+			self:shadowlength(0);
+		end;
+		OnCommand=cmd(playcommand,'Update');
+		CurrentStepsP1ChangedMessageCommand=cmd(playcommand,'Update');
+		CurrentStepsP2ChangedMessageCommand=cmd(playcommand,'Update');
+		UpdateCommand=function(self)
+			self:settext(DifficultyToLocalizedString(GAMESTATE:GetCurrentSteps(pn):GetDifficulty()));
+		end;
+		Condition=GAMESTATE:IsSideJoined(pn) == true or GAMESTATE:GetPlayMode() == 'PlayMode_Rave';
+	};
+	
+	return diffText;
+end;
+
 return Def.ActorFrame {
+
+	-- text on difficulty labels
+	DifficultyLabelText(PLAYER_1);
+	DifficultyLabelText(PLAYER_2);
+
+	-- text on bottom of score frames
 	Def.ActorFrame {
 		frame;
 		font .. {
diff --git a/stepmania/Themes/default/Graphics/ScreenGameplay difficulty icons 2x6.png b/stepmania/Themes/default/Graphics/ScreenGameplay difficulty icons 2x6.png
index f91f696422fd0cc9abb4761045f6317ee5d2b2e8..9b95de2f628f19d01ea9e2dc450f4e6c6d4a31de 100644
GIT binary patch
literal 3457
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
Lb2v)3@=5tGAM?_g

literal 7637
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
E01hY&3IG5A

diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini
index 8ea630a048..b03d12300d 100644
--- a/stepmania/Themes/default/Languages/en.ini
+++ b/stepmania/Themes/default/Languages/en.ini
@@ -59,12 +59,12 @@ Oni=Oni
 Survival=Survival
 
 [Difficulty]
-Beginner=BEGINNER
-Challenge=CHALLENGE
-Easy=LIGHT
-Edit=EDIT
-Hard=HEAVY
-Medium=STANDARD
+Beginner=Beginner
+Challenge=Expert
+Easy=Easy
+Edit=Edit
+Hard=Hard
+Medium=Medium
 
 [EditInstallations]
 You must type a program directory before clicking Add.=You must type a program directory before clicking Add.
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 6a5b4a9274..2d1aec04e5 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -925,15 +925,15 @@ DifficultyP1X=
 DifficultyP1Y=
 DifficultyP1OnCommand=
 DifficultyP1OffCommand=linear,0.5;addx,-200
-DifficultyP1SetReverseCommand=x,SCREEN_CENTER_X-254;y,SCREEN_CENTER_Y-196;addx,-200;linear,0.5;addx,200;cropbottom,0;croptop,0.5
-DifficultyP1SetNoReverseCommand=x,SCREEN_CENTER_X-230;y,SCREEN_CENTER_Y+183;addx,-200;linear,0.5;addx,200;cropbottom,0.5;croptop,0
+DifficultyP1SetReverseCommand=x,SCREEN_CENTER_X-254;y,SCREEN_CENTER_Y-196;cropbottom,0;croptop,0.5;addx,-200;linear,0.5;addx,200
+DifficultyP1SetNoReverseCommand=x,SCREEN_CENTER_X-230;y,SCREEN_CENTER_Y+183;cropbottom,0.5;croptop,0;addx,-200;linear,0.5;addx,200
 
 DifficultyP2X=
 DifficultyP2Y=
 DifficultyP2OnCommand=
 DifficultyP2OffCommand=linear,0.5;addx,200
-DifficultyP2SetReverseCommand=x,SCREEN_CENTER_X+254;y,SCREEN_CENTER_Y-196;addx,-200;linear,0.5;addx,200;cropbottom,0;croptop,0.5
-DifficultyP2SetNoReverseCommand=x,SCREEN_CENTER_X+230;y,SCREEN_CENTER_Y+183;addx,-200;linear,0.5;addx,200;cropbottom,0.5;croptop,0
+DifficultyP2SetReverseCommand=x,SCREEN_CENTER_X+254;y,SCREEN_CENTER_Y-196;cropbottom,0;croptop,0.5;addx,-200;linear,0.5;addx,200
+DifficultyP2SetNoReverseCommand=x,SCREEN_CENTER_X+230;y,SCREEN_CENTER_Y+183;cropbottom,0.5;croptop,0;addx,-200;linear,0.5;addx,200
 LyricsSetNoReverseCommand=x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y+160
 LyricsSetReverseCommand=x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y-140
 # This is used if one player is in reverse and the other isn't.