Completed CBF beatmap loader

Volume normalization (like ReplayGain but it's not)

- Quiter sounds will be sounds louder

Beatmap selection now with pages

Implemented swing + long note (Mermaid Festa vol.2 Master)

- Velocity < 64 when making beatmaps with MIDI editor

- Updated LS2 specification to reflect this change (code updated soon)

Author: MikuAuahDark

AquaShine.lua

@@ -16,10 +16,7 @@ local AquaShine = {
 }
 
 local love = require("love")
-local JSON = require("JSON")
-local Yohane = require("Yohane")
 local Shelsha = require("Shelsha")
-local SkipCall = 0
 
 local ScreenshotThreadCode = [[
 local lt = require("love.timer")
@@ -135,15 +132,15 @@ function AquaShine.LoadConfig(key, defval)
 	return tonumber(data) or data
 end
 
+local TemporaryEntryPoint
 --! @brief Loads entry point
 --! @param name The entry point Lua script file
 --! @param arg Additional argument to be passed
 function AquaShine.LoadEntryPoint(name, arg)
 	local scriptdata = assert(love.filesystem.load(name))()
 	scriptdata.Start(arg or {})
-	AquaShine.CurrentEntryPoint = scriptdata
-	
-	SkipCall = 1
+	--AquaShine.CurrentEntryPoint = scriptdata
+	TemporaryEntryPoint = scriptdata
 end
 
 --! Function used to replace extension on file
@@ -319,6 +316,12 @@ end
 ------------------------------
 function AquaShine.MainLoop()
 	while true do
+		-- Switch entry point
+		if TemporaryEntryPoint then
+			AquaShine.CurrentEntryPoint = TemporaryEntryPoint
+			TemporaryEntryPoint = nil
+		end
+		
 		-- Process events.
 		love.event.pump()
 		for name, a,b,c,d,e,f in love.event.poll() do
@@ -338,18 +341,14 @@ function AquaShine.MainLoop()
 			love.graphics.clear()
 
 			if AquaShine.CurrentEntryPoint then
-				if SkipCall == 0 then
-					dt = dt * 1000
-					AquaShine.CurrentEntryPoint.Update(dt)
-					love.graphics.push()
-					
-					love.graphics.translate(AquaShine.LogicalScale.OffX, AquaShine.LogicalScale.OffY)
-					love.graphics.scale(AquaShine.LogicalScale.ScaleOverall)
-					AquaShine.CurrentEntryPoint.Draw(dt)
-					love.graphics.pop()
-				else
-					SkipCall = SkipCall - 1
-				end
+				dt = dt * 1000
+				AquaShine.CurrentEntryPoint.Update(dt)
+				love.graphics.push()
+				
+				love.graphics.translate(AquaShine.LogicalScale.OffX, AquaShine.LogicalScale.OffY)
+				love.graphics.scale(AquaShine.LogicalScale.ScaleOverall)
+				AquaShine.CurrentEntryPoint.Draw(dt)
+				love.graphics.pop()
 			else
 				love.graphics.setFont(font)
 				love.graphics.print("AquaShine loader: No entry point specificed/entry point rejected", 10, 10)

assets/image/cbf/star4foreRCoolIdolized.png

@@ -317,3 +317,5 @@ Parameters:
 * `attribute` - Note attribute. 1, 2, 3 are Smile, Pure, and Cool respectively. The others depends on beatmap type.
 
 * `is_simul` - Is the note is a simultaneous note? (start holding only)
+
+* `is_slide` - Is the note is a slide note?

assets/image/cbf/star4foreRPureIdolized.png

@@ -583,6 +583,13 @@ function DEPLS.Start(argv)
 	DEPLS.Sound.BeatmapAudio = noteloader_data.song_file
 	DEPLS.Sound.LiveClear = noteloader_data.live_clear
 
+	-- Normalize song volume
+	-- Enabled on LuaJIT by default, disabled on Lua 5.1 by default
+	if noteloader_data.song_file and ((jit and not(AquaShine.GetCommandLineConfig("norg"))) or AquaShine.GetCommandLineConfig("forcerg")) then
+		require("volume_normalizer")(noteloader_data.song_file)
+	end
+	
+	-- Load background
 	if type(noteloader_data.background) == "number" then
 		BackgroundID = noteloader_data.background
 	elseif type(noteloader_data.background) == "table" then

assets/image/cbf/star4foreRSmile.png

@@ -3,7 +3,7 @@
 -- Since AquaShine is special for Live Simulator: 2, it's not available as standalone Lua script.
 -- Please see docs/AquaShine.md for more information.
 
-DEPLS_VERSION = "1.0.0-pre1"
+DEPLS_VERSION = "1.0.0-pre2"
 
 ----------------------
 -- AquaShine loader --

docs/Storyboard.md

@@ -145,8 +145,21 @@ local function NewNoteObject(note_data)
 		end
 
 		PreviousSlideNote = noteobj			
-	elseif note_data.effect == 3 then
-		PreviousSlideNote = nil
+	elseif note_data.effect == 3 or note_data.effect == 13 then
+		-- Long note (necessarily with swing)
+		if note_data.effect == 13 then
+			noteobj.SlideNote = true
+			
+			if PreviousSlideNote then
+				noteobj.Rotation =
+					(PreviousSlideNote.Position - note_data.position > 0 and 0 or math.pi) + PredefinedSlideRotation[note_data.position]
+				noteobj.PreviousChain = PreviousSlideNote
+				
+				PreviousSlideNote.NextChain = noteobj
+			end
+		else
+			PreviousSlideNote = nil
+		end
 
 		-- Long note. Use LongNoteObject metatable
 		noteobj.Audio2 = {
@@ -387,7 +400,8 @@ function LongNoteObject.Update(this, deltaT)
 					0, 								-- accuracy (miss)
 					notedistance,					-- distance
 					this.Attribute,					-- attribute
-					this.SimulNoteImage				-- is_simul
+					this.SimulNote,					-- is_simul
+					this.SlideNote					-- is_slide
 				)
 				return
 			end
@@ -434,7 +448,7 @@ function LongNoteObject.Draw(this)
 
 	setBlendMode("alpha")
 	setColor(255, 255, 255, DEPLS.LiveOpacity)
-	draw(this.NoteImage, this.FirstCircle[1], this.FirstCircle[2], 0, this.CircleScale, this.CircleScale, 64, 64)
+	draw(this.NoteImage, this.FirstCircle[1], this.FirstCircle[2], this.Rotation or 0, this.CircleScale, this.CircleScale, 64, 64)
 
 	-- Draw simultaneous note bar if it is
 	if this.SimulNoteImage then
@@ -491,7 +505,8 @@ function LongNoteObject.SetTouchID(this, touchid)
 			this.ScoreMultipler, 			-- accuracy
 			notedistance,					-- distance
 			this.Attribute,					-- attribute
-			this.SimulNoteImage				-- is_simul
+			this.SimulNote,					-- is_simul
+			this.SlideNote					-- is_slide
 		)
 
 		return
@@ -539,7 +554,8 @@ function LongNoteObject.SetTouchID(this, touchid)
 			this.ScoreMultipler, 			-- accuracy
 			notedistance,					-- distance
 			this.Attribute,					-- attribute
-			this.SimulNote					-- is_simul
+			this.SimulNote,					-- is_simul
+			this.SlideNote					-- is_slide
 		)
 	end
 end
@@ -610,7 +626,8 @@ function LongNoteObject.UnsetTouchID(this, touchid)
 		this.ScoreMultipler2, 			-- accuracy
 		notedistance,					-- distance
 		this.Attribute,					-- attribute
-		this.SimulNote					-- is_simul
+		this.SimulNote,					-- is_simul
+		this.SlideNote					-- is_slide
 	)
 end
 

