0.8.17:Details Update

2020-04-30 00:24:47 +08:00
parent 7d63386410
commit 00026bc46b
104 changed files with 2069 additions and 2708 deletions
--- a/parts/AITemplate.lua
+++ b/parts/AITemplate.lua
@@ -1,5 +1,5 @@
 local int=math.floor
-local AISpeed={60,50,45,35,25,15,9,6,4,2}
+local AISpeed={60,50,45,35,25,15,9,6,4,3}
 return function(type,speedLV,next,hold,node)
 	if type=="CC"then
 		return{
--- a/parts/bg.lua
+++ b/parts/bg.lua
@@ -50,10 +50,10 @@ end
 function BGdraw.strap()
 	gc.setColor(.5,.5,.5)
 	local x=t%16*-64
-	::L::
-	gc.draw(img,x,0,nil,8,scr.h)
-	x=x+1024--image width*8
-	if x<scr.w then goto L end
+	repeat
+		gc.draw(img,x,0,nil,8,scr.h)
+		x=x+1024--image width*8
+	until x>=scr.w
 end

 function BGinit.flink()
@@ -115,10 +115,10 @@ end
 function BGdraw.game4()
 	gc.setColor(.05,.4,.4)
 	local x=t%8*-128
-	::L::
-	gc.draw(img,x,0,nil,8,scr.h)
-	x=x+1024--image width*8
-	if x<scr.w then goto L end
+	repeat
+		gc.draw(img,x,0,nil,8,scr.h)
+		x=x+1024--image width*8
+	until x>=scr.w
 end--Fast strap

 function BGinit.game5()
--- a/parts/bgm.lua
+++ b/parts/bgm.lua
@@ -2,6 +2,7 @@ local rem=table.remove

 local BGM={}
 -- BGM.nowPlay=[str:playing ID]
+-- BGM.suspend=[str:pausing ID]
 -- BGM.playing=[src:playing SRC]
 BGM.list={
 	"blank","way","newera","infinite","reason",
@@ -21,7 +22,12 @@ function BGM.loadAll()
 	end
 end
 function BGM.play(s)
-	if setting.bgm==0 or not s then return end
+	if setting.bgm==0 then
+		BGM.suspend,BGM.nowPlay=s
+		return
+	elseif not s then
+		return
+	end
 	if BGM.nowPlay~=s then
 		if BGM.nowPlay then TASK.new(tickEvent.bgmFadeOut,nil,BGM.nowPlay)end
 		TASK.changeCode(tickEvent.bgmFadeIn,tickEvent.bgmFadeOut)
--- a/parts/color.lua
+++ b/parts/color.lua
@@ -0,0 +1,38 @@
+return{
+	red={1,0,0},
+	green={0,1,0},
+	blue={.2,.2,1},
+	yellow={1,1,0},
+	magenta={1,0,1},
+	cyan={0,1,1},
+	grey={.6,.6,.6},
+
+	lightRed={1,.5,.5},
+	lightGreen={.5,1,.5},
+	lightBlue={.6,.6,1},
+	lightYellow={1,1,.5},
+	lightMagenta={1,.5,1},
+	lightCyan={.5,1,1},
+	lightGrey={.8,.8,.8},
+
+	darkRed={.6,0,0},
+	darkGreen={0,.6,0},
+	darkBlue={0,0,.6},
+	darkYellow={.6,.6,0},
+	darkMagenta={.6,0,.6},
+	darkCyan={0,.6,.6},
+	darkGrey={.3,.3,.3},
+
+	black={0,0,0},
+	orange={1,.6,0},
+	pink={1,0,.6},
+	grass={.6,1,0},
+	water={0,1,.6},
+	bronze={.7,.4,0},
+	white={1,1,1},
+	lightOrange={1,.7,.3},
+	darkOrange={.6,.4,0},
+	purple={.5,0,1},
+	lightPurple={.8,.4,1},
+	darkPurple={.3,0,.6},
+}
--- a/parts/getTip.lua
+++ b/parts/getTip.lua
@@ -33,7 +33,6 @@ if setting.lang==1 then
 		"CLASSIC SEXY RUSSIAN BLOCKS",
 		"戴上耳机以获得最佳体验",
 		"少女祈祷中",
-		"按键/点击以强制满速加载",
 		"LrL,RlR LLr,RRl RRR,LLL RfR,RRf,rFF FFF",--ZSLJTOI
 		"RUR'U'R'FR2U'R'U'RUR'F'",
 		"Am G F G",
@@ -74,7 +73,6 @@ elseif setting.lang==2 then
 		"CLASSIC SEXY RUSSIAN BLOCKS",
 		"戴上耳机以获得最佳体验",
 		"少女祈祷中",
-		"按键/点击以强制满速加载",
 		"LrL,RlR LLr,RRl RRR,LLL RfR,RRf,rFF FFF",--ZSLJTOI
 		"RUR'U'R'FR2U'R'U'RUR'F'",
 		"Am G F G",
@@ -116,7 +114,6 @@ elseif setting.lang==3 then
 		"CLASSIC SEXY RUSSIAN BLOCKS",
 		"Headphones for better experience",
 		"少女祈禱中",
-		"any-key/click to load at fastest speed",
 		"RUR'U'R'FR2U'R'U'RUR'F'",
 		"Am G F G",
 		"LrL,RlR LLr,RRl RRR,LLL RfR,RRf,rFF FFF",--ZSLJTOI
--- a/parts/languages.lua
+++ b/parts/languages.lua
--- a/parts/list.lua
+++ b/parts/list.lua
@@ -7,85 +7,6 @@ actName={
 	"insLeft","insRight","insDown","down1","down4","down10",
 	"dropLeft","dropRight","addLeft","addRight",--Super contorl system
 }
-color={
-	red={1,0,0},
-	green={0,1,0},
-	blue={.2,.2,1},
-	yellow={1,1,0},
-	magenta={1,0,1},
-	cyan={0,1,1},
-	grey={.6,.6,.6},
-
-	lightRed={1,.5,.5},
-	lightGreen={.5,1,.5},
-	lightBlue={.6,.6,1},
-	lightYellow={1,1,.5},
-	lightMagenta={1,.5,1},
-	lightCyan={.5,1,1},
-	lightGrey={.8,.8,.8},
-
-	darkRed={.6,0,0},
-	darkGreen={0,.6,0},
-	darkBlue={0,0,.6},
-	darkYellow={.6,.6,0},
-	darkMagenta={.6,0,.6},
-	darkCyan={0,.6,.6},
-	darkGrey={.3,.3,.3},
-
-	black={0,0,0},
-	orange={1,.6,0},
-	pink={1,0,.6},
-	grass={.6,1,0},
-	water={0,1,.6},
-	bronze={.7,.4,0},
-	white={1,1,1},
-	lightOrange={1,.7,.3},
-	darkOrange={.6,.4,0},
-	purple={.5,0,1},
-	lightPurple={.8,.4,1},
-	darkPurple={.3,0,.6},
-}
-voiceBank={}--{{SRC1s},{SRC2s},...}
-voiceName={
-	"zspin","sspin","lspin","jspin","tspin","ospin","ispin",
-	"single","double","triple","techrash",
-	"mini","b2b","b3b","pc",
-	"win","lose",
-	"bye",
-	"nya",
-	"happy",
-	"doubt",
-	"sad",
-	"egg",
-}
-voiceList={
-	zspin={"zspin_1","zspin_2","zspin_3"},
-	sspin={"sspin_1","sspin_2","sspin_3","sspin_4","sspin_5","sspin_6"},
-	lspin={"lspin_1","lspin_2"},
-	jspin={"jspin_1","jspin_2","jspin_3","jspin_4"},
-	tspin={"tspin_1","tspin_2","tspin_3","tspin_4","tspin_5","tspin_6"},
-	ospin={"ospin_1","ospin_2","ospin_3"},
-	ispin={"ispin_1","ispin_2","ispin_3"},
-
-	single={"single_1","single_2","single_3","single_4","single_5","single_6","single_7"},
-	double={"double_1","double_2","double_3","double_4","double_5"},
-	triple={"triple_1","triple_2","triple_3","triple_4","triple_5","triple_6","triple_7"},
-	techrash={"techrash_1","techrash_2","techrash_3","techrash_4"},
-
-	mini={"mini_1","mini_2","mini_3"},
-	b2b={"b2b_1","b2b_2","b2b_3"},
-	b3b={"b3b_1","b3b_2"},
-	pc={"clear_1","clear_2"},
-	win={"win_1","win_2","win_3","win_4","win_5","win_6","win_6","win_7"},
-	lose={"lose_1","lose_2","lose_3"},
-	bye={"bye_1","bye_2"},
-	nya={"nya_1","nya_2","nya_3","nya_4"},
-	happy={"nya_happy_1","nya_happy_2","nya_happy_3","nya_happy_4"},
-	doubt={"nya_doubt_1","nya_doubt_2"},
-	sad={"nya_sad_1"},
-	egg={"egg_1","egg_2"},
-}
-
 musicID={
 	"blank",
 	"way",
@@ -122,7 +43,7 @@ customRange={
 	fall={0,1,2,3,4,5,6,7,8,10,15,20,30,60},
 	next={0,1,2,3,4,5,6},
 	hold={true,false,true},
-	sequence={"bag7","his4","rnd"},
+	sequence={"bag","his4","rnd"},
 	visible={"show","time","fast","none"},
 	target={10,20,40,100,200,500,1000,1e99},
 	freshLimit={0,8,15,1e99},
@@ -130,6 +51,5 @@ customRange={
 	bg={"none","game1","game2","game3","strap","rgb","glow","matrix"},
 	bgm={"blank","way","race","newera","push","reason","infinite","secret7th","secret8th","rockblock"},
 }
-
 RCPB={10,33,200,33,105,5,105,60}
 snapLevelValue={1,10,20,40,60,80}
--- a/parts/sfx.lua
+++ b/parts/sfx.lua
@@ -2,11 +2,12 @@ local rem=table.remove

 local SFX={}
 SFX.list={
-	"welcome",
+	"welcome_sfx",
 	"click","enter",
 	"finesseError","finesseError_long",
 	--Stereo sfxs(cannot set position)

+	"virtualKey",
 	"button","swipe",
 	"ready","start","win","fail","collect",
 	"move","rotate","rotatekick","hold",
--- a/parts/voice.lua
+++ b/parts/voice.lua
@@ -1,10 +1,52 @@
 local rnd=math.random
 local rem=table.remove
 local voiceQueue={free=0}
+local bank={}--{{SRC1s},{SRC2s},...}
 local VOC={}
+VOC.name={
+	"zspin","sspin","lspin","jspin","tspin","ospin","ispin",
+	"single","double","triple","techrash",
+	"mini","b2b","b3b","pc",
+	"win","lose",
+	"bye",
+	"nya",
+	"happy",
+	"doubt",
+	"sad",
+	"egg",
+	"welcome"
+}
+VOC.list={
+	zspin={"zspin_1","zspin_2","zspin_3"},
+	sspin={"sspin_1","sspin_2","sspin_3","sspin_4","sspin_5","sspin_6"},
+	lspin={"lspin_1","lspin_2"},
+	jspin={"jspin_1","jspin_2","jspin_3","jspin_4"},
+	tspin={"tspin_1","tspin_2","tspin_3","tspin_4","tspin_5","tspin_6"},
+	ospin={"ospin_1","ospin_2","ospin_3"},
+	ispin={"ispin_1","ispin_2","ispin_3"},
+
+	single={"single_1","single_2","single_3","single_4","single_5","single_6","single_7"},
+	double={"double_1","double_2","double_3","double_4","double_5"},
+	triple={"triple_1","triple_2","triple_3","triple_4","triple_5","triple_6","triple_7"},
+	techrash={"techrash_1","techrash_2","techrash_3","techrash_4"},
+
+	mini={"mini_1","mini_2","mini_3"},
+	b2b={"b2b_1","b2b_2","b2b_3"},
+	b3b={"b3b_1","b3b_2"},
+	pc={"clear_1","clear_2"},
+	win={"win_1","win_2","win_3","win_4","win_5","win_6","win_6","win_7"},
+	lose={"lose_1","lose_2","lose_3"},
+	bye={"bye_1","bye_2"},
+	nya={"nya_1","nya_2","nya_3","nya_4"},
+	happy={"nya_happy_1","nya_happy_2","nya_happy_3","nya_happy_4"},
+	doubt={"nya_doubt_1","nya_doubt_2"},
+	sad={"nya_sad_1"},
+	egg={"egg_1","egg_2"},
+	welcome={"welcome_voc"},
+}

 local function getVoice(str)
-	local L=voiceBank[str]
+	local L=bank[str]
 	local n=1
 	while L[n]:isPlaying()do
 		n=n+1
@@ -17,6 +59,18 @@ local function getVoice(str)
 	return L[n]
 	--load voice with string
 end
+function VOC.loadOne(_)
+	local N=VOC.name[_]
+	for i=1,#VOC.list[N]do
+		local V=VOC.list[N][i]
+		bank[V]={love.audio.newSource("VOICE/"..V..".ogg","static")}
+	end
+end
+function VOC.loadAll()
+	for i=1,#VOC.list do
+		VOC.loadOne(i)
+	end
+end
 function VOC.getFreeChannel()
 	local i=#voiceQueue
 	for i=1,i do
@@ -66,12 +120,12 @@ function VOC.play(s,chn)
 	if setting.voc>0 then
 		if chn then
 			local L=voiceQueue[chn]
-			local _=voiceList[s]
+			local _=VOC.list[s]
 			L[#L+1]=_[rnd(#_)]
 			L.s=1
 			--添加到queue[chn]
 		else
-			voiceQueue[VOC.getFreeChannel()]={s=1,voiceList[s][rnd(#voiceList[s])]}
+			voiceQueue[VOC.getFreeChannel()]={s=1,VOC.list[s][rnd(#VOC.list[s])]}
 			--自动创建空轨/播放
 		end
 	end