This commit is contained in:
Chris Danford
2008-07-21 08:02:45 +00:00
parent 340b298f45
commit 901e2f488a
46 changed files with 192 additions and 222 deletions
@@ -1 +1 @@
_options to options
_fade in normal
Binary file not shown.

Before

Width:  |  Height:  |  Size: 264 B

@@ -42,29 +42,11 @@ local function Radar()
return t;
end
local function OptionsArea(pn)
local t = Def.ActorFrame {};
t[#t+1] = Def.ActorFrame {
InitCommand=cmd(x,-1*THEME:GetMetric("ModIconRowSelectMusic","SpacingX");y,-1*THEME:GetMetric("ModIconRowSelectMusic","SpacingY"););
LoadActor( "option icon header" ) .. {
};
LoadFont("_terminator two 18px" ) .. {
InitCommand=cmd(y,-4;settext,PlayerNumberToLocalizedString(pn);diffuse,PlayerColor(pn);shadowlength,0;);
};
};
t[#t+1] = Def.ModIconRow {
InitCommand=cmd(Load,"ModIconRowSelectMusic",pn;);
OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1;);
OffCommand=cmd(linear,0.5;zoomy,0;);
};
return t;
end
local t = LoadFallbackB();
t[#t+1] = Def.ActorFrame {
InitCommand=cmd(x,SCREEN_CENTER_X+140;y,SCREEN_CENTER_Y-10);
InitCommand=cmd(x,SCREEN_CENTER_X+140;y,SCREEN_CENTER_Y-20);
OnCommand=cmd(addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6);
OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6);
LoadActor( "_banner mask" ) .. {
@@ -95,22 +77,37 @@ t[#t+1] = LoadFont("Common", "normal") .. {
};
t[#t+1] = Def.ActorFrame {
InitCommand=cmd(x,SCREEN_CENTER_X-56;y,SCREEN_CENTER_Y);
InitCommand=cmd(x,SCREEN_CENTER_X-56;y,SCREEN_CENTER_Y-10);
LoadActor( "wheel cursor glow" ) .. {
InitCommand=cmd(blend,"BlendMode_Add";);
InitCommand=cmd(blend,"BlendMode_Add";diffuseshift;);
};
LoadActor( "wheel cursor normal" ) .. {
};
};
t[#t+1] = OptionsArea( "PlayerNumber_P1" ) .. {
InitCommand=cmd(x,SCREEN_CENTER_X+56;y,SCREEN_CENTER_Y+136);
};
t[#t+1] = OptionsArea( "PlayerNumber_P2" ) .. {
InitCommand=cmd(x,SCREEN_CENTER_X+56;y,SCREEN_CENTER_Y+154);
};
for pn in ivalues(PlayerNumber) do
local MetricsName = "OptionsArea" .. PlayerNumberToString(pn);
local spacing_x = THEME:GetMetric("ModIconRowSelectMusic","SpacingX");
local spacing_y = THEME:GetMetric("ModIconRowSelectMusic","SpacingY");
t[#t+1] = Def.ActorFrame {
InitCommand=function(self) self:name(MetricsName); ActorUtil.LoadAllCommandsAndSetXYAndOnCommand(self,Var "LoadingScreen"); end;
Def.ActorFrame {
InitCommand=cmd(x,-1*spacing_x;y,-1*spacing_y;);
LoadActor( "option icon header" ) .. {
};
LoadFont("_terminator two 18px" ) .. {
InitCommand=cmd(y,-4;settext,PlayerNumberToLocalizedString(pn);diffuse,PlayerColor(pn);shadowlength,0;);
};
};
Def.ModIconRow {
InitCommand=cmd(Load,"ModIconRowSelectMusic",pn;);
OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1;);
OffCommand=cmd(linear,0.5;zoomy,0;);
};
};
end
t[#t+1] = Def.ActorFrame {
InitCommand=cmd(x,SCREEN_CENTER_X-120;y,SCREEN_CENTER_Y-170);
OnCommand=cmd(addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6);
@@ -134,32 +131,23 @@ t[#t+1] = LoadActor( THEME:GetPathG(Var 'LoadingScreen','options message 1x2') )
HidePressStartForOptionsCommand=cmd(linear,0.4;cropleft,1.3);
};
t[#t+1] = Def.PaneDisplay {
MetricsGroup="PaneDisplay";
PlayerNumber=PLAYER_1;
InitCommand=cmd(player,PLAYER_1;playcommand,"Set";x,SCREEN_CENTER_X-180;y,SCREEN_CENTER_Y+194);
SetCommand=function(self) self:SetFromGameState() end;
CurrentStepsP1ChangedMessageCommand=cmd(playcommand,"Set");
CurrentTrailP1ChangedMessageCommand=cmd(playcommand,"Set");
SortOrderChangedMessageCommand=cmd(playcommand,"Set");
};
t[#t+1] = Def.PaneDisplay {
MetricsGroup="PaneDisplay";
PlayerNumber=PLAYER_2;
InitCommand=cmd(player,PLAYER_2;playcommand,"Set";x,SCREEN_CENTER_X+180;y,SCREEN_CENTER_Y+194);
SetCommand=function(self) self:SetFromGameState() end;
CurrentStepsP2ChangedMessageCommand=cmd(playcommand,"Set");
CurrentTrailP2ChangedMessageCommand=cmd(playcommand,"Set");
SortOrderChangedMessageCommand=cmd(playcommand,"Set");
};
for pn in ivalues(PlayerNumber) do
local MetricsName = "PaneDisplay" .. PlayerNumberToString(pn);
t[#t+1] = Def.PaneDisplay {
MetricsGroup="PaneDisplay";
PlayerNumber=pn;
InitCommand=function(self) self:player(PLAYER_1); self:playcommand("Set"); self:name(MetricsName); ActorUtil.LoadAllCommandsAndSetXYAndOnCommand(self,Var "LoadingScreen"); end;
SetCommand=function(self) self:SetFromGameState() end;
CurrentStepsP1ChangedMessageCommand=cmd(playcommand,"Set");
CurrentTrailP1ChangedMessageCommand=cmd(playcommand,"Set");
SortOrderChangedMessageCommand=cmd(playcommand,"Set");
};
end;
t[#t+1] = Def.BPMDisplay {
File=THEME:GetPathF("BPMDisplay", "bpm");
Name="BPMDisplay";
InitCommand=cmd(horizalign,right;x,SCREEN_CENTER_X+294;y,SCREEN_CENTER_Y+1;zoomx,0.8;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000"););
InitCommand=cmd(horizalign,right;x,SCREEN_CENTER_X+294;y,SCREEN_CENTER_Y-9;zoomx,0.8;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000"););
OnCommand=cmd(stoptweening;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6);
OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6);
SetCommand=function(self) self:SetFromGameState() end;
@@ -167,17 +155,17 @@ t[#t+1] = Def.BPMDisplay {
CurrentCourseChangedMessageCommand=cmd(playcommand,"Set");
};
t[#t+1] = LoadActor( "_bpm label" ) .. {
InitCommand=cmd(horizalign,left;x,SCREEN_CENTER_X+280;y,SCREEN_CENTER_Y);
InitCommand=cmd(horizalign,left;x,SCREEN_CENTER_X+280;y,SCREEN_CENTER_Y-10);
OnCommand=cmd(addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6);
OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6);
};
t[#t+1] = LoadActor( "bpm meter" ) .. {
InitCommand=cmd(x,SCREEN_CENTER_X+230;y,SCREEN_CENTER_Y-12);
InitCommand=cmd(x,SCREEN_CENTER_X+230;y,SCREEN_CENTER_Y-22);
OnCommand=cmd(addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6);
OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6);
};
t[#t+1] = LoadActor( "stop icon" ) .. {
InitCommand=cmd(x,SCREEN_CENTER_X+296;y,SCREEN_CENTER_Y+6);
InitCommand=cmd(x,SCREEN_CENTER_X+296;y,SCREEN_CENTER_Y-4);
OnCommand=cmd(addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6);
OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6);
SetCommand=function(self)
@@ -193,7 +181,7 @@ t[#t+1] = LoadActor( "stop icon" ) .. {
};
t[#t+1] = LoadFont("_regra Bold 16px") .. {
InitCommand=cmd(horizalign,left;x,SCREEN_CENTER_X-14;y,SCREEN_CENTER_Y-14;settext,"xxxx";shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");maxwidth,360);
InitCommand=cmd(horizalign,left;x,SCREEN_CENTER_X-14;y,SCREEN_CENTER_Y-24;settext,"xxxx";shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");maxwidth,360);
SetCommand=function(self)
local s = "---";
local song = GAMESTATE:GetCurrentSong();
@@ -209,7 +197,7 @@ t[#t+1] = LoadFont("_regra Bold 16px") .. {
CurrentCourseChangedMessageCommand=cmd(playcommand,"Set");
};
t[#t+1] = LoadFont("_regra Bold 16px") .. {
InitCommand=cmd(horizalign,right;x,SCREEN_CENTER_X+224;y,SCREEN_CENTER_Y+4;settext,"xxxx";shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000"););
InitCommand=cmd(horizalign,right;x,SCREEN_CENTER_X+224;y,SCREEN_CENTER_Y-6;settext,"xxxx";shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000"););
SetCommand=function(self)
local s = "---";
local song = GAMESTATE:GetCurrentSong();
@@ -226,7 +214,7 @@ t[#t+1] = LoadFont("_regra Bold 16px") .. {
};
t[#t+1] = Def.ActorFrame {
InitCommand=cmd(x,SCREEN_CENTER_X+26;y,SCREEN_CENTER_Y+5;);
InitCommand=cmd(x,SCREEN_CENTER_X+26;y,SCREEN_CENTER_Y-5;);
LoadActor("star full") .. { InitCommand=cmd(x,16*-2); };
LoadActor("star full") .. { InitCommand=cmd(x,16*-1); };
LoadActor("star full") .. { InitCommand=cmd(x,16*0); };
@@ -239,7 +227,7 @@ t[#t+1] = Def.ActorFrame {
t[#t+1] = Def.CourseContentsList {
MaxSongs = 5;
InitCommand=cmd(x,SCREEN_CENTER_X-160;y,SCREEN_CENTER_Y+96);
InitCommand=cmd(x,SCREEN_CENTER_X-160;y,SCREEN_CENTER_Y+91);
OnCommand=cmd(zoomy,0;bounceend,0.3;zoom,1);
OffCommand=cmd(zoomy,1;bouncebegin,0.3;zoomy,0);
ShowCommand=cmd(bouncebegin,0.3;zoomy,1);
@@ -314,16 +302,13 @@ t[#t+1] = Def.CourseContentsList {
};
};
t[#t+1] = DifficultyDisplay(PLAYER_1) .. {
BeginCommand=cmd(player,PLAYER_1;x,SCREEN_CENTER_X-254;y,SCREEN_CENTER_Y-20);
OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1);
OffCommand=cmd(linear,0.5;zoomy,0);
};
t[#t+1] = DifficultyDisplay(PLAYER_2) .. {
BeginCommand=cmd(player,PLAYER_2;x,SCREEN_CENTER_X-121;y,SCREEN_CENTER_Y-20);
OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1);
OffCommand=cmd(linear,0.5;zoomy,0);
};
for pn in ivalues(PlayerNumber) do
local MetricsName = "DifficultyDisplay" .. PlayerNumberToString(pn);
t[#t+1] = DifficultyDisplay(pn) .. {
InitCommand=function(self) self:player(pn); name(MetricsName); ActorUtil.LoadAllCommandsAndSetXYAndOnCommand(self,Var "LoadingScreen"); end;
};
end
t[#t+1] = Def.ActorFrame{
InitCommand=cmd(x,SCREEN_CENTER_X-190;y,SCREEN_CENTER_Y-32);
@@ -384,7 +369,7 @@ t[#t+1] = LoadFont("common normal") .. {
if not GAMESTATE:IsCourseMode() then
t[#t+1] = Def.DifficultyList {
Name="DifficultyList";
OnCommand=cmd(x,SCREEN_CENTER_X+170;y,SCREEN_CENTER_Y+40);
InitCommand=cmd(x,SCREEN_CENTER_X+170;y,SCREEN_CENTER_Y+20);
CursorP1 = Def.ActorFrame {
InitCommand=cmd(x,-150;bounce;effectmagnitude,-5,0,0;effectperiod,1.0;effectoffset,0.0;effectclock,"bgm");
BeginCommand=cmd(visible,true);
@@ -1 +1 @@
_options to options
_fade in normal
Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 393 B

@@ -1,24 +0,0 @@
local t = Def.ActorFrame {
LoadSongBackground() .. {
Condition=not GAMESTATE:IsCourseMode();
OnCommand=cmd(zoom,0;rotationz,0;linear,.5;diffusealpha,1;zoom,1;rotationz,1080);
};
};
local OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+180;diffusealpha,0;linear,0.3;diffusealpha,0.75);
local function AddChild( name )
t[#t+1] = LoadActor( name .. ".png" ) .. {
OnCommand=OnCommand;
Condition=GAMESTATE:GetCurrentStage() == "Stage_" .. name;
};
end
for i = 1, 6, 1 do
AddChild( i );
end
AddChild( "Final" );
AddChild( "Extra1" );
AddChild( "Extra2" );
AddChild( "Event" );
AddChild( "Nonstop" );
AddChild( "Oni" );
AddChild( "Endless" );
return t;
Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.2 KiB

@@ -1,10 +1,12 @@
-- This needs to be an ActorFrame because children will want to load the base and merge their own elements into the table.
return Def.ActorFrame {
LoadActor( THEME:GetPathB('','_standard decoration required'), "LeftFrame", "LeftFrame" );
LoadActor( THEME:GetPathB('','_standard decoration required'), "RightFrame", "RightFrame" );
LoadActor( THEME:GetPathB('','_standard decoration required'), "Header", "Header" );
LoadActor( THEME:GetPathB('','_standard decoration required'), "Footer", "Footer" );
LoadActor( THEME:GetPathB('','_standard decoration optional'), "StyleIcon", "StyleIcon" );
LoadActor( THEME:GetPathB('','_standard decoration optional'), "StageFrame", "StageFrame" );
LoadActor( THEME:GetPathB('','_standard decoration optional'), "StageDisplay", "StageDisplay" );
};
t = Def.ActorFrame {};
t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "LeftFrame", "LeftFrame" );
t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "RightFrame", "RightFrame" );
t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "Header", "Header" );
t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "Footer", "Footer" );
t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration optional'), "Help", "Help" );
t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration optional'), "StyleIcon", "StyleIcon" );
t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration optional'), "StageFrame", "StageFrame" );
t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration optional'), "StageDisplay", "StageDisplay" );
return t;
@@ -1 +1 @@
_Arial 14 shadow
common normal
@@ -1 +1 @@
_terminator two 30px
_terminator two 13px
@@ -1 +1 @@
_shared2
common normal
@@ -1 +1 @@
_ScreenRanking common
common normal
@@ -1 +1 @@
_ScreenRanking common
common normal
@@ -1 +1 @@
_ScreenRanking common
common normal
@@ -1 +1 @@
_shared2
common normal
@@ -1 +1 @@
_ScreenRanking common
common normal
Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 33 KiB

@@ -1,9 +1,9 @@
[common]
[common]
Baseline=13
Top=2
LineSpacing=13
DrawExtraPixelsLeft=0
DrawExtraPixelsRight=0
DrawExtraPixelsLeft=1
DrawExtraPixelsRight=1
AdvanceExtraPixels=0
[main]
@@ -0,0 +1,3 @@
return LoadFont("common normal") .. {
InitCommand=cmd(settext,"*";);
};
Binary file not shown.

Before

Width:  |  Height:  |  Size: 978 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 978 B

@@ -1 +1 @@
_blank
ModIcon Filled
@@ -1 +1 @@
ModIcon Empty
ModIconSelectMusic Filled
@@ -11,29 +11,24 @@ function MakeBitmapTest()
};
end
for _, s in ipairs(Stage) do
if s == "Stage_Next" then
stages[#stages+1] = MakeBitmapTest() .. {
SetCommand=function(self, params)
local StageToShow = THEME:GetMetric( ScreenName, "StageDisplayStageToShow" );
local StageIndex = THEME:GetMetric( ScreenName, "StageDisplayStageIndex" );
self:visible( StageToShow == s );
self:settext( string.upper(FormatNumberAndSuffix(StageIndex+1)) );
self:diffuse( StageToColor(s) );
self:strokecolor( StageToStrokeColor(s) );
end;
};
else
stages[#stages+1] = MakeBitmapTest() .. {
SetCommand=function(self, params)
local StageToShow = THEME:GetMetric( ScreenName, "StageDisplayStageToShow" );
self:visible( StageToShow == s );
self:settext( StageToLocalizedString(StageToShow) );
self:diffuse( StageToColor(s) );
self:strokecolor( StageToStrokeColor(s) );
end;
}
end
for s in ivalues(Stage) do
stages[#stages+1] = MakeBitmapTest() .. {
SetCommand=function(self, params)
local Stage = GAMESTATE:GetCurrentStage();
local StageIndex = GAMESTATE:GetCurrentStageIndex();
local screen = SCREENMAN:GetTopScreen();
if screen and screen.GetStageStats then
local ss = screen:GetStageStats();
Stage = ss:GetStage();
StageIndex = ss:GetStageIndex();
end
self:visible( Stage == s );
self:settext( StageToLocalizedString(Stage) );
self:diffuse( StageToColor(s) );
self:strokecolor( StageToStrokeColor(s) );
end;
}
end
return stages;
@@ -17,8 +17,11 @@ return Def.ActorFrame {
};
LoadActor( "arrow" ) .. {
};
LoadActor( "ring" ) .. {
InitCommand=cmd(x,-1.5);
LoadActor( "ring shadow" ) .. {
InitCommand=cmd(x,-1.5;y,2;spin;effectmagnitude,0,0,10;);
};
LoadActor( "ring diffuse" ) .. {
InitCommand=cmd(x,-1.5;y,-3;spin;effectmagnitude,0,0,10;);
};
UpdateScreenHeaderMessageCommand=function(self,params)
local header = self:GetChild("HeaderText");
Binary file not shown.

Before

Width:  |  Height:  |  Size: 99 KiB

After

Width:  |  Height:  |  Size: 91 KiB

@@ -1366,8 +1366,6 @@ Announcer=Kommentator
Credits=Mitwirkende
Play Online=Het Spel van het netwerk
Options=Optionen
Edit Courses=Kurse bearbeiten
Edit/Sync Songs=Lieder bearbeiten / synchronisieren
Exit=Beenden
Game Start=Spiel Starten
Jukebox=Jukebox
+10 -7
View File
@@ -1282,16 +1282,18 @@ You have changed the timing of=You have changed the timing of
; Put all help text in this one group and have metrics look up the strings here. That will help make sure
; that strings are in a consistent style and that strings aren't duplicated.
HelpTextNormal=Use &MENULEFT;&MENURIGHT; to select, then press &START;
HelpTextSelectMusic=Use &LEFT; &RIGHT; to select, then press &START;
HelpTextSelectMusic=Use &MENULEFT;&MENURIGHT; to select, then press &START;
HelpTextDifficultyPart=&UP;&UP; easier difficulty &DOWN;&DOWN; harder difficulty
HelpTextOptions=&UP; &DOWN; to change line &LEFT; &RIGHT; to select between options &START; to accept changes
HelpTextOptionsAndBack=&UP; &DOWN; line &LEFT; &RIGHT; change START choose BACK discard
HelpTextOptions=&MENUUP;&MENUDOWN; line &MENULEFT;&MENURIGHT; change &START; choose
HelpTextOptionsAndBack=&MENUUP;&MENUDOWN; line &MENULEFT;&MENURIGHT; change &START; choose &BACK; discard
HelpTextOptionsSimple=&MENUUP;&MENUDOWN; line &START; choose
HelpTextOptionsSimpleAndBack=&MENUUP;&MENUDOWN; line &START; choose &BACK; discard
HelpTextSort=&UP;&DOWN;&UP;&DOWN; to change sort
HelpTextContinue=Press any button or key. Press ESCAPE when done.
HelpTextEvaluation=Press &START; to continue
HelpTextScreenshot=Press &SELECT; to take a screenshot
HelpTextTestInput=Press any button or key. Press ESCAPE when done.
HelpTextTestLights=Press &LEFT &RIGHT to cycle lights. Press ESCAPE when done.
HelpTextTestLights=Press &MENULEFT;&MENURIGHT; to cycle lights. Press ESCAPE when done.
HelpTextTextEntry=Type a value using the keyboard. Press Enter to finish.
HelpTextMapControllers=Use arrow keys to move, ENTER to assign, SPACE to clear::Press ESCAPE when done
HelpTextOnline=smonline.us to connect to official Stepmania Online Server::Check out Stepmaniaonline.com for more information
@@ -1414,8 +1416,7 @@ Current gametype:=Current gametype:
Difficulty:=Difficulty:
Announcer=Announcer
Play Online=Network Play
Edit Courses=Edit Courses
Edit/Sync Songs=Edit/Sync Songs
Edit Mode=Edit Mode
Exit=Exit
Game Start=Game Start
Jukebox=Jukebox
@@ -1921,4 +1922,6 @@ Yoruba=Yorùbá
Chinese=中文
Zulu=isiZulu
[ScreenPlayerOptions]
HeaderText=Select Modifiers
HeaderSubText=Challenge yourself to achieve ultimate skill!
@@ -1321,8 +1321,6 @@ Options=Opciones
%d songs in %d groups=las canciones %d en los grupos %d
%d courses in %d groups=los courses %d en los grupos %d
Announcer=Presentador
Edit Courses=Editar Grupos
Edit/Sync Songs=Editar/ Canciones sync
Exit=Salir
Game Start=Comienzo de Juego
Play Online=Juego De la Red
@@ -1341,8 +1341,6 @@ Play Online=Jeu De Réseau
%d courses in %d groups=%d courses dans %d groupes
Announcer=Annonceur
Credits=Crédits
Edit Courses=Editer courses
Edit/Sync Songs=Editer/sync. chansons
Exit=Quitter
Game Start=Démarrage du jeu
Jukebox=Jukebox
@@ -1336,8 +1336,6 @@ Options=Opzioni
%d courses in %d groups=%d percorsi in %d gruppi
Announcer=Annunciatore
Credits=Titoli
Edit Courses=Edita corse
Edit/Sync Songs=Modifica/sincronizza canzoni
Exit=Esci
Game Start=Inizio gioco
Jukebox=Jukebox
+11 -11
View File
@@ -5,19 +5,19 @@ function PlayerColor( pn )
end
local DifficultyDisplayTypeColors = {
DifficultyDisplayType_Single_Beginner = color("0.0,0.9,1.0,1"), -- light blue
DifficultyDisplayType_Single_Easy = color("0.9,0.9,0.0,1"), -- yellow
DifficultyDisplayType_Single_Medium = color("1.0,0.1,0.1,1"), -- light red
DifficultyDisplayType_Single_Hard = color("0.2,1.0,0.2,1"), -- light green
DifficultyDisplayType_Single_Challenge = color("0.2,0.6,1.0,1"), -- blue
DifficultyDisplayType_Single_Beginner = color("#ff32f8"),
DifficultyDisplayType_Single_Easy = color("#2cff00"),
DifficultyDisplayType_Single_Medium = color("#fee600"),
DifficultyDisplayType_Single_Hard = color("#ff2f39"),
DifficultyDisplayType_Single_Challenge = color("#1cd8ff"),
DifficultyDisplayType_Double_Beginner = color("0.0,0.9,1.0,1"), -- light blue
DifficultyDisplayType_Double_Easy = color("0.9,0.9,0.0,1"), -- yellow
DifficultyDisplayType_Double_Medium = color("1.0,0.1,0.1,1"), -- light red
DifficultyDisplayType_Double_Hard = color("0.2,1.0,0.2,1"), -- light green
DifficultyDisplayType_Double_Easy = color("0.9,0.9,0.0,1"), -- yellow
DifficultyDisplayType_Double_Medium = color("1.0,0.1,0.1,1"), -- light red
DifficultyDisplayType_Double_Hard = color("0.2,1.0,0.2,1"), -- light green
DifficultyDisplayType_Double_Challenge = color("0.2,0.6,1.0,1"), -- blue
Difficulty_Edit = color("0.8,0.8,0.8,1"), -- gray
Difficulty_Couple = color("#ff9a00"), -- orange
Difficulty_Routine = color("#ff9a00"), -- orange
Difficulty_Edit = color("0.8,0.8,0.8,1"), -- gray
Difficulty_Couple = color("#ff9a00"), -- orange
Difficulty_Routine = color("#ff9a00"), -- orange
};
local CourseDifficultyColors = {
+65 -54
View File
@@ -86,8 +86,7 @@ SharedSelection=true
AllowDisabledPlayerInput=true
OverrideSleepAfterTweenOffSeconds=true
SleepAfterTweenOffSeconds=0
ChoiceNames="1,2,3,4,5,6,7,8"
//,8
ChoiceNames="1,2,3,4,5,6,7"
DefaultChoice="1"
NumChoicesOnPage1=100
WrapCursor=true
@@ -96,11 +95,10 @@ Choice1="ApplyDefaultOptions;screen,ScreenProfileLoad;text,Game Start"
Choice2="screen,ScreenNetworkOptions;text,Play Online"
Choice3="screen,ScreenSelectGame;text,Select Game"
Choice4="screen,ScreenOptionsService;text,Options"
Choice5="screen,ScreenEditMenu;text,Edit/Sync Songs"
Choice6="screen,ScreenOptionsManageCourses;text,Edit Courses"
Choice7="screen,ScreenJukeboxMenu;text,Jukebox"
Choice8="screen,ScreenExit;text,Exit"
Choice9="screen,ScreenTest;text,Sandbox"
Choice5="screen,ScreenEditMenu;text,Edit Mode"
Choice6="screen,ScreenJukeboxMenu;text,Jukebox"
Choice7="screen,ScreenExit;text,Exit"
Choice8="screen,ScreenTest;text,Sandbox"
ShowIcon=false
ShowScroller=true
PerChoiceScrollElement=false
@@ -113,9 +111,10 @@ ScrollerOnCommand=
ScrollerOffCommand=
TimerSeconds=-1
ShowStyleIcon=false
HelpX=SCREEN_CENTER_X
HelpY=SCREEN_BOTTOM-20
HelpOnCommand=
ShowHelp=true
HelpX=SCREEN_CENTER_X+200
HelpY=SCREEN_BOTTOM-40
HelpText=ScreenString("HelpTextOptionsSimple")
HelpOffCommand=
IdleCommentSeconds=12
IdleTimeoutSeconds=30
@@ -147,7 +146,7 @@ NextScreen=ScreenCautionBranch()
PrevScreen=ScreenTitleBranch()
TimerSeconds=-1
LoadEdits=true
HelpText=""
ShowHelp=false
[ScreenProfileSave]
Class="ScreenProfileSave"
@@ -155,7 +154,7 @@ Fallback="ScreenWithMenuElements"
NextScreen=SelectEndingScreen()
PrevScreen=ScreenTitleBranch()
TimerSeconds=-1
HelpText=""
ShowHelp=false
[ScreenWithMenuElements2]
Fallback="ScreenWithMenuElements"
@@ -615,7 +614,7 @@ ScoreP2SortChangeCommand=stoptweening;decelerate,0.128;x,920;sleep,0.128;acceler
ScoreFrameP1SortChangeCommand=stoptweening;decelerate,0.128;x,920;sleep,0.128;accelerate,0.25;x,58
ScoreFrameP2SortChangeCommand=stoptweening;decelerate,0.128;x,920;sleep,0.128;accelerate,0.25;x,269
MusicWheelX=SCREEN_CENTER_X-190
MusicWheelY=SCREEN_CENTER_Y-2
MusicWheelY=SCREEN_CENTER_Y-10
MusicWheelOnCommand=draworder,-100
MusicWheelOffCommand=
TimerSeconds=60
@@ -633,6 +632,30 @@ NextSongButton="MenuRight"
UseOptionsList=false
TwoPartSelection=false
UsePlayerSelectMenu=false
DifficultyDisplayP1X=
DifficultyDisplayP1Y=
DifficultyDisplayP1OnCommand=visible,false
DifficultyDisplayP1OffCommand=
DifficultyDisplayP2X=
DifficultyDisplayP2Y=
DifficultyDisplayP2OnCommand=visible,false
DifficultyDisplayP2OffCommand=
PaneDisplayP1X=SCREEN_CENTER_X-180
PaneDisplayP1Y=SCREEN_CENTER_Y+194
PaneDisplayP1OnCommand=
PaneDisplayP1OffCommand=
PaneDisplayP2X=SCREEN_CENTER_X+180
PaneDisplayP2Y=SCREEN_CENTER_Y+194
PaneDisplayP2OnCommand=
PaneDisplayP2OffCommand=
OptionsAreaP1X=SCREEN_CENTER_X+56
OptionsAreaP1Y=SCREEN_CENTER_Y+128
OptionsAreaP1OnCommand=
OptionsAreaP1OffCommand=
OptionsAreaP2X=SCREEN_CENTER_X+56
OptionsAreaP2Y=SCREEN_CENTER_Y+148
OptionsAreaP2OnCommand=
OptionsAreaP2OffCommand=
SelectMenuChangesDifficulty=true
[ScreenSelectCourse]
@@ -671,7 +694,7 @@ NextScreen=SMOnlineScreen()
PrevScreen=ScreenTitleBranch()
ShowStyleIcon=false
TimerSeconds=-1
HelpText=""
ShowHelp=false
[ScreenNetRoom]
MusicSelectScreen="ScreenSMOnlineSelectMusic"
@@ -759,14 +782,6 @@ MeterP2Y=SCREEN_CENTER_Y+157
MeterP2X=SCREEN_CENTER_X-110
MeterP2OnCommand=horizalign,right;zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,1.0;zoomx,1.0
MeterP2OffCommand=linear,0.5;zoomx,0.0;zoomy,0.0
DifficultyIconP1X=SCREEN_CENTER_X-175
DifficultyIconP1Y=SCREEN_CENTER_Y+160
DifficultyIconP1OnCommand=shadowlength,2;zoomx,0;zoomy,0;linear,0.5;zoomx,1.0;zoomy,1.0;
DifficultyIconP1OffCommand=linear,0.5;zoomx,0.0;zoomy,0.0;shadowlength,0
DifficultyIconP2Y=SCREEN_CENTER_Y+160
DifficultyIconP2X=SCREEN_CENTER_X-135
DifficultyIconP2OnCommand=shadowlength,2;zoomx,0;zoomy,0;linear,0.5;zoomx,1.0;zoomy,1.0
DifficultyIconP2OffCommand=linear,0.5;zoomx,0.0;zoomy,0.0;shadowlength,0
DiffBGColor=color("0.7,0.7,0.7,0.7")
DiffBGWidth=0
DiffBGHeight=0
@@ -804,7 +819,7 @@ LightsMode="LightsMode_Stage"
// This is the minimum delay after the "in" transition before the
// "out" transition will begin. (NextScreen is loaded during this
// time.)
MinimumDelay=1
MinimumDelay=10
AllowBack=true
[ScreenGameplay]
@@ -1082,8 +1097,6 @@ Fallback="ScreenWithMenuElements2"
Class="ScreenEvaluation"
LightsMode="LightsMode_MenuStartOnly"
HelpText=ScreenString("HelpTextEvaluation")
StageDisplayStageIndex=SCREENMAN:GetTopScreen():GetStageStats():GetStageIndex()
StageDisplayStageToShow=SCREENMAN:GetTopScreen():GetStageStats():GetStage()
Summary=false
TimerSeconds=15
PlayerOptionsSeparator=","
@@ -1972,9 +1985,10 @@ DescriptionY=0
DescriptionOnCommand=shadowlength,0;uppercase,true;
DescriptionSetCommand=%function(self,param) if param.Difficulty then self:diffuse(DifficultyDisplayTypeToLightColor(param.DifficultyDisplayType)); self:strokecolor(DifficultyDisplayTypeToDarkColor(param.DifficultyDisplayType)); end end
ShowAutogen=true
AutogenX=0
AutogenX=40
AutogenY=0
AutogenOnCommand=
AutogenSetCommand=%function(self,param) if param.Difficulty then self:diffuse(DifficultyDisplayTypeToLightColor(param.DifficultyDisplayType)); self:strokecolor(DifficultyDisplayTypeToDarkColor(param.DifficultyDisplayType)); end end
ShowStepsType=false
StepsTypeX=0
StepsTypeY=0
@@ -2010,8 +2024,11 @@ MeterSetCommand=%function(self,param) self:diffuse(DifficultyDisplayTypeToColor(
ShowDescription=true
DescriptionX=-110
DescriptionY=-1
DescriptionOnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#00000077");maxwidth,150
DescriptionOnCommand=uppercase,true;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#00000077");maxwidth,150;
DescriptionSetCommand=%function(self,param) self:diffuse(DifficultyDisplayTypeToColor(param.DifficultyDisplayType)); end
AutogenX=102
AutogenOnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#00000077");
AutogenSetCommand=%function(self,param) self:diffuse(DifficultyDisplayTypeToColor(param.DifficultyDisplayType)); end
[DifficultyDisplayGameplay]
Fallback="DifficultyDisplay"
@@ -2028,8 +2045,6 @@ Fallback="Screen"
AllowDisabledPlayerInput=false
ShowStyleIcon=true
ShowStageDisplay=false
StageDisplayStageToShow=GAMESTATE:GetCurrentStage()
StageDisplayStageIndex=GAMESTATE:GetStageIndex()
StageDisplayX=SCREEN_CENTER_X+220
StageDisplayY=SCREEN_CENTER_Y-172
StageDisplayOnCommand=draworder,-2;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6
@@ -2043,12 +2058,13 @@ MemoryCardIcons=true
CancelTransitionsOut=false
HeaderX=SCREEN_CENTER_X
HeaderY=SCREEN_TOP+35
HeaderOnCommand=addy,-50;linear,0.25;addy,50
HeaderOffCommand=linear,0.25;addy,-50;
HeaderOnCommand=addy,-50;linear,0.25;addy,50;draworder,1
HeaderOffCommand=linear,0.25;addy,-70;
FooterX=SCREEN_CENTER_X
FooterY=SCREEN_BOTTOM
FooterOnCommand=draworder,-1;vertalign,bottom
FooterOffCommand=
ShowHelp=true
HelpX=SCREEN_CENTER_X
HelpY=SCREEN_BOTTOM-20
HelpOnCommand=shadowlength,0;strokecolor,color("#4e4e4e");draworder,1;zoomy,0;linear,0.5;zoomy,1;diffuseblink;
@@ -2067,7 +2083,7 @@ TimerMetricsGroup="MenuTimer"
TimerX=SCREEN_CENTER_X+273
TimerY=SCREEN_TOP+26
TimerOnCommand=draworder,2;addy,-40;linear,0.25;addy,40
TimerOffCommand=linear,0.25;addy,-40;
TimerOffCommand=linear,0.25;addy,-70;
TimerStealth=false
ForceTimer=false
FirstUpdateCommand=
@@ -2102,6 +2118,9 @@ Warning3Command=stoptweening;linear,0.2;zoomx,1;sleep,0.6;linear,0.2;zoomx,0
Warning2Command=stoptweening;linear,0.2;zoomx,1;sleep,0.6;linear,0.2;zoomx,0
Warning1Command=stoptweening;linear,0.2;zoomx,1;sleep,0.6;linear,0.2;zoomx,0
Warning0Command=stoptweening;stopeffect;linear,0.2;zoomx,1
FrameX=-20
FrameY=6
FrameOnCommand=
[ScreenOptions]
Fallback="ScreenWithMenuElements2"
@@ -2116,15 +2135,15 @@ RowOnCommand=
RowOffCommand=
RowPositionTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:y(SCREEN_CENTER_Y-146+36*offsetFromCenter) end
ExplanationP1X=SCREEN_CENTER_X-250
ExplanationP1Y=SCREEN_CENTER_Y+172
ExplanationP1Y=SCREEN_CENTER_Y+182
ExplanationP1OnCommand=shadowlength,0;wrapwidthpixels,500;horizalign,left;cropright,1;linear,0.5;cropright,0
ExplanationP1OffCommand=
ExplanationP2X=SCREEN_CENTER_X+250
ExplanationP2Y=SCREEN_CENTER_Y+172
ExplanationP2Y=SCREEN_CENTER_Y+182
ExplanationP2OnCommand=shadowlength,0;wrapwidthpixels,500;horizalign,right;cropright,1;linear,0.5;cropright,0
ExplanationP2OffCommand=
ExplanationTogetherX=SCREEN_CENTER_X-302
ExplanationTogetherY=SCREEN_CENTER_Y+192
ExplanationTogetherY=SCREEN_CENTER_Y+182
ExplanationTogetherOnCommand=shadowlength,0;wrapwidthpixels,1000;horizalign,left;cropright,1;linear,0.5;cropright,0
ExplanationTogetherOffCommand=
DisqualifyP1X=
@@ -2166,9 +2185,10 @@ CursorTweenSeconds=0.3
WrapValueInRow=true
OptionRowNormalMetricsGroup="OptionRow"
OptionRowExitMetricsGroup="OptionRowExit"
HelpText=ScreenString("HelpTextOptions")
[OptionRow]
ShowModIcons=true
ShowModIcons=false
ShowUnderlines=true
ShowBpmInSpeedTitle=false
ModIconP1X=SCREEN_CENTER_X-280
@@ -2179,7 +2199,7 @@ FrameY=0
FrameOnCommand=
TitleX=SCREEN_CENTER_X-222
TitleY=-2
TitleOnCommand=shadowlength,0;uppercase,true;wrapwidthpixels,250;
TitleOnCommand=shadowlength,0;uppercase,true;wrapwidthpixels,120;
TitleGainFocusCommand=diffuse,color("#fff600");strokecolor,color("#7f6739");
TitleLoseFocusCommand=diffuse,color("#ffffff");strokecolor,color("#37537d");
ItemsStartX=SCREEN_CENTER_X-140
@@ -2189,7 +2209,7 @@ ItemsMinBaseZoom=0.6
ItemsLongRowP1X=SCREEN_CENTER_X-60
ItemsLongRowP2X=SCREEN_CENTER_X+100
ItemsLongRowSharedX=SCREEN_CENTER_X+20
ItemOnCommand=zoom,0.5;shadowlength,0;
ItemOnCommand=shadowlength,0;
ItemGainFocusCommand=
ItemLoseFocusCommand=
TweenSeconds=0.2
@@ -2360,7 +2380,6 @@ DataOnCommand=zoom,0.6
[ScreenPackages]
Class="ScreenPackages"
HelpText=""
PackagesBGY=SCREEN_CENTER_Y
PackagesBGX=SCREEN_WIDTH/4
PackagesBGWidth=SCREEN_WIDTH/3
@@ -2961,8 +2980,7 @@ TimerX=
TimerY=
TimerOnCommand=visible,false
TimerOffCommand=
HelpOnCommand=visible,false
ShowHelp=false
[ScreenSelectBlank]
Fallback="ScreenWithMenuElementsBlank"
@@ -3395,10 +3413,7 @@ TimerOnCommand=visible,false
ShowStyleIcon=false
TimerSeconds=-1
AllowOperatorMenuButton=false
HelpX=SCREEN_CENTER_X+256
HelpY=SCREEN_BOTTOM-40
HelpOnCommand=draworder,1;wrapwidthpixels,200;zoomy,0;linear,0.5;zoomy,1
HelpText=ScreenString("HelpTextOptionsAndBack")
HelpText=ScreenString("HelpTextOptionsSimpleAndBack")
LineNames="1,2,3,4,5,6,7,8"
Line1="gamecommand;screen,ScreenMapControllers;name,Key Joy Mappings"
Line2="gamecommand;screen,ScreenTestInput;name,Test Input"
@@ -3424,9 +3439,6 @@ AllowOperatorMenuButton=false
ForceAllPlayers=true
PrevScreen="ScreenOptionsService"
NextScreen="ScreenOptionsService"
HelpX=SCREEN_CENTER_X+256
HelpY=SCREEN_BOTTOM-40
HelpOnCommand=draworder,1;wrapwidthpixels,200;zoomy,0;linear,0.5;zoomy,1
HelpText=ScreenString("HelpTextOptionsAndBack")
[ScreenOptionsTestMenu]
@@ -3435,7 +3447,6 @@ NextScreen="ScreenOptionsService"
PrevScreen="ScreenOptionsService"
LineNames="1"
Line1="lua,OptionsRowTest()"
HelpText=""
[TextBanner]
TitleOnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");horizalign,right
@@ -3891,7 +3902,7 @@ PersistScreens=GetEditModeSubScreens()
EditMode="EditMode_Full"
NextScreen="ScreenEditMenu"
PrevScreen="ScreenEditMenu"
HelpText=""
ShowHelp=false
AllowOperatorMenuButton=false
ShowCoinsAndCredits=false
ShowStyleIcon=false
@@ -3998,7 +4009,7 @@ ItemUseRateSeconds=0
Class="ScreenMiniMenu"
Fallback="ScreenOptions"
PrevScreen=
HelpText=""
ShowHelp=false
TimerSeconds=-1
ShowExplanations=false
ShowExitRow=false
@@ -4156,7 +4167,7 @@ ItemsStartX=0
LineHighlightX=0
ColorSelected=color("1,1,1,1")
ColorNotSelected=color("0.7,0.7,0.7,1")
HelpText=""
ShowHelp=false
[ScreenOptionsManage]
Fallback="ScreenOptionsSimple"
@@ -4187,7 +4198,7 @@ WrapValueInRow=false
NavigationMode="menu"
ForceAllPlayers=true
InputMode="together"
HelpText=""
ShowHelp=false
[ScreenOptionsManageCourses]
Class="ScreenOptionsManageCourses"
@@ -4253,7 +4264,7 @@ TimerSeconds=-1
[PaneDisplay]
ShiftP1X=-40
ShiftP1Y=0
ShiftP2X=40
ShiftP2X=-40
ShiftP2Y=0
CountFormat="%3.0f"
NumStepsTextX=-18+64*-0.5