提交: c9a73394d575f8752bcb49d1380237f7a21af92d - ikemen_go (git)

Go で書き直した Ikemen

Commit MetaInfo

• 修订版: c9a73394d575f8752bcb49d1380237f7a21af92d (tree)
• 时间: 2019-09-08 19:04:30
• 作者: neatunsou <sisiy4excite@gmai...>
• Commiter: neatunsou

Log Message

BGMのloopstartとloopendを読み込むようにした
Screenpackでbgmのloopとvolumeを読み込むようにした
Storyboardでテキスト表示ができなかったのを修正
StoryboardのBGdefを読み込むときに文字列でインデックスを取ろうとする場合があったのを修正

更改概述

• modified: script/main.lua
• modified: script/motif.lua
• modified: script/select.lua
• modified: script/storyboard.lua
• modified: src/script.go
• modified: src/sound.go
• modified: src/system.go

差异

--- a/script/main.lua
+++ b/script/main.lua
@@ -658,7 +658,7 @@ function main.f_drawBG(data, info, layerno, timer)
 end
 
 --reset screenpack data
-function main.f_resetBG(info, bgdef, bgm)
+function main.f_resetBG(info, bgdef, bgm, bgmLoop, bgmVolume, bgmloopstart, bgmloopend)
 	bgm = bgm or nil
 	animReset(info.fadein_data)
 	animUpdate(info.fadein_data)
@@ -684,7 +684,7 @@ function main.f_resetBG(info, bgdef, bgm)
 		end
 	end
 	if bgm ~= nil then
-		playBGM(bgm)
+		playBGM(bgm, true, bgmLoop, bgmVolume, bgmloopstart or "0", bgmloopend or "0")
 	end
 end
 
@@ -1152,7 +1152,7 @@ for line in content:gmatch('[^\r\n]+') do
 					break
 				end
 				main.t_selStages[row] = {name = tmp, stage = c}
-				local zoomout, zoomin, bgmusic, bgmvolume = getStageInfo(row)
+				local zoomout, zoomin, bgmusic, bgmvolume, bgmloopstart, bgmloopend  = getStageInfo(row)
 				if zoomout ~= '' then
 					main.t_selStages[row].zoommin = tonumber(zoomout)
 				end
@@ -1161,7 +1161,7 @@ for line in content:gmatch('[^\r\n]+') do
 				end
 				if bgmusic ~= '' then
 					bgmusic = bgmusic:gsub('\\', '/')
