Merge pull request #34 from poco0317/master

Prepare for v2.2.6 release - Compatibility with Etterna 0.71.0

BGAnimations/ScreenAssetSettings overlay/default.lua

@@ -2,13 +2,12 @@
 local top
 local profile = PROFILEMAN:GetProfile(PLAYER_1)
 
-local curType = 1
-local assetTypes = {}
-for k,v in pairs(assetFolders) do
-    assetTypes[curType] = k
-    curType = curType + 1
-end
-curType = 2
+local curType = 2
+local assetTypes = {
+	"toasty",
+	"avatar",
+	"judgment",
+}
 
 local maxPage = 1
 local curPage = 1

BGAnimations/ScreenChartLeaderboard overlay/default.lua

@@ -1,6 +1,6 @@
 local pn = GAMESTATE:GetEnabledPlayers()[1]
 local song = GAMESTATE:GetCurrentSong()
-local steps = GAMESTATE:GetCurrentSteps(pn)
+local steps = GAMESTATE:GetCurrentSteps()
 local stepsType = steps:GetStepsType()
 
 local scoreList = {}

BGAnimations/ScreenChartPreview overlay/default.lua

@@ -1,12 +1,10 @@
 local pn = GAMESTATE:GetEnabledPlayers()[1]
 local song = GAMESTATE:GetCurrentSong()
-local steps = GAMESTATE:GetCurrentSteps(pn)
+local steps = GAMESTATE:GetCurrentSteps()
 local stepsType = steps:GetStepsType()
-local usingreverse = GAMESTATE:GetPlayerState(PLAYER_1):GetCurrentPlayerOptions():UsingReverse()
+local usingreverse = GAMESTATE:GetPlayerState():GetCurrentPlayerOptions():UsingReverse()
 
 local ssm
-local NF
-local NFParent
 local musicratio = 1
 local snapGraph
 local densityGraph
@@ -56,7 +54,6 @@ local function input(event)
 	if event.type == "InputEventType_FirstPress" then
 		if event.button == "Back" or event.button == "Start" or event.DeviceInput.button == "DeviceButton_space" then
 			SCREENMAN:GetTopScreen():Cancel()
-			ssm:DeletePreviewNoteField(NFParent)
 			MESSAGEMAN:Broadcast("PreviewNoteFieldDeleted")
 		end
 
@@ -77,8 +74,7 @@ local function input(event)
 		end
 
 		if event.DeviceInput.button == "DeviceButton_right mouse button" then
-			ssm:PausePreviewNoteField()
-			MESSAGEMAN:Broadcast("PreviewPaused")
+			ssm:PauseSampleMusic()
 		end
 
 	end
@@ -513,7 +509,6 @@ local t = Def.ActorFrame {
 		SCREENMAN:GetTopScreen():AddInputCallback(MPinput)
 	end,
 	ExitScreenMessageCommand = function(self)
-		ssm:DeletePreviewNoteField(NFParent)
 		MESSAGEMAN:Broadcast("PreviewNoteFieldDeleted")
 	end
 }
@@ -584,7 +579,7 @@ local function makeABar(vertices, x, y, barWidth, barHeight, thecolor)
 end
 
 local function seekOrHighlight(self)
-	local pos = ssm:GetPreviewNoteFieldMusicPosition() / musicratio
+	local pos = ssm:GetSampleMusicPosition() / musicratio
 	self:GetChild("PreviewProgress"):zoomto(densityGraphWidth, math.min(pos, frameHeight-20))
 	self:queuecommand("Highlight")
 end
