make "rolls increment combo" an option instead of just hardcoding it to off.

Themes/default/Languages/en.ini

@@ -61,6 +61,7 @@ UserPrefGameplayShowStepsDisplay=Show Steps
 UserPrefShowLotsaOptions=Options Density
 UserPrefAutoSetStyle=Auto Set Style
 UserPrefLongFail=Fail Length
+UserPrefComboOnRolls=Rolls Increment Combo
 [OptionExplanations]
 UserPrefNotePosition=Determines where the arrow receptors are placed in gameplay. 
 UserPrefGameplayShowScore=Show or Hide the score display in gameplay.
@@ -68,6 +69,7 @@ UserPrefGameplayShowStepsDisplay=Show or Hide the step information display in ga
 UserPrefShowLotsaOptions=Choose how many lines/rows of options to choose from. &oq;Few&cq; keeps the list to a minimum. &oq;Many&cq; adds various show-off mods.
 UserPrefAutoSetStyle=Allow the game to list all one player and two player modes at once instead of one style only. This might require a restart of StepMania\n( or alternatively hit F2! )
 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

Themes/default/Scripts/00 ThemeInfo.lua

@@ -2,7 +2,8 @@
 themeInfo = {
 	ProductCode = "SSC-00X",
 	Name = "Urban Fragments",
-	Version = "v0.00",
+	Version = 0.70,
-	Date = "00000000",
+	Date = "20100706",
-	Internal = "dev 00000000-0000 | i0000",
+	Internal = "dev 00000000-0000",
+	Revision = 3002,
 };

Themes/default/Scripts/03 ThemePrefs.lua

@@ -19,6 +19,9 @@ function InitUserPrefs()
 	if GetUserPrefB("UserPrefNotePosition") == nil then
 		SetUserPref("UserPrefNotePosition", true);
 	end;
+	if GetUserPrefB("UserPrefComboOnRolls") == nil then
+		SetUserPref("UserPrefComboOnRolls", false);
+	end;
 --[[ 	if GetUserPref("ProTimingP1") == nil then
 		SetUserPref("ProTimingP1", false);
 	end;
@@ -101,7 +104,7 @@ function UserPrefGameplayShowScore()
 				val = false;
 			end;
 			WritePrefToFile("UserPrefGameplayShowScore",val);
-			MESSAGEMAN:Broadcast("PrferenceSet", { Message == "Set Preference" } );
+			MESSAGEMAN:Broadcast("PreferenceSet", { Message == "Set Preference" } );
 			THEME:ReloadMetrics();
 		end;
 	};
@@ -137,7 +140,7 @@ function UserPrefGameplayShowStepsDisplay()
 				val = false;
 			end;
 			WritePrefToFile("UserPrefGameplayShowStepsDisplay",val);
-			MESSAGEMAN:Broadcast("PrferenceSet", { Message == "Set Preference" } );
+			MESSAGEMAN:Broadcast("PreferenceSet", { Message == "Set Preference" } );
 			THEME:ReloadMetrics();
 		end;
 	};
@@ -173,7 +176,7 @@ function UserPrefShowLotsaOptions()
 				val = false;
 			end;
 			WritePrefToFile("UserPrefShowLotsaOptions",val);
-			MESSAGEMAN:Broadcast("PrferenceSet", { Message == "Set Preference" } );
+			MESSAGEMAN:Broadcast("PreferenceSet", { Message == "Set Preference" } );
 			THEME:ReloadMetrics();
 		end;
 	};
@@ -232,7 +235,7 @@ function UserPrefAutoSetStyle()
 				val = false;
 			end;
 			WritePrefToFile("UserPrefAutoSetStyle",val);
-			MESSAGEMAN:Broadcast("PrferenceSet", { Message == "Set Preference" } );
+			MESSAGEMAN:Broadcast("PreferenceSet", { Message == "Set Preference" } );
 			THEME:ReloadMetrics();
 		end;
 	};
