[default -> sm5a2futures] Due for this now.

BackgroundEffects/SongBgWithMovieViz.lua

@@ -7,7 +7,7 @@ local t = Def.ActorFrame {
 	};
 
 	LoadActor(Var "File1") .. {
-		OnCommand=cmd(blend,"BlendMode_Add";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color2;effectclock,"music");
+		OnCommand=cmd(blend,"BlendMode_Add";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color2;effectclock,"music");
 		GainFocusCommand=cmd(play);
 		LoseFocusCommand=cmd(pause);
 	};

BackgroundEffects/StretchNoLoop.lua

@@ -2,7 +2,7 @@ local Color1 = color(Var "Color1");
 
 local t = Def.ActorFrame {
 	LoadActor(Var "File1") .. {
-		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color1;loop,false;effectclock,"music");
+		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;loop,false;effectclock,"music");
 		GainFocusCommand=cmd(play);
 		LoseFocusCommand=cmd(pause);
 	};

BackgroundEffects/StretchNormalAlignLeft.lua

@@ -3,7 +3,7 @@ local Color1 = color(Var "Color1");
 
 local t = Def.ActorFrame {
 	LoadActor(Var "File1") .. {
-		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color1;effectclock,"music");
+		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
 		GainFocusCommand=cmd(play);
 		LoseFocusCommand=cmd(pause);
 	};

BackgroundEffects/StretchNormalBlue.lua

@@ -3,7 +3,7 @@ local Color1 = color("0,0,1,1");
 
 local t = Def.ActorFrame {
 	LoadActor(Var "File1") .. {
-		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color1;effectclock,"music");
+		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
 		GainFocusCommand=cmd(play);
 		LoseFocusCommand=cmd(pause);
 	};

BackgroundEffects/StretchNormalGreen.lua

@@ -3,7 +3,7 @@ local Color1 = color("0,1,0,1");
 
 local t = Def.ActorFrame {
 	LoadActor(Var "File1") .. {
-		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color1;effectclock,"music");
+		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
 		GainFocusCommand=cmd(play);
 		LoseFocusCommand=cmd(pause);
 	};

BackgroundEffects/StretchNormalRed.lua

@@ -3,7 +3,7 @@ local Color1 = color("1,0,0,1");
 
 local t = Def.ActorFrame {
 	LoadActor(Var "File1") .. {
-		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color1;effectclock,"music");
+		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
 		GainFocusCommand=cmd(play);
 		LoseFocusCommand=cmd(pause);
 	};

BackgroundEffects/StretchPaused.lua

@@ -2,7 +2,7 @@ local Color1 = color(Var "Color1");
 
 local t = Def.ActorFrame {
 	LoadActor(Var "File1") .. {
-		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color1;pause;effectclock,"music");
+		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;pause;effectclock,"music");
 		GainFocusCommand=cmd(play);
 		LoseFocusCommand=cmd(pause);
 	};

BackgroundEffects/StretchRewind.lua

@@ -2,7 +2,7 @@ local Color = color(Var "Color1");
 
 local t = Def.ActorFrame {
 	LoadActor(Var "File1") .. {
-		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color1;position,0;effectclock,"music");
+		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;position,0;effectclock,"music");
 		GainFocusCommand=cmd(play);
 		LoseFocusCommand=cmd(pause);
 	};

BackgroundEffects/Vizualization2File.lua

@@ -3,7 +3,7 @@ local Color2 = color(Var "Color2");
 
 local t = Def.ActorFrame {
 	LoadActor(Var "File1") .. {
-		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color1;effectclock,"music");
+		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
 		GainFocusCommand=cmd(play);
 		LoseFocusCommand=cmd(pause);
 	};

Courses/Default/Jupiter.crs

@@ -1,8 +1,9 @@
 #COURSE:Jupiter;
 #SCRIPTER:Midiman;
+#METER:Medium:5;
 
 #GAINSECONDS:120;
-#SONG:StepMania 5\Springtime:Hard;
+#SONG:StepMania 5\Springtime:Medium;nodifficult;
 
 #GAINSECONDS:25;
-#SONG:StepMania 5\MechaTribe Assault:Hard;
+#SONG:StepMania 5\MechaTribe Assault:Easy;nodifficult;

Docs/Changelog_sm5.txt

@@ -5,6 +5,18 @@ from StepMania 4 alpha 5 to sm-ssc v1.2.5, see Changelog_sm-ssc.txt.
 ________________________________________________________________________________
 
 ================================================================================
