Swing token note

Custom background settings

Automatic background selection

- For SIFTrain beatmap (extension)

New note tap accuracy

- Might gives more goods. Not very tested

Global offset setting

Fixed score node canvas management

Optimized loading times (slightly)

Author: MikuAuahDark

AquaShine.lua

@@ -720,6 +720,22 @@ function love.load(arg)
 		jit.off()
 	end
 
+	if AquaShine.GetCommandLineConfig("debug") then
+		function AquaShine.Log(part, msg, ...)
+			if not(part) then
+				local info = debug.getinfo(2)
+				
+				if info.short_src and info.currentline then
+					part = info.short_src..":"..info.currentline
+				end
+			end
+			
+			io.stderr:write("[", part or "unknown", "] ", string.format(msg or "", ...), "\n")
+		end
+	else
+		function AquaShine.Log() end
+	end
+	
 	-- Preload entry points
 	if AquaShine.AllowEntryPointPreload then
 		for n, v in pairs(ASArg.Entries) do

README.md

@@ -3,7 +3,7 @@ Live Simulator: 2
 
 Live Simulator: 2 (`DEPLS2`) is a Love Live! School Idol Festival Live Show Simulator written in Lua.
 
-LOVE2D v0.10.1 or later is required to run this live simulator.
+It is currently LL!SIF live simulator that supports variety of different beatmap formats.
 
 How to run
 ==========
@@ -51,15 +51,17 @@ Controls
 Supported Beatmaps
 ==================
 
-* Raw SIF beatmap, this is main beatmap format that DEPLS uses.
+* Raw SIF beatmap, this is main beatmap format that Live Simulator: 2 internally uses.
 
 * Sukufesu Simulator beatmap, yuyu live simulator beatmap.
 
 * Custom Beatmap Festival project folder.
 
 * MIDI, specialized MIDI file.
 
-* LLPractice beatmap, with some bit complex setup.
+* LLPractice beatmap.
+
+* SIFTrain beatmap, both original one and "extended" one were supported.
 
 Screenshots
 ===========
@@ -102,6 +104,6 @@ Live Simulator: 2 uses these external libraries:
 
 * Lua FFT library (`luafft.lua`)
 
-* LuaBit library (`bit.lua`) (fallback if `bit` library is unavailable)
+* LuaBit library (`bit.lua`) (fallback: used if `bit` library is unavailable)
 
 Please see respective files (or website) for license of those libraries.

TODO.txt

@@ -4,18 +4,28 @@ v1.1.2
 - Add IsOpenGLES() storyboard function			OK
 
 v1.1.3
-- SIFTrain beatmap extension				WIP
+- SIFTrain beatmap extension				OK
 - /gles switch						OK
 - Improved swing note detection				OK
-- Swing token note
-- Difficulty-Background mapping				WIP
+- Swing token note					OK
+- Difficulty-Background mapping				OK
 - New note tap accuracy					OK
-- Deprecation of test beatmap				OK
+- Global offset setting					OK
+- Deprecation of test beatmap
+- Deprecation of SetNotesSpeed
 
 v2.0
 - FFmpeg extension
 - Unit creation
 - AquaShine UI library
-- NoteLoader2 (metadata loading only, beatmap verification)
-- Removal of Playground TEXB Loader
-- Deprecation of test beatmap
+- NoteLoader2 (metadata loading, beatmap verification)
+- Hidden note and sudden note
+- Individual note speed
+- Live Show! Failed
+- Pause
+- Adjustable combo display size
+- Adjustable SE volume
+- Actual unit live skill
+- Removal of Playground TEXB Loader (Shelsha)
+- Removal of test beatmap
+- Removal of SetNotesSpeed

docs/Storyboard.md

@@ -188,6 +188,8 @@ Returns: Previous notes speed
 
 > This function throws error if `notes_speed` is less than 400ms
 
+> This function is now deprecated and will be removed in the future
+
 *************************************************
 
 ### `number SetPlaySpeed([number speed_factor])`

livesim.lua

