diff --git a/parts/backgrounds/fan.lua b/parts/backgrounds/fan.lua index 867ef759..aaa46fc3 100644 --- a/parts/backgrounds/fan.lua +++ b/parts/backgrounds/fan.lua @@ -61,7 +61,7 @@ function back.draw() gc_setLineWidth(6) gc_setColor(.8,.9,1,.3) - for i=1,8 do gc_polygon('line',SVG_TITLE_FAN[i])end + for i=1,#SVG_TITLE_FAN do gc_polygon('line',SVG_TITLE_FAN[i])end gc_setLineWidth(2) gc_setColor(1,.5,.7,.3) diff --git a/parts/gameTables.lua b/parts/gameTables.lua index 767bca70..4230c27e 100644 --- a/parts/gameTables.lua +++ b/parts/gameTables.lua @@ -20,140 +20,129 @@ RANK_COLORS={ {1,.5,.4}, {.95,.5,.95}, } -do--SVG_TITLE - SVG_TITLE={ +do--SVG_TITLE_FILL, SVG_TITLE_LINE + SVG_TITLE_FILL={ { - 53, 60, - 1035, 0, - 964, 218, - 660, 218, - 391, 1300, - 231, 1154, - 415, 218, - 0, 218, + 0,0, + 0,34, + 63,34, + 63,227, + 97,227, + 97,34, + 160,34, + 160,0, }, { - 716, 290, - 1429, 290, - 1312, 462, - 875, 489, - 821, 695, - 1148, 712, - 1017, 902, - 761, 924, - 707, 1127, - 1106, 1101, - 1198, 1300, - 465, 1300, + 126,60, + 244,60, + 244,94, + 160,94, + 160,127, + 230,127, + 230,161, + 160,161, + 160,194, + 244,194, + 244,227, + 126,227, }, { - 1516, 287, - 2102, 290, - 2036, 464, - 1598, 465, - 1322, 905, - 1395, 1102, - 1819, 1064, - 1743, 1280, - 1286, 1310, - 1106, 902, + 262,82, + 283,60, + 385,60, + 385,94, + 296,94, + 296,194, + 385,194, + 385,227, + 283,227, + 262,206, }, { - 2179, 290, - 2411, 290, - 2272, 688, - 2674, 666, - 2801, 290, - 3041, 290, - 2693, 1280, - 2464, 1280, - 2601, 879, - 2199, 897, - 2056, 1280, - 1828, 1280, + 404,60, + 437,60, + 437,127, + 505,127, + 505,60, + 538,60, + 538,227, + 505,227, + 505,161, + 437,161, + 437,227, + 404,227, }, { - 3123, 290, - 3480, 290, - 3496, 480, - 3664, 290, - 4017, 294, - 3682, 1280, - 3453, 1280, - 3697, 578, - 3458, 843, - 3304, 842, - 3251, 561, - 3001, 1280, - 2779, 1280, + 558,60, + 604,60, + 640,153, + 676,60, + 722,60, + 722,227, + 688,227, + 688,108, + 655,194, + 625,194, + 591,108, + 591,227, + 558,227, }, { - 4088, 290, - 4677, 290, - 4599, 501, - 4426, 502, - 4219, 1069, - 4388, 1070, - 4317, 1280, - 3753, 1280, - 3822, 1068, - 3978, 1068, - 4194, 504, - 4016, 504, + 743,60, + 777,60, + 777,227, + 743,227, }, { - 4747, 290, - 4978, 295, - 4921, 464, - 5186, 850, - 5366, 290, - 5599, 295, - 5288, 1280, - 5051, 1280, - 5106, 1102, - 4836, 709, - 4641, 1280, - 4406, 1280, + 798,60, + 831,60, + 899,173, + 899,60, + 933,60, + 933,227, + 899,227, + 831,115, + 831,227, + 798,227, }, { - 5814, 290, - 6370, 295, - 6471, 415, - 6238, 1156, - 6058, 1280, - 5507, 1280, - 5404, 1154, - 5635, 416, - -- 5814, 290, - -- 5878, 463, - 5770, 542, - 5617, 1030, - 5676, 1105, - 5995, 1106, - 6100, 1029, - 6255, 541, - 6199, 465, - 5878, 463, + 950,82, + 971,60, + 1064,60, + 1085,82, + 1085,206, + 1064,227, + 971,227, + 950,206, + 950,82, + + 984,94, + 984,194, + 1051,194, + 1051,94, + 984,94, }, } - for _,C in next,SVG_TITLE do + for _,C in next,SVG_TITLE_FILL do for i=1,#C do - C[i]=C[i]*.1626 + C[i]=C[i]*.94 end end + + SVG_TITLE_LINE=TABLE.shift(SVG_TITLE_FILL) + SVG_TITLE_LINE[8],SVG_TITLE_LINE[9]={},{} + for j=1,16 do SVG_TITLE_LINE[8][j]=SVG_TITLE_FILL[8][j]end + for j=19,#SVG_TITLE_FILL[8]-2 do SVG_TITLE_LINE[9][j-18]=SVG_TITLE_FILL[8][j]end end do--SVG_TITLE_FAN SVG_TITLE_FAN={} local sin,cos=math.sin,math.cos - for i=1,8 do - local L={} + for i=1,9 do + local L=TABLE.copy(SVG_TITLE_LINE[i]) SVG_TITLE_FAN[i]=L - for j=1,#SVG_TITLE[i]do - L[j]=SVG_TITLE[i][j] - end for j=1,#L,2 do - local x,y=L[j],L[j+1]--00 then gc.push('transform') @@ -176,9 +178,12 @@ function scene.draw() gc.translate(0,math.abs(10-dt)-10) end gc.setColor(titleColor[i][1],titleColor[i][2],titleColor[i][3],min(t*.025,1)*.2) - gc.polygon('fill',SVG_TITLE[i]) + for j=1,#triangles do + gc.polygon('fill',triangles[j]) + end gc.setColor(1,1,1,min(t*.025,1)) - gc.polygon('line',SVG_TITLE[i]) + gc.polygon('line',SVG_TITLE_LINE[i]) + if i==8 then gc.polygon('line',SVG_TITLE_LINE[9])end gc.pop() end end diff --git a/parts/texture.lua b/parts/texture.lua index 05ed3b59..cc0733e8 100644 --- a/parts/texture.lua +++ b/parts/texture.lua @@ -69,16 +69,16 @@ end gc.setDefaultFilter('linear','linear') -TEXTURE.title=NSC(1160,236)--Title image (Middle: 580,118) +TEXTURE.title=NSC(1130,236)--Title image (Middle: 580,118) do - for i=1,8 do - local triangles=love.math.triangulate(SVG_TITLE[i]) + gc.setLineWidth(12) + for i=1,#SVG_TITLE_FILL do + local triangles=love.math.triangulate(SVG_TITLE_FILL[i]) gc.translate(12*i,i==1 and 8 or 14) - gc.setLineWidth(16) gc.setColor(COLOR.Z) - gc.polygon('line',SVG_TITLE[i]) + gc.polygon('line',SVG_TITLE_FILL[i]) gc.setColor(.2,.2,.2) for j=1,#triangles do @@ -89,18 +89,18 @@ do end end -TEXTURE.title_color=NSC(1160,236)--Title image (colored) +TEXTURE.title_color=NSC(1130,236)--Title image (colored) do local titleColor={COLOR.P,COLOR.F,COLOR.V,COLOR.A,COLOR.M,COLOR.N,COLOR.W,COLOR.Y} for i=1,8 do - local triangles=love.math.triangulate(SVG_TITLE[i]) + local triangles=love.math.triangulate(SVG_TITLE_FILL[i]) gc.translate(12*i,i==1 and 8 or 14) - gc.setLineWidth(16) + gc.setLineWidth(12) gc.setColor(COLOR.Z) - gc.polygon('line',SVG_TITLE[i]) + gc.polygon('line',SVG_TITLE_FILL[i]) gc.setLineWidth(4) gc.setColor(COLOR.D) @@ -109,11 +109,9 @@ do end gc.setColor(.2+.8*titleColor[i][1],.2+.8*titleColor[i][2],.2+.8*titleColor[i][3],.3) - gc.translate(-4,-4) for j=1,#triangles do gc.polygon('fill',triangles[j]) end - gc.translate(4,4) gc.translate(-12*i,i==1 and -8 or -14) end