diff --git a/main.lua b/main.lua index 1a252a1f..b0c8c06e 100644 --- a/main.lua +++ b/main.lua @@ -103,9 +103,8 @@ for _,v in next,fs.getDirectoryItems('parts/shaders')do end end -require'parts.list' -require'parts.globalTables' -require'parts.gametoolfunc' +require'parts.gameTables' +require'parts.gameFuncs' FREEROW= require'parts.freeRow' DATA= require'parts.data' diff --git a/parts/gametoolfunc.lua b/parts/gameFuncs.lua similarity index 100% rename from parts/gametoolfunc.lua rename to parts/gameFuncs.lua diff --git a/parts/gameTables.lua b/parts/gameTables.lua new file mode 100644 index 00000000..3a37f885 --- /dev/null +++ b/parts/gameTables.lua @@ -0,0 +1,724 @@ +--Static data tables +do--title + title={ + { + 53, 60, + 1035, 0, + 964, 218, + 660, 218, + 391, 1300, + 231, 1154, + 415, 218, + 0, 218, + }, + { + 716, 290, + 1429, 290, + 1312, 462, + 875, 489, + 821, 695, + 1148, 712, + 1017, 902, + 761, 924, + 707, 1127, + 1106, 1101, + 1198, 1300, + 465, 1300, + }, + { + 1516, 287, + 2102, 290, + 2036, 464, + 1598, 465, + 1322, 905, + 1395, 1102, + 1819, 1064, + 1743, 1280, + 1286, 1310, + 1106, 902, + }, + { + 2179, 290, + 2411, 290, + 2272, 688, + 2674, 666, + 2801, 290, + 3041, 290, + 2693, 1280, + 2464, 1280, + 2601, 879, + 2199, 897, + 2056, 1280, + 1828, 1280, + }, + { + 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, + }, + { + 4088, 290, + 4677, 290, + 4599, 501, + 4426, 502, + 4219, 1069, + 4388, 1070, + 4317, 1280, + 3753, 1280, + 3822, 1068, + 3978, 1068, + 4194, 504, + 4016, 504, + }, + { + 4747, 290, + 4978, 295, + 4921, 464, + 5186, 850, + 5366, 290, + 5599, 295, + 5288, 1280, + 5051, 1280, + 5106, 1102, + 4836, 709, + 4641, 1280, + 4406, 1280, + }, + { + 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, + }, + } + for _,C in next,title do + for i=1,#C do + C[i]=C[i]*.1626 + end + end +end +do--title_fan + title_fan={} + local sin,cos=math.sin,math.cos + 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