-					main.t_selStages[row].music = {[1] = {bgmusic = bgmusic, bgmvolume = tonumber(bgmvolume)}}
+					main.t_selStages[row].music = {[1] = {bgmusic = bgmusic, bgmvolume = tonumber(bgmvolume), bgmloopstart = bgmloopstart, bgmloopend = bgmloopend}}
 				end
 				main.t_includeStage[#main.t_includeStage + 1] = row
 				main.t_stageDef[c] = row
@@ -1231,7 +1231,7 @@ for i = 1, #main.t_selChars do
 					break
 				end
 				main.t_selStages[row] = {name = tmp, stage = main.t_selChars[i].stage[j]}
-				local zoomout, zoomin, bgmusic, bgmvolume = getStageInfo(row)
+				local zoomout, zoomin, bgmusic, bgmvolume, bgmloopstart, bgmloopend = getStageInfo(row)
 				if zoomout ~= '' then
 					main.t_selStages[row].zoommin = tonumber(zoomout)
 				end
@@ -1241,7 +1241,7 @@ for i = 1, #main.t_selChars do
 				if bgmusic ~= '' then
 					bgmusic = bgmusic:gsub('\\', '/')
 					main.t_selStages[row].music = {}
-					main.t_selStages[row].music[1] = {bgmusic = bgmusic, bgmvolume = tonumber(bgmvolume)}
+					main.t_selStages[row].music[1] = {bgmusic = bgmusic, bgmvolume = tonumber(bgmvolume), bgmloopstart = bgmloopstart, bgmloopend = bgmloopend}
 				end
 				if main.t_selChars[i].includestage == nil or main.t_selChars[i].includestage == 1 then
 					main.t_includeStage[#main.t_includeStage + 1] = row
@@ -1583,7 +1583,7 @@ function main.f_mainMenu()
 	if motif.files.intro_storyboard ~= '' then
 		storyboard.f_storyboard(motif.files.intro_storyboard)
 	end
-	main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm)
+	main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
 	while true do
 		cursorPosY, moveTxt, item = main.f_menuCommon1(cursorPosY, moveTxt, item, t)
 		if esc() then

--- a/script/motif.lua
+++ b/script/motif.lua
@@ -42,42 +42,44 @@ local motif =
 	{
 		title_bgm = '',
 		title_bgm_volume = 100,
-		title_bgm_loop = 1, --not supported yet
-		title_bgm_loopstart = nil, --not supported yet
-		title_bgm_loopend = nil, --not supported yet
+		title_bgm_loop = 1,
+		title_bgm_loopstart = nil,
+		title_bgm_loopend = nil,
 		select_bgm = '',
 		select_bgm_volume = 100,
-		select_bgm_loop = 1, --not supported yet
-		select_bgm_loopstart = nil, --not supported yet
-		select_bgm_loopend = nil, --not supported yet
+		select_bgm_loop = 1,
+		select_bgm_loopstart = nil,
+		select_bgm_loopend = nil,
 		vs_bgm = '',
 		vs_bgm_volume = 100,
-		vs_bgm_loop = 1, --not supported yet
-		vs_bgm_loopstart = nil, --not supported yet
-		vs_bgm_loopend = nil, --not supported yet
+		vs_bgm_loop = 1,
+		vs_bgm_loopstart = nil,
+		vs_bgm_loopend = nil,
 		victory_bgm = '',
 		victory_bgm_volume = 100,
-		victory_bgm_loop = 1, --not supported yet
-		victory_bgm_loopstart = nil, --not supported yet
-		victory_bgm_loopend = nil, --not supported yet
+		victory_bgm_loop = 1,
+		victory_bgm_loopstart = nil,
+		victory_bgm_loopend = nil,
 		continue_bgm = 'sound/CONTINUE.ogg', --Ikemen feature
-		continue_bgm_volume = 100, --Ikemen feature (not supported yet)
-		continue_bgm_loop = 1, --Ikemen feature (not supported yet)
-		continue_bgm_loopstart = nil, --Ikemen feature (not supported yet)
-		continue_bgm_loopend = nil, --Ikemen feature (not supported yet)
+		continue_bgm_volume = 100, --Ikemen feature
+		continue_bgm_loop = 1, --Ikemen feature
+		continue_bgm_loopstart = nil, --Ikemen feature
+		continue_bgm_loopend = nil, --Ikemen feature
 		continue_end_bgm = 'sound/GAME_OVER.ogg', --Ikemen feature
-		continue_end_volume = 100, --Ikemen feature (not supported yet)
-		continue_end_loop = 0, --Ikemen feature (not supported yet)
-		continue_end_loopstart = nil, --Ikemen feature (not supported yet)
-		continue_end_loopend = nil, --Ikemen feature (not supported yet)
+		continue_end_bgm_volume = 100, --Ikemen feature
+		continue_end_bgm_loop = 0, --Ikemen feature
+		continue_end_bgm_loopstart = nil, --Ikemen feature
+		continue_end_bgm_loopend = nil, --Ikemen feature
 		results_bgm = '', --Ikemen feature
-		results_bgm_loop = 1, --Ikemen feature (not supported yet)
-		results_bgm_loopstart = nil, --Ikemen feature (not supported yet)
-		results_bgm_loopend = nil, --Ikemen feature (not supported yet)
+		results_bgm_volume = 100, --Ikemen feature
+		results_bgm_loop = 1, --Ikemen feature
+		results_bgm_loopstart = nil, --Ikemen feature
+		results_bgm_loopend = nil, --Ikemen feature
 		tournament_bgm = '', --Ikemen feature
-		tournament_bgm_loop = 1, --Ikemen feature (not supported yet)
-		tournament_bgm_loopstart = nil, --Ikemen feature (not supported yet)
-		tournament_bgm_loopend = nil, --Ikemen feature (not supported yet)
+		tournament_bgm_volume = 100, --Ikemen feature
+		tournament_bgm_loop = 1, --Ikemen feature
+		tournament_bgm_loopstart = nil, --Ikemen feature
+		tournament_bgm_loopend = nil, --Ikemen feature
 	},
 	title_info =
 	{

--- a/script/select.lua
+++ b/script/select.lua
@@ -374,22 +374,33 @@ end
 
 function select.f_assignMusic()
 	local track = ''
+	local trackVolume = 100
+	local tracloopstart,tracloopend = nil
 	if main.stageMenu then
 		if main.t_selStages[stageNo].music ~= nil then
 			track = math.random(1, #main.t_selStages[stageNo].music)
+			trackVolume = main.t_selStages[stageNo].music[track].bgmvolume
+			trackloopstart = main.t_selStages[stageNo].music[track].bgmloopstart
+			trackloopend = main.t_selStages[stageNo].music[track].bgmloopend
 			track = main.t_selStages[stageNo].music[track].bgmusic
 		end
 	else
 		if main.t_selChars[t_p2Selected[1].cel + 1].music ~= nil then
 			track = math.random(1, #main.t_selChars[t_p2Selected[1].cel + 1].music)
+			trackVolume = main.t_selChars[t_p2Selected[1].cel + 1].music[track].bgmvolume
+			trackloopstart = main.t_selChars[t_p2Selected[1].cel + 1].music[track].bgmloopstart
+			trackloopend = main.t_selChars[t_p2Selected[1].cel + 1].music[track].bgmloopend
 			track = main.t_selChars[t_p2Selected[1].cel + 1].music[track].bgmusic
 		elseif main.t_selStages[stageNo].music ~= nil then
 			track = math.random(1, #main.t_selStages[stageNo].music)
+			trackVolume = main.t_selStages[stageNo].music[track].bgmvolume
+			trackloopstart = main.t_selStages[stageNo].music[track].bgmloopstart
+			trackloopend = main.t_selStages[stageNo].music[track].bgmloopend
 			track = main.t_selStages[stageNo].music[track].bgmusic
 		end
 		stageEnd = true
 	end
-	playBGM(track)
+	playBGM(track, true, 1, trackVolume, trackloopstart or "0", trackloopend or "0")
 end
 
 function select.f_selectStage()
@@ -697,13 +708,13 @@ function select.f_selectSimple()
 	stageList = 0
 	main.f_cmdInput()
 	while true do
-		main.f_resetBG(motif.select_info, motif.selectbgdef, motif.music.select_bgm)
+		main.f_resetBG(motif.select_info, motif.selectbgdef, motif.music.select_bgm, motif.music.select_bgm_loop, motif.music.select_bgm_volume, motif.music.select_bgm_loopstart, motif.music.select_bgm_loopend)
 		select.f_selectReset()
 		selectStart()
 		while not selScreenEnd do
 			if esc() then
 				sndPlay(motif.files.snd_data, motif.select_info.cancel_snd[1], motif.select_info.cancel_snd[2])
-				main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm)
+				main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
 				return
 			end
 			select.f_selectScreen()
@@ -743,12 +754,12 @@ getSpriteInfo('chars/kfm/kfm.sff', 0, 1)
 	select.f_selectReset()
 	stageEnd = true
 	while true do
-		main.f_resetBG(motif.select_info, motif.selectbgdef, motif.music.select_bgm)
+		main.f_resetBG(motif.select_info, motif.selectbgdef, motif.music.select_bgm, motif.music.select_bgm_loop, motif.music.select_bgm_volume, motif.music.select_bgm_loopstart, motif.music.select_bgm_loopend)
 		selectStart()
 		while not selScreenEnd do
 			if esc() then
 				sndPlay(motif.files.snd_data, motif.select_info.cancel_snd[1], motif.select_info.cancel_snd[2])
-				main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm)
+				main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
 				return
 			end
 			select.f_selectScreen()
@@ -789,7 +800,7 @@ getSpriteInfo('chars/kfm/kfm.sff', 0, 1)
 			if motif.files.intro_storyboard ~= '' then
 				storyboard.f_storyboard(motif.files.intro_storyboard)
 			end
-			main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm)
+			main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
 			return
 		--player won (also if lost in VS 100 Kumite)
 		elseif winner == 1 or main.gameMode == '100kumite' then
@@ -830,7 +841,7 @@ getSpriteInfo('chars/kfm/kfm.sff', 0, 1)
 				if motif.files.intro_storyboard ~= '' then
 					storyboard.f_storyboard(motif.files.intro_storyboard)
 				end
-				main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm)
+				main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
 				return
 			--next match available
 			else
@@ -856,7 +867,7 @@ getSpriteInfo('chars/kfm/kfm.sff', 0, 1)
 			if motif.files.intro_storyboard ~= '' then
 				storyboard.f_storyboard(motif.files.intro_storyboard)
 			end
-			main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm)
+			main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
 			return
 		--player lost but can continue
 		else
