diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Hold Body active.png b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Hold Body active.png new file mode 100644 index 0000000000..05d1a289cd Binary files /dev/null and b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Hold Body active.png differ diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Hold Body inactive.png b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Hold Body inactive.png new file mode 100644 index 0000000000..97c259eaa1 Binary files /dev/null and b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Hold Body inactive.png differ diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Hold BottomCap active.png b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Hold BottomCap active.png new file mode 100644 index 0000000000..80651a8414 Binary files /dev/null and b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Hold BottomCap active.png differ diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Hold BottomCap inactive.png b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Hold BottomCap inactive.png new file mode 100644 index 0000000000..8e4b469a8b Binary files /dev/null and b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Hold BottomCap inactive.png differ diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Hold TopCap active.png b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Hold TopCap active.png new file mode 100644 index 0000000000..bb1601de02 Binary files /dev/null and b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Hold TopCap active.png differ diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Hold TopCap inactive.png b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Hold TopCap inactive.png new file mode 100644 index 0000000000..76ed2442cb Binary files /dev/null and b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Hold TopCap inactive.png differ diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Roll Body Inactive.redir b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Roll Body Inactive.redir new file mode 100644 index 0000000000..06bde73d76 --- /dev/null +++ b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Roll Body Inactive.redir @@ -0,0 +1 @@ +_Roll Body inactive \ No newline at end of file diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Roll Body active.redir b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Roll Body active.redir new file mode 100644 index 0000000000..56bc768aef --- /dev/null +++ b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Roll Body active.redir @@ -0,0 +1 @@ +_Roll Body active \ No newline at end of file diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Roll BottomCap active.redir b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Roll BottomCap active.redir new file mode 100644 index 0000000000..e55de56d40 --- /dev/null +++ b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Roll BottomCap active.redir @@ -0,0 +1 @@ +_Roll BottomCap active \ No newline at end of file diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Roll BottomCap inactive.redir b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Roll BottomCap inactive.redir new file mode 100644 index 0000000000..f60b788141 --- /dev/null +++ b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Roll BottomCap inactive.redir @@ -0,0 +1 @@ +_Roll BottomCap inactive \ No newline at end of file diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Roll TopCap active.redir b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Roll TopCap active.redir new file mode 100644 index 0000000000..f06745bdc7 --- /dev/null +++ b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Roll TopCap active.redir @@ -0,0 +1 @@ +_Roll TopCap active \ No newline at end of file diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Roll TopCap inactive.redir b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Roll TopCap inactive.redir new file mode 100644 index 0000000000..573998cd31 --- /dev/null +++ b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Roll TopCap inactive.redir @@ -0,0 +1 @@ +_Roll TopCap inactive \ No newline at end of file diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Tap Note.lua b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Tap Note.lua new file mode 100644 index 0000000000..ed7d3170c9 --- /dev/null +++ b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue Tap Note.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath( '_Blue', 'tap note' ); + Frames = Sprite.LinearFrames( 4, 1 ); +}; \ No newline at end of file diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/Blue hold explosion.redir b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue hold explosion.redir new file mode 100644 index 0000000000..a902b7fde9 --- /dev/null +++ b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue hold explosion.redir @@ -0,0 +1 @@ +_Hold Explosion \ No newline at end of file diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/Blue receptor.lua b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue receptor.lua new file mode 100644 index 0000000000..6ec0a4d6b2 --- /dev/null +++ b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue receptor.lua @@ -0,0 +1,23 @@ +local t = Def.ActorFrame{ + -- normal + Def.Sprite { + Texture=NOTESKIN:GetPath( '_blue', 'receptor base' ); + Frame0000=0; + Delay0000=1; + InitCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'InitCommand'); + NoneCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'NoneCommand'); + PressCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'PressCommand'); + }; + -- flashpert + Def.Sprite { + Texture="_bar receptor tap"; + Frame0000=0; + Delay0000=1; + InitCommand=NOTESKIN:GetMetricA('ReceptorOverlay', 'InitCommand'); + PressCommand=NOTESKIN:GetMetricA('ReceptorOverlay', 'PressCommand'); + LiftCommand=NOTESKIN:GetMetricA('ReceptorOverlay', 'LiftCommand'); + NoneCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'NoneCommand'); + }; +}; + +return t; \ No newline at end of file diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/Blue roll explosion.redir b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue roll explosion.redir new file mode 100644 index 0000000000..0fe8fb872f --- /dev/null +++ b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue roll explosion.redir @@ -0,0 +1 @@ +_Roll Explosion \ No newline at end of file diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/Blue tap explosion bright.redir b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue tap explosion bright.redir new file mode 100644 index 0000000000..0eb3eea363 --- /dev/null +++ b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue tap explosion bright.redir @@ -0,0 +1 @@ +_Tap explosion bright \ No newline at end of file diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/Blue tap explosion dim.redir b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue tap explosion dim.redir new file mode 100644 index 0000000000..28a4acbeed --- /dev/null +++ b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue tap explosion dim.redir @@ -0,0 +1 @@ +_Tap explosion dim \ No newline at end of file diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/Blue tap fake.png b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue tap fake.png new file mode 100644 index 0000000000..fd093b68ec Binary files /dev/null and b/NoteSkins/dance/retrobar-splithand_whiteblue/Blue tap fake.png differ diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/Noteskin.lua b/NoteSkins/dance/retrobar-splithand_whiteblue/Noteskin.lua new file mode 100644 index 0000000000..4c8ecb5b13 --- /dev/null +++ b/NoteSkins/dance/retrobar-splithand_whiteblue/Noteskin.lua @@ -0,0 +1,94 @@ +-- from scratch, with various references. +local Noteskin = ... or {}; + +-- element redirs +Noteskin.ElementRedirs = { + -- ["element"] = "redir_element"; + -- Instead of separate hold heads, use the tap note graphics. + ["Hold Head Inactive"] = "Tap Note"; + ["Hold Head Active"] = "Tap Note"; + ["Roll Head Inactive"] = "Tap Note"; + ["Roll Head Active"] = "Tap Note"; +}; + +-- button redirs +-- this noteskin is only for solo play. +-- [white][white][white] [blue][blue][blue] +Noteskin.ButtonRedirs = { + -- dance + Left = "White"; + UpLeft = "White"; + Down = "White"; + Up = "Blue"; + UpRight = "Blue"; + Right = "Blue"; +}; + +-- things to blank out +Noteskin.Hide = { + -- ["element"] = true/false; +}; + +-- rotations +Noteskin.BaseRotX = { + Left = 0; + UpLeft = 0; + Up = 0; + Down = 0; + UpRight = 0; + Right = 0; +}; +Noteskin.BaseRotY = { + Left = 0; + UpLeft = 0; + Up = 0; + Down = 0; + UpRight = 0; + Right = 0; +}; + +local function NoteskinLoader() + local Button = Var "Button" + local Element = Var "Element" + + if Noteskin.Hide[Element] then + -- Return a blank element. If SpriteOnly is set, we need to return a + -- sprite; otherwise just return a dummy actor. + local t; + if Var "SpriteOnly" then + t = LoadActor( "_blank" ); + else + t = Def.Actor {}; + end + return t .. { + cmd(visible,false); + }; + end; + + -- load element and button, using redirs + local LoadElement = Noteskin.ElementRedirs[Element] + if not LoadElement then + LoadElement = Element; + end; + + local LoadButton = Noteskin.ButtonRedirs[Button] + if not LoadButton then + LoadButton = Button; + end; + + -- get path to thing + local sPath = NOTESKIN:GetPath( LoadButton, LoadElement ); + + -- make actor + local t = LoadActor( sPath ); + + -- apply rotation + t.BaseRotationX=Noteskin.BaseRotX[sButton] + t.BaseRotationY=Noteskin.BaseRotY[sButton] + + return t; +end + +Noteskin.Load = NoteskinLoader; +Noteskin.CommonLoad = NoteskinLoader; +return Noteskin; \ No newline at end of file diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/White Hold Body active.png b/NoteSkins/dance/retrobar-splithand_whiteblue/White Hold Body active.png new file mode 100644 index 0000000000..1e7942ceb0 Binary files /dev/null and b/NoteSkins/dance/retrobar-splithand_whiteblue/White Hold Body active.png differ diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/White Hold Body inactive.png b/NoteSkins/dance/retrobar-splithand_whiteblue/White Hold Body inactive.png new file mode 100644 index 0000000000..4d19984a11 Binary files /dev/null and b/NoteSkins/dance/retrobar-splithand_whiteblue/White Hold Body inactive.png differ diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/White Hold BottomCap active.png b/NoteSkins/dance/retrobar-splithand_whiteblue/White Hold BottomCap active.png new file mode 100644 index 0000000000..02ee7ae3da Binary files /dev/null and b/NoteSkins/dance/retrobar-splithand_whiteblue/White Hold BottomCap active.png differ diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/White Hold BottomCap inactive.png b/NoteSkins/dance/retrobar-splithand_whiteblue/White Hold BottomCap inactive.png new file mode 100644 index 0000000000..93a5175caa Binary files /dev/null and b/NoteSkins/dance/retrobar-splithand_whiteblue/White Hold BottomCap inactive.png differ diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/White Hold TopCap active.png b/NoteSkins/dance/retrobar-splithand_whiteblue/White Hold TopCap active.png new file mode 100644 index 0000000000..8ab3726130 Binary files /dev/null and b/NoteSkins/dance/retrobar-splithand_whiteblue/White Hold TopCap active.png differ diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/White Hold TopCap inactive.png b/NoteSkins/dance/retrobar-splithand_whiteblue/White Hold TopCap inactive.png new file mode 100644 index 0000000000..5640bbe611 Binary files /dev/null and b/NoteSkins/dance/retrobar-splithand_whiteblue/White Hold TopCap inactive.png differ diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/White Roll Body Inactive.redir b/NoteSkins/dance/retrobar-splithand_whiteblue/White Roll Body Inactive.redir new file mode 100644 index 0000000000..06bde73d76 --- /dev/null +++ b/NoteSkins/dance/retrobar-splithand_whiteblue/White Roll Body Inactive.redir @@ -0,0 +1 @@ +_Roll Body inactive \ No newline at end of file diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/White Roll Body active.redir b/NoteSkins/dance/retrobar-splithand_whiteblue/White Roll Body active.redir new file mode 100644 index 0000000000..56bc768aef --- /dev/null +++ b/NoteSkins/dance/retrobar-splithand_whiteblue/White Roll Body active.redir @@ -0,0 +1 @@ +_Roll Body active \ No newline at end of file diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/White Roll BottomCap active.redir b/NoteSkins/dance/retrobar-splithand_whiteblue/White Roll BottomCap active.redir new file mode 100644 index 0000000000..e55de56d40 --- /dev/null +++ b/NoteSkins/dance/retrobar-splithand_whiteblue/White Roll BottomCap active.redir @@ -0,0 +1 @@ +_Roll BottomCap active \ No newline at end of file diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/White Roll BottomCap inactive.redir b/NoteSkins/dance/retrobar-splithand_whiteblue/White Roll BottomCap inactive.redir new file mode 100644 index 0000000000..f60b788141 --- /dev/null +++ b/NoteSkins/dance/retrobar-splithand_whiteblue/White Roll BottomCap inactive.redir @@ -0,0 +1 @@ +_Roll BottomCap inactive \ No newline at end of file diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/White Roll TopCap active.redir b/NoteSkins/dance/retrobar-splithand_whiteblue/White Roll TopCap active.redir new file mode 100644 index 0000000000..f06745bdc7 --- /dev/null +++ b/NoteSkins/dance/retrobar-splithand_whiteblue/White Roll TopCap active.redir @@ -0,0 +1 @@ +_Roll TopCap active \ No newline at end of file diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/White Roll TopCap inactive.redir b/NoteSkins/dance/retrobar-splithand_whiteblue/White Roll TopCap inactive.redir new file mode 100644 index 0000000000..573998cd31 --- /dev/null +++ b/NoteSkins/dance/retrobar-splithand_whiteblue/White Roll TopCap inactive.redir @@ -0,0 +1 @@ +_Roll TopCap inactive \ No newline at end of file diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/White Tap Note.lua b/NoteSkins/dance/retrobar-splithand_whiteblue/White Tap Note.lua new file mode 100644 index 0000000000..653997ff60 --- /dev/null +++ b/NoteSkins/dance/retrobar-splithand_whiteblue/White Tap Note.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath( '_White', 'tap note' ); + Frames = Sprite.LinearFrames( 4, 1 ); +}; \ No newline at end of file diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/White hold explosion.redir b/NoteSkins/dance/retrobar-splithand_whiteblue/White hold explosion.redir new file mode 100644 index 0000000000..a902b7fde9 --- /dev/null +++ b/NoteSkins/dance/retrobar-splithand_whiteblue/White hold explosion.redir @@ -0,0 +1 @@ +_Hold Explosion \ No newline at end of file diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/White receptor.lua b/NoteSkins/dance/retrobar-splithand_whiteblue/White receptor.lua new file mode 100644 index 0000000000..59dfba60c1 --- /dev/null +++ b/NoteSkins/dance/retrobar-splithand_whiteblue/White receptor.lua @@ -0,0 +1,23 @@ +local t = Def.ActorFrame{ + -- normal + Def.Sprite { + Texture=NOTESKIN:GetPath( '_white', 'receptor base' ); + Frame0000=0; + Delay0000=1; + InitCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'InitCommand'); + NoneCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'NoneCommand'); + PressCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'PressCommand'); + }; + -- flashpert + Def.Sprite { + Texture="_bar receptor tap"; + Frame0000=0; + Delay0000=1; + InitCommand=NOTESKIN:GetMetricA('ReceptorOverlay', 'InitCommand'); + PressCommand=NOTESKIN:GetMetricA('ReceptorOverlay', 'PressCommand'); + LiftCommand=NOTESKIN:GetMetricA('ReceptorOverlay', 'LiftCommand'); + NoneCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'NoneCommand'); + }; +}; + +return t; \ No newline at end of file diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/White roll explosion.redir b/NoteSkins/dance/retrobar-splithand_whiteblue/White roll explosion.redir new file mode 100644 index 0000000000..0fe8fb872f --- /dev/null +++ b/NoteSkins/dance/retrobar-splithand_whiteblue/White roll explosion.redir @@ -0,0 +1 @@ +_Roll Explosion \ No newline at end of file diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/White tap explosion bright.redir b/NoteSkins/dance/retrobar-splithand_whiteblue/White tap explosion bright.redir new file mode 100644 index 0000000000..0eb3eea363 --- /dev/null +++ b/NoteSkins/dance/retrobar-splithand_whiteblue/White tap explosion bright.redir @@ -0,0 +1 @@ +_Tap explosion bright \ No newline at end of file diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/White tap explosion dim.redir b/NoteSkins/dance/retrobar-splithand_whiteblue/White tap explosion dim.redir new file mode 100644 index 0000000000..28a4acbeed --- /dev/null +++ b/NoteSkins/dance/retrobar-splithand_whiteblue/White tap explosion dim.redir @@ -0,0 +1 @@ +_Tap explosion dim \ No newline at end of file diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/White tap fake.png b/NoteSkins/dance/retrobar-splithand_whiteblue/White tap fake.png new file mode 100644 index 0000000000..ab1abebe8e Binary files /dev/null and b/NoteSkins/dance/retrobar-splithand_whiteblue/White tap fake.png differ diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/_Blue tap note 4x2.png b/NoteSkins/dance/retrobar-splithand_whiteblue/_Blue tap note 4x2.png new file mode 100644 index 0000000000..41112e3450 Binary files /dev/null and b/NoteSkins/dance/retrobar-splithand_whiteblue/_Blue tap note 4x2.png differ diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/_Hold Explosion.lua b/NoteSkins/dance/retrobar-splithand_whiteblue/_Hold Explosion.lua new file mode 100644 index 0000000000..8872ea2286 --- /dev/null +++ b/NoteSkins/dance/retrobar-splithand_whiteblue/_Hold Explosion.lua @@ -0,0 +1,3 @@ +return LoadActor("_bar hold explosion bright")..{ + CheckpointHitCommand=cmd(diffusealpha,0); +}; \ No newline at end of file diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/_Receptor.lua b/NoteSkins/dance/retrobar-splithand_whiteblue/_Receptor.lua new file mode 100644 index 0000000000..58549bea9c --- /dev/null +++ b/NoteSkins/dance/retrobar-splithand_whiteblue/_Receptor.lua @@ -0,0 +1,23 @@ +local t = Def.ActorFrame{ + -- normal + Def.Sprite { + Texture=NOTESKIN:GetPath( '_bar', 'receptor base' ); + Frame0000=0; + Delay0000=1; + InitCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'InitCommand'); + NoneCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'NoneCommand'); + PressCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'PressCommand'); + }; + -- flashpert + Def.Sprite { + Texture="_bar receptor tap"; + Frame0000=0; + Delay0000=1; + InitCommand=NOTESKIN:GetMetricA('ReceptorOverlay', 'InitCommand'); + PressCommand=NOTESKIN:GetMetricA('ReceptorOverlay', 'PressCommand'); + LiftCommand=NOTESKIN:GetMetricA('ReceptorOverlay', 'LiftCommand'); + NoneCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'NoneCommand'); + }; +}; + +return t; \ No newline at end of file diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/_Roll Body active.png b/NoteSkins/dance/retrobar-splithand_whiteblue/_Roll Body active.png new file mode 100644 index 0000000000..b6ff89cca8 Binary files /dev/null and b/NoteSkins/dance/retrobar-splithand_whiteblue/_Roll Body active.png differ diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/_Roll Body inactive.png b/NoteSkins/dance/retrobar-splithand_whiteblue/_Roll Body inactive.png new file mode 100644 index 0000000000..10852ee2bd Binary files /dev/null and b/NoteSkins/dance/retrobar-splithand_whiteblue/_Roll Body inactive.png differ diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/_Roll BottomCap active.png b/NoteSkins/dance/retrobar-splithand_whiteblue/_Roll BottomCap active.png new file mode 100644 index 0000000000..c9242e50b6 Binary files /dev/null and b/NoteSkins/dance/retrobar-splithand_whiteblue/_Roll BottomCap active.png differ diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/_Roll BottomCap inactive.png b/NoteSkins/dance/retrobar-splithand_whiteblue/_Roll BottomCap inactive.png new file mode 100644 index 0000000000..c38b76ac9e Binary files /dev/null and b/NoteSkins/dance/retrobar-splithand_whiteblue/_Roll BottomCap inactive.png differ diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/_Roll Explosion.lua b/NoteSkins/dance/retrobar-splithand_whiteblue/_Roll Explosion.lua new file mode 100644 index 0000000000..8872ea2286 --- /dev/null +++ b/NoteSkins/dance/retrobar-splithand_whiteblue/_Roll Explosion.lua @@ -0,0 +1,3 @@ +return LoadActor("_bar hold explosion bright")..{ + CheckpointHitCommand=cmd(diffusealpha,0); +}; \ No newline at end of file diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/_Roll TopCap active.png b/NoteSkins/dance/retrobar-splithand_whiteblue/_Roll TopCap active.png new file mode 100644 index 0000000000..ebaae412df Binary files /dev/null and b/NoteSkins/dance/retrobar-splithand_whiteblue/_Roll TopCap active.png differ diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/_Roll TopCap inactive.png b/NoteSkins/dance/retrobar-splithand_whiteblue/_Roll TopCap inactive.png new file mode 100644 index 0000000000..c521c5c556 Binary files /dev/null and b/NoteSkins/dance/retrobar-splithand_whiteblue/_Roll TopCap inactive.png differ diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/_Tap Lift 4x1.png b/NoteSkins/dance/retrobar-splithand_whiteblue/_Tap Lift 4x1.png new file mode 100644 index 0000000000..4a46e0b910 Binary files /dev/null and b/NoteSkins/dance/retrobar-splithand_whiteblue/_Tap Lift 4x1.png differ diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/_Tap Mine.lua b/NoteSkins/dance/retrobar-splithand_whiteblue/_Tap Mine.lua new file mode 100644 index 0000000000..face18692a --- /dev/null +++ b/NoteSkins/dance/retrobar-splithand_whiteblue/_Tap Mine.lua @@ -0,0 +1,15 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath( '_bar', 'mine' ); + Frame0000=0; + Delay0000=1; + Frame0001=1; + Delay0001=1; + Frame0002=2; + Delay0002=1; + Frame0003=3; + Delay0003=1; + Frame0004=2; + Delay0004=1; + Frame0005=1; + Delay0005=1; +}; \ No newline at end of file diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/_Tap explosion bright.png b/NoteSkins/dance/retrobar-splithand_whiteblue/_Tap explosion bright.png new file mode 100644 index 0000000000..b6c9e91078 Binary files /dev/null and b/NoteSkins/dance/retrobar-splithand_whiteblue/_Tap explosion bright.png differ diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/_Tap explosion dim.redir b/NoteSkins/dance/retrobar-splithand_whiteblue/_Tap explosion dim.redir new file mode 100644 index 0000000000..0eb3eea363 --- /dev/null +++ b/NoteSkins/dance/retrobar-splithand_whiteblue/_Tap explosion dim.redir @@ -0,0 +1 @@ +_Tap explosion bright \ No newline at end of file diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/_White tap note 4x2.png b/NoteSkins/dance/retrobar-splithand_whiteblue/_White tap note 4x2.png new file mode 100644 index 0000000000..efe412e3f6 Binary files /dev/null and b/NoteSkins/dance/retrobar-splithand_whiteblue/_White tap note 4x2.png differ diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/_Yellow tap note 4x2.png b/NoteSkins/dance/retrobar-splithand_whiteblue/_Yellow tap note 4x2.png new file mode 100644 index 0000000000..a150f6a3cc Binary files /dev/null and b/NoteSkins/dance/retrobar-splithand_whiteblue/_Yellow tap note 4x2.png differ diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/_bar hold explosion bright.png b/NoteSkins/dance/retrobar-splithand_whiteblue/_bar hold explosion bright.png new file mode 100644 index 0000000000..cc89bb2a57 Binary files /dev/null and b/NoteSkins/dance/retrobar-splithand_whiteblue/_bar hold explosion bright.png differ diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/_bar hold explosion dim.png b/NoteSkins/dance/retrobar-splithand_whiteblue/_bar hold explosion dim.png new file mode 100644 index 0000000000..0cfe70cb32 Binary files /dev/null and b/NoteSkins/dance/retrobar-splithand_whiteblue/_bar hold explosion dim.png differ diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/_bar mine 4x1.png b/NoteSkins/dance/retrobar-splithand_whiteblue/_bar mine 4x1.png new file mode 100644 index 0000000000..1b3cc0fcf0 Binary files /dev/null and b/NoteSkins/dance/retrobar-splithand_whiteblue/_bar mine 4x1.png differ diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/_bar receptor tap.png b/NoteSkins/dance/retrobar-splithand_whiteblue/_bar receptor tap.png new file mode 100644 index 0000000000..ce6aba0536 Binary files /dev/null and b/NoteSkins/dance/retrobar-splithand_whiteblue/_bar receptor tap.png differ diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/_blue receptor base.png b/NoteSkins/dance/retrobar-splithand_whiteblue/_blue receptor base.png new file mode 100644 index 0000000000..0fe114d25d Binary files /dev/null and b/NoteSkins/dance/retrobar-splithand_whiteblue/_blue receptor base.png differ diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/_white receptor base.png b/NoteSkins/dance/retrobar-splithand_whiteblue/_white receptor base.png new file mode 100644 index 0000000000..c0f3258cba Binary files /dev/null and b/NoteSkins/dance/retrobar-splithand_whiteblue/_white receptor base.png differ diff --git a/NoteSkins/dance/retrobar-splithand_whiteblue/metrics.ini b/NoteSkins/dance/retrobar-splithand_whiteblue/metrics.ini new file mode 100644 index 0000000000..bb74895a50 --- /dev/null +++ b/NoteSkins/dance/retrobar-splithand_whiteblue/metrics.ini @@ -0,0 +1,33 @@ +[NoteDisplay] +HoldLetGoGrayPercent=.8 +DrawHoldHeadForTapsOnSameRow=0 +StartDrawingHoldBodyOffsetFromHead=0 +StopDrawingHoldBodyOffsetFromTail=-32 + +TapNoteNoteColorTextureCoordSpacingX=0 +TapNoteNoteColorTextureCoordSpacingY=0 +# control the vertical +TapNoteAdditionTextureCoordOffsetX=0 +TapNoteAdditionTextureCoordOffsetY=0.5 + +TapFakeAdditionTextureCoordOffsetX=0 +TapFakeAdditionTextureCoordOffsetY=0 +TapLiftAdditionTextureCoordOffsetX=0 +TapLiftAdditionTextureCoordOffsetY=0 + +HoldHeadNoteColorTextureCoordSpacingX=0 +HoldHeadNoteColorTextureCoordSpacingY=0 + +[ReceptorArrow] +InitCommand=effectclock,"beat";diffuseramp;effectcolor1,color(".8,.8,.8,1");effectcolor2,color("1,1,1,1");effecttiming,.2,0,.8,0;effectoffset,.05 +NoneCommand=finishtweening;zoom,.85;diffusealpha,.9;linear,.11;diffusealpha,1;zoom,1 + +[ReceptorOverlay] +InitCommand=diffusealpha,0 +PressCommand=finishtweening;zoom,1;blend,"BlendMode_Add";diffusealpha,.8;decelerate,0.2;diffusealpha,0.4 +LiftCommand=stoptweening;decelerate,.2;diffusealpha,0;zoom,1.2 + +[HoldGhostArrow] +HoldingOnCommand=diffusealpha,0.625;glowshift;effectcolor1,color("1,1,1,0");effectcolor2,color("1,1,1,.7");effectperiod,.1 +HoldingOffCommand=diffusealpha,0 +InitCommand=finishtweening;playcommand,"HoldingOff" \ No newline at end of file diff --git a/NoteSkins/kb7/orbital/Bar Go Receptor.png b/NoteSkins/kb7/orbital/Bar Go Receptor.png new file mode 100644 index 0000000000..6df47f2f66 Binary files /dev/null and b/NoteSkins/kb7/orbital/Bar Go Receptor.png differ diff --git a/NoteSkins/kb7/orbital/Bar Receptor.lua b/NoteSkins/kb7/orbital/Bar Receptor.lua new file mode 100644 index 0000000000..eb9c7f6d0f --- /dev/null +++ b/NoteSkins/kb7/orbital/Bar Receptor.lua @@ -0,0 +1,13 @@ +local t = Def.ActorFrame { + LoadActor( "Bar Go Receptor" )..{ + InitCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'InitCommand'); + NoneCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'NoneCommand'); + }; + LoadActor( "Bar Go Receptor" )..{ + InitCommand=NOTESKIN:GetMetricA('ReceptorOverlay', 'InitCommand'); + PressCommand=NOTESKIN:GetMetricA('ReceptorOverlay', 'PressCommand'); + LiftCommand=NOTESKIN:GetMetricA('ReceptorOverlay', 'LiftCommand'); + NoneCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'NoneCommand'); + }; +}; +return t; diff --git a/NoteSkins/kb7/orbital/Noteskin.lua b/NoteSkins/kb7/orbital/Noteskin.lua new file mode 100644 index 0000000000..5bc5858515 --- /dev/null +++ b/NoteSkins/kb7/orbital/Noteskin.lua @@ -0,0 +1,107 @@ +-- from scratch, with various references. +local Noteskin = ... or {}; + +-- element redirs +Noteskin.ElementRedirs = { + -- ["element"] = "redir_element"; +}; + +-- button redirs (since this is a bar noteskin, it's all the same) +Noteskin.ButtonRedirs = { + -- dance + Left = "Bar"; + UpLeft = "Bar"; + Up = "Bar"; + Down = "Bar"; + UpRight = "Bar"; + Right = "Bar"; + -- kb7 + Key1 = "Red"; + Key2 = "Red"; + Key3 = "Red"; + Key4 = "Yellow"; + Key5 = "Red"; + Key6 = "Red"; + Key7 = "Red"; + -- pump + DownLeft = "Bar"; + DownRight = "Bar"; + Center = "Bar"; +}; + +-- things to blank out +Noteskin.Hide = { + -- ["element"] = true/false; + ["Hold Topcap Active"] = true, + ["Hold Topcap Inactive"] = true, + ["Roll Topcap Active"] = true, + ["Roll Topcap Inactive"] = true, + ["Hold Tail Active"] = true, + ["Hold Tail Inactive"] = true, + ["Roll Tail Active"] = true, + ["Roll Tail Inactive"] = true +}; + +-- rotations +Noteskin.BaseRotX = { + Left = 0; + UpLeft = 0; + Up = 0; + Down = 0; + UpRight = 0; + Right = 0; +}; +Noteskin.BaseRotY = { + Left = 0; + UpLeft = 0; + Up = 0; + Down = 0; + UpRight = 0; + Right = 0; +}; + +local function NoteskinLoader() + local Button = Var "Button" + local Element = Var "Element" + + if Noteskin.Hide[Element] then + -- Return a blank element. If SpriteOnly is set, we need to return a + -- sprite; otherwise just return a dummy actor. + local t; + if Var "SpriteOnly" then + t = LoadActor( "_blank" ); + else + t = Def.Actor {}; + end + return t .. { + cmd(visible,false); + }; + end; + + -- load element and button, using redirs + local LoadElement = Noteskin.ElementRedirs[Element] + if not LoadElement then + LoadElement = Element; + end; + + local LoadButton = Noteskin.ButtonRedirs[Button] + if not LoadButton then + LoadButton = Button; + end; + + -- get path to thing + local sPath = NOTESKIN:GetPath( LoadButton, LoadElement ); + + -- make actor + local t = LoadActor( sPath ); + + -- apply rotation + t.BaseRotationX=Noteskin.BaseRotX[sButton] + t.BaseRotationY=Noteskin.BaseRotY[sButton] + + return t; +end + +Noteskin.Load = NoteskinLoader; +Noteskin.CommonLoad = NoteskinLoader; +return Noteskin; \ No newline at end of file diff --git a/NoteSkins/kb7/orbital/Red Hold Body active.png b/NoteSkins/kb7/orbital/Red Hold Body active.png new file mode 100644 index 0000000000..60a62549f6 Binary files /dev/null and b/NoteSkins/kb7/orbital/Red Hold Body active.png differ diff --git a/NoteSkins/kb7/orbital/Red Hold Body inactive.png b/NoteSkins/kb7/orbital/Red Hold Body inactive.png new file mode 100644 index 0000000000..4ef3a238d1 Binary files /dev/null and b/NoteSkins/kb7/orbital/Red Hold Body inactive.png differ diff --git a/NoteSkins/kb7/orbital/Red Hold BottomCap Inactive.png b/NoteSkins/kb7/orbital/Red Hold BottomCap Inactive.png new file mode 100644 index 0000000000..e97dd7f33e Binary files /dev/null and b/NoteSkins/kb7/orbital/Red Hold BottomCap Inactive.png differ diff --git a/NoteSkins/kb7/orbital/Red Hold BottomCap active.png b/NoteSkins/kb7/orbital/Red Hold BottomCap active.png new file mode 100644 index 0000000000..699cdd5445 Binary files /dev/null and b/NoteSkins/kb7/orbital/Red Hold BottomCap active.png differ diff --git a/NoteSkins/kb7/orbital/Red Hold Explosion 2x1.png b/NoteSkins/kb7/orbital/Red Hold Explosion 2x1.png new file mode 100644 index 0000000000..a91319d791 Binary files /dev/null and b/NoteSkins/kb7/orbital/Red Hold Explosion 2x1.png differ diff --git a/NoteSkins/kb7/orbital/Red Hold Head active.redir b/NoteSkins/kb7/orbital/Red Hold Head active.redir new file mode 100644 index 0000000000..0003e7ec31 --- /dev/null +++ b/NoteSkins/kb7/orbital/Red Hold Head active.redir @@ -0,0 +1 @@ +Red Tap Note \ No newline at end of file diff --git a/NoteSkins/kb7/orbital/Red Hold Head inactive.redir b/NoteSkins/kb7/orbital/Red Hold Head inactive.redir new file mode 100644 index 0000000000..0003e7ec31 --- /dev/null +++ b/NoteSkins/kb7/orbital/Red Hold Head inactive.redir @@ -0,0 +1 @@ +Red Tap Note \ No newline at end of file diff --git a/NoteSkins/kb7/orbital/Red Receptor.redir b/NoteSkins/kb7/orbital/Red Receptor.redir new file mode 100644 index 0000000000..b5b756e170 --- /dev/null +++ b/NoteSkins/kb7/orbital/Red Receptor.redir @@ -0,0 +1 @@ +Bar Receptor \ No newline at end of file diff --git a/NoteSkins/kb7/orbital/Red Roll Body active.png b/NoteSkins/kb7/orbital/Red Roll Body active.png new file mode 100644 index 0000000000..ac9daa346f Binary files /dev/null and b/NoteSkins/kb7/orbital/Red Roll Body active.png differ diff --git a/NoteSkins/kb7/orbital/Red Roll Body inactive.png b/NoteSkins/kb7/orbital/Red Roll Body inactive.png new file mode 100644 index 0000000000..2ca5f5d03c Binary files /dev/null and b/NoteSkins/kb7/orbital/Red Roll Body inactive.png differ diff --git a/NoteSkins/kb7/orbital/Red Roll BottomCap active.png b/NoteSkins/kb7/orbital/Red Roll BottomCap active.png new file mode 100644 index 0000000000..8a9fffffa6 Binary files /dev/null and b/NoteSkins/kb7/orbital/Red Roll BottomCap active.png differ diff --git a/NoteSkins/kb7/orbital/Red Roll BottomCap inactive.png b/NoteSkins/kb7/orbital/Red Roll BottomCap inactive.png new file mode 100644 index 0000000000..02a27b822a Binary files /dev/null and b/NoteSkins/kb7/orbital/Red Roll BottomCap inactive.png differ diff --git a/NoteSkins/kb7/orbital/Red Roll Explosion.redir b/NoteSkins/kb7/orbital/Red Roll Explosion.redir new file mode 100644 index 0000000000..da28ad4cc1 --- /dev/null +++ b/NoteSkins/kb7/orbital/Red Roll Explosion.redir @@ -0,0 +1 @@ +Red Hold Explosion \ No newline at end of file diff --git a/NoteSkins/kb7/orbital/Red Roll Head active.redir b/NoteSkins/kb7/orbital/Red Roll Head active.redir new file mode 100644 index 0000000000..0003e7ec31 --- /dev/null +++ b/NoteSkins/kb7/orbital/Red Roll Head active.redir @@ -0,0 +1 @@ +Red Tap Note \ No newline at end of file diff --git a/NoteSkins/kb7/orbital/Red Roll Head inactive.redir b/NoteSkins/kb7/orbital/Red Roll Head inactive.redir new file mode 100644 index 0000000000..0003e7ec31 --- /dev/null +++ b/NoteSkins/kb7/orbital/Red Roll Head inactive.redir @@ -0,0 +1 @@ +Red Tap Note \ No newline at end of file diff --git a/NoteSkins/kb7/orbital/Red Tap Explosion Bright.png b/NoteSkins/kb7/orbital/Red Tap Explosion Bright.png new file mode 100644 index 0000000000..892e327c58 Binary files /dev/null and b/NoteSkins/kb7/orbital/Red Tap Explosion Bright.png differ diff --git a/NoteSkins/kb7/orbital/Red Tap Explosion Dim.png b/NoteSkins/kb7/orbital/Red Tap Explosion Dim.png new file mode 100644 index 0000000000..cbd86ed7e0 Binary files /dev/null and b/NoteSkins/kb7/orbital/Red Tap Explosion Dim.png differ diff --git a/NoteSkins/kb7/orbital/Red Tap Note.lua b/NoteSkins/kb7/orbital/Red Tap Note.lua new file mode 100644 index 0000000000..ba3b12eb0e --- /dev/null +++ b/NoteSkins/kb7/orbital/Red Tap Note.lua @@ -0,0 +1,6 @@ +local t = Def.Model { + Meshes=NOTESKIN:GetPath('','model/note.txt'); + Materials=NOTESKIN:GetPath('','model/grey.txt'); + Bones=NOTESKIN:GetPath('','model/note.txt'); +}; +return t; \ No newline at end of file diff --git a/NoteSkins/kb7/orbital/Yellow Go Receptor.png b/NoteSkins/kb7/orbital/Yellow Go Receptor.png new file mode 100644 index 0000000000..a7b7c3e99f Binary files /dev/null and b/NoteSkins/kb7/orbital/Yellow Go Receptor.png differ diff --git a/NoteSkins/kb7/orbital/Yellow Hold Body active.redir b/NoteSkins/kb7/orbital/Yellow Hold Body active.redir new file mode 100644 index 0000000000..9fc409bec9 --- /dev/null +++ b/NoteSkins/kb7/orbital/Yellow Hold Body active.redir @@ -0,0 +1 @@ +Red Hold Body active \ No newline at end of file diff --git a/NoteSkins/kb7/orbital/Yellow Hold Body inactive.redir b/NoteSkins/kb7/orbital/Yellow Hold Body inactive.redir new file mode 100644 index 0000000000..f3b5db1edd --- /dev/null +++ b/NoteSkins/kb7/orbital/Yellow Hold Body inactive.redir @@ -0,0 +1 @@ +Red Hold Body inactive \ No newline at end of file diff --git a/NoteSkins/kb7/orbital/Yellow Hold BottomCap active.redir b/NoteSkins/kb7/orbital/Yellow Hold BottomCap active.redir new file mode 100644 index 0000000000..fe8795d50b --- /dev/null +++ b/NoteSkins/kb7/orbital/Yellow Hold BottomCap active.redir @@ -0,0 +1 @@ +Red Hold BottomCap active \ No newline at end of file diff --git a/NoteSkins/kb7/orbital/Yellow Hold BottomCap inactive.redir b/NoteSkins/kb7/orbital/Yellow Hold BottomCap inactive.redir new file mode 100644 index 0000000000..9f75e3831b --- /dev/null +++ b/NoteSkins/kb7/orbital/Yellow Hold BottomCap inactive.redir @@ -0,0 +1 @@ +Red Hold BottomCap inactive \ No newline at end of file diff --git a/NoteSkins/kb7/orbital/Yellow Hold Explosion.redir b/NoteSkins/kb7/orbital/Yellow Hold Explosion.redir new file mode 100644 index 0000000000..da28ad4cc1 --- /dev/null +++ b/NoteSkins/kb7/orbital/Yellow Hold Explosion.redir @@ -0,0 +1 @@ +Red Hold Explosion \ No newline at end of file diff --git a/NoteSkins/kb7/orbital/Yellow Hold Head active.redir b/NoteSkins/kb7/orbital/Yellow Hold Head active.redir new file mode 100644 index 0000000000..c2bf288384 --- /dev/null +++ b/NoteSkins/kb7/orbital/Yellow Hold Head active.redir @@ -0,0 +1 @@ +Yellow Tap Note \ No newline at end of file diff --git a/NoteSkins/kb7/orbital/Yellow Hold Head inactive.redir b/NoteSkins/kb7/orbital/Yellow Hold Head inactive.redir new file mode 100644 index 0000000000..c2bf288384 --- /dev/null +++ b/NoteSkins/kb7/orbital/Yellow Hold Head inactive.redir @@ -0,0 +1 @@ +Yellow Tap Note \ No newline at end of file diff --git a/NoteSkins/kb7/orbital/Yellow Receptor.lua b/NoteSkins/kb7/orbital/Yellow Receptor.lua new file mode 100644 index 0000000000..aea3765cb1 --- /dev/null +++ b/NoteSkins/kb7/orbital/Yellow Receptor.lua @@ -0,0 +1,13 @@ +local t = Def.ActorFrame { + LoadActor( "Yellow Go Receptor" )..{ + InitCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'InitCommand'); + NoneCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'NoneCommand'); + }; + LoadActor( "Yellow Go Receptor" )..{ + InitCommand=NOTESKIN:GetMetricA('ReceptorOverlay', 'InitCommand'); + PressCommand=NOTESKIN:GetMetricA('ReceptorOverlay', 'PressCommand'); + LiftCommand=NOTESKIN:GetMetricA('ReceptorOverlay', 'LiftCommand'); + NoneCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'NoneCommand'); + }; +}; +return t; diff --git a/NoteSkins/kb7/orbital/Yellow Roll Body active.redir b/NoteSkins/kb7/orbital/Yellow Roll Body active.redir new file mode 100644 index 0000000000..4cf2f5318c --- /dev/null +++ b/NoteSkins/kb7/orbital/Yellow Roll Body active.redir @@ -0,0 +1 @@ +Red Roll Body active \ No newline at end of file diff --git a/NoteSkins/kb7/orbital/Yellow Roll Body inactive.redir b/NoteSkins/kb7/orbital/Yellow Roll Body inactive.redir new file mode 100644 index 0000000000..d13ee23a3f --- /dev/null +++ b/NoteSkins/kb7/orbital/Yellow Roll Body inactive.redir @@ -0,0 +1 @@ +Red Roll Body inactive \ No newline at end of file diff --git a/NoteSkins/kb7/orbital/Yellow Roll BottomCap active.redir b/NoteSkins/kb7/orbital/Yellow Roll BottomCap active.redir new file mode 100644 index 0000000000..af22bc8d64 --- /dev/null +++ b/NoteSkins/kb7/orbital/Yellow Roll BottomCap active.redir @@ -0,0 +1 @@ +Red Roll BottomCap active \ No newline at end of file diff --git a/NoteSkins/kb7/orbital/Yellow Roll BottomCap inactive.redir b/NoteSkins/kb7/orbital/Yellow Roll BottomCap inactive.redir new file mode 100644 index 0000000000..bb11bc8176 --- /dev/null +++ b/NoteSkins/kb7/orbital/Yellow Roll BottomCap inactive.redir @@ -0,0 +1 @@ +Red Roll BottomCap inactive \ No newline at end of file diff --git a/NoteSkins/kb7/orbital/Yellow Roll Explosion.redir b/NoteSkins/kb7/orbital/Yellow Roll Explosion.redir new file mode 100644 index 0000000000..da28ad4cc1 --- /dev/null +++ b/NoteSkins/kb7/orbital/Yellow Roll Explosion.redir @@ -0,0 +1 @@ +Red Hold Explosion \ No newline at end of file diff --git a/NoteSkins/kb7/orbital/Yellow Roll Head active.redir b/NoteSkins/kb7/orbital/Yellow Roll Head active.redir new file mode 100644 index 0000000000..0003e7ec31 --- /dev/null +++ b/NoteSkins/kb7/orbital/Yellow Roll Head active.redir @@ -0,0 +1 @@ +Red Tap Note \ No newline at end of file diff --git a/NoteSkins/kb7/orbital/Yellow Roll Head inactive.redir b/NoteSkins/kb7/orbital/Yellow Roll Head inactive.redir new file mode 100644 index 0000000000..0003e7ec31 --- /dev/null +++ b/NoteSkins/kb7/orbital/Yellow Roll Head inactive.redir @@ -0,0 +1 @@ +Red Tap Note \ No newline at end of file diff --git a/NoteSkins/kb7/orbital/Yellow Tap Explosion Bright.png b/NoteSkins/kb7/orbital/Yellow Tap Explosion Bright.png new file mode 100644 index 0000000000..bf1b0d6e35 Binary files /dev/null and b/NoteSkins/kb7/orbital/Yellow Tap Explosion Bright.png differ diff --git a/NoteSkins/kb7/orbital/Yellow Tap Explosion Dim.png b/NoteSkins/kb7/orbital/Yellow Tap Explosion Dim.png new file mode 100644 index 0000000000..75f83555c6 Binary files /dev/null and b/NoteSkins/kb7/orbital/Yellow Tap Explosion Dim.png differ diff --git a/NoteSkins/kb7/orbital/Yellow Tap Note.lua b/NoteSkins/kb7/orbital/Yellow Tap Note.lua new file mode 100644 index 0000000000..cf1bf25680 --- /dev/null +++ b/NoteSkins/kb7/orbital/Yellow Tap Note.lua @@ -0,0 +1,6 @@ +local t = Def.Model { + Meshes=NOTESKIN:GetPath('','model/note-wide.txt'); + Materials=NOTESKIN:GetPath('','model/yellow.txt'); + Bones=NOTESKIN:GetPath('','model/note-wide.txt'); +}; +return t; \ No newline at end of file diff --git a/NoteSkins/kb7/orbital/_blank.png b/NoteSkins/kb7/orbital/_blank.png new file mode 100644 index 0000000000..f66cc02e06 Binary files /dev/null and b/NoteSkins/kb7/orbital/_blank.png differ diff --git a/NoteSkins/kb7/orbital/_blue tap note 4x1.png b/NoteSkins/kb7/orbital/_blue tap note 4x1.png new file mode 100644 index 0000000000..a70eced83f Binary files /dev/null and b/NoteSkins/kb7/orbital/_blue tap note 4x1.png differ diff --git a/NoteSkins/kb7/orbital/_red tap note 4x1.png b/NoteSkins/kb7/orbital/_red tap note 4x1.png new file mode 100644 index 0000000000..48ed1777e8 Binary files /dev/null and b/NoteSkins/kb7/orbital/_red tap note 4x1.png differ diff --git a/NoteSkins/kb7/orbital/_yellow tap note 4x1.png b/NoteSkins/kb7/orbital/_yellow tap note 4x1.png new file mode 100644 index 0000000000..e044794706 Binary files /dev/null and b/NoteSkins/kb7/orbital/_yellow tap note 4x1.png differ diff --git a/NoteSkins/kb7/orbital/metrics.ini b/NoteSkins/kb7/orbital/metrics.ini new file mode 100644 index 0000000000..0ee1350e77 --- /dev/null +++ b/NoteSkins/kb7/orbital/metrics.ini @@ -0,0 +1,68 @@ +[Global] +#FallbackNoteSkin=common + +[NoteDisplay] +TapNoteAnimationIsVivid=0 +DrawHoldHeadForTapsOnSameRow=1 +TapNoteAnimationLengthInBeats=4 +TapAdditionAnimationLengthInBeats=4 +TapMineAnimationLengthInBeats=1 +TapLiftAnimationLengthInBeats=4 +HoldHeadAnimationLengthInBeats=4 +HoldTopCapAnimationLengthInBeats=4 +HoldBottomCapAnimationLengthInBeats=4 +HoldBodyAnimationLengthInBeats=4 +HoldTailAnimationLengthInBeats=4 +StartDrawingHoldBodyOffsetFromHead=0 +StopDrawingHoldBodyOffsetFromTail=-32 +HoldLetGoGrayPercent=0.25 +ReverseDrawOrder=1101 +HoldHeadIsAboveWavyParts=1 +HoldTailIsAboveWavyParts=1 +TapNoteAdditionTextureCoordOffsetX=0 +TapNoteAdditionTextureCoordOffsetY=0 +FlipHeadAndTailWhenReverse=1 +FlipHoldBodyWhenReverse=1 +TopHoldAnchorWhenReverse=1 + +TapNoteNoteColorTextureCoordSpacingX=0.125 +TapNoteNoteColorTextureCoordSpacingY=0 +HoldHeadNoteColorTextureCoordSpacingX=0.125 +HoldHeadNoteColorTextureCoordSpacingY=0 + +[GhostArrowDim] +NoneCommand= +HitMineCommand=blend,'BlendMode_Add';diffuse,1,1,1,1;zoom,1;rotationz,0;smooth,0.3;rotationz,90;linear,0.3;rotationz,180;diffusealpha,0 +MissCommand= +W5Command=diffuse,0.8,0.0,0.6,1;zoom,1;decelerate,0.1;zoom,1.1;decelerate,0.1;diffusealpha,0 +W4Command=diffuse,0.3,0.8,1.0,1;zoom,1;decelerate,0.1;zoom,1.1;decelerate,0.1;diffusealpha,0 +W3Command=diffuse,0.0,1.0,0.4,1;zoom,1;decelerate,0.1;zoom,1.1;decelerate,0.1;diffusealpha,0 +W2Command=diffuse,1.0,1.0,0.3,1;zoom,1;decelerate,0.1;zoom,1.1;decelerate,0.1;diffusealpha,0 +W1Command=diffuse,1.0,1.0,1.0,1;zoom,1;decelerate,0.1;zoom,1.1;decelerate,0.1;diffusealpha,0 + +LetGoCommand= +HeldCommand=diffuse,1.0,1.0,0.3,1;decelerate,0.1;zoom,1.1;decelerate,0.1;diffusealpha,0 + +[GhostArrowBright] +NoneCommand= +HitMineCommand=blend,'BlendMode_Add';diffuse,1,1,1,1;zoom,1;rotationz,0;linear,0.3;rotationz,90;linear,0.3;rotationz,180;diffusealpha,0 +MissCommand= +W5Command=diffuse,0.8,0.0,0.6,1;zoom,1;decelerate,0.1;zoom,1.1;decelerate,0.1;diffusealpha,0 +W4Command=diffuse,0.3,0.8,1.0,1;zoom,1;decelerate,0.1;zoom,1.1;decelerate,0.1;diffusealpha,0 +W3Command=diffuse,0.0,1.0,0.4,1;zoom,1;decelerate,0.1;zoom,1.1;decelerate,0.1;diffusealpha,0 +W2Command=diffuse,1.0,1.0,0.3,1;zoom,1;decelerate,0.1;zoom,1.1;decelerate,0.1;diffusealpha,0 +W1Command=diffuse,1.0,1.0,1.0,1;zoom,1;decelerate,0.1;zoom,1.1;decelerate,0.1;diffusealpha,0 +LetGoCommand= +HeldCommand=diffuse,1.0,1.0,0.3,1;zoom,1;decelerate,0.1;zoom,1.1;decelerate,0.1;diffusealpha,0 + +[ReceptorArrow] +W3Command= +W2Command= +W1Command= +InitCommand=effectclock,"beat";diffuseramp;effectcolor1,color("0.8,0.8,0.8,1");effectcolor2,color("1,1,1,1");effecttiming,0.2,0,0.8,0;effectoffset,0.05 +NoneCommand=zoom,0.8;linear,0.1;zoom,1 + +[ReceptorOverlay] +InitCommand=diffusealpha,0 +PressCommand=blend,"BlendMode_Add";diffusealpha,0.6 +LiftCommand=diffusealpha,0 \ No newline at end of file diff --git a/NoteSkins/kb7/orbital/model/_grey (no mipmaps).png b/NoteSkins/kb7/orbital/model/_grey (no mipmaps).png new file mode 100644 index 0000000000..cb844070f5 Binary files /dev/null and b/NoteSkins/kb7/orbital/model/_grey (no mipmaps).png differ diff --git a/NoteSkins/kb7/orbital/model/_yellow (no mipmaps).png b/NoteSkins/kb7/orbital/model/_yellow (no mipmaps).png new file mode 100644 index 0000000000..6144599911 Binary files /dev/null and b/NoteSkins/kb7/orbital/model/_yellow (no mipmaps).png differ diff --git a/NoteSkins/kb7/orbital/model/grey.txt b/NoteSkins/kb7/orbital/model/grey.txt new file mode 100644 index 0000000000..9537f3cdb4 --- /dev/null +++ b/NoteSkins/kb7/orbital/model/grey.txt @@ -0,0 +1,19 @@ +Materials: 2 +"scroll" +0.000000 0.000000 0.000000 1.000000 +0.800000 0.800000 0.800000 1.000000 +1.000000 1.000000 1.000000 1.000000 +0.000000 0.000000 0.000000 1.000000 +0.000000 +1.000000 +"scroller.ini" +"" +"frame" +0.000000 0.000000 0.000000 1.000000 +0.800000 0.800000 0.800000 1.000000 +1.000000 1.000000 1.000000 1.000000 +0.000000 0.000000 0.000000 1.000000 +0.000000 +1.000000 +"_grey (no mipmaps).png" +"" diff --git a/NoteSkins/kb7/orbital/model/note-wide.txt b/NoteSkins/kb7/orbital/model/note-wide.txt new file mode 100644 index 0000000000..be213d8a14 --- /dev/null +++ b/NoteSkins/kb7/orbital/model/note-wide.txt @@ -0,0 +1,316 @@ +// MilkShape 3D ASCII + +Frames: 30 +Frame: 1 + +Meshes: 2 +"scroll" 0 0 +17 +0 28.576029 12.295176 2.879607 0.114769 0.235221 -1 +0 22.456854 18.468002 2.879607 0.103466 0.102288 -1 +0 0.000001 -0.000001 2.879607 0.061984 0.500000 -1 +0 31.867174 4.250518 2.879607 0.120849 0.408464 -1 +0 31.829239 -4.441243 2.879607 0.120779 0.595643 -1 +0 28.467997 -12.456865 2.879607 0.114570 0.768261 -1 +0 22.295166 -18.576036 2.879607 0.103167 0.900038 -1 +0 14.250505 -21.867176 2.879607 0.088308 0.970913 -1 +0 -14.441256 -21.829237 2.879607 0.035309 0.970096 -1 +0 -22.456873 -18.467987 2.879607 0.020503 0.897711 -1 +0 -28.576046 -12.295153 2.879607 0.009200 0.764778 -1 +0 -31.867182 -4.250491 2.879607 0.003120 0.591535 -1 +0 -31.829235 4.441269 2.879607 0.003190 0.404357 -1 +0 -28.467979 12.456886 2.879607 0.009399 0.231739 -1 +0 -22.295141 18.576052 2.879607 0.020802 0.099962 -1 +0 -14.250477 21.867180 2.879607 0.035661 0.029087 -1 +0 14.441284 21.829229 2.879607 0.088660 0.029904 -1 +1 +0.000000 0.000000 1.000000 +16 +0 0 1 2 0 0 0 1 +0 2 3 0 0 0 0 1 +0 2 4 3 0 0 0 1 +0 2 5 4 0 0 0 1 +0 2 6 5 0 0 0 1 +0 2 7 6 0 0 0 1 +0 2 8 7 0 0 0 1 +0 2 9 8 0 0 0 1 +0 2 10 9 0 0 0 1 +0 2 11 10 0 0 0 1 +0 2 12 11 0 0 0 1 +0 2 13 12 0 0 0 1 +0 2 14 13 0 0 0 1 +0 2 15 14 0 0 0 1 +0 2 16 15 0 0 0 1 +0 2 1 16 0 0 0 1 +"frame" 1 1 +65 +1 0.000000 -0.000000 3.321190 0.500000 0.500000 -1 +1 27.639259 11.675143 3.321190 0.856463 0.427477 -1 +1 21.828669 17.536682 3.321190 0.801575 0.296586 -1 +1 30.764435 4.036170 3.321190 0.857082 0.569410 -1 +1 30.728415 -4.217276 3.321190 0.803338 0.700776 -1 +1 27.536673 -11.828679 3.321190 0.703414 0.801575 -1 +1 21.675133 -17.639269 3.321190 0.572522 0.856463 -1 +1 14.036156 -20.764439 3.321190 0.430590 0.857082 -1 +1 -14.217289 -20.728411 3.321190 0.299224 0.803338 -1 +1 -21.828686 -17.536667 3.321190 0.198425 0.703414 -1 +1 -27.639275 -11.675121 3.321190 0.143537 0.572522 -1 +1 -30.764442 -4.036143 3.321190 0.142919 0.430589 -1 +1 -30.728407 4.217301 3.321190 0.196662 0.299224 -1 +1 -27.536659 11.828699 3.321190 0.296586 0.198425 -1 +1 -21.675112 17.639282 3.321190 0.427478 0.143538 -1 +1 -14.036130 20.764444 3.321190 0.569411 0.142919 -1 +1 14.217316 20.728405 3.321190 0.700777 0.196662 -1 +1 23.683174 20.286118 3.156490 0.848857 0.264694 -1 +1 30.404764 13.505603 3.156490 0.912349 0.416107 -1 +1 34.019917 4.668982 3.156490 0.913065 0.580292 -1 +1 33.978256 -4.878449 3.156490 0.850896 0.732254 -1 +1 30.286112 -13.683181 3.156490 0.735306 0.848857 -1 +1 23.505600 -20.404768 3.156490 0.583893 0.912349 -1 +1 14.668977 -24.019918 3.156490 0.419708 0.913065 -1 +1 -14.878452 -23.978252 3.156490 0.267746 0.850896 -1 +1 -23.683182 -20.286110 3.156490 0.151143 0.735306 -1 +1 -30.404770 -13.505592 3.156490 0.087651 0.583893 -1 +1 -34.019920 -4.668968 3.156490 0.086935 0.419708 -1 +1 -33.978249 4.878465 3.156490 0.149104 0.267746 -1 +1 -30.286102 13.683196 3.156490 0.264694 0.151143 -1 +1 -23.505577 20.404779 3.156490 0.416107 0.087651 -1 +1 -14.668951 24.019922 3.156490 0.580293 0.086935 -1 +1 14.878481 23.978243 3.156490 0.732254 0.149104 -1 +1 26.305698 24.174189 -0.301926 0.917477 0.218408 -1 +1 25.196014 22.529018 1.012907 0.887427 0.238677 -1 +1 32.660770 14.998834 1.012907 0.957940 0.406831 -1 +1 34.315567 16.094122 -0.301926 0.993459 0.399605 -1 +1 36.675629 5.185213 1.012907 0.958735 0.589169 -1 +1 38.623604 5.563864 -0.301926 0.994316 0.596085 -1 +1 36.629364 -5.417810 1.012907 0.889693 0.757932 -1 +1 38.573959 -5.813441 -0.301926 0.919919 0.777938 -1 +1 32.529015 -15.196017 1.012907 0.761323 0.887427 -1 +1 34.174187 -16.305698 -0.301926 0.781592 0.917477 -1 +1 24.998833 -22.660772 1.012907 0.593169 0.957940 -1 +1 26.094122 -24.315565 -0.301926 0.600395 0.993459 -1 +1 15.185220 -26.675629 1.012907 0.410831 0.958735 -1 +1 15.563870 -28.623604 -0.301926 0.403915 0.994316 -1 +1 -15.417803 -26.629364 1.012907 0.242068 0.889693 -1 +1 -15.813432 -28.573965 -0.301926 0.222062 0.919919 -1 +1 -25.196011 -22.529020 1.012907 0.112573 0.761323 -1 +1 -26.305689 -24.174196 -0.301926 0.082523 0.781592 -1 +1 -32.660770 -14.998836 1.012907 0.042060 0.593169 -1 +1 -34.315559 -16.094126 -0.301926 0.006541 0.600395 -1 +1 -36.675629 -5.185212 1.012907 0.041265 0.410831 -1 +1 -38.623604 -5.563865 -0.301926 0.005684 0.403915 -1 +1 -36.629356 5.417814 1.012907 0.110308 0.242068 -1 +1 -38.573959 5.813443 -0.301926 0.080082 0.222062 -1 +1 -32.529011 15.196029 1.012907 0.238677 0.112573 -1 +1 -34.174187 16.305708 -0.301926 0.218408 0.082523 -1 +1 -24.998821 22.660780 1.012907 0.406831 0.042060 -1 +1 -26.094109 24.315575 -0.301926 0.399605 0.006541 -1 +1 -15.185204 26.675629 1.012907 0.589169 0.041265 -1 +1 -15.563847 28.623608 -0.301926 0.596086 0.005684 -1 +1 15.417831 26.629356 1.012907 0.757932 0.110308 -1 +1 15.813461 28.573956 -0.301926 0.777938 0.080082 -1 +65 +0.000000 0.000000 1.000000 +0.023734 0.018076 0.999555 +0.015010 0.025783 0.999555 +0.028845 0.007618 0.999555 +0.029564 -0.004001 0.999555 +0.025783 -0.015010 0.999555 +0.018076 -0.023734 0.999555 +0.007649 -0.028839 0.999555 +-0.003940 -0.029565 0.999555 +-0.015010 -0.025783 0.999555 +-0.023734 -0.018076 0.999555 +-0.028845 -0.007618 0.999555 +-0.029565 0.004001 0.999555 +-0.025783 0.015010 0.999555 +-0.018076 0.023734 0.999555 +-0.007649 0.028839 0.999555 +0.003940 0.029565 0.999555 +0.179817 0.302000 0.936196 +0.281699 0.210198 0.936196 +0.340695 0.086397 0.936196 +0.347824 -0.050559 0.936196 +0.302000 -0.179817 0.936196 +0.210198 -0.281699 0.936196 +0.086772 -0.340640 0.936181 +-0.049893 -0.347841 0.936225 +-0.179817 -0.301999 0.936196 +-0.281699 -0.210198 0.936196 +-0.340695 -0.086396 0.936196 +-0.347824 0.050559 0.936196 +-0.302000 0.179817 0.936196 +-0.210198 0.281699 0.936196 +-0.086772 0.340641 0.936181 +0.049893 0.347841 0.936225 +0.338996 0.437135 0.833064 +0.330211 0.485536 0.809454 +0.490881 0.322210 0.809454 +0.480475 0.274131 0.833064 +0.576820 0.109832 0.809454 +0.548807 0.069395 0.833063 +0.574943 -0.119268 0.809454 +0.533588 -0.145907 0.833063 +0.485536 -0.330211 0.809454 +0.437135 -0.338996 0.833064 +0.322211 -0.490881 0.809454 +0.274132 -0.480475 0.833064 +0.110702 -0.576729 0.809400 +0.070446 -0.548768 0.833001 +-0.118450 -0.575039 0.809506 +-0.145397 -0.533702 0.833080 +-0.330210 -0.485536 0.809454 +-0.338996 -0.437135 0.833064 +-0.490881 -0.322211 0.809454 +-0.480475 -0.274132 0.833064 +-0.576820 -0.109831 0.809454 +-0.548807 -0.069395 0.833064 +-0.574943 0.119268 0.809454 +-0.533587 0.145907 0.833064 +-0.485535 0.330210 0.809454 +-0.437134 0.338996 0.833064 +-0.322210 0.490881 0.809454 +-0.274131 0.480475 0.833064 +-0.110701 0.576729 0.809400 +-0.070446 0.548768 0.833001 +0.118450 0.575039 0.809506 +0.145397 0.533702 0.833080 +112 +1 0 1 2 0 1 2 2 +1 0 3 1 0 3 1 2 +1 0 4 3 0 4 3 2 +1 0 5 4 0 5 4 2 +1 0 6 5 0 6 5 2 +1 0 7 6 0 7 6 2 +1 0 8 7 0 8 7 2 +1 0 9 8 0 9 8 2 +1 0 10 9 0 10 9 2 +1 0 11 10 0 11 10 2 +1 0 12 11 0 12 11 2 +1 0 13 12 0 13 12 2 +1 0 14 13 0 14 13 2 +1 0 15 14 0 15 14 2 +1 0 16 15 0 16 15 2 +1 0 2 16 0 2 16 2 +1 17 2 1 17 2 1 2 +1 17 1 18 17 1 18 2 +1 18 1 3 18 1 3 2 +1 18 3 19 18 3 19 2 +1 19 3 4 19 3 4 2 +1 19 4 20 19 4 20 2 +1 20 4 5 20 4 5 2 +1 20 5 21 20 5 21 2 +1 21 5 6 21 5 6 2 +1 21 6 22 21 6 22 2 +1 22 6 7 22 6 7 2 +1 22 7 23 22 7 23 2 +1 23 7 8 23 7 8 2 +1 23 8 24 23 8 24 2 +1 24 8 9 24 8 9 2 +1 24 9 25 24 9 25 2 +1 25 9 10 25 9 10 2 +1 25 10 26 25 10 26 2 +1 26 10 11 26 10 11 2 +1 26 11 27 26 11 27 2 +1 27 11 12 27 11 12 2 +1 27 12 28 27 12 28 2 +1 28 12 13 28 12 13 2 +1 28 13 29 28 13 29 2 +1 29 13 14 29 13 14 2 +1 29 14 30 29 14 30 2 +1 30 14 15 30 14 15 2 +1 30 15 31 30 15 31 2 +1 31 15 16 31 15 16 2 +1 31 16 32 31 16 32 2 +1 2 17 32 2 17 32 2 +1 2 32 16 2 32 16 2 +1 33 34 35 33 34 35 2 +1 33 35 36 33 35 36 2 +1 34 17 18 34 17 18 2 +1 34 18 35 34 18 35 2 +1 36 35 37 36 35 37 2 +1 36 37 38 36 37 38 2 +1 35 18 19 35 18 19 2 +1 35 19 37 35 19 37 2 +1 38 37 39 38 37 39 2 +1 38 39 40 38 39 40 2 +1 37 19 20 37 19 20 2 +1 37 20 39 37 20 39 2 +1 40 39 41 40 39 41 2 +1 40 41 42 40 41 42 2 +1 39 20 21 39 20 21 2 +1 39 21 41 39 21 41 2 +1 42 41 43 42 41 43 2 +1 42 43 44 42 43 44 2 +1 41 21 22 41 21 22 2 +1 41 22 43 41 22 43 2 +1 44 43 45 44 43 45 2 +1 44 45 46 44 45 46 2 +1 43 22 23 43 22 23 2 +1 43 23 45 43 23 45 2 +1 46 45 47 46 45 47 2 +1 46 47 48 46 47 48 2 +1 45 23 24 45 23 24 2 +1 45 24 47 45 24 47 2 +1 48 47 49 48 47 49 2 +1 48 49 50 48 49 50 2 +1 47 24 25 47 24 25 2 +1 47 25 49 47 25 49 2 +1 50 49 51 50 49 51 2 +1 50 51 52 50 51 52 2 +1 49 25 26 49 25 26 2 +1 49 26 51 49 26 51 2 +1 52 51 53 52 51 53 2 +1 52 53 54 52 53 54 2 +1 51 26 27 51 26 27 2 +1 51 27 53 51 27 53 2 +1 54 53 55 54 53 55 2 +1 54 55 56 54 55 56 2 +1 53 27 28 53 27 28 2 +1 53 28 55 53 28 55 2 +1 56 55 57 56 55 57 2 +1 56 57 58 56 57 58 2 +1 55 28 29 55 28 29 2 +1 55 29 57 55 29 57 2 +1 58 57 59 58 57 59 2 +1 58 59 60 58 59 60 2 +1 57 29 30 57 29 30 2 +1 57 30 59 57 30 59 2 +1 60 59 61 60 59 61 2 +1 60 61 62 60 61 62 2 +1 59 30 31 59 30 31 2 +1 59 31 61 59 31 61 2 +1 62 61 63 62 61 63 2 +1 62 63 64 62 63 64 2 +1 61 31 32 61 31 32 2 +1 61 32 63 61 32 63 2 +1 17 34 63 17 34 63 2 +1 17 63 32 17 63 32 2 +1 34 33 64 34 33 64 2 +1 34 64 63 34 64 63 2 + +Materials: 2 +"scroll" +0.000000 0.000000 0.000000 1.000000 +0.800000 0.800000 0.800000 1.000000 +1.000000 1.000000 1.000000 1.000000 +0.000000 0.000000 0.000000 1.000000 +0.000000 +1.000000 +"" +"" +"frame" +0.000000 0.000000 0.000000 1.000000 +0.800000 0.800000 0.800000 1.000000 +1.000000 1.000000 1.000000 1.000000 +0.000000 0.000000 0.000000 1.000000 +0.000000 +1.000000 +"" +"" + +Bones: 0 +GroupComments: 0 +MaterialComments: 0 +BoneComments: 0 +ModelComment: 0 diff --git a/NoteSkins/kb7/orbital/model/note.txt b/NoteSkins/kb7/orbital/model/note.txt new file mode 100644 index 0000000000..cf74519852 --- /dev/null +++ b/NoteSkins/kb7/orbital/model/note.txt @@ -0,0 +1,316 @@ +// MilkShape 3D ASCII + +Frames: 30 +Frame: 1 + +Meshes: 2 +"scroll" 0 0 +17 +0 18.576029 12.295176 2.879607 0.112493 0.233639 -1 +0 12.456854 18.468002 2.879607 0.095922 0.099912 -1 +0 0.000001 -0.000001 2.879607 0.062189 0.500000 -1 +0 21.867174 4.250518 2.879607 0.121405 0.407917 -1 +0 21.829239 -4.441243 2.879607 0.121302 0.596214 -1 +0 18.467995 -12.456865 2.879607 0.112200 0.769864 -1 +0 12.295166 -18.576036 2.879607 0.095484 0.902428 -1 +0 4.250505 -21.867176 2.879607 0.073699 0.973727 -1 +0 -4.441256 -21.829237 2.879607 0.050162 0.972905 -1 +0 -12.456874 -18.467987 2.879607 0.028456 0.900088 -1 +0 -18.576044 -12.295153 2.879607 0.011886 0.766360 -1 +0 -21.867182 -4.250491 2.879607 0.002973 0.592082 -1 +0 -21.829233 4.441269 2.879607 0.003076 0.403785 -1 +0 -18.467979 12.456886 2.879607 0.012178 0.230136 -1 +0 -12.295140 18.576052 2.879607 0.028894 0.097571 -1 +0 -4.250477 21.867180 2.879607 0.050679 0.026273 -1 +0 4.441284 21.829229 2.879607 0.074216 0.027095 -1 +1 +0.000000 0.000000 1.000000 +16 +0 0 1 2 0 0 0 1 +0 2 3 0 0 0 0 1 +0 2 4 3 0 0 0 1 +0 2 5 4 0 0 0 1 +0 2 6 5 0 0 0 1 +0 2 7 6 0 0 0 1 +0 2 8 7 0 0 0 1 +0 2 9 8 0 0 0 1 +0 2 10 9 0 0 0 1 +0 2 11 10 0 0 0 1 +0 2 12 11 0 0 0 1 +0 2 13 12 0 0 0 1 +0 2 14 13 0 0 0 1 +0 2 15 14 0 0 0 1 +0 2 16 15 0 0 0 1 +0 2 1 16 0 0 0 1 +"frame" 1 1 +65 +1 0.000000 -0.000000 3.321190 0.500000 0.500000 -1 +1 17.639259 11.675143 3.321190 0.856463 0.427477 -1 +1 11.828669 17.536682 3.321190 0.801575 0.296586 -1 +1 20.764435 4.036170 3.321190 0.857082 0.569410 -1 +1 20.728415 -4.217276 3.321190 0.803338 0.700776 -1 +1 17.536673 -11.828679 3.321190 0.703414 0.801575 -1 +1 11.675133 -17.639269 3.321190 0.572522 0.856463 -1 +1 4.036156 -20.764439 3.321190 0.430590 0.857082 -1 +1 -4.217289 -20.728411 3.321190 0.299224 0.803338 -1 +1 -11.828687 -17.536667 3.321190 0.198425 0.703414 -1 +1 -17.639275 -11.675121 3.321190 0.143537 0.572522 -1 +1 -20.764442 -4.036143 3.321190 0.142919 0.430589 -1 +1 -20.728407 4.217301 3.321190 0.196662 0.299224 -1 +1 -17.536659 11.828699 3.321190 0.296586 0.198425 -1 +1 -11.675112 17.639282 3.321190 0.427478 0.143538 -1 +1 -4.036130 20.764444 3.321190 0.569411 0.142919 -1 +1 4.217315 20.728405 3.321190 0.700777 0.196662 -1 +1 13.683175 20.286118 3.156490 0.848857 0.264694 -1 +1 20.404764 13.505603 3.156490 0.912349 0.416107 -1 +1 24.019917 4.668982 3.156490 0.913065 0.580292 -1 +1 23.978254 -4.878449 3.156490 0.850896 0.732254 -1 +1 20.286112 -13.683181 3.156490 0.735306 0.848857 -1 +1 13.505599 -20.404768 3.156490 0.583893 0.912349 -1 +1 4.668977 -24.019918 3.156490 0.419708 0.913065 -1 +1 -4.878453 -23.978252 3.156490 0.267746 0.850896 -1 +1 -13.683182 -20.286110 3.156490 0.151143 0.735306 -1 +1 -20.404770 -13.505592 3.156490 0.087651 0.583893 -1 +1 -24.019920 -4.668968 3.156490 0.086935 0.419708 -1 +1 -23.978251 4.878465 3.156490 0.149104 0.267746 -1 +1 -20.286102 13.683196 3.156490 0.264694 0.151143 -1 +1 -13.505578 20.404779 3.156490 0.416107 0.087651 -1 +1 -4.668952 24.019922 3.156490 0.580293 0.086935 -1 +1 4.878480 23.978243 3.156490 0.732254 0.149104 -1 +1 16.305698 24.174189 -0.301926 0.917477 0.218408 -1 +1 15.196015 22.529018 1.012907 0.887427 0.238677 -1 +1 22.660770 14.998834 1.012907 0.957940 0.406831 -1 +1 24.315565 16.094122 -0.301926 0.993459 0.399605 -1 +1 26.675631 5.185213 1.012907 0.958735 0.589169 -1 +1 28.623606 5.563864 -0.301926 0.994316 0.596085 -1 +1 26.629364 -5.417810 1.012907 0.889693 0.757932 -1 +1 28.573961 -5.813441 -0.301926 0.919919 0.777938 -1 +1 22.529016 -15.196017 1.012907 0.761323 0.887427 -1 +1 24.174189 -16.305698 -0.301926 0.781592 0.917477 -1 +1 14.998834 -22.660772 1.012907 0.593169 0.957940 -1 +1 16.094122 -24.315565 -0.301926 0.600395 0.993459 -1 +1 5.185220 -26.675629 1.012907 0.410831 0.958735 -1 +1 5.563870 -28.623604 -0.301926 0.403915 0.994316 -1 +1 -5.417803 -26.629364 1.012907 0.242068 0.889693 -1 +1 -5.813432 -28.573965 -0.301926 0.222062 0.919919 -1 +1 -15.196011 -22.529020 1.012907 0.112573 0.761323 -1 +1 -16.305689 -24.174196 -0.301926 0.082523 0.781592 -1 +1 -22.660770 -14.998836 1.012907 0.042060 0.593169 -1 +1 -24.315561 -16.094126 -0.301926 0.006541 0.600395 -1 +1 -26.675631 -5.185212 1.012907 0.041265 0.410831 -1 +1 -28.623606 -5.563865 -0.301926 0.005684 0.403915 -1 +1 -26.629358 5.417814 1.012907 0.110308 0.242068 -1 +1 -28.573961 5.813443 -0.301926 0.080082 0.222062 -1 +1 -22.529011 15.196029 1.012907 0.238677 0.112573 -1 +1 -24.174185 16.305708 -0.301926 0.218408 0.082523 -1 +1 -14.998822 22.660780 1.012907 0.406831 0.042060 -1 +1 -16.094109 24.315575 -0.301926 0.399605 0.006541 -1 +1 -5.185204 26.675629 1.012907 0.589169 0.041265 -1 +1 -5.563847 28.623608 -0.301926 0.596086 0.005684 -1 +1 5.417831 26.629356 1.012907 0.757932 0.110308 -1 +1 5.813461 28.573956 -0.301926 0.777938 0.080082 -1 +65 +0.000000 0.000000 1.000000 +0.023734 0.018076 0.999555 +0.015010 0.025783 0.999555 +0.028845 0.007618 0.999555 +0.029564 -0.004001 0.999555 +0.025783 -0.015010 0.999555 +0.018076 -0.023734 0.999555 +0.007618 -0.028845 0.999555 +-0.004001 -0.029564 0.999555 +-0.015010 -0.025783 0.999555 +-0.023734 -0.018076 0.999555 +-0.028845 -0.007618 0.999555 +-0.029564 0.004001 0.999555 +-0.025783 0.015010 0.999555 +-0.018076 0.023734 0.999555 +-0.007618 0.028845 0.999555 +0.004001 0.029565 0.999555 +0.179817 0.302000 0.936196 +0.281699 0.210198 0.936196 +0.340695 0.086397 0.936196 +0.347824 -0.050559 0.936196 +0.301999 -0.179816 0.936196 +0.210198 -0.281699 0.936196 +0.086396 -0.340695 0.936196 +-0.050559 -0.347824 0.936196 +-0.179817 -0.301999 0.936196 +-0.281699 -0.210198 0.936196 +-0.340695 -0.086396 0.936196 +-0.347824 0.050559 0.936196 +-0.301999 0.179817 0.936196 +-0.210198 0.281699 0.936196 +-0.086396 0.340695 0.936196 +0.050559 0.347824 0.936196 +0.338996 0.437135 0.833064 +0.330211 0.485536 0.809454 +0.490881 0.322211 0.809454 +0.480475 0.274132 0.833064 +0.576820 0.109832 0.809454 +0.548807 0.069395 0.833064 +0.574943 -0.119268 0.809454 +0.533588 -0.145907 0.833064 +0.485536 -0.330211 0.809454 +0.437135 -0.338996 0.833064 +0.322211 -0.490881 0.809454 +0.274132 -0.480475 0.833064 +0.109832 -0.576820 0.809454 +0.069395 -0.548807 0.833064 +-0.119268 -0.574943 0.809454 +-0.145907 -0.533588 0.833064 +-0.330210 -0.485536 0.809454 +-0.338996 -0.437135 0.833064 +-0.490881 -0.322211 0.809454 +-0.480475 -0.274132 0.833064 +-0.576820 -0.109831 0.809454 +-0.548807 -0.069395 0.833064 +-0.574943 0.119268 0.809454 +-0.533587 0.145907 0.833064 +-0.485536 0.330211 0.809454 +-0.437135 0.338996 0.833064 +-0.322210 0.490881 0.809454 +-0.274131 0.480475 0.833064 +-0.109831 0.576820 0.809454 +-0.069394 0.548807 0.833064 +0.119268 0.574943 0.809454 +0.145907 0.533588 0.833064 +112 +1 0 1 2 0 1 2 2 +1 0 3 1 0 3 1 2 +1 0 4 3 0 4 3 2 +1 0 5 4 0 5 4 2 +1 0 6 5 0 6 5 2 +1 0 7 6 0 7 6 2 +1 0 8 7 0 8 7 2 +1 0 9 8 0 9 8 2 +1 0 10 9 0 10 9 2 +1 0 11 10 0 11 10 2 +1 0 12 11 0 12 11 2 +1 0 13 12 0 13 12 2 +1 0 14 13 0 14 13 2 +1 0 15 14 0 15 14 2 +1 0 16 15 0 16 15 2 +1 0 2 16 0 2 16 2 +1 17 2 1 17 2 1 2 +1 17 1 18 17 1 18 2 +1 18 1 3 18 1 3 2 +1 18 3 19 18 3 19 2 +1 19 3 4 19 3 4 2 +1 19 4 20 19 4 20 2 +1 20 4 5 20 4 5 2 +1 20 5 21 20 5 21 2 +1 21 5 6 21 5 6 2 +1 21 6 22 21 6 22 2 +1 22 6 7 22 6 7 2 +1 22 7 23 22 7 23 2 +1 23 7 8 23 7 8 2 +1 23 8 24 23 8 24 2 +1 24 8 9 24 8 9 2 +1 24 9 25 24 9 25 2 +1 25 9 10 25 9 10 2 +1 25 10 26 25 10 26 2 +1 26 10 11 26 10 11 2 +1 26 11 27 26 11 27 2 +1 27 11 12 27 11 12 2 +1 27 12 28 27 12 28 2 +1 28 12 13 28 12 13 2 +1 28 13 29 28 13 29 2 +1 29 13 14 29 13 14 2 +1 29 14 30 29 14 30 2 +1 30 14 15 30 14 15 2 +1 30 15 31 30 15 31 2 +1 31 15 16 31 15 16 2 +1 31 16 32 31 16 32 2 +1 2 17 32 2 17 32 2 +1 2 32 16 2 32 16 2 +1 33 34 35 33 34 35 2 +1 33 35 36 33 35 36 2 +1 34 17 18 34 17 18 2 +1 34 18 35 34 18 35 2 +1 36 35 37 36 35 37 2 +1 36 37 38 36 37 38 2 +1 35 18 19 35 18 19 2 +1 35 19 37 35 19 37 2 +1 38 37 39 38 37 39 2 +1 38 39 40 38 39 40 2 +1 37 19 20 37 19 20 2 +1 37 20 39 37 20 39 2 +1 40 39 41 40 39 41 2 +1 40 41 42 40 41 42 2 +1 39 20 21 39 20 21 2 +1 39 21 41 39 21 41 2 +1 42 41 43 42 41 43 2 +1 42 43 44 42 43 44 2 +1 41 21 22 41 21 22 2 +1 41 22 43 41 22 43 2 +1 44 43 45 44 43 45 2 +1 44 45 46 44 45 46 2 +1 43 22 23 43 22 23 2 +1 43 23 45 43 23 45 2 +1 46 45 47 46 45 47 2 +1 46 47 48 46 47 48 2 +1 45 23 24 45 23 24 2 +1 45 24 47 45 24 47 2 +1 48 47 49 48 47 49 2 +1 48 49 50 48 49 50 2 +1 47 24 25 47 24 25 2 +1 47 25 49 47 25 49 2 +1 50 49 51 50 49 51 2 +1 50 51 52 50 51 52 2 +1 49 25 26 49 25 26 2 +1 49 26 51 49 26 51 2 +1 52 51 53 52 51 53 2 +1 52 53 54 52 53 54 2 +1 51 26 27 51 26 27 2 +1 51 27 53 51 27 53 2 +1 54 53 55 54 53 55 2 +1 54 55 56 54 55 56 2 +1 53 27 28 53 27 28 2 +1 53 28 55 53 28 55 2 +1 56 55 57 56 55 57 2 +1 56 57 58 56 57 58 2 +1 55 28 29 55 28 29 2 +1 55 29 57 55 29 57 2 +1 58 57 59 58 57 59 2 +1 58 59 60 58 59 60 2 +1 57 29 30 57 29 30 2 +1 57 30 59 57 30 59 2 +1 60 59 61 60 59 61 2 +1 60 61 62 60 61 62 2 +1 59 30 31 59 30 31 2 +1 59 31 61 59 31 61 2 +1 62 61 63 62 61 63 2 +1 62 63 64 62 63 64 2 +1 61 31 32 61 31 32 2 +1 61 32 63 61 32 63 2 +1 17 34 63 17 34 63 2 +1 17 63 32 17 63 32 2 +1 34 33 64 34 33 64 2 +1 34 64 63 34 64 63 2 + +Materials: 2 +"scroll" +0.000000 0.000000 0.000000 1.000000 +0.800000 0.800000 0.800000 1.000000 +1.000000 1.000000 1.000000 1.000000 +0.000000 0.000000 0.000000 1.000000 +0.000000 +1.000000 +"" +"" +"frame" +0.000000 0.000000 0.000000 1.000000 +0.800000 0.800000 0.800000 1.000000 +1.000000 1.000000 1.000000 1.000000 +0.000000 0.000000 0.000000 1.000000 +0.000000 +1.000000 +"" +"" + +Bones: 0 +GroupComments: 0 +MaterialComments: 0 +BoneComments: 0 +ModelComment: 0 diff --git a/NoteSkins/kb7/orbital/model/scroller.ini b/NoteSkins/kb7/orbital/model/scroller.ini new file mode 100644 index 0000000000..62119a1e81 --- /dev/null +++ b/NoteSkins/kb7/orbital/model/scroller.ini @@ -0,0 +1,5 @@ +[AnimatedTexture] +TexVelocityY=1 +TexOffsetX=0 +Frame0000=scroller.png +Delay0000=1.0 diff --git a/NoteSkins/kb7/orbital/model/scroller.png b/NoteSkins/kb7/orbital/model/scroller.png new file mode 100644 index 0000000000..d3ab3d796b Binary files /dev/null and b/NoteSkins/kb7/orbital/model/scroller.png differ diff --git a/NoteSkins/kb7/orbital/model/yellow.txt b/NoteSkins/kb7/orbital/model/yellow.txt new file mode 100644 index 0000000000..0767ba8c67 --- /dev/null +++ b/NoteSkins/kb7/orbital/model/yellow.txt @@ -0,0 +1,19 @@ +Materials: 2 +"scroll" +0.000000 0.000000 0.000000 1.000000 +0.800000 0.800000 0.800000 1.000000 +1.000000 1.000000 1.000000 1.000000 +0.000000 0.000000 0.000000 1.000000 +0.000000 +1.000000 +"scroller.ini" +"" +"frame" +0.000000 0.000000 0.000000 1.000000 +0.800000 0.800000 0.800000 1.000000 +1.000000 1.000000 1.000000 1.000000 +0.000000 0.000000 0.000000 1.000000 +0.000000 +1.000000 +"_yellow (no mipmaps).png" +"" diff --git a/Themes/_fallback/Scripts/02 StageMods.lua b/Themes/_fallback/Scripts/02 StageMods.lua index 4f094e2cf7..74efa499a9 100644 --- a/Themes/_fallback/Scripts/02 StageMods.lua +++ b/Themes/_fallback/Scripts/02 StageMods.lua @@ -32,11 +32,11 @@ function ScreenSelectMusic:setupmusicstagemods() local song, steps = SONGMAN:GetExtraStageInfo( bExtra2, style ) local po, so if bExtra2 then - po = "default,1.5x,reverse" - so = "suddendeath" + po = THEME:GetMetric("SongManager","ExtraStagePlayerModifiers"); + so = THEME:GetMetric("SongManager","ExtraStageStageModifiers"); else - po = "default,1.5x,reverse" - so = "norecover" + po = THEME:GetMetric("SongManager","OMESPlayerModifiers"); + so = THEME:GetMetric("SongManager","OMESStageModifiers"); end local difficulty = steps:GetDifficulty() local Reverse = PlayerNumber:Reverse() diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 0446fe4c81..c7e4f5b4e0 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -65,6 +65,12 @@ FixedProfiles=false NumFixedProfiles=1 [SongManager] +# SSC: Determine what the ES/OMES Modifiers are +ExtraStagePlayerModifiers="default,1.5x,reverse" +ExtraStageStageModifiers="norecover" +OMESPlayerModifiers="default,1.5x,reverse" +OMESStageModifiers="suddendeath" + # How many different colors you can have in the MusicWheel NumSongGroupColors=10 NumCourseGroupColors=1 diff --git a/Themes/default/Graphics/Combo 100milestone/default.lua b/Themes/default/Graphics/Combo 100milestone/default.lua index 377c7d897e..0d7279c583 100644 --- a/Themes/default/Graphics/Combo 100milestone/default.lua +++ b/Themes/default/Graphics/Combo 100milestone/default.lua @@ -1,10 +1,11 @@ +local ShowFlashyCombo = GetUserPrefB("UserPrefFlashyCombo") return Def.ActorFrame { LoadActor("explosion") .. { - InitCommand=cmd(diffusealpha,0;blend,'BlendMode_Add'); + InitCommand=cmd(diffusealpha,0;blend,'BlendMode_Add';hide_if,not ShowFlashyCombo); MilestoneCommand=cmd(rotationz,0;zoom,2;diffusealpha,0.5;linear,0.5;rotationz,90;zoom,1.75;diffusealpha,0); }; LoadActor("explosion") .. { - InitCommand=cmd(diffusealpha,0;blend,'BlendMode_Add'); + InitCommand=cmd(diffusealpha,0;blend,'BlendMode_Add';hide_if,not ShowFlashyCombo); MilestoneCommand=cmd(rotationz,0;zoom,2;diffusealpha,0.5;linear,0.5;rotationz,-90;zoom,2.5;diffusealpha,0); }; }; \ No newline at end of file diff --git a/Themes/default/Graphics/Player combo/default.lua b/Themes/default/Graphics/Player combo/default.lua index 24526dd9c0..3013a37b6a 100644 --- a/Themes/default/Graphics/Player combo/default.lua +++ b/Themes/default/Graphics/Player combo/default.lua @@ -12,16 +12,22 @@ local NumberMaxZoomAt = THEME:GetMetric("Combo", "NumberMaxZoomAt"); local LabelMinZoom = THEME:GetMetric("Combo", "LabelMinZoom"); local LabelMaxZoom = THEME:GetMetric("Combo", "LabelMaxZoom"); +local ShowFlashyCombo = GetUserPrefB("UserPrefFlashyCombo") + local t = Def.ActorFrame { InitCommand=cmd(vertalign,bottom); ---[[ LoadActor(THEME:GetPathG("Combo","100Milestone")) .. { + -- flashy combo elements: + LoadActor(THEME:GetPathG("Combo","100Milestone")) .. { Name="OneHundredMilestone"; + InitCommand=cmd(visible,ShowFlashyCombo); FiftyMilestoneCommand=cmd(playcommand,"Milestone"); }; LoadActor(THEME:GetPathG("Combo","1000Milestone")) .. { Name="OneThousandMilestone"; + InitCommand=cmd(visible,ShowFlashyCombo); ToastyAchievedMessageCommand=cmd(playcommand,"Milestone"); - }; --]] + }; + -- normal combo elements: Def.ActorFrame { Name="ComboFrame"; LoadFont( "Combo", "numbers" ) .. { @@ -50,9 +56,13 @@ local t = Def.ActorFrame { else return end; --]] ---[[ TwentyFiveMilestoneCommand=function(self,parent) - (cmd(skewy,-0.125;decelerate,0.325;skewy,0))(self); + TwentyFiveMilestoneCommand=function(self,parent) + if ShowFlashyCombo then + (cmd(skewy,-0.125;decelerate,0.325;skewy,0))(self); + end; end; + --]] + --[[ ToastyAchievedMessageCommand=function(self,params) if params.PlayerNumber == player then (cmd(thump,2;effectclock,'beat'))(c.ComboFrame); diff --git a/Themes/default/Languages/en.ini b/Themes/default/Languages/en.ini index 12611207d2..d34c52c2b3 100644 --- a/Themes/default/Languages/en.ini +++ b/Themes/default/Languages/en.ini @@ -63,6 +63,7 @@ UserPrefShowLotsaOptions=Options Density UserPrefAutoSetStyle=Auto Set Style UserPrefLongFail=Fail Length UserPrefComboOnRolls=Rolls Increment Combo +UserPrefFlashyCombo=Flashy Combo [OptionExplanations] UserPrefNotePosition=Determines where the arrow receptors are placed in gameplay. UserPrefGameplayShowScore=Show or Hide the score display in gameplay. @@ -71,6 +72,7 @@ UserPrefShowLotsaOptions=Choose how many lines/rows of options to choose from. & UserPrefAutoSetStyle=Allow the game to list all one player and two player modes at once instead of one style only. This might require a restart of StepMania\n( or alternatively hit F2! ) UserPrefLongFail=Choose between the original sm-ssc fail (Long) or the new sm-ssc fail (Short). UserPrefComboOnRolls=Choose if rolls should increment the combo or not. +UserPrefFlashyCombo=Determine if combo flashes should be shown or not. [StepsListDisplayRow StepsType] Dance_Single=4 Dance_Double=8 diff --git a/Themes/default/Scripts/03 ThemePrefs.lua b/Themes/default/Scripts/03 ThemePrefs.lua index e97a80c1b1..a1955526b9 100644 --- a/Themes/default/Scripts/03 ThemePrefs.lua +++ b/Themes/default/Scripts/03 ThemePrefs.lua @@ -22,6 +22,9 @@ function InitUserPrefs() if GetUserPrefB("UserPrefComboOnRolls") == nil then SetUserPref("UserPrefComboOnRolls", false); end; + if GetUserPrefB("FlashyCombos") == nil then + SetUserPref("FlashyCombos", false); + end; --[[ if GetUserPref("ProTimingP1") == nil then SetUserPref("ProTimingP1", false); end; @@ -350,4 +353,40 @@ function UserPrefComboOnRolls() setmetatable( t, t ); return t; end + +function UserPrefFlashyCombo() + local t = { + Name = "UserPrefFlashyCombo"; + LayoutType = "ShowAllInRow"; + SelectType = "SelectOne"; + OneChoiceForAllPlayers = true; + ExportOnChange = false; + Choices = { 'Off','On' }; + LoadSelections = function(self, list, pn) + if ReadPrefFromFile("UserPrefFlashyCombo") ~= nil then + if GetUserPrefB("UserPrefFlashyCombo") then + list[2] = true; + else + list[1] = true; + end; + else + WritePrefToFile("UserPrefFlashyCombo",false); + list[1] = true; + end; + end; + SaveSelections = function(self, list, pn) + local val; + if list[2] then + val = true; + else + val = false; + end; + WritePrefToFile("UserPrefFlashyCombo",val); + MESSAGEMAN:Broadcast("PreferenceSet", { Message == "Set Preference" } ); + THEME:ReloadMetrics(); + end; + }; + setmetatable( t, t ); + return t; +end --[[ end option rows ]] \ No newline at end of file diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 185b9b0c8b..a062bf5f06 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -773,9 +773,10 @@ LinegAuto="lua,UserPrefAutoSetStyle()" LinegLongFail="lua,UserPrefLongFail()" [ScreenOptionsSystemDirection] -LineNames="1,2,3,4,5,6,7,8,9,RollCombo,10,11,12,13,14,15,16,LF,17,18,19,20,21,22" +LineNames="1,2,3,4,5,6,7,8,9,FlashyCombo,RollCombo,10,11,12,13,14,15,16,LF,17,18,19,20,21,22" LineLF="lua,UserPrefLongFail()" LineRollCombo="lua,UserPrefComboOnRolls()" +LineFlashyCombo="lua,UserPrefFlashyCombo()" [ScreenOptionsService] ShowHeader=false @@ -970,7 +971,6 @@ IconChoice14KeysOnCommand=zoom,0;bounceend,0.35;zoom,1 IconChoice14KeysOffCommand=linear,0.1175;zoomx,0 [ScreenSelectPlayMode] -PrepareScreens="ScreenSelectMusic" PersistScreens="ScreenSelectPlayMode,ScreenSelectMusic" # ScreenOutDelay=3 diff --git a/src/DateTime.h b/src/DateTime.h index a244a4481b..c0d0fac6d6 100644 --- a/src/DateTime.h +++ b/src/DateTime.h @@ -50,14 +50,13 @@ struct DateTime static DateTime GetNowDateTime(); static DateTime GetNowDate(); // GetNowDateTime() with time chopped off - + void StripTime(); RString GetString() const; bool FromString( const RString sDateTime ); }; - #endif /* diff --git a/src/NotesLoaderBMS.cpp b/src/NotesLoaderBMS.cpp index 3d64f4cf27..5882f1a589 100644 --- a/src/NotesLoaderBMS.cpp +++ b/src/NotesLoaderBMS.cpp @@ -18,7 +18,7 @@ typedef multimap NameToData_t; typedef map MeasureToTimeSig_t; /* BMS encoding: tap-hold - * 4&8panel: Player1 Player2 + * 4&8panel: Player1 Player2 * Left 11-51 21-61 * Down 13-53 23-63 * Up 15-55 25-65 @@ -153,7 +153,7 @@ static StepsType DetermineStepsType( int iPlayer, const NoteData &nd, const RStr if( nd.GetTapNote(t, r).type != TapNote::empty ) { bTrackHasNote[t] = true; - break; + break; } } } @@ -165,7 +165,7 @@ static StepsType DetermineStepsType( int iPlayer, const NoteData &nd, const RStr switch( iPlayer ) { - case 1: // "1 player" + case 1: // "1 player" /* Track counts: * 4 - dance 4-panel * 5 - pop 5-key @@ -212,13 +212,13 @@ static bool GetTagFromMap( const NameToData_t &mapNameToData, const RString &sNa it = mapNameToData.find( sName ); if( it == mapNameToData.end() ) return false; - + sOut = it->second; - + return true; } -/* Finds the longest common match for the given tag in all files. If the given tag +/* Finds the longest common match for the given tag in all files. If the given tag * was found in at least one file, returns true; otherwise returns false. */ static bool GetCommonTagFromMapList( const vector &aBMSData, const RString &sName, RString &sOut ) { @@ -228,7 +228,7 @@ static bool GetCommonTagFromMapList( const vector &aBMSData, const RString sTag; if( !GetTagFromMap( aBMSData[i], sName, sTag ) ) continue; - + if( !bFoundOne ) { bFoundOne = true; @@ -239,7 +239,7 @@ static bool GetCommonTagFromMapList( const vector &aBMSData, const sOut = FindLargestInitialSubstring( sOut, sTag ); } } - + return bFoundOne; } @@ -272,7 +272,7 @@ static void SearchForDifficulty( RString sTag, Steps *pOut ) { sTag.MakeLower(); - /* Only match "Light" in parentheses. */ + // Only match "Light" in parentheses. if( sTag.find( "(light" ) != sTag.npos ) { pOut->SetDifficulty( Difficulty_Easy ); @@ -332,16 +332,14 @@ enum BMS_TRACK_STOP = 9 }; -/* - * Time signatures are often abused to tweak sync. Real time signatures should - * cause us to adjust the row offsets so one beat remains one beat. Fake time signatures, - * like 1.001 or 0.999, should be removed and converted to BPM changes. This is much +/* Time signatures are often abused to tweak sync. Real time signatures should + * cause us to adjust the row offsets so one beat remains one beat. Fake time signatures, + * like 1.001 or 0.999, should be removed and converted to BPM changes. This is much * more accurate, and prevents the whole song from being shifted off of the beat, causing * BeatToNoteType to be wrong. * * Evaluate each time signature, and guess which time signatures should be converted - * to BPM changes. This isn't perfect, but errors aren't fatal. - */ + * to BPM changes. This isn't perfect, but errors aren't fatal. */ static void SetTimeSigAdjustments( const MeasureToTimeSig_t &sigs, Song &out, MeasureToTimeSig_t &sigAdjustmentsOut ) { return; @@ -353,7 +351,6 @@ static void SetTimeSigAdjustments( const MeasureToTimeSig_t &sigs, Song &out, Me { int iMeasure = it->first; float fFactor = it->second; - #if 1 static const float ValidFactors[] = { @@ -365,34 +362,34 @@ static void SetTimeSigAdjustments( const MeasureToTimeSig_t &sigs, Song &out, Me 1.5f, /* 6/4 */ 1.75f /* 7/4 */ }; - + bool bValidTimeSignature = false; for( unsigned i = 0; i < ARRAYLEN(ValidFactors); ++i ) if( fabsf(fFactor-ValidFactors[i]) < 0.001 ) bValidTimeSignature = true; - + if( bValidTimeSignature ) continue; #else /* Alternate approach that I tried first: see if the ratio is sane. However, * some songs have values like "1.4", which comes out to 7/4 and is not a valid * time signature. */ - /* Convert the factor to a ratio, and reduce it. */ + // Convert the factor to a ratio, and reduce it. int iNum = lrintf( fFactor * 1000 ), iDen = 1000; int iDiv = gcd( iNum, iDen ); iNum /= iDiv; iDen /= iDiv; - /* Real time signatures usually come down to 1/2, 3/4, 7/8, etc. Bogus + /* Real time signatures usually come down to 1/2, 3/4, 7/8, etc. Bogus * signatures that are only there to adjust sync usually look like 99/100. */ if( iNum <= 8 && iDen <= 8 ) continue; #endif - - /* This time signature is bogus. Convert it to a BPM adjustment for this + + /* This time signature is bogus. Convert it to a BPM adjustment for this * measure. */ LOG->Trace("Converted time signature %f in measure %i to a BPM segment.", fFactor, iMeasure ); - + /* Note that this GetMeasureStartRow will automatically include any adjustments * that we've made previously in this loop; as long as we make the timing * adjustment and the BPM adjustment together, everything remains consistent. @@ -413,7 +410,7 @@ static void ReadTimeSigs( const NameToData_t &mapNameToData, MeasureToTimeSig_t const RString &sName = it->first; if( sName.size() != 6 || sName[0] != '#' || !IsAnInt(sName.substr(1, 5)) ) continue; - + // this is step or offset data. Looks like "#00705" const RString &sData = it->second; int iMeasureNo = atoi( sName.substr(1, 3).c_str() ); @@ -444,7 +441,7 @@ static bool LoadFromBMSFile( const RString &sPath, const NameToData_t &mapNameTo NoteData ndNotes; ndNotes.SetNumTracks( NUM_BMS_TRACKS ); - /* Read time signatures. Note that these can differ across files in the same + /* Read time signatures. Note that these can differ across files in the same * song. */ MeasureToTimeSig_t mapMeasureToTimeSig; ReadTimeSigs( mapNameToData, mapMeasureToTimeSig ); @@ -512,7 +509,7 @@ static bool LoadFromBMSFile( const RString &sPath, const NameToData_t &mapNameTo // shift the auto keysound as far right as possible int iLastEmptyTrack = -1; if( ndNotes.GetTapLastEmptyTrack(row, iLastEmptyTrack) && - iLastEmptyTrack >= BMS_AUTO_KEYSOUND_1 ) + iLastEmptyTrack >= BMS_AUTO_KEYSOUND_1 ) { tn.type = TapNote::autoKeysound; bmsTrack = (BmsTrack)iLastEmptyTrack; @@ -525,9 +522,8 @@ static bool LoadFromBMSFile( const RString &sPath, const NameToData_t &mapNameTo } /* This handles the hold notes in the RDM TYPE 1 style, * like how uBMplay handles it. Different BMS simulators - * supports hold notes differently. see - * http://nvyu.net/rdm/ex.php for more info. - */ + * support hold notes differently. see + * http://nvyu.net/rdm/ex.php for more info. */ else if( iHoldStarts[bmsTrack] != -1 ) { // This is ending a hold. @@ -563,7 +559,7 @@ static bool LoadFromBMSFile( const RString &sPath, const NameToData_t &mapNameTo out.m_StepsType = DetermineStepsType( iPlayer, ndNotes, sPath ); if( out.m_StepsType == StepsType_beat_single5 && GetTagFromMap( mapNameToData, "#title", sData ) ) { - /* Hack: guess at 6-panel. */ + // Hack: guess at 6-panel. // extract the Steps description (looks like 'Music ') const size_t iOpenBracket = sData.find_first_of( "<(" ); @@ -573,7 +569,7 @@ static bool LoadFromBMSFile( const RString &sPath, const NameToData_t &mapNameTo if( sData.find('6', iOpenBracket) < iCloseBracket ) out.m_StepsType = StepsType_dance_solo; } - + if( out.m_StepsType == StepsType_Invalid ) { LOG->UserLog( "Song file", sPath, "has an unknown steps type" ); @@ -731,7 +727,7 @@ static void ReadGlobalTags( const NameToData_t &mapNameToData, Song &out, Measur if( GetTagFromMap(mapNameToData, "#bpm", sData) ) { const float fBPM = StringToFloat( sData ); - + if( PREFSMAN->m_bQuirksMode ) { BPMSegment newSeg( 0, fBPM ); @@ -771,7 +767,7 @@ static void ReadGlobalTags( const NameToData_t &mapNameToData, Song &out, Measur /* Due to bugs in some programs, many BMS files have a "WAV" extension * on files in the BMS for files that actually have some other extension. - * Do a search. Don't do a wildcard search; if sData is "song.wav", + * Do a search. Don't do a wildcard search; if sData is "song.wav", * we might also have "song.png", which we shouldn't match. */ if( !IsAFile(out.GetSongDir()+sData) ) { @@ -795,7 +791,7 @@ static void ReadGlobalTags( const NameToData_t &mapNameToData, Song &out, Measur LOG->Trace( "Inserting keysound index %u '%s'", unsigned(out.m_vsKeysoundFile.size()-1), sWavID.c_str() ); } - /* Time signature tags affect all other global timing tags, so read them first. */ + // Time signature tags affect all other global timing tags, so read them first. MeasureToTimeSig_t mapMeasureToTimeSig; ReadTimeSigs( mapNameToData, mapMeasureToTimeSig ); @@ -838,7 +834,7 @@ static void ReadGlobalTags( const NameToData_t &mapNameToData, Song &out, Measur fBeat, iVal ); } break; - + case BMS_TRACK_BPM_REF: { RString sTagToLookFor = ssprintf( "#bpm%s", sPair.c_str() ); @@ -900,64 +896,64 @@ static void ReadGlobalTags( const NameToData_t &mapNameToData, Song &out, Measur } } } - + switch( iBMSTrackNo ) { - case BMS_TRACK_BPM_REF: - { - // XXX: offset - int iBPMNo; - sscanf( sData, "%x", &iBPMNo ); // data is in hexadecimal - - RString sBPM; - RString sTagToLookFor = ssprintf( "#bpm%02x", iBPMNo ); - if( GetTagFromMap( mapNameToData, sTagToLookFor, sBPM ) ) + case BMS_TRACK_BPM_REF: { - float fBPM = StringToFloat( sBPM ); + // XXX: offset + int iBPMNo; + sscanf( sData, "%x", &iBPMNo ); // data is in hexadecimal - if( PREFSMAN->m_bQuirksMode ) + RString sBPM; + RString sTagToLookFor = ssprintf( "#bpm%02x", iBPMNo ); + if( GetTagFromMap( mapNameToData, sTagToLookFor, sBPM ) ) { - BPMSegment newSeg( iStepIndex, fBPM ); - out.AddBPMSegment( newSeg ); - if( fBPM > 0.0f ) - LOG->Trace( "Inserting new positive BPM change at beat %f, BPM %f", NoteRowToBeat(newSeg.m_iStartRow), newSeg.GetBPM() ); - else - LOG->Trace( "Inserting new negative BPM change at beat %f, BPM %f", NoteRowToBeat(newSeg.m_iStartRow), newSeg.GetBPM() ); - } - else - { - if( fBPM > 0.0f ) + float fBPM = StringToFloat( sBPM ); + + if( PREFSMAN->m_bQuirksMode ) { BPMSegment newSeg( iStepIndex, fBPM ); out.AddBPMSegment( newSeg ); - LOG->Trace( "Inserting new BPM change at beat %f, BPM %f", NoteRowToBeat(newSeg.m_iStartRow), newSeg.GetBPM() ); - + if( fBPM > 0.0f ) + LOG->Trace( "Inserting new positive BPM change at beat %f, BPM %f", NoteRowToBeat(newSeg.m_iStartRow), newSeg.GetBPM() ); + else + LOG->Trace( "Inserting new negative BPM change at beat %f, BPM %f", NoteRowToBeat(newSeg.m_iStartRow), newSeg.GetBPM() ); } else { - LOG->UserLog( "Song file", out.GetSongDir(), "has an invalid BPM change at beat %f, BPM %f.", - NoteRowToBeat(iStepIndex), fBPM ); + if( fBPM > 0.0f ) + { + BPMSegment newSeg( iStepIndex, fBPM ); + out.AddBPMSegment( newSeg ); + LOG->Trace( "Inserting new BPM change at beat %f, BPM %f", NoteRowToBeat(newSeg.m_iStartRow), newSeg.GetBPM() ); + + } + else + { + LOG->UserLog( "Song file", out.GetSongDir(), "has an invalid BPM change at beat %f, BPM %f.", + NoteRowToBeat(iStepIndex), fBPM ); + } } } - } - else - { - LOG->UserLog( "Song file", out.GetSongDir(), "has tag \"%s\" which cannot be found.", sTagToLookFor.c_str() ); - } + else + { + LOG->UserLog( "Song file", out.GetSongDir(), "has tag \"%s\" which cannot be found.", sTagToLookFor.c_str() ); + } - break; - } + break; + } } } - /* Now that we're done reading BPMs, factor out weird time signatures. */ + // Now that we're done reading BPMs, factor out weird time signatures. SetTimeSigAdjustments( mapMeasureToTimeSig, out, sigAdjustmentsOut ); } static void SlideDuplicateDifficulties( Song &p ) { /* BMS files have to guess the Difficulty from the meter; this is inaccurate, - * and often leads to duplicates. Slide duplicate difficulties upwards. We + * and often leads to duplicates. Slide duplicate difficulties upwards. We * only do this with BMS files, since a very common bug was having *all* * difficulties slid upwards due to (for example) having two beginner steps. * We do a second pass in Song::TidyUpData to eliminate any remaining duplicates @@ -968,15 +964,15 @@ static void SlideDuplicateDifficulties( Song &p ) { if( dc == Difficulty_Edit ) continue; - + vector vSteps; SongUtil::GetSteps( &p, vSteps, st, dc ); - + StepsUtil::SortNotesArrayByDifficulty( vSteps ); for( unsigned k=1; kSetDifficulty( dc2 ); } @@ -1003,7 +999,7 @@ bool BMSLoader::LoadFromDir( const RString &sDir, Song &out ) * called to begin with. */ ASSERT( arrayBMSFileNames.size() ); - /* Read all BMS files. */ + // Read all BMS files. vector aBMSData; for( unsigned i=0; iUserLog( "Song", sDir, "has BMS files with inconsistent titles." ); } - /* Create a Steps for each. */ + // Create a Steps for each. vector apSteps; for( unsigned i=0; i idToKeysoundIndex; ReadGlobalTags( aBMSData[iMainDataIndex], out, sigAdjustments, idToKeysoundIndex ); - + // Override what that global tag said about the title if we have a good substring. // Prevents clobbering and catches "MySong (7keys)" / "MySong (Another) (7keys)" // Also catches "MySong (7keys)" / "MySong (14keys)" @@ -1121,7 +1117,6 @@ bool BMSLoader::LoadFromDir( const RString &sDir, Song &out ) ConvertString( out.m_sArtist, "utf-8,japanese" ); ConvertString( out.m_sGenre, "utf-8,japanese" ); - return true; } diff --git a/src/Player.h b/src/Player.h index a611081135..dbd4caf0bf 100644 --- a/src/Player.h +++ b/src/Player.h @@ -204,7 +204,7 @@ protected: ThemeMetric COMBO_UNDER_FIELD; ThemeMetric DRAW_DISTANCE_AFTER_TARGET_PIXELS; ThemeMetric DRAW_DISTANCE_BEFORE_TARGET_PIXELS; - + #define NUM_REVERSE 2 #define NUM_CENTERED 2 TweenState m_tsJudgment[NUM_REVERSE][NUM_CENTERED]; diff --git a/src/RageSoundReader_ThreadedBuffer.cpp b/src/RageSoundReader_ThreadedBuffer.cpp index 3c70929b10..9cdeded9d9 100644 --- a/src/RageSoundReader_ThreadedBuffer.cpp +++ b/src/RageSoundReader_ThreadedBuffer.cpp @@ -4,21 +4,19 @@ #include "Foreach.h" #include "RageLog.h" -/* - * Implement threaded read-ahead buffering. +/* Implement threaded read-ahead buffering. * * If a buffer is low on data, keep filling until it has a g_iMinFillFrames. * Once beyond that, fill at a rate relative to realtime. * * This allows a stream to have a large buffer, for higher reliability, without - * causing major CPU bursts when the stream starts or underruns. Filling 32k - * takes more CPU than filling 4k frames, and may cause a skip. - */ + * causing major CPU bursts when the stream starts or underruns. Filling 32k + * takes more CPU than filling 4k frames, and may cause a skip. */ -/* The amount of data to read at once: */ +// The amount of data to read at once: static const unsigned g_iReadBlockSizeFrames = 1024; -/* The maximum number of frames to buffer: */ +// The maximum number of frames to buffer: static const int g_iStreamingBufferFrames = 1024*32; /* When a sound has fewer than g_iMinFillFrames buffered, buffer at maximum speed. @@ -200,20 +198,20 @@ void RageSoundReader_ThreadedBuffer::BufferingThread() continue; } - /* Fill some data. */ + // Fill some data. m_bFilling = true; - + int iFramesToFill = g_iReadBlockSizeFrames; if( GetFilledFrames() < g_iMinFillFrames ) iFramesToFill = max( iFramesToFill, g_iMinFillFrames - GetFilledFrames() ); int iRet = FillFrames( iFramesToFill ); - /* Release m_bFilling, and signal the event to wake anyone waiting for it. */ + // Release m_bFilling, and signal the event to wake anyone waiting for it. m_bFilling = false; m_Event.Broadcast(); - /* On error or end of file, stop buffering the sound. */ + // On error or end of file, stop buffering the sound. if( iRet < 0 ) { m_bEnabled = false; @@ -253,7 +251,7 @@ int RageSoundReader_ThreadedBuffer::FillFrames( int iFrames ) if( iRet == 0 ) break; - /* On error or end of file, stop buffering the sound. */ + // On error or end of file, stop buffering the sound. if( iRet < 0 ) return iRet; @@ -277,7 +275,7 @@ int RageSoundReader_ThreadedBuffer::FillBlock() m_Event.Unlock(); { - /* We own m_pSource, even after unlocking, because m_bFilling is true. */ + // We own m_pSource, even after unlocking, because m_bFilling is true. unsigned iBufSize; float *pBuf = m_DataBuffer.get_write_pointer( &iBufSize ); ASSERT( (iBufSize % iSamplesPerFrame) == 0 ); @@ -288,7 +286,7 @@ int RageSoundReader_ThreadedBuffer::FillBlock() if( iGotFrames > 0 ) { - /* Add the data to the buffer. */ + // Add the data to the buffer. m_DataBuffer.advance_write_pointer( iGotFrames * iSamplesPerFrame ); if( iNextSourceFrame != m_StreamPosition.back().iPositionOfFirstFrame + m_StreamPosition.back().iFramesBuffered || fRate != m_StreamPosition.back().fRate ) @@ -315,7 +313,7 @@ int RageSoundReader_ThreadedBuffer::Read( float *pBuffer, int iFrames ) { /* Delete any empty mappings from the beginning, but don't empty the list, - * so we always have the current position and rate. If we delete an item, + * so we always have the current position and rate. If we delete an item, * the rate or position has probably changed, so return. */ list::iterator it = m_StreamPosition.begin(); ++it; @@ -344,7 +342,7 @@ int RageSoundReader_ThreadedBuffer::Read( float *pBuffer, int iFrames ) else iRet = WOULD_BLOCK; m_Event.Unlock(); - + return iRet; } diff --git a/src/ReceptorArrow.h b/src/ReceptorArrow.h index 0b19d284e1..28df584ca6 100644 --- a/src/ReceptorArrow.h +++ b/src/ReceptorArrow.h @@ -27,7 +27,7 @@ private: int m_iColNo; AutoActor m_pReceptor; - + bool m_bIsPressed; bool m_bWasPressed; // set in Update bool m_bWasReverse; diff --git a/src/ScreenDimensions.cpp b/src/ScreenDimensions.cpp index f7a440ab25..0363bd3cbc 100644 --- a/src/ScreenDimensions.cpp +++ b/src/ScreenDimensions.cpp @@ -10,8 +10,7 @@ static ThemeMetric THEME_SCREEN_HEIGHT("Common","ScreenHeight"); /* The theme's logical resolution specifies the minimum screen width and * the minimum screen height with a 4:3 aspect ratio. Scale just one - * of the dimensions up to meet the requested aspect ratio. - */ + * of the dimensions up to meet the requested aspect ratio. */ /* The theme resolution isn't necessarily 4:3; a natively widescreen * theme would have eg. 16:9 or 16:10. @@ -25,9 +24,10 @@ float ScreenDimensions::GetThemeAspectRatio() return THEME_NATIVE_ASPECT; } -// ceilf was originally lrintf. However, lrintf causes odd resolutions like -// 639x480 (4:3) and 853x480 (16:9). ceilf gives the correct values of 640x480 -// and 854x480 respectively. -aj +/* ceilf was originally lrintf. However, lrintf causes odd resolutions like + * 639x480 (4:3) and 853x480 (16:9). ceilf gives the correct values of 640x480 + * and 854x480 (should really be 852 so that SCREEN_CENTER_X == 426 and not 427) + * respectively. -aj */ float ScreenDimensions::GetScreenWidth() { float fAspect = PREFSMAN->m_fDisplayAspectRatio; @@ -50,7 +50,7 @@ float ScreenDimensions::GetScreenHeight() void ScreenDimensions::ReloadScreenDimensions() { - /* Important: explicitly refresh cached metrics that we use. */ + // Important: explicitly refresh cached metrics that we use. THEME_SCREEN_WIDTH.Read(); THEME_SCREEN_HEIGHT.Read(); diff --git a/src/ScreenOptionsManageProfiles.cpp b/src/ScreenOptionsManageProfiles.cpp index ee9d21ad7c..f8dbca6666 100644 --- a/src/ScreenOptionsManageProfiles.cpp +++ b/src/ScreenOptionsManageProfiles.cpp @@ -12,7 +12,7 @@ #include "OptionRowHandler.h" #include "LocalizedString.h" -static LocalizedString NEW_PROFILE_DEFAULT_NAME( "ScreenOptionsManageProfiles", "NewProfileDefaultName" ); +static LocalizedString NEW_PROFILE_DEFAULT_NAME( "ScreenOptionsManageProfiles", "NewProfileDefaultName" ); #define SHOW_CREATE_NEW (!PROFILEMAN->FixedProfiles()) @@ -139,7 +139,7 @@ void ScreenOptionsManageProfiles::BeginScreen() RString sEditLocalProfileID = GAMESTATE->m_sEditLocalProfileID; ScreenOptions::BeginScreen(); - + // select the last chosen profile if( !sEditLocalProfileID.empty() ) { @@ -323,7 +323,7 @@ void ScreenOptionsManageProfiles::HandleScreenMessage( const ScreenMessage SM ) ScreenOptions::HandleScreenMessage( SM ); } - + void ScreenOptionsManageProfiles::AfterChangeRow( PlayerNumber pn ) { GAMESTATE->m_sEditLocalProfileID.Set( GetLocalProfileIDWithFocus() ); @@ -411,7 +411,7 @@ int ScreenOptionsManageProfiles::GetLocalProfileIndexWithFocus() const return -1; else if( row.GetRowType() == OptionRow::RowType_Exit ) return -1; - + // a profile int iIndex = iCurRow + (SHOW_CREATE_NEW ? -1 : 0); return iIndex; diff --git a/src/StepMania.cpp b/src/StepMania.cpp index 08203dc8f7..d2b8e03fc3 100644 --- a/src/StepMania.cpp +++ b/src/StepMania.cpp @@ -91,15 +91,13 @@ static Preference g_bAllowMultipleInstances( "AllowMultipleInstances", fal void StepMania::GetPreferredVideoModeParams( VideoModeParams ¶msOut ) { - /* - * We can't rely on there being full-screen video modes that give us square + /* We can't rely on there being full-screen video modes that give us square * pixels at non-4:3 aspects. The lowest non-4:3 resolution my new laptop * with Radeon supports is 1280x720. In most cases, we'll using a 4:3 * resolution when full-screen let the monitor stretch to the correct aspect. * When windowed (no monitor stretching), we will tweak the width so that * we get square pixels. - * -Chris - */ + * -Chris */ int iWidth = PREFSMAN->m_iDisplayWidth; if( PREFSMAN->m_bWindowed ) { @@ -128,12 +126,12 @@ void StepMania::GetPreferredVideoModeParams( VideoModeParams ¶msOut ) ); } -static LocalizedString COLOR ("StepMania","color"); -static LocalizedString TEXTURE ("StepMania","texture"); +static LocalizedString COLOR ("StepMania","color"); +static LocalizedString TEXTURE ("StepMania","texture"); static LocalizedString WINDOWED ("StepMania","Windowed"); -static LocalizedString FULLSCREEN ("StepMania","Fullscreen"); -static LocalizedString ANNOUNCER_ ("StepMania","Announcer"); -static LocalizedString VSYNC ("StepMania","Vsync"); +static LocalizedString FULLSCREEN ("StepMania","Fullscreen"); +static LocalizedString ANNOUNCER_ ("StepMania","Announcer"); +static LocalizedString VSYNC ("StepMania","Vsync"); static LocalizedString NO_VSYNC ("StepMania","NoVsync"); static LocalizedString SMOOTH_LINES ("StepMania","SmoothLines"); static LocalizedString NO_SMOOTH_LINES ("StepMania","NoSmoothLines"); @@ -159,14 +157,12 @@ static void StoreActualGraphicOptions() { /* Store the settings that RageDisplay was actually able to use so that * we don't go through the process of auto-detecting a usable video mode - * every time. - */ + * every time. */ const VideoModeParams ¶ms = DISPLAY->GetActualVideoModeParams(); - PREFSMAN->m_bWindowed .Set( params.windowed ); + PREFSMAN->m_bWindowed.Set( params.windowed ); /* If we're windowed, we may have tweaked the width based on the aspect ratio. - * Don't save this new value over the preferred value. - */ + * Don't save this new value over the preferred value. */ if( !PREFSMAN->m_bWindowed ) { PREFSMAN->m_iDisplayWidth .Set( params.width ); diff --git a/src/smpackage/MainMenuDlg.cpp b/src/smpackage/MainMenuDlg.cpp index 69ea2de0c3..1ab14a4199 100644 --- a/src/smpackage/MainMenuDlg.cpp +++ b/src/smpackage/MainMenuDlg.cpp @@ -228,7 +228,7 @@ void MainMenuDlg::OnBnClickedOpenPreferences() void MainMenuDlg::OnBnClickedClearPreferences() { // TODO: Add your control notification handler code here - FlushDirCache(); + FILEMAN->FlushDirCache(); if( !DoesFileExist(SpecialFiles::PREFERENCES_INI_PATH) ) { Dialog::OK( ssprintf(IS_ALREADY_CLEARED.GetValue(),SpecialFiles::PREFERENCES_INI_PATH.c_str()) );