actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'StageDispFixes' of https://github.com/kyzentun/stepmania

Browse Source
This commit is contained in:
Kyzentun
2014-09-14 21:06:27 -06:00
parent 64cd9f898d 2199e7aafb
commit 1dbdca6b0a
12 changed files with 145 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/default/Graphics/ScreenEvaluationSummary BannerList.lua
+2 -2
View File
@@ -33,7 +33,7 @@ for i=1,#statList do
as[#as+1] = Def.ActorFrame {
Def.Sprite {
InitCommand=cmd(scaletoclipped,256,80);
BeginCommand=function(self)
OnCommand=function(self)
local path = statList[j]:GetPlayedSongs()[1]:GetBannerPath() or THEME:GetPathG("Common","fallback banner");
self:LoadBanner(path);
end;
@@ -43,7 +43,7 @@ for i=1,#statList do
OnCommand=cmd(zoomto,80,18;diffuse,Color.Black;diffusealpha,0.5;fadeleft,0.5);
};
LoadFont("Common Normal") .. {
Text=StageToLocalizedString( statList[j]:GetStage() );
Text=thify_number(statList[j]:GetStageIndex()+1);
InitCommand=cmd(x,128-4;y,40-4;horizalign,right;vertalign,bottom);
OnCommand=cmd(diffuse,StageToColor(statList[j]:GetStage());zoom,0.675;shadowlength,1);
};
Themes/default/Graphics/ScreenGameplay StageDisplay.lua
+5 -16
View File
@@ -1,20 +1,8 @@
local curScreen = Var "LoadingScreen";
local curStage = GAMESTATE:GetCurrentStage();
local curStageIndex = GAMESTATE:GetCurrentStageIndex();
local curStageIndex = GAMESTATE:GetCurrentStageIndex() + 1;
local playMode = GAMESTATE:GetPlayMode();
local tRemap = {
Stage_1st = 1,
Stage_2nd = 2,
Stage_3rd = 3,
Stage_4th = 4,
Stage_5th = 5,
Stage_6th = 6,
};
if tRemap[curStage] == PREFSMAN:GetPreference("SongsPerPlay") then
curStage = "Stage_Final";
end
local t = Def.ActorFrame {
LoadActor(THEME:GetPathB("_frame","3x3"),"rounded black",64,16);
LoadFont("Common Normal") .. {
@@ -36,12 +24,13 @@ local t = Def.ActorFrame {
self:settextf("%i / %i", songsPlayed, GAMESTATE:GetCurrentCourse():GetEstimatedNumStages());
else
if GAMESTATE:IsEventMode() then
self:settextf("Stage %s", curStageIndex+1);
self:settextf("Stage %s", curStageIndex);
else
local thed_stage= thified_curstage_index(false)
if THEME:GetMetric(curScreen,"StageDisplayUseShortString") then
self:settextf("%s", ToEnumShortString(curStage));
self:settextf(thed_stage)
else
self:settextf("%s Stage", ToEnumShortString(curStage));
self:settextf("%s Stage", thed_stage)
end
end
end;
Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua
+3 -9
View File
@@ -21,18 +21,12 @@ t[#t+1] = Def.ActorFrame {
elseif GAMESTATE:IsEventMode() then
self:settextf("Stage %s", curStageIndex);
else
-- hack: ScreenEvaluation shows the current stage, but it needs to
-- show the last stage instead. PlayedStageStats has the right one.
if string.find(curScreen,"Evaluation") then
local stageStats = STATSMAN:GetPlayedStageStats(1)
curStage = stageStats:GetStage()
end
local thed_stage= thified_curstage_index(curScreen:find("Evaluation"))
if THEME:GetMetric(curScreen,"StageDisplayUseShortString") then
self:settextf("%s", ToEnumShortString(curStage));
self:settext(thed_stage)
self:zoom(0.75);
else
self:settextf("%s Stage", ToEnumShortString(curStage));
self:settextf("%s Stage", thed_stage);
self:zoom(1);
end;
end;