From 5a30e4aec9bed1a80c320e33ea7b28e468b5e7fb Mon Sep 17 00:00:00 2001 From: MrZ_26 <1046101471@qq.com> Date: Sat, 23 Sep 2023 03:56:41 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9F=A2=E9=87=8F=E5=8C=96=E4=BA=94=E8=BF=9E?= =?UTF-8?q?=E5=9D=97=E6=A8=A1=E5=BC=8F=E5=9B=BE=E6=A0=87=20=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E4=BA=94=E8=BF=9E=E5=9D=97=E5=92=8C=E4=B8=89=E8=BF=9E?= =?UTF-8?q?=E5=9D=97=E6=A8=A1=E5=BC=8F=E5=9B=BE=E6=A0=87=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- media/image/modeicon/sprint_pento.png | Bin 5185 -> 0 bytes media/image/modeicon/sprint_tri.png | Bin 801 -> 0 bytes parts/scenes/load.lua | 31 ++++++++++---------------- 3 files changed, 12 insertions(+), 19 deletions(-) delete mode 100644 media/image/modeicon/sprint_pento.png delete mode 100644 media/image/modeicon/sprint_tri.png diff --git a/media/image/modeicon/sprint_pento.png b/media/image/modeicon/sprint_pento.png deleted file mode 100644 index aea62da5a2ad2fe804c6a8c00070f5753c196728..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5185 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 t%x}|S>9P&~d!h8-zD4_8-JUsaVM%xNb!1@J z*w6hZkrl{i3-AeX{r~?zkQsXDavhLjDhcun{?G7qyMY&w$64SJSMu4uTOHK**3a+W%X*I~zj3=m zP9yVWC+vZ~;@(VOeHwl{xvHItQ-tOwT?hE?~35a(Tmpz;}C?INysg zac@Xv?@wPYF2Hg{l~u@SBI}Gd35I`r4}^$!Mp`i#$Eu{gWH|HX!i+X%gUhbPv-l49 zh@Z^_Nti4LNo<(&?_2V+Zq~2c<&9%?R_y;f<7JZL-?zto_?y1HJnADp36(tJF5a&w9gW7;l(TJD&z1_)D^TPOc^#<9*9UX3mGvjqwjcf~mr zZ0UY3r!qN*`+NMH{D(`qFQ%+_ICNEO-cA8uDK3t6t1BKk2APNn*qkhU?G&POyl8)4 z`TiY+idu76h31{JC{xt>!^(1A)Ll;H>PDtV4k=C{U;i4r8+GOy*Rt{@&E2(#;r5xe zTm|+rug?f`Z{W4BF9I?@9AL_seP;#3_rn|WKJ5Xr?=AJf%Db6>s-%t8#Wu9= zj24-2o--%-UG_+EQ*&AKW-6|v35+0Q?!&X^sotI*MwkdnB$ zLE(OHVe4HcPUT+)t1kpO7(BChCKAQX;U;^iW76`5gn7~*CvA5)H-quu zDb;sbhqyVeowHac738oXx-i6ajl-c|uemx-bHAzL-UCi#-P|>H|5bIAwq9so1WL;c Mp00i_>zopr0M%?->;M1& diff --git a/parts/scenes/load.lua b/parts/scenes/load.lua index dae769b1..55fa2518 100644 --- a/parts/scenes/load.lua +++ b/parts/scenes/load.lua @@ -99,25 +99,18 @@ local loadingThread=coroutine.wrap(function() {'fRect',080,096,16,16}, {'fRect',064,112,16,16}, } - do - local pento_polygon = {0,0, 32,0, 32,32, 96,32, 96,64, 64,64, 64,96, 32,96, 32,64, 0,64} - local pento_tris = love.math.triangulate(pento_polygon) - local draw_pentomino_table = {} - for i=1, #pento_tris do - table.insert(draw_pentomino_table,{'fPoly',unpack(pento_tris[i])}) - end - modeIcons.sprint_pento=GC.DO{128,128, - {'move',6,64}, - {'rotate',7*math.pi/4}, -- 45 degrees - - unpack(draw_pentomino_table), - } - end + modeIcons.sprint_pento=GC.DO{256,256, + {'scale',2.8}, + {'move',-10,-5}, + {'rotate',-.26}, + {'setFT',100}, + {'print',CHAR.mino.F}, + } modeIcons.sprint_tri=GC.DO{256,256, - {'rotate',math.pi/12}, -- 15 degrees - {'move',56,-20}, - {'fRect',0,100,200,100}, - {'fRect',100,0,100,100} + {'move',72,20}, + {'rotate',.26}, + {'fRect',0,80,160,80}, + {'fRect',80,0,80,80} } modeIcons.ultra=GC.DO{128,128, {'setLW',12}, @@ -137,7 +130,7 @@ local loadingThread=coroutine.wrap(function() {'dRect',20,80,20,20}, {'dRect',40,80,20,20}, {'dRect',20,60,20,20}, - + {'setCL',1,1,1,.5}, -- Draw grid {'fRect',15,20,8,2},{'fRect',35,20,8,2},{'fRect',55,20,8,2},{'fRect',75,20,8,2},