@@ -479,7 +479,6 @@ function DEPLS.DrawDebugInfo()
 	local sample = DEPLS.StoryboardFunctions.GetCurrentAudioSample()[1]
 	local text = string.format([[
 %d FPS
-SAVE_DIR = %s
 NOTE_SPEED = %d ms
 ELAPSED_TIME = %d ms
 SPEED_FACTOR = %.2f%%
@@ -493,7 +492,7 @@ REMAINING_NOTES = %d
 PERFECT = %d GREAT = %d
 GOOD = %d BAD = %d MISS = %d
 AUTOPLAY = %s
-]]		, love.timer.getFPS(), DEPLS.SaveDirectory, DEPLS.NotesSpeed, DEPLS.ElapsedTime, DEPLS.PlaySpeed * 100
+]]		, love.timer.getFPS(), DEPLS.NotesSpeed, DEPLS.ElapsedTime, DEPLS.PlaySpeed * 100
 		, DEPLS.Routines.ComboCounter.CurrentCombo, #EffectPlayer.list, DEPLS.LiveOpacity, DEPLS.BackgroundOpacity
 		, DEPLS.BeatmapAudioVolume, sample[1], sample[2], DEPLS.NoteManager.NoteRemaining, DEPLS.NoteManager.Perfect
 		, DEPLS.NoteManager.Great, DEPLS.NoteManager.Good, DEPLS.NoteManager.Bad, DEPLS.NoteManager.Miss, tostring(DEPLS.AutoPlay))
@@ -536,6 +535,7 @@ function DEPLS.Start(argv)
 
 	-- Load configuration
 	local BackgroundID = AquaShine.LoadConfig("BACKGROUND_IMAGE", 11)
+	local GlobalOffset = AquaShine.LoadConfig("GLOBAL_OFFSET", 0)
 	local Keys = AquaShine.LoadConfig("IDOL_KEYS", "a\ts\td\tf\tspace\tj\tk\tl\t;")
 	local Auto = assert(tonumber(AquaShine.LoadConfig("AUTOPLAY", 0)))
 	DEPLS.LiveDelay = math.max(AquaShine.LoadConfig("LIVESIM_DELAY", 1000), 1000)
@@ -598,6 +598,11 @@ function DEPLS.Start(argv)
 	notes_list = noteloader_data.notes_list
 
 	-- Load background
+	if  AquaShine.LoadConfig("AUTO_BACKGROUND", 1) == 0 then
+		-- Background always default one
+		noteloader_data.background = nil
+	end
+	
 	if type(noteloader_data.background) == "number" then
 		BackgroundID = noteloader_data.background
 	elseif type(noteloader_data.background) == "table" then
@@ -637,7 +642,7 @@ function DEPLS.Start(argv)
 	-- Add to note manager
 	do
 		for i = 1, #notes_list do
-			DEPLS.NoteManager.Add(notes_list[i])
+			DEPLS.NoteManager.Add(notes_list[i], GlobalOffset)
 		end
 	end
 	DEPLS.NoteManager.InitializeImage()

livesim/scorenode_effect.lua

@@ -24,12 +24,12 @@ function ScoreNode.Create(score)
 		local canvas = graphics.newCanvas(500, 32)
 		local temp = {}
 
-		temp.Used = true
 		temp.Canvas = canvas
 		out.score_canvas = temp
 		ScoreNode.CanvasList[#ScoreNode.CanvasList + 1] = temp
 	end
-		
+	
+	out.score_canvas.Used = true
 	out.score_info = {opacity = 0, scale = 0.9, x = 530}
 	out.opacity_tw = tween.new(100, out.score_info, {opacity = 255})
 	out.scale_tw = tween.new(200, out.score_info, {scale = 1}, "inOutSine")

main.lua

@@ -23,8 +23,8 @@
 -- IN THE SOFTWARE.
 --]]---------------------------------------------------------------------------
 
-DEPLS_VERSION = "1.1.3-pre1"
-DEPLS_VERSION_NUMBER = 01010201	-- xxyyzzww. x = major, y = minor, z = patch, w = pre-release counter
+DEPLS_VERSION = "1.1.3"
+DEPLS_VERSION_NUMBER = 01010300	-- xxyyzzww. x = major, y = minor, z = patch, w = pre-release counter
 
 ----------------------
 -- AquaShine loader --

note.lua

@@ -123,9 +123,11 @@ local SlideNoteList = {}
 --! @brief Creates new SingleNoteObject
 --! @param note_data SIF-compilant note data
 --! @returns New NoteObject