+
+StepMania 5.0 alpha 2 | 20120???
+--------------------------------------------------------------------------------
+
+2012/03/01
+----------
+* [MemoryCardManager] Disable Memory Cards by default. If you want to use them,
+set MemoryCards=1 in Save/Preferences.ini (or Save/Static.ini). [AJ]
+* [GameState] Set Premium to Premium_DoubleFor1Credit by default. [AJ]
+* [ScreenSelectMusic] Added PlaySoundOnEnteringOptionsMenu metric. [AJ]
+* [MusicWheel, WheelBase] Added collapse sound. [AJ]
+
 StepMania 5.0 alpha 1a | 20120219
 --------------------------------------------------------------------------------
 

Docs/credits.txt

@@ -84,7 +84,7 @@ v1toko
 Macgravel
  * Orbular noteskin (the default kb7 noteskin)
 
-sy567
+hanubeki (@803832, formerly sy567)
  * Small beginner helper fix
  (http://www.stepmania.com/forums/showpost.php?p=158721&postcount=12)
 

Docs/license-ext/theme_lang-ja.txt

@@ -1,23 +1,19 @@
-Stepmania 5系本体用　日本語化セット6(2012/02/19)
+Stepmania 5系本体用　日本語化セット7(2012/02/26)
 作者：ナイラー
 -----------
 Stepmania5系本体では従来の日本語テーマ、および日本語ランゲージファイルが使用できなくなっています。
 個人的に日本語が見えているほうが安心できるので、とりあえずファイルを製作してみました。
 -----------
 以下のファイルが同梱されています。
-・fallbackja.ini(_fallbackテーマ用日本語ランゲージファイル) Ver 1.05γ
+・fallbackja.ini(_fallbackテーマ用日本語ランゲージファイル) Ver 1.06-A
 ・themeja.ini(デフォルトテーマ用日本語ランゲージファイル) Ver 1.03γ
-(添字がβからγになったのに強い意味はありません。番号動かしたくなかったので)
 -----------
 今回の更新点
-おそらくalpha 1に対するファイルとしては最終更新となります。
+今回からalpha 1a正式対応ということで。ああ石投げないで「てめー文章打ってるだけだろ」とか言わないで。
 fallbackja.iniに対して
-・エディットの曲選択時の解説を微変更。
+・エディットにとある設定項目が追加されたのでその部分の翻訳。
-・詳細オプションの名前を一部変更。
-・一部プレイオプションが紛れ込んでいたのを削除。
 themeja.iniに対して
-・プレイオプションの解説を少し充実した。
+・今回は更新されていません。セット6と同内容が収録されています。
-・テーマ固有オプションの名前、および解説の微変更。
 -----------
 それぞれのファイルは、次の場所に配置してください。
 ・fallbackja.iniは、「Theme」フォルダの「_fallback」フォルダ内の「Language」フォルダに、

Themes/HelloWorld/Graphics/ScreenGuideMain scroll.lua

@@ -4,19 +4,19 @@ local itemName = gc:GetName()
 local t = Def.ActorFrame{
 	-- focused frame
 	LoadActor( THEME:GetPathG("SectionMenu","ItemFocused") )..{
-		GainFocusCommand=cmd(decelerate,0.5;diffusealpha,1);
+		GainFocusCommand=cmd(decelerate,0.25;diffusealpha,1);
-		LoseFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,0);
+		LoseFocusCommand=cmd(stoptweening;decelerate,0.25;diffusealpha,0);
 	};
 	-- unfocused
 	LoadActor( THEME:GetPathG("SectionMenu","ItemUnfocused") )..{
-		GainFocusCommand=cmd(decelerate,0.5;diffusealpha,0);
+		GainFocusCommand=cmd(decelerate,0.25;diffusealpha,0);
-		LoseFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,1);
+		LoseFocusCommand=cmd(stoptweening;decelerate,0.25;diffusealpha,1);
 	};
 
 	LoadActor( THEME:GetPathG("_section", "Guide") )..{
-		InitCommand=cmd(x,-244;y,-23;Real;halign,0);
+		InitCommand=cmd(x,-240;y,-23;Real;halign,0);
-		GainFocusCommand=cmd(decelerate,0.5;diffusealpha,0.9);
+		GainFocusCommand=cmd(decelerate,0.25;diffusealpha,0.9);
-		LoseFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,0.45);
+		LoseFocusCommand=cmd(stoptweening;decelerate,0.25;diffusealpha,0.45);
 	};
 
 	Def.ActorFrame{
@@ -24,15 +24,15 @@ local t = Def.ActorFrame{
 			Name="SectionName";
 			Text=THEME:GetString("ScreenGuideMain",itemName);
 			InitCommand=cmd(x,-250;y,-6;halign,0;diffuse,color("#222222FF"));
-			GainFocusCommand=cmd(decelerate,0.5;diffusealpha,1);
+			GainFocusCommand=cmd(decelerate,0.25;diffusealpha,1);
-			LoseFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,0.5);
+			LoseFocusCommand=cmd(stoptweening;decelerate,0.25;diffusealpha,0.5);
 		};
 		LoadFont("_frutiger roman 24px")..{
 			Name="SectionDesc";
 			Text=THEME:GetString("ScreenGuideMain",itemName.."Desc");
 			InitCommand=cmd(x,-248;y,10;align,0,0;diffuse,color("#222222FF");zoom,0.5);
-			GainFocusCommand=cmd(decelerate,0.5;diffusealpha,1);
+			GainFocusCommand=cmd(decelerate,0.25;diffusealpha,1);
-			LoseFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,0.5);
+			LoseFocusCommand=cmd(stoptweening;decelerate,0.25;diffusealpha,0.5);
 		};
 	};
 };