@@ -653,7 +648,7 @@ t[#t+1] = Def.ActorFrame {
 			end
 		end,
 		GraphUpdateCommand = function(self)
-			steps = GAMESTATE:GetCurrentSteps(PLAYER_1)
+			steps = GAMESTATE:GetCurrentSteps()
 			if steps then
 				local nColumns = steps:GetNumColumns()
 				local rate = math.max(1, getCurRateValue())
@@ -740,17 +735,17 @@ t[#t+1] = Def.ActorFrame {
 		end,
 		MouseDownCommand = function(self, params)
 			if params.button == "DeviceButton_left mouse button" then
-				ssm:SetPreviewNoteFieldMusicPosition( (INPUTFILTER:GetMouseY() - self:GetParent():GetY() - 20) * musicratio)
+				ssm:SetSampleMusicPosition( (INPUTFILTER:GetMouseY() - self:GetParent():GetY() - 20) * musicratio)
 			end
 		end,
 		WheelUpSlowMessageCommand = function(self)
 			if isOver(self) then
-				ssm:SetPreviewNoteFieldMusicPosition( ssm:GetPreviewNoteFieldMusicPosition() - 0.1 )
+				ssm:SetSampleMusicPosition( ssm:GetSampleMusicPosition() - 0.1 )
 			end
 		end,
 		WheelDownSlowMessageCommand = function(self)
 			if isOver(self) then
-				ssm:SetPreviewNoteFieldMusicPosition( ssm:GetPreviewNoteFieldMusicPosition() + 0.1 )
+				ssm:SetSampleMusicPosition( ssm:GetSampleMusicPosition() + 0.1 )
 			end
 		end
 	},
@@ -887,24 +882,40 @@ t[#t+1] = Def.ActorFrame {
 	-- The Preview Notefield.
 	Def.ActorFrame {
 		InitCommand = function(self)
-			NFParent = self
 			ssm = GHETTOGAMESTATE:getSSM()
-			self:queuecommand("StartPreview")
 		end,
 
-		StartPreviewCommand = function(self)
-			NF = ssm:CreatePreviewNoteField()
-			if NF == nil then
-				return
-			end
-			NF:zoom(0.5):draworder(100)
-			ssm:dootforkfive(NFParent)
-			NF:xy(frameWidth / 2, 50)
-			if usingreverse then
-				NF:y(50 * 1.5 + 215)
+		Def.NoteFieldPreview {
+			Name = "NoteField",
+			DrawDistanceBeforeTargetsPixels = 800,
+			DrawDistanceAfterTargetsPixels = 0,
+			YReverseOffsetPixels = 100,
+
+			InitCommand = function(self)
+				local s = GAMESTATE:GetCurrentSteps()
+				if s ~= nil then
+					self:LoadNoteData(s)
+				end
+			end,
+			BeginCommand = function(self)
+				self:zoom(0.5):draworder(100)
+				self:xy(frameWidth / 2, 50)
+				if usingreverse then
+					self:y(50 * 1.5 + 215)
+				end
+				self:GetParent():SortByDrawOrder()
+				SOUND:StopMusic()
+				ssm:PlayCurrentSongSampleMusic(true, true)
+			end,
+			CurrentStepsChangedMessageCommand = function(self, params)
+				local steps = params.ptr
+				if steps ~= nil then
+					self:LoadNoteData(steps)
+				else
+					self:LoadDummyNoteData()
+				end
 			end
-			NFParent:SortByDrawOrder()
-		end
+		},
 	},
 }
 

BGAnimations/ScreenDownload overlay/default.lua

@@ -2,7 +2,6 @@ local top
 
 local initpacklist = PackList:new()
 local packlist = initpacklist:GetPackTable()
-local downloading = DLMAN:GetDownloadingPacks()
 
 -- make lookup table for installed packs
 local installedPacks = {}
@@ -144,10 +143,17 @@ local function input(event)
 end
 
 local downloading = DLMAN:GetDownloadingPacks()
+local queued = DLMAN:GetQueuedPacks()
 local function update(self, delta)
+	downloading = DLMAN:GetDownloadingPacks()
+	queued = DLMAN:GetQueuedPacks()
 	for _,pack in ipairs(downloading) do
 		local download = pack:GetDownload()
-		self:GetChild("PackList"):playcommand("DownloadStatus", {pack = pack, download = download})
+		self:GetChild("PackList"):playcommand("DownloadStatus", {pack = pack, download = download, queued = false})
+	end
+	for _,pack in ipairs(queued) do
+		local download = pack:GetDownload()
+		self:GetChild("PackList"):playcommand("DownloadStatus", {pack = pack, download = download, queued = true})
 	end
 
 end
@@ -423,7 +429,6 @@ local function packList()
 		end,
 		DFRFinishedMessageCommand = function(self) -- Download Finished, a Diff Reload happens (forced by the game)
 			refreshInstalledPacks()
-			downloading = DLMAN:GetDownloadingPacks()
 			MESSAGEMAN:Broadcast("UpdateList")
 		end,
 	}
@@ -611,17 +616,21 @@ local function packList()
 				end
 			end,
 			DownloadStatusCommand = function(self, params) -- Download status update from updatefunction
-				if not params.download then
+				if not params.download and not params.queued then
 					return 
 				end
-
 				if params.pack == packlist[packIndex] then
