small changes to gameplay decorations, nothing serious

This commit is contained in:
AJ Kelly
2012-02-19 12:38:25 -06:00
parent 49ea2575ed
commit 6b0a52e170
2 changed files with 21 additions and 24 deletions
Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

@@ -22,8 +22,8 @@ local function CreateSegments(Player)
local steps = GAMESTATE:GetCurrentSteps( Player );
if steps then
local timingData = steps:GetTimingData();
-- if we're using SSC, might as well use the StepsSeconds, which will
-- almost always be more proper than a r21'd file.
-- use the StepsSeconds, which will almost always be more proper
-- than a file with ITG2r21 compatibility.
if song then
local songLen = song:MusicLengthSeconds();
@@ -150,6 +150,8 @@ end
local t = LoadFallbackB()
t[#t+1] = StandardDecorationFromFileOptional("ScoreFrame","ScoreFrame");
local function songMeterScale(val) return scale(val,0,1,-380/2,380/2) end
for pn in ivalues(PlayerNumber) do
local MetricsName = "SongMeterDisplay" .. PlayerNumberToString(pn);
local songMeterDisplay = Def.ActorFrame{
@@ -166,15 +168,15 @@ for pn in ivalues(PlayerNumber) do
};
Def.Quad {
InitCommand=cmd(zoomto,2,8);
OnCommand=cmd(x,scale(0.25,0,1,-380/2,380/2);diffuse,PlayerColor(pn);diffusealpha,0.5);
OnCommand=cmd(x,songMeterScale(0.25);diffuse,PlayerColor(pn);diffusealpha,0.5);
};
Def.Quad {
InitCommand=cmd(zoomto,2,8);
OnCommand=cmd(x,scale(0.5,0,1,-380/2,380/2);diffuse,PlayerColor(pn);diffusealpha,0.5);
OnCommand=cmd(x,songMeterScale(0.5);diffuse,PlayerColor(pn);diffusealpha,0.5);
};
Def.Quad {
InitCommand=cmd(zoomto,2,8);
OnCommand=cmd(x,scale(0.75,0,1,-380/2,380/2);diffuse,PlayerColor(pn);diffusealpha,0.5);
OnCommand=cmd(x,songMeterScale(0.75);diffuse,PlayerColor(pn);diffusealpha,0.5);
};
Def.SongMeterDisplay {
StreamWidth=THEME:GetMetric( MetricsName, 'StreamWidth' );
@@ -184,11 +186,12 @@ for pn in ivalues(PlayerNumber) do
Tip=LoadActor( THEME:GetPathG( 'SongMeterDisplay', 'tip ' .. PlayerNumberToString(pn) ) ) .. { InitCommand=cmd(visible,false); };
};
};
if ThemePrefs.Get("TimingDisplay") == true then
if ThemePrefs.Get("TimingDisplay") == true then
songMeterDisplay[#songMeterDisplay+1] = CreateSegments(pn);
end
t[#t+1] = songMeterDisplay
end;
for pn in ivalues(PlayerNumber) do
local MetricsName = "ToastyDisplay" .. PlayerNumberToString(pn);
t[#t+1] = LoadActor( THEME:GetPathG("Player", 'toasty'), pn ) .. {
@@ -204,25 +207,19 @@ end;
t[#t+1] = StandardDecorationFromFileOptional("BPMDisplay","BPMDisplay");
t[#t+1] = StandardDecorationFromFileOptional("StageDisplay","StageDisplay");
t[#t+1] = StandardDecorationFromFileOptional("SongTitle","SongTitle");
t[#t+1] = Def.ActorFrame {
InitCommand=cmd(x,SCREEN_RIGHT;y,SCREEN_BOTTOM;draworder,5);
--[[ LoadActor("_whatsup") .. {
InitCommand=cmd(horizalign,left;vertalign,top);
ToastyMessageCommand=cmd(smooth,3;x,-256;y,-200;sleep,2;smooth,3;x,256;y,200)
}; ]]
};
if( not GAMESTATE:IsCourseMode() ) then
t[#t+1] = Def.Actor{
JudgmentMessageCommand = function(self, params)
if params.TapNoteScore and
params.TapNoteScore ~= 'TapNoteScore_Invalid' and
params.TapNoteScore ~= 'TapNoteScore_None'
then
Scoring[GetUserPref("UserPrefScoringMode")](params,
STATSMAN:GetCurStageStats():GetPlayerStageStats(params.Player))
end
end;
};
t[#t+1] = Def.Actor{
JudgmentMessageCommand = function(self, params)
if params.TapNoteScore and
params.TapNoteScore ~= 'TapNoteScore_Invalid' and
params.TapNoteScore ~= 'TapNoteScore_None'
then
Scoring[GetUserPref("UserPrefScoringMode")](params,
STATSMAN:GetCurStageStats():GetPlayerStageStats(params.Player))
end
end;
};
end;
return t