Merge pull request #6 from Tiny-Foxes/alpha-4.9.7-merge

Alpha 4.9.7 merge

BGAnimations/ScreenDetailStatEdit decorations.lua

@@ -394,6 +394,7 @@ local function GetJLineValue(line, pl)
 	return "???"
 end
 
+local CurPrefTiming = LoadModule("Options.ReturnCurrentTiming.lua")().Name
 local Name,Length = LoadModule("Options.SmartTapNoteScore.lua")()
 local DLW = LoadModule("Config.Load.lua")("DisableLowerWindows","Save/OutFoxPrefs.ini") or false
 table.sort(Name)

BGAnimations/ScreenEdit background.lua

@@ -1,6 +1,7 @@
 local ColorTable = LoadModule("Theme.Colors.lua")( LoadModule("Config.Load.lua")("SoundwavesSubTheme","Save/OutFoxPrefs.ini") );
 return Def.ActorFrame {
 	LoadModule("Options.SmartTiming.lua"),
+	LoadModule("Options.SmartScoring.lua"),
 	Def.Quad {
 		InitCommand=function(self) self:scaletoclipped(SCREEN_WIDTH,SCREEN_HEIGHT):xy(SCREEN_CENTER_X,SCREEN_CENTER_Y) end,
 		OnCommand=function(self) self:diffuse(color("#000000")):diffusebottomedge( ColorTable["serviceBG"] )  end

BGAnimations/ScreenEvaluation underlay/Page1.lua

@@ -3,7 +3,7 @@ local p = ...
 local fade_out_speed = 0.2
 local fade_out_pause = 0.1
 local off_wait = 0.75
-local CurPrefTiming = LoadModule("Options.OverwriteTiming.lua")()
+local CurPrefTiming = LoadModule("Options.ReturnCurrentTiming.lua")().Name
 local SelJudg = {2,4,5}
 
 local eval_radar = {
@@ -59,8 +59,11 @@ local Name,Length = LoadModule("Options.SmartTapNoteScore.lua")()
 local DLW = LoadModule("Config.Load.lua")("DisableLowerWindows","Save/OutFoxPrefs.ini") or false
 table.sort(Name)
 Name[#Name+1] = "Miss"
+Length = Length + 1
+local DoubleSet = Length*2
 Name[#Name+1] = "MaxCombo"
-Length = Length + 2
+Length = Length + 1
+
 for i,v in ipairs( Name ) do
 	local Con = Def.ActorFrame{
 		OffCommand=function(self)
@@ -105,26 +108,18 @@ for i,v in ipairs( Name ) do
 			Texture=LoadModule("Options.SmartJudgments.lua")()[LoadModule("Options.ChoiceToValue.lua")(LoadModule("Options.SmartJudgments.lua")("Show"),LoadModule("Config.Load.lua")("SmartJudgments",CheckIfUserOrMachineProfile(string.sub(p,-1)-1).."/OutFoxPrefs.ini"))],
 			InitCommand=function(self)
 				local int = i-1
-				if self:GetNumStates() ~= 6 and self:GetNumStates() ~= 11 then int = 2*int end
+				-- lua.ReportScriptError( self:GetNumStates() .. " . ".. DoubleSet )
+				if self:GetNumStates() == DoubleSet then
+					int = (i-1)*2
+				end
+				-- lua.ReportScriptError(int)
     	    	self:xy(SCREEN_CENTER_X+(eval_part_offs-80),SCREEN_CENTER_Y-80+((44-(Length*2))*i)):zoom(1.275-(Length*0.075)):animate(0):setstate(int)
 		    end,
 			OnCommand=function(self)
 				local sizemargin = 160
 				local height = self:GetHeight()
 				local width = self:GetWidth()
-				if height >= sizemargin and width >= sizemargin then
-					if height >= width then
-						self:zoom(sizemargin/height)
-					else
-						self:zoom(sizemargin/width)
-					end
-				elseif height >= sizemargin then
-					self:zoom(sizemargin/height)
-				elseif width >= sizemargin then
-					self:zoom(sizemargin/width)
-				else 
-					self:zoom(1)
-				end
+				self:zoom( LoadModule("Lua.Resize.lua")(width, height, 160, 160) )
 				self:diffusealpha(0):sleep(0.1 * i):decelerate(0.6):diffusealpha(0.86)
 			end
 		}

BGAnimations/ScreenEvaluation underlay/Page4.lua

@@ -13,20 +13,15 @@ local sm = LoadModule("Gameplay.Median.lua")( p, OffsetTable, graphsizes )
 -- Load Timing information
 local f = LoadModule("Config.Load.lua")("SmartTimings","Save/OutFoxPrefs.ini")
 local JudgNames = {"ProW1","ProW2","ProW3","ProW4","ProW5","W1","W2","W3","W4","W5"}
-local Name,Timings
-
-for i = 1,#TimingWindow do
-    Name,Timings = TimingWindow[i]()
-    if f == Name then break end
-end
+local n = LoadModule("Options.ReturnCurrentTiming.lua")()
 
 ------------------------------------------
 -- Header Title
 ------------------------------------------
 t[#t+1] = Def.BitmapText {
     Font = "_Bold",
     InitCommand=function(self)
-        self:zoom(1.25):xy(_screen.cx +(eval_part_offs),_screen.cy-165+70):maxwidth(260):horizalign(center)
+        self:zoom(1):xy(_screen.cx +(eval_part_offs),_screen.cy-165+70):maxwidth(260):horizalign(center)
         self:diffuse(Color.White):diffusebottomedge(ColorLightTone(PlayerCompColor(p)))
     end,
     OffCommand=function(self)
@@ -64,11 +59,11 @@ t[#t+1] = Def.Quad{
 		s:sleep(0.2):decelerate(0.3):y( _screen.cy+192-80 ):sleep(0.1):accelerate(0.3):cropleft(1)
 	end,
 }
-local CurPrefTiming = LoadModule("Config.Load.lua")("SmartTimings","Save/OutFoxPrefs.ini")
+local CurPrefTiming = LoadModule("Options.ReturnCurrentTiming.lua")().Name
 
 for k,v in pairs( sm.TimingList[1] ) do
-	if Timings[ "TapNoteScore_"..v ] > 0 then
-		local position = scale( Timings[ "TapNoteScore_"..v ], sm.HighWindow ,sm.LowWindow, 0, graphsizes[1]*.528 )
+	if n.Timings[ "TapNoteScore_"..v ] > 0 then
+		local position = scale( n.Timings[ "TapNoteScore_"..v ], sm.HighWindow ,sm.LowWindow, 0, graphsizes[1]*.528 )
 		for i=1,2 do
 			t[#t+1] = Def.Quad{
 				OnCommand=function(s)

BGAnimations/ScreenGameplay background.lua

@@ -5,7 +5,6 @@
 	the z field changes on the current Aspect Ratio, so correct that.
 ]]
 local background = Def.ActorFrame { Name="YOU_WISH_YOU_WERE_PLAYING_BEATMANIA_RIGHT_NOW",
-	LoadModule("Options.SmartTiming.lua"),
 	UpdateDiscordInfoCommand=function(s)
 		local player = GAMESTATE:GetMasterPlayerNumber()
 		if GAMESTATE:GetCurrentSong() then

BGAnimations/ScreenGameplay overlay/DetailedStats.lua

@@ -490,7 +490,7 @@ local function GetJLineValue(line, pl)
 end
 
 local Name,Length = LoadModule("Options.SmartTapNoteScore.lua")()
-local CurPrefTiming = LoadModule("Config.Load.lua")("SmartTimings","Save/OutFoxPrefs.ini")
+local CurPrefTiming = LoadModule("Options.ReturnCurrentTiming.lua")().Name
 local DLW = LoadModule("Config.Load.lua")("DisableLowerWindows","Save/OutFoxPrefs.ini") or false
 table.sort(Name)
 Name[#Name+1] = "Miss"

BGAnimations/ScreenSelectProfile overlay.lua

@@ -15,7 +15,7 @@ function GetLocalProfiles()
 				OffCommand=function(self) self:linear(0.3):diffusealpha(0) end;
 			};
 			Def.BitmapText {
-				Font="_Condensed Medium";
+				Font="_Medium";
 				InitCommand=function(self) self:horizalign(left):shadowlength(1):xy(-120,12):zoom(0.6):vertspacing(-8):ztest(true) end;
 				BeginCommand=function(self)
 					local numSongsPlayed = profile:GetNumTotalSongsPlayed();

BGAnimations/ScreenTimingAdjust decorations.lua

@@ -2,16 +2,11 @@ local t = LoadFallbackB()
 local f = LoadModule("Config.Load.lua")("SmartTimings","Save/OutFoxPrefs.ini")
 -- local Name,Length = GetTimingDifficulty()
 local JudgNames = {"ProW1","ProW2","ProW3","ProW4","ProW5","W1","W2","W3","W4","W5"}
-local Name,Timings
-
-for i = 1,#TimingWindow do
-    Name,Timings = TimingWindow[i]()
-    if f == Name then break end
-end
+local n = LoadModule("Options.ReturnCurrentTiming.lua")()
 
 t[#t+1] = Def.BitmapText{
     Font="_Semibold",
-    Text=Screen.String("Current").. " " .. Name,
+    Text=Screen.String("Current").. " " .. n.Name,
     OnCommand=function(s)
         s:zoom(1):xy(SCREEN_CENTER_X-300,SCREEN_CENTER_Y-190):halign(0):draworder(100):shadowlength(1)
         :diffusealpha(0):sleep(0.2):linear(0.05):diffusealpha(1)
@@ -24,15 +19,15 @@ for i=1,10 do
         OnCommand=function(s)
             s:xy( SCREEN_CENTER_X-250, SCREEN_CENTER_Y-180+(34*i) ):draworder(100)
             :diffuse( JudgmentLineToColor("JudgmentLine_" .. JudgNames[i]) )
-            if not Timings[ "TapNoteScore_"..JudgNames[i] ] then
+            if not n.Timings[ "TapNoteScore_"..JudgNames[i] ] then
                 s:diffuse( ColorDarkTone( JudgmentLineToColor("JudgmentLine_" .. JudgNames[i]) ) )
             end
             s:diffusealpha(0):sleep(0.2+(0.04*i)):linear(0.1):diffusealpha(1)
         end,
         OffCommand=function(s) s:sleep(0.01*i):linear(0.1):diffusealpha(0) end,
         Def.BitmapText{
             Font="_SemiBold",
-            Text=Timings[ "TapNoteScore_"..JudgNames[i] ] or "0.0",
+            Text=n.Timings[ "TapNoteScore_"..JudgNames[i] ] or "0.0",
             OnCommand=function(s) s:shadowlength(1):x(40):halign(0):skewx(-0.1):zoom(1) end,
         },
         Def.BitmapText{
@@ -47,16 +42,16 @@ for i=1,10 do
             s:xy( SCREEN_CENTER_X+230, SCREEN_CENTER_Y-180+(34*i) ):draworder(100)
             :diffuse( JudgmentLineToColor("JudgmentLine_" .. JudgNames[i]) )
             :diffusealpha(0):sleep(0.2+(0.04*i)):linear(0.1):diffusealpha(1)
-            if not Timings[ "TapNoteScore_"..JudgNames[i] ] then
+            if not n.Timings[ "TapNoteScore_"..JudgNames[i] ] then
                 s:diffuse( ColorDarkTone( JudgmentLineToColor("JudgmentLine_" .. JudgNames[i]) ) )
             end
         end,
         OffCommand=function(s) s:sleep(0.01*i):linear(0.1):diffusealpha(0) end,
         SmartTimingsChangeMessageCommand=function(s,param)
             if param.choice then
-                local name,sm = TimingWindow[param.choice]()
-                if sm[ "TapNoteScore_"..JudgNames[i] ] then
-                    s:GetChild("Tm"..i):settext( sm[ "TapNoteScore_"..JudgNames[i] ] )
+                local sm = TimingWindow[param.choice]()
+                if sm.Timings[ "TapNoteScore_"..JudgNames[i] ] then
+                    s:GetChild("Tm"..i):settext( sm.Timings[ "TapNoteScore_"..JudgNames[i] ] )
                     s:diffuse( JudgmentLineToColor("JudgmentLine_" .. JudgNames[i]) )
                 else
                     s:GetChild("Tm"..i):settext( "0.0" )
@@ -67,7 +62,7 @@ for i=1,10 do
         Def.BitmapText{
             Name="Tm"..i,
             Font="_SemiBold",
-            Text=Timings[ "TapNoteScore_"..JudgNames[i] ] or "0.0",
+            Text=n.Timings[ "TapNoteScore_"..JudgNames[i] ] or "0.0",
             OnCommand=function(s) s:shadowlength(1):x(-40):halign(1):skewx(-0.1):zoom(1) end,
         },
         Def.BitmapText{
@@ -80,16 +75,16 @@ end
 
 t[#t+1] = Def.BitmapText{
     Font="_Semibold",
-    Text=Screen.String("Selected") .. " " .. Name,
+    Text=Screen.String("Selected") .. " " .. n.Name,
     OnCommand=function(s)
         s:shadowlength(1):zoom(1):xy(SCREEN_CENTER_X+150,SCREEN_CENTER_Y-190):halign(0):draworder(100)
         :diffusealpha(0):sleep(0.2):linear(0.05):diffusealpha(1)
     end,
     OffCommand=function(s) s:linear(0.05):diffusealpha(0) end,
     SmartTimingsChangeMessageCommand=function(s,param)
         if param.choice then
-            local name,sm = TimingWindow[param.choice]()
-            s:settext( THEME:GetString("ScreenTimingAdjust","Selected") .. " " .. name )
+            local sm = TimingWindow[param.choice]()
+            s:settext( THEME:GetString("ScreenTimingAdjust","Selected") .. " " .. sm.Name )
         end
     end,
 }

Graphics/Combo 100milestone/default.lua

@@ -1,7 +1,7 @@
 local ShowFlashyCombo = LoadModule("Config.Load.lua")("FlashyCombo","Save/OutFoxPrefs.ini")
 return Def.ActorFrame {
 	LoadActor("explosion") .. {
-		InitCommand=function(self) self:diffusealpha(0):blend('BlendMode_Add'):hide_if(not ShowFlashyCombo):y(20) end;
+		InitCommand=function(self) self:diffusealpha(0):blend('BlendMode_Add'):hide_if(not ShowFlashyCombo):y(30) end;
 		MilestoneCommand=function(self) self:rotationz(0):zoom(0.2):diffusealpha(0.3):linear(0.3):zoom(0.6):diffusealpha(0) end;
 	};
 };

Graphics/OptionRow Frame.lua

@@ -96,14 +96,17 @@ for _, pn in ipairs(GAMESTATE:GetEnabledPlayers()) do
 			self:SetAllStateDelays(1)
 		end,
 		ChangeCommand=function(self)
-			local Sets = {"Advanced","ECFA"}
-			local found = ""
-				for v in ivalues( Sets ) do
-					if string.find(TimingWindow[getenv("SmartTimings")](),v) then
-						found = LoadModule("Options.SmartJudgments.lua")()[LoadModule("Options.ChoiceToValue.lua")(LoadModule("Options.SmartJudgments.lua")("Show"),LoadModule("Options.SmartJudgeChoices.lua")("Value")[1])]
-					end
-				end
-			self:Load( found )
+			local Sets = {"Advanced","FAPlus","ECFA"}
+			local found = nil
+			if TimingWindow[getenv("SmartTimings")]().Name then
+				found = LoadModule("Options.SmartJudgments.lua")()[
+					LoadModule("Options.ChoiceToValue.lua")(LoadModule("Options.SmartJudgments.lua")("Show"),
+					LoadModule("Options.SmartJudgeChoices.lua")("Value")[1])
+				]
+			end
+			if found then
+				self:Load( found )
+			end
 		end
 	}