From f3e0a0bfcd8843968d037ad93c0e4840a31eb151 Mon Sep 17 00:00:00 2001
From: Cameron Ball <c.ball1729@gmail.com>
Date: Tue, 17 Dec 2013 11:07:26 +0800
Subject: [PATCH] #26 bit of cleanup and things don't crash now so that's good.

---
 .../ScreenSelectMusic banner frame/default.xml     |  10 --
 Themes/GrooveNights/Scripts/gnSystem.lua           | 164 ++++-----------------
 2 files changed, 25 insertions(+), 149 deletions(-)

diff --git a/Themes/GrooveNights/Graphics/ScreenSelectMusic banner frame/default.xml b/Themes/GrooveNights/Graphics/ScreenSelectMusic banner frame/default.xml
index bd75028..9e38551 100644
--- a/Themes/GrooveNights/Graphics/ScreenSelectMusic banner frame/default.xml	
+++ b/Themes/GrooveNights/Graphics/ScreenSelectMusic banner frame/default.xml	
@@ -16,7 +16,6 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectMusic')
 			<BitmapText
 				Text="TEST"
 				File="_eurostile normal"
-				Condition="PROFILEMAN:IsPersistentProfile(PLAYER_1)"
 				OnCommand="%function(self)
 				self:horizalign('left');
 				self:zoom(0.55);
@@ -31,7 +30,6 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectMusic')
 			<BitmapText
 				Text="TEST"
 				File="_eurostile normal"
-				Condition="PROFILEMAN:IsPersistentProfile(PLAYER_1)"
 				OnCommand="%function(self)
 				self:horizalign('left');
 				self:zoom(0.55);
@@ -46,7 +44,6 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectMusic')
 			<BitmapText
 				Text="TEST"
 				File="_eurostile normal"
-				Condition="PROFILEMAN:IsPersistentProfile(PLAYER_1)"
 				OnCommand="%function(self)
 				self:horizalign('left');
 				self:zoom(0.55);
@@ -61,7 +58,6 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectMusic')
 			<BitmapText
 				Text="TEST"
 				File="_eurostile normal"
-				Condition="PROFILEMAN:IsPersistentProfile(PLAYER_1)"
 				OnCommand="%function(self)
 				self:horizalign('left');
 				self:zoom(0.55);
@@ -76,7 +72,6 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectMusic')
 			<BitmapText
 				Text="TEST"
 				File="_eurostile normal"
-				Condition="PROFILEMAN:IsPersistentProfile(PLAYER_1)"
 				OnCommand="%function(self)
 				self:horizalign('left');
 				self:zoom(0.55);
@@ -91,7 +86,6 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectMusic')
 			<BitmapText
 				Text="TEST"
 				File="_eurostile normal"
-				Condition="PROFILEMAN:IsPersistentProfile(PLAYER_1)"
 				OnCommand="%function(self)
 				self:horizalign('left');
 				self:zoom(0.55);
@@ -106,7 +100,6 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectMusic')
 			<BitmapText
 				Text="TEST"
 				File="_eurostile normal"
-				Condition="PROFILEMAN:IsPersistentProfile(PLAYER_1)"
 				OnCommand="%function(self)
 				self:horizalign('left');
 				self:zoom(0.55);
@@ -121,7 +114,6 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectMusic')
 			<BitmapText
 				Text="TEST"
 				File="_eurostile normal"
-				Condition="PROFILEMAN:IsPersistentProfile(PLAYER_1)"
 				OnCommand="%function(self)
 				self:horizalign('left');
 				self:zoom(0.55);
@@ -136,7 +128,6 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectMusic')
 			<BitmapText
 				Text="TEST"
 				File="_eurostile normal"
-				Condition="PROFILEMAN:IsPersistentProfile(PLAYER_1)"
 				OnCommand="%function(self)
 				self:horizalign('left');
 				self:zoom(0.55);
@@ -151,7 +142,6 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectMusic')
 			<BitmapText
 				Text="TEST"
 				File="_eurostile normal"
-				Condition="PROFILEMAN:IsPersistentProfile(PLAYER_1)"
 				OnCommand="%function(self)
 				self:horizalign('left');
 				self:zoom(0.55);
diff --git a/Themes/GrooveNights/Scripts/gnSystem.lua b/Themes/GrooveNights/Scripts/gnSystem.lua
index db29246..de1d653 100644
--- a/Themes/GrooveNights/Scripts/gnSystem.lua
+++ b/Themes/GrooveNights/Scripts/gnSystem.lua
@@ -469,117 +469,15 @@ end
 function getStats(pn,mode,stat)
 
 -- Add modes and grade tiers into a table for quick reference
