Revert "DONE! All lua is future-proofed."
This reverts commit afd0dac0c1.
This commit is contained in:
@@ -1,24 +1,11 @@
|
||||
local gc = Var("GameCommand");
|
||||
local t = Def.ActorFrame {};
|
||||
t[#t+1] = Def.ActorFrame {
|
||||
GainFocusCommand=function(self)
|
||||
self:stoptweening();
|
||||
self:bob(); -- the heck is this?
|
||||
self:effectmagnitude(0, 6, 0);
|
||||
self:decelerate(0.05);
|
||||
self:zoom(1);
|
||||
end;
|
||||
LoseFocusCommand=function(self)
|
||||
self:stoptweening();
|
||||
self:stopeffect();
|
||||
self:decelerate(0.1);
|
||||
self:zoom(0.6);
|
||||
end;
|
||||
GainFocusCommand=cmd(stoptweening;bob;effectmagnitude,0,6,0;decelerate,0.05;zoom,1);
|
||||
LoseFocusCommand=cmd(stoptweening;stopeffect;decelerate,0.1;zoom,0.6);
|
||||
|
||||
LoadActor("_background base")..{
|
||||
InitCommand=function(self)
|
||||
self:diffuse(ModeIconColors[gc:GetName()]);
|
||||
end;
|
||||
InitCommand=cmd(diffuse,ModeIconColors[gc:GetName()]);
|
||||
};
|
||||
LoadActor("_background effect");
|
||||
LoadActor("_gloss");
|
||||
@@ -27,46 +14,24 @@ t[#t+1] = Def.ActorFrame {
|
||||
|
||||
-- todo: generate a better font for these.
|
||||
LoadFont("_helveticaneuelt std extblk cn 42px")..{
|
||||
InitCommand=function(self)
|
||||
self:y(-12);
|
||||
self:zoom(1.1);
|
||||
self:diffuse(color("#000000"));
|
||||
self:uppercase(true);
|
||||
self:settext(gc:GetText());
|
||||
end;
|
||||
GainFocusCommand=function(self)
|
||||
self:diffuse(Color.Black);
|
||||
self:stopeffect();
|
||||
end;
|
||||
LoseFocusCommand=function(self)
|
||||
self:diffuse(Color.Black);
|
||||
self:stopeffect();
|
||||
end;
|
||||
InitCommand=cmd(y,-12;zoom,1.1;diffuse,color("#000000");uppercase,true;settext,gc:GetText(););
|
||||
GainFocusCommand=cmd(diffuse,Color.Black;stopeffect);
|
||||
LoseFocusCommand=cmd(diffuse,Color.Black;stopeffect);
|
||||
};
|
||||
LoadFont("_helveticaneuelt std extblk cn 42px")..{
|
||||
InitCommand=function(self)
|
||||
self:y(27.5);
|
||||
self:zoom(0.45);
|
||||
self:maxwidth(320 * 1.6);
|
||||
self:uppercase(true);
|
||||
self:settext(THEME:GetString(Var "LoadingScreen", gc:GetName().."Explanation"));
|
||||
end;
|
||||
GainFocusCommand=function(self)
|
||||
self:diffuse(Color.White);
|
||||
self:stopeffect();
|
||||
end;
|
||||
LoseFocusCommand=function(self)
|
||||
self:diffuse(Color.White);
|
||||
self:stopeffect();
|
||||
end;
|
||||
InitCommand=cmd(y,27.5;zoom,0.45;maxwidth,320*1.6;uppercase,true;settext,THEME:GetString(Var "LoadingScreen", gc:GetName().."Explanation"));
|
||||
GainFocusCommand=cmd(diffuse,Color.White;stopeffect);
|
||||
LoseFocusCommand=cmd(diffuse,Color.White;stopeffect);
|
||||
};
|
||||
LoadActor("_background base") .. {
|
||||
DisabledCommand=function(self)
|
||||
self:diffuse(color("0,0,0,0.5"));
|
||||
end;
|
||||
EnabledCommand=function(self)
|
||||
self:diffuse(color("1,1,1,0"));
|
||||
end;
|
||||
DisabledCommand=cmd(diffuse,color("0,0,0,0.5"));
|
||||
EnabledCommand=cmd(diffuse,color("1,1,1,0"));
|
||||
};
|
||||
--[[
|
||||
LoadActor(THEME:GetPathG("_SelectIcon",gc:GetName() )) .. {
|
||||
DisabledCommand=cmd(diffuse,color("0.5,0.5,0.5,1"));
|
||||
EnabledCommand=cmd(diffuse,color("1,1,1,1"));
|
||||
};
|
||||
--]]
|
||||
};
|
||||
return t
|
||||
Reference in New Issue
Block a user