diff --git a/Zframework/bg.lua b/Zframework/bg.lua index 806c3699..3ccac96b 100644 --- a/Zframework/bg.lua +++ b/Zframework/bg.lua @@ -71,8 +71,6 @@ local wingColor={ } back.wing={ init=function() - t=rnd(02200,19600) - gc.setDefaultFilter("linear","linear") bar=gc.newCanvas(41,1) gc.push("transform") @@ -101,7 +99,6 @@ back.wing={ end end, update=function() - t=t+1 for i=1,16 do local B=crystal[i] B.a=B.a+B.va @@ -129,6 +126,46 @@ back.wing={ end, }--Flandre's wing +local _ +back.fan={ + init=function() + L=_G.title_fan + t=0 + BG.resize() + end, + resize=function() + CX,CY=scr.w/2,scr.h/2 + end, + update=function() + t=t+1 + end, + draw=function() + gc.push("transform") + gc.translate(CX,CY+20*sin(t*.02)) + gc.scale(scr.k) + gc.clear(.1,.1,.1) + gc.setLineWidth(320) + gc.setColor(.3,.2,.3) + gc.arc("line","open",0,420,500,-.8*3.1416,-.2*3.1416) + + gc.setLineWidth(4) + gc.setColor(.7,.5,.65) + gc.arc("line","open",0,420,660,-.799*3.1416,-.201*3.1416) + gc.arc("line","open",0,420,340,-.808*3.1416,-.192*3.1416) + gc.line(-281,224,-530,30.5) + gc.line(281,224,530,30.5) + + gc.setLineWidth(6) + gc.setColor(.55,.5,.6) + local L=L + for i=1,8 do + gc.polygon("line",L[i]) + end + + gc.pop() + end, +} + back.aura={ init=function() t=rnd()*3600 diff --git a/modes/ultra.lua b/modes/ultra.lua index 64953136..92a84b47 100644 --- a/modes/ultra.lua +++ b/modes/ultra.lua @@ -20,7 +20,7 @@ return{ end end end, - bg="matrix",bgm="infinite", + bg="fan",bgm="infinite", }, slowMark=true, pauseLimit=true, diff --git a/parts/list.lua b/parts/list.lua index 45012af2..9426b8a9 100644 --- a/parts/list.lua +++ b/parts/list.lua @@ -1,3 +1,4 @@ +local sin,cos=math.sin,math.cos snapLevelValue={1,10,20,40,60,80} title={ { @@ -114,6 +115,12 @@ title={ 5878, 463, }, } +for _,C in next,title do + for i=1,#C do + C[i]=C[i]*.1626 + end +end +--[[ title2={} for i=1,#title do title2[i]=title[i]end title2[5]={ @@ -140,12 +147,22 @@ title2[5]={ 3001, 1280, 2779, 1280, } - -for _,C in next,title do - for i=1,#C do - C[i]=C[i]*.1626 +]] +title_fan={} +for i=1,8 do + local L={} + title_fan[i]=L + for j=1,#title[i]do + L[j]=title[i][j] + end + for j=1,#L,2 do + local x,y=L[j],L[j+1]--0