various theme changes from midi; shortens the main options menu a bit

This commit is contained in:
AJ Kelly
2010-08-02 01:18:32 -05:00
parent c850a851bf
commit b5a7c11b4f
6 changed files with 36 additions and 15 deletions
+2
View File
@@ -397,6 +397,7 @@ ProgressiveNonstopLifebar=Determine whether the lifebar gets harsher as a nonsto
ProgressiveStageLifebar=Determine whether the lifebar gets harsher on later stages. LifeDifficulty + this = LifeDifficulty on a final stage. (No effect if Event Mode).
ProTiming=ProTiming
RandomBackgroundMode=Choose background style. &oq;Animations&cq; uses random items in the BGAnimations folder; &oq;Random Movies&cq; cycles through movies in the RandomMovies folder.
More Options=Access more advanced options here.
RandomModifiers=
Rate=Rate
RefreshRate=Controls how many times per second the screen will refresh. Only has an effect when Display Mode is set to &oq;Full Screen&cq;.
@@ -885,6 +886,7 @@ MenuTimer=Menu Timer
Meter=Meter
Mines=Mines
MoveRandomToEnd=Random At End
More Options=More Options
MovieColorDepth=Movie Color
MusicWheelSwitchSpeed=Wheel Speed
MusicWheelUsesSections=Wheel Sections
+20 -6
View File
@@ -720,14 +720,13 @@ FadeSeconds=1
SwitchSeconds=0.10
RandomPicksLockedSongs=true
UseSectionsWithPreferredGroup=false
OnlyShowActiveSection=false
RemindWheelPositions=false
#
RouletteSwitchSeconds=0.05
RouletteSlowDownSwitches=5
LockedInitialVelocity=15
#
OnlyShowActiveSection=false
RemindWheelPositions=false
#
ScrollBarHeight=300
ScrollBarOnCommand=visible,false
#
@@ -2310,7 +2309,8 @@ Fallback="ScreenOptionsSimpleService"
NextScreen=Branch.Init()
PrevScreen=Branch.Init()
LineNames="SD,1,2,Sync,13,3,10,11,4,12,6,5,Theme,8,9"
LineNames="SystemDirection,KeyConfig,GameType,Reload,MoreOptions"
# LineNames="SystemDirection,1,2,Sync,13,3,10,11,4,12,6,5,Theme,8,9"
Line1="gamecommand;screen,ScreenMapControllers;name,Key Joy Mappings"
Line2="gamecommand;screen,ScreenTestInput;name,Test Input"
Line13="gamecommand;screen,ScreenSelectGame;name,Select Game"
@@ -2325,8 +2325,20 @@ Line8="gamecommand;screen,ScreenOptionsManageProfiles;name,Profiles"
Line9="gamecommand;screen,ScreenReloadSongs;name,Reload Songs"
LineTheme="gamecommand;screen,ScreenOptionsTheme;name,Theme Options"
LineSD="gamecommand;screen,ScreenOptionsSystemDirection;name,System Direction"
LineSystemDirection="gamecommand;screen,ScreenOptionsSystemDirection;name,System Direction"
LineKeyConfig="gamecommand;screen,ScreenMapControllers;name,Key Joy Mappings"
LineGameType="gamecommand;screen,ScreenSelectGame;name,Select Game"
LineSync="gamecommand;screen,ScreenGameplaySyncMachine;name,Calibrate Machine Sync"
LineReload="gamecommand;screen,ScreenReloadSongs;name,Reload Songs"
LineMoreOptions="gamecommand;screen,ScreenOptionsExtended;name,More Options"
[ScreenOptionsExtended]
Fallback="ScreenOptionsService"
#
NextScreen="ScreenOptionsService"
PrevScreen="ScreenOptionsService"
#
LineNames="SystemDirection,1,2,Sync,13,3,10,11,4,12,6,5,Theme,8,9"
[ScreenOptionsServiceChild]
Fallback="ScreenOptionsMaster"
@@ -2351,6 +2363,8 @@ ExplanationTogetherY=SCREEN_CENTER_Y+174
ExplanationTogetherOnCommand=zoom,0.625;shadowlength,0;wrapwidthpixels,600/0.665;cropright,1;linear,0.5;cropright,0
ExplanationTogetherOffCommand=
[ScreenOptionsServiceExtendedChild]
Fallback="ScreenOptionsServiceChild"
[ScreenMiniMenu]
Class="ScreenMiniMenu"
Fallback="ScreenOptions"
@@ -11,11 +11,13 @@ local tRemap = {
Stage_5th = 5,
Stage_6th = 6,
};
if tRemap[sStage] == PREFSMAN:GetPreference("SongsPerPlay") then
sStage = "Stage_Final";
else
return
sStage = sStage;
end;
local t = Def.ActorFrame {};
t[#t+1] = Def.Quad {
InitCommand=cmd(Center;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color("Black"));
Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

+11 -8
View File
@@ -86,12 +86,12 @@ JudgmentOnCommand=
# !!! #
JudgmentW1Command=shadowlength,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=shadowlength,0;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0
JudgmentW3Command=shadowlength,0;diffusealpha,1;zoom,1.2;linear,0.05;zoom,1;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0;
JudgmentW4Command=shadowlength,0;diffusealpha,1;zoom,1.1;linear,0.05;zoom,1;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0;
JudgmentW5Command=shadowlength,0;diffusealpha,1;zoom,1.0;vibrate;effectmagnitude,1,2,2;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0
JudgmentMissCommand=shadowlength,0;diffusealpha,1;zoom,1;y,-20;linear,0.8;y,20;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0
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;
JudgmentW4Command=finishtweening;y,0;shadowlength,0;diffusealpha,1;zoom,1.1;linear,0.05;zoom,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0;
JudgmentW5Command=finishtweening;y,0;shadowlength,0;diffusealpha,1;zoom,1.0;vibrate;effectmagnitude,1,2,2;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0
JudgmentMissCommand=finishtweening;y,0;shadowlength,0;diffusealpha,1;zoom,1;y,-20;linear,0.8;y,20;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0
[LifeMeterBar]
OverOnCommand=diffuse,Color("Orange");diffuserightedge,BoostColor(Color("Orange"),1.5)
@@ -764,7 +764,7 @@ ItemsLongRowSharedX=SCREEN_CENTER_X
[ScreenOptionsTheme]
Fallback="ScreenOptionsServiceChild"
LineNames="gNotePos,gAuto,gScore,gSDisp,gOpts,gLongFail,"
LineNames="gNotePos,gAuto,gScore,gSDisp,gOpts,gLongFail,FlashyCombo"
#,gAuto
LinegNotePos="lua,UserPrefNotePosition()"
LinegScore="lua,UserPrefGameplayShowScore()"
@@ -772,13 +772,16 @@ LinegSDisp="lua,UserPrefGameplayShowStepsDisplay()"
LinegOpts="lua,UserPrefShowLotsaOptions()"
LinegAuto="lua,UserPrefAutoSetStyle()"
LinegLongFail="lua,UserPrefLongFail()"
LineFlashyCombo="lua,UserPrefFlashyCombo()"
[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