From 39448381910c32affcdfb7d1669299d0ce3b03e2 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Fri, 1 Apr 2011 00:14:08 -0500 Subject: [PATCH 01/28] GamePref* -> UserPref* for the Lua functions; fixes bug 246 --- Themes/default/metrics.ini | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 9c36c29337..e66dbe9d61 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -830,24 +830,24 @@ Fallback="ScreenOptionsServiceChild" NextScreen="ScreenOptionsExtended" PrevScreen="ScreenOptionsExtended" LineNames="gNotePos,gAuto,gScore,gSScore,gSDisp,gOpts,gLongFail,gComboUnderField,FlashyCombo,GameplayFooter" -LinegNotePos="lua,GamePrefNotePosition()" +LinegNotePos="lua,UserPrefNotePosition()" LinegScore="lua,UserPrefGameplayShowScore()" LinegSScore="lua,UserPrefSpecialScoringMode()" LinegSDisp="lua,UserPrefGameplayShowStepsDisplay()" LinegOpts="lua,UserPrefShowLotsaOptions()" -LinegAuto="lua,GamePrefAutoSetStyle()" +LinegAuto="lua,UserPrefAutoSetStyle()" LinegLongFail="lua,UserPrefLongFail()" -LinegComboUnderField="lua,GamePrefComboUnderField()" +LinegComboUnderField="lua,UserPrefComboUnderField()" LineFlashyCombo="lua,UserPrefFlashyCombo()" LineGameplayFooter="lua,UserPrefGameplayFooter()" [ScreenOptionsSystemDirection] 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,GamePrefComboOnRolls()" +LineRollCombo="lua,UserPrefComboOnRolls()" LineFlashyCombo="lua,UserPrefFlashyCombo()" [ScreenOptionsAdvanced] LineNames="2,3,4,8,11,13,14,15,16,28,29,30,RollCombo" -LineRollCombo="lua,GamePrefComboOnRolls()" +LineRollCombo="lua,UserPrefComboOnRolls()" [ScreenOptionsService] ShowHeader=false From 7a9796f769da79818e138ebf7e0acb9843d31f80 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Fri, 1 Apr 2011 01:35:14 -0400 Subject: [PATCH 02/28] Add metrics for BPM and Song Length sorting. Fixes request 173. --- Themes/_fallback/metrics.ini | 3 +++ src/SongUtil.cpp | 9 +++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 72a53b7a53..58d1b6d53d 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -843,6 +843,9 @@ ShowRoulette=true ShowRandom=false ShowPortal=false # +SortBPMDivision=20 +SortLengthDivision=5 +# MostPlayedSongsToShow=30 RecentSongsToShow=30 # diff --git a/src/SongUtil.cpp b/src/SongUtil.cpp index d221159346..2641f860f0 100644 --- a/src/SongUtil.cpp +++ b/src/SongUtil.cpp @@ -19,6 +19,9 @@ #include "LuaBinding.h" #include "EnumHelper.h" +ThemeMetric SORT_BPM_DIVISION ( "MusicWheel", "SortBPMDivision" ); +ThemeMetric SORT_LENGTH_DIVISION ( "MusicWheel", "SortLengthDivision" ); + bool SongCriteria::Matches( const Song *pSong ) const { if( !m_sGroupName.empty() && m_sGroupName != pSong->m_sGroupName ) @@ -595,8 +598,7 @@ RString SongUtil::GetSectionNameFromSongAndSort( const Song* pSong, SortOrder so return SORT_NOT_AVAILABLE.GetValue(); case SORT_BPM: { - // todo: make this a theme metric? -aj - const int iBPMGroupSize = 20; + const int iBPMGroupSize = SORT_BPM_DIVISION; DisplayBpms bpms; pSong->GetDisplayBpms( bpms ); int iMaxBPM = (int)bpms.GetMax(); @@ -605,8 +607,7 @@ RString SongUtil::GetSectionNameFromSongAndSort( const Song* pSong, SortOrder so } case SORT_LENGTH: { - // todo: make this a theme metric? -aj - const int iSortLengthSize = 5; + const int iSortLengthSize = SORT_LENGTH_DIVISION; int iMaxLength = (int)pSong->m_fMusicLengthSeconds; iMaxLength += (iSortLengthSize - (iMaxLength%iSortLengthSize) - 1); int iMinLength = iMaxLength - (iSortLengthSize-1); From 348df5f561d658e02c7d17c5c74da9dbc0f9ae80 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sat, 2 Apr 2011 00:32:30 -0500 Subject: [PATCH 03/28] Fix issue 247; a crash occurs when exiting Practice mode from dance-solo, dance-threepanel, and popn-nine (all of which can only have one player). Not sure if any other modes will cause this crash. --- Docs/Changelog_sm-ssc.txt | 6 ++++++ src/GameState.cpp | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt index 8916f99138..9b7c9fd1a0 100644 --- a/Docs/Changelog_sm-ssc.txt +++ b/Docs/Changelog_sm-ssc.txt @@ -15,6 +15,12 @@ sm-ssc $NEXTVERSION | 2011???? It depends on who you ask. It could be v1.2.5, it could be v1.3.0, it could even be StepMania 5. +20110402 +-------- +* Fix a crash (issue 247) when exiting Practice mode from dance-solo, + dance-threepanel, and popn-nine (all of which can only have one player). + If you find any other modes this crashes on, let us know. [AJ] + 20110329 -------- * [ScreenEdit] Changed sample playback button to L. [AJ] diff --git a/src/GameState.cpp b/src/GameState.cpp index 1a3f2d0793..90792cad8c 100644 --- a/src/GameState.cpp +++ b/src/GameState.cpp @@ -355,9 +355,14 @@ void GameState::JoinPlayer( PlayerNumber pn ) if( ALLOW_LATE_JOIN && m_pCurStyle != NULL ) { const Style *pStyle; - // only use one player for StyleType_OnePlayerTwoSides. + // Only use one player for StyleType_OnePlayerTwoSides and StepsTypes + // that can only be played by one player (e.g. dance-solo, + // dance-threepanel, popn-nine). -aj // XXX?: still shows joined player as "Insert Card". May not be an issue? -aj - if( m_pCurStyle->m_StyleType == StyleType_OnePlayerTwoSides ) + if( m_pCurStyle->m_StyleType == StyleType_OnePlayerTwoSides || + m_pCurStyle->m_StepsType == StepsType_dance_solo || + m_pCurStyle->m_StepsType == StepsType_dance_threepanel || + m_pCurStyle->m_StepsType == StepsType_popn_nine ) pStyle = GAMEMAN->GetFirstCompatibleStyle( m_pCurGame, 1, m_pCurStyle->m_StepsType ); else pStyle = GAMEMAN->GetFirstCompatibleStyle( m_pCurGame, GetNumSidesJoined(), m_pCurStyle->m_StepsType ); From 9eb9f182a623c15e28d7991000ac3a420da6dfb4 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sat, 2 Apr 2011 00:49:08 -0500 Subject: [PATCH 04/28] small cleanup --- src/NoteDisplay.cpp | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/NoteDisplay.cpp b/src/NoteDisplay.cpp index 0bae40abd8..3998c1fb08 100644 --- a/src/NoteDisplay.cpp +++ b/src/NoteDisplay.cpp @@ -418,7 +418,7 @@ void NoteDisplay::DrawHoldPart( vector &vpSpr, int iCol, int fYStep, fl { /* For very large hold notes, shift the texture coordinates to be near 0, so we * don't send very large values to the renderer. */ - const float fDistFromTop = fYStartPos - fYTop; + const float fDistFromTop = fYStartPos - fYTop; float fTexCoordTop = SCALE( fDistFromTop, 0, fFrameHeight, rect.top, rect.bottom ); fTexCoordTop += fAddToTexCoord; fAddToTexCoord -= floorf( fTexCoordTop ); @@ -542,8 +542,8 @@ void NoteDisplay::DrawHoldBody( const TapNote& tn, int iCol, float fBeat, bool b DISPLAY->SetZTestMode( bWavyPartsNeedZBuffer?ZTEST_WRITE_ON_PASS:ZTEST_OFF ); DISPLAY->SetZWrite( bWavyPartsNeedZBuffer ); - /* Hack: Z effects need a finer grain step. */ - const int fYStep = bWavyPartsNeedZBuffer? 4: 16; // use small steps only if wavy + // Hack: Z effects need a finer grain step. + const int fYStep = bWavyPartsNeedZBuffer? 4: 16; // use small steps only if wavy if( bFlipHoldBody ) { @@ -641,16 +641,18 @@ void NoteDisplay::DrawHold( const TapNote &tn, int iCol, int iRow, bool bIsBeing /* The body and caps should have no overlap, so their order doesn't matter. * Draw the head last, so it appears on top. */ float fBeat = NoteRowToBeat(iRow); - //if( !cache->m_bHoldHeadIsAboveWavyParts ) - //{ - // Actor *pActor = GetHoldActor( m_HoldHead, NotePart_HoldHead, NoteRowToBeat(iRow), tn.subType == TapNote::hold_head_roll, bIsBeingHeld ); - // DrawActor( tn, pActor, NotePart_HoldHead, iCol, bFlipHeadAndTail ? fEndYOffset : fStartYOffset, fBeat, bIsAddition, fPercentFadeToFail, fReverseOffsetPixels, fColorScale, fDrawDistanceAfterTargetsPixels, fDrawDistanceBeforeTargetsPixels, fFadeInPercentOfDrawFar ); - //} - //if( !cache->m_bHoldTailIsAboveWavyParts ) - //{ - // Actor *pActor = GetHoldActor( m_HoldTail, NotePart_HoldTail, NoteRowToBeat(iRow), tn.subType == TapNote::hold_head_roll, bIsBeingHeld ); - // DrawActor( tn, pActor, NotePart_HoldTail, iCol, bFlipHeadAndTail ? fStartYOffset : fEndYOffset, fBeat, bIsAddition, fPercentFadeToFail, fReverseOffsetPixels, fColorScale, fDrawDistanceAfterTargetsPixels, fDrawDistanceBeforeTargetsPixels, fFadeInPercentOfDrawFar ); - //} + /* + if( !cache->m_bHoldHeadIsAboveWavyParts ) + { + Actor *pActor = GetHoldActor( m_HoldHead, NotePart_HoldHead, NoteRowToBeat(iRow), tn.subType == TapNote::hold_head_roll, bIsBeingHeld ); + DrawActor( tn, pActor, NotePart_HoldHead, iCol, bFlipHeadAndTail ? fEndYOffset : fStartYOffset, fBeat, bIsAddition, fPercentFadeToFail, fReverseOffsetPixels, fColorScale, fDrawDistanceAfterTargetsPixels, fDrawDistanceBeforeTargetsPixels, fFadeInPercentOfDrawFar ); + } + if( !cache->m_bHoldTailIsAboveWavyParts ) + { + Actor *pActor = GetHoldActor( m_HoldTail, NotePart_HoldTail, NoteRowToBeat(iRow), tn.subType == TapNote::hold_head_roll, bIsBeingHeld ); + DrawActor( tn, pActor, NotePart_HoldTail, iCol, bFlipHeadAndTail ? fStartYOffset : fEndYOffset, fBeat, bIsAddition, fPercentFadeToFail, fReverseOffsetPixels, fColorScale, fDrawDistanceAfterTargetsPixels, fDrawDistanceBeforeTargetsPixels, fFadeInPercentOfDrawFar ); + } + */ DrawHoldBody( tn, iCol, fBeat, bIsBeingHeld, fYHead, fYTail, bIsAddition, fPercentFadeToFail, fColorScale, false, fDrawDistanceAfterTargetsPixels, fDrawDistanceBeforeTargetsPixels, fFadeInPercentOfDrawFar ); DrawHoldBody( tn, iCol, fBeat, bIsBeingHeld, fYHead, fYTail, bIsAddition, fPercentFadeToFail, fColorScale, true, fDrawDistanceAfterTargetsPixels, fDrawDistanceBeforeTargetsPixels, fFadeInPercentOfDrawFar ); From 7e747c6d650d78ea44b27494e5aceb6cb135bce4 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sat, 2 Apr 2011 16:37:45 -0400 Subject: [PATCH 05/28] Implement Dominik's patch. Someone on Linux needs to test if possible. This will be reverted if it's proven it doesn't work. --- src/arch/InputHandler/InputHandler_Linux_Event.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/arch/InputHandler/InputHandler_Linux_Event.cpp b/src/arch/InputHandler/InputHandler_Linux_Event.cpp index 6c944f9a29..2baebdc253 100644 --- a/src/arch/InputHandler/InputHandler_Linux_Event.cpp +++ b/src/arch/InputHandler/InputHandler_Linux_Event.cpp @@ -398,7 +398,7 @@ void InputHandler_Linux_Event::InputThread() DeviceButton neg = g_apEventDevices[i]->aiAbsMappingLow[event.code]; DeviceButton pos = g_apEventDevices[i]->aiAbsMappingHigh[event.code]; - float l = SCALE( int(event.value), (float) g_apEventDevices[i]->aiAbsMin[i], (float) g_apEventDevices[i]->aiAbsMax[i], -1.0f, 1.0f ); + float l = SCALE( int(event.value), (float) g_apEventDevices[i]->aiAbsMin[event.code], (float) g_apEventDevices[i]->aiAbsMax[event.code], -1.0f, 1.0f ); ButtonPressed( DeviceInput(g_apEventDevices[i]->m_Dev, neg, max(-l,0), now) ); ButtonPressed( DeviceInput(g_apEventDevices[i]->m_Dev, pos, max(+l,0), now) ); break; From 7c04c919b9daa9eb8ac0011233a28efd0844c274 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 3 Apr 2011 01:26:36 -0500 Subject: [PATCH 06/28] small comment/cleanup --- src/Player.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Player.cpp b/src/Player.cpp index 92aeee5f09..6e620bdec2 100644 --- a/src/Player.cpp +++ b/src/Player.cpp @@ -2562,7 +2562,7 @@ void Player::UpdateTapNotesMissedOlderThan( float fMissIfOlderThanSeconds ) if( !NeedsTapJudging(tn) ) continue; - + // Ignore all notes that are skipped via WARPS. if( GAMESTATE->m_pCurSong->m_Timing.IsWarpAtRow( iter.Row() ) ) continue; @@ -2598,7 +2598,7 @@ void Player::UpdateJudgedRows() { int iRow = iter.Row(); - // if row is within a warp section, ignore it. -aj + // If row is within a warp section, ignore it. -aj if( GAMESTATE->m_pCurSong->m_Timing.IsWarpAtRow(iRow) ) continue; @@ -2933,7 +2933,7 @@ void Player::HandleTapRowScore( unsigned row ) bNoCheating = false; #endif - // more warp hackery. -aj + // Warp hackery. -aj if( GAMESTATE->m_pCurSong->m_Timing.IsWarpAtRow( row ) ) return; @@ -3037,7 +3037,7 @@ void Player::HandleHoldCheckpoint( int iRow, int iNumHoldsHeldThisRow, int iNumH bNoCheating = false; #endif - // more warp hackery. -aj + // More warp hackery. -aj if( GAMESTATE->m_pCurSong->m_Timing.IsWarpAtRow( iRow ) ) return; From c9776058977b43529c0fb7eb0bc80883c3f6b05d Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 3 Apr 2011 04:21:07 -0400 Subject: [PATCH 07/28] Add comment about an old bug. --- src/ScreenGameplaySyncMachine.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ScreenGameplaySyncMachine.cpp b/src/ScreenGameplaySyncMachine.cpp index 2ac318a5b1..008bb31585 100644 --- a/src/ScreenGameplaySyncMachine.cpp +++ b/src/ScreenGameplaySyncMachine.cpp @@ -35,6 +35,7 @@ void ScreenGameplaySyncMachine::Init() SongUtil::GetPlayableSteps( &m_Song, vpSteps ); ASSERT_M(vpSteps.size() > 0, "No playable steps for ScreenGameplaySyncMachine"); Steps *pSteps = vpSteps[0]; + // TODO: Either detect which player accessed this file, or FOREACH all of them. -Wolfman2000 GAMESTATE->m_pCurSteps[0].Set( pSteps ); GamePreferences::m_AutoPlay.Set( PC_HUMAN ); From ca383b7fcca162511670644bdbf794b47622340a Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 3 Apr 2011 12:44:23 -0500 Subject: [PATCH 08/28] GetExtension takes in an RString. steve was right, I don't need to .c_str() here --- src/GameSoundManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/GameSoundManager.cpp b/src/GameSoundManager.cpp index 2c17b82c6e..5b3ba858de 100644 --- a/src/GameSoundManager.cpp +++ b/src/GameSoundManager.cpp @@ -142,7 +142,7 @@ static void StartMusic( MusicToPlay &ToPlay ) { LOG->Trace( "Found '%s'", ToPlay.m_sTimingFile.c_str() ); Song song; - if( GetExtension(ToPlay.m_sTimingFile.c_str()) == ".ssc" && + if( GetExtension(ToPlay.m_sTimingFile) == ".ssc" && SSCLoader::LoadFromSSCFile(ToPlay.m_sTimingFile, song) ) { ToPlay.HasTiming = true; @@ -152,7 +152,7 @@ static void StartMusic( MusicToPlay &ToPlay ) if( pStepsCabinetLights ) pStepsCabinetLights->GetNoteData( ToPlay.m_LightsData ); } - else if( GetExtension(ToPlay.m_sTimingFile.c_str()) == ".sm" && + else if( GetExtension(ToPlay.m_sTimingFile) == ".sm" && SMLoader::LoadFromSMFile(ToPlay.m_sTimingFile, song) ) { ToPlay.HasTiming = true; From 439a607e876a39ce5f919a0219fd70c7c85ba674 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 3 Apr 2011 16:10:10 -0400 Subject: [PATCH 09/28] New branch from default: [metricClean] Line up metrics from fallback and default for easier diffing. The goal here is to address issue number 55 for version 1.2.5. --- Themes/_fallback/metrics.ini | 15 +- Themes/default/metrics.ini | 1288 +++++++++++++++++++--------------- 2 files changed, 748 insertions(+), 555 deletions(-) diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 58d1b6d53d..56624e357f 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -233,6 +233,11 @@ FormatString="%03.0f" [CodeDetector] # Codes on the MusicWheel that change stuff! +# For Future Reference: +# @ = Holding +# - = In Conjuction With / Then +# ~ = Released +# + = At The Same Time PrevSteps1="Up,Up" PrevSteps2="MenuUp,MenuUp" NextSteps1="Down,Down" @@ -585,6 +590,7 @@ StreamX=0 StreamY=0 OverX=0 OverY=0 + [LifeMeterBattery] # The bar that shows up in Oni mode. @@ -1101,7 +1107,6 @@ TextOffCommand= [ScoreDisplayOni] - [ScoreDisplayLifeTime] FrameX= FrameY= @@ -1251,6 +1256,7 @@ SoundProperty="Pitch" PropertyMin=7/8 PropertyCenter=1.0 PropertyMax=9/8 + [StepsDisplayListRow] FrameX=0 FrameY=0 @@ -1834,6 +1840,7 @@ PerChoiceIconElement=false ShowScroller=true WrapScroller=true ShowIcon=false + [ScreenGameInformation] Class="ScreenSelectMaster" Fallback="ScreenSelectMaster" @@ -1958,6 +1965,7 @@ ScreenModsCommand=setupcoursestagemods # MusicWheelType="CourseWheel" Codes="CourseCodeDetector" + [CourseCodeDetector] Fallback="CodeDetector" NextSort1= @@ -1965,7 +1973,6 @@ NextSort2= NextSort3= NextSort4= - [StepsDisplay] FrameX=0 FrameY=0 @@ -2519,6 +2526,7 @@ ExplanationTogetherOffCommand= [ScreenOptionsServiceExtendedChild] Fallback="ScreenOptionsServiceChild" + [ScreenMiniMenu] Class="ScreenMiniMenu" Fallback="ScreenOptions" @@ -3342,11 +3350,13 @@ NextScreen=Branch.AfterProfileSave() PrevScreen=Branch.TitleMenu() # TimerSeconds=-1 + [ScreenProfileSaveSummary] Fallback="ScreenProfileSave" # NextScreen="ScreenGameOver" PrevScreen="ScreenGameOver" + [ScreenGameOver] Class="ScreenEnding" Fallback="ScreenAttract" @@ -4114,6 +4124,7 @@ ChoiceNames="1" IdleCommentSeconds=-1 IdleTimeoutSeconds=-1 IdleTimeoutScreen=Branch.AfterInit() + [ScreenDemonstration] Fallback="ScreenGameplay" Class="ScreenDemonstration" diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index e66dbe9d61..1fdca10835 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -1,11 +1,40 @@ +# 01 # [Global] FallbackTheme=_fallback [Common] FirstAttractScreen="" -InitialScreen="ScreenInit" -# AutoSetStyle=GetUserPrefB("UserPrefAutoSetStyle") +# 02 # +[LightsManager] + +[ProfileManager] + +[SongManager] +SongGroupColor1=BoostColor(Color("Orange"),1.2) +SongGroupColor2=BoostColor(Color("Orange"),1.25) +SongGroupColor3=BoostColor(Color("Orange"),1.25) +SongGroupColor4=BoostColor(Color("Orange"),1.25) +SongGroupColor5=BoostColor(Color("Orange"),1.25) +SongGroupColor6=BoostColor(Color("Orange"),1.25) +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 + +[UnlockManager] + +# 03 # +[ArrowEffects] + +[Background] + +[Banner] + [BitmapText] NumRainbowColors=1 RainbowColor1=Color("Black"); @@ -16,32 +45,23 @@ SetNormalCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,Color("White");dif SetChangeCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,Color("Orange");diffusetopedge,BoostColor(Color("Orange"),1.5); SetRandomCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,Color("Blue");diffusetopedge,BoostColor(Color("Blue"),1.5); SetExtraCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,Color("Red");diffusebottomedge,BoostColor(Color("Red"),0.5); -Cycle=true -NoBpmText="000" RandomCycleSpeed=0.2 -- smaller numbers mean the bpm cycles faster -Separator="-" -ShowQMarksInRandomCycle=true [CombinedLifeMeterTug] -# We dont use it. MeterWidth=512-8 MeterHeight=40 -[CodeDetector] -# For Future Reference: -# @ = Holding -# - = In Conjuction With / Then -# ~ = Released -# + = At The Same Time -[DifficultyList] -CapitalizeDifficultyNames=false -NumShownItems=8 -ItemsSpacingY=24 -[HelpDisplay] -TipShowTime=7 [Combo] ShowComboAt=2 +[HoldJudgment] +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 + +[HelpDisplay] +TipShowTime=7 + + NumberMinZoom=0.8 NumberMaxZoom=1 NumberMaxZoomAt=100 @@ -53,37 +73,7 @@ PulseLabelCommand=%function(self,param) self:finishtweening(); self:diffusealpha NumberOnCommand=y,240-216-1.5;shadowlength,1;horizalign,right;vertalign,bottom;skewx,-0.125; LabelOnCommand=x,6;y,22.5;shadowlength,1;zoom,0.75;diffusebottomedge,color("0.75,0.75,0.75,1");horizalign,left;vertalign,bottom -[FadingBanner] -BannerOnCommand= -BannerFadeFromCachedCommand=diffusealpha,1;stoptweening;accelerate,0.05;glow,Colors.Alpha( Color("White"), 0.45 );decelerate,0.175;diffusealpha,0;glow,Color("Invisible"); -BannerFadeOffCommand=diffusealpha,1;stoptweening;linear,0.25;diffusealpha,0 -BannerResetFadeCommand=diffusealpha,1 - -[HoldJudgment] -# !!! # -# HoldJudgmentLetGoCommand=HoldJudgmentLetGo() -# HoldJudgmentHeldCommand=HoldJudgmentHeld() -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 -# HoldJudgmentLetGoCommand=GAMESTATE:GetCurrentGame():GetName() == "pump" and "visible,false" or "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=GAMESTATE:GetCurrentGame():GetName() == "pump" and "visible,false" or "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"; -# HoldJudgmentLetGoCommand=function(self) \ - # if GAMESTATE:GetCurrentGame():GetName() == "pump" then \ - # return (cmd(visible,false))(self); \ - # 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))(self); \ - # end; \ -# end; -# HoldJudgmentHeldCommand=function(self) \ - # if GAMESTATE:GetCurrentGame():GetName() == "pump" then \ - # return (cmd(visible,false)); \ - # 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))(self); \ - # end; \ -# end; - [Judgment] -# New # -JudgmentOnCommand= -# !!! # JudgmentW1Command=finishtweening;shadowlength,0;y,0;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0;glowblink;effectperiod,0.05;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.8 JudgmentW2Command=finishtweening;y,0;shadowlength,0;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 JudgmentW3Command=finishtweening;y,0;shadowlength,0;diffusealpha,1;zoom,1.2;linear,0.05;zoom,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0; @@ -94,6 +84,66 @@ JudgmentMissCommand=finishtweening;y,0;shadowlength,0;diffusealpha,1;zoom,1;y,-2 OffsetOnCommand= OffsetLateCommand= OffsetEarlyCommand= + +[Protiming] +ProtimingOnCommand=shadowlength,1;horizalign,right;x,30;strokecolor,Color("Outline");skewx,-0.125;textglowmode,"TextGlowMode_Inner"; +AverageOnCommand=shadowlength,1;horizalign,left;x,32;y,8;zoom,0.75;diffuse,ColorLightTone( Color("Green") );strokecolor,Color("Outline");skewx,-0.125;textglowmode,"TextGlowMode_Inner"; +TextOnCommand=shadowlength,1;horizalign,left;x,32;y,-6;zoom,0.5;strokecolor,Color("Outline");skewx,-0.125;textglowmode,"TextGlowMode_Inner"; +# +ProtimingW1Command=finishtweening;diffuse,Color("White");zoom,1.15;glow,Color("White");linear,0.05;zoom,1;glow,Color("Invisible");diffuse,GameColor.Judgment["JudgmentLine_W1"];sleep,2;linear,0.5;diffuse,Color("Invisible"); +ProtimingW2Command=finishtweening;diffuse,Color("White");zoom,1.15;glow,Color("White");linear,0.05;zoom,1;glow,Color("Invisible");diffuse,GameColor.Judgment["JudgmentLine_W2"];sleep,2;linear,0.5;diffuse,Color("Invisible"); +ProtimingW3Command=finishtweening;diffuse,Color("White");zoom,1.15;glow,Color("White");linear,0.05;zoom,1;glow,Color("Invisible");diffuse,GameColor.Judgment["JudgmentLine_W3"];sleep,2;linear,0.5;diffuse,Color("Invisible"); +ProtimingW4Command=finishtweening;diffuse,Color("White");zoom,1.15;glow,Color("White");linear,0.05;zoom,1;glow,Color("Invisible");diffuse,GameColor.Judgment["JudgmentLine_W4"];sleep,2;linear,0.5;diffuse,Color("Invisible"); +ProtimingW5Command=finishtweening;diffuse,Color("White");zoom,1.15;glow,Color("White");linear,0.05;zoom,1;glow,Color("Invisible");diffuse,GameColor.Judgment["JudgmentLine_W5"];sleep,2;linear,0.5;diffuse,Color("Invisible"); +ProtimingMissCommand=finishtweening;diffusealpha,1;zoom,1.15;glow,GameColor.Judgment["JudgmentLine_Miss"];linear,0.05;zoom,1;glow,Color("Invisible");diffuse,GameColor.Judgment["JudgmentLine_Miss"];sleep,2;linear,0.5;diffuse,Color("Invisible"); +# +AveragePulseCommand=finishtweening;diffusealpha,1;zoom,0.75*1.025;decelerate,0.05;zoom,0.75;sleep,2;linear,0.5;diffusealpha,0; +TextPulseCommand=finishtweening;diffusealpha,1;zoom,0.5*1.025;decelerate,0.05;zoom,0.5;sleep,2;linear,0.5;diffusealpha,0; + +[Course] + +[CustomDifficulty] + +[CustomScoring] +# So special scoring works properly, we zero this out +ComboAboveThresholdAddsToScoreBonus=0 +ComboScoreBonusThreshold=0 +ComboScoreBonusValue=0 +ComboMultiplier=0 +DoubleNoteScoreMultiplier=0 +TripleNoteScoreMultiplier=0 +QuadOrHigherNoteScoreMultiplier=0 +PointsW1=0 +PointsW2=0 +PointsW3=0 +PointsW4=0 +PointsW5=0 +PointsMiss=0 +PointsHitMine=0 +PointsCheckpointHit=0 +PointsCheckpointMiss=0 +PointsNone=0 +PointsHoldHeld=0 +PointsHoldLetGo=0 + +[DifficultyList] +ItemsSpacingY=24 +NumShownItems=8 + +[FadingBanner] +BannerFadeFromCachedCommand=diffusealpha,1;stoptweening;accelerate,0.05;glow,Colors.Alpha( Color("White"), 0.45 );decelerate,0.175;diffusealpha,0;glow,Color("Invisible"); +BannerFadeOffCommand=diffusealpha,1;stoptweening;linear,0.25;diffusealpha,0 + +[Gameplay] + +[GameState] + +[GrooveRadar] + +[HighScore] + +[Inventory] + [LifeMeterBar] OverOnCommand=diffuse,Color("Orange");diffuserightedge,BoostColor(Color("Orange"),1.5) @@ -105,10 +155,6 @@ BatteryP1Y=0 BatteryP2X=0 BatteryP2Y=0 # -NumLivesP1X=-92 -NumLivesP1Y=0 -NumLivesP2X=92 -NumLivesP2Y=0 NumLivesP2OnCommand=zoomx,-1 [LifeMeterBattery Percent] @@ -123,8 +169,59 @@ PercentP2Y=0 PercentP2OnCommand=zoom,0.7;zoomx,-0.7;shadowlength,0;diffuse,PlayerColor(PLAYER_2) PercentP2OffCommand= -[NoteField] -ShowBoard=GAMESTATE:GetCurrentGame():GetName() == "kb7" +[LifeMeterTime] + +[LyricDisplay] + +[NotesWriterSM] + +[OptionRow] +TitleOnCommand=shadowlength,0;skewx,-0.1;uppercase,true;wrapwidthpixels,136;maxheight,42;zoom,0.6 +TitleGainFocusCommand=stoptweening;zoom,0.6375*1.125;bounceend,0.2;diffuse,Color("Orange");diffusetopedge,BoostColor(Color("Orange"),1.5);strokecolor,Color("Black");zoom,0.6375; +# TitleGainFocusCommand=stoptweening;zoom,0.6375*1.25;bounceend,0.2;diffuse,Color("Orange");diffusetopedge,BoostColor(Color("Orange"),1.5);strokecolor,Color("Black");zoom,0.6375;thump;effectmagnitude,1,1.05,1;effectclock,'beat' +TitleLoseFocusCommand=diffuse,Color("White");strokecolor,Color("Black");stopeffect; + +[OptionRowExit] +Fallback="OptionRow" +FrameOnCommand=visible,true;diffuse,Color("Red"); +FrameX=SCREEN_CENTER_X +TitleOnCommand=visible,false + +ItemsMinBaseZoom=1 +ItemOnCommand=shadowlength,1;zoom,0.8;diffuse,Color("Red");diffusebottomedge,BoostColor(Color("Red"),0.75);shadowcolor,BoostColor(Color("Red"),0.35) +ItemGainFocusCommand=stoptweening;linear,0.2;zoom,1;diffuse,Color("Red");diffusebottomedge,BoostColor(Color("Red"),0.75) +ItemLoseFocusCommand=stoptweening;decelerate,0.5;zoom,0.8; +ColorSelected=Color("Red") +ColorNotSelected=Color("Red") +ColorDisabled=Color("Red") + +ItemsLongRowP1X=SCREEN_CENTER_X-1024 +ItemsLongRowP2X=SCREEN_CENTER_X+1024 +ItemsLongRowSharedX=SCREEN_CENTER_X + +[OptionsCursor] + +[OptionsCursorP1] +LeftOnCommand=horizalign,right;diffuse,PlayerColor(PLAYER_1) +MiddleOnCommand=;diffuse,PlayerColor(PLAYER_1) +RightOnCommand=horizalign,left;diffuse,PlayerColor(PLAYER_1) + +[OptionsCursorP2] +LeftOnCommand=horizalign,right;diffuse,PlayerColor(PLAYER_2) +MiddleOnCommand=;diffuse,PlayerColor(PLAYER_2) +RightOnCommand=horizalign,left;diffuse,PlayerColor(PLAYER_2) + +[OptionsUnderline] + +[OptionsUnderlineP1] +LeftOnCommand=horizalign,right;diffuse,PlayerColor(PLAYER_1) +MiddleOnCommand=;diffuse,PlayerColor(PLAYER_1) +RightOnCommand=horizalign,left;diffuse,PlayerColor(PLAYER_1) + +[OptionsUnderlineP2] +LeftOnCommand=horizalign,right;diffuse,PlayerColor(PLAYER_2) +MiddleOnCommand=;diffuse,PlayerColor(PLAYER_2) +RightOnCommand=horizalign,left;diffuse,PlayerColor(PLAYER_2) [MenuTimer] Text1OnCommand=stopeffect;stoptweening;shadowlength,0;strokecolor,Color("Outline") @@ -139,14 +236,10 @@ Warning10Command=diffuseshift;effectperiod,1;effectcolor2,Color("Red");effectcol #~ end; [MusicWheel] -FadeSeconds=1 SwitchSeconds=0.08 -RandomPicksLockedSongs=true RouletteSwitchSeconds=0.05 RouletteSlowDownSwitches=5 LockedInitialVelocity=7 -ScrollBarHeight=300 -ScrollBarOnCommand=visible,false ; linear wheel example: ; ItemTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \ ; self:y(offsetFromCenter*38); \ @@ -181,10 +274,7 @@ SectionColor1=Color("Orange") SongRealExtraColor=Color("Red") SortMenuColor=Color("Orange") # -ShowRoulette=true -ShowRandom=false -ShowPortal=false -MostPlayedSongsToShow=30 + #~ ModeMenuChoiceNames="Preferred,Group,Title,Bpm,Popularity,TopGrades,Artist,EasyMeter,MediumMeter,HardMeter,ChallengeMeter,Genre,Length" #~ ChoicePreferred="sort,Preferred" #~ ChoiceGroup="sort,Group" @@ -205,15 +295,11 @@ UseEasyMarkerFlag=true [MusicWheelItem] WheelNotifyIconX=-128-16+0.5 -WheelNotifyIconY=0 WheelNotifyIconOnCommand=shadowlength,2; # SongNameX=-120 -SongNameY=0 -SongNameOnCommand= # CourseX=-120 -CourseY=0 CourseOnCommand=maxwidth,208;horizalign,left # SectionExpandedX=-38 @@ -245,104 +331,24 @@ GradeP2X=110+16 GradeP2Y=8 GradesShowMachine=true -[OptionRow] -TitleOnCommand=shadowlength,0;skewx,-0.1;uppercase,true;wrapwidthpixels,136;maxheight,42;zoom,0.6 -TitleGainFocusCommand=stoptweening;zoom,0.6375*1.125;bounceend,0.2;diffuse,Color("Orange");diffusetopedge,BoostColor(Color("Orange"),1.5);strokecolor,Color("Black");zoom,0.6375; -# TitleGainFocusCommand=stoptweening;zoom,0.6375*1.25;bounceend,0.2;diffuse,Color("Orange");diffusetopedge,BoostColor(Color("Orange"),1.5);strokecolor,Color("Black");zoom,0.6375;thump;effectmagnitude,1,1.05,1;effectclock,'beat' -TitleLoseFocusCommand=diffuse,Color("White");strokecolor,Color("Black");stopeffect; -[OptionRowMiniMenu] -Fallback="OptionRow" - -TitleX=SCREEN_CENTER_X-320+48 -TitleOnCommand=horizalign,left;shadowlength,0;uppercase,true;zoom,0.6375;strokecolor,Color("Black"); -#~ TitleGainFocusCommand= -#~ TitleLoseFocusCommand= - -ColorSelected=color("1,1,1,1") -ColorNotSelected=color("0.9,0.9,0.9,1") -ColorDisabled=color("0.5,0.5,0.5,1") - -ItemOnCommand=zoom,0.6375 -ItemsLongRowP1X=SCREEN_CENTER_X-240 -ItemsLongRowP2X=SCREEN_CENTER_X+240 -ItemsLongRowSharedX=SCREEN_CENTER_X+200 - -[OptionRowMiniMenuContext] -Fallback="OptionRowMiniMenu" - -[OptionRowExit] -Fallback="OptionRow" -FrameOnCommand=visible,true;diffuse,Color("Red"); -FrameX=SCREEN_CENTER_X -TitleOnCommand=visible,false - -ItemsMinBaseZoom=1 -ItemOnCommand=shadowlength,1;zoom,0.8;diffuse,Color("Red");diffusebottomedge,BoostColor(Color("Red"),0.75);shadowcolor,BoostColor(Color("Red"),0.35) -ItemGainFocusCommand=stoptweening;linear,0.2;zoom,1;diffuse,Color("Red");diffusebottomedge,BoostColor(Color("Red"),0.75) -ItemLoseFocusCommand=stoptweening;decelerate,0.5;zoom,0.8; -ColorSelected=Color("Red") -ColorNotSelected=Color("Red") -ColorDisabled=Color("Red") - -ItemsLongRowP1X=SCREEN_CENTER_X-1024 -ItemsLongRowP2X=SCREEN_CENTER_X+1024 -ItemsLongRowSharedX=SCREEN_CENTER_X - -[OptionsCursorP1] -LeftOnCommand=horizalign,right;diffuse,PlayerColor(PLAYER_1) -MiddleOnCommand=;diffuse,PlayerColor(PLAYER_1) -RightOnCommand=horizalign,left;diffuse,PlayerColor(PLAYER_1) -[OptionsCursorP2] -LeftOnCommand=horizalign,right;diffuse,PlayerColor(PLAYER_2) -MiddleOnCommand=;diffuse,PlayerColor(PLAYER_2) -RightOnCommand=horizalign,left;diffuse,PlayerColor(PLAYER_2) -[OptionsUnderlineP1] -LeftOnCommand=horizalign,right;diffuse,PlayerColor(PLAYER_1) -MiddleOnCommand=;diffuse,PlayerColor(PLAYER_1) -RightOnCommand=horizalign,left;diffuse,PlayerColor(PLAYER_1) -[OptionsUnderlineP2] -LeftOnCommand=horizalign,right;diffuse,PlayerColor(PLAYER_2) -MiddleOnCommand=;diffuse,PlayerColor(PLAYER_2) -RightOnCommand=horizalign,left;diffuse,PlayerColor(PLAYER_2) -[Protiming] -ProtimingOnCommand=shadowlength,1;horizalign,right;x,30;strokecolor,Color("Outline");skewx,-0.125;textglowmode,"TextGlowMode_Inner"; -AverageOnCommand=shadowlength,1;horizalign,left;x,32;y,8;zoom,0.75;diffuse,ColorLightTone( Color("Green") );strokecolor,Color("Outline");skewx,-0.125;textglowmode,"TextGlowMode_Inner"; -TextOnCommand=shadowlength,1;horizalign,left;x,32;y,-6;zoom,0.5;strokecolor,Color("Outline");skewx,-0.125;textglowmode,"TextGlowMode_Inner"; -# -ProtimingW1Command=finishtweening;diffuse,Color("White");zoom,1.15;glow,Color("White");linear,0.05;zoom,1;glow,Color("Invisible");diffuse,GameColor.Judgment["JudgmentLine_W1"];sleep,2;linear,0.5;diffuse,Color("Invisible"); -ProtimingW2Command=finishtweening;diffuse,Color("White");zoom,1.15;glow,Color("White");linear,0.05;zoom,1;glow,Color("Invisible");diffuse,GameColor.Judgment["JudgmentLine_W2"];sleep,2;linear,0.5;diffuse,Color("Invisible"); -ProtimingW3Command=finishtweening;diffuse,Color("White");zoom,1.15;glow,Color("White");linear,0.05;zoom,1;glow,Color("Invisible");diffuse,GameColor.Judgment["JudgmentLine_W3"];sleep,2;linear,0.5;diffuse,Color("Invisible"); -ProtimingW4Command=finishtweening;diffuse,Color("White");zoom,1.15;glow,Color("White");linear,0.05;zoom,1;glow,Color("Invisible");diffuse,GameColor.Judgment["JudgmentLine_W4"];sleep,2;linear,0.5;diffuse,Color("Invisible"); -ProtimingW5Command=finishtweening;diffuse,Color("White");zoom,1.15;glow,Color("White");linear,0.05;zoom,1;glow,Color("Invisible");diffuse,GameColor.Judgment["JudgmentLine_W5"];sleep,2;linear,0.5;diffuse,Color("Invisible"); -ProtimingMissCommand=finishtweening;diffusealpha,1;zoom,1.15;glow,GameColor.Judgment["JudgmentLine_Miss"];linear,0.05;zoom,1;glow,Color("Invisible");diffuse,GameColor.Judgment["JudgmentLine_Miss"];sleep,2;linear,0.5;diffuse,Color("Invisible"); -# -AveragePulseCommand=finishtweening;diffusealpha,1;zoom,0.75*1.025;decelerate,0.05;zoom,0.75;sleep,2;linear,0.5;diffusealpha,0; -TextPulseCommand=finishtweening;diffusealpha,1;zoom,0.5*1.025;decelerate,0.05;zoom,0.5;sleep,2;linear,0.5;diffusealpha,0; -[Player] -# ReceptorArrowsYStandard=GetTapPosition('Standard') -# ReceptorArrowsYReverse=GetTapPosition('Reverse') -# RollBodyIncrementsCombo=GetUserPrefB("UserPrefComboOnRolls") +[NoteField] +ShowBoard=GAMESTATE:GetCurrentGame():GetName() == "kb7" [ScoreDisplayNormal] -FrameX= -FrameY= -FrameOnCommand= -FrameOffCommand= -TextX= -TextY= TextOnCommand=shadowlength,1;diffusebottomedge,BoostColor(Color('White'),0.75) -TextOffCommand= [ScoreDisplayOni] TextX= TextY= TextOnCommand=shadowlength,1;diffusebottomedge,BoostColor(Color('White'),0.75) TextOffCommand= + [ScoreDisplayOni Numbers] TextX= TextY= TextOnCommand=shadowlength,1;diffusebottomedge,BoostColor(Color('White'),0.75) TextOffCommand= + [ScoreDisplayLifeTime] FrameX= FrameY= @@ -355,23 +361,33 @@ TimeRemainingOnCommand=zoom,1;shadowlength,1;settext,"Hi!"; TimeRemainingOffCommand= # DeltaSecondsOnCommand=y,80;settext,Hi;spin; -DeltaSecondsNoneCommand= -DeltaSecondsHitMineCommand= -DeltaSecondsAvoidMineCommand= -DeltaSecondsCheckpointMissCommand= -DeltaSecondsCheckpointHitCommand= -DeltaSecondsMissCommand= -DeltaSecondsW5Command= -DeltaSecondsW4Command= -DeltaSecondsW3Command= -DeltaSecondsW2Command= -DeltaSecondsW1Command= -DeltaSecondsLetGoCommand= -DeltaSecondsHeldCommand= DeltaSecondsGainLifeCommand=zoom,0.5;settext,"Hi!"; + [ScoreDisplayPercentage Percent] PercentP1OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_1);diffusetopedge,BoostColor(PlayerColor(PLAYER_1),1.5) PercentP2OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_2);diffusetopedge,BoostColor(PlayerColor(PLAYER_2),1.5) + +[ScoreDisplayRave] +MeterP1X= +MeterP1Y= +MeterP1OnCommand=draworder,-1 +MeterP1OffCommand= +MeterP2X= +MeterP2Y= +MeterP2OnCommand=draworder,-1;zoomx,-1 +MeterP2OffCommand= + +LevelP1X= +LevelP1Y= +LevelP1OnCommand=draworder,105;zoom,0.75;diffuse,ColorLightTone( PlayerColor(PLAYER_1) );strokecolor,ColorDarkTone( PlayerColor(PLAYER_1) );x,-144;skewx,-0.125; +LevelP1OffCommand= +LevelP2X= +LevelP2Y= +LevelP2OnCommand=draworder,105;draworder,105;zoom,0.75;diffuse,ColorLightTone( PlayerColor(PLAYER_2) );strokecolor,ColorDarkTone( PlayerColor(PLAYER_2) );x,144;skewx,-0.125; +LevelP2OffCommand= + +[ScoreKeeperRave] + [ScreenEvaluation Percent] # This shouldn't even be named this but whatever man. PercentP1X=0 @@ -406,211 +422,13 @@ Format= PercentDecimalPlaces=2 PercentTotalSize=5 -[ScoreDisplayRave] -MeterP1X= -MeterP1Y= -MeterP1OnCommand=draworder,-1 -MeterP1OffCommand= -MeterP2X= -MeterP2Y= -MeterP2OnCommand=draworder,-1;zoomx,-1 -MeterP2OffCommand= +[SoundEffectControl] -LevelP1X= -LevelP1Y= -LevelP1OnCommand=draworder,105;zoom,0.75;diffuse,ColorLightTone( PlayerColor(PLAYER_1) );strokecolor,ColorDarkTone( PlayerColor(PLAYER_1) );x,-144;skewx,-0.125; -LevelP1OffCommand= -LevelP2X= -LevelP2Y= -LevelP2OnCommand=draworder,105;draworder,105;zoom,0.75;diffuse,ColorLightTone( PlayerColor(PLAYER_2) );strokecolor,ColorDarkTone( PlayerColor(PLAYER_2) );x,144;skewx,-0.125; -LevelP2OffCommand= -[SongManager] -SongGroupColor1=BoostColor(Color("Orange"),1.2) -SongGroupColor2=BoostColor(Color("Orange"),1.25) -SongGroupColor3=BoostColor(Color("Orange"),1.25) -SongGroupColor4=BoostColor(Color("Orange"),1.25) -SongGroupColor5=BoostColor(Color("Orange"),1.25) -SongGroupColor6=BoostColor(Color("Orange"),1.25) -SongGroupColor7=BoostColor(Color("Orange"),1.25) -SongGroupColor8=BoostColor(Color("Orange"),1.25) -SongGroupColor9=BoostColor(Color("Orange"),1.25) -SongGroupColor10=BoostColor(Color("Orange"),1.25) +[SoundEffectControl_Off] -CourseGroupColor1=color("1,1,1,1") -UnlockColor=color("1,0.5,0,1") -ExtraColor=color("#ff0000") -- red +[SoundEffectControl_Speed] -[SongMeterDisplay] -StreamWidth=380 - -ContainerX= -ContainerY= -ContainerOnCommand= -ContainerOffCommand= - -FrameX=0 -FrameY=0 -FrameOnCommand=sleep,2;linear,0.25;diffuse,Color("Orange");glow,1,1,1,0.5;decelerate,0.6;glow,1,1,1,0 -FrameOffCommand= - -StreamX=0 -StreamY=0 -StreamOnCommand=0 -StreamOffCommand=0 - -TipX=0 -TipY=0 -TipOnCommand= -TipOffCommand= -[SongMeterDisplayP1] -Fallback="SongMeterDisplay" -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,0.5;decelerate,0.6;glow,1,1,1,0 -[StepsDisplay] -FrameX=0 -FrameY=0 -FrameOnCommand= -FrameLoadCommand=%function(self,param) end; -FrameSetCommand=%function(self,param) \ - if param.CustomDifficulty then \ - self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \ - end; \ -end; -# -ShowTicks=false -NumTicks=10 -MaxTicks=14 -TicksX=0 -TicksY=0 -TicksOnCommand=shadowlength,0; -TicksSetCommand=%function(self,param) end; -# -ShowMeter=true -ZeroMeterString="?" -MeterX=56-32 -MeterY=0 -MeterOnCommand=shadowlength,1;textglowmode,'TextGlowMode_Inner' -MeterSetCommand=%function(self,param) \ - if param.CustomDifficulty then \ - self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \ - self:shadowcolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); \ - end; \ - if param.Meter then \ - if param.Meter >= 100 then \ - self:basezoom(0.8); \ - self:glowshift(); \ - elseif param.Meter >= 10 then \ - self:basezoom(1); \ - self:glowshift(); \ - else \ - self:basezoom(1); \ - self:stopeffect(); \ - end; \ - end; \ -end; -# -ShowDescription=true -DescriptionX=-20-32 -DescriptionY=GetGamePrefB("AutoSetStyle") and -5 or 0 -# DescriptionY=GetUserPrefB("UserPrefAutoSetStyle") and -5 or 0 -DescriptionOnCommand=shadowlength,1;uppercase,true;zoom,0.75;maxwidth,128+8 -DescriptionSetCommand=%function(self,param) \ - if self:GetText() == "" then \ - self:settext("Edit"); \ - end; \ - if param.CustomDifficulty then \ - self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \ - self:shadowcolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); \ - end; \ -end; -# -ShowAutogen=false -AutogenX=40-32 -AutogenY=0 -AutogenOnCommand= -AutogenSetCommand=%function(self,param) if param.Difficulty then self:diffuse(CustomDifficultyToLightColor(param.Difficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.Difficulty)); end end -# -ShowStepsType=GetGamePrefB("AutoSetStyle") -# ShowStepsType=GetUserPrefB("UserPrefAutoSetStyle") -StepsTypeX=-20-32 -StepsTypeY=7 -StepsTypeOnCommand=zoom,0.45 - -[StepsDisplayEdit] -Fallback="StepsDisplayGameplay" - -[StepsDisplayGameplay] -Fallback="StepsDisplay" - -FrameX=0 -FrameY=0 -FrameOnCommand= -FrameLoadCommand=%function(self,param) end; -FrameSetCommand=%function(self,param) \ - if param.CustomDifficulty then \ - self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \ - end; \ -end; -# -ShowTicks=false -NumTicks=10 -MaxTicks=14 -TicksX=0 -TicksY=0 -TicksOnCommand=shadowlength,0; -TicksSetCommand=%function(self,param) end; -# -ShowMeter=true -ZeroMeterString="?" -MeterX=56 -MeterY=0 -MeterOnCommand=shadowlength,1;textglowmode,'TextGlowMode_Inner' -MeterSetCommand=%function(self,param) \ - if param.CustomDifficulty then \ - self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \ - self:shadowcolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); \ - end; \ - if param.Meter then \ - if param.Meter >= 100 then \ - self:zoom(0.8); \ - else \ - self:zoom(1); \ - end; \ - end; \ -end; -# -ShowDescription=true -DescriptionX=-20 -DescriptionY=GetGamePrefB("AutoSetStyle") and -5 or 0 -# DescriptionY=GetUserPrefB("UserPrefAutoSetStyle") and -5 or 0 -DescriptionOnCommand=shadowlength,1;uppercase,true;zoom,0.75;maxwidth,128+8 -DescriptionSetCommand=%function(self,param) \ - if self:GetText() == "" then \ - self:settext("Edit"); \ - end; \ - if param.CustomDifficulty then \ - self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \ - self:shadowcolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); \ - end; \ - (cmd(finishtweening;diffusealpha,0;addx,-4;smooth,0.125;addx,4;diffusealpha,1))(self); \ -end; -# -ShowAutogen=false -AutogenX=40 -AutogenY=0 -AutogenOnCommand= -AutogenSetCommand=%function(self,param) if param.Difficulty then self:diffuse(CustomDifficultyToLightColor(param.Difficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.Difficulty)); end end -# -ShowStepsType=GetGamePrefB("AutoSetStyle") -# ShowStepsType=GetUserPrefB("UserPrefAutoSetStyle") -StepsTypeX=-20 -StepsTypeY=7 -StepsTypeOnCommand=zoom,0.45 - -[StepsDisplayEvaluation] -Fallback="StepsDisplay" +[SoundEffectControl_Pitch] [StepsDisplayListRow] # @@ -680,11 +498,6 @@ AutogenY=0 AutogenOnCommand=blend,Blend.Add;diffuseshift;effectcolor1,color("#FFCC00FF");effectcolor2,color("#FFCC0088"); AutogenSetCommand= # -ShowStepsType=GetGamePrefB("AutoSetStyle") -# ShowStepsType=GetUserPrefB("UserPrefAutoSetStyle") -StepsTypeX=-64-8 -StepsTypeY=0 -StepsTypeOnCommand= StepsTypeSetCommand= [StreamDisplay] @@ -717,6 +530,40 @@ TextureCoordScaleX=1 NumPills=1 AlwaysBounceNormalBar=false +[StepsDisplayEvaluation] +Fallback="StepsDisplay" + +[SongMeterDisplay] +StreamWidth=380 + +ContainerX= +ContainerY= +ContainerOnCommand= +ContainerOffCommand= + +FrameX=0 +FrameY=0 +FrameOnCommand=sleep,2;linear,0.25;diffuse,Color("Orange");glow,1,1,1,0.5;decelerate,0.6;glow,1,1,1,0 +FrameOffCommand= + +StreamX=0 +StreamY=0 +StreamOnCommand=0 +StreamOffCommand=0 + +TipX=0 +TipY=0 +TipOnCommand= +TipOffCommand= + +[SongMeterDisplayP1] +Fallback="SongMeterDisplay" +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,0.5;decelerate,0.6;glow,1,1,1,0 + [TextBanner] TitleOnCommand=horizalign,left;shadowlength,1; SubtitleOnCommand=horizalign,left;shadowlength,1; @@ -724,12 +571,28 @@ ArtistOnCommand=horizalign,left;shadowlength,1;skewx,-0.2 ArtistPrependString="" AfterSetCommand=%TextBannerAfterSet +[WheelNotifyIcon] + +# 04 # +[Screen] + +[ScreenDebugOverlay] + [ScreenSystemLayer] CreditsP1OnCommand=horizalign,left;vertalign,bottom;zoom,0.675;shadowlength,1;diffusebottomedge,PlayerColor(PLAYER_1); CreditsP1OffCommand= # CreditsP2OnCommand=horizalign,right;vertalign,bottom;zoom,0.675;shadowlength,1;diffusebottomedge,PlayerColor(PLAYER_2); CreditsP2OffCommand= + +[ScreenConsoleOverlay] + +[ScreenInstallOverlay] + +[ScreenSyncOverlay] + +[ScreenStatsOverlay] + [ScreenWithMenuElements] WaitForChildrenBeforeTweening=true @@ -780,84 +643,14 @@ ArcadeOverlay.TextX=SCREEN_CENTER_X ArcadeOverlay.TextY=SCREEN_BOTTOM-48 ArcadeOverlay.TextOnCommand= ArcadeOverlay.TextOffCommand= + [ScreenWithMenuElementsBlank] ShowHeader=false ShowFooter=false -[ScreenOptions] -DisqualifyP1X=SCREEN_CENTER_X-176 -DisqualifyP1Y=SCREEN_BOTTOM-98 -DisqualifyP1OnCommand=draworder,100;zoom,0.5;shadowlength,1;player,PLAYER_1 -DisqualifyP1OffCommand= -DisqualifyP2X=SCREEN_CENTER_X+176 -DisqualifyP2Y=SCREEN_BOTTOM-98 -DisqualifyP2OnCommand=draworder,100;zoom,0.5;shadowlength,1;player,PLAYER_2 -DisqualifyP2OffCommand= +[ScreenSelectMaster] -ContainerOnCommand=x,-SCREEN_WIDTH;decelerate,0.35;x,SCREEN_LEFT -# PageOnCommand=fadetop,0.125;fadebottom,0.125;cropbottom,0.5;croptop,0.5;decelerate,0.25;croptop,0;cropbottom,0;fadetop,0;fadebottom,0; -CursorOnCommand= - -LineHighlightOnCommand=cropleft,0.1;cropright,0.1;zoomx,1.25;fadeleft,0.05;faderight,0.05;diffuseshift;effectcolor2,color("1,1,1,0.5");effectcolor1,color("1,1,1,0.25");effectclock,'beat' -LineHighlightChangeCommand=linear,0.1;diffuse,Color("White");diffuseshift;effectcolor2,color("1,1,1,0.5");effectcolor1,color("1,1,1,0.25") -LineHighlightChangeToExitCommand=linear,0.1;diffuse,Color("Red");diffuseshift;effectcolor2,color("1,0,0,0.5");effectcolor1,color("1,0,0,0.25") - -[ScreenMiniMenu] -HeaderX=SCREEN_CENTER_X -HeaderY=SCREEN_TOP -HeaderOnCommand=draworder,100;visible,false -HeaderOffCommand= - -LineHighlightOnCommand=cropleft,0.1;cropright,0.1;zoomx,1.3;fadeleft,0.25;faderight,0.25;diffusealpha,0.375 -LineHighlightChangeCommand= -LineHighlightChangeToExitCommand= - -[ScreenMiniMenuContext] -PageOnCommand=visible,false -LineHighlightX=SCREEN_CENTER_X/2 - -TitleX=SCREEN_CENTER_X -TitleOnCommand=shadowlength,1; -ItemsStartX=SCREEN_CENTER_X -ItemsEndX=SCREEN_CENTER_X -ItemsGapX=14 -ItemsLongRowP1X=SCREEN_CENTER_X -ItemsLongRowP2X=SCREEN_CENTER_X -ItemsLongRowSharedX=SCREEN_CENTER_X - -[ScreenOptionsTheme] -Fallback="ScreenOptionsServiceChild" -NextScreen="ScreenOptionsExtended" -PrevScreen="ScreenOptionsExtended" -LineNames="gNotePos,gAuto,gScore,gSScore,gSDisp,gOpts,gLongFail,gComboUnderField,FlashyCombo,GameplayFooter" -LinegNotePos="lua,UserPrefNotePosition()" -LinegScore="lua,UserPrefGameplayShowScore()" -LinegSScore="lua,UserPrefSpecialScoringMode()" -LinegSDisp="lua,UserPrefGameplayShowStepsDisplay()" -LinegOpts="lua,UserPrefShowLotsaOptions()" -LinegAuto="lua,UserPrefAutoSetStyle()" -LinegLongFail="lua,UserPrefLongFail()" -LinegComboUnderField="lua,UserPrefComboUnderField()" -LineFlashyCombo="lua,UserPrefFlashyCombo()" -LineGameplayFooter="lua,UserPrefGameplayFooter()" -[ScreenOptionsSystemDirection] -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()" -[ScreenOptionsAdvanced] -LineNames="2,3,4,8,11,13,14,15,16,28,29,30,RollCombo" -LineRollCombo="lua,UserPrefComboOnRolls()" -[ScreenOptionsService] -ShowHeader=false - -# ScreenOptionsSystemDirection" - -NumRowsShown=14 -RowPositionTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:y(SCREEN_CENTER_Y-170+24*offsetFromCenter) end - -SeparateExitRow=false -SeparateExitRowY=SCREEN_BOTTOM-40 +[ScreenSelectMasterBlank] [ScreenTextEntry] QuestionOnCommand=diffuse,Color("Orange");diffusetopedge,BoostColor(Color("Orange"),1.5);wrapwidthpixels,600 @@ -934,25 +727,15 @@ DefaultChoice="1" #ChoiceSetup="text,Setup" ChoiceSetup="screen,ScreenQuickSetupOverview;text,Setup" -[ScreenQuickSetupOverview] -IconStartX=SCREEN_CENTER_X-160 -IconStartY=SCREEN_BOTTOM-60 -IconSetX=SCREEN_CENTER_X-160 -IconSetY=SCREEN_BOTTOM-60 -IconBackX=SCREEN_CENTER_X+160 -IconBackY=SCREEN_BOTTOM-60 - -ExplanationX=SCREEN_CENTER_X -ExplanationY=SCREEN_BOTTOM-100 -ExplanationOnCommand=shadowlength,1;zoom,0.75;maxwidth,SCREEN_WIDTH/0.75; -ExplanationOffCommand= [ScreenProfileLoad] # ShowHeader=true ShowFooter=true ShowHelp=true + [ScreenSelectProfile] WaitForChildrenBeforeTweening=true + [ScreenSelectStyle] UpdateOnMesage="" # @@ -1106,6 +889,23 @@ IconChoiceEndlessY=SCREEN_BOTTOM-88 IconChoiceEndlessOnCommand=zoom,0;bounceend,0.35;zoom,0.8 IconChoiceEndlessOffCommand=linear,0.1175;zoomx,0 +[ScreenQuickSetupOverview] +IconStartX=SCREEN_CENTER_X-160 +IconStartY=SCREEN_BOTTOM-60 +IconSetX=SCREEN_CENTER_X-160 +IconSetY=SCREEN_BOTTOM-60 +IconBackX=SCREEN_CENTER_X+160 +IconBackY=SCREEN_BOTTOM-60 + +ExplanationX=SCREEN_CENTER_X +ExplanationY=SCREEN_BOTTOM-100 +ExplanationOnCommand=shadowlength,1;zoom,0.75;maxwidth,SCREEN_WIDTH/0.75; +ExplanationOffCommand= + +[ScreenSelectCharacter] + +[ScreenGameInformation] + [ScreenSelectMusic] UsePlayerSelectMenu=false # OptionsMenuAvailable=(getenv(sMode) ~= Oni) @@ -1320,6 +1120,7 @@ PercentScoreP2X=SCREEN_CENTER_X+240-1 PercentScoreP2Y=SCREEN_BOTTOM-60 PercentScoreP2OnCommand=player,PLAYER_2;addy,SCREEN_CENTER_Y;decelerate,0.35;addy,-SCREEN_CENTER_Y PercentScoreP2OffCommand=bouncebegin,0.15;zoomx,0; + [ScreenSelectCourse] #~ ScreenInitCommand=%function(self) \ #~ GAMESTATE:ApplyGameCommand("sort,AllCourses",PLAYER_1); \ @@ -1339,39 +1140,288 @@ ShowPaneDisplayFrameP1=false ShowPaneDisplayTextP1=false ShowPaneDisplayFrameP2=false ShowPaneDisplayTextP2=false -[ScreenNetSelectMusic] -StepsDisplayP1X=SCREEN_CENTER_X-240 -StepsDisplayP1Y=SCREEN_CENTER_Y+185 -StepsDisplayP1OnCommand=horizalign,right;zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,1.0;zoomx,1.0 -StepsDisplayP1OffCommand=linear,0.5;zoomx,0.0;zoomy,0.0 -#--# -StepsDisplayP2X=SCREEN_CENTER_X-110 -StepsDisplayP2Y=SCREEN_CENTER_Y+185 -StepsDisplayP2OnCommand=horizalign,right;zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,1.0;zoomx,1.0 -StepsDisplayP2OffCommand=linear,0.5;zoomx,0.0;zoomy,0.0 -#====# -BPMDisplayX=SCREEN_CENTER_X-160-90+2 -BPMDisplayY=SCREEN_CENTER_Y+156 -BPMDisplayOnCommand=finishtweening;horizalign,left;strokecolor,Color("Outline");maxwidth,128;addx,320;zoomx,0;decelerate,0.35;addx,-320;zoomx,1 -BPMDisplayOffCommand=bouncebegin,0.15;zoomx,0; -#--# -ShowBPMLabel=true -BPMLabelX=SCREEN_CENTER_X-160-90 -BPMLabelY=SCREEN_CENTER_Y+156 -BPMLabelOnCommand=horizalign,right;zoom,0.75;strokecolor,Color("Outline");addx,-SCREEN_CENTER_X;decelerate,0.35;addx,SCREEN_CENTER_X -BPMLabelOffCommand=bouncebegin,0.15;zoomx,0; -UsersX=SCREEN_CENTER_X-272 -UsersY=SCREEN_CENTER_Y-172 -UsersDX=40 -UsersAY=16 -UsersOnCommand=draworder,2;zoom,0.75;shadowlength,1 +[CourseCodeDetector] + +[StepsDisplay] +FrameX=0 +FrameY=0 +FrameOnCommand= +FrameLoadCommand=%function(self,param) end; +FrameSetCommand=%function(self,param) \ + if param.CustomDifficulty then \ + self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \ + end; \ +end; # -ShowDifficultyDisplay=true -DifficultyDisplayX=SCREEN_CENTER_X-240+200 -DifficultyDisplayY=SCREEN_CENTER_Y+185 -DifficultyDisplayOnCommand=draworder,105;fov,90;zoom,1;zoomy,0;sleep,0.35;smooth,0.35;zoomy,1 -DifficultyDisplayOffCommand=linear,0.25;zoomy,0; +ShowTicks=false +NumTicks=10 +MaxTicks=14 +TicksX=0 +TicksY=0 +TicksOnCommand=shadowlength,0; +TicksSetCommand=%function(self,param) end; +# +ShowMeter=true +ZeroMeterString="?" +MeterX=56-32 +MeterY=0 +MeterOnCommand=shadowlength,1;textglowmode,'TextGlowMode_Inner' +MeterSetCommand=%function(self,param) \ + if param.CustomDifficulty then \ + self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \ + self:shadowcolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); \ + end; \ + if param.Meter then \ + if param.Meter >= 100 then \ + self:basezoom(0.8); \ + self:glowshift(); \ + elseif param.Meter >= 10 then \ + self:basezoom(1); \ + self:glowshift(); \ + else \ + self:basezoom(1); \ + self:stopeffect(); \ + end; \ + end; \ +end; +# +ShowDescription=true +DescriptionX=-20-32 +DescriptionY=GetGamePrefB("AutoSetStyle") and -5 or 0 +# DescriptionY=GetUserPrefB("UserPrefAutoSetStyle") and -5 or 0 +DescriptionOnCommand=shadowlength,1;uppercase,true;zoom,0.75;maxwidth,128+8 +DescriptionSetCommand=%function(self,param) \ + if self:GetText() == "" then \ + self:settext("Edit"); \ + end; \ + if param.CustomDifficulty then \ + self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \ + self:shadowcolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); \ + end; \ +end; +# +ShowAutogen=false +AutogenX=40-32 +AutogenY=0 +AutogenOnCommand= +AutogenSetCommand=%function(self,param) if param.Difficulty then self:diffuse(CustomDifficultyToLightColor(param.Difficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.Difficulty)); end end +# +ShowStepsType=GetGamePrefB("AutoSetStyle") +# ShowStepsType=GetUserPrefB("UserPrefAutoSetStyle") +StepsTypeX=-20-32 +StepsTypeY=7 +StepsTypeOnCommand=zoom,0.45 + +[StepsDisplayGameplay] +Fallback="StepsDisplay" + +FrameX=0 +FrameY=0 +FrameOnCommand= +FrameLoadCommand=%function(self,param) end; +FrameSetCommand=%function(self,param) \ + if param.CustomDifficulty then \ + self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \ + end; \ +end; +# +ShowTicks=false +NumTicks=10 +MaxTicks=14 +TicksX=0 +TicksY=0 +TicksOnCommand=shadowlength,0; +TicksSetCommand=%function(self,param) end; +# +ShowMeter=true +ZeroMeterString="?" +MeterX=56 +MeterY=0 +MeterOnCommand=shadowlength,1;textglowmode,'TextGlowMode_Inner' +MeterSetCommand=%function(self,param) \ + if param.CustomDifficulty then \ + self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \ + self:shadowcolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); \ + end; \ + if param.Meter then \ + if param.Meter >= 100 then \ + self:zoom(0.8); \ + else \ + self:zoom(1); \ + end; \ + end; \ +end; +# +ShowDescription=true +DescriptionX=-20 +DescriptionY=GetGamePrefB("AutoSetStyle") and -5 or 0 +# DescriptionY=GetUserPrefB("UserPrefAutoSetStyle") and -5 or 0 +DescriptionOnCommand=shadowlength,1;uppercase,true;zoom,0.75;maxwidth,128+8 +DescriptionSetCommand=%function(self,param) \ + if self:GetText() == "" then \ + self:settext("Edit"); \ + end; \ + if param.CustomDifficulty then \ + self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \ + self:shadowcolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); \ + end; \ + (cmd(finishtweening;diffusealpha,0;addx,-4;smooth,0.125;addx,4;diffusealpha,1))(self); \ +end; +# +ShowAutogen=false +AutogenX=40 +AutogenY=0 +AutogenOnCommand= +AutogenSetCommand=%function(self,param) if param.Difficulty then self:diffuse(CustomDifficultyToLightColor(param.Difficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.Difficulty)); end end +# +ShowStepsType=GetGamePrefB("AutoSetStyle") +# ShowStepsType=GetUserPrefB("UserPrefAutoSetStyle") +StepsTypeX=-20 +StepsTypeY=7 +StepsTypeOnCommand=zoom,0.45 + +[ScreenStageInformation] +ForceTimer=true +TimerOnCommand=visible,false +TimerSeconds=3 +# +WaitForChildrenBeforeTweening=true + +[ScreenOptions] +DisqualifyP1X=SCREEN_CENTER_X-176 +DisqualifyP1Y=SCREEN_BOTTOM-98 +DisqualifyP1OnCommand=draworder,100;zoom,0.5;shadowlength,1;player,PLAYER_1 +DisqualifyP1OffCommand= +DisqualifyP2X=SCREEN_CENTER_X+176 +DisqualifyP2Y=SCREEN_BOTTOM-98 +DisqualifyP2OnCommand=draworder,100;zoom,0.5;shadowlength,1;player,PLAYER_2 +DisqualifyP2OffCommand= + +ContainerOnCommand=x,-SCREEN_WIDTH;decelerate,0.35;x,SCREEN_LEFT +# PageOnCommand=fadetop,0.125;fadebottom,0.125;cropbottom,0.5;croptop,0.5;decelerate,0.25;croptop,0;cropbottom,0;fadetop,0;fadebottom,0; +CursorOnCommand= + +LineHighlightOnCommand=cropleft,0.1;cropright,0.1;zoomx,1.25;fadeleft,0.05;faderight,0.05;diffuseshift;effectcolor2,color("1,1,1,0.5");effectcolor1,color("1,1,1,0.25");effectclock,'beat' +LineHighlightChangeCommand=linear,0.1;diffuse,Color("White");diffuseshift;effectcolor2,color("1,1,1,0.5");effectcolor1,color("1,1,1,0.25") +LineHighlightChangeToExitCommand=linear,0.1;diffuse,Color("Red");diffuseshift;effectcolor2,color("1,0,0,0.5");effectcolor1,color("1,0,0,0.25") + +[ScreenOptionsMaster] + +[ScreenOptionsSimple] + +[ScreenOptionsSimpleService] + +[ScreenOptionsService] +ShowHeader=false + +# ScreenOptionsSystemDirection" + +NumRowsShown=14 +RowPositionTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:y(SCREEN_CENTER_Y-170+24*offsetFromCenter) end + +SeparateExitRow=false +SeparateExitRowY=SCREEN_BOTTOM-40 + +[ScreenOptionsExtended] + +[ScreenOptionsServiceChild] + +[ScreenOptionsServiceExtendedChild] + +[ScreenMiniMenu] +HeaderX=SCREEN_CENTER_X +HeaderY=SCREEN_TOP +HeaderOnCommand=draworder,100;visible,false +HeaderOffCommand= + +LineHighlightOnCommand=cropleft,0.1;cropright,0.1;zoomx,1.3;fadeleft,0.25;faderight,0.25;diffusealpha,0.375 +LineHighlightChangeCommand= +LineHighlightChangeToExitCommand= + +[OptionRowMiniMenu] +Fallback="OptionRow" + +TitleX=SCREEN_CENTER_X-320+48 +TitleOnCommand=horizalign,left;shadowlength,0;uppercase,true;zoom,0.6375;strokecolor,Color("Black"); +#~ TitleGainFocusCommand= +#~ TitleLoseFocusCommand= + +ColorSelected=color("1,1,1,1") +ColorNotSelected=color("0.9,0.9,0.9,1") +ColorDisabled=color("0.5,0.5,0.5,1") + +ItemOnCommand=zoom,0.6375 +ItemsLongRowP1X=SCREEN_CENTER_X-240 +ItemsLongRowP2X=SCREEN_CENTER_X+240 +ItemsLongRowSharedX=SCREEN_CENTER_X+200 + +[ScreenMiniMenuContext] +PageOnCommand=visible,false +LineHighlightX=SCREEN_CENTER_X/2 + +TitleX=SCREEN_CENTER_X +TitleOnCommand=shadowlength,1; +ItemsStartX=SCREEN_CENTER_X +ItemsEndX=SCREEN_CENTER_X +ItemsGapX=14 +ItemsLongRowP1X=SCREEN_CENTER_X +ItemsLongRowP2X=SCREEN_CENTER_X +ItemsLongRowSharedX=SCREEN_CENTER_X + +[OptionRowMiniMenuContext] +Fallback="OptionRowMiniMenu" + +[ScreenMapControllers] + +[ScreenTestInput] + +[ScreenOptionsSystemDirection] +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()" + +[ScreenOptionsGraphicsSound] + +[ScreenOptionsAdvanced] +LineNames="2,3,4,8,11,13,14,15,16,28,29,30,RollCombo" +LineRollCombo="lua,UserPrefComboOnRolls()" + +[ScreenAppearanceOptions] + +[ScreenOptionsUI] + +[ScreenOptionsInput] + +[ScreenOptionsArcade] + +[ScreenOptionsTheme] +Fallback="ScreenOptionsServiceChild" +NextScreen="ScreenOptionsExtended" +PrevScreen="ScreenOptionsExtended" +LineNames="gNotePos,gAuto,gScore,gSScore,gSDisp,gOpts,gLongFail,gComboUnderField,FlashyCombo,GameplayFooter" +LinegNotePos="lua,UserPrefNotePosition()" +LinegScore="lua,UserPrefGameplayShowScore()" +LinegSScore="lua,UserPrefSpecialScoringMode()" +LinegSDisp="lua,UserPrefGameplayShowStepsDisplay()" +LinegOpts="lua,UserPrefShowLotsaOptions()" +LinegAuto="lua,UserPrefAutoSetStyle()" +LinegLongFail="lua,UserPrefLongFail()" +LinegComboUnderField="lua,UserPrefComboUnderField()" +LineFlashyCombo="lua,UserPrefFlashyCombo()" +LineGameplayFooter="lua,UserPrefGameplayFooter()" + +[ScreenSelectGame] + +[ScreenNetworkOptions] + +[ScreenOptionsManageProfiles] + +[ScreenOptionsEditProfile] + +[ScreenReloadSongs] + [ScreenPlayerOptions] LineNames=GetDefaultOptionLines() #~ LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17" @@ -1395,15 +1445,18 @@ Line15="list,ScoreDisplay" Line16="list,Steps" Line17="lua,OptionRowProTiming()" Line18="list,Characters" -[ScreenEditOptions] -Line1="lua,SpeedMods()" -[ScreenStageInformation] -ForceTimer=true -TimerOnCommand=visible,false -TimerSeconds=3 -# -WaitForChildrenBeforeTweening=true +[ScreenPlayerOptionsRestricted] + +[ScreenSongOptions] + +[ScreenExit] + +[ScreenAttract] + +[ScreenRanking] + +# 05 # C [ScreenGameplay] ShowLifeMeterForDisabledPlayers=false # @@ -1589,15 +1642,7 @@ LyricDisplaySetReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-140 LyricDisplaySetOneReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-160; LyricDisplayDefaultColor=Color("White") -[ScreenGameplaySyncMachine] -SongMeterDisplayP1OnCommand=visible,false -SongMeterDisplayP2OnCommand=visible,false -StepsDescriptionP1OnCommand=visible,false -StepsDescriptionP2OnCommand=visible,false -StepsDisplayP1OnCommand=visible,false -StepsDisplayP2OnCommand=visible,false -PlayerOptionsP1OnCommand=visible,false -PlayerOptionsP2OnCommand=visible,false +[ScreenGameplayShared] [ScreenEvaluation] Class="ScreenEvaluation" @@ -1925,6 +1970,7 @@ SongInformationX=SCREEN_CENTER_X SongInformationY=SCREEN_TOP+100 SongInformationOnCommand=playcommand,"Set";draworder,105 SongInformationOffCommand= + [ScreenEvaluationNormal] Fallback="ScreenEvaluation" # @@ -1979,6 +2025,186 @@ SmallBanner6Y=SCREEN_TOP+100+24 SmallBanner6OnCommand=zoom,0.5 SmallBanner6OffCommand= +[ScreenProfileSave] + +[ScreenProfileSaveSummary] + +[ScreenGameOver] + +[ScreenPrompt] + +[ScreenOptionsEdit] + +[EditMenu] + +[TextBannerEditMode] + +[ScreenEditMenu] + +[ScreenEdit] + +[ScreenPracticeMenu] + +[PracticeMenu] + +[ScreenPractice] + +[ScreenEditOptions] +Line1="lua,SpeedMods()" + +[StepsDisplayEdit] +Fallback="StepsDisplayGameplay" + +[ScreenMiniMenuEditHelp] + +[OptionRowMiniMenuEditHelp] + +[ScreenMiniMenuMainMenu] + +[ScreenMiniMenuAreaMenu] + +[ScreenMiniMenuStepsInformation] + +[ScreenMiniMenuTimingDataInformation] + +[ScreenMiniMenuBackgroundChange] + +[ScreenMiniMenuPreferences] + +[ScreenMiniMenuInsertTapAttack] + +[ScreenMiniMenuInsertCourseAttack] + +[ScreenMiniMenuCourseDisplay] + +[ScreenMiniMenuCourseOptions] + +# Export Packages +[ScreenOptionsExportPackage] + +[ScreenOptionsManage] + +[OptionRowManage] + +# Manage Courses +[OptionRowCourseOverview] + +[ScreenOptionsManageCourses] + +[OptionRowCourse] + +[ScreenOptionsEditCourse] + +[OptionRowEditCourse] + +[ScreenOptionsCourseOverview] + +# visual/interactive syncing +[ScreenGameplaySyncMachine] +SongMeterDisplayP1OnCommand=visible,false +SongMeterDisplayP2OnCommand=visible,false +StepsDescriptionP1OnCommand=visible,false +StepsDescriptionP2OnCommand=visible,false +StepsDisplayP1OnCommand=visible,false +StepsDisplayP2OnCommand=visible,false +PlayerOptionsP1OnCommand=visible,false +PlayerOptionsP2OnCommand=visible,false + +[PlayerSyncMachine] + +# sm-ssc helper screens +[ScreenHowToInstallSongs] +Class="ScreenSelectMaster" +Fallback="ScreenSelectMaster" +ShowHeader=false + +ShowScroller=true +PerChoiceScrollElement=false +# +ShowIcon=true +UseIconMetrics=false +PerChoiceIconElement=false +# +ScrollerX=SCREEN_LEFT+32 +ScrollerY=SCREEN_CENTER_Y +ScrollerTransform=function(self,offset,itemIndex,numItems) self:y(24*(itemIndex-(numItems-1)/2)); end +ScrollerNumItemsToDraw=20 +ScrollerOffCommand=bouncebegin,0.25;addx,-SCREEN_CENTER_X + +ChoiceNames="WhereToFind,HowToInstall,AdditionalFolders,ReloadSongs,Exit" +ChoiceWhereToFind="urlnoexit,http://code.google.com/p/sm-ssc/wiki/FindingContent;text,"..Screen.String("Finding Songs") +ChoiceHowToInstall="urlnoexit,http://code.google.com/p/sm-ssc/wiki/InstallingContent;text,"..Screen.String("Installing Songs") +ChoiceAdditionalFolders="text,"..Screen.String("Importing Songs") +ChoiceReloadSongs="screen,ScreenReloadSongs;text,"..Screen.String("Reload Songs") +ChoiceExit="screen,"..Branch.TitleMenu()..";text,"..Screen.String("Exit") +DefaultChoice="WhereToFind" + +OptionOrderUp="5:4,4:3,3:2,2:1,1:5" +OptionOrderDown="1:2,2:3,3:4,4:5,5:1" + +# stuff for online mode: +[ScreenSMOnlineLogin] + +[ScreenNetSelectBase] + +[ScreenNetSelectMusic] +StepsDisplayP1X=SCREEN_CENTER_X-240 +StepsDisplayP1Y=SCREEN_CENTER_Y+185 +StepsDisplayP1OnCommand=horizalign,right;zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,1.0;zoomx,1.0 +StepsDisplayP1OffCommand=linear,0.5;zoomx,0.0;zoomy,0.0 +#--# +StepsDisplayP2X=SCREEN_CENTER_X-110 +StepsDisplayP2Y=SCREEN_CENTER_Y+185 +StepsDisplayP2OnCommand=horizalign,right;zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,1.0;zoomx,1.0 +StepsDisplayP2OffCommand=linear,0.5;zoomx,0.0;zoomy,0.0 +#====# +BPMDisplayX=SCREEN_CENTER_X-160-90+2 +BPMDisplayY=SCREEN_CENTER_Y+156 +BPMDisplayOnCommand=finishtweening;horizalign,left;strokecolor,Color("Outline");maxwidth,128;addx,320;zoomx,0;decelerate,0.35;addx,-320;zoomx,1 +BPMDisplayOffCommand=bouncebegin,0.15;zoomx,0; +#--# +ShowBPMLabel=true +BPMLabelX=SCREEN_CENTER_X-160-90 +BPMLabelY=SCREEN_CENTER_Y+156 +BPMLabelOnCommand=horizalign,right;zoom,0.75;strokecolor,Color("Outline");addx,-SCREEN_CENTER_X;decelerate,0.35;addx,SCREEN_CENTER_X +BPMLabelOffCommand=bouncebegin,0.15;zoomx,0; + +UsersX=SCREEN_CENTER_X-272 +UsersY=SCREEN_CENTER_Y-172 +UsersDX=40 +UsersAY=16 +UsersOnCommand=draworder,2;zoom,0.75;shadowlength,1 +# +ShowDifficultyDisplay=true +DifficultyDisplayX=SCREEN_CENTER_X-240+200 +DifficultyDisplayY=SCREEN_CENTER_Y+185 +DifficultyDisplayOnCommand=draworder,105;fov,90;zoom,1;zoomy,0;sleep,0.35;smooth,0.35;zoomy,1 +DifficultyDisplayOffCommand=linear,0.25;zoomy,0; + +[ScreenDisplayNet] + +[ScreenNetRoom] + +[RoomWheel] + +[RoomWheelItem] + +[RoomInfoDisplay] + +[ScreenSMOnlineSelectMusic] + +[ModIcon] + +[ModIconSelectMusic] + +[ModIconRow] + +[ModIconRowSelectMusic] + +[GraphDisplay] + +[ComboGraph] + [ScreenNetEvaluation] UserTier02OrBetterCommand=diffuseshift;effectperiod,0.75;effectcolor1,color("1,0.95,0.8,1");effectcolor2,color("0.8,0.95,1,1") @@ -1993,6 +2219,9 @@ LogoOffCommand=stopeffect;bouncebegin,0.35;zoom,0 ArcadeOverlay.TextY=SCREEN_BOTTOM-60 # + +[ScreenHowToPlay] + [ScreenTitleJoin] ShowHelp=false HelpText=Screen.String("HelpTextTitleJoin") @@ -2037,53 +2266,6 @@ ShowBPMDisplay=false # PlayMusic=false -# sm-ssc helper screens -[ScreenHowToInstallSongs] -Class="ScreenSelectMaster" -Fallback="ScreenSelectMaster" -ShowHeader=false +[ScreenJukeboxMenu] -ShowScroller=true -PerChoiceScrollElement=false -# -ShowIcon=true -UseIconMetrics=false -PerChoiceIconElement=false -# -ScrollerX=SCREEN_LEFT+32 -ScrollerY=SCREEN_CENTER_Y -ScrollerTransform=function(self,offset,itemIndex,numItems) self:y(24*(itemIndex-(numItems-1)/2)); end -ScrollerNumItemsToDraw=20 -ScrollerOffCommand=bouncebegin,0.25;addx,-SCREEN_CENTER_X - -ChoiceNames="WhereToFind,HowToInstall,AdditionalFolders,ReloadSongs,Exit" -ChoiceWhereToFind="urlnoexit,http://code.google.com/p/sm-ssc/wiki/FindingContent;text,"..Screen.String("Finding Songs") -ChoiceHowToInstall="urlnoexit,http://code.google.com/p/sm-ssc/wiki/InstallingContent;text,"..Screen.String("Installing Songs") -ChoiceAdditionalFolders="text,"..Screen.String("Importing Songs") -ChoiceReloadSongs="screen,ScreenReloadSongs;text,"..Screen.String("Reload Songs") -ChoiceExit="screen,"..Branch.TitleMenu()..";text,"..Screen.String("Exit") -DefaultChoice="WhereToFind" - -OptionOrderUp="5:4,4:3,3:2,2:1,1:5" -OptionOrderDown="1:2,2:3,3:4,4:5,5:1" -[CustomScoring] -# So special scoring works properly, we zero this out -ComboAboveThresholdAddsToScoreBonus=0 -ComboScoreBonusThreshold=0 -ComboScoreBonusValue=0 -ComboMultiplier=0 -DoubleNoteScoreMultiplier=0 -TripleNoteScoreMultiplier=0 -QuadOrHigherNoteScoreMultiplier=0 -PointsW1=0 -PointsW2=0 -PointsW3=0 -PointsW4=0 -PointsW5=0 -PointsMiss=0 -PointsHitMine=0 -PointsCheckpointHit=0 -PointsCheckpointMiss=0 -PointsNone=0 -PointsHoldHeld=0 -PointsHoldLetGo=0 +[ScreenJukebox] From 594bbbd2bc6cb2214b4e0f23e4dffcb98cbcd6ef Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 3 Apr 2011 15:35:01 -0500 Subject: [PATCH 10/28] scroll wheel is an axis, remove comment --- src/arch/InputHandler/InputHandler_DirectInputHelper.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/arch/InputHandler/InputHandler_DirectInputHelper.cpp b/src/arch/InputHandler/InputHandler_DirectInputHelper.cpp index 6699b16910..a493502baf 100644 --- a/src/arch/InputHandler/InputHandler_DirectInputHelper.cpp +++ b/src/arch/InputHandler/InputHandler_DirectInputHelper.cpp @@ -331,7 +331,6 @@ static BOOL CALLBACK DIMouse_EnumDevObjectsProc(LPCDIDEVICEOBJECTINSTANCE dev, L in.ofs = dev->dwOfs; - // xxx: does this check for scrollwheels? -aj if(dev->dwType & DIDFT_BUTTON) { in.type = in.BUTTON; From 60c86c4b99f372a84eb63ce4abf24a8604f18764 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 3 Apr 2011 15:38:25 -0500 Subject: [PATCH 11/28] slight update to comments in here --- src/tests/test_timing_data.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tests/test_timing_data.cpp b/src/tests/test_timing_data.cpp index 06118d6fc9..de995caab9 100644 --- a/src/tests/test_timing_data.cpp +++ b/src/tests/test_timing_data.cpp @@ -101,7 +101,7 @@ void run() CHECK( test.GetElapsedTimeFromBeat(15.0f), 14.5f ); // stopped CHECK( test.GetElapsedTimeFromBeat(16), 20.0f ); - /* todo: add warp tests once the warp code is done */ + // todo: add warp tests -aj RageTimer foobar; /* We can look up the time of any given beat, then look up the beat of that @@ -124,10 +124,10 @@ int q = 0; } LOG->Trace("... %i in %f", q, foobar.GetDeltaTime()); - // todo: add warp segments TimingData test2; test2.AddBPMSegment( BPMSegment(0, 60) ); test2.AddStopSegment( StopSegment(0, 1) ); + //test2.AddWarpSegment( WarpSegment() ); CHECK( test2.GetBeatFromElapsedTime(-1), -1.0f ); CHECK( test2.GetBeatFromElapsedTime(0), 0.0f ); CHECK( test2.GetBeatFromElapsedTime(1), 0.0f ); From d466870e5de384035294b46e307c9a80eaaa51e6 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 3 Apr 2011 16:00:23 -0500 Subject: [PATCH 12/28] remove comments that aren't really needed --- src/RoomWheel.cpp | 1 - src/ScreenEdit.cpp | 7 ------- 2 files changed, 8 deletions(-) diff --git a/src/RoomWheel.cpp b/src/RoomWheel.cpp index 9678d3701f..0541b90b4e 100644 --- a/src/RoomWheel.cpp +++ b/src/RoomWheel.cpp @@ -151,7 +151,6 @@ bool RoomWheel::Select() { // Since this is not actually an option outside of this wheel, NULL is a good idea. m_LastSelection = NULL; - // todo: Call a screen with class ScreenTextEntry instead. -aj ScreenTextEntry::TextEntry( SM_BackFromRoomName, ENTER_ROOM_NAME, "", 255 ); } return false; diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp index 30d900fa2b..b315b74098 100644 --- a/src/ScreenEdit.cpp +++ b/src/ScreenEdit.cpp @@ -3531,7 +3531,6 @@ void ScreenEdit::HandleStepsInformationChoice( StepsInformationChoice c, const v switch( c ) { case description: - // todo: Call a screen with class ScreenTextEntry instead. -aj ScreenTextEntry::TextEntry( SM_None, ENTER_NEW_DESCRIPTION, @@ -3580,8 +3579,6 @@ void ScreenEdit::HandleSongInformationChoice( SongInformationChoice c, const vec { Song* pSong = GAMESTATE->m_pCurSong; - // todo: Call a screen with class ScreenTextEntry instead. - // multiple times in this section, so I'm only saying it here. -aj switch( c ) { DEFAULT_FAIL(c); @@ -3628,7 +3625,6 @@ void ScreenEdit::HandleTimingDataInformationChoice( TimingDataInformationChoice { DEFAULT_FAIL( c ); case bpm: - // todo: Call a screen with class ScreenTextEntry instead. -aj ScreenTextEntry::TextEntry( SM_BackFromBPMChange, ENTER_BPM_VALUE, @@ -3637,7 +3633,6 @@ void ScreenEdit::HandleTimingDataInformationChoice( TimingDataInformationChoice ); break; case stop: - // todo: Call a screen with class ScreenTextEntry instead. -aj ScreenTextEntry::TextEntry( SM_BackFromStopChange, ENTER_STOP_VALUE, @@ -3646,7 +3641,6 @@ void ScreenEdit::HandleTimingDataInformationChoice( TimingDataInformationChoice ); break; case delay: - // todo: Call a screen with class ScreenTextEntry instead. -aj ScreenTextEntry::TextEntry( SM_BackFromDelayChange, ENTER_DELAY_VALUE, @@ -3687,7 +3681,6 @@ void ScreenEdit::HandleTimingDataInformationChoice( TimingDataInformationChoice ); break; case warp: - // todo: Call a screen with class ScreenTextEntry instead. -aj ScreenTextEntry::TextEntry( SM_BackFromWarpChange, ENTER_WARP_VALUE, From 6a458cc83627e50ce846bf6df11805c3451145d9 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 3 Apr 2011 16:00:46 -0500 Subject: [PATCH 13/28] small comment changes --- src/ScreenSelectMusic.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/ScreenSelectMusic.cpp b/src/ScreenSelectMusic.cpp index a7335d68ba..14cb6bf61c 100644 --- a/src/ScreenSelectMusic.cpp +++ b/src/ScreenSelectMusic.cpp @@ -485,7 +485,7 @@ void ScreenSelectMusic::Input( const InputEventPlus &input ) m_bStepsChosen[input.pn] ) return; // ignore - // todo: use mousewheel to scroll MusicWheel -aj + // todo: Allow mousewheel to scroll MusicWheel -aj if( USE_PLAYER_SELECT_MENU ) { @@ -1528,9 +1528,8 @@ void ScreenSelectMusic::AfterStepsOrTrailChange( const vector &vpn } else { - // I don't like how numbers just stay up there if the current - // selection is NULL. - // todo: Let themers set the text instead of just using 0. -aj + // The numbers shouldn't stay if the current selection is NULL. + // todo: Let themers set the text value instead of just using 0. -aj m_textHighScore[pn].SetText( ssprintf("%*i", NUM_SCORE_DIGITS, 0) ); } } From 6e56c0e7f526f45dcaa52b6ad8a6e59c0d3bec2a Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 3 Apr 2011 16:01:08 -0500 Subject: [PATCH 14/28] change the todo comment here to something more concrete --- src/ScreenSelectMaster.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ScreenSelectMaster.cpp b/src/ScreenSelectMaster.cpp index 03b8058b30..3d76c7cdfa 100644 --- a/src/ScreenSelectMaster.cpp +++ b/src/ScreenSelectMaster.cpp @@ -809,8 +809,7 @@ void ScreenSelectMaster::MenuStart( const InputEventPlus &input ) mc.ApplyToAllPlayers(); // We want to be able to broadcast a Start message to the theme, in // case a themer wants to handle something. -aj - // TODO: Find a way to differentiate this from the message below, for - // less ambiguousness? + // TODO: Add a param to differentiate this from the message below. MESSAGEMAN->Broadcast( (MessageID)(Message_MenuStartP1+pn) ); return; } From 30b04b3180ea52be58bc2f02821aa8fb0436b4c3 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 3 Apr 2011 16:01:45 -0500 Subject: [PATCH 15/28] refer to ScreenOptionsToggleSongs for ScreenOptionsExportPackage restructuring --- src/ScreenOptionsExportPackage.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ScreenOptionsExportPackage.cpp b/src/ScreenOptionsExportPackage.cpp index 6bbdf66f2d..eda77e4ac9 100644 --- a/src/ScreenOptionsExportPackage.cpp +++ b/src/ScreenOptionsExportPackage.cpp @@ -25,8 +25,8 @@ void ScreenOptionsExportPackage::Init() void ScreenOptionsExportPackage::BeginScreen() { // Fill m_vsPossibleDirsToExport - // todo: split these out over multiple screens so the scroller - // isn't so overloaded. -freem + // todo: Split these out over multiple screens so the scroller + // isn't so overloaded. (See ScreenOptionsToggleSongs) -freem { // Add themes { From 48bbb4e2526e70e6d64c09febfb35099f1956480 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 3 Apr 2011 17:46:08 -0400 Subject: [PATCH 16/28] [metricClean] Fix Combo metrics. --- Themes/default/metrics.ini | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 1fdca10835..0df3e9d818 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -23,8 +23,6 @@ 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 [UnlockManager] @@ -53,6 +51,12 @@ MeterHeight=40 [Combo] ShowComboAt=2 +LabelMaxZoom=0.75*1 + +PulseCommand=%function(self,param) self:finishtweening(); self:diffusealpha(1); self:zoom(1.125*param.Zoom); self:linear(0.05); self:zoom(param.Zoom); self:sleep(2); self:linear(0.5); self:diffusealpha(0); end; +PulseLabelCommand=%function(self,param) self:finishtweening(); self:diffusealpha(1); self:zoom(1.075*param.LabelZoom); self:linear(0.05); self:zoom(param.LabelZoom); self:sleep(2); self:linear(0.5); self:diffusealpha(0); end; +NumberOnCommand=y,240-216-1.5;shadowlength,1;horizalign,right;vertalign,bottom;skewx,-0.125; +LabelOnCommand=x,6;y,22.5;shadowlength,1;zoom,0.75;diffusebottomedge,color("0.75,0.75,0.75,1");horizalign,left;vertalign,bottom [HoldJudgment] 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 @@ -61,18 +65,6 @@ HoldJudgmentHeldCommand=finishtweening;shadowlength,0;diffusealpha,1;zoom,1.25;l [HelpDisplay] TipShowTime=7 - -NumberMinZoom=0.8 -NumberMaxZoom=1 -NumberMaxZoomAt=100 -LabelMinZoom=0.75*0.75 -LabelMaxZoom=0.75*1 - -PulseCommand=%function(self,param) self:finishtweening(); self:diffusealpha(1); self:zoom(1.125*param.Zoom); self:linear(0.05); self:zoom(param.Zoom); self:sleep(2); self:linear(0.5); self:diffusealpha(0); end; -PulseLabelCommand=%function(self,param) self:finishtweening(); self:diffusealpha(1); self:zoom(1.075*param.LabelZoom); self:linear(0.05); self:zoom(param.LabelZoom); self:sleep(2); self:linear(0.5); self:diffusealpha(0); end; -NumberOnCommand=y,240-216-1.5;shadowlength,1;horizalign,right;vertalign,bottom;skewx,-0.125; -LabelOnCommand=x,6;y,22.5;shadowlength,1;zoom,0.75;diffusebottomedge,color("0.75,0.75,0.75,1");horizalign,left;vertalign,bottom - [Judgment] JudgmentW1Command=finishtweening;shadowlength,0;y,0;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0;glowblink;effectperiod,0.05;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.8 JudgmentW2Command=finishtweening;y,0;shadowlength,0;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 From 3d0c2af473482f0de36eae59b79699ef6a813468 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 3 Apr 2011 18:45:51 -0400 Subject: [PATCH 17/28] [metricClean] more removal of duplicates. I may have removed something in a rush: there are more items on the MusicWheel showing. --- Themes/_fallback/metrics.ini | 2 +- Themes/default/metrics.ini | 250 ++++------------------------------- 2 files changed, 28 insertions(+), 224 deletions(-) diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 56624e357f..f5638d1633 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -342,6 +342,7 @@ TipShowTime=4 TipSwitchTime=1 # The Command when its made TipOnCommand=shadowlength,0;diffuseblink + [Judgment] # New # JudgmentOnCommand= @@ -633,7 +634,6 @@ DancePointsP2Y=0 DancePointsP2OnCommand=zoom,0.7;shadowlength,0;diffuse,PlayerColor(PLAYER_2) DancePointsP2OffCommand= - [LifeMeterTime] # The Lifemeter that shows up when you're playing survival. diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 0df3e9d818..cc5f4b82f9 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -153,13 +153,9 @@ NumLivesP2OnCommand=zoomx,-1 # still asking for this even though it's in fallback... -aj Format= # -DancePointsP2OnCommand=zoom,0.7;zoomx,-0.7;shadowlength,0;diffuse,PlayerColor(PLAYER_2) -DancePointsP2OffCommand= -# -PercentP2X=0 -PercentP2Y=0 PercentP2OnCommand=zoom,0.7;zoomx,-0.7;shadowlength,0;diffuse,PlayerColor(PLAYER_2) -PercentP2OffCommand= +# +DancePointsP2OnCommand=zoom,0.7;zoomx,-0.7;shadowlength,0;diffuse,PlayerColor(PLAYER_2) [LifeMeterTime] @@ -174,10 +170,8 @@ TitleGainFocusCommand=stoptweening;zoom,0.6375*1.125;bounceend,0.2;diffuse,Color TitleLoseFocusCommand=diffuse,Color("White");strokecolor,Color("Black");stopeffect; [OptionRowExit] -Fallback="OptionRow" FrameOnCommand=visible,true;diffuse,Color("Red"); FrameX=SCREEN_CENTER_X -TitleOnCommand=visible,false ItemsMinBaseZoom=1 ItemOnCommand=shadowlength,1;zoom,0.8;diffuse,Color("Red");diffusebottomedge,BoostColor(Color("Red"),0.75);shadowcolor,BoostColor(Color("Red"),0.35) @@ -220,17 +214,14 @@ Text1OnCommand=stopeffect;stoptweening;shadowlength,0;strokecolor,Color("Outline Text1FormatFunction=function(fSeconds) \ return string.format("%0.1f", fSeconds); \ end -FrameOnCommand= Warning10Command=diffuseshift;effectperiod,1;effectcolor2,Color("Red");effectcolor1,color("0.5,0,0,1"); -#~ Warning10Command=%function(self) \ - #~ MESSAGEMAN:Broadcast("TimerWarning"); \ - #~ cmd(diffuseshift;effectperiod,1;effectcolor2,Color("Red");effectcolor1,color("0.5,0,0,1"))(self); \ -#~ end; + +[MenuTimerNoSound] + +[MusicList] [MusicWheel] SwitchSeconds=0.08 -RouletteSwitchSeconds=0.05 -RouletteSlowDownSwitches=5 LockedInitialVelocity=7 ; linear wheel example: ; ItemTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \ @@ -246,21 +237,15 @@ LockedInitialVelocity=7 ; self:z( -100 + WHEEL_3D_RADIUS * math.cos(rotationx_radians) ); \ ; self:rotationx( rotationx_radians * 180/math.pi ); --[[ to degrees end]] \ ; end; -ItemTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:x( (1-math.cos(offsetFromCenter/math.pi))*44 ); self:y( offsetFromCenter*46 ); end -NumWheelItems=11 MusicWheelSortOnCommand=fov,90; MusicWheelSortOffCommand=fov,90; 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=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") -# -NumSectionColors=1 SectionColor1=Color("Orange") # SongRealExtraColor=Color("Red") @@ -302,11 +287,8 @@ SectionCollapsedX=-38 SectionCollapsedY=-2 SectionCollapsedOnCommand=maxwidth,194;shadowlength,1;shadowcolor,color("0.1,0.1,0.1,0.2") SectionCountX=112 -SectionCountY=0 SectionCountOnCommand=zoom,0.75;strokecolor,Color("Outline") # -RouletteX=0 -RouletteY=0 RouletteOnCommand=maxwidth,400;shadowlength,1;zoom,0.75;rainbowscroll,true;thump,2; # SortX=-132 @@ -321,7 +303,6 @@ GradeP1X=106+16 GradeP1Y=-8 GradeP2X=110+16 GradeP2Y=8 -GradesShowMachine=true [NoteField] ShowBoard=GAMESTATE:GetCurrentGame():GetName() == "kb7" @@ -342,15 +323,10 @@ TextOnCommand=shadowlength,1;diffusebottomedge,BoostColor(Color('White'),0.75) TextOffCommand= [ScoreDisplayLifeTime] -FrameX= -FrameY= FrameOnCommand=visible,false;spin -FrameOffCommand= # -TimeRemainingX= TimeRemainingY=80 TimeRemainingOnCommand=zoom,1;shadowlength,1;settext,"Hi!"; -TimeRemainingOffCommand= # DeltaSecondsOnCommand=y,80;settext,Hi;spin; DeltaSecondsGainLifeCommand=zoom,0.5;settext,"Hi!"; @@ -360,44 +336,20 @@ PercentP1OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_1);diffusetopedge,B PercentP2OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_2);diffusetopedge,BoostColor(PlayerColor(PLAYER_2),1.5) [ScoreDisplayRave] -MeterP1X= -MeterP1Y= MeterP1OnCommand=draworder,-1 -MeterP1OffCommand= -MeterP2X= -MeterP2Y= MeterP2OnCommand=draworder,-1;zoomx,-1 -MeterP2OffCommand= -LevelP1X= -LevelP1Y= LevelP1OnCommand=draworder,105;zoom,0.75;diffuse,ColorLightTone( PlayerColor(PLAYER_1) );strokecolor,ColorDarkTone( PlayerColor(PLAYER_1) );x,-144;skewx,-0.125; -LevelP1OffCommand= -LevelP2X= -LevelP2Y= LevelP2OnCommand=draworder,105;draworder,105;zoom,0.75;diffuse,ColorLightTone( PlayerColor(PLAYER_2) );strokecolor,ColorDarkTone( PlayerColor(PLAYER_2) );x,144;skewx,-0.125; -LevelP2OffCommand= [ScoreKeeperRave] [ScreenEvaluation Percent] -# This shouldn't even be named this but whatever man. -PercentP1X=0 -PercentP1Y=0 +# TODO: Come up with a better name? PercentP1OnCommand=horizalign,right;shadowlength,1;diffuse,PlayerColor(PLAYER_1);strokecolor,ColorDarkTone( PlayerColor(PLAYER_1) ); -PercentP1OffCommand= -PercentP2X=0 -PercentP2Y=0 PercentP2OnCommand=horizalign,right;shadowlength,1;diffuse,PlayerColor(PLAYER_2);strokecolor,ColorDarkTone( PlayerColor(PLAYER_2) ); -PercentP2OffCommand= -PercentRemainderP1X=0 -PercentRemainderP1Y=0 PercentRemainderP1OnCommand=horizalign,left;shadowlength,1;diffuse,PlayerColor(PLAYER_1);strokecolor,ColorDarkTone( PlayerColor(PLAYER_1) ); -PercentRemainderP1OffCommand= -PercentRemainderP2X=0 -PercentRemainderP2Y=0 PercentRemainderP2OnCommand=horizalign,left;shadowlength,1;diffuse,PlayerColor(PLAYER_2);strokecolor,ColorDarkTone( PlayerColor(PLAYER_2) ); -PercentRemainderP2OffCommand= DancePointsP1X=0 DancePointsP1Y=0 DancePointsP1OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_1);strokecolor,ColorDarkTone( PlayerColor(PLAYER_1) ); @@ -407,10 +359,7 @@ DancePointsP2Y=0 DancePointsP2OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_2);strokecolor,ColorDarkTone( PlayerColor(PLAYER_2) ); DancePointsP2OffCommand= DancePointsDigits=2 -PercentUseRemainder=true ApplyScoreDisplayOptions=true -FormatPercentScore=FormatPercentScore -Format= PercentDecimalPlaces=2 PercentTotalSize=5 @@ -423,16 +372,12 @@ PercentTotalSize=5 [SoundEffectControl_Pitch] [StepsDisplayListRow] -# CapitalizeDifficultyNames=false NumShownItems=5 ItemsSpacingY=24 MoveCommand=decelerate,0.3 # FrameX= -FrameY=0 -FrameOnCommand= -FrameOffCommand= FrameSetCommand=%function(self,param) \ if param.CustomDifficulty then \ self:diffuse(ColorMidTone( CustomDifficultyToColor(param.CustomDifficulty) )); \ @@ -441,17 +386,12 @@ FrameSetCommand=%function(self,param) \ end; \ end; # -ShowTicks=false NumTicks=10 MaxTicks=10 -TicksSetCommand= # ShowMeter=true -ZeroMeterString="0" MeterX=56 -MeterY=0 MeterOnCommand=shadowlength,1;zoom,0.65;textglowmode,'TextGlowMode_Inner'; -MeterOffCommand= MeterSetCommand=%function(self,param) \ if param.CustomDifficulty then \ self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \ @@ -470,7 +410,6 @@ end; ShowDescription=true DescriptionX=GetGamePrefB("AutoSetStyle") and (-64-8+20) or (-64-8) # DescriptionX=GetUserPrefB("UserPrefAutoSetStyle") and (-64-8+20) or (-64-8) -DescriptionY=0 DescriptionOnCommand=shadowlength,1;horizalign,left;zoom,0.65;maxwidth,128+8-20;uppercase,true; DescriptionOffCommand= DescriptionSetCommand=%function(self,param) \ @@ -488,39 +427,15 @@ AutogenX=0 AutogenY=0 #AutogenOnCommand=diffuseshift;effectcolor1,Colors.Alpha( Color("Green") , 0.5 );effectcolor2,ColorLightTone( Color("Green") ); AutogenOnCommand=blend,Blend.Add;diffuseshift;effectcolor1,color("#FFCC00FF");effectcolor2,color("#FFCC0088"); -AutogenSetCommand= # -StepsTypeSetCommand= [StreamDisplay] -; a simple bar life meter: -; PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) local native_width=32; local zoomed_width=12; self:zoomx(zoomed_width/native_width); self:x((itemIndex-(numItems/2))*zoomed_width); end -# PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \ - # local fItemWidth = ( 256 / numItems ) \ - # self:x( ((itemIndex-(numItems/2))*fItemWidth) + ( numItems / 2 ) ); \ - # self:zoomtowidth(fItemWidth); \ - # self:diffuseramp(); \ - # self:effectperiod(4); \ - # self:effectoffset((itemIndex-1)/numItems * -1); \ - # self:effectcolor2(color("1,1,1,1")); \ - # self:effectcolor1(color("0.5,0.5,0.5,1")); \ - # self:effectclock('beatnooffset'); \ -# end; PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \ local fItemWidth = ( 256 / numItems ) \ self:zoomtowidth(fItemWidth); \ end; -# PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \ - # local fItemWidth = ( 256 / numItems ) \ - # self:x( ((itemIndex-(numItems/2))*fItemWidth) + ( numItems / 2 ) ); \ - # self:zoomtowidth(fItemWidth); \ - # self:diffuseramp(); \ - # self:effecttiming(1,0.01875*itemIndex,1,1-(0.01875*itemIndex)); \ - # self:effectclock('beatnooffset'); \ -# end; TextureCoordScaleX=1 NumPills=1 -AlwaysBounceNormalBar=false [StepsDisplayEvaluation] Fallback="StepsDisplay" @@ -561,7 +476,6 @@ TitleOnCommand=horizalign,left;shadowlength,1; SubtitleOnCommand=horizalign,left;shadowlength,1; ArtistOnCommand=horizalign,left;shadowlength,1;skewx,-0.2 ArtistPrependString="" -AfterSetCommand=%TextBannerAfterSet [WheelNotifyIcon] @@ -572,10 +486,8 @@ AfterSetCommand=%TextBannerAfterSet [ScreenSystemLayer] CreditsP1OnCommand=horizalign,left;vertalign,bottom;zoom,0.675;shadowlength,1;diffusebottomedge,PlayerColor(PLAYER_1); -CreditsP1OffCommand= # CreditsP2OnCommand=horizalign,right;vertalign,bottom;zoom,0.675;shadowlength,1;diffusebottomedge,PlayerColor(PLAYER_2); -CreditsP2OffCommand= [ScreenConsoleOverlay] @@ -620,8 +532,6 @@ TimerX=SCREEN_RIGHT-36-4 TimerY=SCREEN_TOP+22 TimerOnCommand=draworder,6;visible,PREFSMAN:GetPreference("MenuTimer"); # TimerOnCommand=fov,90;vanishpoint,SCREEN_RIGHT-36-4,SCREEN_TOP+20;draworder,5;visible,PREFSMAN:GetPreference("MenuTimer");rotationy,90;decelerate,0.4;rotationy,0; -TimerOffCommand= -# TimerOffCommand=accelerate,0.4;rotationx,90; StageDisplayNumberOffset=1 @@ -647,7 +557,6 @@ ShowFooter=false [ScreenTextEntry] QuestionOnCommand=diffuse,Color("Orange");diffusetopedge,BoostColor(Color("Orange"),1.5);wrapwidthpixels,600 AnswerOnCommand=diffuse,Color("Blue");glowshift; -KeysInitCommand=zoom,0.8;shadowlength,0 [ScreenInit] PrepareScreens="ScreenTitleMenu,ScreenTitleJoin" @@ -753,8 +662,8 @@ Choice14Keys="name,14Keys;style,double14;screen,"..Branch.AfterSelectPlayMode() ChoiceKB7="name,kb7;style,single;screen,"..Branch.AfterSelectPlayMode() # ShowScroller=false -ShowIcon=true WrapScroller=false +ShowIcon=true UseIconMetrics=true # IconGainFocusCommand=stoptweening;bounceend,0.125;zoom,1; @@ -823,10 +732,6 @@ ScreenOutDelay=3 DefaultChoice="Easy" # ChoiceNames="Normal,Extended" # -PerChoiceIconElement=false -# -ShowScroller=true -WrapScroller=true ScrollerX=SCREEN_CENTER_X ScrollerY=SCREEN_CENTER_Y-60 ScrollerOnCommand=SetFastCatchup,true; @@ -1064,29 +969,6 @@ CDTitleBackCommand=cullmode,'CullMode_Back' CDTitleOnCommand=draworder,106;shadowlength,1;zoom,0.75;diffusealpha,1;zoom,0;bounceend,0.35;zoom,0.75;spin;effectmagnitude,0,180,0; CDTitleOffCommand=bouncebegin,0.15;zoomx,0; # -ScoreFrameP1X= -ScoreFrameP1Y= -ScoreFrameP1OnCommand=visible,false -ScoreFrameP1OffCommand= -ScoreP1X= -ScoreP1Y= -ScoreP1OnCommand=visible,false -ScoreP1OffCommand= -# -ScoreP2X= -ScoreP2Y= -ScoreP2OnCommand=visible,false -ScoreP2OffCommand= -ScoreFrameP2X= -ScoreFrameP2Y= -ScoreFrameP2OnCommand=visible,false -ScoreFrameP2OffCommand= -# -ScoreP1SortChangeCommand=stoptweening; -ScoreP2SortChangeCommand=stoptweening; -ScoreFrameP1SortChangeCommand=stoptweening; -ScoreFrameP2SortChangeCommand=stoptweening; -# ShowStepsDisplayP1=GAMESTATE:IsHumanPlayer(PLAYER_1) StepsDisplayP1X=SCREEN_CENTER_X-160 StepsDisplayP1Y=SCREEN_BOTTOM-60 @@ -1114,13 +996,6 @@ PercentScoreP2OnCommand=player,PLAYER_2;addy,SCREEN_CENTER_Y;decelerate,0.35;add PercentScoreP2OffCommand=bouncebegin,0.15;zoomx,0; [ScreenSelectCourse] -#~ ScreenInitCommand=%function(self) \ - #~ GAMESTATE:ApplyGameCommand("sort,AllCourses",PLAYER_1); \ - #~ GAMESTATE:ApplyGameCommand("sort,AllCourses",PLAYER_2); \ -#~ end; -# -DefaultSort="Nonstop" -# ShowDifficultyList=false ShowCourseContentsList=true ShowNumCourseSongs=true @@ -1136,9 +1011,6 @@ ShowPaneDisplayTextP2=false [CourseCodeDetector] [StepsDisplay] -FrameX=0 -FrameY=0 -FrameOnCommand= FrameLoadCommand=%function(self,param) end; FrameSetCommand=%function(self,param) \ if param.CustomDifficulty then \ @@ -1147,17 +1019,9 @@ FrameSetCommand=%function(self,param) \ end; # ShowTicks=false -NumTicks=10 -MaxTicks=14 -TicksX=0 -TicksY=0 -TicksOnCommand=shadowlength,0; TicksSetCommand=%function(self,param) end; # -ShowMeter=true -ZeroMeterString="?" MeterX=56-32 -MeterY=0 MeterOnCommand=shadowlength,1;textglowmode,'TextGlowMode_Inner' MeterSetCommand=%function(self,param) \ if param.CustomDifficulty then \ @@ -1178,7 +1042,6 @@ MeterSetCommand=%function(self,param) \ end; \ end; # -ShowDescription=true DescriptionX=-20-32 DescriptionY=GetGamePrefB("AutoSetStyle") and -5 or 0 # DescriptionY=GetUserPrefB("UserPrefAutoSetStyle") and -5 or 0 @@ -1195,8 +1058,6 @@ end; # ShowAutogen=false AutogenX=40-32 -AutogenY=0 -AutogenOnCommand= AutogenSetCommand=%function(self,param) if param.Difficulty then self:diffuse(CustomDifficultyToLightColor(param.Difficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.Difficulty)); end end # ShowStepsType=GetGamePrefB("AutoSetStyle") @@ -1206,8 +1067,6 @@ StepsTypeY=7 StepsTypeOnCommand=zoom,0.45 [StepsDisplayGameplay] -Fallback="StepsDisplay" - FrameX=0 FrameY=0 FrameOnCommand= @@ -1274,7 +1133,6 @@ StepsTypeY=7 StepsTypeOnCommand=zoom,0.45 [ScreenStageInformation] -ForceTimer=true TimerOnCommand=visible,false TimerSeconds=3 # @@ -1284,15 +1142,12 @@ WaitForChildrenBeforeTweening=true DisqualifyP1X=SCREEN_CENTER_X-176 DisqualifyP1Y=SCREEN_BOTTOM-98 DisqualifyP1OnCommand=draworder,100;zoom,0.5;shadowlength,1;player,PLAYER_1 -DisqualifyP1OffCommand= DisqualifyP2X=SCREEN_CENTER_X+176 DisqualifyP2Y=SCREEN_BOTTOM-98 DisqualifyP2OnCommand=draworder,100;zoom,0.5;shadowlength,1;player,PLAYER_2 -DisqualifyP2OffCommand= ContainerOnCommand=x,-SCREEN_WIDTH;decelerate,0.35;x,SCREEN_LEFT # PageOnCommand=fadetop,0.125;fadebottom,0.125;cropbottom,0.5;croptop,0.5;decelerate,0.25;croptop,0;cropbottom,0;fadetop,0;fadebottom,0; -CursorOnCommand= LineHighlightOnCommand=cropleft,0.1;cropright,0.1;zoomx,1.25;fadeleft,0.05;faderight,0.05;diffuseshift;effectcolor2,color("1,1,1,0.5");effectcolor1,color("1,1,1,0.25");effectclock,'beat' LineHighlightChangeCommand=linear,0.1;diffuse,Color("White");diffuseshift;effectcolor2,color("1,1,1,0.5");effectcolor1,color("1,1,1,0.25") @@ -1307,8 +1162,6 @@ LineHighlightChangeToExitCommand=linear,0.1;diffuse,Color("Red");diffuseshift;ef [ScreenOptionsService] ShowHeader=false -# ScreenOptionsSystemDirection" - NumRowsShown=14 RowPositionTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:y(SCREEN_CENTER_Y-170+24*offsetFromCenter) end @@ -1322,26 +1175,19 @@ SeparateExitRowY=SCREEN_BOTTOM-40 [ScreenOptionsServiceExtendedChild] [ScreenMiniMenu] -HeaderX=SCREEN_CENTER_X HeaderY=SCREEN_TOP HeaderOnCommand=draworder,100;visible,false -HeaderOffCommand= LineHighlightOnCommand=cropleft,0.1;cropright,0.1;zoomx,1.3;fadeleft,0.25;faderight,0.25;diffusealpha,0.375 LineHighlightChangeCommand= LineHighlightChangeToExitCommand= [OptionRowMiniMenu] -Fallback="OptionRow" - TitleX=SCREEN_CENTER_X-320+48 TitleOnCommand=horizalign,left;shadowlength,0;uppercase,true;zoom,0.6375;strokecolor,Color("Black"); -#~ TitleGainFocusCommand= -#~ TitleLoseFocusCommand= ColorSelected=color("1,1,1,1") ColorNotSelected=color("0.9,0.9,0.9,1") -ColorDisabled=color("0.5,0.5,0.5,1") ItemOnCommand=zoom,0.6375 ItemsLongRowP1X=SCREEN_CENTER_X-240 @@ -1362,7 +1208,6 @@ ItemsLongRowP2X=SCREEN_CENTER_X ItemsLongRowSharedX=SCREEN_CENTER_X [OptionRowMiniMenuContext] -Fallback="OptionRowMiniMenu" [ScreenMapControllers] @@ -1389,9 +1234,6 @@ LineRollCombo="lua,UserPrefComboOnRolls()" [ScreenOptionsArcade] [ScreenOptionsTheme] -Fallback="ScreenOptionsServiceChild" -NextScreen="ScreenOptionsExtended" -PrevScreen="ScreenOptionsExtended" LineNames="gNotePos,gAuto,gScore,gSScore,gSDisp,gOpts,gLongFail,gComboUnderField,FlashyCombo,GameplayFooter" LinegNotePos="lua,UserPrefNotePosition()" LinegScore="lua,UserPrefGameplayShowScore()" @@ -1416,25 +1258,6 @@ LineGameplayFooter="lua,UserPrefGameplayFooter()" [ScreenPlayerOptions] LineNames=GetDefaultOptionLines() -#~ LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17" -Line1="lua,SpeedMods()" -#~ Line1="list,Speed" -Line2="list,Accel" -Line3="list,Effect" -Line4="list,Appearance" -Line5="list,Turn" -Line6="list,Insert" -LineR="list,Remove" -Line7="list,Scroll" -Line8="list,NoteSkins" -Line9="list,Holds" -Line10="list,Mines" -Line11="list,Attacks" -Line12="list,PlayerAutoPlay" -Line13="list,Hide" -Line14="list,Persp" -Line15="list,ScoreDisplay" -Line16="list,Steps" Line17="lua,OptionRowProTiming()" Line18="list,Characters" @@ -1442,6 +1265,7 @@ Line18="list,Characters" [ScreenSongOptions] +# 05 # A [ScreenExit] [ScreenAttract] @@ -1450,8 +1274,6 @@ Line18="list,Characters" # 05 # C [ScreenGameplay] -ShowLifeMeterForDisabledPlayers=false -# SongMeterDisplayX=SCREEN_CENTER_X SongMeterDisplayY=SCREEN_TOP+50 SongMeterDisplayOnCommand=draworder,50;zoom,0;y,SCREEN_TOP-24;sleep,1.5;decelerate,0.5;zoom,1;y,SCREEN_TOP+50 @@ -1583,6 +1405,21 @@ PlayerOptionsP2Y=SCREEN_CENTER_Y+24 PlayerOptionsP2OnCommand=draworder,101;vertalign,top;wrapwidthpixels,256*2;zoom,0.5;diffusealpha,0;addy,10;smooth,0.3;diffusealpha,1;addy,-10;sleep,3;smooth,0.5;addy,10;diffusealpha,0 PlayerOptionsP2OffCommand= # +LyricDisplaySetNoReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+160 +LyricDisplaySetReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-140 +# This is used if one player is in reverse and the other isn't. +LyricDisplaySetOneReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-160; +LyricDisplayDefaultColor=Color("White") +# +ActiveAttackListP1X=THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") +ActiveAttackListP1Y= +ActiveAttackListP1OnCommand=visible,false +ActiveAttackListP1OffCommand= +ActiveAttackListP2X=THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") +ActiveAttackListP2Y= +ActiveAttackListP2OnCommand=visible,false +ActiveAttackListP2OffCommand= +# StepsDisplayP1X=Center1Player() and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") # StepsDisplayP1X=(PREFSMAN:GetPreference("Center1Player") and GAMESTATE:GetNumPlayersEnabled() == 1) and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") StepsDisplayP1Y=SCREEN_CENTER_Y @@ -1604,42 +1441,15 @@ SongOptionsY=SCREEN_BOTTOM-32 SongOptionsOnCommand=draworder,101;zoom,0.5 SongOptionsOffCommand= # -OniGameOverP1X= -OniGameOverP1Y= -OniGameOverP1OnCommand= -OniGameOverP1OffCommand= -# -OniGameOverP2X= -OniGameOverP2Y= -OniGameOverP2OnCommand= -OniGameOverP2OffCommand= -# SurviveTimeX=SCREEN_CENTER_X SurviveTimeY=SCREEN_CENTER_Y+40 SurviveTimeOnCommand=shadowlength,1;zoomx,0;bounceend,1;zoomx,1 SurviveTimeOffCommand=shadowlength,1;linear,1;zoom,0.75;diffusealpha,0 -# -ActiveAttackListP1X=THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") -ActiveAttackListP1Y= -ActiveAttackListP1OnCommand=visible,false -ActiveAttackListP1OffCommand= -ActiveAttackListP2X=THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") -ActiveAttackListP2Y= -ActiveAttackListP2OnCommand=visible,false -ActiveAttackListP2OffCommand= -# -LyricDisplaySetNoReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+160 -LyricDisplaySetReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-140 -# This is used if one player is in reverse and the other isn't. -LyricDisplaySetOneReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-160; -LyricDisplayDefaultColor=Color("White") + [ScreenGameplayShared] [ScreenEvaluation] -Class="ScreenEvaluation" -Fallback="ScreenWithMenuElements" -# StageDisplayNumberOffset=0 # NextScreen=Branches.AfterEvaluation() @@ -1964,8 +1774,6 @@ SongInformationOnCommand=playcommand,"Set";draworder,105 SongInformationOffCommand= [ScreenEvaluationNormal] -Fallback="ScreenEvaluation" -# PlayMusic=false # ShowBannerFrame=false @@ -1977,14 +1785,10 @@ StageDisplayOnCommand=draworder,105;fov,90;vertalign,bottom;vanishpoint,SCREEN_C StageDisplayOffCommand= [ScreenEvaluationSummary] -Fallback="ScreenEvaluation" -# NextScreen=Branch.AfterSummary # PlayMusic=false # -Summary=true -# ShowStageDisplay=false # SmallBanner1X=SCREEN_CENTER_X-72 @@ -2017,6 +1821,8 @@ SmallBanner6Y=SCREEN_TOP+100+24 SmallBanner6OnCommand=zoom,0.5 SmallBanner6OffCommand= +[ScreenNameEntry] + [ScreenProfileSave] [ScreenProfileSaveSummary] @@ -2255,8 +2061,6 @@ ScoreP2OnCommand=visible,false StepsDisplayP1OnCommand=zoomy,0;linear,0.3;zoomy,1;sleep,3;smooth,0.5;y,SCREEN_BOTTOM-20;zoomy,0 StepsDisplayP2OnCommand=zoomy,0;linear,0.3;zoomy,1;sleep,3;smooth,0.5;y,SCREEN_BOTTOM-20;zoomy,0 ShowBPMDisplay=false -# -PlayMusic=false [ScreenJukeboxMenu] From a93169daa0e0aa0b76336c428611a5cd9ee0aba7 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 3 Apr 2011 19:37:49 -0400 Subject: [PATCH 18/28] [metricClean] Add other blanks, fix MusicWheel. --- Themes/default/metrics.ini | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index cc5f4b82f9..ea124393db 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -237,6 +237,7 @@ LockedInitialVelocity=7 ; self:z( -100 + WHEEL_3D_RADIUS * math.cos(rotationx_radians) ); \ ; self:rotationx( rotationx_radians * 180/math.pi ); --[[ to degrees end]] \ ; end; +ItemTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:x( (1-math.cos(offsetFromCenter/math.pi))*44 ); self:y( offsetFromCenter*46 ); end MusicWheelSortOnCommand=fov,90; MusicWheelSortOffCommand=fov,90; MusicWheelItemSortOnCommand=zoomy,0;bounceend,0.15;zoomy,1 @@ -268,7 +269,10 @@ SortMenuColor=Color("Orange") #~ ChoiceLength="sort,Length" #~ ChoiceCourses="sort,AllCourses;" UseEasyMarkerFlag=true -# + +[CourseWheel] + +[OnlineMusicWheel] [MusicWheelItem] WheelNotifyIconX=-128-16+0.5 From cc0d89fe19ba0ab377a4e54ec8427be27523acc3 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 3 Apr 2011 21:29:46 -0400 Subject: [PATCH 19/28] [metricClean] establish consistent spacing (or try to anyway). --- Themes/_fallback/metrics.ini | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index f5638d1633..d6a2ce0e92 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -64,6 +64,7 @@ OverlayScreens="ScreenSystemLayer,ScreenSyncOverlay,ScreenStatsOverlay,ScreenDeb PercentScoreDecimalPlaces=2 # 02 # + [LightsManager] # Mostly useless since it doesn't work, as well as that barely anyone has # lights to play around with. @@ -128,6 +129,7 @@ AutoLockChallengeSteps=false UnlockNames="" # 03 # + [ArrowEffects] # Complicated stuff you probably shouldn't ever mess with or else you'll # destroy mods completely! @@ -284,6 +286,7 @@ SaveScreenshot1="MenuLeft-MenuRight" SaveScreenshot2="" CancelAllPlayerOptions="Left,Right,Left,Right,Left,Right" BackInEventMode="" + [CodeDetectorOnline] Fallback="CodeDetector" PrevSteps1="MenuUp,MenuUp" @@ -444,6 +447,7 @@ PumpRoutineString="Routine" # Difficulty_Edit-StepsType_Pump_Halfdouble=Edit # Difficulty_Edit-StepsType_Pump_Double=Edit # Course=Progressive + [CustomScoring] # Custom scoring, usually good for custom games. @@ -470,6 +474,7 @@ PointsCheckpointMiss=-5 PointsNone=0 PointsHoldHeld=+5 PointsHoldLetGo=-5 + [DifficultyList] # A list that shows difficulties in a song. CapitalizeDifficultyNames=false @@ -1333,6 +1338,7 @@ ShowTraining=false BlinkPlayersBest=true # 04 # + [Screen] ScreenInitCommand= ScreenOnCommand= @@ -1383,6 +1389,7 @@ HeaderTextOffCommand= LineOnCommand=zoom,0.75 # + [ScreenSystemLayer] Class="ScreenSystemLayer" Fallback="Screen" @@ -1433,6 +1440,7 @@ Fallback="Screen" StatusOnCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+150;shadowlength,2;strokecolor,color("#000000"); AdjustmentsOnCommand=x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y; # + [ScreenStatsOverlay] Class="ScreenStatsOverlay" Fallback="Screen" @@ -1446,6 +1454,7 @@ SkipOnCommand=zoom,0.5 SkipWidth=190 SkipSpacingY=14 # + [ScreenWithMenuElements] Class="ScreenWithMenuElements" Fallback="Screen" @@ -2846,12 +2855,14 @@ Line16="list,Steps" Line17="list,Characters" # + [ScreenPlayerOptionsRestricted] Fallback="ScreenPlayerOptions" NextScreen="ScreenStageInformation" LineNames="1,8,16,17" # funny + [ScreenSongOptions] Fallback="ScreenOptions" Class="ScreenSongOptions" @@ -2886,6 +2897,7 @@ AllowStartToSkip=false PrepareScreen= # 05 # A + [ScreenExit] # Midiman: # Fun fact, if you don't enable this screen, Force Crashing will hang @@ -3298,6 +3310,7 @@ DisqualifiedP2OffCommand= # DetailLineFormat="%3d/%3d" # + [ScreenEvaluationNormal] Fallback="ScreenEvaluation" # @@ -3419,6 +3432,7 @@ Answer3Of3OffCommand= # # stuff for edit mode: # + [ScreenOptionsEdit] Class="ScreenOptionsMaster" Fallback="ScreenOptionsSimpleService" @@ -3547,6 +3561,7 @@ TimerSeconds=-1 HelpText=Screen.String("HelpTextOptionsAndBack") # could use a redo but whatever + [ScreenEdit] Class="ScreenEdit" Fallback="ScreenWithMenuElementsBlank" @@ -3652,6 +3667,7 @@ OutCancelCommand= Fallback="StepsDisplay" # oh, right, minimenus. + [ScreenMiniMenuEditHelp] Fallback="ScreenMiniMenu" ShowFooter=false @@ -3713,6 +3729,7 @@ Fallback="ScreenMiniMenu" Fallback="ScreenMiniMenu" # Export Packages + [ScreenOptionsExportPackage] Class="ScreenOptionsExportPackage" Fallback="ScreenOptionsSimpleService" @@ -3730,6 +3747,7 @@ Fallback="OptionRowService" TitleX=SCREEN_CENTER_X-150 # Manage Courses + [OptionRowCourseOverview] Fallback="OptionRowService" ItemsLongRowSharedX=SCREEN_CENTER_X-100 @@ -3778,6 +3796,7 @@ EditScreen="ScreenOptionsEditCourse" OptionRowNormalMetricsGroup="OptionRowCourseOverview" # visual/interactive syncing + [ScreenGameplaySyncMachine] Class="ScreenGameplaySyncMachine" Fallback="ScreenGameplay" @@ -3807,6 +3826,7 @@ Fallback="Player" ComboOnCommand=visible,false # sm-ssc helper screens + [ScreenHowToInstallSongs] Class="ScreenSplash" Fallback="ScreenSplash" @@ -3817,6 +3837,7 @@ TimerSeconds=-1 ShowHelp=false # stuff for online mode: + [ScreenSMOnlineLogin] Class="ScreenSMOnlineLogin" Fallback="ScreenOptionsServiceChild" @@ -4061,6 +4082,7 @@ UserOnCommand= UserOffCommand= # Arcade + [ScreenLogo] Fallback="ScreenAttract" # From 68083077c793d6defa2259839f1a73fb0308d966 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 3 Apr 2011 21:32:01 -0400 Subject: [PATCH 20/28] [metricClean] Partial revert. Restore the diff order, but don't remove individuals yet. One step at a time I think. --- Themes/default/metrics.ini | 446 +++++++++++++++++++++++++++++++------ 1 file changed, 375 insertions(+), 71 deletions(-) diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index ea124393db..91f95a189b 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -4,6 +4,9 @@ FallbackTheme=_fallback [Common] FirstAttractScreen="" +InitialScreen="ScreenInit" + +# AutoSetStyle=GetUserPrefB("UserPrefAutoSetStyle") # 02 # [LightsManager] @@ -23,6 +26,8 @@ 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 [UnlockManager] @@ -43,14 +48,33 @@ SetNormalCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,Color("White");dif SetChangeCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,Color("Orange");diffusetopedge,BoostColor(Color("Orange"),1.5); SetRandomCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,Color("Blue");diffusetopedge,BoostColor(Color("Blue"),1.5); SetExtraCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,Color("Red");diffusebottomedge,BoostColor(Color("Red"),0.5); +Cycle=true +NoBpmText="000" RandomCycleSpeed=0.2 -- smaller numbers mean the bpm cycles faster +Separator="-" +ShowQMarksInRandomCycle=true + +[CodeDetector] +# For Future Reference: +# @ = Holding +# - = In Conjuction With / Then +# ~ = Released +# + = At The Same Time + +[CodeDetectorOnline] [CombinedLifeMeterTug] +# We dont use it. MeterWidth=512-8 MeterHeight=40 [Combo] ShowComboAt=2 + +NumberMinZoom=0.8 +NumberMaxZoom=1 +NumberMaxZoomAt=100 +LabelMinZoom=0.75*0.75 LabelMaxZoom=0.75*1 PulseCommand=%function(self,param) self:finishtweening(); self:diffusealpha(1); self:zoom(1.125*param.Zoom); self:linear(0.05); self:zoom(param.Zoom); self:sleep(2); self:linear(0.5); self:diffusealpha(0); end; @@ -59,13 +83,33 @@ NumberOnCommand=y,240-216-1.5;shadowlength,1;horizalign,right;vertalign,bottom;s LabelOnCommand=x,6;y,22.5;shadowlength,1;zoom,0.75;diffusebottomedge,color("0.75,0.75,0.75,1");horizalign,left;vertalign,bottom [HoldJudgment] +# !!! # +# HoldJudgmentLetGoCommand=HoldJudgmentLetGo() +# HoldJudgmentHeldCommand=HoldJudgmentHeld() 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 +# HoldJudgmentLetGoCommand=GAMESTATE:GetCurrentGame():GetName() == "pump" and "visible,false" or "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=GAMESTATE:GetCurrentGame():GetName() == "pump" and "visible,false" or "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"; +# HoldJudgmentLetGoCommand=function(self) \ + # if GAMESTATE:GetCurrentGame():GetName() == "pump" then \ + # return (cmd(visible,false))(self); \ + # 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))(self); \ + # end; \ +# end; +# HoldJudgmentHeldCommand=function(self) \ + # if GAMESTATE:GetCurrentGame():GetName() == "pump" then \ + # return (cmd(visible,false)); \ + # 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))(self); \ + # end; \ +# end; [HelpDisplay] TipShowTime=7 [Judgment] +# New # +JudgmentOnCommand= +# !!! # JudgmentW1Command=finishtweening;shadowlength,0;y,0;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0;glowblink;effectperiod,0.05;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.8 JudgmentW2Command=finishtweening;y,0;shadowlength,0;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 JudgmentW3Command=finishtweening;y,0;shadowlength,0;diffusealpha,1;zoom,1.2;linear,0.05;zoom,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0; @@ -119,12 +163,15 @@ PointsHoldHeld=0 PointsHoldLetGo=0 [DifficultyList] -ItemsSpacingY=24 +CapitalizeDifficultyNames=false NumShownItems=8 +ItemsSpacingY=24 [FadingBanner] +BannerOnCommand= BannerFadeFromCachedCommand=diffusealpha,1;stoptweening;accelerate,0.05;glow,Colors.Alpha( Color("White"), 0.45 );decelerate,0.175;diffusealpha,0;glow,Color("Invisible"); BannerFadeOffCommand=diffusealpha,1;stoptweening;linear,0.25;diffusealpha,0 +BannerResetFadeCommand=diffusealpha,1 [Gameplay] @@ -132,6 +179,8 @@ BannerFadeOffCommand=diffusealpha,1;stoptweening;linear,0.25;diffusealpha,0 [GrooveRadar] +[GroupList] + [HighScore] [Inventory] @@ -147,17 +196,23 @@ BatteryP1Y=0 BatteryP2X=0 BatteryP2Y=0 # +NumLivesP1X=-92 +NumLivesP1Y=0 +NumLivesP2X=92 +NumLivesP2Y=0 NumLivesP2OnCommand=zoomx,-1 [LifeMeterBattery Percent] # still asking for this even though it's in fallback... -aj Format= # -PercentP2OnCommand=zoom,0.7;zoomx,-0.7;shadowlength,0;diffuse,PlayerColor(PLAYER_2) -# DancePointsP2OnCommand=zoom,0.7;zoomx,-0.7;shadowlength,0;diffuse,PlayerColor(PLAYER_2) - -[LifeMeterTime] +DancePointsP2OffCommand= +# +PercentP2X=0 +PercentP2Y=0 +PercentP2OnCommand=zoom,0.7;zoomx,-0.7;shadowlength,0;diffuse,PlayerColor(PLAYER_2) +PercentP2OffCommand= [LyricDisplay] @@ -169,9 +224,13 @@ TitleGainFocusCommand=stoptweening;zoom,0.6375*1.125;bounceend,0.2;diffuse,Color # TitleGainFocusCommand=stoptweening;zoom,0.6375*1.25;bounceend,0.2;diffuse,Color("Orange");diffusetopedge,BoostColor(Color("Orange"),1.5);strokecolor,Color("Black");zoom,0.6375;thump;effectmagnitude,1,1.05,1;effectclock,'beat' TitleLoseFocusCommand=diffuse,Color("White");strokecolor,Color("Black");stopeffect; +[OptionRowService] + [OptionRowExit] +Fallback="OptionRow" FrameOnCommand=visible,true;diffuse,Color("Red"); FrameX=SCREEN_CENTER_X +TitleOnCommand=visible,false ItemsMinBaseZoom=1 ItemOnCommand=shadowlength,1;zoom,0.8;diffuse,Color("Red");diffusebottomedge,BoostColor(Color("Red"),0.75);shadowcolor,BoostColor(Color("Red"),0.35) @@ -208,21 +267,29 @@ RightOnCommand=horizalign,left;diffuse,PlayerColor(PLAYER_1) LeftOnCommand=horizalign,right;diffuse,PlayerColor(PLAYER_2) MiddleOnCommand=;diffuse,PlayerColor(PLAYER_2) RightOnCommand=horizalign,left;diffuse,PlayerColor(PLAYER_2) - [MenuTimer] Text1OnCommand=stopeffect;stoptweening;shadowlength,0;strokecolor,Color("Outline") Text1FormatFunction=function(fSeconds) \ return string.format("%0.1f", fSeconds); \ end +FrameOnCommand= Warning10Command=diffuseshift;effectperiod,1;effectcolor2,Color("Red");effectcolor1,color("0.5,0,0,1"); +#~ Warning10Command=%function(self) \ + #~ MESSAGEMAN:Broadcast("TimerWarning"); \ + #~ cmd(diffuseshift;effectperiod,1;effectcolor2,Color("Red");effectcolor1,color("0.5,0,0,1"))(self); \ +#~ end; [MenuTimerNoSound] -[MusicList] - [MusicWheel] +FadeSeconds=1 SwitchSeconds=0.08 +RandomPicksLockedSongs=true +RouletteSwitchSeconds=0.05 +RouletteSlowDownSwitches=5 LockedInitialVelocity=7 +ScrollBarHeight=300 +ScrollBarOnCommand=visible,false ; linear wheel example: ; ItemTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \ ; self:y(offsetFromCenter*38); \ @@ -238,21 +305,29 @@ LockedInitialVelocity=7 ; self:rotationx( rotationx_radians * 180/math.pi ); --[[ to degrees end]] \ ; end; ItemTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:x( (1-math.cos(offsetFromCenter/math.pi))*44 ); self:y( offsetFromCenter*46 ); end +NumWheelItems=11 MusicWheelSortOnCommand=fov,90; MusicWheelSortOffCommand=fov,90; 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=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") +# +NumSectionColors=1 SectionColor1=Color("Orange") # SongRealExtraColor=Color("Red") SortMenuColor=Color("Orange") # - +ShowRoulette=true +ShowRandom=false +ShowPortal=false +MostPlayedSongsToShow=30 #~ ModeMenuChoiceNames="Preferred,Group,Title,Bpm,Popularity,TopGrades,Artist,EasyMeter,MediumMeter,HardMeter,ChallengeMeter,Genre,Length" #~ ChoicePreferred="sort,Preferred" #~ ChoiceGroup="sort,Group" @@ -269,6 +344,7 @@ SortMenuColor=Color("Orange") #~ ChoiceLength="sort,Length" #~ ChoiceCourses="sort,AllCourses;" UseEasyMarkerFlag=true +# [CourseWheel] @@ -276,11 +352,15 @@ UseEasyMarkerFlag=true [MusicWheelItem] WheelNotifyIconX=-128-16+0.5 +WheelNotifyIconY=0 WheelNotifyIconOnCommand=shadowlength,2; # SongNameX=-120 +SongNameY=0 +SongNameOnCommand= # CourseX=-120 +CourseY=0 CourseOnCommand=maxwidth,208;horizalign,left # SectionExpandedX=-38 @@ -291,8 +371,11 @@ SectionCollapsedX=-38 SectionCollapsedY=-2 SectionCollapsedOnCommand=maxwidth,194;shadowlength,1;shadowcolor,color("0.1,0.1,0.1,0.2") SectionCountX=112 +SectionCountY=0 SectionCountOnCommand=zoom,0.75;strokecolor,Color("Outline") # +RouletteX=0 +RouletteY=0 RouletteOnCommand=maxwidth,400;shadowlength,1;zoom,0.75;rainbowscroll,true;thump,2; # SortX=-132 @@ -307,12 +390,41 @@ GradeP1X=106+16 GradeP1Y=-8 GradeP2X=110+16 GradeP2Y=8 +GradesShowMachine=true [NoteField] ShowBoard=GAMESTATE:GetCurrentGame():GetName() == "kb7" +[PlayerStageStats] + +[Player] +# ReceptorArrowsYStandard=GetTapPosition('Standard') +# ReceptorArrowsYReverse=GetTapPosition('Reverse') +# RollBodyIncrementsCombo=GetUserPrefB("UserPrefComboOnRolls") + +[PlayerOptions] + +[PlayerShared] + +[Profile] + +[RadarValues] + +[RollingNumbers] + +[RollingNumbersEvaluation] + +[RollingNumbersJudgment] + [ScoreDisplayNormal] +FrameX= +FrameY= +FrameOnCommand= +FrameOffCommand= +TextX= +TextY= TextOnCommand=shadowlength,1;diffusebottomedge,BoostColor(Color('White'),0.75) +TextOffCommand= [ScoreDisplayOni] TextX= @@ -327,12 +439,30 @@ TextOnCommand=shadowlength,1;diffusebottomedge,BoostColor(Color('White'),0.75) TextOffCommand= [ScoreDisplayLifeTime] +FrameX= +FrameY= FrameOnCommand=visible,false;spin +FrameOffCommand= # +TimeRemainingX= TimeRemainingY=80 TimeRemainingOnCommand=zoom,1;shadowlength,1;settext,"Hi!"; +TimeRemainingOffCommand= # DeltaSecondsOnCommand=y,80;settext,Hi;spin; +DeltaSecondsNoneCommand= +DeltaSecondsHitMineCommand= +DeltaSecondsAvoidMineCommand= +DeltaSecondsCheckpointMissCommand= +DeltaSecondsCheckpointHitCommand= +DeltaSecondsMissCommand= +DeltaSecondsW5Command= +DeltaSecondsW4Command= +DeltaSecondsW3Command= +DeltaSecondsW2Command= +DeltaSecondsW1Command= +DeltaSecondsLetGoCommand= +DeltaSecondsHeldCommand= DeltaSecondsGainLifeCommand=zoom,0.5;settext,"Hi!"; [ScoreDisplayPercentage Percent] @@ -340,20 +470,44 @@ PercentP1OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_1);diffusetopedge,B PercentP2OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_2);diffusetopedge,BoostColor(PlayerColor(PLAYER_2),1.5) [ScoreDisplayRave] +MeterP1X= +MeterP1Y= MeterP1OnCommand=draworder,-1 +MeterP1OffCommand= +MeterP2X= +MeterP2Y= MeterP2OnCommand=draworder,-1;zoomx,-1 +MeterP2OffCommand= +LevelP1X= +LevelP1Y= LevelP1OnCommand=draworder,105;zoom,0.75;diffuse,ColorLightTone( PlayerColor(PLAYER_1) );strokecolor,ColorDarkTone( PlayerColor(PLAYER_1) );x,-144;skewx,-0.125; +LevelP1OffCommand= +LevelP2X= +LevelP2Y= LevelP2OnCommand=draworder,105;draworder,105;zoom,0.75;diffuse,ColorLightTone( PlayerColor(PLAYER_2) );strokecolor,ColorDarkTone( PlayerColor(PLAYER_2) );x,144;skewx,-0.125; +LevelP2OffCommand= [ScoreKeeperRave] [ScreenEvaluation Percent] -# TODO: Come up with a better name? +# This shouldn't even be named this but whatever man. +PercentP1X=0 +PercentP1Y=0 PercentP1OnCommand=horizalign,right;shadowlength,1;diffuse,PlayerColor(PLAYER_1);strokecolor,ColorDarkTone( PlayerColor(PLAYER_1) ); +PercentP1OffCommand= +PercentP2X=0 +PercentP2Y=0 PercentP2OnCommand=horizalign,right;shadowlength,1;diffuse,PlayerColor(PLAYER_2);strokecolor,ColorDarkTone( PlayerColor(PLAYER_2) ); +PercentP2OffCommand= +PercentRemainderP1X=0 +PercentRemainderP1Y=0 PercentRemainderP1OnCommand=horizalign,left;shadowlength,1;diffuse,PlayerColor(PLAYER_1);strokecolor,ColorDarkTone( PlayerColor(PLAYER_1) ); +PercentRemainderP1OffCommand= +PercentRemainderP2X=0 +PercentRemainderP2Y=0 PercentRemainderP2OnCommand=horizalign,left;shadowlength,1;diffuse,PlayerColor(PLAYER_2);strokecolor,ColorDarkTone( PlayerColor(PLAYER_2) ); +PercentRemainderP2OffCommand= DancePointsP1X=0 DancePointsP1Y=0 DancePointsP1OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_1);strokecolor,ColorDarkTone( PlayerColor(PLAYER_1) ); @@ -363,7 +517,10 @@ DancePointsP2Y=0 DancePointsP2OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_2);strokecolor,ColorDarkTone( PlayerColor(PLAYER_2) ); DancePointsP2OffCommand= DancePointsDigits=2 +PercentUseRemainder=true ApplyScoreDisplayOptions=true +FormatPercentScore=FormatPercentScore +Format= PercentDecimalPlaces=2 PercentTotalSize=5 @@ -376,12 +533,16 @@ PercentTotalSize=5 [SoundEffectControl_Pitch] [StepsDisplayListRow] +# CapitalizeDifficultyNames=false NumShownItems=5 ItemsSpacingY=24 MoveCommand=decelerate,0.3 # FrameX= +FrameY=0 +FrameOnCommand= +FrameOffCommand= FrameSetCommand=%function(self,param) \ if param.CustomDifficulty then \ self:diffuse(ColorMidTone( CustomDifficultyToColor(param.CustomDifficulty) )); \ @@ -390,12 +551,17 @@ FrameSetCommand=%function(self,param) \ end; \ end; # +ShowTicks=false NumTicks=10 MaxTicks=10 +TicksSetCommand= # ShowMeter=true +ZeroMeterString="0" MeterX=56 +MeterY=0 MeterOnCommand=shadowlength,1;zoom,0.65;textglowmode,'TextGlowMode_Inner'; +MeterOffCommand= MeterSetCommand=%function(self,param) \ if param.CustomDifficulty then \ self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \ @@ -414,6 +580,7 @@ end; ShowDescription=true DescriptionX=GetGamePrefB("AutoSetStyle") and (-64-8+20) or (-64-8) # DescriptionX=GetUserPrefB("UserPrefAutoSetStyle") and (-64-8+20) or (-64-8) +DescriptionY=0 DescriptionOnCommand=shadowlength,1;horizalign,left;zoom,0.65;maxwidth,128+8-20;uppercase,true; DescriptionOffCommand= DescriptionSetCommand=%function(self,param) \ @@ -431,18 +598,14 @@ AutogenX=0 AutogenY=0 #AutogenOnCommand=diffuseshift;effectcolor1,Colors.Alpha( Color("Green") , 0.5 );effectcolor2,ColorLightTone( Color("Green") ); AutogenOnCommand=blend,Blend.Add;diffuseshift;effectcolor1,color("#FFCC00FF");effectcolor2,color("#FFCC0088"); +AutogenSetCommand= # - -[StreamDisplay] -PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \ - local fItemWidth = ( 256 / numItems ) \ - self:zoomtowidth(fItemWidth); \ -end; -TextureCoordScaleX=1 -NumPills=1 - -[StepsDisplayEvaluation] -Fallback="StepsDisplay" +ShowStepsType=GetGamePrefB("AutoSetStyle") +# ShowStepsType=GetUserPrefB("UserPrefAutoSetStyle") +StepsTypeX=-64-8 +StepsTypeY=0 +StepsTypeOnCommand= +StepsTypeSetCommand= [SongMeterDisplay] StreamWidth=380 @@ -466,32 +629,65 @@ TipX=0 TipY=0 TipOnCommand= TipOffCommand= - [SongMeterDisplayP1] Fallback="SongMeterDisplay" 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,0.5;decelerate,0.6;glow,1,1,1,0 +[StepsDisplayEvaluation] +Fallback="StepsDisplay" + +[StreamDisplay] +; a simple bar life meter: +; PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) local native_width=32; local zoomed_width=12; self:zoomx(zoomed_width/native_width); self:x((itemIndex-(numItems/2))*zoomed_width); end +# PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \ + # local fItemWidth = ( 256 / numItems ) \ + # self:x( ((itemIndex-(numItems/2))*fItemWidth) + ( numItems / 2 ) ); \ + # self:zoomtowidth(fItemWidth); \ + # self:diffuseramp(); \ + # self:effectperiod(4); \ + # self:effectoffset((itemIndex-1)/numItems * -1); \ + # self:effectcolor2(color("1,1,1,1")); \ + # self:effectcolor1(color("0.5,0.5,0.5,1")); \ + # self:effectclock('beatnooffset'); \ +# end; +PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \ + local fItemWidth = ( 256 / numItems ) \ + self:zoomtowidth(fItemWidth); \ +end; +# PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \ + # local fItemWidth = ( 256 / numItems ) \ + # self:x( ((itemIndex-(numItems/2))*fItemWidth) + ( numItems / 2 ) ); \ + # self:zoomtowidth(fItemWidth); \ + # self:diffuseramp(); \ + # self:effecttiming(1,0.01875*itemIndex,1,1-(0.01875*itemIndex)); \ + # self:effectclock('beatnooffset'); \ +# end; +TextureCoordScaleX=1 +NumPills=1 +AlwaysBounceNormalBar=false + [TextBanner] TitleOnCommand=horizalign,left;shadowlength,1; SubtitleOnCommand=horizalign,left;shadowlength,1; ArtistOnCommand=horizalign,left;shadowlength,1;skewx,-0.2 ArtistPrependString="" +AfterSetCommand=%TextBannerAfterSet -[WheelNotifyIcon] +[WheelnotifyIcon] -# 04 # [Screen] [ScreenDebugOverlay] [ScreenSystemLayer] CreditsP1OnCommand=horizalign,left;vertalign,bottom;zoom,0.675;shadowlength,1;diffusebottomedge,PlayerColor(PLAYER_1); +CreditsP1OffCommand= # CreditsP2OnCommand=horizalign,right;vertalign,bottom;zoom,0.675;shadowlength,1;diffusebottomedge,PlayerColor(PLAYER_2); +CreditsP2OffCommand= [ScreenConsoleOverlay] @@ -536,6 +732,8 @@ TimerX=SCREEN_RIGHT-36-4 TimerY=SCREEN_TOP+22 TimerOnCommand=draworder,6;visible,PREFSMAN:GetPreference("MenuTimer"); # TimerOnCommand=fov,90;vanishpoint,SCREEN_RIGHT-36-4,SCREEN_TOP+20;draworder,5;visible,PREFSMAN:GetPreference("MenuTimer");rotationy,90;decelerate,0.4;rotationy,0; +TimerOffCommand= +# TimerOffCommand=accelerate,0.4;rotationx,90; StageDisplayNumberOffset=1 @@ -561,6 +759,7 @@ ShowFooter=false [ScreenTextEntry] QuestionOnCommand=diffuse,Color("Orange");diffusetopedge,BoostColor(Color("Orange"),1.5);wrapwidthpixels,600 AnswerOnCommand=diffuse,Color("Blue");glowshift; +KeysInitCommand=zoom,0.8;shadowlength,0 [ScreenInit] PrepareScreens="ScreenTitleMenu,ScreenTitleJoin" @@ -632,6 +831,20 @@ DefaultChoice="1" #ChoiceSetup="text,Setup" ChoiceSetup="screen,ScreenQuickSetupOverview;text,Setup" +[ScreenQuickSetupOverview] +IconStartX=SCREEN_CENTER_X-160 +IconStartY=SCREEN_BOTTOM-60 +IconSetX=SCREEN_CENTER_X-160 +IconSetY=SCREEN_BOTTOM-60 +IconBackX=SCREEN_CENTER_X+160 +IconBackY=SCREEN_BOTTOM-60 + +ExplanationX=SCREEN_CENTER_X +ExplanationY=SCREEN_BOTTOM-100 +ExplanationOnCommand=shadowlength,1;zoom,0.75;maxwidth,SCREEN_WIDTH/0.75; +ExplanationOffCommand= + + [ScreenProfileLoad] # ShowHeader=true @@ -666,8 +879,8 @@ Choice14Keys="name,14Keys;style,double14;screen,"..Branch.AfterSelectPlayMode() ChoiceKB7="name,kb7;style,single;screen,"..Branch.AfterSelectPlayMode() # ShowScroller=false -WrapScroller=false ShowIcon=true +WrapScroller=false UseIconMetrics=true # IconGainFocusCommand=stoptweening;bounceend,0.125;zoom,1; @@ -736,6 +949,10 @@ ScreenOutDelay=3 DefaultChoice="Easy" # ChoiceNames="Normal,Extended" # +PerChoiceIconElement=false +# +ShowScroller=true +WrapScroller=true ScrollerX=SCREEN_CENTER_X ScrollerY=SCREEN_CENTER_Y-60 ScrollerOnCommand=SetFastCatchup,true; @@ -790,19 +1007,6 @@ IconChoiceEndlessY=SCREEN_BOTTOM-88 IconChoiceEndlessOnCommand=zoom,0;bounceend,0.35;zoom,0.8 IconChoiceEndlessOffCommand=linear,0.1175;zoomx,0 -[ScreenQuickSetupOverview] -IconStartX=SCREEN_CENTER_X-160 -IconStartY=SCREEN_BOTTOM-60 -IconSetX=SCREEN_CENTER_X-160 -IconSetY=SCREEN_BOTTOM-60 -IconBackX=SCREEN_CENTER_X+160 -IconBackY=SCREEN_BOTTOM-60 - -ExplanationX=SCREEN_CENTER_X -ExplanationY=SCREEN_BOTTOM-100 -ExplanationOnCommand=shadowlength,1;zoom,0.75;maxwidth,SCREEN_WIDTH/0.75; -ExplanationOffCommand= - [ScreenSelectCharacter] [ScreenGameInformation] @@ -973,6 +1177,29 @@ CDTitleBackCommand=cullmode,'CullMode_Back' CDTitleOnCommand=draworder,106;shadowlength,1;zoom,0.75;diffusealpha,1;zoom,0;bounceend,0.35;zoom,0.75;spin;effectmagnitude,0,180,0; CDTitleOffCommand=bouncebegin,0.15;zoomx,0; # +ScoreFrameP1X= +ScoreFrameP1Y= +ScoreFrameP1OnCommand=visible,false +ScoreFrameP1OffCommand= +ScoreP1X= +ScoreP1Y= +ScoreP1OnCommand=visible,false +ScoreP1OffCommand= +# +ScoreP2X= +ScoreP2Y= +ScoreP2OnCommand=visible,false +ScoreP2OffCommand= +ScoreFrameP2X= +ScoreFrameP2Y= +ScoreFrameP2OnCommand=visible,false +ScoreFrameP2OffCommand= +# +ScoreP1SortChangeCommand=stoptweening; +ScoreP2SortChangeCommand=stoptweening; +ScoreFrameP1SortChangeCommand=stoptweening; +ScoreFrameP2SortChangeCommand=stoptweening; +# ShowStepsDisplayP1=GAMESTATE:IsHumanPlayer(PLAYER_1) StepsDisplayP1X=SCREEN_CENTER_X-160 StepsDisplayP1Y=SCREEN_BOTTOM-60 @@ -1000,6 +1227,13 @@ PercentScoreP2OnCommand=player,PLAYER_2;addy,SCREEN_CENTER_Y;decelerate,0.35;add PercentScoreP2OffCommand=bouncebegin,0.15;zoomx,0; [ScreenSelectCourse] +#~ ScreenInitCommand=%function(self) \ + #~ GAMESTATE:ApplyGameCommand("sort,AllCourses",PLAYER_1); \ + #~ GAMESTATE:ApplyGameCommand("sort,AllCourses",PLAYER_2); \ +#~ end; +# +DefaultSort="Nonstop" +# ShowDifficultyList=false ShowCourseContentsList=true ShowNumCourseSongs=true @@ -1015,6 +1249,9 @@ ShowPaneDisplayTextP2=false [CourseCodeDetector] [StepsDisplay] +FrameX=0 +FrameY=0 +FrameOnCommand= FrameLoadCommand=%function(self,param) end; FrameSetCommand=%function(self,param) \ if param.CustomDifficulty then \ @@ -1023,9 +1260,17 @@ FrameSetCommand=%function(self,param) \ end; # ShowTicks=false +NumTicks=10 +MaxTicks=14 +TicksX=0 +TicksY=0 +TicksOnCommand=shadowlength,0; TicksSetCommand=%function(self,param) end; # +ShowMeter=true +ZeroMeterString="?" MeterX=56-32 +MeterY=0 MeterOnCommand=shadowlength,1;textglowmode,'TextGlowMode_Inner' MeterSetCommand=%function(self,param) \ if param.CustomDifficulty then \ @@ -1046,6 +1291,7 @@ MeterSetCommand=%function(self,param) \ end; \ end; # +ShowDescription=true DescriptionX=-20-32 DescriptionY=GetGamePrefB("AutoSetStyle") and -5 or 0 # DescriptionY=GetUserPrefB("UserPrefAutoSetStyle") and -5 or 0 @@ -1062,6 +1308,8 @@ end; # ShowAutogen=false AutogenX=40-32 +AutogenY=0 +AutogenOnCommand= AutogenSetCommand=%function(self,param) if param.Difficulty then self:diffuse(CustomDifficultyToLightColor(param.Difficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.Difficulty)); end end # ShowStepsType=GetGamePrefB("AutoSetStyle") @@ -1071,6 +1319,8 @@ StepsTypeY=7 StepsTypeOnCommand=zoom,0.45 [StepsDisplayGameplay] +Fallback="StepsDisplay" + FrameX=0 FrameY=0 FrameOnCommand= @@ -1136,22 +1386,19 @@ StepsTypeX=-20 StepsTypeY=7 StepsTypeOnCommand=zoom,0.45 -[ScreenStageInformation] -TimerOnCommand=visible,false -TimerSeconds=3 -# -WaitForChildrenBeforeTweening=true - [ScreenOptions] DisqualifyP1X=SCREEN_CENTER_X-176 DisqualifyP1Y=SCREEN_BOTTOM-98 DisqualifyP1OnCommand=draworder,100;zoom,0.5;shadowlength,1;player,PLAYER_1 +DisqualifyP1OffCommand= DisqualifyP2X=SCREEN_CENTER_X+176 DisqualifyP2Y=SCREEN_BOTTOM-98 DisqualifyP2OnCommand=draworder,100;zoom,0.5;shadowlength,1;player,PLAYER_2 +DisqualifyP2OffCommand= ContainerOnCommand=x,-SCREEN_WIDTH;decelerate,0.35;x,SCREEN_LEFT # PageOnCommand=fadetop,0.125;fadebottom,0.125;cropbottom,0.5;croptop,0.5;decelerate,0.25;croptop,0;cropbottom,0;fadetop,0;fadebottom,0; +CursorOnCommand= LineHighlightOnCommand=cropleft,0.1;cropright,0.1;zoomx,1.25;fadeleft,0.05;faderight,0.05;diffuseshift;effectcolor2,color("1,1,1,0.5");effectcolor1,color("1,1,1,0.25");effectclock,'beat' LineHighlightChangeCommand=linear,0.1;diffuse,Color("White");diffuseshift;effectcolor2,color("1,1,1,0.5");effectcolor1,color("1,1,1,0.25") @@ -1166,6 +1413,8 @@ LineHighlightChangeToExitCommand=linear,0.1;diffuse,Color("Red");diffuseshift;ef [ScreenOptionsService] ShowHeader=false +# ScreenOptionsSystemDirection" + NumRowsShown=14 RowPositionTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:y(SCREEN_CENTER_Y-170+24*offsetFromCenter) end @@ -1179,19 +1428,26 @@ SeparateExitRowY=SCREEN_BOTTOM-40 [ScreenOptionsServiceExtendedChild] [ScreenMiniMenu] +HeaderX=SCREEN_CENTER_X HeaderY=SCREEN_TOP HeaderOnCommand=draworder,100;visible,false +HeaderOffCommand= LineHighlightOnCommand=cropleft,0.1;cropright,0.1;zoomx,1.3;fadeleft,0.25;faderight,0.25;diffusealpha,0.375 LineHighlightChangeCommand= LineHighlightChangeToExitCommand= [OptionRowMiniMenu] +Fallback="OptionRow" + TitleX=SCREEN_CENTER_X-320+48 TitleOnCommand=horizalign,left;shadowlength,0;uppercase,true;zoom,0.6375;strokecolor,Color("Black"); +#~ TitleGainFocusCommand= +#~ TitleLoseFocusCommand= ColorSelected=color("1,1,1,1") ColorNotSelected=color("0.9,0.9,0.9,1") +ColorDisabled=color("0.5,0.5,0.5,1") ItemOnCommand=zoom,0.6375 ItemsLongRowP1X=SCREEN_CENTER_X-240 @@ -1212,6 +1468,7 @@ ItemsLongRowP2X=SCREEN_CENTER_X ItemsLongRowSharedX=SCREEN_CENTER_X [OptionRowMiniMenuContext] +Fallback="OptionRowMiniMenu" [ScreenMapControllers] @@ -1238,6 +1495,9 @@ LineRollCombo="lua,UserPrefComboOnRolls()" [ScreenOptionsArcade] [ScreenOptionsTheme] +Fallback="ScreenOptionsServiceChild" +NextScreen="ScreenOptionsExtended" +PrevScreen="ScreenOptionsExtended" LineNames="gNotePos,gAuto,gScore,gSScore,gSDisp,gOpts,gLongFail,gComboUnderField,FlashyCombo,GameplayFooter" LinegNotePos="lua,UserPrefNotePosition()" LinegScore="lua,UserPrefGameplayShowScore()" @@ -1262,22 +1522,41 @@ LineGameplayFooter="lua,UserPrefGameplayFooter()" [ScreenPlayerOptions] LineNames=GetDefaultOptionLines() +#~ LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17" +Line1="lua,SpeedMods()" +#~ Line1="list,Speed" +Line2="list,Accel" +Line3="list,Effect" +Line4="list,Appearance" +Line5="list,Turn" +Line6="list,Insert" +LineR="list,Remove" +Line7="list,Scroll" +Line8="list,NoteSkins" +Line9="list,Holds" +Line10="list,Mines" +Line11="list,Attacks" +Line12="list,PlayerAutoPlay" +Line13="list,Hide" +Line14="list,Persp" +Line15="list,ScoreDisplay" +Line16="list,Steps" Line17="lua,OptionRowProTiming()" Line18="list,Characters" [ScreenPlayerOptionsRestricted] -[ScreenSongOptions] +[ScreenSplash] -# 05 # A [ScreenExit] -[ScreenAttract] +[ScreenAttact] [ScreenRanking] -# 05 # C [ScreenGameplay] +ShowLifeMeterForDisabledPlayers=false +# SongMeterDisplayX=SCREEN_CENTER_X SongMeterDisplayY=SCREEN_TOP+50 SongMeterDisplayOnCommand=draworder,50;zoom,0;y,SCREEN_TOP-24;sleep,1.5;decelerate,0.5;zoom,1;y,SCREEN_TOP+50 @@ -1409,21 +1688,6 @@ PlayerOptionsP2Y=SCREEN_CENTER_Y+24 PlayerOptionsP2OnCommand=draworder,101;vertalign,top;wrapwidthpixels,256*2;zoom,0.5;diffusealpha,0;addy,10;smooth,0.3;diffusealpha,1;addy,-10;sleep,3;smooth,0.5;addy,10;diffusealpha,0 PlayerOptionsP2OffCommand= # -LyricDisplaySetNoReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+160 -LyricDisplaySetReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-140 -# This is used if one player is in reverse and the other isn't. -LyricDisplaySetOneReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-160; -LyricDisplayDefaultColor=Color("White") -# -ActiveAttackListP1X=THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") -ActiveAttackListP1Y= -ActiveAttackListP1OnCommand=visible,false -ActiveAttackListP1OffCommand= -ActiveAttackListP2X=THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") -ActiveAttackListP2Y= -ActiveAttackListP2OnCommand=visible,false -ActiveAttackListP2OffCommand= -# StepsDisplayP1X=Center1Player() and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") # StepsDisplayP1X=(PREFSMAN:GetPreference("Center1Player") and GAMESTATE:GetNumPlayersEnabled() == 1) and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") StepsDisplayP1Y=SCREEN_CENTER_Y @@ -1445,15 +1709,42 @@ SongOptionsY=SCREEN_BOTTOM-32 SongOptionsOnCommand=draworder,101;zoom,0.5 SongOptionsOffCommand= # +OniGameOverP1X= +OniGameOverP1Y= +OniGameOverP1OnCommand= +OniGameOverP1OffCommand= +# +OniGameOverP2X= +OniGameOverP2Y= +OniGameOverP2OnCommand= +OniGameOverP2OffCommand= +# SurviveTimeX=SCREEN_CENTER_X SurviveTimeY=SCREEN_CENTER_Y+40 SurviveTimeOnCommand=shadowlength,1;zoomx,0;bounceend,1;zoomx,1 SurviveTimeOffCommand=shadowlength,1;linear,1;zoom,0.75;diffusealpha,0 - +# +ActiveAttackListP1X=THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") +ActiveAttackListP1Y= +ActiveAttackListP1OnCommand=visible,false +ActiveAttackListP1OffCommand= +ActiveAttackListP2X=THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") +ActiveAttackListP2Y= +ActiveAttackListP2OnCommand=visible,false +ActiveAttackListP2OffCommand= +# +LyricDisplaySetNoReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+160 +LyricDisplaySetReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-140 +# This is used if one player is in reverse and the other isn't. +LyricDisplaySetOneReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-160; +LyricDisplayDefaultColor=Color("White") [ScreenGameplayShared] [ScreenEvaluation] +Class="ScreenEvaluation" +Fallback="ScreenWithMenuElements" +# StageDisplayNumberOffset=0 # NextScreen=Branches.AfterEvaluation() @@ -1778,6 +2069,8 @@ SongInformationOnCommand=playcommand,"Set";draworder,105 SongInformationOffCommand= [ScreenEvaluationNormal] +Fallback="ScreenEvaluation" +# PlayMusic=false # ShowBannerFrame=false @@ -1789,10 +2082,14 @@ StageDisplayOnCommand=draworder,105;fov,90;vertalign,bottom;vanishpoint,SCREEN_C StageDisplayOffCommand= [ScreenEvaluationSummary] +Fallback="ScreenEvaluation" +# NextScreen=Branch.AfterSummary # PlayMusic=false # +Summary=true +# ShowStageDisplay=false # SmallBanner1X=SCREEN_CENTER_X-72 @@ -1867,6 +2164,8 @@ Fallback="StepsDisplayGameplay" [ScreenMiniMenuStepsInformation] +[ScreenMiniMenuSongInformation] + [ScreenMiniMenuTimingDataInformation] [ScreenMiniMenuBackgroundChange] @@ -1881,14 +2180,12 @@ Fallback="StepsDisplayGameplay" [ScreenMiniMenuCourseOptions] -# Export Packages [ScreenOptionsExportPackage] [ScreenOptionsManage] [OptionRowManage] -# Manage Courses [OptionRowCourseOverview] [ScreenOptionsManageCourses] @@ -1901,7 +2198,6 @@ Fallback="StepsDisplayGameplay" [ScreenOptionsCourseOverview] -# visual/interactive syncing [ScreenGameplaySyncMachine] SongMeterDisplayP1OnCommand=visible,false SongMeterDisplayP2OnCommand=visible,false @@ -1914,7 +2210,6 @@ PlayerOptionsP2OnCommand=visible,false [PlayerSyncMachine] -# sm-ssc helper screens [ScreenHowToInstallSongs] Class="ScreenSelectMaster" Fallback="ScreenSelectMaster" @@ -1944,7 +2239,6 @@ DefaultChoice="WhereToFind" OptionOrderUp="5:4,4:3,3:2,2:1,1:5" OptionOrderDown="1:2,2:3,3:4,4:5,5:1" -# stuff for online mode: [ScreenSMOnlineLogin] [ScreenNetSelectBase] @@ -1983,7 +2277,7 @@ DifficultyDisplayY=SCREEN_CENTER_Y+185 DifficultyDisplayOnCommand=draworder,105;fov,90;zoom,1;zoomy,0;sleep,0.35;smooth,0.35;zoomy,1 DifficultyDisplayOffCommand=linear,0.25;zoomy,0; -[ScreenDisplayNet] +[StepsDisplayNet] [ScreenNetRoom] @@ -2011,6 +2305,7 @@ DifficultyDisplayOffCommand=linear,0.25;zoomy,0; UserTier02OrBetterCommand=diffuseshift;effectperiod,0.75;effectcolor1,color("1,0.95,0.8,1");effectcolor2,color("0.8,0.95,1,1") # arcade stuff + [ScreenLogo] TimerSeconds=10 ShowLogo=true @@ -2054,6 +2349,13 @@ ScrollerOnCommand=visible,false; ArcadeOverlay.TextY=SCREEN_BOTTOM-128 +[ScreenStageInformation] +ForceTimer=true +TimerOnCommand=visible,false +TimerSeconds=3 +# +WaitForChildrenBeforeTweening=true + [ScreenDemonstration] SongMeterDisplayOnCommand=visible,false SongMeterDisplayP1OnCommand=visible,false @@ -2065,6 +2367,8 @@ ScoreP2OnCommand=visible,false StepsDisplayP1OnCommand=zoomy,0;linear,0.3;zoomy,1;sleep,3;smooth,0.5;y,SCREEN_BOTTOM-20;zoomy,0 StepsDisplayP2OnCommand=zoomy,0;linear,0.3;zoomy,1;sleep,3;smooth,0.5;y,SCREEN_BOTTOM-20;zoomy,0 ShowBPMDisplay=false +# +PlayMusic=false [ScreenJukeboxMenu] From 108ca53691e2007c40a980104b499aa8562c3679 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 3 Apr 2011 21:46:37 -0400 Subject: [PATCH 21/28] [metricClean] cleanup and diff matching. So far, nothing obvious is broken here. --- Themes/default/metrics.ini | 62 ++++---------------------------------- 1 file changed, 6 insertions(+), 56 deletions(-) diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 91f95a189b..c24020d661 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -4,9 +4,6 @@ FallbackTheme=_fallback [Common] FirstAttractScreen="" -InitialScreen="ScreenInit" - -# AutoSetStyle=GetUserPrefB("UserPrefAutoSetStyle") # 02 # [LightsManager] @@ -26,8 +23,6 @@ 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 [UnlockManager] @@ -48,11 +43,7 @@ SetNormalCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,Color("White");dif SetChangeCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,Color("Orange");diffusetopedge,BoostColor(Color("Orange"),1.5); SetRandomCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,Color("Blue");diffusetopedge,BoostColor(Color("Blue"),1.5); SetExtraCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,Color("Red");diffusebottomedge,BoostColor(Color("Red"),0.5); -Cycle=true -NoBpmText="000" RandomCycleSpeed=0.2 -- smaller numbers mean the bpm cycles faster -Separator="-" -ShowQMarksInRandomCycle=true [CodeDetector] # For Future Reference: @@ -64,17 +55,13 @@ ShowQMarksInRandomCycle=true [CodeDetectorOnline] [CombinedLifeMeterTug] -# We dont use it. +# We don't use it. MeterWidth=512-8 MeterHeight=40 [Combo] ShowComboAt=2 -NumberMinZoom=0.8 -NumberMaxZoom=1 -NumberMaxZoomAt=100 -LabelMinZoom=0.75*0.75 LabelMaxZoom=0.75*1 PulseCommand=%function(self,param) self:finishtweening(); self:diffusealpha(1); self:zoom(1.125*param.Zoom); self:linear(0.05); self:zoom(param.Zoom); self:sleep(2); self:linear(0.5); self:diffusealpha(0); end; @@ -83,33 +70,13 @@ NumberOnCommand=y,240-216-1.5;shadowlength,1;horizalign,right;vertalign,bottom;s LabelOnCommand=x,6;y,22.5;shadowlength,1;zoom,0.75;diffusebottomedge,color("0.75,0.75,0.75,1");horizalign,left;vertalign,bottom [HoldJudgment] -# !!! # -# HoldJudgmentLetGoCommand=HoldJudgmentLetGo() -# HoldJudgmentHeldCommand=HoldJudgmentHeld() 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 -# HoldJudgmentLetGoCommand=GAMESTATE:GetCurrentGame():GetName() == "pump" and "visible,false" or "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=GAMESTATE:GetCurrentGame():GetName() == "pump" and "visible,false" or "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"; -# HoldJudgmentLetGoCommand=function(self) \ - # if GAMESTATE:GetCurrentGame():GetName() == "pump" then \ - # return (cmd(visible,false))(self); \ - # 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))(self); \ - # end; \ -# end; -# HoldJudgmentHeldCommand=function(self) \ - # if GAMESTATE:GetCurrentGame():GetName() == "pump" then \ - # return (cmd(visible,false)); \ - # 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))(self); \ - # end; \ -# end; [HelpDisplay] TipShowTime=7 [Judgment] -# New # -JudgmentOnCommand= -# !!! # JudgmentW1Command=finishtweening;shadowlength,0;y,0;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0;glowblink;effectperiod,0.05;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.8 JudgmentW2Command=finishtweening;y,0;shadowlength,0;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 JudgmentW3Command=finishtweening;y,0;shadowlength,0;diffusealpha,1;zoom,1.2;linear,0.05;zoom,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0; @@ -163,15 +130,11 @@ PointsHoldHeld=0 PointsHoldLetGo=0 [DifficultyList] -CapitalizeDifficultyNames=false -NumShownItems=8 ItemsSpacingY=24 +NumShownItems=8 [FadingBanner] -BannerOnCommand= BannerFadeFromCachedCommand=diffusealpha,1;stoptweening;accelerate,0.05;glow,Colors.Alpha( Color("White"), 0.45 );decelerate,0.175;diffusealpha,0;glow,Color("Invisible"); -BannerFadeOffCommand=diffusealpha,1;stoptweening;linear,0.25;diffusealpha,0 -BannerResetFadeCommand=diffusealpha,1 [Gameplay] @@ -196,23 +159,16 @@ BatteryP1Y=0 BatteryP2X=0 BatteryP2Y=0 # -NumLivesP1X=-92 -NumLivesP1Y=0 -NumLivesP2X=92 -NumLivesP2Y=0 NumLivesP2OnCommand=zoomx,-1 [LifeMeterBattery Percent] # still asking for this even though it's in fallback... -aj Format= # -DancePointsP2OnCommand=zoom,0.7;zoomx,-0.7;shadowlength,0;diffuse,PlayerColor(PLAYER_2) -DancePointsP2OffCommand= -# -PercentP2X=0 -PercentP2Y=0 PercentP2OnCommand=zoom,0.7;zoomx,-0.7;shadowlength,0;diffuse,PlayerColor(PLAYER_2) -PercentP2OffCommand= +DancePointsP2OnCommand=zoom,0.7;zoomx,-0.7;shadowlength,0;diffuse,PlayerColor(PLAYER_2) + +[LifeMeterTime] [LyricDisplay] @@ -227,10 +183,8 @@ TitleLoseFocusCommand=diffuse,Color("White");strokecolor,Color("Black");stopeffe [OptionRowService] [OptionRowExit] -Fallback="OptionRow" FrameOnCommand=visible,true;diffuse,Color("Red"); FrameX=SCREEN_CENTER_X -TitleOnCommand=visible,false ItemsMinBaseZoom=1 ItemOnCommand=shadowlength,1;zoom,0.8;diffuse,Color("Red");diffusebottomedge,BoostColor(Color("Red"),0.75);shadowcolor,BoostColor(Color("Red"),0.35) @@ -272,12 +226,8 @@ Text1OnCommand=stopeffect;stoptweening;shadowlength,0;strokecolor,Color("Outline Text1FormatFunction=function(fSeconds) \ return string.format("%0.1f", fSeconds); \ end -FrameOnCommand= + Warning10Command=diffuseshift;effectperiod,1;effectcolor2,Color("Red");effectcolor1,color("0.5,0,0,1"); -#~ Warning10Command=%function(self) \ - #~ MESSAGEMAN:Broadcast("TimerWarning"); \ - #~ cmd(diffuseshift;effectperiod,1;effectcolor2,Color("Red");effectcolor1,color("0.5,0,0,1"))(self); \ -#~ end; [MenuTimerNoSound] From 4caccb906a5e06bde83c0a8628f3787fb73214bd Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 3 Apr 2011 22:38:51 -0400 Subject: [PATCH 22/28] [metricClean] More diff progress. --- Themes/_fallback/metrics.ini | 12 ++++---- Themes/default/metrics.ini | 56 ++++++++++-------------------------- 2 files changed, 21 insertions(+), 47 deletions(-) diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index d6a2ce0e92..524bda0550 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -849,19 +849,19 @@ PortalColor=color("1,0,0,1") 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 ShowPortal=false -# + SortBPMDivision=20 SortLengthDivision=5 -# + MostPlayedSongsToShow=30 RecentSongsToShow=30 -# + UseEasyMarkerFlag=false -# + 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" @@ -884,7 +884,7 @@ ChoiceLength="sort,Length" ChoiceRecent="sort,Recent" ChoiceNormalMode="playmode,regular" ChoiceBattleMode="playmode,battle" -# + CustomWheelItemNames="" [CourseWheel] diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index c24020d661..5e02892de7 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -232,14 +232,9 @@ Warning10Command=diffuseshift;effectperiod,1;effectcolor2,Color("Red");effectcol [MenuTimerNoSound] [MusicWheel] -FadeSeconds=1 SwitchSeconds=0.08 -RandomPicksLockedSongs=true -RouletteSwitchSeconds=0.05 -RouletteSlowDownSwitches=5 LockedInitialVelocity=7 -ScrollBarHeight=300 -ScrollBarOnCommand=visible,false + ; linear wheel example: ; ItemTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \ ; self:y(offsetFromCenter*38); \ @@ -255,46 +250,25 @@ ScrollBarOnCommand=visible,false ; self:rotationx( rotationx_radians * 180/math.pi ); --[[ to degrees end]] \ ; end; ItemTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:x( (1-math.cos(offsetFromCenter/math.pi))*44 ); self:y( offsetFromCenter*46 ); end -NumWheelItems=11 MusicWheelSortOnCommand=fov,90; MusicWheelSortOffCommand=fov,90; 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=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") -# -NumSectionColors=1 + SectionColor1=Color("Orange") # SongRealExtraColor=Color("Red") SortMenuColor=Color("Orange") + # -ShowRoulette=true -ShowRandom=false -ShowPortal=false -MostPlayedSongsToShow=30 -#~ ModeMenuChoiceNames="Preferred,Group,Title,Bpm,Popularity,TopGrades,Artist,EasyMeter,MediumMeter,HardMeter,ChallengeMeter,Genre,Length" -#~ ChoicePreferred="sort,Preferred" -#~ ChoiceGroup="sort,Group" -#~ ChoiceTitle="sort,Title" -#~ ChoiceBpm="sort,BPM" -#~ ChoicePopularity="sort,Popularity" -#~ ChoiceTopGrades="sort,TopGrades" -#~ ChoiceArtist="sort,Artist" -#~ ChoiceGenre="sort,Genre" -#~ ChoiceEasyMeter="sort,EasyMeter" -#~ ChoiceMediumMeter="sort,MediumMeter" -#~ ChoiceHardMeter="sort,HardMeter" -#~ ChoiceChallengeMeter="sort,ChallengeMeter" -#~ ChoiceLength="sort,Length" -#~ ChoiceCourses="sort,AllCourses;" + UseEasyMarkerFlag=true -# + [CourseWheel] @@ -1500,10 +1474,12 @@ Line18="list,Characters" [ScreenExit] -[ScreenAttact] +[ScreenAttract] [ScreenRanking] +# 05 # B +# 05 # C [ScreenGameplay] ShowLifeMeterForDisabledPlayers=false # @@ -2194,6 +2170,11 @@ OptionOrderDown="1:2,2:3,3:4,4:5,5:1" [ScreenNetSelectBase] [ScreenNetSelectMusic] +BPMDisplayX=SCREEN_CENTER_X-160-90+2 +BPMDisplayY=SCREEN_CENTER_Y+156 +BPMDisplayOnCommand=finishtweening;horizalign,left;strokecolor,Color("Outline");maxwidth,128;addx,320;zoomx,0;decelerate,0.35;addx,-320;zoomx,1 +BPMDisplayOffCommand=bouncebegin,0.15;zoomx,0; + StepsDisplayP1X=SCREEN_CENTER_X-240 StepsDisplayP1Y=SCREEN_CENTER_Y+185 StepsDisplayP1OnCommand=horizalign,right;zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,1.0;zoomx,1.0 @@ -2204,10 +2185,7 @@ StepsDisplayP2Y=SCREEN_CENTER_Y+185 StepsDisplayP2OnCommand=horizalign,right;zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,1.0;zoomx,1.0 StepsDisplayP2OffCommand=linear,0.5;zoomx,0.0;zoomy,0.0 #====# -BPMDisplayX=SCREEN_CENTER_X-160-90+2 -BPMDisplayY=SCREEN_CENTER_Y+156 -BPMDisplayOnCommand=finishtweening;horizalign,left;strokecolor,Color("Outline");maxwidth,128;addx,320;zoomx,0;decelerate,0.35;addx,-320;zoomx,1 -BPMDisplayOffCommand=bouncebegin,0.15;zoomx,0; + #--# ShowBPMLabel=true BPMLabelX=SCREEN_CENTER_X-160-90 @@ -2254,7 +2232,7 @@ DifficultyDisplayOffCommand=linear,0.25;zoomy,0; [ScreenNetEvaluation] UserTier02OrBetterCommand=diffuseshift;effectperiod,0.75;effectcolor1,color("1,0.95,0.8,1");effectcolor2,color("0.8,0.95,1,1") -# arcade stuff +# Arcade [ScreenLogo] TimerSeconds=10 @@ -2294,9 +2272,7 @@ LogoOffCommand=stopeffect;bouncebegin,0.35;rotationz,360;zoom,0 VersionInfoX=SCREEN_CENTER_X+114 VersionInfoY=SCREEN_CENTER_Y+44 VersionInfoOnCommand=settext,ProductVersion();horizalign,right;vertalign,bottom;bob;effectperiod,4;effectmagnitude,0,5.25,0;zoom,0;bounceend,0.35;zoom,0.65;shadowlength,1;shadowcolor,color("0.2,0.2,0.2,0.925"); - ScrollerOnCommand=visible,false; - ArcadeOverlay.TextY=SCREEN_BOTTOM-128 [ScreenStageInformation] @@ -2317,8 +2293,6 @@ ScoreP2OnCommand=visible,false StepsDisplayP1OnCommand=zoomy,0;linear,0.3;zoomy,1;sleep,3;smooth,0.5;y,SCREEN_BOTTOM-20;zoomy,0 StepsDisplayP2OnCommand=zoomy,0;linear,0.3;zoomy,1;sleep,3;smooth,0.5;y,SCREEN_BOTTOM-20;zoomy,0 ShowBPMDisplay=false -# -PlayMusic=false [ScreenJukeboxMenu] From 3c9bf6c54dd8e46684e70bae98aeba0b0762a820 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 3 Apr 2011 23:19:37 -0400 Subject: [PATCH 23/28] [metricClean] More cleaning. --- Themes/default/metrics.ini | 157 ++----------------------------------- 1 file changed, 5 insertions(+), 152 deletions(-) diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 5e02892de7..ecfbe23c26 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -276,15 +276,11 @@ UseEasyMarkerFlag=true [MusicWheelItem] WheelNotifyIconX=-128-16+0.5 -WheelNotifyIconY=0 WheelNotifyIconOnCommand=shadowlength,2; # SongNameX=-120 -SongNameY=0 -SongNameOnCommand= # CourseX=-120 -CourseY=0 CourseOnCommand=maxwidth,208;horizalign,left # SectionExpandedX=-38 @@ -295,11 +291,8 @@ SectionCollapsedX=-38 SectionCollapsedY=-2 SectionCollapsedOnCommand=maxwidth,194;shadowlength,1;shadowcolor,color("0.1,0.1,0.1,0.2") SectionCountX=112 -SectionCountY=0 SectionCountOnCommand=zoom,0.75;strokecolor,Color("Outline") # -RouletteX=0 -RouletteY=0 RouletteOnCommand=maxwidth,400;shadowlength,1;zoom,0.75;rainbowscroll,true;thump,2; # SortX=-132 @@ -314,7 +307,6 @@ GradeP1X=106+16 GradeP1Y=-8 GradeP2X=110+16 GradeP2Y=8 -GradesShowMachine=true [NoteField] ShowBoard=GAMESTATE:GetCurrentGame():GetName() == "kb7" @@ -322,9 +314,6 @@ ShowBoard=GAMESTATE:GetCurrentGame():GetName() == "kb7" [PlayerStageStats] [Player] -# ReceptorArrowsYStandard=GetTapPosition('Standard') -# ReceptorArrowsYReverse=GetTapPosition('Reverse') -# RollBodyIncrementsCombo=GetUserPrefB("UserPrefComboOnRolls") [PlayerOptions] @@ -341,14 +330,7 @@ ShowBoard=GAMESTATE:GetCurrentGame():GetName() == "kb7" [RollingNumbersJudgment] [ScoreDisplayNormal] -FrameX= -FrameY= -FrameOnCommand= -FrameOffCommand= -TextX= -TextY= TextOnCommand=shadowlength,1;diffusebottomedge,BoostColor(Color('White'),0.75) -TextOffCommand= [ScoreDisplayOni] TextX= @@ -363,30 +345,12 @@ TextOnCommand=shadowlength,1;diffusebottomedge,BoostColor(Color('White'),0.75) TextOffCommand= [ScoreDisplayLifeTime] -FrameX= -FrameY= FrameOnCommand=visible,false;spin -FrameOffCommand= # -TimeRemainingX= TimeRemainingY=80 TimeRemainingOnCommand=zoom,1;shadowlength,1;settext,"Hi!"; -TimeRemainingOffCommand= # DeltaSecondsOnCommand=y,80;settext,Hi;spin; -DeltaSecondsNoneCommand= -DeltaSecondsHitMineCommand= -DeltaSecondsAvoidMineCommand= -DeltaSecondsCheckpointMissCommand= -DeltaSecondsCheckpointHitCommand= -DeltaSecondsMissCommand= -DeltaSecondsW5Command= -DeltaSecondsW4Command= -DeltaSecondsW3Command= -DeltaSecondsW2Command= -DeltaSecondsW1Command= -DeltaSecondsLetGoCommand= -DeltaSecondsHeldCommand= DeltaSecondsGainLifeCommand=zoom,0.5;settext,"Hi!"; [ScoreDisplayPercentage Percent] @@ -394,44 +358,19 @@ PercentP1OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_1);diffusetopedge,B PercentP2OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_2);diffusetopedge,BoostColor(PlayerColor(PLAYER_2),1.5) [ScoreDisplayRave] -MeterP1X= -MeterP1Y= MeterP1OnCommand=draworder,-1 -MeterP1OffCommand= -MeterP2X= -MeterP2Y= MeterP2OnCommand=draworder,-1;zoomx,-1 -MeterP2OffCommand= - -LevelP1X= -LevelP1Y= LevelP1OnCommand=draworder,105;zoom,0.75;diffuse,ColorLightTone( PlayerColor(PLAYER_1) );strokecolor,ColorDarkTone( PlayerColor(PLAYER_1) );x,-144;skewx,-0.125; -LevelP1OffCommand= -LevelP2X= -LevelP2Y= LevelP2OnCommand=draworder,105;draworder,105;zoom,0.75;diffuse,ColorLightTone( PlayerColor(PLAYER_2) );strokecolor,ColorDarkTone( PlayerColor(PLAYER_2) );x,144;skewx,-0.125; -LevelP2OffCommand= [ScoreKeeperRave] [ScreenEvaluation Percent] -# This shouldn't even be named this but whatever man. -PercentP1X=0 -PercentP1Y=0 +# TODO: Better name? PercentP1OnCommand=horizalign,right;shadowlength,1;diffuse,PlayerColor(PLAYER_1);strokecolor,ColorDarkTone( PlayerColor(PLAYER_1) ); -PercentP1OffCommand= -PercentP2X=0 -PercentP2Y=0 PercentP2OnCommand=horizalign,right;shadowlength,1;diffuse,PlayerColor(PLAYER_2);strokecolor,ColorDarkTone( PlayerColor(PLAYER_2) ); -PercentP2OffCommand= -PercentRemainderP1X=0 -PercentRemainderP1Y=0 PercentRemainderP1OnCommand=horizalign,left;shadowlength,1;diffuse,PlayerColor(PLAYER_1);strokecolor,ColorDarkTone( PlayerColor(PLAYER_1) ); -PercentRemainderP1OffCommand= -PercentRemainderP2X=0 -PercentRemainderP2Y=0 PercentRemainderP2OnCommand=horizalign,left;shadowlength,1;diffuse,PlayerColor(PLAYER_2);strokecolor,ColorDarkTone( PlayerColor(PLAYER_2) ); -PercentRemainderP2OffCommand= DancePointsP1X=0 DancePointsP1Y=0 DancePointsP1OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_1);strokecolor,ColorDarkTone( PlayerColor(PLAYER_1) ); @@ -441,10 +380,7 @@ DancePointsP2Y=0 DancePointsP2OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_2);strokecolor,ColorDarkTone( PlayerColor(PLAYER_2) ); DancePointsP2OffCommand= DancePointsDigits=2 -PercentUseRemainder=true ApplyScoreDisplayOptions=true -FormatPercentScore=FormatPercentScore -Format= PercentDecimalPlaces=2 PercentTotalSize=5 @@ -457,7 +393,7 @@ PercentTotalSize=5 [SoundEffectControl_Pitch] [StepsDisplayListRow] -# +# TODO: Make this use DifficultyList? CapitalizeDifficultyNames=false NumShownItems=5 ItemsSpacingY=24 @@ -475,17 +411,12 @@ FrameSetCommand=%function(self,param) \ end; \ end; # -ShowTicks=false NumTicks=10 MaxTicks=10 -TicksSetCommand= # ShowMeter=true -ZeroMeterString="0" MeterX=56 -MeterY=0 MeterOnCommand=shadowlength,1;zoom,0.65;textglowmode,'TextGlowMode_Inner'; -MeterOffCommand= MeterSetCommand=%function(self,param) \ if param.CustomDifficulty then \ self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \ @@ -504,9 +435,7 @@ end; ShowDescription=true DescriptionX=GetGamePrefB("AutoSetStyle") and (-64-8+20) or (-64-8) # DescriptionX=GetUserPrefB("UserPrefAutoSetStyle") and (-64-8+20) or (-64-8) -DescriptionY=0 DescriptionOnCommand=shadowlength,1;horizalign,left;zoom,0.65;maxwidth,128+8-20;uppercase,true; -DescriptionOffCommand= DescriptionSetCommand=%function(self,param) \ if self:GetText() == "" then \ self:settext("Edit"); \ @@ -522,10 +451,8 @@ AutogenX=0 AutogenY=0 #AutogenOnCommand=diffuseshift;effectcolor1,Colors.Alpha( Color("Green") , 0.5 );effectcolor2,ColorLightTone( Color("Green") ); AutogenOnCommand=blend,Blend.Add;diffuseshift;effectcolor1,color("#FFCC00FF");effectcolor2,color("#FFCC0088"); -AutogenSetCommand= # ShowStepsType=GetGamePrefB("AutoSetStyle") -# ShowStepsType=GetUserPrefB("UserPrefAutoSetStyle") StepsTypeX=-64-8 StepsTypeY=0 StepsTypeOnCommand= @@ -591,16 +518,15 @@ end; # end; TextureCoordScaleX=1 NumPills=1 -AlwaysBounceNormalBar=false + [TextBanner] TitleOnCommand=horizalign,left;shadowlength,1; SubtitleOnCommand=horizalign,left;shadowlength,1; ArtistOnCommand=horizalign,left;shadowlength,1;skewx,-0.2 ArtistPrependString="" -AfterSetCommand=%TextBannerAfterSet -[WheelnotifyIcon] +[WheelNotifyIcon] [Screen] @@ -608,10 +534,8 @@ AfterSetCommand=%TextBannerAfterSet [ScreenSystemLayer] CreditsP1OnCommand=horizalign,left;vertalign,bottom;zoom,0.675;shadowlength,1;diffusebottomedge,PlayerColor(PLAYER_1); -CreditsP1OffCommand= # CreditsP2OnCommand=horizalign,right;vertalign,bottom;zoom,0.675;shadowlength,1;diffusebottomedge,PlayerColor(PLAYER_2); -CreditsP2OffCommand= [ScreenConsoleOverlay] @@ -683,7 +607,7 @@ ShowFooter=false [ScreenTextEntry] QuestionOnCommand=diffuse,Color("Orange");diffusetopedge,BoostColor(Color("Orange"),1.5);wrapwidthpixels,600 AnswerOnCommand=diffuse,Color("Blue");glowshift; -KeysInitCommand=zoom,0.8;shadowlength,0 + [ScreenInit] PrepareScreens="ScreenTitleMenu,ScreenTitleJoin" @@ -694,7 +618,6 @@ PersistScreens="ScreenInit,ScreenTitleJoin,ScreenTitleMenu" ShowHeader=false ShowFooter=false # -ShowScroller=true WrapScroller=false ScrollerTransform=function(self,offset,itemIndex,numItems) self:y((28)*(itemIndex-(numItems-1)/2)); end; ScrollerSecondsPerItem=0 @@ -786,17 +709,6 @@ FOV=90 PerChoiceScrollElement=false PerChoiceIconElement=false # -DefaultChoice="Single" -ChoiceNames=GameCompatibleModes() -# -OptionOrderAuto="1:2,2:1" -ChoiceSingle="name,Single;style,single;screen,"..Branch.AfterSelectPlayMode() -ChoiceDouble="name,Double;style,double;screen,"..Branch.AfterSelectPlayMode() -ChoiceSolo="name,Solo;style,solo;screen,"..Branch.AfterSelectPlayMode() -ChoiceVersus="name,Versus;style,versus;screen,"..Branch.AfterSelectPlayMode() -ChoiceCouple="name,Couple;style,couple;screen,"..Branch.AfterSelectPlayMode() -ChoiceHalfDouble="name,HalfDouble;style,halfdouble;screen,"..Branch.AfterSelectPlayMode() -Choice5Keys="name,5Keys;style,single5;;screen,"..Branch.AfterSelectPlayMode() Choice7Keys="name,7Keys;style,single7;screen,"..Branch.AfterSelectPlayMode() Choice10Keys="name,10Keys;style,double10;screen,"..Branch.AfterSelectPlayMode() Choice14Keys="name,14Keys;style,double14;screen,"..Branch.AfterSelectPlayMode() @@ -1101,23 +1013,7 @@ CDTitleBackCommand=cullmode,'CullMode_Back' CDTitleOnCommand=draworder,106;shadowlength,1;zoom,0.75;diffusealpha,1;zoom,0;bounceend,0.35;zoom,0.75;spin;effectmagnitude,0,180,0; CDTitleOffCommand=bouncebegin,0.15;zoomx,0; # -ScoreFrameP1X= -ScoreFrameP1Y= -ScoreFrameP1OnCommand=visible,false -ScoreFrameP1OffCommand= -ScoreP1X= -ScoreP1Y= -ScoreP1OnCommand=visible,false -ScoreP1OffCommand= # -ScoreP2X= -ScoreP2Y= -ScoreP2OnCommand=visible,false -ScoreP2OffCommand= -ScoreFrameP2X= -ScoreFrameP2Y= -ScoreFrameP2OnCommand=visible,false -ScoreFrameP2OffCommand= # ScoreP1SortChangeCommand=stoptweening; ScoreP2SortChangeCommand=stoptweening; @@ -1151,12 +1047,6 @@ PercentScoreP2OnCommand=player,PLAYER_2;addy,SCREEN_CENTER_Y;decelerate,0.35;add PercentScoreP2OffCommand=bouncebegin,0.15;zoomx,0; [ScreenSelectCourse] -#~ ScreenInitCommand=%function(self) \ - #~ GAMESTATE:ApplyGameCommand("sort,AllCourses",PLAYER_1); \ - #~ GAMESTATE:ApplyGameCommand("sort,AllCourses",PLAYER_2); \ -#~ end; -# -DefaultSort="Nonstop" # ShowDifficultyList=false ShowCourseContentsList=true @@ -1173,26 +1063,13 @@ ShowPaneDisplayTextP2=false [CourseCodeDetector] [StepsDisplay] -FrameX=0 -FrameY=0 -FrameOnCommand= FrameLoadCommand=%function(self,param) end; -FrameSetCommand=%function(self,param) \ - if param.CustomDifficulty then \ - self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \ - end; \ -end; -# -ShowTicks=false NumTicks=10 MaxTicks=14 TicksX=0 TicksY=0 TicksOnCommand=shadowlength,0; TicksSetCommand=%function(self,param) end; -# -ShowMeter=true -ZeroMeterString="?" MeterX=56-32 MeterY=0 MeterOnCommand=shadowlength,1;textglowmode,'TextGlowMode_Inner' @@ -1245,23 +1122,6 @@ StepsTypeOnCommand=zoom,0.45 [StepsDisplayGameplay] Fallback="StepsDisplay" -FrameX=0 -FrameY=0 -FrameOnCommand= -FrameLoadCommand=%function(self,param) end; -FrameSetCommand=%function(self,param) \ - if param.CustomDifficulty then \ - self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \ - end; \ -end; -# -ShowTicks=false -NumTicks=10 -MaxTicks=14 -TicksX=0 -TicksY=0 -TicksOnCommand=shadowlength,0; -TicksSetCommand=%function(self,param) end; # ShowMeter=true ZeroMeterString="?" @@ -2275,13 +2135,6 @@ VersionInfoOnCommand=settext,ProductVersion();horizalign,right;vertalign,bottom; ScrollerOnCommand=visible,false; ArcadeOverlay.TextY=SCREEN_BOTTOM-128 -[ScreenStageInformation] -ForceTimer=true -TimerOnCommand=visible,false -TimerSeconds=3 -# -WaitForChildrenBeforeTweening=true - [ScreenDemonstration] SongMeterDisplayOnCommand=visible,false SongMeterDisplayP1OnCommand=visible,false From eca1754dbf0310961631b6221e40b11ef4b23d7b Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 3 Apr 2011 23:43:22 -0400 Subject: [PATCH 24/28] [metricClean] Make DiffMerge happy. Anyone know of a diff tool that will let me specify points to diff instead of relying on automatic tools? --- Themes/default/metrics.ini | 74 +++++++++++++++----------------------- 1 file changed, 28 insertions(+), 46 deletions(-) diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index ecfbe23c26..ddba187e95 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -398,11 +398,9 @@ CapitalizeDifficultyNames=false NumShownItems=5 ItemsSpacingY=24 MoveCommand=decelerate,0.3 -# + FrameX= -FrameY=0 -FrameOnCommand= -FrameOffCommand= + FrameSetCommand=%function(self,param) \ if param.CustomDifficulty then \ self:diffuse(ColorMidTone( CustomDifficultyToColor(param.CustomDifficulty) )); \ @@ -519,7 +517,6 @@ end; TextureCoordScaleX=1 NumPills=1 - [TextBanner] TitleOnCommand=horizalign,left;shadowlength,1; SubtitleOnCommand=horizalign,left;shadowlength,1; @@ -1174,14 +1171,11 @@ StepsTypeOnCommand=zoom,0.45 DisqualifyP1X=SCREEN_CENTER_X-176 DisqualifyP1Y=SCREEN_BOTTOM-98 DisqualifyP1OnCommand=draworder,100;zoom,0.5;shadowlength,1;player,PLAYER_1 -DisqualifyP1OffCommand= DisqualifyP2X=SCREEN_CENTER_X+176 DisqualifyP2Y=SCREEN_BOTTOM-98 DisqualifyP2OnCommand=draworder,100;zoom,0.5;shadowlength,1;player,PLAYER_2 -DisqualifyP2OffCommand= ContainerOnCommand=x,-SCREEN_WIDTH;decelerate,0.35;x,SCREEN_LEFT -# PageOnCommand=fadetop,0.125;fadebottom,0.125;cropbottom,0.5;croptop,0.5;decelerate,0.25;croptop,0;cropbottom,0;fadetop,0;fadebottom,0; CursorOnCommand= LineHighlightOnCommand=cropleft,0.1;cropright,0.1;zoomx,1.25;fadeleft,0.05;faderight,0.05;diffuseshift;effectcolor2,color("1,1,1,0.5");effectcolor1,color("1,1,1,0.25");effectclock,'beat' @@ -1212,31 +1206,23 @@ SeparateExitRowY=SCREEN_BOTTOM-40 [ScreenOptionsServiceExtendedChild] [ScreenMiniMenu] -HeaderX=SCREEN_CENTER_X HeaderY=SCREEN_TOP HeaderOnCommand=draworder,100;visible,false -HeaderOffCommand= - LineHighlightOnCommand=cropleft,0.1;cropright,0.1;zoomx,1.3;fadeleft,0.25;faderight,0.25;diffusealpha,0.375 LineHighlightChangeCommand= LineHighlightChangeToExitCommand= [OptionRowMiniMenu] Fallback="OptionRow" - TitleX=SCREEN_CENTER_X-320+48 TitleOnCommand=horizalign,left;shadowlength,0;uppercase,true;zoom,0.6375;strokecolor,Color("Black"); -#~ TitleGainFocusCommand= -#~ TitleLoseFocusCommand= - -ColorSelected=color("1,1,1,1") -ColorNotSelected=color("0.9,0.9,0.9,1") -ColorDisabled=color("0.5,0.5,0.5,1") - -ItemOnCommand=zoom,0.6375 ItemsLongRowP1X=SCREEN_CENTER_X-240 ItemsLongRowP2X=SCREEN_CENTER_X+240 ItemsLongRowSharedX=SCREEN_CENTER_X+200 +ItemOnCommand=zoom,0.6375 + +ColorSelected=color("1,1,1,1") +ColorNotSelected=color("0.9,0.9,0.9,1") [ScreenMiniMenuContext] PageOnCommand=visible,false @@ -1252,7 +1238,6 @@ ItemsLongRowP2X=SCREEN_CENTER_X ItemsLongRowSharedX=SCREEN_CENTER_X [OptionRowMiniMenuContext] -Fallback="OptionRowMiniMenu" [ScreenMapControllers] @@ -1306,25 +1291,6 @@ LineGameplayFooter="lua,UserPrefGameplayFooter()" [ScreenPlayerOptions] LineNames=GetDefaultOptionLines() -#~ LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17" -Line1="lua,SpeedMods()" -#~ Line1="list,Speed" -Line2="list,Accel" -Line3="list,Effect" -Line4="list,Appearance" -Line5="list,Turn" -Line6="list,Insert" -LineR="list,Remove" -Line7="list,Scroll" -Line8="list,NoteSkins" -Line9="list,Holds" -Line10="list,Mines" -Line11="list,Attacks" -Line12="list,PlayerAutoPlay" -Line13="list,Hide" -Line14="list,Persp" -Line15="list,ScoreDisplay" -Line16="list,Steps" Line17="lua,OptionRowProTiming()" Line18="list,Characters" @@ -1336,12 +1302,26 @@ Line18="list,Characters" [ScreenAttract] +# +# +# +# + [ScreenRanking] +# + +# + +# + +# + +# + # 05 # B # 05 # C [ScreenGameplay] -ShowLifeMeterForDisabledPlayers=false # SongMeterDisplayX=SCREEN_CENTER_X SongMeterDisplayY=SCREEN_TOP+50 @@ -1495,6 +1475,12 @@ SongOptionsY=SCREEN_BOTTOM-32 SongOptionsOnCommand=draworder,101;zoom,0.5 SongOptionsOffCommand= # +LyricDisplaySetNoReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+160 +LyricDisplaySetReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-140 +# This is used if one player is in reverse and the other isn't. +LyricDisplaySetOneReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-160; +LyricDisplayDefaultColor=Color("White") +# OniGameOverP1X= OniGameOverP1Y= OniGameOverP1OnCommand= @@ -1519,11 +1505,7 @@ ActiveAttackListP2Y= ActiveAttackListP2OnCommand=visible,false ActiveAttackListP2OffCommand= # -LyricDisplaySetNoReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+160 -LyricDisplaySetReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-140 -# This is used if one player is in reverse and the other isn't. -LyricDisplaySetOneReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-160; -LyricDisplayDefaultColor=Color("White") + [ScreenGameplayShared] From 883080470802ec6fbd2e4784ba13c0632324f83a Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 3 Apr 2011 23:53:07 -0400 Subject: [PATCH 25/28] [metricClean] Space this out too. --- Themes/default/Languages/en.ini | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/Themes/default/Languages/en.ini b/Themes/default/Languages/en.ini index 125ed3b51f..cb15bb4c97 100644 --- a/Themes/default/Languages/en.ini +++ b/Themes/default/Languages/en.ini @@ -1,7 +1,9 @@ [Screen] HelpText=&BACK; Exit &START; Select &SELECT; Options &MENULEFT;&MENURIGHT;&MENUUP;&MENUDOWN; Move + [ScreenWithMenuElements] HelpText=&BACK; Exit &START; Select &MENULEFT;&MENURIGHT; Move + [ScreenTitleMenu] HelpText=&BACK; Exit &START; Select &MENUUP;&MENUDOWN; Move Network OK=Network OK @@ -10,6 +12,7 @@ Connected to %s=Connected to %s CurrentGametype=Current Gametype: %s LifeDifficulty=Life Difficulty: %s TimingDifficulty=Timing Difficulty: %s + [ScreenTitleJoin] HelpText=Press &START; to Play HelpTextJoin=Press &START; to Play @@ -19,16 +22,22 @@ JointPremiumMain=Joint Premium JointPremiumSecondary=Two players can play with one credit! DoublesPremiumMain=Doubles Premium DoublesPremiumSecondary=Play doubles for one credit! + [ScreenDemonstration] Demonstration=Demonstration + [ScreenQuickSetupOverview] Explanation=Quick Setup provides a easy way to set commonly-changed and useful preferences. + [ScreenProfileLoad] HelpText=... Loading profiles, please wait ... + [ScreenSelectProfile] HelpText=&MENUUP;&MENUDOWN; Switch Profile &START; Choose/Join &BACK; Unselect + [ScreenSelectMaster] HelpText=&BACK; Exit &START; Select / Join &MENULEFT;&MENURIGHT; Move + [ScreenSelectPlayMode] HelpText=&BACK; Exit &START; Select / Join &MENULEFT;&MENURIGHT; Move EasyExplanation=A mode for beginners. @@ -39,25 +48,34 @@ RaveExplanation=Battle against friend or foe. ExtendedExplanation=Several Songs in a row OniExplanation=A true test of skill. EndlessExplanation=It don't stop, it keep rollin'. + [ScreenSelectPlayStyle] 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::&AUXWHITE;+[KEY] Sort To [KEY] AlternateHelpText=&SELECT;+&MENULEFT;&MENURIGHT; Change Difficulties &SELECT;+&START; Quick Sort + [ScreenSelectCourse] HelpText=&BACK; Exit &START; Select / Join &SELECT; Magic Codes &MENULEFT;&MENURIGHT; Move::&UP;&DOWN;&UP;&DOWN; for other course types + [ScreenOptions] HelpText=&BACK; Exit &START; Choose &SELECT; Go Up &MENULEFT;&MENURIGHT;&MENUUP;&MENUDOWN; Move + [ScreenStageInformation] HelpText= + [ScreenGameplay] HelpText= + [ScreenEvaluation] HelpText=&BACK; Exit &START; Move On &MENULEFT;+&MENURIGHT; or &SELECT; Snapshot LifeDifficulty=Life Difficulty: %s TimingDifficulty=Timing Difficulty: %s + [OptionTitles] GamePrefAutoSetStyle=Auto Set Style UserPrefSpecialScoringMode=Special Scoring Mode @@ -71,6 +89,7 @@ UserPrefShowLotsaOptions=Options Density UserPrefLongFail=Fail Length UserPrefFlashyCombo=Flashy Combo UserPrefGameplayFooter=Gameplay Footer + [OptionExplanations] GamePrefAutoSetStyle=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! ) GamePrefNotePosition=Determines where the arrow receptors are placed in gameplay. @@ -107,6 +126,7 @@ Steps=Adjust the difficulty of the steps. Characters=Dancing buddies. SaveToProfileHelp=Requires profile or memory card. MusicRateHelp=Play the music at a faster rate. + [StepsListDisplayRow StepsType] Dance_Single=4 Dance_Double=8 @@ -160,4 +180,4 @@ Explanation-Exit=Return to the title menu. Custom=Special [ScreenTestInput] -HelpText=Hold &BACK; or &START; to exit. \ No newline at end of file +HelpText=Hold &BACK; or &START; to exit. From 6b0de06a050023479af3d4355c8ee3c17d8c720d Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 3 Apr 2011 23:55:35 -0400 Subject: [PATCH 26/28] [metricClean] Update file to address resolved bug. Guess I'll have to merge this branch in soon. --- Themes/default/Languages/en.ini | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Themes/default/Languages/en.ini b/Themes/default/Languages/en.ini index cb15bb4c97..0c6b61d7c8 100644 --- a/Themes/default/Languages/en.ini +++ b/Themes/default/Languages/en.ini @@ -79,9 +79,9 @@ TimingDifficulty=Timing Difficulty: %s [OptionTitles] GamePrefAutoSetStyle=Auto Set Style UserPrefSpecialScoringMode=Special Scoring Mode -GamePrefNotePosition=Note Positions -GamePrefComboOnRolls=Rolls Increment Combo -GamePrefComboUnderField=Combo Under Field +UserPrefNotePosition=Note Positions +UserPrefComboOnRolls=Rolls Increment Combo +UserPrefComboUnderField=Combo Under Field UserPrefGameplayShowScore=Show Score UserPrefGameplayShowStepsDisplay=Show Steps @@ -92,9 +92,9 @@ UserPrefGameplayFooter=Gameplay Footer [OptionExplanations] GamePrefAutoSetStyle=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! ) -GamePrefNotePosition=Determines where the arrow receptors are placed in gameplay. -GamePrefComboOnRolls=Choose if rolls should increment the combo or not. -GamePrefComboUnderField=Determine if the combo should display under the notes or not. +UserPrefNotePosition=Determines where the arrow receptors are placed in gameplay. +UserPrefComboOnRolls=Choose if rolls should increment the combo or not. +UserPrefComboUnderField=Determine if the combo should display under the notes or not. UserPrefGameplayShowScore=Show or Hide the score display in gameplay. UserPrefSpecialScoringMode=Select the scoring mode to be used if the Special scoring type is selected. From 3740c328ba04cd5da843a71a4507fd04a251e6f5 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 3 Apr 2011 23:57:53 -0400 Subject: [PATCH 27/28] [metricClean] Guess no more GamePrefs. --- Themes/default/Languages/en.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Themes/default/Languages/en.ini b/Themes/default/Languages/en.ini index 0c6b61d7c8..1afd38fa53 100644 --- a/Themes/default/Languages/en.ini +++ b/Themes/default/Languages/en.ini @@ -77,7 +77,7 @@ LifeDifficulty=Life Difficulty: %s TimingDifficulty=Timing Difficulty: %s [OptionTitles] -GamePrefAutoSetStyle=Auto Set Style +UserPrefAutoSetStyle=Auto Set Style UserPrefSpecialScoringMode=Special Scoring Mode UserPrefNotePosition=Note Positions UserPrefComboOnRolls=Rolls Increment Combo @@ -91,7 +91,7 @@ UserPrefFlashyCombo=Flashy Combo UserPrefGameplayFooter=Gameplay Footer [OptionExplanations] -GamePrefAutoSetStyle=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! ) +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! ) UserPrefNotePosition=Determines where the arrow receptors are placed in gameplay. UserPrefComboOnRolls=Choose if rolls should increment the combo or not. UserPrefComboUnderField=Determine if the combo should display under the notes or not. From dae8bc3cecac47fca51ea05481ec82646147ae2e Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Mon, 4 Apr 2011 00:58:18 -0400 Subject: [PATCH 28/28] Part of OpenITG's profile bugfix. Needs some lua hooks on our end though apparently. --- src/Profile.h | 13 ++++++++----- src/ProfileManager.cpp | 11 +++++++++++ src/ProfileManager.h | 2 ++ src/ScreenNameEntryTraditional.cpp | 3 ++- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/Profile.h b/src/Profile.h index b95fd8d3a7..1115192911 100644 --- a/src/Profile.h +++ b/src/Profile.h @@ -85,11 +85,12 @@ public: m_iNumExtraStagesPassed(0), m_iNumExtraStagesFailed(0), m_iNumToasties(0), m_iTotalTapsAndHolds(0), m_iTotalJumps(0), m_iTotalHolds(0), m_iTotalRolls(0), m_iTotalMines(0), - m_iTotalHands(0), m_iTotalLifts(0), m_UnlockedEntryIDs(), - m_sLastPlayedMachineGuid(""), m_LastPlayedDate(), - m_iNumSongsPlayedByStyle(), m_iNumTotalSongsPlayed(0), - m_UserData(), m_SongHighScores(), m_CourseHighScores(), - m_vScreenshots(), m_mapDayToCaloriesBurned() + m_iTotalHands(0), m_iTotalLifts(0), m_bNewProfile(false), + m_UnlockedEntryIDs(), m_sLastPlayedMachineGuid(""), + m_LastPlayedDate(),m_iNumSongsPlayedByStyle(), + m_iNumTotalSongsPlayed(0), m_UserData(), m_SongHighScores(), + m_CourseHighScores(), m_vScreenshots(), + m_mapDayToCaloriesBurned() { m_lastSong.Unset(); m_lastCourse.Unset(); @@ -182,6 +183,8 @@ public: int m_iTotalMines; int m_iTotalHands; int m_iTotalLifts; + /** @brief Is this a brand new profile? */ + bool m_bNewProfile; set m_UnlockedEntryIDs; /** * @brief Which machine did we play on last, based on the Guid? diff --git a/src/ProfileManager.cpp b/src/ProfileManager.cpp index aa103b4e6b..bd84550431 100644 --- a/src/ProfileManager.cpp +++ b/src/ProfileManager.cpp @@ -97,6 +97,7 @@ void ProfileManager::Init() m_bLastLoadWasTamperedOrCorrupt[p] = false; m_bLastLoadWasFromLastGood[p] = false; m_bNeedToBackUpLastLoad[p] = false; + m_bNewProfile[p] = false; } LoadMachineProfile(); @@ -222,6 +223,7 @@ bool ProfileManager::LoadProfileFromMemoryCard( PlayerNumber pn, bool bLoadEdits vector asDirsToTry; GetMemoryCardProfileDirectoriesToTry( asDirsToTry ); + m_bNewProfile[pn] = true; for( unsigned i = 0; i < asDirsToTry.size(); ++i ) { @@ -239,6 +241,7 @@ bool ProfileManager::LoadProfileFromMemoryCard( PlayerNumber pn, bool bLoadEdits ProfileLoadResult res = LoadProfile( pn, sDir, true ); if( res == ProfileLoadResult_Success ) { + m_bNewProfile[pn] = false; /* If importing, store the directory we imported from, for display purposes. */ if( i > 0 ) m_sProfileDirImportedFrom[pn] = asDirsToTry[i]; @@ -246,7 +249,10 @@ bool ProfileManager::LoadProfileFromMemoryCard( PlayerNumber pn, bool bLoadEdits } if( res == ProfileLoadResult_FailedTampered ) + { + m_bNewProfile[pn] = false; break; + } } /* If we imported a profile fallback directory, change the memory card @@ -544,6 +550,11 @@ bool ProfileManager::ProfileWasLoadedFromMemoryCard( PlayerNumber pn ) const return !m_sProfileDir[pn].empty() && m_bWasLoadedFromMemoryCard[pn]; } +bool ProfileManager::ProfileFromMemoryCardIsNew( PlayerNumber pn ) const +{ + return GetProfile(pn) && m_bWasLoadedFromMemoryCard[pn] && m_bNewProfile[pn]; +} + bool ProfileManager::LastLoadWasTamperedOrCorrupt( PlayerNumber pn ) const { return !m_sProfileDir[pn].empty() && m_bLastLoadWasTamperedOrCorrupt[pn]; diff --git a/src/ProfileManager.h b/src/ProfileManager.h index e083d13636..6cb5632388 100644 --- a/src/ProfileManager.h +++ b/src/ProfileManager.h @@ -77,6 +77,7 @@ public: RString GetPlayerName( PlayerNumber pn ) const; bool ProfileWasLoadedFromMemoryCard( PlayerNumber pn ) const; + bool ProfileFromMemoryCardIsNew( PlayerNumber pn ) const; bool LastLoadWasTamperedOrCorrupt( PlayerNumber pn ) const; bool LastLoadWasFromLastGood( PlayerNumber pn ) const; @@ -117,6 +118,7 @@ private: bool m_bLastLoadWasTamperedOrCorrupt[NUM_PLAYERS]; // true if Stats.xml was present, but failed to load (probably because of a signature failure) bool m_bLastLoadWasFromLastGood[NUM_PLAYERS]; // if true, then m_bLastLoadWasTamperedOrCorrupt is also true mutable bool m_bNeedToBackUpLastLoad[NUM_PLAYERS]; // if true, back up profile on next save + bool m_bNewProfile[NUM_PLAYERS]; Profile *m_pMemoryCardProfile[NUM_PLAYERS]; // holds Profile for the currently inserted card Profile *m_pMachineProfile; diff --git a/src/ScreenNameEntryTraditional.cpp b/src/ScreenNameEntryTraditional.cpp index 6c0c229e3f..3663641412 100644 --- a/src/ScreenNameEntryTraditional.cpp +++ b/src/ScreenNameEntryTraditional.cpp @@ -81,7 +81,8 @@ void ScreenNameEntryTraditional::BeginScreen() GAMESTATE->GetRankingFeats( pn, aFeats ); bool bNoStagesLeft = GAMESTATE->m_iPlayerStageTokens[pn] <= 0; - m_bEnteringName[pn] = aFeats.size() > 0 && bNoStagesLeft; + m_bEnteringName[pn] = ( aFeats.size() > 0 || + PROFILEMAN->ProfileFromMemoryCardIsNew(pn) ) && bNoStagesLeft; m_bFinalized[pn] = !m_bEnteringName[pn]; }