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

deal with some commit issues

Browse Source
This commit is contained in:
Flameshadowxeroshin
2010-09-24 22:43:37 -05:00
parent a617dbdf2c 60c371c169
commit 970a9ab4b4
4 changed files with 47 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/_fallback/BGAnimations/ScreenSelectProfile overlay.lua
+47 -45
View File
@@ -10,11 +10,16 @@ function GetLocalProfiles()
}; --]]
LoadFont("Common Normal") .. {
Text=profile:GetDisplayName();
InitCommand=cmd(shadowlength,1;y,-9;zoom,0.95;ztest,true);
InitCommand=cmd(shadowlength,1;y,-10;zoom,1;ztest,true);
};
LoadFont("Common Normal") .. {
Text=profile:GetNumTotalSongsPlayed() .. " Songs Played";
InitCommand=cmd(shadowlength,1;y,9;zoom,0.5;vertspacing,-8;ztest,true);
InitCommand=cmd(shadowlength,1;y,8;zoom,0.5;vertspacing,-8;ztest,true);
BeginCommand=function(self)
local numSongsPlayed = profile:GetNumTotalSongsPlayed();
local s = numSongsPlayed == 1 and "Song" or "Songs";
-- todo: localize
self:settext( numSongsPlayed.." "..s.." Played" );
end;
};
};
table.insert( ret, item );
@@ -23,29 +28,34 @@ function GetLocalProfiles()
return ret;
end;
function LoadCard(cColor)
local t = Def.ActorFrame {
LoadActor( THEME:GetPathG("ScreenSelectProfile","CardBackground") ) .. {
InitCommand=cmd(diffuse,cColor);
};
LoadActor( THEME:GetPathG("ScreenSelectProfile","CardFrame") );
};
return t
end
function LoadPlayerStuff(Player)
local ret = {};
local pn;
if Player == PLAYER_1 then
pn = 1;
else
pn = 2;
end;
local pn = (Player == PLAYER_1) and 1 or 2;
--[[ local t = LoadActor(THEME:GetPathB('', '_frame 3x3'), 'metal', 200, 230) .. {
Name = 'BigFrame';
}; --]]
local t = Def.ActorFrame {
Name = 'JoinFrame';
Def.Quad {
LoadCard(Color('Orange'));
--[[ Def.Quad {
InitCommand=cmd(zoomto,200+4,230+4);
OnCommand=cmd(shadowlength,1;diffuse,color("0,0,0,0.5"));
};
Def.Quad {
InitCommand=cmd(zoomto,200,230);
OnCommand=cmd(diffuse,Color('Orange');diffusealpha,0.5);
};
}; --]]
LoadFont("Common Normal") .. {
Text="Press &START; to join.";
InitCommand=cmd(shadowlength,1);
@@ -56,14 +66,7 @@ function LoadPlayerStuff(Player)
t = Def.ActorFrame {
Name = 'BigFrame';
Def.Quad {
InitCommand=cmd(zoomto,200+4,230+4);
OnCommand=cmd(shadowlength,1);
};
Def.Quad {
InitCommand=cmd(zoomto,200,230);
OnCommand=cmd(diffuse,PlayerColor(Player));
};
LoadCard(PlayerColor(Player));
};
table.insert( ret, t );
@@ -78,21 +81,21 @@ function LoadPlayerStuff(Player)
}; --]]
InitCommand=cmd(y,-2);
Def.Quad {
InitCommand=cmd(zoomto,200,40+2);
InitCommand=cmd(zoomto,200-10,40+2);
OnCommand=cmd(diffuse,Color('Black');diffusealpha,0.5);
};
Def.Quad {
InitCommand=cmd(zoomto,200,40);
OnCommand=cmd(diffuse,PlayerColor(Player);glow,color("1,1,1,0.25"));
InitCommand=cmd(zoomto,200-10,40);
OnCommand=cmd(diffuse,PlayerColor(Player);fadeleft,0.25;faderight,0.25;glow,color("1,1,1,0.25"));
};
Def.Quad {
InitCommand=cmd(zoomto,200,40;y,-40/2+20);
InitCommand=cmd(zoomto,200-10,40;y,-40/2+20);
OnCommand=cmd(diffuse,Color("Black");fadebottom,1;diffusealpha,0.35);
};
Def.Quad {
InitCommand=cmd(zoomto,200,1;y,-40/2+1);
InitCommand=cmd(zoomto,200-10,1;y,-40/2+1);
OnCommand=cmd(diffuse,PlayerColor(Player);glow,color("1,1,1,0.25"));
};
};
};
table.insert( ret, t );
@@ -100,7 +103,7 @@ function LoadPlayerStuff(Player)
Name = 'Scroller';
NumItemsToDraw=6;
-- InitCommand=cmd(y,-230/2+20;);
OnCommand=cmd(SetFastCatchup,true;SetMask,200,50;SetSecondsPerItem,0.15);
OnCommand=cmd(y,1;SetFastCatchup,true;SetMask,200,58;SetSecondsPerItem,0.15);
TransformFunction=function(self, offset, itemIndex, numItems)
local focus = scale(math.abs(offset),0,2,1,0);
self:visible(false);
@@ -115,14 +118,14 @@ function LoadPlayerStuff(Player)
t = Def.ActorFrame {
Name = "EffectFrame";
Def.Quad {
InitCommand=cmd(y,-230/2;vertalign,top;zoomto,200,8;fadebottom,1);
OnCommand=cmd(diffuse,Color("Black");diffusealpha,0.25);
};
Def.Quad {
InitCommand=cmd(y,230/2;vertalign,bottom;zoomto,200,8;fadetop,1);
OnCommand=cmd(diffuse,Color("Black");diffusealpha,0.25);
};
--[[ Def.Quad {
InitCommand=cmd(y,-230/2;vertalign,top;zoomto,200,8;fadebottom,1);
OnCommand=cmd(diffuse,Color("Black");diffusealpha,0.25);
};
Def.Quad {
InitCommand=cmd(y,230/2;vertalign,bottom;zoomto,200,8;fadetop,1);
OnCommand=cmd(diffuse,Color("Black");diffusealpha,0.25);
}; --]]
};
table.insert( ret, t );
--[[ t = Def.BitmapText {
@@ -133,8 +136,8 @@ function LoadPlayerStuff(Player)
}; --]]
t = LoadFont("Common Normal") .. {
Name = 'SelectedProfileText';
InitCommand=cmd(y,160);
OnCommand=cmd(shadowlength,1);
--InitCommand=cmd(y,160;shadowlength,1;diffuse,PlayerColor(Player));
InitCommand=cmd(y,160;shadowlength,1;);
};
table.insert( ret, t );
@@ -142,15 +145,11 @@ function LoadPlayerStuff(Player)
end;
function UpdateInternal3(self, Player)
local pn;
if Player == PLAYER_1 then
pn = 1;
else
pn = 2;
end;
local pn = (Player == PLAYER_1) and 1 or 2;
local frame = self:GetChild(string.format('P%uFrame', pn));
local scroller = frame:GetChild('Scroller');
local seltext = frame:GetChild('SelectedProfileText');
local joinframe = frame:GetChild('JoinFrame');
local smallframe = frame:GetChild('SmallFrame');
local bigframe = frame:GetChild('BigFrame');
@@ -158,6 +157,7 @@ function UpdateInternal3(self, Player)
frame:visible(true);
if MEMCARDMAN:GetCardState(Player) == 'MemoryCardState_none' then
--using profile if any
joinframe:visible(false);
smallframe:visible(true);
bigframe:visible(true);
seltext:visible(true);
@@ -171,6 +171,7 @@ function UpdateInternal3(self, Player)
scroller:SetDestinationItem(0);
self:queuecommand('UpdateInternal2');
else
joinframe:visible(true);
smallframe:visible(false);
bigframe:visible(false);
scroller:visible(false);
@@ -185,6 +186,7 @@ function UpdateInternal3(self, Player)
SCREENMAN:GetTopScreen():SetProfileIndex(Player, 0);
end;
else
joinframe:visible(true);
scroller:visible(false);
seltext:visible(false);
smallframe:visible(false);
@@ -218,7 +220,7 @@ local t = Def.ActorFrame {
end;
end;
end;
if params.Name == 'Down' or params.Name == 'Down2' or params.Name == 'DownRight' then
if params.Name == 'Down' or params.Name == 'Down2' or params.Name == 'DownRight' then
if GAMESTATE:IsHumanPlayer(params.PlayerNumber) then
local ind = SCREENMAN:GetTopScreen():GetProfileIndex(params.PlayerNumber);
if ind > 0 then
@@ -264,7 +266,7 @@ local t = Def.ActorFrame {
OffCommand=cmd(bouncebegin,0.35;zoom,0);
PlayerJoinedMessageCommand=function(self,param)
if param.Player == PLAYER_1 then
(cmd(bouncebegin,0.175;zoom,1.15;bounceend,0.175;zoom,1.0;))(self);
(cmd(;zoom,1.15;bounceend,0.175;zoom,1.0;))(self);
end;
end;
children = LoadPlayerStuff(PLAYER_1);
@@ -276,7 +278,7 @@ local t = Def.ActorFrame {
OffCommand=cmd(bouncebegin,0.35;zoom,0);
PlayerJoinedMessageCommand=function(self,param)
if param.Player == PLAYER_2 then
(cmd(bouncebegin,0.175;zoom,1.15;bounceend,0.175;zoom,1.0;))(self);
(cmd(zoom,1.15;bounceend,0.175;zoom,1.0;))(self);
end;
end;
children = LoadPlayerStuff(PLAYER_2);
Themes/_fallback/Graphics/ScreenSelectProfile CardBackground.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

Themes/_fallback/Graphics/ScreenSelectProfile CardFrame.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

Themes/themekit/BGAnimations/ScreenSelectProfile overlay.lua
-215
View File
@@ -1,215 +0,0 @@
function GetLocalProfiles()
local ret = {};
for p = 0,PROFILEMAN:GetNumLocalProfiles()-1 do
local profile=PROFILEMAN:GetLocalProfileFromIndex(p);
local item = Def.ActorFrame {
LoadFont("Common Normal") .. {
Text=profile:GetDisplayName();
InitCommand=cmd(shadowlength,1;y,-9);
};
LoadFont("Common Normal") .. {
Text=profile:GetNumTotalSongsPlayed() .. " Songs Played";
InitCommand=cmd(shadowlength,1;y,8;zoom,0.5;vertspacing,-8);
};
};
table.insert( ret, item );
end;
return ret;
end;
function LoadPlayerStuff(Player)
local ret = {};
local pn;
if Player == PLAYER_1 then
pn = 1;
else
pn = 2;
end;
--[[ local t = LoadActor(THEME:GetPathB('', '_frame 3x3'), 'metal', 200, 230) .. {
Name = 'BigFrame';
}; --]]
local t = Def.ActorFrame {
Name = 'BigFrame';
Def.Quad {
InitCommand=cmd(zoomto,200+4,230+4);
OnCommand=cmd(shadowlength,1);
};
Def.Quad {
InitCommand=cmd(zoomto,200,230);
OnCommand=cmd(diffuse,color("0.25,0,0.15,1"));
};
};
table.insert( ret, t );
--[[ t = LoadActor(THEME:GetPathB('', '_frame 3x3'), 'metal', 170, 20) .. {
Name = 'SmallFrame';
}; --]]
t = Def.ActorFrame {
Name = 'SmallFrame';
--[[ Def.Quad {
InitCommand=cmd(zoomto,170+4,32+4);
OnCommand=cmd(shadowlength,1);
}; --]]
Def.Quad {
InitCommand=cmd(zoomto,200,40);
OnCommand=cmd(diffuse,color("0.25,0.5,0.15,1"));
};
};
table.insert( ret, t );
t = Def.ActorScroller{
Name = 'Scroller';
NumItemsToDraw=4;
-- InitCommand=cmd(y,-230/2+20;);
OnCommand=cmd(SetFastCatchup,true;SetMask,200,230;SetSecondsPerItem,0.15);
TransformFunction=function(self, offset, itemIndex, numItems)
local focus = scale(math.abs(offset),0,2,1,0);
self:visible(false);
self:y(math.floor( offset*40 ));
-- self:zoomy( focus );
-- self:z(-math.abs(offset));
-- self:zoom(focus);
end;
children = GetLocalProfiles();
};
table.insert( ret, t );
--[[ t = Def.BitmapText {
OnCommand = cmd(y,160);
Name = 'SelectedProfileText';
Font = "Common Normal";
Text = 'No profile';
}; --]]
t = LoadFont("Common Normal") .. {
Name = 'SelectedProfileText';
InitCommand=cmd(y,160);
OnCommand=cmd(shadowlength,1);
};
table.insert( ret, t );
return ret;
end;
function UpdateInternal3(self, Player)
local pn;
if Player == PLAYER_1 then
pn = 1;
else
pn = 2;
end;
local frame = self:GetChild(string.format('P%uFrame', pn));
local scroller = frame:GetChild('Scroller');
local seltext = frame:GetChild('SelectedProfileText');
local smallframe = frame:GetChild('SmallFrame');
if GAMESTATE:IsHumanPlayer(Player) then
frame:visible(true);
if MEMCARDMAN:GetCardState(Player) == 'MemoryCardState_none' then
--using profile if any
smallframe:visible(true);
scroller:visible(true);
local ind = SCREENMAN:GetTopScreen():GetProfileIndex(Player);
if ind > 0 then
scroller:SetDestinationItem(ind-1);
seltext:settext(PROFILEMAN:GetLocalProfileFromIndex(ind-1):GetDisplayName());
else
if SCREENMAN:GetTopScreen():SetProfileIndex(Player, 1) then
scroller:SetDestinationItem(0);
self:queuecommand('UpdateInternal2');
else
smallframe:visible(false);
scroller:visible(false);
seltext:settext('No profile');
end;
end;
else
--using card
smallframe:visible(false);
scroller:visible(false);
seltext:settext('CARD');
SCREENMAN:GetTopScreen():SetProfileIndex(Player, 0);
end;
else
frame:visible(false);
end;
end;
local t = Def.ActorFrame {
StorageDevicesChangedMessageCommand=function(self, params)
self:queuecommand('UpdateInternal2');
end;
CodeMessageCommand = function(self, params)
if params.Name == 'Start' then
if not GAMESTATE:IsHumanPlayer(params.PlayerNumber) then
SCREENMAN:GetTopScreen():SetProfileIndex(params.PlayerNumber, -1);
else
SCREENMAN:GetTopScreen():Finish();
end;
end;
if params.Name == 'Up' then
if GAMESTATE:IsHumanPlayer(params.PlayerNumber) then
local ind = SCREENMAN:GetTopScreen():GetProfileIndex(params.PlayerNumber);
if ind > 1 then
if SCREENMAN:GetTopScreen():SetProfileIndex(params.PlayerNumber, ind - 1 ) then
self:queuecommand('UpdateInternal2');
end;
end;
end;
end;
if params.Name == 'Down' then
if GAMESTATE:IsHumanPlayer(params.PlayerNumber) then
local ind = SCREENMAN:GetTopScreen():GetProfileIndex(params.PlayerNumber);
if ind > 0 then
if SCREENMAN:GetTopScreen():SetProfileIndex(params.PlayerNumber, ind + 1 ) then
self:queuecommand('UpdateInternal2');
end;
end;
end;
end;
if params.Name == 'Back' then
if GAMESTATE:GetNumPlayersEnabled()==0 then
SCREENMAN:GetTopScreen():Cancel();
else
SCREENMAN:GetTopScreen():SetProfileIndex(params.PlayerNumber, -2);
end;
end;
end;
PlayerJoinedMessageCommand=function(self, params)
self:queuecommand('UpdateInternal2');
end;
PlayerUnjoinedMessageCommand=function(self, params)
self:queuecommand('UpdateInternal2');
end;
OnCommand=function(self, params)
self:queuecommand('UpdateInternal2');
end;
UpdateInternal2Command=function(self)
UpdateInternal3(self, PLAYER_1);
UpdateInternal3(self, PLAYER_2);
end;
children = {
Def.ActorFrame {
Name = 'P1Frame';
InitCommand=cmd(x,SCREEN_CENTER_X-160;y,SCREEN_CENTER_Y;);
OnCommand=cmd(hide_if,not GAMESTATE:IsHumanPlayer(PLAYER_1););
children = LoadPlayerStuff(PLAYER_2);
};
Def.ActorFrame {
Name = 'P2Frame';
InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y;);
OnCommand=cmd(hide_if,not GAMESTATE:IsHumanPlayer(PLAYER_2););
children = LoadPlayerStuff(PLAYER_2);
};
};
};
return t;