Themes/HelloWorld/Graphics/ScreenReferenceMain scroll.lua

@@ -4,19 +4,19 @@ local itemName = gc:GetName()
 local t = Def.ActorFrame{
 	-- focused frame
 	LoadActor( THEME:GetPathG("SectionMenu","ItemFocused") )..{
-		GainFocusCommand=cmd(decelerate,0.5;diffusealpha,1);
+		GainFocusCommand=cmd(decelerate,0.25;diffusealpha,1);
-		LoseFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,0);
+		LoseFocusCommand=cmd(stoptweening;decelerate,0.25;diffusealpha,0);
 	};
 	-- unfocused
 	LoadActor( THEME:GetPathG("SectionMenu","ItemUnfocused") )..{
-		GainFocusCommand=cmd(decelerate,0.5;diffusealpha,0);
+		GainFocusCommand=cmd(decelerate,0.25;diffusealpha,0);
-		LoseFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,1);
+		LoseFocusCommand=cmd(stoptweening;decelerate,0.25;diffusealpha,1);
 	};
 
 	LoadActor( THEME:GetPathG("_section", "Reference") )..{
-		InitCommand=cmd(x,-244;y,-23;Real;halign,0);
+		InitCommand=cmd(x,-240;y,-23;Real;halign,0);
-		GainFocusCommand=cmd(decelerate,0.5;diffusealpha,0.9);
+		GainFocusCommand=cmd(decelerate,0.25;diffusealpha,0.9);
-		LoseFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,0.45);
+		LoseFocusCommand=cmd(stoptweening;decelerate,0.25;diffusealpha,0.45);
 	};
 
 	Def.ActorFrame{
@@ -24,15 +24,15 @@ local t = Def.ActorFrame{
 			Name="SectionName";
 			Text=THEME:GetString("ScreenReferenceMain",itemName);
 			InitCommand=cmd(x,-250;y,-6;halign,0;diffuse,color("#222222FF"));
-			GainFocusCommand=cmd(decelerate,0.5;diffusealpha,1);
+			GainFocusCommand=cmd(decelerate,0.25;diffusealpha,1);
-			LoseFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,0.5);
+			LoseFocusCommand=cmd(stoptweening;decelerate,0.25;diffusealpha,0.5);
 		};
 		LoadFont("_frutiger roman 24px")..{
 			Name="SectionDesc";
 			Text=THEME:GetString("ScreenReferenceMain",itemName.."Desc");
 			InitCommand=cmd(x,-248;y,10;align,0,0;diffuse,color("#222222FF");zoom,0.5);
-			GainFocusCommand=cmd(decelerate,0.5;diffusealpha,1);
+			GainFocusCommand=cmd(decelerate,0.25;diffusealpha,1);
-			LoseFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,0.5);
+			LoseFocusCommand=cmd(stoptweening;decelerate,0.25;diffusealpha,0.5);
 		};
 	};
 };

Themes/_fallback/BGAnimations/ScreenCredits overlay.lua

@@ -59,7 +59,7 @@ local contrib = {
 	"Petriform", -- default theme music
 	"桜為小鳩/Sakurana-Kobato (@sakuraponila)", -- custom scoring fixes
 	"Samuel Kim (1a2a3a2a1a)", -- various beat mode fixes
-	"sy567", -- beginner helper fix
+	"hanubeki (@803832)", -- beginner helper fix, among various other things
 	"v1toko", -- x-mode from StepNXA
 }
 

