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

change /new, merge with latest? BGeffects still need changing.

Browse Source
This commit is contained in:
Jonathan Payne
2012-06-18 19:01:16 -07:00
parent db0fc91d8b
commit 7aa504530f
15 changed files with 190 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BackgroundEffects/File1FlashOverlay.lua
+13
View File
@@ -0,0 +1,13 @@
local Color1 = color(Var "Color1");
local Color2 = color(Var "Color2");
local t = Def.ActorFrame {};
t[#t+1] = LoadActor(Var "File1") .. {
OnCommand=cmd(diffuse,Color1;blend,"BlendMode_Add";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;linear,1;diffusealpha,0);
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
return t;
BackgroundEffects/File2Flash.lua
+20
View File
@@ -0,0 +1,20 @@
local Color1 = color(Var "Color1");
local Color2 = color(Var "Color2");
local t = Def.ActorFrame {};
t[#t+1] = LoadActor(Var "File1") .. {
OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
if Var("File2") ~= nil then
t[#t+1] = LoadActor(Var("File2")) .. {
OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color2;effectclock,"music";linear,1;diffusealpha,0);
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
end;
return t;
BackgroundEffects/File2Normal.lua
+21
View File
@@ -0,0 +1,21 @@
local Color1 = color(Var "Color1");
local Color2 = color(Var "Color2");
local stretchBG = PREFSMAN:GetPreference("StretchBackgrounds")
local t = Def.ActorFrame {};
t[#t+1] = LoadActor(Var "File1") .. {
OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
if Var("File2") ~= nil then
t[#t+1] = LoadActor(Var("File2")) .. {
OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
end;
return t;
BackgroundEffects/OverlayAdd.lua
+11
View File
@@ -0,0 +1,11 @@
local Color1 = color(Var "Color1");
local t = Def.ActorFrame {};
t[#t+1] = LoadActor(Var "File1") .. {
OnCommand=cmd(diffuse,Color1;blend,"BlendMode_Add";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;);
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
return t;
BackgroundEffects/Visualization2File.lua
+18
View File
@@ -0,0 +1,18 @@
local Color1 = color(Var "Color1");
local Color2 = color(Var "Color2");
local t = Def.ActorFrame {};
t[#t+1] = LoadActor(Var "File1") .. {
OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
};
if Var("File2") ~= nil then
t[#t+1] = LoadActor(Var("File2")) .. {
OnCommand=cmd(blend,"BlendMode_Add";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color2;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
end;
return t;
BackgroundEffects/Visualization2FileFlash.lua
+20
View File
@@ -0,0 +1,20 @@
local Color1 = color(Var "Color1");
local Color2 = color(Var "Color2");
local t = Def.ActorFrame {};
t[#t+1] = LoadActor(Var "File1") .. {
OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
if Var("File2") ~= nil then
t[#t+1] = LoadActor(Var("File2")) .. {
OnCommand=cmd(blend,"BlendMode_Add";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color2;effectclock,"music";linear,1;diffusealpha,0);
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
end;
return t;
BackgroundTransitions/CrossFade_Faster.xml
+4
View File
@@ -0,0 +1,4 @@
<BackgroundTransition
LeavesCommand="stoptweening;linear,0.75;diffusealpha,0"
RootCommand=""
/>
BackgroundTransitions/CrossFade_Fastest.xml
+4
View File
@@ -0,0 +1,4 @@
<BackgroundTransition
LeavesCommand="stoptweening;linear,0.5;diffusealpha,0"
RootCommand=""
/>
BackgroundTransitions/FadeCenterHorizontal.xml
+4
View File
@@ -0,0 +1,4 @@
<BackgroundTransition
LeavesCommand="croptop,-0.3;fadetop,0.3;cropbottom,-0.3;fadebottom,0.3;linear,1.0;croptop,.5;cropbottom,.5"
RootCommand=""
/>
BackgroundTransitions/FadeCenterVertical.xml
+4
View File
@@ -0,0 +1,4 @@
<BackgroundTransition
LeavesCommand="cropright,-0.3;faderight,0.3;cropleft,-0.3;fadeleft,0.3;linear,1.0;cropright,.5;cropleft,.5"
RootCommand=""
/>
Themes/new/BGAnimations/ScreenSelectMusic decorations.lua
+27 -10
View File
@@ -2,11 +2,34 @@ local t = LoadFallbackB();
--
t[#t+1] = StandardDecorationFromFileOptional("BannerFrame","BannerFrame");
t[#t+1] = StandardDecorationFromFileOptional("BPMDisplay","BPMDisplay");
t[#t+1] = StandardDecorationFromFileOptional("TimeDisplay","TimeDisplay");
--~ t[#t+1] = StandardDecorationFromFileOptional("TimeDisplay","TimeDisplay");
t[#t+1] = StandardDecorationFromFileOptional("StageDisplay","StageDisplay");
t[#t+1] = StandardDecorationFromFileOptional("SortDisplay","SortDisplay");
t[#t+1] = StandardDecorationFromFileOptional("DifficultyList","DifficultyList");
--~ t[#t+1] = StandardDecorationFromFileOptional("SortDisplay","SortDisplay");
--~ t[#t+1] = StandardDecorationFromFileOptional("DifficultyList","DifficultyList");
t[#t+1] = Def.ActorFrame {
Def.Quad {
InitCommand=cmd(x,SCREEN_CENTER_X-320+24;y,SCREEN_CENTER_Y-192+16;zoomto,40-4,20;diffuse,PlayerColor(PLAYER_1));
};
LoadFont("Common Normal") .. {
Text=ToEnumShortString(PLAYER_1);
InitCommand=cmd(x,SCREEN_CENTER_X-320+24;y,SCREEN_CENTER_Y-192+16;diffuse,ThemeColor.Secondary);
};
LoadActor(THEME:GetPathG(Var "LoadingScreen", "OptionRows"),PLAYER_1) .. {
InitCommand=cmd(x,SCREEN_CENTER_X-320+24+40;y,SCREEN_CENTER_Y-192+16);
};
};
t[#t+1] = Def.ActorFrame {
Def.Quad {
InitCommand=cmd(x,SCREEN_CENTER_X-320+24;y,SCREEN_CENTER_Y-192+16+22;zoomto,40-4,20;diffuse,PlayerColor(PLAYER_2));
};
LoadFont("Common Normal") .. {
Text=ToEnumShortString(PLAYER_1);
InitCommand=cmd(x,SCREEN_CENTER_X-320+24;y,SCREEN_CENTER_Y-192+16+22;diffuse,ThemeColor.Secondary);
};
LoadActor(THEME:GetPathG(Var "LoadingScreen", "OptionRows"),PLAYER_1) .. {
InitCommand=cmd(x,SCREEN_CENTER_X-320+24+40;y,SCREEN_CENTER_Y-192+16+22);
};
};
-- StepsDisplay creator
local function CreateStepsDisplay( _pn )
local function set(self, _pn)
@@ -34,10 +57,4 @@ for pn in ivalues(PlayerNumber) do
InitCommand=function(self) self:player(pn); self:name(MetricsName); ActorUtil.LoadAllCommandsAndSetXY(self,Var "LoadingScreen"); end;
};
end
-- Create PaneDisplay for each player
t[#t+1] = StandardDecorationFromFileOptional("PaneDisplay","PaneDisplay");
--[[ for pn in ivalues(PlayerNumber) do
local MetricsName = "PaneDisplay" .. PlayerNumberToString(pn);
t[#t+1] = StandardDecorationFromFileOptional(MetricsName,"PaneDisplay",PlayerNumber);
end ]]
return t;
Themes/new/Graphics/ScreenSelectMusic BPMDisplay.lua
+29 -20
View File
@@ -33,32 +33,41 @@ return Def.ActorFrame {
self:aux(0);
self:playcommand( GAMESTATE:GetCurrentSong():GetTimingData():HasBPMChanges() and "MultipleBPM" or "SingleBPM" );
end;
-- BPM Background
Def.Quad {
Name="BPMBackground";
InitCommand=cmd(zoomto,96,32;diffuse,ThemeColor.Secondary;shadowlength,2;shadowcolor,Color.Alpha(ColorDarkTone(ThemeColor.Primary),0.95));
};
-- BPM Multiple Warning
Def.Quad {
Name="BPMFlag";
InitCommand=cmd(x,32;y,-8;basezoomx,24;basezoomy,4;fadeleft,0.2;faderight,0.2;diffuse,ThemeColor.Primary;thump,1;effectclock,'beatnooffset');
SingleBPMCommand=cmd(finishtweening;decelerate,0.1;zoom,0;zoomx,8;diffusealpha,0);
MultipleBPMCommand=cmd(finishtweening;smooth,0.05;zoom,1;diffusealpha,1;);
};
-- BPM Label
LoadFont("Common Normal") .. {
Name="BPMLabel";
Text="BPM";
InitCommand=cmd(x,-32;y,-8;zoom,0.5);
};
-- BPM Display
LoadActor(THEME:GetPathB("_frame","3x3"),"rounded black",160,20);
-- BPM Display Low
Def.RollingNumbers {
Name="BPMText";
Name="BPMTextLow";
File=THEME:GetPathF("Common","Normal");
InitCommand=cmd(Load,"RollingNumbersBPMDisplay");
OnCommand=cmd(horizalign,left;x,-46;y,6;zoom,0.75;maxwidth,92/0.75;);
OnCommand=cmd(horizalign,left;x,-64;maxwidth,92/0.75;);
BeginCommand=cmd(playcommand,"Set");
CurrentSongChangedMessageCommand=cmd(playcommand,"Set");
SetCommand=function(self);
Song = GAMESTATE:GetCurrentSong();
BPMs = Song:GetDisplayBpms() or {0,0};
-- reset numbers
self:targetnumber( clamp(BPMs[1],0,9999) );
-- (force once)
if (self:getaux() == 0) then
self:settext(clamp(BPMs[1],0,9999));
self:aux( 1 );
end;
end;
};
LoadFont("Common Normal") .. {
Text="-";
};
-- BPM Display High
Def.RollingNumbers {
Name="BPMTextHigh";
File=THEME:GetPathF("Common","Normal");
InitCommand=cmd(Load,"RollingNumbersBPMDisplay");
OnCommand=cmd(horizalign,left;x,8;maxwidth,92/0.75;);
BeginCommand=cmd(playcommand,"Set");
CurrentSongChangedMessageCommand=cmd(playcommand,"Set");
HideCommand=cmd(finishtweening;linear,0.2;diffusealpha,0);
ShowCommand=cmd(finishtweening;decelerate,0.125;diffusealpha,1);
SetCommand=function(self)
Song = GAMESTATE:GetCurrentSong();
BPMs = Song:GetDisplayBpms() or {0,0};
Themes/new/Graphics/ScreenWithMenuElements StageDisplay.lua
+4 -3
View File
@@ -8,10 +8,11 @@ local curStageIndex = GAMESTATE:GetCurrentStageIndex();
local t = Def.ActorFrame {};
t[#t+1] = Def.ActorFrame {
LoadActor(THEME:GetPathB("_frame","3x3"),"rounded black",160,20);
LoadActor(THEME:GetPathB("_frame","3x3"),"rounded black",160,20);
LoadFont("Common Normal") .. {
Text=StageToLocalizedString( curStage ) .. " Stage (" .. curStageIndex .. ")";
InitCommand=cmd(zoom,0.75;y,-2;shadowlength,1;
Text=StageToLocalizedString( curStage ) .. " Stage";
--~ Text=StageToLocalizedString( curStage ) .. " Stage (" .. curStageIndex .. ")";
InitCommand=cmd(shadowlength,1;
diffuse,StageToColor(curStage);
diffusetopedge,ColorLightTone(StageToColor(curStage));
-- shadowcolor,ColorDarkTone(StageToColor(curStage));
Themes/new/Sounds/ScreenWithMenuElements music (loop).ogg
BIN
View File
Binary file not shown.
Themes/new/metrics.ini
+11 -5
View File
@@ -34,20 +34,26 @@ StageDisplayOffCommand=
MusicWheelX=SCREEN_CENTER_X+180
MusicWheelY=SCREEN_CENTER_Y
#
BannerX=SCREEN_CENTER_X-160+32
BannerY=SCREEN_CENTER_Y-100
BannerX=SCREEN_CENTER_X-160
BannerY=SCREEN_CENTER_Y-64-4
BannerOnCommand=draworder,111;scaletoclipped,256,80
BannerOffCommand=
#
ShowBannerFrame=true
BannerFrameX=SCREEN_CENTER_X-128-32
BannerFrameY=SCREEN_CENTER_Y-96-4
BannerFrameY=SCREEN_CENTER_Y-64-4
BannerFrameOnCommand=draworder,110
BannerFrameOffCommand=
#
ShowStageDisplay=true
StageDisplayX=SCREEN_CENTER_X-128-128+12
StageDisplayY=SCREEN_CENTER_Y-64-64
StageDisplayOnCommand=draworder,115;zoom,0.75
StageDisplayOffCommand=
#
ShowBPMDisplay=true
BPMDisplayX=SCREEN_CENTER_X-256
BPMDisplayY=SCREEN_CENTER_Y-128-40
BPMDisplayX=SCREEN_CENTER_X-256+12+160
BPMDisplayY=SCREEN_CENTER_Y-64-64
BPMDisplayOnCommand=draworder,115
BPMDisplayOffCommand=
#