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

Fix up theme a little. Sorry about the head clobber.

Browse Source 
~ [ScreenSelectMusic] Change CDTitle Display.
~ [ScreenSelectPlayMode] Change icons due to ActorFrame propagation.
- [ScreenSelectPlayStyle] Remove couple, routine. These cause crashes.
- [ScreenOptionsArcade] Remove Premium choice. Requests lang strings that don't exist.
This commit is contained in:
Jonathan Payne
2013-06-04 02:12:58 -07:00
parent 93f98c429d
commit a72416e039
16 changed files with 63 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/_fallback/Scripts/03 Gameplay.lua
+2 -2
View File
@@ -43,8 +43,8 @@ end
-- [en] returns possible modes for ScreenSelectPlayMode
function GameCompatibleModes()
local Modes = {
dance = "Single,Double,Solo,Versus,Couple",
pump = "Single,Double,HalfDouble,Versus,Couple,Routine",
dance = "Single,Double,Solo,Versus",
pump = "Single,Double,HalfDouble,Versus",
beat = "5Keys,7Keys,10Keys,14Keys,Versus5,Versus7",
kb7 = "KB7",
para = "Single",
Themes/_fallback/metrics.ini
+3 -3
View File
@@ -467,8 +467,8 @@ SortLevel5Color=color("0,1,0,1")
# Custom system that lets you rename certain classes of difficulties to
# something else. Mostly for custom games and game emulation, PIU for example.
Names="PumpHard,PumpFreestyle,PumpNightmare"
#~ Names="PumpHard,PumpFreestyle,PumpNightmare,PumpHalfDoubleEasy,PumpHalfDoubleMedium,PumpHalfDoubleHard,PumpHalfDoubleExpert"
#Names="PumpHard,PumpFreestyle,PumpNightmare"
Names="PumpHard,PumpFreestyle,PumpNightmare,PumpHalfDoubleEasy,PumpHalfDoubleMedium,PumpHalfDoubleHard,PumpHalfDoubleExpert"
# Dance Couple Beginner
DanceCoupleBeginnerStepsType="StepsType_Dance_Couple"
DanceCoupleBeginnerDifficulty="Difficulty_Beginner"
@@ -3001,7 +3001,7 @@ Fallback="ScreenOptionsServiceChild"
NextScreen="ScreenOptionsService"
PrevScreen="ScreenOptionsService"
# stuff tied to arcade features
LineNames="1,2,3,4,5,6"
LineNames="1,2,3,5,6"
Line1="conf,GetRankingName"
Line2="conf,CoinMode"
Line3="conf,SongsPerPlay"
Themes/default/BGAnimations/ScreenDemonstration decorations.lua
-1
View File
@@ -1,3 +1,2 @@
local t = LoadFallbackB();
t[#t+1] = LoadActor( THEME:GetPathB("_Arcade","decorations") );
return t
Themes/default/BGAnimations/ScreenHowToPlay decorations.lua
-1
View File
@@ -1,3 +1,2 @@
local t = LoadFallbackB();
t[#t+1] = LoadActor( THEME:GetPathB("_Arcade","decorations") );
return t
Themes/default/BGAnimations/ScreenInit decorations.lua
-1
View File
@@ -1,3 +1,2 @@
local t = LoadFallbackB();
t[#t+1] = LoadActor( THEME:GetPathB("_Arcade","decorations") );
return t
Themes/default/BGAnimations/ScreenLogo decorations.lua
-1
View File
@@ -1,6 +1,5 @@
local t = LoadFallbackB();
t[#t+1] = StandardDecorationFromFileOptional("Logo","Logo");
t[#t+1] = LoadActor( THEME:GetPathB("_Arcade","decorations") );
return t;
Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua
+40
View File
@@ -166,6 +166,46 @@ t[#t+1] = StandardDecorationFromFileOptional("SongTime","SongTime") .. {
}
if not GAMESTATE:IsCourseMode() then
local function CDTitleUpdate(self)
local song = GAMESTATE:GetCurrentSong();
local cdtitle = self:GetChild("CDTitle");
local height = cdtitle:GetHeight();
local width = cdtitle:GetWidth();
if song then
if song:HasCDTitle() then
cdtitle:visible(true);
cdtitle:Load(song:GetCDTitlePath());
else
cdtitle:visible(false);
end;
else
cdtitle:visible(false);
end;
if height >= 60 and width >= 80 then
if height*(80/60) >= width then
cdtitle:zoom(60/height);
else
cdtitle:zoom(80/width);
end;
elseif height >= 60 then
cdtitle:zoom(60/height);
elseif width >= 80 then
cdtitle:zoom(80/width);
else
cdtitle:zoom(1);
end;
end;
t[#t+1] = Def.ActorFrame {
OnCommand=cmd(draworder,105;x,SCREEN_CENTER_X-76;y,SCREEN_CENTER_Y-72;zoomy,0;sleep,0.5;decelerate,0.25;zoomy,1;SetUpdateFunction,CDTitleUpdate);
OffCommand=cmd(bouncebegin,0.15;zoomx,0);
Def.Sprite {
Name="CDTitle";
InitCommand=cmd(y,19);
--OnCommand=cmd(draworder,106;shadowlength,1;zoom,0.75;diffusealpha,1;zoom,0;bounceend,0.35;zoom,0.75;spin;effectmagnitude,0,180,0);
};
};
t[#t+1] = StandardDecorationFromFileOptional("NewSong","NewSong") .. {
-- ShowCommand=THEME:GetMetric(Var "LoadingScreen", "NewSongShowCommand" );
-- HideCommand=THEME:GetMetric(Var "LoadingScreen", "NewSongHideCommand" );
Themes/default/BGAnimations/ScreenSelectMusic overlay.lua
+1 -52
View File
@@ -1,52 +1 @@
local t = Def.ActorFrame {
OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_BOTTOM-96;zoomy,0;sleep,0.5;decelerate,0.25;zoomy,1);
OffCommand=cmd(bouncebegin,0.15;zoomx,0);
LoadActor(THEME:GetPathG("CDTitle", "Con")) .. {
InitCommand=cmd(diffuse,Color("Orange"));
};
LoadFont("Common Normal") .. {
Text="Author";
InitCommand=cmd(zoom,0.7;y,-36,diffuse,0,0,0,1;shadowlength,1); -- strokecolor,Color("Black")
};
Def.Sprite {
Name="CDTitle";
InitCommand=cmd(y,19);
--OnCommand=cmd(draworder,106;shadowlength,1;zoom,0.75;diffusealpha,1;zoom,0;bounceend,0.35;zoom,0.75;spin;effectmagnitude,0,180,0);
};
};
local function Update(self)
local song = GAMESTATE:GetCurrentSong();
local cdtitle = self:GetChild("CDTitle");
local height = cdtitle:GetHeight();
local width = cdtitle:GetWidth();
if song then
if song:HasCDTitle() then
cdtitle:visible(true);
cdtitle:Load(song:GetCDTitlePath());
else
cdtitle:visible(false);
end;
else
cdtitle:visible(false);
end;
if height >= 60 and width >= 80 then
if height*(80/60) >= width then
cdtitle:zoom(60/height);
else
cdtitle:zoom(80/width);
end;
elseif height >= 60 then
cdtitle:zoom(60/height);
elseif width >= 80 then
cdtitle:zoom(80/width);
else
cdtitle:zoom(1);
end;
end;
t.InitCommand=cmd(SetUpdateFunction,Update);
return t--]]
return {};
Themes/default/BGAnimations/ScreenTitleJoin decorations.lua
-1
View File
@@ -1,3 +1,2 @@
local t = LoadFallbackB();
t[#t+1] = LoadActor( THEME:GetPathB("_Arcade","decorations") );
return t
Themes/default/BGAnimations/ScreenTitleJoin overlay.lua
+1 -1
View File
@@ -4,7 +4,7 @@ local t = Def.ActorFrame{};
if GAMESTATE:IsEventMode() then
t[#t+1] = LoadFont("Common normal")..{
Text=Screen.String("EventMode");
InitCommand=cmd(CenterX;y,SCREEN_BOTTOM-72;zoom,0.75;diffuse,HSV(56,0.8,1));
InitCommand=cmd(CenterX;y,SCREEN_BOTTOM-72;zoom,0.75;diffuse,HSV(56,0.8,1);shadowlength,1);
};
end;
Themes/default/BGAnimations/_Arcade decorations/default.lua
+1 -1
View File
@@ -13,7 +13,7 @@ t[#t+1] = Def.ActorFrame {
};
LoadFont("Common Normal") .. {
InitCommand=cmd(zoom,0.75;shadowlength,1;glowshift;strokecolor,Color("Outline");diffuse,Color("Orange");diffusetopedge,Color("Yellow");textglowmode,'TextGlowMode_Inner');
Text="PRESS ENTER";
Text=THEME:GetString("ScreenTitleJoin","HelpTextWait");
OnCommand=cmd(playcommand,"Refresh");
CoinInsertedMessageCommand=cmd(playcommand,"Refresh");
CoinModeChangedMessageCommand=cmd(playcommand,"Refresh");
Themes/default/Graphics/ScreenSelectPlayMode Icon/default.lua
+7 -5
View File
@@ -1,10 +1,8 @@
local gc = Var("GameCommand");
local t = Def.ActorFrame {};
t[#t+1] = Def.ActorFrame {
GainFocusCommand=THEME:GetMetric(Var "LoadingScreen","IconGainFocusCommand");
LoseFocusCommand=THEME:GetMetric(Var "LoadingScreen","IconLoseFocusCommand");
-- IconGainFocusCommand=cmd(stoptweening;glowshift;decelerate,0.125;zoom,1);
-- IconLoseFocusCommand=cmd(stoptweening;stopeffect;decelerate,0.125;zoom,fZoom);
t[#t+1] = Def.ActorFrame {
GainFocusCommand=cmd(stoptweening;bob;effectmagnitude,0,6,0;decelerate,0.125;zoom,1);
LoseFocusCommand=cmd(stoptweening;stopeffect;decelerate,0.125;zoom,0.6);
LoadActor("_background base")..{
InitCommand=cmd(diffuse,ModeIconColors[gc:GetName()]);
@@ -17,9 +15,13 @@ t[#t+1] = Def.ActorFrame {
-- todo: generate a better font for these.
LoadFont("_helveticaneuelt std extblk cn 42px")..{
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=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=cmd(diffuse,color("0,0,0,0.5"));
Themes/default/Graphics/ScreenWithMenuElements Footer.lua
+1 -1
View File
@@ -1,7 +1,7 @@
local t = Def.ActorFrame {};
t[#t+1] = Def.Quad {
InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH+1,32;diffuse,Color.Black);
InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH+1,34;diffuse,Color.Black);
};
return t;
Themes/default/Graphics/ScreenWithMenuElements header/default.lua
+1 -1
View File
@@ -1,7 +1,7 @@
local t = Def.ActorFrame {};
t[#t+1] = Def.Quad {
InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH+1,48;diffuse,Color.Black);
InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH+1,50;diffuse,Color.Black);
}
--[[ t[#t+1] = LoadActor("Header") .. {
InitCommand=cmd(vertalign,top;zoomtowidth,SCREEN_WIDTH+1;diffuse,color("#ffd400"));
Themes/default/Languages/en.ini
+1 -1
View File
@@ -19,7 +19,7 @@ TimingDifficulty=Timing Difficulty: %s
[ScreenTitleJoin]
HelpText=Press &START; to Play
HelpTextJoin=Press &START; to Play
HelpTextWait=Insert Credits...
HelpTextWait=Insert Credits!
EventMode=Event Mode
JointPremiumMain=Joint Premium
JointPremiumSecondary=Two players can play with one credit!
Themes/default/metrics.ini
+5 -5
View File
@@ -567,13 +567,13 @@ ScreenOutDelay=0
FOV=90
ShowHeader=true
HeaderX=SCREEN_CENTER_X
HeaderY=SCREEN_TOP
HeaderY=SCREEN_TOP-2
HeaderOnCommand=draworder,5;
HeaderOffCommand=
ShowFooter=true
FooterX=SCREEN_CENTER_X
FooterY=SCREEN_BOTTOM
FooterY=SCREEN_BOTTOM+2
FooterOnCommand=draworder,5;vertalign,bottom;zoomtowidth,SCREEN_WIDTH+1;
FooterOffCommand=
@@ -2218,9 +2218,9 @@ LogoY=SCREEN_CENTER_Y-28
LogoOnCommand=bob;effectperiod,4;effectmagnitude,0,5.25,0;zoom,0;bounceend,0.35;zoom,0.75
LogoOffCommand=stopeffect;bouncebegin,0.35;rotationz,360;zoom,0
VersionInfoX=SCREEN_CENTER_X+114
VersionInfoY=SCREEN_CENTER_Y+44
VersionInfoOnCommand=horizalign,right;vertalign,bottom;bob;effectperiod,4;effectmagnitude,0,5.25,0;zoom,0;bounceend,0.35;zoom,0.65;shadowlength,1;shadowcolor,color("0.2,0.2,0.2,0.925");
VersionInfoX=SCREEN_CENTER_X+110
VersionInfoY=SCREEN_CENTER_Y+4
VersionInfoOnCommand=horizalign,right;vertalign,bottom;bob;effectperiod,4;effectmagnitude,0,5.25,0;zoom,0;bounceend,0.35;zoom,1;shadowlength,1;shadowcolor,color("0.2,0.2,0.2,0.925");
ScrollerOnCommand=visible,false;
ArcadeOverlay.TextY=SCREEN_BOTTOM-128