diff --git a/stepmania/Themes/default/BGAnimations/ScreenLegal background/bg.png b/stepmania/Themes/default/BGAnimations/ScreenLegal background/bg.png new file mode 100644 index 0000000000..a8159e9865 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenLegal background/bg.png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenLegal background/default.lua b/stepmania/Themes/default/BGAnimations/ScreenLegal background/default.lua new file mode 100644 index 0000000000..0fe48bfea3 --- /dev/null +++ b/stepmania/Themes/default/BGAnimations/ScreenLegal background/default.lua @@ -0,0 +1,3 @@ +return LoadActor("bg") .. { + InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;); +}; \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenLegal decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenLegal decorations/default.lua new file mode 100644 index 0000000000..85dc33967f --- /dev/null +++ b/stepmania/Themes/default/BGAnimations/ScreenLegal decorations/default.lua @@ -0,0 +1,14 @@ +return Def.ActorFrame { + Def.ActorFrame { + InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;); + LoadActor("frame") .. { + InitCommand=cmd(); + }; + LoadFont("_terminator two 60") .. { + InitCommand=cmd(y,-150;settext,ScreenString("Warning");diffuse,color("#fef500");strokecolor,color("#0167d2");shadowlength,0); + }; + LoadFont("_venacti bold 30") .. { + InitCommand=cmd(y,20;settext,ScreenString("BodyText");wrapwidthpixels,1000;strokecolor,color("#0167d2");shadowlength,0); + }; + }; +}; \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenLegal decorations/frame (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenLegal decorations/frame (doubleres).png new file mode 100644 index 0000000000..49797041ff Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenLegal decorations/frame (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/_moveon (doubleres).png b/stepmania/Themes/default/BGAnimations/_moveon (doubleres).png new file mode 100644 index 0000000000..8701fee0dd Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/_moveon (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/_moveon.png b/stepmania/Themes/default/BGAnimations/_moveon.png deleted file mode 100644 index 25a0d95e18..0000000000 Binary files a/stepmania/Themes/default/BGAnimations/_moveon.png and /dev/null differ diff --git a/stepmania/Themes/default/Graphics/ScreenOptionsSimple cursor.redir b/stepmania/Themes/default/Graphics/ScreenOptionsSimple cursor.redir deleted file mode 100644 index 04b2ead777..0000000000 --- a/stepmania/Themes/default/Graphics/ScreenOptionsSimple cursor.redir +++ /dev/null @@ -1 +0,0 @@ -_blank \ No newline at end of file diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini index 05f363265a..f084ccaaef 100644 --- a/stepmania/Themes/default/Languages/en.ini +++ b/stepmania/Themes/default/Languages/en.ini @@ -1156,6 +1156,10 @@ PlayMode_Battle instructions= Hold instructions=Hold arrows are arrows that you must keep held down. A successfully held down hold arrow will give you an OK while a missed hold arrow will give you an NG. Mine instructions=Mines are explosive and should be avoided at all costs as they will take life off of your meter. They will trigger if you keep your foot held down as they pass. +[ScreenLegal] +Warning=Warning +BodyText=The StepMania program source codeis licensed under a permissive open-source license.\n\nThe StepMania name and logos are protected by Trademark law.\n\nThe StepMania default theme SOUNDS ARE SEPARATELY OWNED BY THE AUTHORS. ALL OTHER THEME COMPONENTS ARE LICENSED UNDER THE STEPMANIA LICENSE.\n\nSee license.txt for details. + [ScreenMapControllers] HeaderText=Map Controllers InvalidButton=That key can not be mapped. diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 1628ef64f3..7e3fcc4078 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -3194,11 +3194,6 @@ ScoreOffsetY=0 ScoreOnCommand=zoom,0.7;ztest,1 ScoreOffCommand= -[ScreenIntroMovie] -Class="ScreenAttract" -Fallback="ScreenAttract" -NextScreen="ScreenDemonstration" - [ScreenMemoryCard] Class="ScreenAttract" Fallback="ScreenAttract" @@ -3207,11 +3202,18 @@ NextScreen="ScreenCompany" [ScreenCompany] Class="ScreenAttract" Fallback="ScreenAttract" -NextScreen="ScreenLogo" -PrevScreen="ScreenCompany" +NextScreen="ScreenLegal" +PrevScreen="" TimerSeconds=9 -[ScreenAlbums] +[ScreenLegal] +Class="ScreenAttract" +Fallback="ScreenAttract" +NextScreen="ScreenIntro" +PrevScreen="" +TimerSeconds=9 + +[ScreenIntro] Class="ScreenAttract" Fallback="ScreenAttract" NextScreen="ScreenLogo"