From 85e14ebfce038392eca05011a470c09ea7107a65 Mon Sep 17 00:00:00 2001 From: "Devin J. Pohly" Date: Tue, 4 Jun 2013 23:31:57 -0400 Subject: [PATCH] Partial revert of a72416e --- Themes/_fallback/Scripts/03 Gameplay.lua | 4 ++-- Themes/_fallback/metrics.ini | 2 +- .../default/BGAnimations/ScreenDemonstration decorations.lua | 1 + Themes/default/BGAnimations/ScreenHowToPlay decorations.lua | 1 + Themes/default/BGAnimations/ScreenInit decorations.lua | 1 + Themes/default/BGAnimations/ScreenLogo decorations.lua | 1 + Themes/default/BGAnimations/ScreenTitleJoin decorations.lua | 1 + Themes/default/BGAnimations/_Arcade decorations/default.lua | 2 +- 8 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Themes/_fallback/Scripts/03 Gameplay.lua b/Themes/_fallback/Scripts/03 Gameplay.lua index dee3634471..f80281cc04 100644 --- a/Themes/_fallback/Scripts/03 Gameplay.lua +++ b/Themes/_fallback/Scripts/03 Gameplay.lua @@ -43,8 +43,8 @@ end -- [en] returns possible modes for ScreenSelectPlayMode function GameCompatibleModes() local Modes = { - dance = "Single,Double,Solo,Versus", - pump = "Single,Double,HalfDouble,Versus", + dance = "Single,Double,Solo,Versus,Couple", + pump = "Single,Double,HalfDouble,Versus,Couple,Routine", beat = "5Keys,7Keys,10Keys,14Keys,Versus5,Versus7", kb7 = "KB7", para = "Single", diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 0c0c13e3a8..b9c3a2e38c 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -3001,7 +3001,7 @@ Fallback="ScreenOptionsServiceChild" NextScreen="ScreenOptionsService" PrevScreen="ScreenOptionsService" # stuff tied to arcade features -LineNames="1,2,3,5,6" +LineNames="1,2,3,4,5,6" Line1="conf,GetRankingName" Line2="conf,CoinMode" Line3="conf,SongsPerPlay" diff --git a/Themes/default/BGAnimations/ScreenDemonstration decorations.lua b/Themes/default/BGAnimations/ScreenDemonstration decorations.lua index 44a5fc11c5..65d556611d 100644 --- a/Themes/default/BGAnimations/ScreenDemonstration decorations.lua +++ b/Themes/default/BGAnimations/ScreenDemonstration decorations.lua @@ -1,2 +1,3 @@ local t = LoadFallbackB(); +t[#t+1] = LoadActor( THEME:GetPathB("_Arcade","decorations") ); return t \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenHowToPlay decorations.lua b/Themes/default/BGAnimations/ScreenHowToPlay decorations.lua index 44a5fc11c5..65d556611d 100644 --- a/Themes/default/BGAnimations/ScreenHowToPlay decorations.lua +++ b/Themes/default/BGAnimations/ScreenHowToPlay decorations.lua @@ -1,2 +1,3 @@ local t = LoadFallbackB(); +t[#t+1] = LoadActor( THEME:GetPathB("_Arcade","decorations") ); return t \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenInit decorations.lua b/Themes/default/BGAnimations/ScreenInit decorations.lua index 44a5fc11c5..65d556611d 100644 --- a/Themes/default/BGAnimations/ScreenInit decorations.lua +++ b/Themes/default/BGAnimations/ScreenInit decorations.lua @@ -1,2 +1,3 @@ local t = LoadFallbackB(); +t[#t+1] = LoadActor( THEME:GetPathB("_Arcade","decorations") ); return t \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenLogo decorations.lua b/Themes/default/BGAnimations/ScreenLogo decorations.lua index 09d7c7e74a..1a520b1693 100644 --- a/Themes/default/BGAnimations/ScreenLogo decorations.lua +++ b/Themes/default/BGAnimations/ScreenLogo decorations.lua @@ -1,5 +1,6 @@ local t = LoadFallbackB(); t[#t+1] = StandardDecorationFromFileOptional("Logo","Logo"); +t[#t+1] = LoadActor( THEME:GetPathB("_Arcade","decorations") ); return t; \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenTitleJoin decorations.lua b/Themes/default/BGAnimations/ScreenTitleJoin decorations.lua index 44a5fc11c5..65d556611d 100644 --- a/Themes/default/BGAnimations/ScreenTitleJoin decorations.lua +++ b/Themes/default/BGAnimations/ScreenTitleJoin decorations.lua @@ -1,2 +1,3 @@ local t = LoadFallbackB(); +t[#t+1] = LoadActor( THEME:GetPathB("_Arcade","decorations") ); return t \ No newline at end of file diff --git a/Themes/default/BGAnimations/_Arcade decorations/default.lua b/Themes/default/BGAnimations/_Arcade decorations/default.lua index f6e47d24c3..a98070d7d8 100644 --- a/Themes/default/BGAnimations/_Arcade decorations/default.lua +++ b/Themes/default/BGAnimations/_Arcade decorations/default.lua @@ -13,7 +13,7 @@ t[#t+1] = Def.ActorFrame { }; LoadFont("Common Normal") .. { InitCommand=cmd(zoom,0.75;shadowlength,1;glowshift;strokecolor,Color("Outline");diffuse,Color("Orange");diffusetopedge,Color("Yellow");textglowmode,'TextGlowMode_Inner'); - Text=THEME:GetString("ScreenTitleJoin","HelpTextWait"); + Text="PRESS ENTER"; OnCommand=cmd(playcommand,"Refresh"); CoinInsertedMessageCommand=cmd(playcommand,"Refresh"); CoinModeChangedMessageCommand=cmd(playcommand,"Refresh");