diff --git a/Themes/_fallback/Graphics/ScreenSelectMaster scroll.lua b/Themes/_fallback/Graphics/ScreenSelectMaster scroll.lua index 48b53e504d..e1d3b5882a 100644 --- a/Themes/_fallback/Graphics/ScreenSelectMaster scroll.lua +++ b/Themes/_fallback/Graphics/ScreenSelectMaster scroll.lua @@ -3,7 +3,7 @@ local gc = Var("GameCommand"); local t = Def.ActorFrame {}; t[#t+1] = LoadFont("Common Normal") .. { - Text=gc:GetName() .. "\n" .. gc:GetText(); + Text=gc:GetName(); }; t.GainFocusCommand=cmd(visible,true); diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini index 972022857d..9695cf0bc8 100644 --- a/Themes/_fallback/Languages/en.ini +++ b/Themes/_fallback/Languages/en.ini @@ -2122,6 +2122,8 @@ HeaderText=Test Input HeaderText=! [ScreenOptionsManageProfiles] HeaderText=Profiles +[ScreenOptionsSystemDirection] +HeaderText=System Direction [ScreenOptionsUI] HeaderText=UI [ScreenOptionsArcade] diff --git a/Themes/_fallback/Scripts/02 Actor.lua b/Themes/_fallback/Scripts/02 Actor.lua index f8d7c42b43..f9adbb1a3e 100644 --- a/Themes/_fallback/Scripts/02 Actor.lua +++ b/Themes/_fallback/Scripts/02 Actor.lua @@ -72,7 +72,17 @@ local SmoothBezier = function Actor:smooth(t) self:tween( t, "TweenType_Bezier", SmoothBezier ); end - +-- SSC Additions +local DropBezier = +{ + 0 , 0, + 1/3 , 1, + 2/3 , 0.5, + 1 , 1, +} +function Actor:drop(t) + self:tween( t, "TweenType_Bezier", DropBezier ); +end -- Hide if b is true, but don't unhide if b is false. function Actor:hide_if(b) if b then @@ -135,18 +145,6 @@ function Actor:Center() self:y(SCREEN_CENTER_Y); end; --- SSC Additions -local DropBezier = -{ - 0 , 0, - 8/16 , 1, - 12/16 , 0.5, - 16/16 , 1, -} -function Actor:drop(t) - self:tween( t, "TweenType_Bezier", DropBezier ); -end - -- (c) 2006 Glenn Maynard -- All rights reserved. -- diff --git a/Themes/_fallback/Scripts/02 Colors.lua b/Themes/_fallback/Scripts/02 Colors.lua index f82979f407..3837b298ab 100644 --- a/Themes/_fallback/Scripts/02 Colors.lua +++ b/Themes/_fallback/Scripts/02 Colors.lua @@ -5,26 +5,26 @@ Colors = { -- UI Colors -- These colors are common to the theme interface and should be used -- often to make use of these efficiently. - Enabled = nilColor, - Disabled = nilColor, - Focused = nilColor, - Outline = nilColor, - Shadow = nilColor, - Important = nilColor, - Reward = nilColor, + Enabled = nilColor, + Disabled = nilColor, + Focused = nilColor, + Outline = nilColor, + Shadow = nilColor, + Important = nilColor, + Reward = nilColor, Special = color("#f7941d"), -- Global Colors -- These colors are usually tied to colors that shouldn't change that -- much throughout themes, but should be easily accessible. -- ( Do note that I want to remove '*Color' entirely, it'll look neater ) - Player = { + Player = { P1 = color("#ef403d"), P2 = color("#0089cf"), }, - Difficulty = { - --[[ These are for 'Custom' Difficulty Ranks. It can be very - useful in some cases, especially to apply new colors for - stuff you couldn't before ]] + Difficulty = { + --[[ These are for 'Custom' Difficulty Ranks. It can be very useful + in some cases, especially to apply new colors for stuff you + couldn't before. (huh? -aj) ]] Beginner = color("#ff32f8"), -- light cyan Easy = color("#2cff00"), -- green Medium = color("#fee600"), -- yellow @@ -33,8 +33,8 @@ Colors = { Edit = color("0.8,0.8,0.8,1"), -- gray Couple = color("#ed0972"), -- hot pink Routine = color("#ff9a00"), -- orange - --[[ These are for courses, so let's slap them here incase someone - you wanted to use Difficulty in Course and Step regions ]] + --[[ These are for courses, so let's slap them here in case someone + wanted to use Difficulty in Course and Step regions. ]] Difficulty_Beginner = color("0.0,0.9,1.0,1"), -- purple Difficulty_Easy = color("0.9,0.9,0.0,1"), -- green Difficulty_Medium = color("1.0,0.1,0.1,1"), -- yellow diff --git a/Themes/_fallback/Scripts/02 Sprite.lua b/Themes/_fallback/Scripts/02 Sprite.lua index ad355d5af5..12a69f3948 100644 --- a/Themes/_fallback/Scripts/02 Sprite.lua +++ b/Themes/_fallback/Scripts/02 Sprite.lua @@ -1,10 +1,14 @@ function Sprite:LoadFromSongBanner(song) - local Path = song:GetBannerPath() - if not Path then - Path = THEME:GetPathG("Common","fallback banner") - end + if song then + local Path = song:GetBannerPath() + if not Path then + Path = THEME:GetPathG("Common","fallback banner") + end - self:LoadBanner( Path ) + self:LoadBanner( Path ) + else + self:LoadBanner( THEME:GetPathG("Common","fallback banner") ) + end; end function Sprite:LoadFromSongBackground(song) diff --git a/Themes/_fallback/Scripts/03 CustomSpeedMods.lua b/Themes/_fallback/Scripts/03 CustomSpeedMods.lua index 13f56a24ae..21a796adbb 100644 --- a/Themes/_fallback/Scripts/03 CustomSpeedMods.lua +++ b/Themes/_fallback/Scripts/03 CustomSpeedMods.lua @@ -278,7 +278,7 @@ function SpeedMods() end; --[[ -Copyright © 2008-2009 AJ Kelly/KKI Labs. +Copyright © 2008-2009 AJ Kelly/KKI Labs. Use freely, so long this notice and the above documentation remains. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" diff --git a/Themes/_fallback/Scripts/03 ProductivityHelpers.lua b/Themes/_fallback/Scripts/03 ProductivityHelpers.lua index a75213c87f..f867444d34 100644 --- a/Themes/_fallback/Scripts/03 ProductivityHelpers.lua +++ b/Themes/_fallback/Scripts/03 ProductivityHelpers.lua @@ -121,6 +121,12 @@ function tobool(v) end; function pname(pn) return ToEnumShortString(pn); end; + +-- from http://ardoris.wordpress.com/2008/11/07/rounding-to-a-certain-number-of-decimal-places-in-lua/ +function round(what, precision) + return math.floor(what*math.pow(10,precision)+0.5) / math.pow(10,precision) +end + --[[ end helper functions ]] -- this code is in the public domain. @@ -161,121 +167,4 @@ function ComboMaintain() para = "TapNoteScore_W4", }; return Maintain[sGame] -end; - -function ComboPerRow() - sGame = GAMESTATE:GetCurrentGame():GetName(); - if sGame == "pump" then - return true; - elseif GAMESTATE:GetPlayMode() == "PlayMode_Oni" then - return true; - else return false; - end; -end; - -function HitCombo() - sGame = GAMESTATE:GetCurrentGame():GetName(); - local Combo = { - dance = "2", - pump = "4", - beat = "2", - kb7 = "2", - para = "2", - }; - return Combo[sGame] -end; - -function MissCombo() - sGame = GAMESTATE:GetCurrentGame():GetName(); - local Combo = { - dance = "2", - pump = "4", - beat = "", - kb7 = "", - para = "", - }; - return Combo[sGame] -end; - -function FailCombo() -- The combo that causes game failure. - sGame = GAMESTATE:GetCurrentGame():GetName(); - local Combo = { - dance = "30", -- ITG/Pump Pro does it this way. - pump = "51", - beat = "-1", - kb7 = "-1", - para = "-1", - }; - return Combo[sGame] -end; - --- todo: use tables for some of these -aj -function HoldTiming() - if GAMESTATE:GetCurrentGame():GetName() == "pump" then - return 0; - else return PREFSMAN:GetPreference("TimingWindowSecondsHold"); - end; -end; - -function HoldJudgmentFail() - if GAMESTATE:GetCurrentGame():GetName() == "pump" then - return cmd(); - else return cmd(finishtweening;shadowlength,0;diffusealpha,1;zoom,1;y,-10;linear,0.8;y,10;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0); - end; -end; - -function HoldJudgmentPass() - if GAMESTATE:GetCurrentGame():GetName() == "pump" then - return cmd(); - else return cmd(finishtweening;shadowlength,0;diffusealpha,1;zoom,1.25;linear,0.3;zoomx,1;zoomy,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0); - end; -end; - -function HoldHeadStep() - if GAMESTATE:GetCurrentGame():GetName() == "pump" then - return false; - else return true; - end; -end; - -function InitialHoldLife() - if GAMESTATE:GetCurrentGame():GetName() == "pump" then - return 0.05; - else return 1; - end; -end; - -function MaxHoldLife() - if GAMESTATE:GetCurrentGame():GetName() == "pump" then - return 0.05; - else return 1; - end; -end; - -function ImmediateHoldLetGo() - if GAMESTATE:GetCurrentGame():GetName() == "pump" then - return false; - else return true; - end; -end; - -function RollBodyIncrementsCombo() - if GAMESTATE:GetCurrentGame():GetName() == "pump" then - return false; - else return true; - end; -end; - -function CheckpointsTapsSeparateJudgment() - if GAMESTATE:GetCurrentGame():GetName() == "pump" then - return false; - else return true; - end; -end; - -function ScoreMissedHoldsAndRolls() - if GAMESTATE:GetCurrentGame():GetName() == "pump" then - return false; - else return true; - end; end; \ No newline at end of file diff --git a/Themes/_fallback/Sounds/ScreenGameplay battle trick level1.redir b/Themes/_fallback/Sounds/ScreenGameplay battle trick level1.redir new file mode 100644 index 0000000000..1f8565ca21 --- /dev/null +++ b/Themes/_fallback/Sounds/ScreenGameplay battle trick level1.redir @@ -0,0 +1 @@ +_silent \ No newline at end of file diff --git a/Themes/_fallback/Sounds/ScreenGameplay battle trick level2.redir b/Themes/_fallback/Sounds/ScreenGameplay battle trick level2.redir new file mode 100644 index 0000000000..1f8565ca21 --- /dev/null +++ b/Themes/_fallback/Sounds/ScreenGameplay battle trick level2.redir @@ -0,0 +1 @@ +_silent \ No newline at end of file diff --git a/Themes/_fallback/Sounds/ScreenGameplay battle trick level3.redir b/Themes/_fallback/Sounds/ScreenGameplay battle trick level3.redir new file mode 100644 index 0000000000..1f8565ca21 --- /dev/null +++ b/Themes/_fallback/Sounds/ScreenGameplay battle trick level3.redir @@ -0,0 +1 @@ +_silent \ No newline at end of file diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 036113b75b..4060d24709 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -34,9 +34,6 @@ PercentScoreDecimalPlaces=2 ColorP1Command=diffuse,PlayerColor(PLAYER_1) ColorP2Command=diffuse,PlayerColor(PLAYER_2) -[Preferences] -TimingWindowSecondsHold=HoldTiming() - # 02 # [LightsManager] GameButtonsToShow="" @@ -58,7 +55,6 @@ ExtraStage2DifficultyMax=8 UseUnlockColor=false UsePreferredSortColor=false MoveUnlocksToBottomOfPreferredSort=false -# # Lots of themes want more than one group color, so let them have this. SongGroupColor1=color("#00aeef") -- blue SongGroupColor2=color("#00aeef") -- blue @@ -171,6 +167,7 @@ MeterWidth=0.0 MeterHeight=0.0 [Combo] +ShowComboAt=2 NumberMinZoom=0.8 NumberMaxZoom=1 @@ -182,8 +179,8 @@ LabelOnCommand=x,6;y,22;shadowlength,1;horizalign,left;vertalign,bottom [HoldJudgment] # !!! # -HoldJudgmentLetGoCommand=HoldJudgmentFail() -HoldJudgmentHeldCommand=HoldJudgmentPass() +HoldJudgmentLetGoCommand=shadowlength,0;diffusealpha,1;zoom,1;y,-10;linear,0.8;y,10;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 +HoldJudgmentHeldCommand=shadowlength,0;diffusealpha,1;zoom,1.25;linear,0.3;zoomx,1;zoomy,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 [HelpDisplay] TipShowTime=4 @@ -245,23 +242,22 @@ ComboScoreBonusValue=+1000 ComboMultiplier=0.0 -DoubleNoteScoreMultiplier=1.0 -TripleNoteScoreMultiplier=1.0 -QuadOrHigherNoteScoreMultiplier=1.0 +DoubleNoteScoreMultiplier=2.0 +TripleNoteScoreMultiplier=3.0 +QuadOrHigherNoteScoreMultiplier=4.0 -PointsW1=+1000 -PointsW2=+1000 -PointsW3=+500 -PointsW4=+100 -PointsW5=-200 -PointsMiss=-500 -PointsHitMine=-500 -PointsCheckpointHit=+1000 -PointsCheckpointMiss=-200 +PointsW1=+50 +PointsW2=+20 +PointsW3=+10 +PointsW4=+5 +PointsW5=0 +PointsMiss=-5 +PointsHitMine=-5 +PointsCheckpointHit=+5 +PointsCheckpointMiss=-5 PointsNone=0 -PointsHoldHeld=+1000 -PointsHoldLetGo=-500 - +PointsHoldHeld=+5 +PointsHoldLetGo=-5 [DifficultyList] CapitalizeDifficultyNames=false # @@ -278,7 +274,7 @@ BannerResetFadeCommand=diffusealpha,1 [Gameplay] # todo: make some of these play nice with other gametypes -ComboIsPerRow=ComboPerRow() +ComboIsPerRow=GAMESTATE:GetPlayMode() == "PlayMode_Oni" MinScoreToContinueCombo=ComboContinue() MinScoreToMaintainCombo=ComboMaintain() ToastyTriggersAt=250 @@ -580,7 +576,8 @@ SectionColor1=color("1,1,1,1") SongRealExtraColor=color("1,0,0,1") SortMenuColor=color("1,1,1,1") -SortOrders={ "SortOrder_Preferred", "SortOrder_Group", "SortOrder_Title", "SortOrder_BPM", "SortOrder_Popularity", "SortOrder_Artist", "SortOrder_Genre" } +SortOrders={ "SortOrder_Preferred", "SortOrder_Group", "SortOrder_Title", "SortOrder_BPM", "SortOrder_Artist", "SortOrder_Genre" } +# SortOrders={ "SortOrder_Preferred", "SortOrder_Group", "SortOrder_Title", "SortOrder_BPM", "SortOrder_Popularity", "SortOrder_Artist", "SortOrder_Genre" } # ShowRoulette=true ShowRandom=false @@ -589,7 +586,8 @@ ShowPortal=false MostPlayedSongsToShow=30 RecentSongsToShow=30 # -ModeMenuChoiceNames="Preferred,Group,Title,Bpm,Popularity,TopGrades,Artist,EasyMeter,MediumMeter,HardMeter,ChallengeMeter,DoubleEasyMeter,DoubleMediumMeter,DoubleHardMeter,DoubleChallengeMeter,Genre,Length,Recent,NormalMode,BattleMode" +ModeMenuChoiceNames="Preferred,Group,Title,Bpm,Popularity,TopGrades,Artist,EasyMeter,MediumMeter,HardMeter,ChallengeMeter,DoubleEasyMeter,DoubleMediumMeter,DoubleHardMeter,DoubleChallengeMeter,Genre,Length,Recent" +# ModeMenuChoiceNames="Preferred,Group,Title,Bpm,Popularity,TopGrades,Artist,EasyMeter,MediumMeter,HardMeter,ChallengeMeter,DoubleEasyMeter,DoubleMediumMeter,DoubleHardMeter,DoubleChallengeMeter,Genre,Length,Recent,NormalMode,BattleMode" ChoicePreferred="sort,Preferred" ChoiceGroup="sort,Group" ChoiceTitle="sort,Title" @@ -609,7 +607,7 @@ ChoiceDoubleChallengeMeter="sort,DoubleChallengeMeter" ChoiceLength="sort,Length" ChoiceRecent="sort,Recent" ChoiceNormalMode="playmode,regular" -ChoiceBattleMode="playmode,regular" +ChoiceBattleMode="playmode,battle" UseEasyMarkerFlag=false # @@ -675,6 +673,9 @@ BarMeasureAlpha=1 Bar4thAlpha=1 Bar8thAlpha=1 Bar16thAlpha=1 +# +RoutineNoteSkinP1=default +RoutineNoteSkinP2=default [PlayerStageStats] NumGradeTiersUsed=6 @@ -719,16 +720,16 @@ TapJudgmentsUnderField=false HoldJudgmentsUnderField=false ComboUnderField=true PenalizeTapScoreNone=false -JudgeHoldNotesOnSameRowTogether=(GAMESTATE:GetCurrentGame():GetName() == "pump") +JudgeHoldNotesOnSameRowTogether=false HoldCheckpoints=(GAMESTATE:GetCurrentGame():GetName() == "pump") -ImmediateHoldLetGo=ImmediateHoldLetGo() -RequireStepOnHoldHeads=HoldHeadStep() -CheckpointsUseTimeSignatures=(GAMESTATE:GetCurrentGame():GetName() == "pump") -InitialHoldLife=InitialHoldLife() -MaxHoldLife=MaxHoldLife() -RollBodyIncrementsCombo=RollBodyIncrementsCombo() -CheckpointsTapsSeparateJudgment=CheckpointsTapsSeparateJudgment() -ScoreMissedHoldsAndRolls=ScoreMissedHoldsAndRolls() +ImmediateHoldLetGo=(GAMESTATE:GetCurrentGame():GetName() == "pump") and false or true +RequireStepOnHoldHeads=(GAMESTATE:GetCurrentGame():GetName() == "pump") and false or true +CheckpointsUseTimeSignatures=false +InitialHoldLife=1 +MaxHoldLife=1 +RollBodyIncrementsCombo=true +CheckpointsTapsSeparateJudgment=true +ScoreMissedHoldsAndRolls=(GAMESTATE:GetCurrentGame():GetName() == "pump") and false or true [Profile] ShowCoinData=true @@ -959,6 +960,7 @@ SkipWidth=190 SkipSpacingY=14 # [ScreenWithMenuElements] +Class="ScreenWithMenuElements" Fallback="Screen" # TimerSeconds=-1 @@ -1174,12 +1176,23 @@ DefaultChoice="1" Choice1="applydefaultoptions;screen,ScreenProfileLoad;text,Game Start" Choice2="screen,ScreenNetworkOptions;text,Play Online" Choice3="screen,ScreenSelectGame;text,Select Game" -Choice4="screen,ScreenOptionsService;text,Options" +Choice4="screen,ScreenOptionsSystemDirection;text,Options" Choice5="screen,ScreenOptionsEdit;text,Edit/Share" Choice6="screen,ScreenJukeboxMenu;text,Jukebox" Choice7="screen,ScreenExit;text,Exit" Choice8="screen,ScreenTest;text,Sandbox" +Choice9="screen,ScreenQuickSetupOverview;text,Setup" +# Aliases for the future. ChoiceSetup="screen,ScreenQuickSetupOverview;text,Setup" +ChoiceGameStart="applydefaultoptions;screen,ScreenProfileLoad;text,Game Start" +ChoiceOnline="screen,ScreenNetworkOptions;text,Play Online" +ChoiceGameSelect="screen,ScreenSelectGame;text,Select Game" +ChoiceOptions="screen,ScreenOptionsSystemDirection;text,Options" +ChoiceEdit="screen,ScreenOptionsEdit;text,Edit/Share" +ChoiceJukebox="screen,ScreenJukeboxMenu;text,Jukebox" +ChoiceSandbox="screen,ScreenTest;text,Sandbox" +ChoiceSetup="screen,ScreenQuickSetupOverview;text,Setup" +ChoiceExit="screen,ScreenExit;text,Exit" # AllowRepeatingInput=true ShowCursor=false @@ -1854,6 +1867,7 @@ ScoreDisplay,2="mod,subtractscore;name,Subtract" ScoreDisplay,3="mod,averagescore;name,Average" # Song options +# LifeType="3;together" LifeType=(GAMESTATE:IsCourseMode() and 3 or 2)..";together" LifeTypeDefault="" LifeType,1="mod,bar;name,Bar" @@ -2121,6 +2135,34 @@ PrevScreen="ScreenOptionsService" [DeviceList] DeviceListOnCommand=zoom,1;shadowlength,1 +[ScreenOptionsSystemDirection] +Fallback="ScreenOptionsServiceChild" +PrevScreen=Branch.TitleMenu +NextScreen=Branch.TitleMenu +LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22" +Line1="conf,Windowed" +Line2="conf,DisplayResolution" +Line3="conf,DisplayAspectRatio" +Line4="conf,HighResolutionTextures" +Line5="conf,Vsync" +Line6="conf,SoundVolume" +Line7="conf,TimingWindowScale" +Line8="conf,LifeDifficulty" +Line9="conf,AllowW1" +Line10="conf,AutogenSteps" +Line11="conf,ShowBanners" +Line12="conf,ShowCaution" +Line13="conf,ShowInstructions" +Line14="conf,ShowDanger" +Line15="conf,ShowSongOptions" +Line16="conf,EasterEggs" +Line17="conf,Theme" +Line18="conf,DefaultNoteskin" +Line19="conf,PercentageScoring" +Line20="conf,BGBrightness" +Line21="conf,Center1Player" +Line22="conf,EventMode" + [ScreenOptionsGraphicsSound] Fallback="ScreenOptionsServiceChild" LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,17,18,19,20" @@ -2337,6 +2379,7 @@ Fallback="ScreenWithMenuElements" AllowOperatorMenuButton=false [ScreenAttract] +Class="ScreenAttract" Fallback="ScreenWithMenuElementsBlank" # StartScreen="" @@ -2503,7 +2546,7 @@ PlayerInitCommand=y,SCREEN_CENTER_Y;zoom,(THEME:GetMetric("Common","ScreenHeight StartGivesUp=true BackGivesUp=false # -FailOnMissCombo=FailCombo() +FailOnMissCombo=-1 GivingUpGoesToPrevScreen=false GivingUpGoesToNextScreen=false # @@ -2551,6 +2594,11 @@ ActiveAttackListP2Y= ActiveAttackListP2OnCommand=visible,false ActiveAttackListP2OffCommand= # +CombinedLifeX=SCREEN_CENTER_X +CombinedLifeY=SCREEN_CENTER_Y +CombinedLifeOnCommand=visible,false +CombinedLifeOffCommand= +# LifeP1X=THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") LifeP1Y=SCREEN_TOP+24 LifeP1OnCommand= @@ -3295,4 +3343,4 @@ UsersBG2OffCommand= UserDX=0 UserDY=24 UserOnCommand= -UserOffCommand= +UserOffCommand= \ No newline at end of file diff --git a/Themes/default/BGAnimations/Screen cancel/default.lua b/Themes/default/BGAnimations/Screen cancel/default.lua index bb54d7b264..e5c61720a9 100644 --- a/Themes/default/BGAnimations/Screen cancel/default.lua +++ b/Themes/default/BGAnimations/Screen cancel/default.lua @@ -1,6 +1,6 @@ return Def.ActorFrame { Def.Quad { - InitCommand=cmd(Center;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT); + InitCommand=cmd(Center;zoomto,SCREEN_WIDTH+1,SCREEN_HEIGHT); OnCommand=cmd(diffuse,color("0,0,0,0.5");sleep,0.15;diffusealpha,1;sleep,0.15); }; LoadActor(THEME:GetPathS("_Screen","cancel")) .. { diff --git a/Themes/default/BGAnimations/Screen in/default.lua b/Themes/default/BGAnimations/Screen in/default.lua index 237dcd127b..e9d413cd7d 100644 --- a/Themes/default/BGAnimations/Screen in/default.lua +++ b/Themes/default/BGAnimations/Screen in/default.lua @@ -1,6 +1,6 @@ return Def.ActorFrame { Def.Quad { - InitCommand=cmd(Center;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT); + InitCommand=cmd(Center;zoomto,SCREEN_WIDTH+1,SCREEN_HEIGHT); OnCommand=cmd(diffuse,color("0,0,0,1");linear,0.15;diffusealpha,0); }; }; \ No newline at end of file diff --git a/Themes/default/BGAnimations/Screen out/default.lua b/Themes/default/BGAnimations/Screen out/default.lua index 343943c967..e133f4379d 100644 --- a/Themes/default/BGAnimations/Screen out/default.lua +++ b/Themes/default/BGAnimations/Screen out/default.lua @@ -1,6 +1,6 @@ return Def.ActorFrame { Def.Quad { - InitCommand=cmd(Center;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT); + InitCommand=cmd(Center;zoomto,SCREEN_WIDTH+1,SCREEN_HEIGHT); OnCommand=cmd(diffuse,color("0,0,0,0");linear,0.15;diffusealpha,1); }; }; \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua b/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua index 97ebeb5859..a20fa5ef87 100644 --- a/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua +++ b/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua @@ -96,6 +96,18 @@ for pn in ivalues(PlayerNumber) do ActorUtil.LoadAllCommandsAndSetXY(self,MetricsName); end; }; + Def.Quad { + InitCommand=cmd(zoomto,2,8); + OnCommand=cmd(x,scale(0.25,0,1,-380/2,380/2);diffuse,Color("White");diffusealpha,0.5); + }; + Def.Quad { + InitCommand=cmd(zoomto,2,8); + OnCommand=cmd(x,scale(0.5,0,1,-380/2,380/2);diffuse,Color("White");diffusealpha,0.5); + }; + Def.Quad { + InitCommand=cmd(zoomto,2,8); + OnCommand=cmd(x,scale(0.75,0,1,-380/2,380/2);diffuse,Color("White");diffusealpha,0.5); + }; Def.SongMeterDisplay { StreamWidth=THEME:GetMetric( MetricsName, 'StreamWidth' ); Stream=LoadActor( THEME:GetPathG( 'SongMeterDisplay', 'stream ' .. PlayerNumberToString(pn) ) )..{ diff --git a/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua b/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua index f53453bd46..e867afd1bd 100644 --- a/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua +++ b/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua @@ -19,6 +19,7 @@ local function StepsDisplay(pn) return t; end +t[#t+1] = StandardDecorationFromFileOptional("AlternateHelpDisplay","AlternateHelpDisplay"); -- Legacy StepMania 4 Function for pn in ivalues(PlayerNumber) do local MetricsName = "StepsDisplay" .. PlayerNumberToString(pn); @@ -44,6 +45,38 @@ t[#t+1] = StandardDecorationFromFileOptional("DifficultyList","DifficultyList"); t[#t+1] = StandardDecorationFromFileOptional("CourseContentsList","CourseContentsList"); t[#t+1] = StandardDecorationFromFileOptional("BPMDisplay","BPMDisplay"); t[#t+1] = StandardDecorationFromFileOptional("BPMLabel","BPMLabel"); +t[#t+1] = StandardDecorationFromFileOptional("SongTime","SongTime") .. { + SetCommand=function(self) + local curSelection, length = nil; + if GAMESTATE:IsCourseMode() then + curSelection = GAMESTATE:GetCurrentCourse(); + self:playcommand("Reset"); + if curSelection then + length = curSelection:GetTotalSeconds(GAMESTATE:GetCurrentStyle():GetStepsType()); + else + length = 0.0; + end; + else + curSelection = GAMESTATE:GetCurrentSong(); + self:playcommand("Reset"); + if curSelection then + length = curSelection:MusicLengthSeconds(); + else + length = 0.0; + end; + if curSelection:IsLong() then + self:playcommand("Long"); + elseif curSelection:IsMarathon() then + self:playcommand("Marathon"); + else + self:playcommand("Reset"); + end + end; + self:settext( SecondsToMSS(length) ); + end; + CurrentSongChangedMessageCommand=cmd(playcommand,"Set"); + CurrentCourseChangedMessageCommand=cmd(playcommand,"Set"); +} if not GAMESTATE:IsCourseMode() then t[#t+1] = StandardDecorationFromFileOptional("NewSong","NewSong") .. { diff --git a/Themes/default/BGAnimations/ScreenStageInformation underlay/default.lua b/Themes/default/BGAnimations/ScreenStageInformation underlay/default.lua index 057a938f75..91ec26969b 100644 --- a/Themes/default/BGAnimations/ScreenStageInformation underlay/default.lua +++ b/Themes/default/BGAnimations/ScreenStageInformation underlay/default.lua @@ -14,16 +14,16 @@ t[#t+1] = Def.Sprite { t[#t+1] = Def.ActorFrame { InitCommand=cmd(Center); - OnCommand=cmd(stoptweening;addx,30;linear,3;addx,-30); + OnCommand=cmd(stoptweening;addy,-16;decelerate,3;addy,16); LoadFont("Common Normal") .. { Text=GAMESTATE:IsCourseMode() and GAMESTATE:GetCurrentCourse():GetDisplayFullTitle() or GAMESTATE:GetCurrentSong():GetDisplayFullTitle(); InitCommand=cmd(strokecolor,Color("Outline");y,-20); - OnCommand=cmd(faderight,1;diffusealpha,0;linear,0.5;faderight,0;diffusealpha,1;sleep,1.5;linear,0.5;diffusealpha,0); + OnCommand=cmd(diffusealpha,0;linear,0.5;diffusealpha,1;sleep,1.5;linear,0.5;diffusealpha,0); }; LoadFont("Common Normal") .. { Text=GAMESTATE:IsCourseMode() and ToEnumShortString( GAMESTATE:GetCurrentCourse():GetCourseType() ) or GAMESTATE:GetCurrentSong():GetDisplayArtist(); InitCommand=cmd(strokecolor,Color("Outline");zoom,0.75); - OnCommand=cmd(faderight,1;diffusealpha,0;linear,0.5;faderight,0;diffusealpha,1;sleep,1.5;linear,0.5;diffusealpha,0); + OnCommand=cmd(diffusealpha,0;linear,0.5;diffusealpha,1;sleep,1.5;linear,0.5;diffusealpha,0); }; LoadFont("Common Normal") .. { InitCommand=cmd(strokecolor,Color("Outline");diffuse,Color("Orange");diffusebottomedge,Color("Yellow");zoom,0.75;y,20); @@ -44,7 +44,7 @@ t[#t+1] = Def.ActorFrame { end; self:settext(text); end; - OnCommand=cmd(faderight,1;diffusealpha,0;linear,0.5;faderight,0;diffusealpha,1;sleep,1.5;linear,0.5;diffusealpha,0); + OnCommand=cmd(diffusealpha,0;linear,0.5;diffusealpha,1;sleep,1.5;linear,0.5;diffusealpha,0); }; }; diff --git a/Themes/default/BGAnimations/ScreenTitleMenu out.lua b/Themes/default/BGAnimations/ScreenTitleMenu out.lua index a94bb05b13..60dd6762d9 100644 --- a/Themes/default/BGAnimations/ScreenTitleMenu out.lua +++ b/Themes/default/BGAnimations/ScreenTitleMenu out.lua @@ -1,6 +1,6 @@ return Def.ActorFrame { Def.Quad { - InitCommand=cmd(Center;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT); + InitCommand=cmd(Center;zoomto,SCREEN_WIDTH+1,SCREEN_HEIGHT); OnCommand=cmd(diffuse,color("0,0,0,0");sleep,0.15;linear,0.35;diffusealpha,1); }; }; \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua b/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua index 316a693fb9..82b17187f1 100644 --- a/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua +++ b/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua @@ -3,11 +3,11 @@ local t = Def.ActorFrame {}; t[#t+1] = Def.ActorFrame { InitCommand=cmd(Center); Def.Quad { - InitCommand=cmd(scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT); + InitCommand=cmd(scaletoclipped,SCREEN_WIDTH+1,SCREEN_HEIGHT); OnCommand=cmd(diffuse,color("#FFCB05");diffusebottomedge,color("#F0BA00")); }; LoadActor("_bg top") .. { - InitCommand=cmd(scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT); + InitCommand=cmd(scaletoclipped,SCREEN_WIDTH+1,SCREEN_HEIGHT); }; }; diff --git a/Themes/default/Graphics/CombinedLifeMeterTug frame.redir b/Themes/default/Graphics/CombinedLifeMeterTug frame.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/default/Graphics/CombinedLifeMeterTug frame.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/default/Graphics/CombinedLifeMeterTug separator.redir b/Themes/default/Graphics/CombinedLifeMeterTug separator.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/default/Graphics/CombinedLifeMeterTug separator.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/default/Graphics/CombinedLifeMeterTug stream p1.redir b/Themes/default/Graphics/CombinedLifeMeterTug stream p1.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/default/Graphics/CombinedLifeMeterTug stream p1.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/default/Graphics/CombinedLifeMeterTug stream p2.redir b/Themes/default/Graphics/CombinedLifeMeterTug stream p2.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/default/Graphics/CombinedLifeMeterTug stream p2.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/default/Graphics/CombinedLifeMeterTug tip p1.redir b/Themes/default/Graphics/CombinedLifeMeterTug tip p1.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/default/Graphics/CombinedLifeMeterTug tip p1.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/default/Graphics/CombinedLifeMeterTug tip p2.redir b/Themes/default/Graphics/CombinedLifeMeterTug tip p2.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/default/Graphics/CombinedLifeMeterTug tip p2.redir @@ -0,0 +1 @@ +_blank \ 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 0de48e19fc..43c1087e26 100644 --- a/Themes/default/Graphics/Player combo/default.lua +++ b/Themes/default/Graphics/Player combo/default.lua @@ -40,10 +40,10 @@ local t = Def.ActorFrame { return end; --]] TwentyFiveMilestoneCommand=function(self,parent) - (cmd(zoom,1.25;drop,0.325;zoom,1))(self); + (cmd(zoom,1.25;decelerate,1.325;zoom,1))(self); end; ToastyAchievedMessageCommand=function(self,parent) - (cmd(pulse;effectperiod,1))(self); + (cmd(thump,2;effectclock,'beat'))(self); end; ComboCommand=function(self, param) local iCombo = param.Misses or param.Combo; @@ -55,9 +55,9 @@ local t = Def.ActorFrame { local labeltext = ""; if param.Combo then - labeltext = "Combo"; + labeltext = "COMBO"; else - labeltext = "Misses"; + labeltext = "MISSES"; end c.Label:settext( labeltext ); c.Label:visible(false); diff --git a/Themes/default/Graphics/ScreenSelectMusic AlternateHelpDisplay.lua b/Themes/default/Graphics/ScreenSelectMusic AlternateHelpDisplay.lua new file mode 100644 index 0000000000..cd7889b469 --- /dev/null +++ b/Themes/default/Graphics/ScreenSelectMusic AlternateHelpDisplay.lua @@ -0,0 +1,33 @@ +return Def.HelpDisplay { + File = THEME:GetPathF("HelpDisplay", "text"); + InitCommand=function(self) + local s = THEME:GetString(Var "LoadingScreen","AlternateHelpText"); + self:SetTipsColonSeparated(s); + end; + SetHelpTextCommand=function(self, params) + self:SetTipsColonSeparated( params.Text ); + end; +}; +--[[ local sString = THEME:GetString(Var "LoadingScreen","AlternateHelpText"); +local tItems = split(sString,"&"); + +local t = Def.ActorScroller { + NumItemsToDraw=#tItems; + SecondsPerItem=1.25; + TransformFunction=function( self, offset, itemIndex, numItems ) + self:x( offset*74 ); + end; + InitCommand=cmd(SetLoop,true); +-- OnCommand=cmd(scrollwithpadding,10,0); +}; + +for i=1,#tItems do + t[#t+1] = Def.ActorFrame { + LoadFont("HelpDisplay", "text") .. { + Text=tostring(tItems[i]); + OnCommand=THEME:GetMetric( Var "LoadingScreen","HelpOnCommand"); + }; + }; +end + +return t; --]] diff --git a/Themes/default/Graphics/ScreenSelectMusic BPMLabel.lua b/Themes/default/Graphics/ScreenSelectMusic BPMLabel.lua index d4ef62c242..567c3c001f 100644 --- a/Themes/default/Graphics/ScreenSelectMusic BPMLabel.lua +++ b/Themes/default/Graphics/ScreenSelectMusic BPMLabel.lua @@ -1,16 +1,19 @@ -return LoadFont("Common Normal") .. { - Text="BPM"; - SetCommand=function(self) - local bIsFirst = false; - local song = GAMESTATE:GetCurrentSong(); - self:stoptweening(); - self:linear(0.25); - if song then - self:diffusebottomedge( song:GetTimingData():HasStops() and color("#55CCEE") or color("#FFFFFF") ); - else - self:diffusebottomedge( color("#FFFFFF") ); +return Def.ActorFrame { + LoadFont("Common Normal") .. { + Text="BPM"; + InitCommand=cmd(horizalign,right;zoom,0.75;strokecolor,Color("Outline")); + SetCommand=function(self) + local bIsFirst = false; + local song = GAMESTATE:GetCurrentSong(); + self:stoptweening(); +-- self:linear(0.25); + if song then + self:diffusebottomedge( song:GetTimingData():HasStops() and color("#55CCEE") or color("#FFFFFF") ); + else + self:diffusebottomedge( color("#FFFFFF") ); + end; end; - end; - CurrentSongChangedMessageCommand=cmd(playcommand,"Set"); - CurrentCourseChangedMessageCommand=cmd(playcommand,"Set"); + CurrentSongChangedMessageCommand=cmd(playcommand,"Set"); + CurrentCourseChangedMessageCommand=cmd(playcommand,"Set"); + }; }; \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenSelectMusic SongTime.lua b/Themes/default/Graphics/ScreenSelectMusic SongTime.lua new file mode 100644 index 0000000000..93e17dacca --- /dev/null +++ b/Themes/default/Graphics/ScreenSelectMusic SongTime.lua @@ -0,0 +1,2 @@ +return LoadFont("Common Normal") .. { +}; \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenTitleMenu logo/_multi.png b/Themes/default/Graphics/ScreenTitleMenu logo/_multi.png new file mode 100644 index 0000000000..9603860c23 Binary files /dev/null and b/Themes/default/Graphics/ScreenTitleMenu logo/_multi.png differ diff --git a/Themes/default/Graphics/ScreenTitleMenu logo/default.lua b/Themes/default/Graphics/ScreenTitleMenu logo/default.lua index 7eb3dc3b42..e099e1dc9f 100644 --- a/Themes/default/Graphics/ScreenTitleMenu logo/default.lua +++ b/Themes/default/Graphics/ScreenTitleMenu logo/default.lua @@ -4,7 +4,17 @@ local t = Def.ActorFrame{ -- [BGAnimation] LoadActor("_ball"); -- [Layer1] Type=0 File=_ball.png LoadActor("_text")..{ -- [Layer2] Type=0 File=_text.png - InitCommand=cmd(y,48); -- Command=y,48 + InitCommand=cmd(y,48;hide_if,GAMESTATE:GetMultiplayer()); -- Command=y,48 + }; + LoadActor("_multi")..{ -- [Layer3] Type=0 File=_multi.png + InitCommand=cmd(y,60;hide_if,not GAMESTATE:GetMultiplayer()); -- Command=y,48 + -- the hide_if command would be similar to Condition=, which also exists. + -- Condition=GAMESTATE:GetMultiplayer(); is the equivalent code. + }; + LoadFont("Common normal")..{ + Text="sm-ssc Multiplayer"; + InitCommand=cmd(y,5;shadowlength,0;strokecolor,color("0,0,0,0.375");diffusebottomedge,color("#D6DBDD");); + BeginCommand=cmd(hide_if,not GAMESTATE:GetMultiplayer()); }; }; diff --git a/Themes/default/Graphics/ScreenWithMenuElements header/default.lua b/Themes/default/Graphics/ScreenWithMenuElements header/default.lua index 3e971e2958..7182bd65a8 100644 --- a/Themes/default/Graphics/ScreenWithMenuElements header/default.lua +++ b/Themes/default/Graphics/ScreenWithMenuElements header/default.lua @@ -1,7 +1,7 @@ local t = Def.ActorFrame {}; t[#t+1] = LoadActor("Header") .. { - InitCommand=cmd(vertalign,top;zoomtowidth,SCREEN_WIDTH;diffuse,color("#ffd400")); + InitCommand=cmd(vertalign,top;zoomtowidth,SCREEN_WIDTH+1;diffuse,color("#ffd400")); }; --[[ t[#t+1] = LoadActor("_texture stripe") .. { InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH+64,44;customtexturerect,0,0,SCREEN_WIDTH+64/8,44/32); diff --git a/Themes/default/Languages/en.ini b/Themes/default/Languages/en.ini index 19a0251a5a..2cb8fc6e2f 100644 --- a/Themes/default/Languages/en.ini +++ b/Themes/default/Languages/en.ini @@ -23,7 +23,8 @@ HelpText=&BACK; Exit &START; Select &MENULEFT;&MENURIGHT; Move [ScreenGameInformation] HelpText=&BACK; Exit &START; Skip [ScreenSelectMusic] -HelpText=&BACK; Exit &START; Select / Join &SELECT; Magic Codes &MENULEFT;&MENURIGHT; Move::&SELECT;+&MENULEFT; or &MENURIGHT; Change Difficulty::&AUXWHITE;+[KEY] Sort To [KEY] +HelpText=&BACK; Exit &START; Select / Join &SELECT; Magic Codes &MENULEFT;&MENURIGHT; Move::&AUXWHITE;+[KEY] Sort To [KEY] +AlternateHelpText=&SELECT;+&MENULEFT;&MENURIGHT; Change Difficulties &SELECT;+&START; Quick Sort [StepsListDisplayRow StepsType] Dance_Single=Single Dance_Double=Double diff --git a/Themes/default/ScreenNetSelectMusic ChatInputBox.redir b/Themes/default/ScreenNetSelectMusic ChatInputBox.redir deleted file mode 100644 index 256307f65b..0000000000 --- a/Themes/default/ScreenNetSelectMusic ChatInputBox.redir +++ /dev/null @@ -1 +0,0 @@ -ScreenNetRoom ChatInputBox \ No newline at end of file diff --git a/Themes/default/ScreenNetSelectMusic ChatOutputBox.redir b/Themes/default/ScreenNetSelectMusic ChatOutputBox.redir deleted file mode 100644 index 506211f007..0000000000 --- a/Themes/default/ScreenNetSelectMusic ChatOutputBox.redir +++ /dev/null @@ -1 +0,0 @@ -ScreenNetRoom ChatOutputBox \ No newline at end of file diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 50dccb9516..77b51b0cd9 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -31,8 +31,7 @@ ShowQMarksInRandomCycle=true [HelpDisplay] TipShowTime=7 [Combo] -ShowComboAt=HitCombo() -ShowMissesAt=MissCombo() +ShowComboAt=2 NumberMinZoom=0.8 NumberMaxZoom=1 @@ -42,10 +41,16 @@ PulseCommand=%function(self,param) self:stoptweening(); self:zoom(1.125*param.Zo NumberOnCommand=y,240-216-2;shadowlength,1;horizalign,right;vertalign,bottom; LabelOnCommand=x,6;y,22;shadowlength,1;horizalign,left;vertalign,bottom +[FadingBanner] +BannerOnCommand= +BannerFadeFromCachedCommand=diffusealpha,1;stoptweening;accelerate,0.05;glow,Color("White");decelerate,0.175;diffusealpha,0;glow,Color("Invisible"); +BannerFadeOffCommand=diffusealpha,1;stoptweening;linear,0.25;diffusealpha,0 +BannerResetFadeCommand=diffusealpha,1 + [HoldJudgment] # !!! # -HoldJudgmentLetGoCommand=HoldJudgmentFail() -HoldJudgmentHeldCommand=HoldJudgmentPass() +HoldJudgmentLetGoCommand=finishtweening;shadowlength,0;diffusealpha,1;zoom,1;y,-10;linear,0.8;y,10;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 +HoldJudgmentHeldCommand=finishtweening;shadowlength,0;diffusealpha,1;zoom,1.25;linear,0.3;zoomx,1;zoomy,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 [Judgment] # New # @@ -118,8 +123,8 @@ MusicWheelItemSortOnCommand=zoomy,0;bounceend,0.15;zoomy,1 MusicWheelItemSortOffCommand=linear,0.175;zoomy,0 HighlightOnCommand=diffuseshift;effecttiming,(1/8),0,(7/8),0;effectcolor2,Color("White");effectcolor1,color("1,1,1,0.5");effectclock,'beatnooffset' HighlightOffCommand= -HighlightSortOnCommand=linear,0.3;diffusealpha,1 -HighlightSortOffCommand=linear,0.15;diffusealpha,0 +HighlightSortOnCommand=stoptweening;decelerate,0.125;glow,Color("Stealth");zoom,1 +HighlightSortOffCommand=stoptweening;accelerate,0.125;glow,Color("Orange");zoom,1.05 WheelItemOnDelayOffset=0.04 WheelItemOffDelayOffset=0.04 WheelItemLockedColor=color("0,0,0,0.5") @@ -130,7 +135,6 @@ SectionColor1=Color("Orange") SongRealExtraColor=Color("Red") SortMenuColor=Color("Blue") # -SortOrders={ "SortOrder_Preferred", "SortOrder_Group", "SortOrder_Title", "SortOrder_BPM", "SortOrder_Popularity", "SortOrder_Artist", "SortOrder_Genre" } ShowRoulette=true ShowRandom=false ShowPortal=false @@ -179,7 +183,7 @@ SectionCountOnCommand=zoom,0.75;strokecolor,Color("Outline") # RouletteX=0 RouletteY=0 -RouletteOnCommand=maxwidth,400;shadowlength,1;zoom,0.75;rainbowscroll,true;wag;effectmagnitude,10,10,10; +RouletteOnCommand=maxwidth,400;shadowlength,1;zoom,0.75;rainbowscroll,true;thump,2; # SortX=-132 SortY=-2 @@ -277,6 +281,7 @@ SongGroupColor7=BoostColor(Color("Orange"),1.25) SongGroupColor8=BoostColor(Color("Orange"),1.25) SongGroupColor9=BoostColor(Color("Orange"),1.25) SongGroupColor10=BoostColor(Color("Orange"),1.25) + CourseGroupColor1=color("1,1,1,1") UnlockColor=color("1,0.5,0,1") ExtraColor=color("#ff0000") -- red @@ -305,10 +310,10 @@ TipOnCommand= TipOffCommand= [SongMeterDisplayP1] Fallback="SongMeterDisplay" -FrameOnCommand=sleep,2;linear,0.25;diffuse,PlayerColor(PLAYER_1);glow,1,1,1,1;decelerate,0.6;glow,1,1,1,0 +FrameOnCommand=sleep,2;linear,0.25;diffuse,PlayerColor(PLAYER_1);glow,1,1,1,0.5;decelerate,0.6;glow,1,1,1,0 [SongMeterDisplayP2] Fallback="SongMeterDisplay" -FrameOnCommand=sleep,2;linear,0.25;diffuse,PlayerColor(PLAYER_2);glow,1,1,1,1;decelerate,0.6;glow,1,1,1,0 +FrameOnCommand=sleep,2;linear,0.25;diffuse,PlayerColor(PLAYER_2);glow,1,1,1,0.5;decelerate,0.6;glow,1,1,1,0 [StepsDisplay] FrameX=0 FrameY=0 @@ -377,10 +382,12 @@ Fallback="StepsDisplay" [StepsDisplayGameplay] Fallback="StepsDisplay" -MeterOnCommand=shadowlength,0; -FrameOnCommand= -ShowAutogen=false -ShowStepsType=false +MeterSetCommand=%function(self,param) \ + if param.CustomDifficulty then \ + self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \ + self:shadowcolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); \ + end; \ +end; [StepsDisplayEvaluation] Fallback="StepsDisplay" @@ -488,7 +495,7 @@ HeaderOffCommand= ShowFooter=true FooterX=SCREEN_CENTER_X FooterY=SCREEN_BOTTOM -FooterOnCommand=draworder,5;vertalign,bottom;zoomtowidth,math.ceil(SCREEN_WIDTH);diffuse,color("#ffd400"); +FooterOnCommand=draworder,5;vertalign,bottom;zoomtowidth,SCREEN_WIDTH+1;diffuse,color("#ffd400"); FooterOffCommand= ShowHelp=true @@ -497,6 +504,12 @@ HelpY=SCREEN_BOTTOM-16 HelpOnCommand=SetSecsBetweenSwitches,4;shadowlength,0;strokecolor,Color("Outline");draworder,105;zoomy,0;linear,0.175;zoom,1*0.75;diffuseshift;effectcolor1,color("0.5,0.5,0.5,1"); HelpOffCommand=linear,0.175;zoomy,0 +AlternateHelpDisplayX=SCREEN_CENTER_X +AlternateHelpDisplayY=SCREEN_BOTTOM-16 +# AlternateHelpDisplayOnCommand=draworder,105; +AlternateHelpDisplayOnCommand=SetSecsBetweenSwitches,4;shadowlength,0;strokecolor,Color("Outline");draworder,105;zoomy,0;linear,0.175;zoom,1*0.75;diffuseshift;effectcolor1,color("0.5,0.5,0.5,1");;diffusealpha,0 +AlternateHelpDisplayOffCommand=linear,0.175;zoomy,0 + TimerX=SCREEN_RIGHT-36-4 TimerY=SCREEN_TOP+22 TimerOnCommand=draworder,6;visible,PREFSMAN:GetPreference("MenuTimer"); @@ -679,21 +692,13 @@ NetworkStatusY=SCREEN_HEIGHT*0.85 NetworkStatusOnCommand=horizalign,left; NetworkStatusOffCommand=linear,0.5;cropright,1 # -ChoiceNames="1,Setup,4,5,7" -#ChoiceNames="1,4,5,7" +#ChoiceNames="1,Setup,4,5,7" +ChoiceNames="1,4,5,7" #~ ChoiceNames="1,3,4,7" DefaultChoice="1" -DisabledChoices="Setup" -Choice1="applydefaultoptions;screen,ScreenProfileLoad;text,Game Start" -Choice2="screen,ScreenNetworkOptions;text,Play Online" -Choice3="screen,ScreenSelectGame;text,Select Game" -Choice4="screen,ScreenOptionsService;text,Options" -Choice5="screen,ScreenOptionsEdit;text,Edit/Share" -Choice6="screen,ScreenJukeboxMenu;text,Jukebox" +#DisabledChoices="Setup" #ChoiceSetup="text,Setup" ChoiceSetup="screen,ScreenQuickSetupOverview;text,Setup" -Choice7="screen,ScreenExit;text,Exit" -Choice8="screen,ScreenTest;text,Sandbox" [ScreenQuickSetupOverview] IconStartX=SCREEN_CENTER_X-160 IconStartY=SCREEN_BOTTOM-60 @@ -864,6 +869,14 @@ SampleMusicDelayInit=0 AlignMusicBeat=false SelectMenuChangesDifficulty=true WrapChangeSteps=false +# HelpDisplay has things added here to make sure it disappears for another +# actor, which we defined in this screens decorations. +HelpSelectMenuOpenedMessageCommand=stoptweening;decelerate,0.125;diffusealpha,0; +HelpSelectMenuClosedMessageCommand=stoptweening;accelerate,0.0725;diffusealpha,1; +# Clone everything from HelpDisplay: we're lazy +ShowAlternateHelpDisplay=true +AlternateHelpDisplaySelectMenuOpenedMessageCommand=stoptweening;accelerate,0.0725;diffusealpha,1; +AlternateHelpDisplaySelectMenuClosedMessageCommand=stoptweening;decelerate,0.125;diffusealpha,0; # MusicWheelX=SCREEN_CENTER_X+160 MusicWheelY=SCREEN_CENTER_Y @@ -878,6 +891,15 @@ NewSongOffCommand=accelerate,0.35;addy,-SCREEN_CENTER_Y; NewSongShowCommand=stoptweening;decelerate,0.125;diffusealpha,1;zoomy,0.75;thump,2;effectclock,'bgm';effectmagnitude,1,1,1;effectcolor1,color("1,1,1");effectcolor2,color("1,1.25,1"); NewSongHideCommand=stoptweening;accelerate,0.075;diffusealpha,0;zoomy,0.75*1.5;stopeffect; # +ShowSongTime=true +SongTimeX=SCREEN_CENTER_X-160 +SongTimeY=SCREEN_TOP+160+(36/2)+8 +SongTimeOnCommand=zoom,0.75;strokecolor,Color("Outline");shadowlength,1 +SongTimeOffCommand=bouncebegin,0.15;zoom,0;diffusealpha,0; +SongTimeResetCommand=diffuse,Color("White"); +SongTimeLongCommand=diffusebottomedge,Color("Blue"); +SongTimeMarathonCommand=diffuse,Color("Yellow");diffusebottomedge,Color("Orange"); +# ShowSortOrder=true SortOrderX=SCREEN_CENTER_X+128+32 SortOrderY=SCREEN_TOP+24+4 @@ -920,7 +942,7 @@ BPMDisplayOffCommand=bouncebegin,0.15;zoomx,0; ShowBPMLabel=true BPMLabelX=SCREEN_CENTER_X-160-90 BPMLabelY=SCREEN_TOP+160+(36/2)+6 -BPMLabelOnCommand=horizalign,right;zoom,0.75;strokecolor,Color("Outline");addx,-SCREEN_CENTER_X;decelerate,0.35;addx,SCREEN_CENTER_X +BPMLabelOnCommand=addx,-SCREEN_CENTER_X;decelerate,0.35;addx,SCREEN_CENTER_X BPMLabelOffCommand=bouncebegin,0.15;zoomx,0; # ShowDifficultyList=not GAMESTATE:IsCourseMode(); @@ -929,8 +951,8 @@ DifficultyListY=SCREEN_TOP+216+6 DifficultyListOnCommand=addx,-SCREEN_CENTER_X;decelerate,0.35;addx,SCREEN_CENTER_X; DifficultyListOffCommand=bouncebegin,0.15;zoomx,0; # -DifficultyListShowCommand=bounceend,0.135;zoomx,1 -DifficultyListHideCommand=bouncebegin,0.135;zoomx,0 +DifficultyListShowCommand=stoptweening;bounceend,0.135;zoomx,1 +DifficultyListHideCommand=stoptweening;bouncebegin,0.135;zoomx,0 # ShowCourseContentsList=false CourseContentsListX=SCREEN_CENTER_X-160