-local function NewNoteObject(note_data)
+local function NewNoteObject(note_data, offset)
+	offset = offset or 0
+	
 	local noteobj = {
-		ZeroAccuracyTime = note_data.timing_sec * 1000,
+		ZeroAccuracyTime = note_data.timing_sec * 1000 + offset,
 		Attribute = tonumber(note_data.notes_attribute),
 		Position = note_data.position,
 		Audio = {
@@ -137,6 +139,7 @@ local function NewNoteObject(note_data)
 		FirstCircle = {480, 160}
 	}
 	local idolpos = assert(DEPLS.IdolPosition[note_data.position], "Invalid idol position")
+	local note_effect = note_data.effect % 10
 
 	-- Idol position
 	noteobj.NoteposDiff = {idolpos[1] - 416, idolpos[2] - 96}
@@ -148,39 +151,33 @@ local function NewNoteObject(note_data)
 		noteobj.SimulNote = true
 	end
 
-	if note_data.effect == 2 then
-		-- Token note
-		noteobj.TokenNote = true
-	elseif note_data.effect == 4 then
-		-- Star note
-		noteobj.StarNote = true
-	elseif note_data.effect == 11 then
-		-- Slide note
+	-- Swing note
+	noteobj.SlideNote = (note_data.effect - 1) / 10 >= 1 and note_effect < 4
+	
+	if noteobj.SlideNote then
 		local newnotedata = Yohane.CopyTable(note_data)
 
-		noteobj.SlideNote = true
 		SlideNoteList[#SlideNoteList + 1] = newnotedata
 		newnotedata.noteobj = noteobj
 		newnotedata.index = Note.TotalNotes
-	elseif note_data.effect == 3 or note_data.effect == 13 then
-		-- Long note (necessarily with swing)
-		if note_data.effect == 13 then
-			local newnotedata = Yohane.CopyTable(note_data)
-			
-			noteobj.SlideNote = true
-			noteobj.SlideNote = true
-			SlideNoteList[#SlideNoteList + 1] = newnotedata
-			newnotedata.noteobj = noteobj
-			newnotedata.index = Note.TotalNotes
-		end
-		
+	end
+	
+	if note_effect == 2 then
+		-- Token note
+		noteobj.TokenNote = true
+	elseif note_effect == 4 then
+		-- Star note
+		noteobj.StarNote = true
+	elseif note_effect == 3 then
 		-- Long note. Use LongNoteObject metatable
 		noteobj.Audio2 = {
 			Perfect = DEPLS.Sound.PerfectTap:clone(),
 			Great = DEPLS.Sound.GreatTap:clone(),
 			Good = DEPLS.Sound.GoodTap:clone(),
 			Bad = DEPLS.Sound.BadTap:clone(),
 		}
+		
+		-- Create trail mesh vertices
 		noteobj.Vert = {}
 		noteobj.SecondCircle = {480, 160}
 		noteobj.ZeroAccuracyEndNote = note_data.effect_value * 1000
@@ -206,10 +203,6 @@ local function NewNoteObject(note_data)
 		return noteobj
 	end
 
-	if note_data.effect ~= 11 then
-		PreviousSlideNote = nil
-	end
-	
 	-- SingleNoteObject in here
 	noteobj.Audio.StarExplode = DEPLS.Sound.StarExplode:clone()
 	noteobj.ScoreMultipler2 = 1
@@ -695,10 +688,10 @@ end
 
 --! @brief Add note
 --! @param note_data SIF-compilant note data
-function Note.Add(note_data)
+function Note.Add(note_data, offset)
 	Note.NoteRemaining = Note.NoteRemaining + 1
 	Note.TotalNotes = Note.TotalNotes + 1
-	table.insert(Note[note_data.position], NewNoteObject(note_data))
+	table.insert(Note[note_data.position], NewNoteObject(note_data, offset))
 end
 
 local function initnote_pos(a)
@@ -757,9 +750,8 @@ function Note.InitializeImage()
 						applyswing(chainswing)
 					end
 
-					
 					if (chainswing.effect == 13 and
-							chainswing.timing_sec + chainswing.effect_value or
+							chainswing.timing_sec  + chainswing.effect_value or
 							chainswing.timing_sec
 						) - last_timing > 0.25
 					then