-					download = params.download
-
-					self:GetChild("Status"):diffuse(color(colorConfig:get_data().downloadStatus.downloading)):diffusealpha(0.8)
-					self:GetChild("ProgressBar"):diffuse(color(colorConfig:get_data().downloadStatus.downloading)):diffusealpha(0.2)
-					self:GetChild("Size"):settextf("Downloading %5.2f MB / %5.2f MB", download:GetKBDownloaded()/1048576, download:GetTotalKB()/1048576)
-					self:GetChild("ProgressBar"):zoomx(download:GetKBDownloaded()/download:GetTotalKB()*packItemWidth)
+					if params.queued then
+						self:GetChild("Status"):diffuse(color(colorConfig:get_data().downloadStatus.downloading)):diffusealpha(0.8)
+						self:GetChild("ProgressBar"):diffuse(color(colorConfig:get_data().downloadStatus.downloading)):diffusealpha(0.2)
+						self:GetChild("ProgressBar"):zoomx(0)
+					else
+						download = params.download
+						self:GetChild("Status"):diffuse(color(colorConfig:get_data().downloadStatus.downloading)):diffusealpha(0.8)
+						self:GetChild("ProgressBar"):diffuse(color(colorConfig:get_data().downloadStatus.downloading)):diffusealpha(0.2)
+						self:GetChild("Size"):settextf("Downloading %5.2f MB / %5.2f MB", download:GetKBDownloaded()/1048576, download:GetTotalKB()/1048576)
+						self:GetChild("ProgressBar"):zoomx(download:GetKBDownloaded()/download:GetTotalKB()*packItemWidth)
+					end
 				end
 			end,
 			StartDownloadCommand = function(self) -- Start download
@@ -630,22 +639,28 @@ local function packList()
 					return
 				end
 				download = packlist[packIndex]:DownloadAndInstall()
-				downloading = DLMAN:GetDownloadingPacks()
 				if not packExists(packlist[packIndex]:GetName()) then
 					self:GetChild("Status"):diffuse(color(colorConfig:get_data().downloadStatus.downloading)):diffusealpha(0.8)
 					self:GetChild("ProgressBar"):diffuse(color(colorConfig:get_data().downloadStatus.downloading)):diffusealpha(0.2)
 				end
 			end,
 			StopDownloadCommand = function(self) -- Stop download
-				download:Stop()
-				downloading = DLMAN:GetDownloadingPacks()
+				if packlist[packIndex]:IsQueued() then
+					local success = packlist[packIndex]:RemoveFromQueue()
+					if success then
+						self:GetChild("Status"):playcommand("Set")
+						self:GetChild("ProgressBar"):diffuse(color(colorConfig:get_data().downloadStatus.available)):diffusealpha(0.2)
+						self:GetChild("Size"):settextf("Download Removed from Queue")
+					end
+				else
+					download:Stop()
+				end
 			end,
 			PackDownloadedMessageCommand = function(self, params) -- Download Stopped/Finished
-				downloading = DLMAN:GetDownloadingPacks()
+				-- nothing?
 			end,
 			DownloadFailedMessageCommand = function(self, params) -- Download Failed
 				if packlist[packIndex] ~= nil and packlist[packIndex]:GetName() == params.pack:GetName() then 
-					downloading = DLMAN:GetDownloadingPacks()
 					self:GetChild("Status"):playcommand("Set")
 					self:GetChild("ProgressBar"):diffuse(color(colorConfig:get_data().downloadStatus.available)):diffusealpha(0.2)
 					self:GetChild("Size"):settextf("Download Failed or Cancelled")
@@ -689,7 +704,7 @@ local function packList()
 				self:zoomto(packItemWidth, packItemHeight)
 			end,
 			MouseDownCommand = function(self)
-				if packlist[packIndex] ~= nil and packlist[packIndex]:IsDownloading() then -- IsDownloading() returns the wrong boolean for some reason.
+				if packlist[packIndex] ~= nil and packlist[packIndex]:IsDownloading() and not packlist[packIndex]:IsQueued() then -- IsDownloading() returns the wrong boolean for some reason.
 					self:GetParent():playcommand("StartDownload")
 				elseif packlist[packIndex] ~= nil then
 					self:GetParent():playcommand("StopDownload")

BGAnimations/ScreenEvaluation decorations/MPscoreboard.lua

@@ -3,7 +3,7 @@ local frameWidth = capWideScale(160, 260)
 local framex = SCREEN_WIDTH-frameWidth-WideScale(get43size(40),40)/2
 local framey = 110
 local spacing = 34
-local steps = GAMESTATE:GetCurrentSteps(PLAYER_1)
+local steps = GAMESTATE:GetCurrentSteps()
 
 --Input event for mouse clicks
 local function input(event)