Themes/_fallback/Languages/ja.ini

@@ -1,4 +1,4 @@
-;Stepmania 5.0系本体用　_fallbackテーマ日本語化ファイルVer 1.05γ
+;Stepmania 5.0系本体用　_fallbackテーマ日本語化ファイルVer 1.06-A
 
 [Common]
 WindowTitle=StepMania
@@ -965,6 +965,7 @@ Min BPM=最小(表示)BPM
 Mines=地雷
 Mirror Player 1 to 2=1Pのノートを2Pにミラー
 Mirror Player 2 to 1=2Pのノートを1Pにミラー
+Modify Keysounds at current beat=オブジェにキー音をアサインする
 MoveRandomToEnd=最後までランダム
 More Options=詳細オプション
 MovieColorDepth=ムービーの\n有効色数
@@ -1112,6 +1113,8 @@ Shuffle=シャッフル
 GamePrefDefaultFail=曲の終了
 #
 UserPrefScoringMode=スコアの計算方式
+
+
 [PaneDisplay]
 Steps=オブジェ
 Holds=ホールド
@@ -1363,6 +1366,12 @@ Help=ヘルプ
 Info=情報
 Routine Player=ルーチンプレイヤー
 
+Track %d=(左から) %dレーン目のアサイン
+None=無し
+New Sound=新規にアサイン
+Enter New Keysound File=キー音ファイルの名前を入力してください。\n特に長いファイルネームを間違わないようにしてください。
+
+
 [ScreenEditMenu]
 HeaderText=譜面の編集
 HeaderSubText=曲に譜面を割り当て、編集できます。
@@ -1719,11 +1728,11 @@ Setup=クイックセットアップ
 Error adding file '%s'.=「%s」の追加でエラーが発生しました。
 
 [SongManager]
-Loading courses...=コース読み込み中…
+Loading courses...=コース読み込み中
-Loading songs...=曲読み込み中…
+Loading songs...=曲読み込み中
-Reloading...=リロード中…
+Reloading...=リロード中
-Unloading songs...=ロード解除中…
+Unloading songs...=ロード解除中
-Unloading courses...=ロード解除中……
+Unloading courses...=ロード解除中
 The folder "%s" appears to be a song folder.  All song folders must reside in a group folder.  For example, "Songs/Originals/My Song".=「%s」は曲フォルダです。曲フォルダはグループフォルダの中に配置してください。
 
 [SongUtil]

Themes/_fallback/Sounds/MusicWheel collapse.redir

@@ -0,0 +1 @@
+Common invalid

Themes/_fallback/metrics.ini

@@ -2009,11 +2009,12 @@ OptionsListTimeout=0.25
 #
 UsePlayerSelectMenu=false
 SelectMenuScreenName="ScreenPlayerOptions"
-OptionsMenuAvailable=true
+OptionsMenuAvailable=GAMESTATE:GetPlayMode() ~= "PlayMode_Oni"
 SelectMenuAvailable=false
 ModeMenuAvailable=true
 #
 ShowOptionsMessageSeconds=1.5
+PlaySoundOnEnteringOptionsMenu=true
 #
 ScreenModsCommand=setupmusicstagemods
 #
@@ -2628,27 +2629,42 @@ Fallback="ScreenOptionsSimpleService"
 NextScreen=Branch.AfterInit()
 PrevScreen=Branch.AfterInit()
 
-LineNames="SystemDirection,KeyConfig,GameType,6,8,Reload,Credits,MoreOptions"
+LineNames="Sync,GameType,KeyConfig,TestInput,Input,Reload,Arcade,Appearance,Theme,GraphicSound,Profiles,Network,UI,Advanced,Credits"
-# LineNames="SystemDirection,1,2,Sync,13,3,10,11,4,12,6,5,Theme,8,9"
+LineSync="gamecommand;screen,ScreenGameplaySyncMachine;name,Calibrate Machine Sync"
-LineSystemDirection="gamecommand;screen,ScreenOptionsSystemDirection;name,System Direction"
-LineKeyConfig="gamecommand;screen,ScreenMapControllers;name,Key Joy Mappings"
 LineGameType="gamecommand;screen,ScreenSelectGame;name,Select Game"
-Line6="gamecommand;screen,ScreenNetworkOptions;name,Network Options"
+LineKeyConfig="gamecommand;screen,ScreenMapControllers;name,Key Joy Mappings"
-Line8="gamecommand;screen,ScreenOptionsManageProfiles;name,Profiles"
+LineTestInput="gamecommand;screen,ScreenTestInput;name,Test Input"
+LineInput="gamecommand;screen,ScreenOptionsInput;name,Input Options"
 LineReload="gamecommand;screen,ScreenReloadSongs;name,Reload Songs"
