From 15d333bec414b4102ff20911890a27c1631bea35 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Tue, 6 Jul 2010 19:59:24 -0500
Subject: [PATCH] make "rolls increment combo" an option instead of just
 hardcoding it to off.

---
 .../Graphics/ScreenTitle ItemFrame.png        | Bin 0 -> 3613 bytes
 Themes/default/Languages/en.ini               |   2 +
 Themes/default/Scripts/00 ThemeInfo.lua       |   7 +--
 Themes/default/Scripts/03 ThemePrefs.lua      |  51 +++++++++++++++---
 Themes/default/metrics.ini                    |  11 +++-
 5 files changed, 61 insertions(+), 10 deletions(-)
 create mode 100644 Themes/default/Graphics/ScreenTitle ItemFrame.png

diff --git a/Themes/default/Graphics/ScreenTitle ItemFrame.png b/Themes/default/Graphics/ScreenTitle ItemFrame.png
new file mode 100644
index 0000000000000000000000000000000000000000..809ce7e8f7ffa04c1423ec4be3fc1bceb2fb6988
GIT binary patch
literal 3613
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

literal 0
HcmV?d00001

diff --git a/Themes/default/Languages/en.ini b/Themes/default/Languages/en.ini
index 243d49264f..80c1e43f18 100644
--- a/Themes/default/Languages/en.ini
+++ b/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
diff --git a/Themes/default/Scripts/00 ThemeInfo.lua b/Themes/default/Scripts/00 ThemeInfo.lua
index 3ccc0168cb..5521820afe 100644
--- a/Themes/default/Scripts/00 ThemeInfo.lua	
+++ b/Themes/default/Scripts/00 ThemeInfo.lua	
@@ -2,7 +2,8 @@
 themeInfo = {
 	ProductCode = "SSC-00X",
 	Name = "Urban Fragments",
-	Version = "v0.00",
-	Date = "00000000",
-	Internal = "dev 00000000-0000 | i0000",
+	Version = 0.70,
+	Date = "20100706",
+	Internal = "dev 00000000-0000",
+	Revision = 3002,
 };
\ No newline at end of file
diff --git a/Themes/default/Scripts/03 ThemePrefs.lua b/Themes/default/Scripts/03 ThemePrefs.lua
index ffa765cba1..e3e5fa3267 100644
--- a/Themes/default/Scripts/03 ThemePrefs.lua	
+++ b/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;
 	};
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index 4b9cb9672b..fc8ef69103 100644
--- a/Themes/default/metrics.ini
+++ b/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