miscallaneous updates to do with the previous commits

poco0317 · Dec 27, 2016 · 86ebd28 · 86ebd28
1 parent 57390b6
commit 86ebd28
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/Themes/Til Death/BGAnimations/ScreenEvaluation decorations/default.lua b/Themes/Til Death/BGAnimations/ScreenEvaluation decorations/default.lua
@@ -94,7 +94,7 @@ function scoreBoard(pn,position)
 		InitCommand=cmd(xy,frameWidth+frameX,frameY+32;zoom,0.5;halign,1;valign,0;maxwidth,200),
 		BeginCommand=cmd(queuecommand,"Set"),
 		SetCommand=function(self)
-			local meter = score:GetSSR()
+			local meter = score:GetSkillsetSSR(0)
 			self:settextf("%5.2f", meter)
 			self:diffuse(ByMSD(meter))
 		end,

diff --git a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/profile.lua b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/profile.lua
@@ -51,7 +51,7 @@ if GAMESTATE:IsPlayerEnabled(PLAYER_1) then
 		skillsets.Speed = profile:GetPlayerSpeedRating()
 		skillsets.Stam = profile:GetPlayerStamRating()
 		skillsets.Jack = profile:GetPlayerJackRating()
-		skillsets.Technical = 1
+		skillsets.Technical = profile:GetPlayerTechnicalRating()
 	end
 end
 

diff --git a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/score.lua b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/score.lua
@@ -199,7 +199,7 @@ t[#t+1] = LoadFont("Common Normal")..{
 			if score:GetWifeScore() == 0 then 
 				self:settext("")
 			else
-				self:settextf("%5.2f", score:GetSSRSpeed())
+				self:settextf("%5.2f", score:GetSkillsetSSR(2))
 			end
 		else
 			self:settext("")
@@ -216,7 +216,7 @@ t[#t+1] = LoadFont("Common Normal")..{
 			if score:GetWifeScore() == 0 then 
 				self:settext("")
 			else
-				self:settextf("%5.2f", score:GetSSRStam())
+				self:settextf("%5.2f", score:GetSkillsetSSR(3))
 			end
 		else
 			self:settext("")
@@ -233,7 +233,24 @@ t[#t+1] = LoadFont("Common Normal")..{
 			if score:GetWifeScore() == 0 then 
 				self:settext("")
 			else
-				self:settextf("%5.2f", score:GetSSRJack())
+				self:settextf("%5.2f", score:GetSkillsetSSR(4))
+			end
+		else
+			self:settext("")
+		end
+	end,
+	ScoreUpdateMessageCommand=cmd(queuecommand,"Set")
+}
+
+t[#t+1] = LoadFont("Common Normal")..{
+	Name="Score",
+	InitCommand=cmd(xy,frameX+offsetX+155,frameY+offsetY+58;zoom,0.5;halign,0),
+	SetCommand=function(self)
+		if score ~= nil then
+			if score:GetWifeScore() == 0 then 
+				self:settext("")
+			else
+				self:settextf("%5.2f", score:GetSkillsetSSR(5))
 			end
 		else
 			self:settext("")

diff --git a/src/StatsManager.cpp b/src/StatsManager.cpp
@@ -145,7 +145,7 @@ void AddPlayerStatsToProfile( Profile *pProfile, const StageStats &ss, PlayerNum
 	if (!pProfile->IsMachine()) {
 		pProfile->ResetSSRs(true);
 		pProfile->RecalculateSSRs(true);
-		pProfile->CalcPlayerRating(pProfile->m_fPlayerRating, pProfile->m_fPlayerSpeedRating, pProfile->m_fPlayerStamRating, pProfile->m_fPlayerJackRating);
+		pProfile->CalcPlayerRating(pProfile->m_fPlayerRating, pProfile->m_fPlayerSpeedRating, pProfile->m_fPlayerStamRating, pProfile->m_fPlayerJackRating, pProfile->m_fPlayerTechnicalRating);
 	}
 
 }