-LineCredits="gamecommand;screen,ScreenCredits;name,StepMania Credits"
+LineArcade="gamecommand;screen,ScreenOptionsArcade;name,Arcade Options"
+LineAppearance="gamecommand;screen,ScreenAppearanceOptions;name,Appearance Options"
+LineTheme="gamecommand;screen,ScreenOptionsTheme;name,Theme Options"
+LineGraphicSound="gamecommand;screen,ScreenOptionsGraphicsSound;name,Graphics/Sound Options"
+LineProfiles="gamecommand;screen,ScreenOptionsManageProfiles;name,Profiles"
+LineNetwork="gamecommand;screen,ScreenNetworkOptions;name,Network Options"
+LineUI="gamecommand;screen,ScreenOptionsUI;name,UI Options"
+LineAdvanced="gamecommand;screen,ScreenOptionsAdvanced;name,Advanced Options"
 LineMoreOptions="gamecommand;screen,ScreenOptionsExtended;name,More Options"
+LineCredits="gamecommand;screen,ScreenCredits;name,StepMania Credits"
+
+# Old
+#LineNames="SystemDirection,KeyConfig,GameType,6,8,Reload,Credits,MoreOptions"
+# LineNames="SystemDirection,1,2,Sync,13,3,10,11,4,12,6,5,Theme,8,9"
 
 # for ScreenOptionsExtended:
-Line2="gamecommand;screen,ScreenTestInput;name,Test Input"
+#LineSystemDirection="gamecommand;screen,ScreenOptionsSystemDirection;name,System Direction"
-LineSync="gamecommand;screen,ScreenGameplaySyncMachine;name,Calibrate Machine Sync"
+#Line2="gamecommand;screen,ScreenTestInput;name,Test Input"
-Line3="gamecommand;screen,ScreenAppearanceOptions;name,Appearance Options"
+#Line3="gamecommand;screen,ScreenAppearanceOptions;name,Appearance Options"
-Line10="gamecommand;screen,ScreenOptionsUI;name,UI Options"
+#Line4="gamecommand;screen,ScreenOptionsGraphicsSound;name,Graphics/Sound Options"
-Line11="gamecommand;screen,ScreenOptionsInput;name,Input Options"
+#Line5="gamecommand;screen,ScreenOptionsAdvanced;name,Advanced Options"
-Line4="gamecommand;screen,ScreenOptionsGraphicsSound;name,Graphics/Sound Options"
+#Line6="gamecommand;screen,ScreenNetworkOptions;name,Network Options"
-Line12="gamecommand;screen,ScreenOptionsArcade;name,Arcade Options"
+#Line8="gamecommand;screen,ScreenOptionsManageProfiles;name,Profiles"
-Line5="gamecommand;screen,ScreenOptionsAdvanced;name,Advanced Options"
+#Line10="gamecommand;screen,ScreenOptionsUI;name,UI Options"
-LineTheme="gamecommand;screen,ScreenOptionsTheme;name,Theme Options"
+#Line11="gamecommand;screen,ScreenOptionsInput;name,Input Options"
+#Line12="gamecommand;screen,ScreenOptionsArcade;name,Arcade Options"
+#LineTheme="gamecommand;screen,ScreenOptionsTheme;name,Theme Options"
+#LineMoreOptions="gamecommand;screen,ScreenOptionsExtended;name,More Options"
+#LineCredits="gamecommand;screen,ScreenCredits;name,StepMania Credits"
 
 [ScreenOptionsExtended]
 Fallback="ScreenOptionsService"
@@ -2794,8 +2810,8 @@ ShowExitRow=true
 [ScreenTestInput]
 Class="ScreenTestInput"
 Fallback="ScreenOptionsServiceChild"
-NextScreen="ScreenOptionsExtended"
+NextScreen="ScreenOptionsService"
-PrevScreen="ScreenOptionsExtended"
+PrevScreen="ScreenOptionsService"
 
 [ScreenOptionsSystemDirection]
 Fallback="ScreenOptionsServiceChild"
@@ -2828,8 +2844,8 @@ Line22="conf,EventMode"
 
 [ScreenOptionsGraphicsSound]
 Fallback="ScreenOptionsServiceChild"
-NextScreen="ScreenOptionsExtended"
+NextScreen="ScreenOptionsService"
-PrevScreen="ScreenOptionsExtended"
+PrevScreen="ScreenOptionsService"
 LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,17,18,19,20"
 Line1="conf,Windowed"
 Line2="conf,DisplayResolution"