-gnStatsMode = {
-STEPS_TYPE_DANCE_SINGLE, 
-STEPS_TYPE_DANCE_DOUBLE
-}
-
-gnStatsGradeTier = {
-DIFFICULTY_BEGINNER,GRADE_TIER01,
-DIFFICULTY_BEGINNER,GRADE_TIER02,
-DIFFICULTY_BEGINNER,GRADE_TIER03,
-DIFFICULTY_BEGINNER,GRADE_TIER04,
-DIFFICULTY_BEGINNER,GRADE_TIER05,
-DIFFICULTY_BEGINNER,GRADE_TIER06,
-DIFFICULTY_BEGINNER,GRADE_TIER07,
-DIFFICULTY_BEGINNER,GRADE_TIER08,
-DIFFICULTY_BEGINNER,GRADE_TIER09,
-DIFFICULTY_BEGINNER,GRADE_TIER10,
-DIFFICULTY_BEGINNER,GRADE_TIER11,
-DIFFICULTY_BEGINNER,GRADE_TIER12,
-DIFFICULTY_BEGINNER,GRADE_TIER13,
-DIFFICULTY_BEGINNER,GRADE_TIER14,
-DIFFICULTY_BEGINNER,GRADE_TIER15,
-DIFFICULTY_BEGINNER,GRADE_TIER16,
-DIFFICULTY_BEGINNER,GRADE_TIER17,
-DIFFICULTY_EASY,GRADE_TIER01,
-DIFFICULTY_EASY,GRADE_TIER02,
-DIFFICULTY_EASY,GRADE_TIER03,
-DIFFICULTY_EASY,GRADE_TIER04,
-DIFFICULTY_EASY,GRADE_TIER05,
-DIFFICULTY_EASY,GRADE_TIER06,
-DIFFICULTY_EASY,GRADE_TIER07,
-DIFFICULTY_EASY,GRADE_TIER08,
-DIFFICULTY_EASY,GRADE_TIER09,
-DIFFICULTY_EASY,GRADE_TIER10,
-DIFFICULTY_EASY,GRADE_TIER11,
-DIFFICULTY_EASY,GRADE_TIER12,
-DIFFICULTY_EASY,GRADE_TIER13,
-DIFFICULTY_EASY,GRADE_TIER14,
-DIFFICULTY_EASY,GRADE_TIER15,
-DIFFICULTY_EASY,GRADE_TIER16,
-DIFFICULTY_EASY,GRADE_TIER17,
-DIFFICULTY_MEDIUM,GRADE_TIER01,
-DIFFICULTY_MEDIUM,GRADE_TIER02,
-DIFFICULTY_MEDIUM,GRADE_TIER03,
-DIFFICULTY_MEDIUM,GRADE_TIER04,
-DIFFICULTY_MEDIUM,GRADE_TIER05,
-DIFFICULTY_MEDIUM,GRADE_TIER06,
-DIFFICULTY_MEDIUM,GRADE_TIER07,
-DIFFICULTY_MEDIUM,GRADE_TIER08,
-DIFFICULTY_MEDIUM,GRADE_TIER09,
-DIFFICULTY_MEDIUM,GRADE_TIER10,
-DIFFICULTY_MEDIUM,GRADE_TIER11,
-DIFFICULTY_MEDIUM,GRADE_TIER12,
-DIFFICULTY_MEDIUM,GRADE_TIER13,
-DIFFICULTY_MEDIUM,GRADE_TIER14,
-DIFFICULTY_MEDIUM,GRADE_TIER15,
-DIFFICULTY_MEDIUM,GRADE_TIER16,
-DIFFICULTY_MEDIUM,GRADE_TIER17,
-DIFFICULTY_HARD,GRADE_TIER01,
-DIFFICULTY_HARD,GRADE_TIER02,
-DIFFICULTY_HARD,GRADE_TIER03,
-DIFFICULTY_HARD,GRADE_TIER04,
-DIFFICULTY_HARD,GRADE_TIER05,
-DIFFICULTY_HARD,GRADE_TIER06,
-DIFFICULTY_HARD,GRADE_TIER07,
-DIFFICULTY_HARD,GRADE_TIER08,
-DIFFICULTY_HARD,GRADE_TIER09,
-DIFFICULTY_HARD,GRADE_TIER10,
-DIFFICULTY_HARD,GRADE_TIER11,
-DIFFICULTY_HARD,GRADE_TIER12,
-DIFFICULTY_HARD,GRADE_TIER13,
-DIFFICULTY_HARD,GRADE_TIER14,
-DIFFICULTY_HARD,GRADE_TIER15,
-DIFFICULTY_HARD,GRADE_TIER16,
-DIFFICULTY_HARD,GRADE_TIER17,
-DIFFICULTY_CHALLENGE,GRADE_TIER01,
-DIFFICULTY_CHALLENGE,GRADE_TIER02,
-DIFFICULTY_CHALLENGE,GRADE_TIER03,
-DIFFICULTY_CHALLENGE,GRADE_TIER04,
-DIFFICULTY_CHALLENGE,GRADE_TIER05,
-DIFFICULTY_CHALLENGE,GRADE_TIER06,
-DIFFICULTY_CHALLENGE,GRADE_TIER07,
-DIFFICULTY_CHALLENGE,GRADE_TIER08,
-DIFFICULTY_CHALLENGE,GRADE_TIER09,
-DIFFICULTY_CHALLENGE,GRADE_TIER10,
-DIFFICULTY_CHALLENGE,GRADE_TIER11,
-DIFFICULTY_CHALLENGE,GRADE_TIER12,
-DIFFICULTY_CHALLENGE,GRADE_TIER13,
-DIFFICULTY_CHALLENGE,GRADE_TIER14,
-DIFFICULTY_CHALLENGE,GRADE_TIER15,
-DIFFICULTY_CHALLENGE,GRADE_TIER16,
-DIFFICULTY_CHALLENGE,GRADE_TIER17,
-DIFFICULTY_EDIT,GRADE_TIER01,
-DIFFICULTY_EDIT,GRADE_TIER02,
-DIFFICULTY_EDIT,GRADE_TIER03,
-DIFFICULTY_EDIT,GRADE_TIER04,
-DIFFICULTY_EDIT,GRADE_TIER05,
-DIFFICULTY_EDIT,GRADE_TIER06,
-DIFFICULTY_EDIT,GRADE_TIER07,
-DIFFICULTY_EDIT,GRADE_TIER08,
-DIFFICULTY_EDIT,GRADE_TIER09,
-DIFFICULTY_EDIT,GRADE_TIER10,
-DIFFICULTY_EDIT,GRADE_TIER11,
-DIFFICULTY_EDIT,GRADE_TIER12,
-DIFFICULTY_EDIT,GRADE_TIER13,
-DIFFICULTY_EDIT,GRADE_TIER14,
-DIFFICULTY_EDIT,GRADE_TIER15,
-DIFFICULTY_EDIT,GRADE_TIER16,
-DIFFICULTY_EDIT,GRADE_TIER17
-}
+local gnStatsMode = {STEPS_TYPE_DANCE_SINGLE, STEPS_TYPE_DANCE_DOUBLE}
+local gnStatsGradeDifficulties = {DIFFICULTY_BEGINNER, DIFFICULTY_EASY, DIFFICULTY_MEDIUM, DIFFICULTY_HARD, DIFFICULTY_CHALLENGE, DIFFICULTY_EDIT}
 
 -- Define the tables if nil, otherwise reset based on the selected player
