various theme changes from midi

This commit is contained in:
AJ Kelly
2010-07-19 20:36:37 -05:00
parent 1d47332cb1
commit ca5a13a71b
7 changed files with 113 additions and 49 deletions
+3 -1
View File
@@ -341,6 +341,7 @@ DisplayResolution=Choose the output resolution. A higher resolution will show m
EasterEggs=Enable or disable some special easter eggs.
Edit Courses=Edit Courses
Edit Songs/Steps=Edit Songs/Steps
Practice Songs/Steps=Practice Songs/Steps
EditorShowBGChangesPlay=Choose whether to display song backgrounds while playing.
Effect=Effect
EnableAttackSounds=If enabled, a sound effect will play when an attack begins or ends.
@@ -811,6 +812,7 @@ DisplayResolution=Display Resolution
Duration seconds=Duration seconds
EasterEggs=Easter Eggs
Edit Songs/Steps=Edit Songs/Steps
Practice Songs/Steps=Practice Songs/Steps
Edit Courses=Edit Courses
Edit BPM change=Edit BPM change
Edit song info=Edit song info
@@ -1915,7 +1917,7 @@ Event=Event
Demo=Demo
[JudgmentLine]
W1=Fantastic
W1=Flawless
W2=Perfect
W3=Great
W4=Good
+16
View File
@@ -4,6 +4,22 @@
-- shakesoda calls this pump.lua
-- GetEditModifiers
-- [en] returns modifiers for ScreenEdit to use.
function GetEditModifiers()
sGame = GAMESTATE:GetCurrentGame():GetName()
local Modes = {
dance = "",
pump = "",
beat = "reverse",
kb7 = "reverse",
para = "",
techno = "",
lights = "" -- lights shouldn't be playable
}
return Modes[sGame]
end
-- GameCompatibleModes:
-- [en] returns possible modes for ScreenSelectPlayMode
function GameCompatibleModes()
+21 -11
View File
@@ -2136,11 +2136,11 @@ PlayerAutoPlayDefault="mod,no playerautoplay"
PlayerAutoPlay,1="name,Off"
PlayerAutoPlay,2="mod,playerautoplay;name,On"
Hide="2;selectmultiple"
Hide="3;selectmultiple"
HideDefault="mod,no dark,no blind,no cover"
Hide,1="mod,dark;name,Dark"
Hide,2="mod,blind;name,Blind"
Hide,3="mod,blind;name,Cover"
Hide,3="mod,60% cover;name,Cover"
# Hide="3"
# HideDefault="mod,no dark,no blind"
@@ -2820,8 +2820,6 @@ NumW2s=0
NumMisses=0
# 05 # B
[ScreenEdit]
EditModifiers=
# 05 # C
[ScreenGameplay]
@@ -3210,13 +3208,14 @@ Fallback="ScreenOptionsSimpleService"
NextScreen=Branch.TitleMenu()
PrevScreen=Branch.TitleMenu()
#LineNames="1,2,3,4,5,6"
LineNames="1,2,3"
LineNames="1,2,3,4"
Line1="gamecommand;screen,ScreenEditMenu;name,Edit Songs/Steps"
Line2="gamecommand;screen,ScreenOptionsExportPackage;name,Export Packages"
Line3="gamecommand;screen,ScreenOptionsManageCourses;name,Edit Courses"
Line4="gamecommand;screen,ScreenServiceActionCopyEditsMachineToMemoryCard;name,Transfer Edits to USB"
Line5="gamecommand;screen,ScreenOptionsGraphicsSound;name,Transfer Edits from USB"
Line6="gamecommand;screen,ScreenOptionsAdvanced;name,Clear USB edits"
Line2="gamecommand;screen,ScreenPracticeMenu;name,Practice Songs/Steps"
Line3="gamecommand;screen,ScreenOptionsExportPackage;name,Export Packages"
Line4="gamecommand;screen,ScreenOptionsManageCourses;name,Edit Courses"
# Line4="gamecommand;screen,ScreenServiceActionCopyEditsMachineToMemoryCard;name,Transfer Edits to USB"
# Line5="gamecommand;screen,ScreenOptionsGraphicsSound;name,Transfer Edits from USB"
# Line6="gamecommand;screen,ScreenOptionsAdvanced;name,Clear USB edits"
[EditMenu]
EditMode="EditMode_Full"
@@ -3294,7 +3293,7 @@ AllowOperatorMenuButton=false
ShowCreditDisplay=false
ShowStyleIcon=false
TimerSeconds=-1
EditModifiers=""
EditModifiers=GetEditModifiers()
EditHelpX=SCREEN_LEFT+4
EditHelpY=SCREEN_TOP+16
EditHelpOnCommand=halign,0;valign,0;zoom,0.675;shadowlength,1
@@ -3305,6 +3304,17 @@ PlayRecordHelpX=SCREEN_LEFT+20
PlayRecordHelpY=SCREEN_BOTTOM-20
PlayRecordHelpOnCommand=halign,0;valign,0;shadowlength,1
[ScreenPracticeMenu]
Fallback="ScreenEditMenu"
Class="ScreenEditMenu"
#
NextScreen="ScreenPractice"
[ScreenPractice]
Fallback="ScreenEdit"
Class="ScreenEdit"
#
EditMode="EditMode_Practice"
[ScreenEditOptions]
Fallback="ScreenOptions"
Class="ScreenOptionsMaster"
@@ -85,8 +85,8 @@ local function CreateStops()
end
local t = LoadFallbackB()
for pn in ivalues(PlayerNumber) do
local MetricsName = "SongMeterDisplay" .. PlayerNumberToString(pn);
t[#t+1] = Def.ActorFrame {
-- local MetricsName = "SongMeterDisplay" .. PlayerNumberToString(pn);
--[[ t[#t+1] = Def.ActorFrame {
InitCommand=function(self)
self:player(pn);
self:name(MetricsName);
@@ -118,7 +118,7 @@ for pn in ivalues(PlayerNumber) do
Tip=LoadActor( THEME:GetPathG( 'SongMeterDisplay', 'tip ' .. PlayerNumberToString(pn) ) ) .. { InitCommand=cmd(visible,false); };
};
CreateStops();
};
}; --]]
end;
for pn in ivalues(PlayerNumber) do
local MetricsName = "ToastyDisplay" .. PlayerNumberToString(pn);
@@ -132,5 +132,36 @@ for pn in ivalues(PlayerNumber) do
end;
t[#t+1] = StandardDecorationFromFileOptional("BPMDisplay","BPMDisplay");
t[#t+1] = StandardDecorationFromFileOptional("StageDisplay","StageDisplay");
t[#t+1] = Def.ActorFrame {
InitCommand=function(self)
self:name("SongMeterDisplay");
ActorUtil.LoadAllCommandsAndSetXY(self,Var "LoadingScreen");
end;
LoadActor( THEME:GetPathG( 'SongMeterDisplay', 'frame ' .. PlayerNumberToString(PLAYER_1) ) ) .. {
InitCommand=function(self)
self:name('Frame');
ActorUtil.LoadAllCommandsAndSetXY(self,"SongMeterDisplay");
end;
};
Def.Quad {
InitCommand=cmd(zoomto,2,8);
OnCommand=cmd(x,scale(0.25,0,1,-380/2,380/2);diffuse,Color("Orange");diffusealpha,0.5);
};
Def.Quad {
InitCommand=cmd(zoomto,2,8);
OnCommand=cmd(x,scale(0.5,0,1,-380/2,380/2);diffuse,Color("Orange");diffusealpha,0.5);
};
Def.Quad {
InitCommand=cmd(zoomto,2,8);
OnCommand=cmd(x,scale(0.75,0,1,-380/2,380/2);diffuse,Color("Orange");diffusealpha,0.5);
};
Def.SongMeterDisplay {
StreamWidth=THEME:GetMetric( "SongMeterDisplay", 'StreamWidth' );
Stream=LoadActor( THEME:GetPathG( 'SongMeterDisplay', 'stream ' .. PlayerNumberToString(PLAYER_1) ) )..{
InitCommand=cmd(diffuse,Color("Orange");diffusealpha,0.5;blend,Blend.Add;);
};
Tip=LoadActor( THEME:GetPathG( 'SongMeterDisplay', 'tip ' .. PlayerNumberToString(PLAYER_1) ) ) .. { InitCommand=cmd(visible,false); };
};
CreateStops();
};
return t
@@ -14,14 +14,14 @@ local LabelMaxZoom = THEME:GetMetric("Combo", "LabelMaxZoom");
local t = Def.ActorFrame {
InitCommand=cmd(vertalign,bottom);
LoadActor(THEME:GetPathG("Combo","100Milestone")) .. {
--[[ LoadActor(THEME:GetPathG("Combo","100Milestone")) .. {
Name="OneHundredMilestone";
FiftyMilestoneCommand=cmd(playcommand,"Milestone");
};
LoadActor(THEME:GetPathG("Combo","1000Milestone")) .. {
Name="OneThousandMilestone";
ToastyAchievedMessageCommand=cmd(playcommand,"Milestone");
};
}; --]]
Def.ActorFrame {
Name="ComboFrame";
LoadFont( "Combo", "numbers" ) .. {
+25 -25
View File
@@ -72,38 +72,38 @@ UserPrefAutoSetStyle=Allow the game to list all one player and two player modes
UserPrefLongFail=Choose between the original sm-ssc fail (Long) or the new sm-ssc fail (Short).
UserPrefComboOnRolls=Choose if rolls should increment the combo or not.
[StepsListDisplayRow StepsType]
Dance_Single=DS
Dance_Double=DB
Dance_Couple=DC
Dance_Solo=DX
Dance_Routine=DR
Dance_Threepanel=D3
Pump_Single=PS
Pump_Double=PD
Pump_Halfdouble=HD
Pump_Couple=PC
Pump_Routine=PR
Kb7_Single=KB7
Dance_Single=4
Dance_Double=8
Dance_Couple=8
Dance_Solo=6
Dance_Routine=8
Dance_Threepanel=3
Pump_Single=5
Pump_Double=10
Pump_Halfdouble=6
Pump_Couple=5
Pump_Routine=10
Kb7_Single=7
Ez2_Single=ES
Ez2_Double=ED
Ez2_Real=ER
Para_Single=PS
Ds3ddx_Single=XS
Bm_Single5=5K
Bm_Double5=10K
Bm_Single7=7K
Bm_Double7=14K
Bm_Single5=5
Bm_Double5=10
Bm_Single7=7
Bm_Double7=14
Maniax_Single=MS
Maniax_Double=MD
Techno_Single4=S4
Techno_Single5=S5
Techno_Single8=S8
Techno_Double4=D4
Techno_Double5=D5
Pnm_Five=5B
Pnm_Nine=9B
Guitar_Five=5F
Karaoke=KA
Techno_Single4=4
Techno_Single5=5
Techno_Single8=8
Techno_Double4=4
Techno_Double5=5
Pnm_Five=5
Pnm_Nine=9
Guitar_Five=5
Karaoke=V
Lights_Cabinet=!
[ScreenHowToInstallSongs]
+11 -6
View File
@@ -90,7 +90,7 @@ JudgmentW1Command=shadowlength,0;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;slee
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,4,8,8;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
[LifeMeterBar]
@@ -406,7 +406,7 @@ ContainerOffCommand=
FrameX=0
FrameY=0
FrameOnCommand=
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
@@ -1302,6 +1302,11 @@ WaitForChildrenBeforeTweening=true
[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
SongMeterDisplayOffCommand=
#
SongMeterDisplayP1X=SCREEN_LEFT+16
SongMeterDisplayP1Y=SCREEN_CENTER_Y
SongMeterDisplayP1OnCommand=rotationz,-90;zoom,0;addx,-24;sleep,1.5;decelerate,0.5;zoom,1;addx,24
@@ -1341,12 +1346,12 @@ CombinedLifeOffCommand=
#
ToastyDisplayP1X=(GAMESTATE:GetCurrentStyle():GetStyleType() == 'StyleType_OnePlayerTwoSides' or (PREFSMAN:GetPreference("Center1Player") and GAMESTATE:GetNumPlayersEnabled() == 1)) and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX")
ToastyDisplayP1Y=SCREEN_CENTER_Y
ToastyDisplayP1OnCommand=
ToastyDisplayP1OnCommand=visible,false
ToastyDisplayP1OffCommand=
#
ToastyDisplayP2X=(GAMESTATE:GetCurrentStyle():GetStyleType() == 'StyleType_OnePlayerTwoSides' or (PREFSMAN:GetPreference("Center1Player") and GAMESTATE:GetNumPlayersEnabled() == 1)) and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP2OnePlayerOneSideX")
ToastyDisplayP2Y=SCREEN_CENTER_Y
ToastyDisplayP2OnCommand=
ToastyDisplayP2OnCommand=visible,false
ToastyDisplayP2OffCommand=
#
SongNumberP1X=THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") - 60
@@ -1360,11 +1365,11 @@ SongNumberP2OffCommand=
#
ScoreP1X=(PREFSMAN:GetPreference("Center1Player") and GAMESTATE:GetNumPlayersEnabled() == 1) and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX")
ScoreP1Y=SCREEN_BOTTOM-28
ScoreP1OnCommand=visible,GetUserPrefB("UserPrefGameplayShowScore");sleep,3+0.3;smooth,0.5;y,SCREEN_BOTTOM-50
ScoreP1OnCommand=visible,GetUserPrefB("UserPrefGameplayShowScore");diffuse,PlayerColor(PLAYER_1);sleep,3+0.3;smooth,0.5;y,SCREEN_BOTTOM-50
ScoreP1OffCommand=
ScoreP2X=(PREFSMAN:GetPreference("Center1Player") and GAMESTATE:GetNumPlayersEnabled() == 1) and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP2OnePlayerOneSideX")
ScoreP2Y=SCREEN_BOTTOM-28
ScoreP2OnCommand=visible,GetUserPrefB("UserPrefGameplayShowScore");sleep,3+0.3;smooth,0.5;y,SCREEN_BOTTOM-50
ScoreP2OnCommand=visible,GetUserPrefB("UserPrefGameplayShowScore");diffuse,PlayerColor(PLAYER_2);sleep,3+0.3;smooth,0.5;y,SCREEN_BOTTOM-50
ScoreP2OffCommand=
#
StepsDescriptionP1X=(PREFSMAN:GetPreference("Center1Player") and GAMESTATE:GetNumPlayersEnabled() == 1) and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX")