I did something really stupid...

This commit is contained in:
Alberto Ramos
2010-08-07 20:41:22 -06:00
parent dba5744435
commit e6e9941d17
5 changed files with 38 additions and 28 deletions
+5 -11
View File
@@ -58,7 +58,11 @@ local function func()
local sElement = Var "Element" local sElement = Var "Element"
if Noteskin.bBlanks[sElement] then if Noteskin.bBlanks[sElement] then
return Def.Actor {} local t = Def.Actor {};
if Var "SpriteOnly" then
t = LoadActor( "_blank" );
end
return t
end end
--local ButtonToLoad = Noteskin.ButtonRedirs[sButton] --local ButtonToLoad = Noteskin.ButtonRedirs[sButton]
@@ -84,16 +88,6 @@ local function func()
end end
local t = LoadActor(path) local t = LoadActor(path)
--Rotaciones independientes por elemento
--[[local dRotationX = Noteskin.BaseRotX[sButton][ElementToLoad]
if not dRotationX then
dRotationX = Noteskin.BaseRotX[sButton]["Common"]
end
local dRotationY = Noteskin.BaseRotY[sButton][ElementToLoad]
if not dRotationY then
dRotationY = Noteskin.BaseRotY[sButton]["Common"]
end]]
t.BaseRotationX=Noteskin.BaseRotX[sButton] t.BaseRotationX=Noteskin.BaseRotX[sButton]
t.BaseRotationY=Noteskin.BaseRotY[sButton] t.BaseRotationY=Noteskin.BaseRotY[sButton]
+18 -3
View File
@@ -46,8 +46,23 @@ return Def.ActorFrame {
HeldCommand=cmd(playcommand,"Glow"); HeldCommand=cmd(playcommand,"Glow");
GlowCommand=cmd(setstate,0;finishtweening;diffusealpha,1;zoom,1;linear,0.2;diffusealpha,0;zoom,1.2); GlowCommand=cmd(setstate,0;finishtweening;diffusealpha,1;zoom,1;linear,0.2;diffusealpha,0;zoom,1.2);
}; };
Def.Quad { Def.Actor {
InitCommand=cmd(diffuse,1,1,1,0;zoomto,SCREEN_WIDTH*100,SCREEN_HEIGHT*100;zoomz,SCREEN_WIDTH*SCREEN_HEIGHT); HitMineCommand=function(self) MESSAGEMAN:BroadCast("AMineWasHit"); end;
HitMineCommand=cmd(finishtweening;diffusealpha,1;linear,0.3;diffusealpha,0);
}; };
--[[Def.Quad {
InitCommand=function(self)
local style = GAMESTATE:GetCurrentStyle()GetStyleType()
local maxzoom = SCREEN_WIDTH
if style == 'StyleType_OnePlayerTwoSides' then
maxzoom = 320
end
self:diffuse(1,1,1,0);
self:zoomx(maxzoom);
self:zoomy(SCREEN_HEIGHT*5)
end;
--cmd(diffuse,1,1,1,0;zoomy,SCREEN_HEIGHT*100);
HitMineCommand=function(self) MESSAGEMAN:BroadCast("AMineWasHit"); end;
--cmd(finishtweening;diffusealpha,1;linear,0.3;diffusealpha,0);
};]]
} }
+9 -9
View File
@@ -1,10 +1,10 @@
[NoteDisplay] [NoteDisplay]
TapNoteAnimationLength=0.1875 TapNoteAnimationLength=0.333
TapMineAnimationLength=0.1875 TapMineAnimationLength=0.333
TapLiftAnimationLength=0.1875 TapLiftAnimationLength=0.333
TapFakeAnimationLength=0.1875 TapFakeAnimationLength=0.333
HoldHeadAnimationLength=0.1875 HoldHeadAnimationLength=0.333
HoldTopCapAnimationLength=0.1875 HoldTopCapAnimationLength=0.333
HoldBottomCapAnimationLength=0.1875 HoldBottomCapAnimationLength=0.333
HoldBodyAnimationLength=0.1875 HoldBodyAnimationLength=0.333
HoldTailAnimationLength=0.1875 HoldTailAnimationLength=0.333
+4 -4
View File
@@ -1768,12 +1768,12 @@ PreviousSongButton="MenuLeft"
NextSongButton="MenuRight" NextSongButton="MenuRight"
# #
ChangeStepsWithGameButtons=false ChangeStepsWithGameButtons=false
PreviousDifficultyButton="MenuUp" ;PreviousDifficultyButton="MenuUp"
NextDifficultyButton="MenuDown" ;NextDifficultyButton="MenuDown"
# #
ChangeGroupsWithGameButtons=false ChangeGroupsWithGameButtons=false
PreviousDifficultyButton="MenuUp" ;PreviousDifficultyButton="MenuUp"
NextDifficultyButton="MenuDown" ;NextDifficultyButton="MenuDown"
# #
TwoPartSelection=false TwoPartSelection=false
TwoPartConfirmsOnly=false TwoPartConfirmsOnly=false
+2 -1
View File
@@ -573,8 +573,9 @@ static bool LoadGlobalData( const RString &sPath, Song &out, bool &bKIUCompliant
} }
else if (BeginsWith(NoteRowString, "|B")) else if (BeginsWith(NoteRowString, "|B"))
{ {
float fCurBpm = (float)numTemp;
//out.m_Timing.AddBPMSegment( BPMSegment( BeatToNoteRow(fCurBeat), (float)numTemp ) ); //out.m_Timing.AddBPMSegment( BPMSegment( BeatToNoteRow(fCurBeat), (float)numTemp ) );
out.m_Timing.SetBPMAtBeat( (float)numTemp, fCurBeat ); out.m_Timing.SetBPMAtBeat( fCurBeat, (float)numTemp );
continue; continue;
} }
else if (BeginsWith(NoteRowString, "|E")) else if (BeginsWith(NoteRowString, "|E"))