@@ -269,7 +272,7 @@ function UserPrefNotePosition()
 				val = false;
 			end;
 			WritePrefToFile("UserPrefNotePosition",val);
-			MESSAGEMAN:Broadcast("PrferenceSet", { Message == "Set Preference" } );
+			MESSAGEMAN:Broadcast("PreferenceSet", { Message == "Set Preference" } );
 			THEME:ReloadMetrics();
 		end;
 	};
@@ -305,7 +308,43 @@ function UserPrefLongFail()
 				val = false;
 			end;
 			WritePrefToFile("UserPrefLongFail",val);
-			MESSAGEMAN:Broadcast("PrferenceSet", { Message == "Set Preference" } );
+			MESSAGEMAN:Broadcast("PreferenceSet", { Message == "Set Preference" } );
+			THEME:ReloadMetrics();
+		end;
+	};
+	setmetatable( t, t );
+	return t;
+end
+
+function UserPrefComboOnRolls()
+	local t = {
+		Name = "UserPrefComboOnRolls";
+		LayoutType = "ShowAllInRow";
+		SelectType = "SelectOne";
+		OneChoiceForAllPlayers = true;
+		ExportOnChange = false;
+		Choices = { 'Off','On' };
+		LoadSelections = function(self, list, pn)
+			if ReadPrefFromFile("UserPrefComboOnRolls") ~= nil then
+				if GetUserPrefB("UserPrefComboOnRolls") then
+					list[2] = true;
+				else
+					list[1] = true;
+				end;
+			else
+				WritePrefToFile("UserPrefComboOnRolls",false);
+				list[1] = true;
+			end;
+		end;
+		SaveSelections = function(self, list, pn)
+			local val;
+			if list[2] then
+				val = true;
+			else
+				val = false;
+			end;
+			WritePrefToFile("UserPrefComboOnRolls",val);
+			MESSAGEMAN:Broadcast("PreferenceSet", { Message == "Set Preference" } );
 			THEME:ReloadMetrics();
 		end;
 	};

Themes/default/metrics.ini

@@ -315,6 +315,7 @@ ProtimingMissCommand=
 [Player]
 ReceptorArrowsYStandard=GetTapPosition('Standard')
 ReceptorArrowsYReverse=GetTapPosition('Reverse')
+RollBodyIncrementsCombo=GetUserPrefB("UserPrefComboOnRolls")
 
 [ScoreDisplayNormal]
 FrameX=
@@ -772,8 +773,9 @@ LinegAuto="lua,UserPrefAutoSetStyle()"
 LinegLongFail="lua,UserPrefLongFail()"
 
 [ScreenOptionsSystemDirection]
-LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,LF,17,18,19,20,21,22"
+LineNames="1,2,3,4,5,6,7,8,9,RollCombo,10,11,12,13,14,15,16,LF,17,18,19,20,21,22"
 LineLF="lua,UserPrefLongFail()"
+LineRollCombo="lua,UserPrefComboOnRolls()"
 
 [ScreenOptionsService]
 ShowHeader=false
@@ -1737,6 +1739,13 @@ SmallBanner6Y=SCREEN_TOP+100+24
 SmallBanner6OnCommand=zoom,0.5
 SmallBanner6OffCommand=
 # arcade stuff
+[ScreenLogo]
+ShowLogo=true
+LogoX=SCREEN_CENTER_X
+LogoY=SCREEN_CENTER_Y-68
+LogoOnCommand=bob;effectperiod,4;effectmagnitude,0,5.25,0;zoom,0;bounceend,0.35;zoom,0.75
+LogoOffCommand=stopeffect;bouncebegin,0.35;rotationz,360;zoom,0
+#
 [ScreenTitleJoin]
 HelpText=Screen.String("HelpTextTitleJoin")
 HelpY=SCREEN_CENTER_Y+100