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

Cleanup, part 2 (working on fallback)

Browse Source
This commit is contained in:
Colby Klein
2011-08-18 11:35:14 -07:00
parent e9c0794bba
commit bf4a10ce7b
10 changed files with 118 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/_fallback/Scripts/02 Other.lua
+38 -32
View File
@@ -8,37 +8,37 @@ function LoadFallbackB()
-- The fallback metrics group and element name will come either from LuaThreadVars
-- (loading from C++) or from the Lua globals above (loading from Lua).
--Warn( "g_element " .. (g_element or "") );
--Warn( "MatchingElement " .. (Var 'MatchingElement' or "") );
--Warn( "g_metrics_group " .. (g_metrics_group or "") );
--Warn( "MatchingMetricsGroup " .. (Var 'MatchingMetricsGroup' or "") );
--Warn( "g_element " .. (g_element or "") )
--Warn( "MatchingElement " .. (Var 'MatchingElement' or "") )
--Warn( "g_metrics_group " .. (g_metrics_group or "") )
--Warn( "MatchingMetricsGroup " .. (Var 'MatchingMetricsGroup' or "") )
local metrics_group = g_metrics_group or Var 'MatchingMetricsGroup';
local element = g_element or Var 'MatchingElement';
local fallback = THEME:GetMetric(metrics_group,'Fallback');
local metrics_group = g_metrics_group or Var 'MatchingMetricsGroup'
local element = g_element or Var 'MatchingElement'
local fallback = THEME:GetMetric(metrics_group,'Fallback')
local old_metrics_group = g_metrics_group;
local old_element = g_element;
local old_metrics_group = g_metrics_group
local old_element = g_element
local path;
path, g_metrics_group, g_element = THEME:GetPathInfoB(fallback,element);
--Trace('path ' .. path );
local t = LoadActor( path );
local path
path, g_metrics_group, g_element = THEME:GetPathInfoB(fallback,element)
--Trace('path ' .. path )
local t = LoadActor( path )
g_metrics_group = old_metrics_group;
g_element = old_element;
g_metrics_group = old_metrics_group
g_element = old_element
return t;
return t
end
function FormatNumSongsPlayed( num )
local s = num..' song';
local s = num..' song'
if s == 1 then
s = s .. ' ';
s = s .. ' '
else
s = s .. 's';
s = s .. 's'
end
return s..' played';
return s..' played'
end
function JudgmentTransformCommand( self, params )
@@ -87,7 +87,7 @@ function GetEditModeSubScreens()
"ScreenMiniMenuInsertTapAttack," ..
"ScreenMiniMenuInsertCourseAttack," ..
"ScreenMiniMenuCourseDisplay," ..
"ScreenEditOptions";
"ScreenEditOptions"
end
function GetCoursesToShowRanking()
@@ -105,24 +105,30 @@ end
ScreenMetric = Screen.Metric
Screen.String = function ( sName )
local sClass = Var "LoadingScreen";
local sClass = Var "LoadingScreen"
return THEME:GetString( sClass, sName )
end
ScreenString = Screen.String
function TextBannerAfterSet(self,param)
local Title=self:GetChild("Title");
local Subtitle=self:GetChild("Subtitle");
--local Artist=self:GetChild("Artist");
local Title=self:GetChild("Title")
local Subtitle=self:GetChild("Subtitle")
if Subtitle:GetText() == "" then
(cmd(maxwidth,208;y,0;zoom,1.0;))(Title);
(cmd(visible,false))(Subtitle);
--(cmd(zoom,0.66;maxwidth,300;y,7))(Artist);
Title:maxwidth(208)
Title:y(0)
Title:zoom(1)
Subtitle:visible(false)
else
-- subtitle below
(cmd(zoom,1;y,-6;zoom,0.9;))(Title);
(cmd(visible,true;zoom,0.6;y,7))(Subtitle);
--(cmd(zoom,0.66;maxwidth,300;y,9))(Artist);
Title:zoom(1)
Title:y(-6)
Title:zoom(0.9)
-- subtitle below title
Subtitle:visible(true)
Subtitle:zoom(0.6)
Subtitle:y(7)
end
end