Merge pull request #35 from poco0317/master

Prepare for v2.2.7 release - Compatibility with Etterna 0.72.0

Author: poco0317

BGAnimations/ScreenGameplay underlay/default.lua

@@ -1,15 +1,9 @@
 local playeroptions = GAMESTATE:GetPlayerState():GetPlayerOptions("ModsLevel_Preferred")
 playeroptions:Mini(2 - playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).ReceptorSize / 50)
-local profile = PROFILEMAN:GetProfile(PLAYER_1)
-local replaystate = GAMESTATE:GetPlayerState():GetPlayerController() == "PlayerController_Replay"
-if profile:IsCurrentChartPermamirror() and not replaystate then -- turn on mirror if song is flagged as perma mirror
-	playeroptions:Mirror(true)
-end
 
 setMovableKeymode(getCurrentKeyMode())
 setCurExp(PLAYER_1)
 
-
 local t = Def.ActorFrame{}
 t[#t+1] = Def.Quad{
 	InitCommand=function(self)

Graphics/OffsetGraph.lua

@@ -162,18 +162,21 @@ t[#t+1] = Def.Quad{
 			bg:x(xpos)
 			bg:zoomto(txt:GetZoomedWidth() + 4, txt:GetZoomedHeight() + 4)
 			local row = convertXToRow(xpos)
-			local judgments = SCREENMAN:GetTopScreen():GetReplaySnapshotJudgmentsForNoterow(row)
-			local wifescore = SCREENMAN:GetTopScreen():GetReplaySnapshotWifePercentForNoterow(row) * 100
-			local mean = SCREENMAN:GetTopScreen():GetReplaySnapshotMeanForNoterow(row)
-			local sd = SCREENMAN:GetTopScreen():GetReplaySnapshotSDForNoterow(row)
+			local replay = REPLAYS:GetActiveReplay()
+			local snapshot = replay:GetReplaySnapshotForNoterow(row)
+
+			local judgments = snapshot:GetJudgments()
+			local wifescore = snapshot:GetWifePercent() * 100
+			local mean = snapshot:GetMean()
+			local sd = snapshot:GetStandardDeviation()
 			local timebro = td:GetElapsedTimeFromNoteRow(row) / getCurRateValue()
 
-			local marvCount = judgments[10]
-			local perfCount = judgments[9]
-			local greatCount = judgments[8]
-			local goodCount = judgments[7]
-			local badCount = judgments[6]
-			local missCount = judgments[5]
+			local marvCount = judgments["W1"]
+			local perfCount = judgments["W2"]
+			local greatCount = judgments["W3"]
+			local goodCount = judgments["W4"]
+			local badCount = judgments["W5"]
+			local missCount = judgments["Miss"]
 
 			--txt:settextf("x %f\nrow %f\nbeat %f\nfinalsecond %f", xpos, row, row/48, finalSecond)
 			-- The odd formatting here is in case we want to add translation support.

Scripts/00 ThemeInfo.lua

@@ -1,9 +1,9 @@
 -- theme identification file
 
 themeInfo = {
-	Name = "spawncamping-wallhack (etterna .71.0)",
-	Version = "2.2.6", -- a.b.c, a for complete overhauls, b for major releases, c for minor additions/bugfix.
-	Date = "20211210",
+	Name = "spawncamping-wallhack (etterna .72.0)",
+	Version = "2.2.7", -- a.b.c, a for complete overhauls, b for major releases, c for minor additions/bugfix.
+	Date = "20221225",
 }
 
 function getThemeName()

Scripts/WifeSundries.lua

@@ -42,7 +42,7 @@ end
 function changeMusicRate(amount)
 	local curRate = getCurRateValue()
 	local newRate = curRate + amount
-	if newRate <= 3 and newRate >= 0.7 then
+	if newRate <= 3 and newRate >= 0.05 then
 		GAMESTATE:GetSongOptionsObject('ModsLevel_Preferred'):MusicRate(curRate+amount)
 		GAMESTATE:GetSongOptionsObject('ModsLevel_Song'):MusicRate(curRate+amount)
 		GAMESTATE:GetSongOptionsObject('ModsLevel_Current'):MusicRate(curRate+amount)

metrics.ini

@@ -434,7 +434,7 @@ end; \
 PlayerNameplateP1X=
 PlayerNameplateP1Y=
 
-LineNames="1,Rate,CG,PRAC,8,RS,14,2,3A,3B,4,5,R1,R2,7,9,10,13,SF,LDB,DispPct,DispMen,JT,TTT,TTG,TTM,EB,LC,CH,NPS,16,LD,JD,BG,BGB,Fail"
+LineNames="1,RateList,CG,PRAC,8,RS,14,2,3A,3B,4,5,R1,R2,7,9,10,13,SF,LDB,DispPct,DispMen,JT,TTT,TTG,TTM,EB,LC,CH,NPS,16,LD,JD,BG,BGB,Fail"
 Line1="lua,ArbitrarySpeedMods()"
 Line5="list,Turn"
 Line7="list,Scroll"
@@ -458,7 +458,6 @@ LineEB="lua,ErrorBar()"
 LineLC="lua,LaneCover()"
 LineCH="lua,CBHighlight()"
 LineNPS="lua,NPSDisplay()"
-LineRate="list,Rate"
 LineBG="list,Background"
 LineFail="list,Fail"
 LineScore="list,SaveScores"