This commit is contained in:
Chris Danford
2009-04-12 01:48:29 +00:00
parent ad936ebe25
commit 94014a2f62
3 changed files with 27 additions and 20 deletions
@@ -18,16 +18,13 @@ t[#t+1] = StandardDecorationFromFile( "LeftFrame", "LeftFrame" );
t[#t+1] = StandardDecorationFromFile( "RightFrame", "RightFrame" );
t[#t+1] = Def.ModIconRow {
InitCommand=cmd(x,THEME:GetMetric(Var "LoadingScreen","LeftFrameX");y,THEME:GetMetric(Var "LoadingScreen","LeftFrameY");Load,"ModIconRowGameplayP1",PLAYER_1;player,PLAYER_1;);
OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1);
OffCommand=cmd(linear,0.5;zoomy,0);
};
t[#t+1] = Def.ModIconRow {
InitCommand=cmd(x,THEME:GetMetric(Var "LoadingScreen","RightFrameX");y,THEME:GetMetric(Var "LoadingScreen","RightFrameY");Load,"ModIconRowGameplayP2",PLAYER_2;player,PLAYER_2;);
OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1);
OffCommand=cmd(linear,0.5;zoomy,0);
};
if ShowStandardDecoration("ModIconRows") then
for pn in ivalues(PlayerNumber) do
local t2 = Def.ModIconRow {
InitCommand=cmd(Load,"ModIconRowGameplay"..ToEnumShortString(pn),pn);
};
t[#t+1] = StandardDecorationFromTable( "ModIconRow" .. ToEnumShortString(pn), t2 );
end
end
return t;
@@ -24,7 +24,7 @@ return Def.ActorFrame {
LoadActor( "arrow" ) .. {
};
LoadActor( "ring shadow" ) .. {
InitCommand=cmd(x,-1.5;y,2;spin;effectmagnitude,0,0,10;);
InitCommand=cmd(x,-1.5;y,2;spin;effectmagnitude,0,0,20;);
};
LoadActor( "ring diffuse" ) .. {
InitCommand=cmd(x,-1.5;y,-3;spin;effectmagnitude,0,0,20;);
+18 -8
View File
@@ -763,7 +763,7 @@ SurviveTimeY=SCREEN_CENTER_Y+100
SurviveTimeOnCommand=sleep,0.3;linear,0.3;diffusealpha,1;sleep,3.5;linear,0.5;diffusealpha,0
DebugX=SCREEN_CENTER_X
DebugY=SCREEN_CENTER_Y
DebugOnCommand=wrapwidthpixels,SCREEN_WIDTH-50
DebugOnCommand=wrapwidthpixels,SCREEN_WIDTH-50;strokecolor,color("#000000");
DebugOffCommand=stoptweening;linear,1/8;diffusealpha,0
SecondsBetweenComments=10
TickEarlySeconds=0.05
@@ -782,12 +782,22 @@ PlayerP1TwoPlayersSharedSidesX=SCREEN_CENTER_X
PlayerP2TwoPlayersSharedSidesX=SCREEN_CENTER_X
LeftFrameX=math.floor(scale(0.25,0,1,SCREEN_LEFT,SCREEN_RIGHT))-160
LeftFrameY=SCREEN_CENTER_Y
LeftFrameOnCommand=
LeftFrameOffCommand=
LeftFrameOnCommand=addx,-200;linear,0.5;addx,200
LeftFrameOffCommand=linear,0.5;addx,-200
RightFrameX=math.floor(scale(0.75,0,1,SCREEN_LEFT,SCREEN_RIGHT))+160
RightFrameY=SCREEN_CENTER_Y
RightFrameOnCommand=
RightFrameOffCommand=
RightFrameOnCommand=addx,200;linear,0.5;addx,-200
RightFrameOffCommand=linear,0.5;addx,200
ShowModIconRows=true
ModIconRowP1X=THEME:GetMetric(Var "LoadingScreen","LeftFrameX")+6
ModIconRowP1Y=SCREEN_CENTER_Y
ModIconRowP1OnCommand=player,"PlayerNumber_P1";addx,-200;linear,0.5;addx,200
ModIconRowP1OffCommand=linear,0.5;addx,-200
ModIconRowP2X=THEME:GetMetric(Var "LoadingScreen","RightFrameX")-6
ModIconRowP2Y=SCREEN_CENTER_Y
ModIconRowP2OnCommand=player,"PlayerNumber_P2";addx,200;linear,0.5;addx,-200
ModIconRowP2OffCommand=linear,0.5;addx,200
StopCourseEarly=false
ShowEvaluationOnFail=true
@@ -1287,11 +1297,11 @@ StageAwardP2OnCommand=draworder,1
StageAwardP2OffCommand=linear,0.7;addx,400
ModIconRowP1X=SCREEN_CENTER_X-316
ModIconRowP1Y=SCREEN_CENTER_Y-130
ModIconRowP1Y=SCREEN_CENTER_Y
ModIconRowP1OnCommand=draworder,1;player,"PlayerNumber_P1";addx,-200;linear,0.5;addx,200
ModIconRowP1OffCommand=linear,0.5;addx,-200
ModIconRowP2X=SCREEN_CENTER_X+316
ModIconRowP2Y=SCREEN_CENTER_Y-130
ModIconRowP2Y=SCREEN_CENTER_Y
ModIconRowP2OnCommand=draworder,1;player,"PlayerNumber_P2";addx,200;linear,0.5;addx,-200
ModIconRowP2OffCommand=linear,0.5;addx,200
@@ -1600,7 +1610,7 @@ Fallback="Screen"
[ScreenSyncOverlay]
Class="ScreenSyncOverlay"
Fallback="Screen"
StatusOnCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+150;shadowlength,2;
StatusOnCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+150;shadowlength,2;strokecolor,color("#000000");
SyncInfoOnCommand=x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y;
[ScreenStatsOverlay]