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

Extended -> Nonstop (internally), get rid of segment display "fade" effect, etc.

Browse Source
This commit is contained in:
Jonathan Payne
2012-01-07 16:01:51 -08:00
parent 146ec27083
commit 01c44d2cd9
8 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/_fallback/metrics.ini
+2 -2
View File
@@ -1904,7 +1904,7 @@ PrevScreen=Branch.TitleMenu()
TimerSeconds=30
#
DefaultChoice="Normal"
ChoiceNames="Normal,Rave,Extended,Oni,Endless"
ChoiceNames="Normal,Rave,Nonstop,Oni,Endless"
#
PerChoiceScrollElement=false
PerChoiceIconElement=false
@@ -1917,7 +1917,7 @@ ChoiceEasy="applydefaultoptions;name,Easy;text,Easy;playmode,regular;difficulty,
ChoiceNormal="applydefaultoptions;name,Normal;text,Normal;playmode,regular;difficulty,easy;screen,ScreenSelectMusic;setenv,sMode,Normal"
ChoiceHard="applydefaultoptions;name,Hard;text,Hard;playmode,regular;difficulty,hard;screen,ScreenSelectMusic;setenv,sMode,Normal"
ChoiceRave="applydefaultoptions;name,Rave;text,Rave;playmode,rave;screen,ScreenSelectMusic;setenv,sMode,Rave"
ChoiceExtended="applydefaultoptions;name,Extended;text,Extended;playmode,nonstop;screen,ScreenSelectCourse;setenv,sMode,Extended"
ChoiceNonstop="applydefaultoptions;name,Nonstop;text,Extended;playmode,nonstop;screen,ScreenSelectCourse;setenv,sMode,Nonstop"
ChoiceOni="applydefaultoptions;name,Oni;text,Oni;playmode,oni;screen,ScreenSelectCourse;setenv,sMode,Oni"
ChoiceEndless="applydefaultoptions;name,Endless;text,Endless;playmode,endless;screen,ScreenSelectCourse;setenv,sMode,Endless"
Themes/default/BGAnimations/ScreenGameplay decorations/default.lua
+3 -3
View File
@@ -84,7 +84,7 @@ local function CreateSegments(Player)
};
end;
for i=1,#bpms do
for i=2,#bpms do
local data = split("=",bpms[i]);
bpmFrame[#bpmFrame+1] = CreateLine(data[1], 0,
"#00808077", "#00808077", "#00808077", "#FF634777", "#FF000077");
@@ -198,10 +198,10 @@ t[#t+1] = StandardDecorationFromFileOptional("StageDisplay","StageDisplay");
t[#t+1] = StandardDecorationFromFileOptional("SongTitle","SongTitle");
t[#t+1] = Def.ActorFrame {
InitCommand=cmd(x,SCREEN_RIGHT;y,SCREEN_BOTTOM;draworder,5);
LoadActor("_whatsup") .. {
--[[ LoadActor("_whatsup") .. {
InitCommand=cmd(horizalign,left;vertalign,top);
ToastyMessageCommand=cmd(smooth,3;x,-256;y,-200;sleep,2;smooth,3;x,256;y,200)
};
}; ]]
};
if( not GAMESTATE:IsCourseMode() ) then
t[#t+1] = Def.Actor{
Themes/default/Graphics/ScreenSelectPlayMode Icon/default.lua
+1 -1
View File
@@ -16,7 +16,7 @@ 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:GetName(););
InitCommand=cmd(y,-12;zoom,1.1;diffuse,color("#000000");uppercase,true;settext,gc:GetText(););
};
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"));
Themes/default/Graphics/ScreenSelectPlayMode scroller/Extended.png → Themes/default/Graphics/ScreenSelectPlayMode scroller/Nonstop.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

Themes/default/Graphics/ScreenSelectPlayMode scroller/default.lua
+7 -7
View File
@@ -4,7 +4,7 @@ local colors = {
Normal = color("#feee00"),
Hard = color("#feee00"),
Rave = color("#c44dff"),
Extended = color("#00ffff"),
Nonstop = color("#00ffff"),
Oni = color("#d70b8c"),
Endless = color("748392"),
};
@@ -14,7 +14,7 @@ t[#t+1] = Def.ActorFrame {
-- GainFocusCommand=cmd(visible,true);
-- LoseFocusCommand=cmd(visible,false);
LoadActor("_HighlightFrame") .. {
InitCommand=cmd(diffuse,colors[gc:GetName()];diffusealpha,0);
InitCommand=cmd(diffuse,ModeIconColors[gc:GetName()];diffusealpha,0);
GainFocusCommand=cmd(stoptweening;linear,0.125;diffusealpha,1);
LoseFocusCommand=cmd(stoptweening;linear,0.125;diffusealpha,0);
OffFocusedCommand=cmd(finishtweening;glow,Color("White");decelerate,1.5;glow,Color("Invisible"));
@@ -29,27 +29,27 @@ t[#t+1] = Def.ActorFrame {
InitCommand=cmd(x,2;y,2;diffuse,Color("Black");diffusealpha,0;zoom,0.75);
GainFocusCommand=cmd(stoptweening;stopeffect;smooth,0.125;diffusealpha,0;zoom,1;decelerate,0.25;diffusealpha,0.5;pulse;effecttiming,0.75,0.125,0.125,0.75;effectmagnitude,0.95,1,1;);
LoseFocusCommand=cmd(stoptweening;stopeffect;smooth,0.25;diffusealpha,0;zoom,0.75;);
OffFocusedCommand=cmd(finishtweening;stopeffect;glow,colors[gc:GetName()];decelerate,1.75;rotationy,360*1;);
OffFocusedCommand=cmd(finishtweening;stopeffect;glow,ModeIconColors[gc:GetName()];decelerate,1.75;rotationy,360*1;);
};
-- Main Emblem
LoadActor( gc:GetName() ) .. {
InitCommand=cmd(diffusealpha,0;zoom,0.75);
GainFocusCommand=cmd(stoptweening;stopeffect;smooth,0.125;diffusealpha,1;zoom,1;glow,Color("White");decelerate,0.25;glow,Color("Invisible");pulse;effecttiming,0.75,0.125,0.125,0.75;effectmagnitude,0.95,1,1;);
LoseFocusCommand=cmd(stoptweening;stopeffect;smooth,0.25;diffusealpha,0;zoom,0.75;glow,Color("Invisible"));
OffFocusedCommand=cmd(finishtweening;stopeffect;glow,colors[gc:GetName()];decelerate,1.75;rotationy,360*1;glow,Color("Invisible"));
OffFocusedCommand=cmd(finishtweening;stopeffect;glow,ModeIconColors[gc:GetName()];decelerate,1.75;rotationy,360*1;glow,Color("Invisible"));
};
};
-- Text Frame
t[#t+1] = Def.ActorFrame {
InitCommand=cmd(x,-192/2;y,-10);
Def.Quad {
InitCommand=cmd(horizalign,left;y,20;zoomto,320,2;diffuse,colors[gc:GetName()];diffusealpha,0;fadeleft,0.35;faderight,0.35);
InitCommand=cmd(horizalign,left;y,20;zoomto,320,2;diffuse,ModeIconColors[gc:GetName()];diffusealpha,0;fadeleft,0.35;faderight,0.35);
GainFocusCommand=cmd(stoptweening;linear,0.2;diffusealpha,1);
LoseFocusCommand=cmd(stoptweening;linear,0.2;diffusealpha,0);
};
LoadFont("_helveticaneuelt std extblk cn 42px") .. {
Text=gc:GetName();
InitCommand=cmd(horizalign,left;diffuse,colors[gc:GetName()];shadowcolor,ColorDarkTone(colors[gc:GetName()]);shadowlength,2;diffusealpha,0;skewx,-0.125);
Text=gc:GetText();
InitCommand=cmd(horizalign,left;diffuse,ModeIconColors[gc:GetName()];shadowcolor,ColorDarkTone(ModeIconColors[gc:GetName()]);shadowlength,2;diffusealpha,0;skewx,-0.125);
GainFocusCommand=cmd(stoptweening;x,-16;decelerate,0.25;diffusealpha,1;x,0);
LoseFocusCommand=cmd(stoptweening;x,0;accelerate,0.25;diffusealpha,0;x,16;diffusealpha,0);
};
Themes/default/Languages/en.ini
+1 -1
View File
@@ -52,7 +52,7 @@ HardExplanation=For experts.
OldNormalExplanation=Not too easy, not too hard.
NormalExplanation=Play all your favorite songs!
RaveExplanation=Battle against friend or foe.
ExtendedExplanation=Several Songs in a row
NonstopExplanation=Several Songs in a row
OniExplanation=A true test of skill.
EndlessExplanation=It don't stop, it keep rollin'.
Themes/default/Scripts/02 Colors.lua
+1 -1
View File
@@ -1,7 +1,7 @@
ModeIconColors = {
Normal = color("#FFEE00"), -- yellow
Rave = color("#4400CC"), -- purple
Extended = color("#00CCFF"), -- cyan
Nonstop = color("#00CCFF"), -- cyan
Oni = color("#CC00FF"), -- redder purple
Endless = color("#444488"), -- steel
}
Themes/default/metrics.ini
+4 -4
View File
@@ -826,10 +826,10 @@ IconChoiceRaveY=SCREEN_BOTTOM-88-64
IconChoiceRaveOnCommand=zoom,0;bounceend,0.35;zoom,0.8
IconChoiceRaveOffCommand=linear,0.1175;zoomx,0
#
IconChoiceExtendedX=SCREEN_CENTER_X-160
IconChoiceExtendedY=SCREEN_BOTTOM-88
IconChoiceExtendedOnCommand=zoom,0;bounceend,0.35;zoom,0.8
IconChoiceExtendedOffCommand=linear,0.1175;zoomx,0
IconChoiceNonstopX=SCREEN_CENTER_X-160
IconChoiceNonstopY=SCREEN_BOTTOM-88
IconChoiceNonstopOnCommand=zoom,0;bounceend,0.35;zoom,0.8
IconChoiceNonstopOffCommand=linear,0.1175;zoomx,0
#
IconChoiceOniX=SCREEN_CENTER_X
IconChoiceOniY=SCREEN_BOTTOM-88