@@ -877,7 +888,7 @@ getSpriteInfo('chars/kfm/kfm.sff', 0, 1)
 				if motif.files.intro_storyboard ~= '' then
 					storyboard.f_storyboard(motif.files.intro_storyboard)
 				end
-				main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm)
+				main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
 				return
 			end
 			if config.ContSelection then --true if 'Char change at Continue' option is enabled
@@ -894,14 +905,14 @@ getSpriteInfo('chars/kfm/kfm.sff', 0, 1)
 				while not selScreenEnd do
 					if esc() then
 						sndPlay(motif.files.snd_data, motif.select_info.cancel_snd[1], motif.select_info.cancel_snd[2])
-						main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm)
+						main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
 						return
 					end
 					select.f_selectScreen()
 				end
 			elseif esc() then
 				sndPlay(motif.files.snd_data, motif.select_info.cancel_snd[1], motif.select_info.cancel_snd[2])
-				main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm)
+				main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
 				return
 			end
 		end
@@ -992,12 +1003,12 @@ function select.f_selectTournament()
 	stageList = 0
 	main.f_cmdInput()
 	while true do
-		main.f_resetBG(motif.tournament_info, motif.tournamentbgdef, motif.music.tournament_bgm)
+		main.f_resetBG(motif.tournament_info, motif.tournamentbgdef, motif.music.tournament_bgm, motif.music.tournament_bgm_loop, motif.music.tournament_bgm_volume, motif.music.tournament_bgm_loopstart, motif.music.tournament_bgm_loopend)
 		select.f_selectReset()
 		while not selScreenEnd do
 			if esc() then
 				sndPlay(motif.files.snd_data, motif.select_info.cancel_snd[1], motif.select_info.cancel_snd[2])