@@ -2854,8 +2870,8 @@ Line20="conf,VisualDelaySeconds"
 
 [ScreenOptionsAdvanced]
 Fallback="ScreenOptionsServiceChild"
-NextScreen="ScreenOptionsExtended"
+NextScreen="ScreenOptionsService"
-PrevScreen="ScreenOptionsExtended"
+PrevScreen="ScreenOptionsService"
 LineNames="Score,3,4,8,11,13,14,15,16,28,29,30"
 LineScore="lua,UserPrefScoringMode()"
 Line3="conf,TimingWindowScale"
@@ -2881,8 +2897,8 @@ Line30="conf,FastLoad"
 
 [ScreenAppearanceOptions]
 Fallback="ScreenOptionsServiceChild"
-NextScreen="ScreenOptionsExtended"
+NextScreen="ScreenOptionsService"
-PrevScreen="ScreenOptionsExtended"
+PrevScreen="ScreenOptionsService"
 LineNames="1,2,3,4,5,14,15,17,18,19"
 Line1="conf,Language"
 Line2="conf,Announcer"
@@ -2899,8 +2915,8 @@ Line19="conf,NumBackgrounds"
 # user interface options that aren't related to themes, etc.
 # (some don't get used/modified too often)
 Fallback="ScreenOptionsServiceChild"
-NextScreen="ScreenOptionsExtended"
+NextScreen="ScreenOptionsService"
-PrevScreen="ScreenOptionsExtended"
+PrevScreen="ScreenOptionsService"
 LineNames="1,3,4,6,7,9,10,11,12,14"
 Line1="conf,Center1Player"
 Line3="conf,DancePointsForOni"
@@ -2920,8 +2936,8 @@ Line14="conf,ShowSongOptions"
 
 [ScreenOptionsInput]
 Fallback="ScreenOptionsServiceChild"
-NextScreen="ScreenOptionsExtended"
+NextScreen="ScreenOptionsService"
-PrevScreen="ScreenOptionsExtended"
+PrevScreen="ScreenOptionsService"
 LineNames="1,2,3,4,5"
 Line1="conf,AutoMapOnJoyChange"
 Line2="conf,OnlyDedicatedMenuButtons"
@@ -2931,8 +2947,8 @@ Line5="conf,MusicWheelSwitchSpeed"
 
 [ScreenOptionsArcade]
 Fallback="ScreenOptionsServiceChild"
-NextScreen="ScreenOptionsExtended"
+NextScreen="ScreenOptionsService"
-PrevScreen="ScreenOptionsExtended"
+PrevScreen="ScreenOptionsService"
 # stuff tied to arcade features
 LineNames="1,2,3,4,5,6"
 Line1="conf,GetRankingName"
@@ -4043,8 +4059,8 @@ OptionRowNormalMetricsGroup="OptionRowCourseOverview"
 [ScreenGameplaySyncMachine]
 Class="ScreenGameplaySyncMachine"
 Fallback="ScreenGameplay"
-PrevScreen="ScreenOptionsExtended"
+PrevScreen="ScreenOptionsService"
-NextScreen="ScreenOptionsExtended"
+NextScreen="ScreenOptionsService"
 PlayerType="PlayerSyncMachine"
 
 #AllowCenter1Player=false

Themes/default/BGAnimations/ScreenCredits overlay.lua

@@ -59,7 +59,7 @@ local contrib = {
 	"Petriform", -- default theme music
 	"桜為小鳩/Sakurana-Kobato (@sakuraponila)", -- custom scoring fixes
 	"Samuel Kim (1a2a3a2a1a)", -- various beat mode fixes
-	"sy567", -- beginner helper fix
+	"hanubeki (@803832)", -- beginner helper fix, among various other things
 	"v1toko", -- x-mode from StepNXA
 }
 

Themes/default/metrics.ini

@@ -1290,8 +1290,8 @@ LineRollCombo="lua,ThemePrefRow('ComboOnRolls')"
 
 [ScreenOptionsTheme]
 Fallback="ScreenOptionsServiceChild"
-NextScreen="ScreenOptionsExtended"
+NextScreen="ScreenOptionsService"
-PrevScreen="ScreenOptionsExtended"
+PrevScreen="ScreenOptionsService"
 LineNames="gNotePos,gAuto,gScore,gSDisp,TimingDisplay,gOpts,gLongFail,gComboUnderField,FlashyCombo,GameplayFooter,FancyUIBG"
 LinegNotePos="lua,ThemePrefRow('NotePosition')"
 LinegScore="lua,ThemePrefRow('GameplayShowScore')"