livesim.lua

@@ -32,7 +32,31 @@ local UnitIconCache = {
 	HANAMARU_INITIAL_IDOL = AquaShine.LoadImage("assets/image/cbf/01_Initial_Idolized_game.png"),
 	ELI_THIEF = AquaShine.LoadImage("assets/image/cbf/02_thief_unidolized_game.png"),
 	ELI_THIEF_IDOL = AquaShine.LoadImage("assets/image/cbf/02_thief_idolized_game.png"),
-	-- TODO: Complete it
+	RIN_ARABIAN = AquaShine.LoadImage("assets/image/cbf/01_arabianSet_unidolized_game.png"),
+	RIN_ARABIAN_IDOL = AquaShine.LoadImage("assets/image/cbf/01_arabianSet_idolized_game.png"),
+	NOZOMI_IDOLSET = AquaShine.LoadImage("assets/image/cbf/01_idolCostumeSet_unidolized_game.png"),
+	NOZOMI_IDOLSET_IDOL = AquaShine.LoadImage("assets/image/cbf/01_idolCostumeSet_idolized_game.png"),
+	NICO_DEVIL = AquaShine.LoadImage("assets/image/cbf/01_devil_unidolized_game.png"),
+	NICO_DEVIL_IDOL = AquaShine.LoadImage("assets/image/cbf/01_devil_idolized_game.png"),
+	UMI_DEVIL = AquaShine.LoadImage("assets/image/cbf/01_devil_unidolized_game_2.png"),
+	HANAYO_TAISHOROMAN = AquaShine.LoadImage("assets/image/cbf/01_taishoRoman_unidolized_game.png"),
+	HANAYO_TAISHOROMAN_IDOL = AquaShine.LoadImage("assets/image/cbf/01_taishoRoman_idolized_game.png"),
+	ELI_POOL = AquaShine.LoadImage("assets/image/cbf/01_pool_unidolized_game.png"),
+	KANAN_YUKATA = AquaShine.LoadImage("assets/image/cbf/01_yukata_unidolized_game.png"),
+	KANAN_YUKATA_IDOL = AquaShine.LoadImage("assets/image/cbf/01_yukata_idolized_game.png"),
+	YOSHIKO_YUKATA = AquaShine.LoadImage("assets/image/cbf/01_yukata_unidolized_game_2.png"),
+	YOSHIKO_YUKATA_IDOL = AquaShine.LoadImage("assets/image/cbf/01_yukata_idolized_game_3.png"),
+	YOU_YUKATA = AquaShine.LoadImage("assets/image/cbf/01_yukata_unidolized_game_3.png"),
+	YOU_YUKATA_IDOL = AquaShine.LoadImage("assets/image/cbf/01_yukata_idolized_game_2.png"),
+	MAKI_POOL = AquaShine.LoadImage("assets/image/cbf/01_pool_unidolized_game_2.png"),
+	MAKI_POOL_IDOL = AquaShine.LoadImage("assets/image/cbf/01_pool_idolized_game.png"),
+	RUBY_GOTHIC = AquaShine.LoadImage("assets/image/cbf/01_gothic_unidolized_game.png"),
+	RUBY_GOTHIC_IDOL = AquaShine.LoadImage("assets/image/cbf/01_gothic_idolized_game.png"),
+	YOSHIKO_HALLOWEEN = AquaShine.LoadImage("assets/image/cbf/01_halloween_unidolized_game.png"),
+	YOSHIKO_HALLOWEEN_IDOL = AquaShine.LoadImage("assets/image/cbf/01_halloween_idolized_game_2.png"),
+	MARI_HALLOWEEN_IDOL = AquaShine.LoadImage("assets/image/cbf/01_halloween_idolized_game.png"),
+	RIKO_HALLOWEEN_IDOL = AquaShine.LoadImage("assets/image/cbf/01_halloween_idolized_game_3.png"),
+	HANAMARU_YUKATA = AquaShine.LoadImage("assets/image/cbf/02_yukata_unidolized_game.png")
 }
 local IconCache = {
 	None = {
@@ -181,11 +205,11 @@ local function LoadUnitStrategy2(file)
 	then
 		for line in love.filesystem.lines(listname) do
 			if #line > 0 then
-				local idx, name = line:match("(%d+)/([^;]+)")
+				local idx = line:match("([^/]+)/[^;]+")
 				local _, img = pcall(love.graphics.newImage, file[1].."/Custom Cards/"..idx..".png")
 
 				if _ then
-					UnitIconCache[name] = img
+					UnitIconCache[idx] = img
 				end
 			end
 		end
@@ -283,7 +307,10 @@ function CBFBeatmap.Load(file)
 			hold_time = tonumber(hold_time)
 
 			if is_customcol == "True" then
-				attri = bit.bor(bit.bor(bit.lshift(tonumber(r) * 255, 23), bit.lshift(tonumber(g) * 255, 14)), bit.bor(bit.lshift(tonumber(b) * 255, 5), 31))
+				attri = bit.bor(
+					bit.bor(bit.lshift(math.floor(tonumber(r) * 255), 23), bit.lshift(math.floor(tonumber(g) * 255), 14)),
+					bit.bor(bit.lshift(math.floor(tonumber(b) * 255), 5), 31)
+				)
 			end
 
 			if is_release == "True" then
@@ -387,8 +414,8 @@ function CBFBeatmap.Load(file)
 					units[i] = CompositionCache[cache_name]
 					has_custom_units = true
 				else
-					local attr, rar, cname, r, g, b, cust_char = line:match("[^/]+/([^/]+)/([^/]+)/([^/]*)/(%d+%.?%d*),(%d+%.?%d*),(%d+%.?%d*)/([False|True]+);")
-					local a = ComposeUnitImage(attr, rar, cust_char == "True" and cname, r, g, b)
+					local attr, rar, cname, r, g, b = line:match("[^/]+/([^/]+)/([^/]+)/([^/]*)/(%d+%.?%d*),(%d+%.?%d*),(%d+%.?%d*)/")
+					local a = ComposeUnitImage(attr, rar, cname, r, g, b)
 
 					units[i] = a
 					CompositionCache[cache_name] = a

main.lua

@@ -7,12 +7,11 @@ local CurrentPage = 0
 local BeatmapSelectedIndex = 0
 local MouseState = {X = 0, Y = 0, Pressed = {}}
 
-local com_button_14
-local com_button_14di
-local com_button_14se
+local com_button_14, com_button_14di, com_button_14se
 local com_win_02
-local s_button_03
-local s_button_03se
+local s_button_03, s_button_03se
+local com_button_12, com_button_12se
+local com_button_13, com_button_13se
 local log_etc_08
 local liveback_1
 
@@ -37,6 +36,10 @@ function SelectBeatmap.Start(arg)
 	s_button_03 = AquaShine.LoadImage("image/s_button_03.png")
 	s_button_03se = AquaShine.LoadImage("image/s_button_03se.png")
 	log_etc_08 = AquaShine.LoadImage("assets/image/ui/log_etc_08.png")
+	com_button_12 = AquaShine.LoadImage("assets/image/ui/com_button_12.png")
+	com_button_12se = AquaShine.LoadImage("assets/image/ui/com_button_12se.png")
+	com_button_13 = AquaShine.LoadImage("assets/image/ui/com_button_13.png")
+	com_button_13se = AquaShine.LoadImage("assets/image/ui/com_button_13se.png")
 
 	liveback_1 = AquaShine.LoadImage("assets/image/background/liveback_1.png")
 
@@ -76,17 +79,45 @@ function SelectBeatmap.Draw()
 	draw(BackImage, -98, 0)
 	setColor(0, 0, 0)
 	drawtext("Select Beatmap", 95, 13)
+	drawtext(string.format("Page %d", CurrentPage + 1), 52, 500)
 	setColor(255, 255, 255)
 	setFont(MTLmr3m)
 
+	--[[
 	if
 		MouseState.Pressed[1] and
-		MouseState.X >= 0 and MouseState.X <= 86 and
-		MouseState.Y >= 0 and MouseState.Y <= 58
-	then
-		draw(BackButtonSe)
+	]]
+	if MouseState.Pressed[1] then
+		if
+			MouseState.X >= 0 and MouseState.X <= 86 and
+			MouseState.Y >= 0 and MouseState.Y <= 58
+		then
+			draw(BackButtonSe)
+		else
+			draw(BackButton)
+		end
+		
+		if
+			MouseState.X >= 0 and MouseState.X < 48 and
+			MouseState.Y >= 272 and MouseState.Y < 328
+		then
+			draw(com_button_12se, 0, 272)
+		else
+			draw(com_button_12, 0, 272)
+		end
+		
+		if
+			MouseState.X >= 912 and MouseState.X < 960 and
+			MouseState.Y >= 272 and MouseState.Y < 328
+		then
+			draw(com_button_13se, 912, 272)
+		else
+			draw(com_button_13, 912, 272)
+		end
 	else
 		draw(BackButton)
+		draw(com_button_12, 0, 272)
+		draw(com_button_13, 912, 272)
 	end
 
 	for i = CurrentPage * 40 + 1, (CurrentPage + 1) * 40 do
@@ -166,13 +197,21 @@ function SelectBeatmap.MouseReleased(x, y, button)
 		then
 			-- Start livesim
 			AquaShine.LoadEntryPoint("livesim.lua", {BeatmapList[BeatmapSelectedIndex].name, Random = IsRandomNotesWasTicked})
+			
 			return
 		elseif
 			x >= 476 and x < 508 and
 			y >= 528 and y < 560
 		then
+			-- Random note check
 			IsRandomNotesWasTicked = not(IsRandomNotesWasTicked)
 			return
+		elseif x >= 0 and x < 48 and y >= 272 and y < 328 then
+			-- Prev
+			CurrentPage = math.max(CurrentPage - 1, 0)
+		elseif x >= 912 and x < 960 and y >= 272 and y < 328 then
+			-- Next
+			CurrentPage = math.min(math.floor(math.max(#BeatmapList - 1, 0) / 40), CurrentPage + 1)
 		end
 	end
 

note.lua

@@ -0,0 +1,55 @@
+-- Audio volume normalizer, similar to ReplayGain but it's not
+-- Part of Live Simulator: 2
+
+local love = love
+local _, ffi = pcall(require, "ffi")
+
+if _ == false then
+	-- Non-FFI functions
+	return function(sd)
+		local samples = sd:getSampleCount() * sd:getChannels() - 1
+		local sample_data = {}
+		local peak = 0
+		
+		for i = 0, samples do
+			local smp = sd:getSample(i)
+			
+			peak = math.max(peak, math.abs(smp))
+			sample_data[i] = smp
+		end
+		
+		print(peak)
+		peak = 1 / peak
+		print(peak)
+		
+		for i = 0, samples do
+			sd:setSample(i, sample_data[i] * peak)
+		end
+	end
+end
+
+-- FFI functions
+return function(sd)
+	local samples = sd:getSampleCount() * sd:getChannels() - 1
+	local depth = sd:getBitDepth()
+	local lower_limits = -2 ^ (depth - 1)
+	local upper_limits = 2 ^ (depth - 1) - 1
+	local ptr = sd:getPointer()
+	local peak = 0
+	
+	if depth == 8 then
+		ptr = ffi.cast("int8_t*", ptr)
+	elseif depth == 16 then
+		ptr = ffi.cast("int16_t*", ptr)
+	end
+	
+	for i = 0, samples do
+		peak = math.max(peak, math.abs(ptr[i]))
+	end
+	
+	peak = upper_limits / peak
+	
+	for i = 0, samples do
+		ptr[i] = math.min(math.max(ptr[i] * peak, lower_limits), upper_limits)
+	end
+end