-				main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm)
+				main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
 				return
 			end
 			select.f_selectTournamentScreen()
@@ -1992,7 +2003,7 @@ function select.f_selectVersus()
 	textImgSetText(txt_matchNo, text[1])
 	local delay = 0
 	local minTime = 15 --let's reserve few extra ticks in case selectChar function needs time to load data, also prevents sound from being interrupted
-	main.f_resetBG(motif.vs_screen, motif.versusbgdef, motif.music.vs_bgm)
+	main.f_resetBG(motif.vs_screen, motif.versusbgdef, motif.music.vs_bgm, motif.music.vs_bgm_loop, motif.music.vs_bgm_volume, motif.music.vs_bgm_loopstart, motif.music.vs_bgm_loopend)
 	if not main.versusScreen then
 		delay = minTime
 		select.f_selectChar(1, t_p1Selected)
@@ -2038,7 +2049,7 @@ function select.f_selectVersus()
 		while true do
 			if esc() then
 				sndPlay(motif.files.snd_data, motif.select_info.cancel_snd[1], motif.select_info.cancel_snd[2])
-				main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm)
+				main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
 				break
 			elseif p1Confirmed and p2Confirmed then
 				if orderTime == -1 and main.f_btnPalNo(main.p1Cmd) > 0 and delay > motif.versusbgdef.timer + minTime then
@@ -2309,15 +2320,15 @@ function select.f_result(state)
 	else
 		return
 	end
-	main.f_resetBG(t, motif.resultsbgdef, motif.music.results_bgm)
+	main.f_resetBG(t, motif.resultsbgdef, motif.music.results_bgm, motif.music.results_bgm_loop, motif.music.results_bgm_volume, motif.music.results_bgm_loopstart, motif.music.results_bgm_loopend)
 	main.f_cmdInput()
 	while true do
 		if esc() or main.f_btnPalNo(main.p1Cmd) > 0 then
-			main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm)
+			main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
 			break
 		elseif motif.resultsbgdef.timer >= t.show_time then
 			--add fadeout code here
-			main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm)
+			main.f_resetBG(motif.title_info, motif.titlebgdef, motif.music.title_bgm, motif.music.title_bgm_loop, motif.music.title_bgm_volume, motif.music.title_bgm_loopstart, motif.music.title_bgm_loopend)
 			break
 		end
 		--draw clearcolor
@@ -2394,7 +2405,7 @@ function select.f_selectVictory()
 	if motif.music.victory_bgm == '' then
 		main.f_resetBG(motif.victory_screen, motif.victorybgdef)
 	else