Themes/test/metrics.ini

@@ -1,6 +1,17 @@
 [Global]
 FallbackTheme=default
 [ScreenTitleMenu]
+# new scroll for wrapping
+ScrollerTransform=function(self,offset,itemIndex,numItems) \
+	self:y((28)*(itemIndex-(numItems-1)/2)); \
+	self:x(math.floor(itemIndex/5) * 128); \
+end;
+# more choices for debug stuff
+DefaultChoice="GameStart"
+# new stuff
+ChoiceNames="GameStart,Options,Edit,Jukebox,TestClearChildren,Exit"
+# new tests
+ChoiceTestClearChildren="screen,ScreenTestClearChildren;text,Test: Clear Children"
 [ScreenGameplay]
 # LifeP1OnCommand=visible,false
 # LifeP2OnCommand=visible,false

src/GameState.cpp

@@ -103,7 +103,7 @@ static const ThemeMetric<Grade> GRADE_TIER_FOR_EXTRA_2	("GameState","GradeTierFo
 static ThemeMetric<bool> ARE_STAGE_PLAYER_MODS_FORCED	("GameState","AreStagePlayerModsForced");
 static ThemeMetric<bool> ARE_STAGE_SONG_MODS_FORCED	("GameState","AreStageSongModsForced");
 
-static Preference<Premium> g_Premium( "Premium", Premium_Off );
+static Preference<Premium> g_Premium( "Premium", Premium_DoubleFor1Credit );
 Preference<bool> GameState::m_bAutoJoin( "AutoJoin", false );
 
 GameState::GameState() :

src/MemoryCardManager.cpp

@@ -39,7 +39,7 @@ static void MemoryCardUsbLevelInit( size_t /*PlayerNumber*/ i, RString &sNameOut
 	defaultValueOut = -1;
 }
 
-static Preference<bool>	g_bMemoryCards( "MemoryCards", true );
+static Preference<bool>	g_bMemoryCards( "MemoryCards", false );
 static Preference<bool>	g_bMemoryCardProfiles( "MemoryCardProfiles", true );
 
 // if set, always use the device that mounts to this point

src/MusicWheel.cpp

@@ -109,6 +109,7 @@ void MusicWheel::Load( RString sType )
 
 	m_soundChangeSort.Load(	THEME->GetPathS(sType,"sort") );
 	m_soundExpand.Load(	THEME->GetPathS(sType,"expand"), true );
+	m_soundCollapse.Load(	THEME->GetPathS(sType,"collapse"), true );
 
 	// Update for SORT_MOST_PLAYED.
 	SONGMAN->UpdatePopular();

src/PrefsManager.cpp

@@ -213,7 +213,7 @@ PrefsManager::PrefsManager() :
 	m_iSongsPerPlay			( "SongsPerPlay",		3, ValidateSongsPerPlay ),
 	m_bDelayedCreditsReconcile	( "DelayedCreditsReconcile",	false ),
 	m_ShowSongOptions		( "ShowSongOptions",		Maybe_YES ),
-	m_bDancePointsForOni		( "DancePointsForOni",		false ),
+	m_bDancePointsForOni		( "DancePointsForOni",		true ),
 	m_bPercentageScoring		( "PercentageScoring",		false ),
 	m_fMinPercentageForMachineSongHighScore		( "MinPercentageForMachineSongHighScore",	0.0001f ), // This is for home, who cares how bad you do?
 	m_fMinPercentageForMachineCourseHighScore	( "MinPercentageForMachineCourseHighScore",	0.0001f ),	// don't save course scores with 0 percentage

src/ScreenDebugOverlay.cpp

@@ -262,13 +262,10 @@ void ScreenDebugOverlay::Init()
 		BitmapText *p = new BitmapText;
 		p->SetName( "PageText" );
 		p->LoadFromFont( THEME->GetPathF("ScreenDebugOverlay", "page") );
-		LOAD_ALL_COMMANDS( p );
+		LOAD_ALL_COMMANDS_AND_ON_COMMAND( p );
-		// xxx: I shouldn't have to do this:
-		ON_COMMAND( p );
 		// todo: Y value is still hardcoded. -aj
 		p->SetXY( PAGE_START_X+iPage*PAGE_SPACING_X, SCREEN_TOP+20 );
 		p->SetText( *s + " (" + sButton + ")" );
-		//p->SetShadowLength( 1 );
 		m_vptextPages.push_back( p );
 		this->AddChild( p );
 	}
