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

small cleanup on aisle number ScreenNameEntryTraditional

Browse Source
This commit is contained in:
AJ Kelly
2011-10-15 18:25:07 -05:00
parent 460be0a069
commit ffa977baf0
1 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/_fallback/BGAnimations/ScreenNameEntryTraditional underlay/keyboard.lua
+6 -20
View File
@@ -19,8 +19,7 @@ end
local MapNameToLetter = {}; local MapNameToLetter = {};
local MapLetterToName = {}; local MapLetterToName = {};
local letter = LoadFont( "Common Normal" ) .. { local letter = LoadFont("Common Normal")..{
-- local letter = LoadFont( "_regra bold 30px" ) .. {
InitCommand=cmd(zoom,0.8;shadowlength,0); InitCommand=cmd(zoom,0.8;shadowlength,0);
PulseCommand = function(self) PulseCommand = function(self)
self:finishtweening(); self:finishtweening();
@@ -33,19 +32,14 @@ for l in ivalues(Letters) do
local Name = "letter " .. l; local Name = "letter " .. l;
MapNameToLetter[Name] = l; MapNameToLetter[Name] = l;
MapLetterToName[l] = Name; MapLetterToName[l] = Name;
children[#children+1] = letter .. { children[#children+1] = letter..{
Name = Name; Name = Name;
Text = l; Text = l;
}; };
if l == "BACK" or l == "ENTER" then if l == "BACK" or l == "ENTER" then
children[#children].File = THEME:GetPathF("", "Common Normal"); children[#children].File = THEME:GetPathF("Common", "Normal");
-- children[#children].File = THEME:GetPathF("", "_venacti 26px normal");
end; end;
end; end;
--[[ children[#children+1] = LoadActor( THEME:GetPathS(Var "LoadingScreen", "type key") ) .. { Name = "Type"; SupportPan = true; }
children[#children+1] = LoadActor( THEME:GetPathS(Var "LoadingScreen", "back") ) .. { Name = "Back"; SupportPan = true; }
children[#children+1] = LoadActor( THEME:GetPathS(Var "LoadingScreen", "enter") ) .. { Name = "Enter"; SupportPan = true; }
children[#children+1] = LoadActor( THEME:GetPathS(Var "LoadingScreen", "move cursor") ) .. { Name = "Move"; SupportPan = true; } --]]
children[#children+1] = LoadActor( THEME:GetPathS("Common", "value") ) .. { Name = "Type"; SupportPan = true; } children[#children+1] = LoadActor( THEME:GetPathS("Common", "value") ) .. { Name = "Type"; SupportPan = true; }
children[#children+1] = LoadActor( THEME:GetPathS("Common", "cancel") ) .. { Name = "Back"; SupportPan = true; } children[#children+1] = LoadActor( THEME:GetPathS("Common", "cancel") ) .. { Name = "Back"; SupportPan = true; }
children[#children+1] = LoadActor( THEME:GetPathS("Common", "start") ).. { Name = "Enter"; SupportPan = true; } children[#children+1] = LoadActor( THEME:GetPathS("Common", "start") ).. { Name = "Enter"; SupportPan = true; }
@@ -60,7 +54,7 @@ for pn in ivalues(PlayerNumber) do
children[#children+1] = LoadActor( THEME:GetPathG("_frame", "1D"), children[#children+1] = LoadActor( THEME:GetPathG("_frame", "1D"),
{ 4/10, 2/10, 4/10 }, { 4/10, 2/10, 4/10 },
LoadActor(CursorFiles[pn]) LoadActor(CursorFiles[pn])
) .. { )..{
Name = CursorFiles[pn]; Name = CursorFiles[pn];
BeginCommand = cmd(visible,SCREENMAN:GetTopScreen():GetEnteringName(pn)); BeginCommand = cmd(visible,SCREENMAN:GetTopScreen():GetEnteringName(pn));
OnCommand = cmd( OnCommand = cmd(
@@ -77,10 +71,7 @@ for pn in ivalues(PlayerNumber) do
self:playcommand("TweenOff" ); self:playcommand("TweenOff" );
end; end;
TweenOffCommand = function(self,param) TweenOffCommand = function(self,param)
(cmd( (cmd(accelerate,0.25;zoomx,0;))(self);
accelerate,0.25;
zoomx,0;
))(self);
end; end;
}; };
end end
@@ -116,8 +107,7 @@ return Def.ActorFrame {
local fY = 0; local fY = 0;
local iRow = 1; local iRow = 1;
for l in ivalues(Letters) do for l in ivalues(Letters) do
if l == "O" or l == "0" or l == "BACK" if l == "O" or l == "0" or l == "BACK" then
then
fX = 0; fX = 0;
fY = fY + 30; fY = fY + 30;
iRow = iRow + 1; iRow = iRow + 1;
@@ -248,8 +238,6 @@ return Def.ActorFrame {
PlayerX[pn] = Keys[key].Text:GetX(); PlayerX[pn] = Keys[key].Text:GetX();
PlayerY[pn] = Keys[key].Text:GetY(); PlayerY[pn] = Keys[key].Text:GetY();
end end
-- SCREENMAN:GetTopScreen():EnterKey(PLAYER_2,"x");
end; end;
MenuTimerExpiredMessageCommand = function(self, param) MenuTimerExpiredMessageCommand = function(self, param)
for pn in ivalues(PlayerNumber) do for pn in ivalues(PlayerNumber) do
@@ -261,7 +249,6 @@ return Def.ActorFrame {
OnCommand = function(self, param) OnCommand = function(self, param)
for key in ivalues(Letters) do for key in ivalues(Letters) do
local fDist = distance( Keys[key].Text:GetX(), Keys[key].Text:GetY(), 0, 100 ); local fDist = distance( Keys[key].Text:GetX(), Keys[key].Text:GetY(), 0, 100 );
local f = cmd( local f = cmd(
diffusealpha,0;zoom,0; diffusealpha,0;zoom,0;
sleep,0.25 + (fDist / 400); sleep,0.25 + (fDist / 400);
@@ -274,7 +261,6 @@ return Def.ActorFrame {
OffCommand = function(self, param) OffCommand = function(self, param)
for key in ivalues(Letters) do for key in ivalues(Letters) do
local fDist = distance( Keys[key].Text:GetX(), Keys[key].Text:GetY(), 0, 100 ); local fDist = distance( Keys[key].Text:GetX(), Keys[key].Text:GetY(), 0, 100 );
local f = cmd( local f = cmd(
sleep,0.0 + (fDist / 400); sleep,0.0 + (fDist / 400);
decelerate,0.5; decelerate,0.5;