-		main.f_resetBG(motif.victory_screen, motif.victorybgdef, motif.music.victory_bgm)
+		main.f_resetBG(motif.victory_screen, motif.victorybgdef, motif.music.victory_bgm, motif.music.victory_bgm_loop, motif.music.victory_bgm_volume, motif.music.victory_bgm_loopstart, motif.music.victory_bgm_loopend)
 	end
 	local winquote = ''
 	local winnerNum = 0
@@ -2503,7 +2514,7 @@ local txt_credits = main.f_createTextImg(
 )
 
 function select.f_continue()
-	main.f_resetBG(motif.continue_screen, motif.continuebgdef, motif.music.continue_bgm)
+	main.f_resetBG(motif.continue_screen, motif.continuebgdef, motif.music.continue_bgm, motif.music.continue_bgm_loop, motif.music.continue_bgm_volume, motif.music.continue_bgm_loopstart, motif.music.continue_bgm_loopend)
 	animReset(motif.continue_screen.continue_anim_data)
 	animUpdate(motif.continue_screen.continue_anim_data)
 	continue = false
@@ -2526,7 +2537,7 @@ function select.f_continue()
 				text = main.f_extractText(motif.continue_screen.credits_text, main.credits)
 				textImgSetText(txt_credits, text[1])
 				main.f_cmdInput()
-				main.f_resetBG(motif.select_info, motif.selectbgdef, motif.music.select_bgm)
+				main.f_resetBG(motif.select_info, motif.selectbgdef, motif.music.select_bgm, motif.music.select_bgm_loop, motif.music.select_bgm_volume, motif.music.select_bgm_loopstart, motif.music.select_bgm_loopend)
 				break
 			elseif main.f_btnPalNo(main.p1Cmd) > 0 and motif.continuebgdef.timer >= motif.continue_screen.continue_starttime + motif.continue_screen.continue_skipstart then
 				local cnt = 0
@@ -2578,7 +2589,7 @@ function select.f_continue()
 				sndPlay(motif.files.continue_snd_data, motif.continue_screen.continue_0_snd[1], motif.continue_screen.continue_0_snd[2])
 			end
 		elseif motif.continuebgdef.timer == motif.continue_screen.continue_end_skiptime then
-			playBGM(motif.music.continue_end_bgm)
+			playBGM(motif.music.continue_end_bgm, true, motif.music.continue_end_loop, motif.music.continue_end_volume, motif.music.continue_end_loopstart or "0", motif.music.continue_end_loopend or "0")
 			sndPlay(motif.files.continue_snd_data, motif.continue_screen.continue_end_snd[1], motif.continue_screen.continue_end_snd[2])
 		end
 		--draw credits text

--- a/script/storyboard.lua
+++ b/script/storyboard.lua
@@ -61,7 +61,7 @@ local function f_play(t)
 				end
 				--play bgm
 				if i == 0 and t.scene[k].bgm ~= nil then
-					playBGM(t.scene[k].bgm)
+					playBGM(t.scene[k].bgm, true, t.scene[k].bgm_loop, t.scene[k].bgm_volume, t.scene[k].bgm_loopstart or "0", t.scene[k].bgm_loopend or "0")
 				end
 				--play snd
 				if t.scenedef.snd_data ~= nil then
@@ -92,10 +92,10 @@ local function f_play(t)
 								t.scene[k].layer[k2].text_data,
 								t.scene[k].layer[k2].text,
 								t.scene[k].layer[k2].text_timer,
-								t.scene[k].layerall_pos[1] + t_layer[k2].offset[1],
-								t.scene[k].layerall_pos[2] + t_layer[k2].offset[2],
-								t.scene[k].layer[k2].text_spacing,
-								t.scene[k].layer[k2].text_delay,
+								t.scene[k].layerall_pos[1] + t.scene[k].layer[k2].offset[1],
+								t.scene[k].layerall_pos[2] + t.scene[k].layer[k2].offset[2],
+								t.scene[k].layer[k2].text_spacing[2],
+								t.scene[k].layer[k2].textdelay,
 								t.scene[k].layer[k2].text_length
 							)
 							end
@@ -120,7 +120,7 @@ local function f_play(t)
 			end
 		end
 	end
-	playBGM('')
+	playBGM('', true, 1, 100, "0", "0")
 end
 
 local function f_parse(path)
@@ -238,6 +238,9 @@ local function f_parse(path)
 					sound = {},
 					--bgm = '',
 					bgm_loop = 0,
+					bgm_volume = 100,
+					bgm_loopstart = nil,
+					bgm_loopend = nil,
 					--window = {0, 0, 0, 0},
 					bg_name = ''
 				}