@@ -281,10 +278,7 @@ void ScreenDebugOverlay::Init()
 			bt->LoadFromFont( THEME->GetPathF("ScreenDebugOverlay", "line") );
 			bt->SetHorizAlign( align_right );
 			bt->SetText( "blah" );
-			//p->SetShadowLength( 2 );
+			LOAD_ALL_COMMANDS_AND_ON_COMMAND( *bt );
-			LOAD_ALL_COMMANDS( *bt );
-			// xxx: I shouldn't have to do this:
-			ON_COMMAND( bt );
 			m_vptextButton.push_back( bt );
 			this->AddChild( bt );
 		}
@@ -294,10 +288,7 @@ void ScreenDebugOverlay::Init()
 			bt->LoadFromFont( THEME->GetPathF("ScreenDebugOverlay", "line") );
 			bt->SetHorizAlign( align_left );
 			bt->SetText( "blah" );
-			//p->SetShadowLength( 2 );
+			LOAD_ALL_COMMANDS_AND_ON_COMMAND( *bt );
-			LOAD_ALL_COMMANDS( *bt );
-			// xxx: I shouldn't have to do this:
-			ON_COMMAND( bt );
 			m_vptextFunction.push_back( bt );
 			this->AddChild( bt );
 		}
@@ -366,7 +357,6 @@ void ScreenDebugOverlay::UpdateText()
 
 		int i = p-g_pvpSubscribers->begin();
 
-		//float fY = SCREEN_TOP+50 + iOffset * 16;
 		float fY = LINE_START_Y + iOffset * LINE_SPACING;
 
 		BitmapText &txt1 = *m_vptextButton[i];

src/ScreenSelectMusic.cpp

@@ -94,6 +94,7 @@ void ScreenSelectMusic::Init()
 	TWO_PART_TIMER_SECONDS.Load( m_sName, "TwoPartTimerSeconds" );
 	WRAP_CHANGE_STEPS.Load( m_sName, "WrapChangeSteps" );
 	NULL_SCORE_STRING.Load( m_sName, "NullScoreString" );
+	PLAY_SOUND_ON_ENTERING_OPTIONS_MENU.Load( m_sName, "PlaySoundOnEnteringOptionsMenu" );
 	// To allow changing steps with gamebuttons -DaisuMaster
 	CHANGE_STEPS_WITH_GAME_BUTTONS.Load( m_sName, "ChangeStepsWithGameButtons" );
 	CHANGE_GROUPS_WITH_GAME_BUTTONS.Load( m_sName, "ChangeGroupsWithGameButtons" );
@@ -437,6 +438,7 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
 		}
 
 		m_bGoToOptions = true;
+		if( PLAY_SOUND_ON_ENTERING_OPTIONS_MENU )
 			m_soundStart.Play();
 		this->PlayCommand( "ShowEnteringOptions" );
 

src/ScreenSelectMusic.h

@@ -97,6 +97,7 @@ protected:
 	ThemeMetric<bool>		CHANGE_STEPS_WITH_GAME_BUTTONS;
 	ThemeMetric<bool>		CHANGE_GROUPS_WITH_GAME_BUTTONS;
 	ThemeMetric<RString>	NULL_SCORE_STRING;
+	ThemeMetric<bool>		PLAY_SOUND_ON_ENTERING_OPTIONS_MENU;
 
 	bool CanChangeSong() const { return m_SelectionState == SelectionState_SelectingSong; }
 	bool CanChangeSteps() const { return TWO_PART_SELECTION ? m_SelectionState == SelectionState_SelectingSteps : m_SelectionState == SelectionState_SelectingSong; }

src/WheelBase.cpp

@@ -283,12 +283,16 @@ bool WheelBase::Select()	// return true if this selection can end the screen
 		{
 			RString sThisItemSectionName = m_CurWheelItemData[m_iSelection]->m_sText;
 			if( m_sExpandedSectionName == sThisItemSectionName ) // already expanded
+			{
 				SetOpenSection( "" ); // collapse it
+				m_soundCollapse.Play();
+			}
 			else // already collapsed
+			{
 				SetOpenSection( sThisItemSectionName ); // expand it
-
 				m_soundExpand.Play();
 			}
+		}
 		break;
 	default:
 		break;

src/WheelBase.h

@@ -99,6 +99,7 @@ protected:
 
 	RageSound m_soundChangeMusic;
 	RageSound m_soundExpand;
+	RageSound m_soundCollapse;
 	RageSound m_soundLocked;
 
 //	bool WheelItemIsVisible(int n);