+--[[
+TODO: I'll leave this here for now, but down the track I would like to move these
+outside the function definition as local variables so that they are accessible
+only by this script.
+]]-- 
 if gnStatsTotalSongCount == nil then
 gnStatsTotalSongCount = {0,0};
 gnStatsTotalExpCount = {0,0};
@@ -607,75 +505,67 @@ gnStats4StarCount[pn] = 0
 
 gnStatsLevel[pn] = 1
 gnStatsExpRemaining[pn] = 0
-
 end
 
 
-
-
 --------------------------
 -------STAR DISPLAY-------
 --------------------------
--- Count the number of 1Stars (Tier 4 (-1 for the table value), increasing by 17 for each difficulty level)
+-- Count the number of 1Stars (Tier 4)
 if stat == 1 then
-	for s = 6, 34, 176 do
-	gnStats1StarCount[pn] = PROFILEMAN:GetProfile(pn):GetTotalStepsWithTopGrade(gnStatsMode[mode],gnStatsGradeTier[s],gnStatsGradeTier[s+1]);
+	for s=1, table.getn(gnStatsGradeDifficulties) do
+        --mode, diff, tier
+	gnStats1StarCount[pn] = PROFILEMAN:GetProfile(pn):GetTotalStepsWithTopGrade(gnStatsMode[mode],gnStatsGradeDifficulties[s],GRADE_TIER04);
 	end
 	return gnStats1StarCount[pn];
 end
 
--- Count the number of 2Stars (Tier 3 (-1 for the table value), increasing by 17 for each difficulty level)
+-- Count the number of 2Stars (Tier 3)
 if stat == 2 then