@@ -281,9 +284,9 @@ local function f_parse(path)
 							{
 								anim = -1,
 								text = '',
-								font = {1, 0, 1, nil, nil, nil},
+								font = {1, 0, 0, nil, nil, nil},
 								text_spacing = {0, 15}, --Ikemen feature
-								text_delay = 2, --Ikemen feature
+								textdelay = 2,
 								text_length = 50, --Ikemen feature
 								text_timer = 0, --Ikemen feature
 								offset = {0, 0},
@@ -396,8 +399,12 @@ local function f_parse(path)
 				elseif main.f_fileExists('font/' .. t.scenedef.font[k]) then
 					t.scenedef.font[k] = 'font/' .. t.scenedef.font[k]
 				end
+				t.scenedef.font_data[k] = fontNew(t.scenedef.font[k])
+				t.scenedef.font[k] = {}
+				t.scenedef.font[k][1] = k
+				t.scenedef.font[k][2] = 0
+				t.scenedef.font[k][3] = 0
 			end
-			t.scenedef.font_data[k] = fontNew(t.scenedef.font[k])
 		end
 	end
 	--loop through scenes
@@ -435,7 +442,7 @@ local function f_parse(path)
 			local t_bgdef = t[t.scene[k].bg_name .. 'def']
 			local prev_k2 = ''
 			for k2, v2 in pairs(t_bgdef) do --loop through table keys
-				if t_bgdef[k2].type ~= nil then
+				if type(k2) == "number" and t_bgdef[k2].type ~= nil then
 					t_bgdef[k2].type = t_bgdef[k2].type:lower()
 					--mugen ignores delta = 0 (defaults to 1)
 					if t_bgdef[k2].delta[1] == 0 then t_bgdef[k2].delta[1] = 1 end
@@ -520,17 +527,17 @@ local function f_parse(path)
 			--text
 			if t_layer[k2].text ~= '' then
 				t.scene[k].layer[k2].text_data = main.f_createTextImg(
-					t.scenedef.font_data[t.scenedef.font[t_layer[k2].font][1]],
-					t.scenedef.font[t_layer[k2].font][2],
-					t.scenedef.font[t_layer[k2].font][3],
+					t.scenedef.font_data[t.scenedef.font[t_layer[k2].font[1]][1]],
+					t_layer[k2].font[2],
+					t_layer[k2].font[3],
 					t_layer[k2].text,
 					t.scene[k].layerall_pos[1] + t_layer[k2].offset[1],
 					t.scene[k].layerall_pos[2] + t_layer[k2].offset[2],
 					320/t.info.localcoord[1],
 					240/t.info.localcoord[2],
-					t.scenedef.font[t_layer[k2].font][4],
-					t.scenedef.font[t_layer[k2].font][5],
-					t.scenedef.font[t_layer[k2].font][6]
+					t_layer[k2].font[4],
+					t_layer[k2].font[5],
+					t_layer[k2].font[6]
 				)
 			end
 			--endtime

--- a/src/script.go
+++ b/src/script.go
@@ -201,7 +201,7 @@ func scriptCommonInit(l *lua.LState) {
 		return 0
 	})
 	luaRegister(l, "playBGM", func(l *lua.LState) int {
-		sys.bgm.Open(strArg(l, 1))
+		sys.bgm.Open(strArg(l, 1), boolArg(l, 2), int(numArg(l, 3)), int(numArg(l, 4)), int(Atoi(strArg(l, 5))), int(Atoi(strArg(l, 6))))
 		return 0
 	})
 	luaRegister(l, "esc", func(l *lua.LState) int {
@@ -1203,12 +1203,14 @@ func systemScriptInit(l *lua.LState) {
 		return 1
 	})
 	luaRegister(l, "getStageInfo", func(*lua.LState) int {
-		a, b, c, d := sys.sel.GetStageInfo(int(numArg(l, 1)))
+		a, b, c, d, e, f := sys.sel.GetStageInfo(int(numArg(l, 1)))
 		l.Push(lua.LString(a))
 		l.Push(lua.LString(b))
 		l.Push(lua.LString(c))
 		l.Push(lua.LString(d))
-		return 4
+		l.Push(lua.LString(e))
+		l.Push(lua.LString(f))
+		return 6
 	})
 	luaRegister(l, "getKey", func(*lua.LState) int {
 		s := ""

--- a/src/sound.go
+++ b/src/sound.go
@@ -236,8 +236,18 @@ func (n *NormalizerLR) process(bai float64, sam *float32) float64 {
 // Bgm
 
 type Bgm struct {
-	filename string
-	ctrl     *beep.Ctrl
+	filename            string
+	bgmLoopStart        int
+	bgmLoopEnd          int
+	defaultFilename     string
+	defaultBgmVolume    int
+	defaultbgmLoopStart int
+	defaultbgmLoopEnd   int
+	sampleRate          beep.SampleRate
+	streamer            beep.StreamSeekCloser
+	ctrl                *beep.Ctrl
+	resampler           *beep.Resampler
+	volume              *effects.Volume
 }
 
 func newBgm() *Bgm {
@@ -260,58 +270,71 @@ func (bgm *Bgm) IsFormat(extension string) bool {
 	return filepath.Ext(bgm.filename) == extension
 }
 
-func (bgm *Bgm) Open(filename string) {
-
+func (bgm *Bgm) Open(filename string, isDefaultBGM bool, loop, bgmVolume, bgmLoopStart, bgmLoopEnd int) {
 	if filepath.Base(bgm.filename) == filepath.Base(filename) {
 		return
 	}
-
 	bgm.filename = filename
+	bgm.bgmLoopStart = bgmLoopStart
+	bgm.bgmLoopEnd = bgmLoopEnd
+	if isDefaultBGM {
+		bgm.defaultFilename = filename
+		bgm.defaultBgmVolume = bgmVolume
+		bgm.defaultbgmLoopStart = bgmLoopStart
+		bgm.defaultbgmLoopEnd = bgmLoopEnd
+	}
 	speaker.Clear()
 
 	if bgm.IsVorbis() {
-		bgm.ReadVorbis()
+		bgm.ReadVorbis(loop, bgmVolume)
 	} else if bgm.IsMp3() {
-		bgm.ReadMp3()
+		bgm.ReadMp3(loop, bgmVolume)
 	} else if bgm.IsFLAC() {
-		bgm.ReadFLAC()
+		bgm.ReadFLAC(loop, bgmVolume)
 	}
 
 }
 
-func (bgm *Bgm) ReadMp3() {
+func (bgm *Bgm) ReadMp3(loop int, bgmVolume int) {
 	f, _ := os.Open(bgm.filename)
 	s, format, err := mp3.Decode(f)
+	bgm.streamer = s
 	if err != nil {
 		return
 	}
-	bgm.ReadFormat(s, format)
+	bgm.ReadFormat(format, loop, bgmVolume)
 }
 
-func (bgm *Bgm) ReadFLAC() {
+func (bgm *Bgm) ReadFLAC(loop int, bgmVolume int) {
 	f, _ := os.Open(bgm.filename)
 	s, format, err := flac.Decode(f)
+	bgm.streamer = s
 	if err != nil {
 		return
 	}
-	bgm.ReadFormat(s, format)
+	bgm.ReadFormat(format, loop, bgmVolume)
 }
 
-func (bgm *Bgm) ReadVorbis() {
+func (bgm *Bgm) ReadVorbis(loop int, bgmVolume int) {
 	f, _ := os.Open(bgm.filename)
 	s, format, err := vorbis.Decode(f)
+	bgm.streamer = s
 	if err != nil {
 		return
 	}
-	bgm.ReadFormat(s, format)
+	bgm.ReadFormat(format, loop, bgmVolume)
 }
 
-func (bgm *Bgm) ReadFormat(s beep.StreamSeekCloser, format beep.Format) {
-	streamer := beep.Loop(-1, s)
-	volume := -5 + float64(sys.bgmVolume)*0.06*(float64(sys.masterVolume)/100)
-	streamer = &effects.Volume{Streamer: streamer, Base: 2, Volume: volume, Silent: volume <= -5}
-	resample := beep.Resample(int(3), format.SampleRate, beep.SampleRate(Mp3SampleRate), streamer)
-	bgm.ctrl = &beep.Ctrl{Streamer: resample}
+func (bgm *Bgm) ReadFormat(format beep.Format, loop int, bgmVolume int) {
+	loopCount := int(1)
+	if loop > 0 {
+		loopCount = -1
+	}
+	streamer := beep.Loop(loopCount, bgm.streamer)
+	volume := -5 + float64(sys.bgmVolume)*0.06*(float64(sys.masterVolume)/100)*(float64(bgmVolume)/100)
+	bgm.volume = &effects.Volume{Streamer: streamer, Base: 2, Volume: volume, Silent: volume <= -5}
+	bgm.resampler = beep.Resample(int(3), format.SampleRate, beep.SampleRate(Mp3SampleRate), bgm.volume)
+	bgm.ctrl = &beep.Ctrl{Streamer: bgm.resampler}
 	speaker.Play(bgm.ctrl)
 }
 

--- a/src/system.go
+++ b/src/system.go
@@ -406,15 +406,11 @@ func (s *System) audioOpen() {
 func (s *System) soundWrite() {
 	defer func() { s.audioClose <- true }()
 	src := NewAudioSource()
-	bgmSrc := NewAudioSource()
 	processed := false
 	for !s.gameEnd {
 		if src.Src.State() != openal.Playing {
 			src.Src.Play()
 		}
-		if bgmSrc.Src.State() != openal.Playing {
-			bgmSrc.Src.Play()
-		}
 		if !processed {
 			time.Sleep(10 * time.Millisecond)
 		}
@@ -434,27 +430,20 @@ func (s *System) soundWrite() {
 			}
 			processed = true
 		}
-		if bgmSrc.Src.BuffersProcessed() > 0 {
-			out := s.nullSndBuf[:]
-			if !s.nomusic {
-				if s.bgm.ctrl != nil {
-					s.bgm.ctrl.Paused = false
-				}
-			} else {
-				if s.bgm.ctrl != nil {
-					s.bgm.Pause()
+		if !s.nomusic {
+			if s.bgm.ctrl != nil {
+				s.bgm.ctrl.Paused = false
+				if s.bgm.bgmLoopEnd > 0 && s.bgm.streamer.Position() >= s.bgm.bgmLoopEnd {
+					s.bgm.streamer.Seek(s.bgm.bgmLoopStart)
 				}
 			}
-			buf := bgmSrc.Src.UnqueueBuffer()
-			buf.SetDataInt16(openal.FormatStereo16, out, audioFrequency)
-			bgmSrc.Src.QueueBuffer(buf)
-			if err := openal.Err(); err != nil {
-				s.errLog.Println(err.Error())
+		} else {
+			if s.bgm.ctrl != nil {
+				s.bgm.Pause()
 			}
-			processed = true
 		}
+
 	}
-	bgmSrc.Delete()
 	src.Delete()
 	openal.NullContext.Activate()
 	device := s.audioContext.GetDevice()
@@ -1748,7 +1737,7 @@ type SelectChar struct {
 	sportrait, lportrait, vsportrait, vportrait            *Sprite
 }
 type SelectStage struct {
-	def, name, zoomout, zoomin, bgmusic, bgmvolume string
+	def, name, zoomout, zoomin, bgmusic, bgmvolume, bgmloopstart, bgmloopend string
 }
 type Select struct {
 	columns, rows   int
@@ -1810,12 +1799,12 @@ func (s *Select) GetStageName(n int) string {
 	}
 	return s.stagelist[n-1].name
 }
-func (s *Select) GetStageInfo(n int) (zoomin, zoomout, bgmusic, bgmvolume string) {
+func (s *Select) GetStageInfo(n int) (zoomin, zoomout, bgmusic, bgmvolume, bgmloopstart, bgmloopend string) {
 	n %= len(s.stagelist) + 1
 	if n < 0 {
 		n += len(s.stagelist) + 1
 	}
-	return s.stagelist[n-1].zoomin, s.stagelist[n-1].zoomout, s.stagelist[n-1].bgmusic, s.stagelist[n-1].bgmvolume
+	return s.stagelist[n-1].zoomin, s.stagelist[n-1].zoomout, s.stagelist[n-1].bgmusic, s.stagelist[n-1].bgmvolume, s.stagelist[n-1].bgmloopstart, s.stagelist[n-1].bgmloopend
 }
 func (s *Select) addCahr(def string) {
 	s.charlist = append(s.charlist, SelectChar{})
@@ -1968,6 +1957,14 @@ func (s *Select) AddStage(def string) error {
 				if !ok {
 					ss.bgmvolume = "100"
 				}
+				ss.bgmloopstart, ok = is.getString("bgmloopstart")
+				if !ok {
+					ss.bgmloopstart = ""
+				}
+				ss.bgmloopend, ok = is.getString("bgmloopend")
+				if !ok {
+					ss.bgmloopend = ""
+				}
 			}
 		}
 	}