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

Merge branch 'changes-beta4' of https://github.com/Midiman/stepmania

Browse Source
This commit is contained in:
Colby Klein
2014-09-01 04:49:24 -07:00
parent de36029650 4fdbb3dff6
commit d1cdd04099
16 changed files with 198 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/_fallback/Languages/en.ini
+3
View File
@@ -1656,6 +1656,9 @@ Cancel=CANCEL
HeaderText=High Scores
HeaderSubText=Who's the top dog?
[ScreenContinue]
HelpText=&START; Advance Timer
[ScreenRanking]
[ScreenSMOnlineLogin]
Themes/_fallback/Scripts/02 Colors.lua
+7 -7
View File
@@ -12,7 +12,7 @@ Color = {
Yellow = color("#fff200"),
Orange = color("#f7941d"),
Purple = color("#92278f"),
Outline = color("0,0,0,0.675"),
Outline = color("0,0,0,0.5"),
Invisible = color("1,1,1,0"),
Stealth = color("0,0,0,0"),
-- Android Design Stencil Colors
@@ -47,8 +47,8 @@ setmetatable(Color, { __call = function(self, c) return self[c] end })
GameColor = {
PlayerColors = {
PLAYER_1 = color("#ef403d"),
PLAYER_2 = color("#0089cf"),
PLAYER_1 = color("#ff4444"),
PLAYER_2 = color("#5d9cec"),
},
Difficulty = {
--[[ These are for 'Custom' Difficulty Ranks. It can be very useful
@@ -126,13 +126,13 @@ function ColorDarkTone(c)
end
function PlayerColor( pn )
if pn == PLAYER_1 then return color("#ef403d") end -- pink-red
if pn == PLAYER_2 then return color("#0089cf") end -- sea-blue
if pn == PLAYER_1 then return GameColor.PlayerColors["PLAYER_1"] end -- pink-red
if pn == PLAYER_2 then return GameColor.PlayerColors["PLAYER_2"] end -- sea-blue
return color("1,1,1,1")
end
function PlayerScoreColor( pn )
if pn == PLAYER_1 then return color("#ef403d") end -- pink-red
if pn == PLAYER_2 then return color("#0089cf") end -- sea-blue
if pn == PLAYER_1 then return GameColor.PlayerColors["PLAYER_1"] end -- pink-red
if pn == PLAYER_2 then return GameColor.PlayerColors["PLAYER_2"] end -- sea-blue
return color("1,1,1,1")
end
Themes/default/BGAnimations/ScreenEvaluation decorations/default.lua
+2 -2
View File
@@ -70,13 +70,13 @@ local t = LoadFallbackB();
t[#t+1] = StandardDecorationFromFileOptional("StageDisplay","StageDisplay");
if ShowStandardDecoration("GraphDisplay") then
if ShowStandardDecoration("GraphDisplay") and not GAMESTATE:GetPlayMode() == "PlayMode_Rave" then
for pn in ivalues(GAMESTATE:GetHumanPlayers()) do
t[#t+1] = StandardDecorationFromTable( "GraphDisplay" .. ToEnumShortString(pn), GraphDisplay(pn) );
end
end
if ShowStandardDecoration("ComboGraph") then
if ShowStandardDecoration("ComboGraph") and not GAMESTATE:GetPlayMode() == "PlayMode_Rave" then
for pn in ivalues(GAMESTATE:GetHumanPlayers()) do
t[#t+1] = StandardDecorationFromTable( "ComboGraph" .. ToEnumShortString(pn), ComboGraph(pn) );
end
Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay feet.lua
+6
View File
@@ -0,0 +1,6 @@
return LoadFont("Common Normal") .. {
Text="Your feet will be used to play!";
BeginCommand=function(self)
self:AddAttribute(5, {Length= 4, Diffuse=Color.Red})
end;
};
Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay jump.lua
+18
View File
@@ -0,0 +1,18 @@
return Def.ActorFrame {
LoadActor(THEME:GetPathB("_frame","3x3"),"rounded black",380,80);
Def.Quad {
Name="Underline";
InitCommand=cmd(y,-12);
OnCommand=cmd(diffuse,color("#ffd400");shadowlength,1;zoomtowidth,192;fadeleft,0.25;faderight,0.25);
};
LoadFont("Common Bold") .. {
Text="Information";
InitCommand=cmd(y,-26);
OnCommand=cmd(skewx,-0.125;diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25))
};
LoadFont("Common Normal") .. {
Text="Step on both panels if two different\narrows appear at the same time!.";
InitCommand=cmd(y,18;wrapwidthpixels,480;vertspacing,-12;shadowlength,1);
OnCommand=cmd(zoom,0.875);
};
};
Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay miss.lua
+18
View File
@@ -0,0 +1,18 @@
return Def.ActorFrame {
LoadActor(THEME:GetPathB("_frame","3x3"),"rounded black",380,80);
Def.Quad {
Name="Underline";
InitCommand=cmd(y,-12);
OnCommand=cmd(diffuse,color("#ffd400");shadowlength,1;zoomtowidth,192;fadeleft,0.25;faderight,0.25);
};
LoadFont("Common Bold") .. {
Text="Information";
InitCommand=cmd(y,-26);
OnCommand=cmd(skewx,-0.125;diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25))
};
LoadFont("Common Normal") .. {
Text="If you misstep repeatedly, your dance\nguage will decrease until the game is\nis over!";
InitCommand=cmd(y,18;wrapwidthpixels,480;vertspacing,-12;shadowlength,1);
OnCommand=cmd(zoom,0.75);
};
};
Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay tap.lua
+18
View File
@@ -0,0 +1,18 @@
return Def.ActorFrame {
LoadActor(THEME:GetPathB("_frame","3x3"),"rounded black",380,80);
Def.Quad {
Name="Underline";
InitCommand=cmd(y,-12);
OnCommand=cmd(diffuse,color("#ffd400");shadowlength,1;zoomtowidth,192;fadeleft,0.25;faderight,0.25);
};
LoadFont("Common Bold") .. {
Text="Information";
InitCommand=cmd(y,-26);
OnCommand=cmd(skewx,-0.125;diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25))
};
LoadFont("Common Normal") .. {
Text="When the arrows rise to this point,\nstep on the matching panels.";
InitCommand=cmd(y,18;wrapwidthpixels,480;vertspacing,-12;shadowlength,1);
OnCommand=cmd(zoom,0.875);
};
};
Themes/default/BGAnimations/ScreenHowToPlay overlay/_message jump.lua
-6
View File
@@ -1,6 +0,0 @@
return Def.ActorFrame{
LoadActor("jumpmessage") .. {
InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;diffusealpha,0;);
ShowCommand=cmd(linear,0;diffusealpha,1;sleep,1.7;linear,0;diffusealpha,0);
};
};
Themes/default/BGAnimations/ScreenHowToPlay overlay/_message miss.lua
-6
View File
@@ -1,6 +0,0 @@
return Def.ActorFrame{
LoadActor("missmessage") .. {
InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;diffusealpha,0;);
ShowCommand=cmd(linear,0;diffusealpha,1;sleep,22.7;linear,0;diffusealpha,0);
};
};
Themes/default/BGAnimations/ScreenHowToPlay overlay/_message tap.lua
-6
View File
@@ -1,6 +0,0 @@
return Def.ActorFrame{
LoadActor("tapmessage") .. {
InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;diffusealpha,0;);
ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0);
};
};
Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua
+41 -22
View File
@@ -45,31 +45,50 @@ return Def.ActorFrame {
};
-- messages
LoadFont("Common Normal") .. {
LoadFont("Common Bold") .. {
Text=ScreenString("How To Play StepMania"),
InitCommand=cmd(zbuffer,1;z,20;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;shadowlength,1;strokecolor,Color("Outline"));
OnCommand=cmd(diffusealpha,0;zoom,4;sleep,0.0;linear,0.3;diffusealpha,1;zoom,1;sleep,1.8;linear,0.3;zoom,0.75;x,170;y,60);
BeginCommand=function(self)
self:AddAttribute(12, {Length=9, Diffuse=Color.White});
end;
OnCommand=cmd(skewx,-0.125;diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25);diffusealpha,0;zoom,4;sleep,0.0;linear,0.3;diffusealpha,1;zoom,1;sleep,1.8;linear,0.3;zoom,0.75;x,170;y,60);
};
LoadActor("feet") .. {
OnCommand=cmd(z,20;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;addx,-SCREEN_WIDTH;sleep,2.4;decelerate,0.3;addx,SCREEN_WIDTH;sleep,2;linear,0.3;zoomy,0);
LoadActor("_howtoplay feet") .. {
InitCommand=cmd(shadowlength,1;strokecolor,Color.Outline);
OnCommand=cmd(z,20;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;addx,-SCREEN_WIDTH;sleep,2.4;decelerate,0.3;addx,SCREEN_WIDTH;sleep,2;linear,0.3;zoomy,0);
};
LoadActor("_message tap")..{
OnCommand=cmd(sleep,6;queuecommand,"Show");
};
LoadActor("_message tap")..{
OnCommand=cmd(sleep,9.7;queuecommand,"Show");
};
LoadActor("_message tap")..{
OnCommand=cmd(sleep,12.7;queuecommand,"Show");
};
LoadActor("_message tap")..{
OnCommand=cmd(sleep,15.7;queuecommand,"Show");
};
LoadActor("_message jump")..{
OnCommand=cmd(sleep,18.7;queuecommand,"Show");
};
LoadActor("_message miss")..{
OnCommand=cmd(sleep,22.7;queuecommand,"Show");
Def.ActorFrame {
InitCommand=cmd(x,SCREEN_CENTER_X+120;y,SCREEN_CENTER_Y+40);
LoadActor("_howtoplay tap")..{
InitCommand=cmd(diffusealpha,0);
ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0);
OnCommand=cmd(sleep,6;queuecommand,"Show");
};
LoadActor("_howtoplay tap")..{
InitCommand=cmd(diffusealpha,0);
ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0);
OnCommand=cmd(sleep,9.7;queuecommand,"Show");
};
LoadActor("_howtoplay tap")..{
InitCommand=cmd(diffusealpha,0);
ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0);
OnCommand=cmd(sleep,12.7;queuecommand,"Show");
};
LoadActor("_howtoplay tap")..{
InitCommand=cmd(diffusealpha,0);
ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0);
OnCommand=cmd(sleep,15.7;queuecommand,"Show");
};
LoadActor("_howtoplay jump")..{
InitCommand=cmd(diffusealpha,0);
ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0);
OnCommand=cmd(sleep,18.7;queuecommand,"Show");
};
LoadActor("_howtoplay miss")..{
InitCommand=cmd(diffusealpha,0);
ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0);
OnCommand=cmd(sleep,22.7;queuecommand,"Show");
};
};
};
Themes/default/BGAnimations/ScreenSelectMusic overlay.lua
+56 -15
View File
@@ -1,3 +1,10 @@
local num_players = GAMESTATE:GetHumanPlayers();
local function PositionItem(i,max)
local x_spacing = 128;
return x_spacing * (i-(max-1)/2);
end
local t = Def.ActorFrame {
FOV=90;
--
@@ -5,22 +12,56 @@ local t = Def.ActorFrame {
InitCommand=cmd(zoomto,SCREEN_CENTER_X+80,SCREEN_HEIGHT);
OnCommand=cmd(diffuse,Color.Black;diffusealpha,0.75;fadeleft,32/SCREEN_CENTER_X;faderight,32/SCREEN_CENTER_X);
};
LoadActor( NOTESKIN:GetPathForNoteSkin("Center","Tap","cmd") ) .. {
InitCommand=cmd(y,20);
};
LoadFont("Common Bold") .. {
Text="PRESS";
InitCommand=cmd(y,-20);
OnCommand=cmd(shadowlength,1;pulse;effectmagnitude,1,1.125,1;effectperiod,0.5);
};
LoadFont("Common Bold") .. {
Text="TO START";
InitCommand=cmd(y,58);
OnCommand=cmd(shadowlength,1;zoom,0.875);
};
--
for i=1,#num_players do
t[#t+1] = Def.ActorFrame {
InitCommand=cmd(x,-128+PositionItem(i,#num_players));
UnchosenCommand=cmd(finishtweening;bounceend,0.25;zoom,1);
ChosenCommand=cmd(stoptweening;bouncebegin,0.3;zoom,0);
--
StepsChosenMessageCommand=function( self, param )
if param.Player ~= num_players[i] then return end;
self:playcommand("Chosen");
end;
StepsUnchosenMessageCommand=function( self, param )
if param.Player ~= num_players[i] then return end;
self:playcommand("Unchosen");
end;
--
LoadActor( NOTESKIN:GetPathForNoteSkin("Center","Tap","cmd") ) .. {
InitCommand=cmd(y,20);
};
Def.Quad {
InitCommand=cmd(y,-35);
OnCommand=cmd(diffuse,PlayerColor(num_players[i]);shadowlength,1;linear,0.25;zoomtowidth,80;fadeleft,0.5;faderight,0.5);
};
LoadFont("Common Bold") .. {
Text=ToEnumShortString(num_players[i]);
InitCommand=cmd(y,-48);
OnCommand=cmd(shadowlength,1;diffuse,PlayerColor(num_players[i]));
};
LoadFont("Common Bold") .. {
Text="PRESS";
InitCommand=cmd(y,-20);
OnCommand=cmd(shadowlength,1;pulse;effectmagnitude,1,1.125,1;effectperiod,0.5);
};
LoadFont("Common Normal") .. {
Text="TO START";
InitCommand=cmd(y,58);
OnCommand=cmd(shadowlength,1;zoom,0.75);
};
};
end
-- Lock input for half a second so that players don't accidentally start a song
t[#t+1] = Def.Actor {
StartSelectingStepsMessageCommand=function() SCREENMAN:GetTopScreen():lockinput(0.5); end;
};
t.InitCommand=cmd(Center;x,SCREEN_CENTER_X*1.5;visible,false;diffusealpha,0);
t.StartSelectingStepsMessageCommand=cmd(linear,0.2;visible,true;diffusealpha,1);
t.StartSelectingSongMessageCommand=cmd(linear,0.2;visible,true;diffusealpha,0);
--
t.InitCommand=cmd(Center;x,SCREEN_CENTER_X*1.5;diffusealpha,0);
t.StartSelectingStepsMessageCommand=cmd(linear,0.2;diffusealpha,1);
t.SongUnchosenMessageCommand=cmd(linear,0.2;diffusealpha,0);
return t;
Themes/default/BGAnimations/ScreenSelectMusic underlay.lua
+1
View File
@@ -3,6 +3,7 @@ local t = Def.ActorFrame {
InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT);
OnCommand=cmd(diffuse,Color.Black;diffusealpha,0);
StartSelectingStepsMessageCommand=cmd(stoptweening;linear,0.2;diffusealpha,0.75);
SongUnchosenMessageCommand=cmd(stoptweening;linear,0.2;diffusealpha,0);
};
};
Themes/default/Graphics/ScreenWithMenuElements Footer.lua
+6 -1
View File
@@ -1,7 +1,12 @@
local t = Def.ActorFrame {};
t[#t+1] = Def.Quad {
InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH+1,34;diffuse,color("#161616"));
InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH,34;diffuse,color("#161616"));
};
t[#t+1] = LoadActor(THEME:GetPathG("ScreenWithMenuElements","header/Header")) .. {
InitCommand=cmd(y,-48;vertalign,bottom;zoomtowidth,SCREEN_WIDTH);
OnCommand=cmd(zoomy,-1;diffuse,color("#ffd400"));
};
return t;
Themes/default/Languages/en.ini
+8 -2
View File
@@ -1,4 +1,4 @@
[Screen]
`[Screen]
HelpText=&BACK; Exit &START; Select &SELECT; Options &MENULEFT;&MENURIGHT;&MENUUP;&MENUDOWN; Move
[ScreenWithMenuElements]
@@ -26,6 +26,9 @@ JointPremiumSecondary=Two players can play with one credit!
DoublesPremiumMain=Doubles Premium
DoublesPremiumSecondary=Play doubles for one credit!
[ScreenCaution]
HelpText=&START; Continue
[ScreenDemonstration]
Demonstration=Demonstration
%s - %s [from %s]=%s - %s\n[from %s]
@@ -91,6 +94,9 @@ PersonalRecord=Personal Record #%i!
ITG DP:=ITG DP:
MIGS DP:=MIGS DP:
[ScreenContinue]
HelpText=&START; Advance Timer
[OptionTitles]
AutoSetStyle=Auto Set Style
NotePosition=Note Positions
@@ -232,4 +238,4 @@ Play again soon!=Play again soon!
How To Play StepMania=How To Play StepMania
[Protiming]
MS=MS
MS=MS
Themes/default/metrics.ini
+14 -8
View File
@@ -370,12 +370,14 @@ FrameOnCommand=visible,false;spin
TimeRemainingY=80
TimeRemainingOnCommand=zoom,1;shadowlength,1;
#
DeltaSecondsOnCommand=y,80;spin;
DeltaSecondsOnCommand=y,80;
DeltaSecondsGainLifeCommand=zoom,0.5;
[ScoreDisplayPercentage Percent]
PercentP1OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_1);strokecolor,ColorDarkTone(PlayerColor(PLAYER_1))
PercentP2OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_2);strokecolor,ColorDarkTone(PlayerColor(PLAYER_2))
PercentP1OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_1);strokecolor,Color.Outline
PercentP2OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_2);strokecolor,Color.Outline
DancePointsP1OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_1);strokecolor,Color.Outline
DancePointsP2OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_2);strokecolor,Color.Outline
[ScoreDisplayRave]
MeterP1OnCommand=draworder,-1;texcoordvelocity,1,0
@@ -530,9 +532,9 @@ PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \
self:diffuseramp(); \
self:effectcolor2(color("1,1,1,1")); \
self:effectcolor1(color("0.5,0.5,0.5,1")); \
self:effectperiod(rate); \
self:effectclock('beat'); \
self:effecttiming(rate*0.75,rate*0.125,rate*0.125,0); \
self:effectoffset(1.25-offset); \
self:effectoffset(1-offset); \
end;
# PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \
# local fItemWidth = ( 256 / numItems ) \
@@ -589,8 +591,8 @@ HeaderOffCommand=
ShowFooter=true
FooterX=SCREEN_CENTER_X
FooterY=SCREEN_BOTTOM+2
FooterOnCommand=draworder,1;vertalign,bottom;zoomtowidth,SCREEN_WIDTH+1;
FooterY=SCREEN_BOTTOM+4
FooterOnCommand=draworder,1;
FooterOffCommand=
ShowHelp=true
@@ -698,6 +700,8 @@ ShowVersionInfo=true
VersionInfoX=SCREEN_RIGHT-16
VersionInfoY=SCREEN_TOP+24
VersionInfoOnCommand=
VersionInfoOffCommand=
#
ShowNetworkStatus=true
@@ -916,6 +920,7 @@ SongTimeX=SCREEN_CENTER_X-160
SongTimeY=SCREEN_TOP+160+(36/2)+8
SongTimeOnCommand=zoom,0.75;strokecolor,Color("Outline");shadowlength,1
SongTimeOffCommand=bouncebegin,0.15;zoom,0;diffusealpha,0;
SongTimeResetCommand=diffuse,Color("White");
SongTimeAutogenCommand=diffuse,Color("Green");
@@ -983,7 +988,7 @@ ShowDifficultyList=not GAMESTATE:IsCourseMode();
DifficultyListX=SCREEN_CENTER_X-160
DifficultyListY=SCREEN_TOP+216
DifficultyListOnCommand=addx,-SCREEN_CENTER_X;decelerate,0.1;addx,SCREEN_CENTER_X;
DifficultyListStartSelectingStepsMessageCommand=finishtweening;glowshift;effectcolor1,color("1,1,1,0.25");effectcolor2,color("1,1,1,0");effectperiod,2;
DifficultyListStartSelectingStepsMessageCommand=finishtweening;accelerate,0.2;zoom,1.1;decelerate,0.2;zoom,1;
DifficultyListOffCommand=bouncebegin,0.05;zoomx,0;
#
DifficultyListTweenOnCommand=stoptweening;bounceend,0.1;zoomx,1
@@ -1870,6 +1875,7 @@ MachineRecordP2X=SCREEN_CENTER_X+220
#MachineRecordP2Y=SCREEN_BOTTOM-156
MachineRecordP2Y=SCREEN_TOP+146
MachineRecordP2OnCommand=
MachineRecordP2OffCommand=
#
PersonalRecordP1X=SCREEN_CENTER_X-160