-	for s = 4, 34, 174 do
-	gnStats2StarCount[pn] = PROFILEMAN:GetProfile(pn):GetTotalStepsWithTopGrade(gnStatsMode[mode],gnStatsGradeTier[s],gnStatsGradeTier[s+1]);
+	for s=1, table.getn(gnStatsGradeDifficulties) do
+	gnStats2StarCount[pn] = PROFILEMAN:GetProfile(pn):GetTotalStepsWithTopGrade(gnStatsMode[mode],gnStatsGradeDifficulties[s],GRADE_TIER03);
 	end
 	return gnStats2StarCount[pn];
 end
 
--- Count the number of 3Stars (Tier 2 (-1 for the table value), increasing by 17 for each difficulty level)
+-- Count the number of 3Stars (Tier 2)
 if stat == 3 then
-	for s = 2, 34, 172 do
-	gnStats3StarCount[pn] = PROFILEMAN:GetProfile(pn):GetTotalStepsWithTopGrade(gnStatsMode[mode],gnStatsGradeTier[s],gnStatsGradeTier[s+1]);
+	for s=1, table.getn(gnStatsGradeDifficulties) do
+	gnStats3StarCount[pn] = PROFILEMAN:GetProfile(pn):GetTotalStepsWithTopGrade(gnStatsMode[mode],gnStatsGradeDifficulties[s],GRADE_TIER02);
 	end
 	return gnStats3StarCount[pn];
 end
 
--- Count the number of 4Stars (Tier 1 (-1 for the table value), increasing by 17 for each difficulty level)
+-- Count the number of 4Stars (Tier 1)
 if stat == 4 then
-	for s = 0, 34, 170 do
-	gnStats4StarCount[pn] = PROFILEMAN:GetProfile(pn):GetTotalStepsWithTopGrade(gnStatsMode[mode],gnStatsGradeTier[s],gnStatsGradeTier[s+1]);
+	for s=1, table.getn(gnStatsGradeDifficulties) do
+	gnStats4StarCount[pn] = PROFILEMAN:GetProfile(pn):GetTotalStepsWithTopGrade(gnStatsMode[mode],gnStatsGradeDifficulties[s],GRADE_TIER01);
 	end
 	return gnStats4StarCount[pn];
 end
 
 
-
-
 -------------------------
 ---ACHIEVEMENT DISPLAY---
 -------------------------
 -- Count the total number of songs played
 if stat == 5 then
-	for s = 0, 2, 202 do
-	gnStatsTotalSongCount[pn] = PROFILEMAN:GetProfile(pn):GetTotalStepsWithTopGrade(gnStatsMode[mode],gnStatsGradeTier[s],gnStatsGradeTier[s+1]);
-	end
+	gnStatsTotalSongCount[pn] = PROFILEMAN:GetProfile(pn):GetTotalNumSongsPlayed()
 	return gnStatsTotalSongCount[pn];
 end
 
 -- Count the total number of EXP earned
 if stat == 6 then
 	if gnStatsTotalSongCount[pn] == 0 then
-		for s = 0, 2, 202 do
-		gnStatsTotalExpCount[pn] = gnStatsTotalExpCount[pn] + (PROFILEMAN:GetProfile(pn):GetTotalStepsWithTopGrade(gnStatsMode[mode],gnStatsGradeTier[s],gnStatsGradeTier[s+1]) * ((s+17)/17) );
-		end
+            gnStatsTotalExpCount[pn] = gnStatsTotalExpCount[pn] + (PROFILEMAN:GetProfile(pn):GetTotalNumSongsPlayed()) -- there used to be ((s+17)/17) here, I don't really get what it was doing because s was from the for loop ... some sort of weighting?
 	end
 	return gnStatsTotalExpCount[pn];
 end
 
--- Count the total number of player deaths (Tier 17 (-1 for the table value), increasing by 17 for each difficulty level)
+-- Count the total number of player deaths (Tier 17)
 if stat == 7 then
-	for s = 32, 34, 202 do
-	gnStatsTotalDeathCount[pn] = PROFILEMAN:GetProfile(pn):GetTotalStepsWithTopGrade(gnStatsMode[mode],gnStatsGradeTier[s],gnStatsGradeTier[s+1]);
+	for s=1, table.getn(gnStatsGradeDifficulties) do
+	gnStatsTotalDeathCount[pn] = PROFILEMAN:GetProfile(pn):GetTotalStepsWithTopGrade(gnStatsMode[mode],gnStatsGradeDifficulties[s],GRADE_TIER17);
 	end
 	return gnStatsTotalDeathCount[pn];
 end
@@ -714,9 +604,5 @@ end
 if stat == 10 then
 	return gnStatsExpRemaining[pn]
 end
-
-
-
-
 end
 
-- 
2.11.0