diff --git a/parts/scenes/app_15p.lua b/parts/scenes/app_15p.lua index 8c98ded2..f6a7b9ee 100644 --- a/parts/scenes/app_15p.lua +++ b/parts/scenes/app_15p.lua @@ -1,7 +1,7 @@ local gc=love.graphics local int,rnd=math.floor,math.random -local mStr=mStr +local mStr=GC.mStr local scene={} @@ -258,7 +258,7 @@ local backColor={ },--Black } function scene.draw() - setFont(40) + FONT.get(40) gc.setColor(COLOR.Z) gc.print(("%.3f"):format(time),1026,80) gc.setColor(1,.8,.8) @@ -282,7 +282,7 @@ function scene.draw() gc.setLineWidth(4) local mono=invis and state==1 - setFont(80) + FONT.get(80) for i=1,4 do for j=1,4 do if cx~=j or cy~=i then diff --git a/parts/scenes/app_2048.lua b/parts/scenes/app_2048.lua index 290cc269..b3278181 100644 --- a/parts/scenes/app_2048.lua +++ b/parts/scenes/app_2048.lua @@ -4,8 +4,8 @@ local setColor,rectangle=gc.setColor,gc.rectangle local int,abs=math.floor,math.abs local rnd,min=math.random,math.min local ins=table.insert -local setFont=setFont -local mStr=mStr +local setFont=FONT.get +local mStr=GC.mStr local scene={} diff --git a/parts/scenes/app_AtoZ.lua b/parts/scenes/app_AtoZ.lua index df9dbffa..f97f8603 100644 --- a/parts/scenes/app_AtoZ.lua +++ b/parts/scenes/app_AtoZ.lua @@ -1,6 +1,5 @@ local gc=love.graphics local rnd=math.random -local mStr=mStr local levels={ A_Z="ABCDEFGHIJKLMNOPQRSTUVWXYZ", @@ -83,7 +82,7 @@ function scene.update() end function scene.draw() - setFont(40) + FONT.get(40) gc.setColor(COLOR.Z) gc.print(("%.3f"):format(time),1026,80) gc.print(mistake,1026,150) @@ -100,15 +99,15 @@ function scene.draw() gc.setColor(.2,.8,.2)--ready end - setFont(100) - mStr(state==1 and #targetString-progress+1 or state==0 and"Ready"or state==2 and"Win",640,200) + FONT.get(100) + GC.mStr(state==1 and #targetString-progress+1 or state==0 and"Ready"or state==2 and"Win",640,200) gc.setColor(COLOR.Z) gc.print(targetString:sub(progress,progress),120,280,0,2) gc.print(targetString:sub(progress+1),310,380) gc.setColor(1,1,1,.7) - setFont(40) + FONT.get(40) gc.print(targetString,120,520) end diff --git a/parts/scenes/app_UTTT.lua b/parts/scenes/app_UTTT.lua index ce3face3..f9003824 100644 --- a/parts/scenes/app_UTTT.lua +++ b/parts/scenes/app_UTTT.lua @@ -171,7 +171,7 @@ function scene.draw() if gameover then --Draw result - setFont(60) + FONT.get(60) if gameover==0 then gc.setColor(1,.6,.6) mStr("RED\nWON",1140,200) diff --git a/parts/scenes/app_arithmetic.lua b/parts/scenes/app_arithmetic.lua index 510de686..31b414ed 100644 --- a/parts/scenes/app_arithmetic.lua +++ b/parts/scenes/app_arithmetic.lua @@ -189,17 +189,17 @@ function scene.update(dt) end end function scene.draw() - setFont(35) + FONT.get(35) gc.setColor(COLOR.Z) - mStr("["..level.."]",640,30) + GC.mStr("["..level.."]",640,30) - setFont(100) + FONT.get(100) if type(question)=='table'then gc.setColor(1,1,1)end - mStr(question,640,60) + GC.mStr(question,640,60) - setFont(80) + FONT.get(80) gc.setColor(1,1,1,inputTime) - mStr(input,640,160) + GC.mStr(input,640,160) end scene.widgetList={ diff --git a/parts/scenes/app_calc.lua b/parts/scenes/app_calc.lua index 92f50e69..572f86c3 100644 --- a/parts/scenes/app_calc.lua +++ b/parts/scenes/app_calc.lua @@ -114,10 +114,10 @@ function scene.draw() gc.setColor(COLOR.Z) gc.setLineWidth(2) gc.rectangle('line',100,80,650,150,5) - setFont(45) + FONT.get(45) if reg then gc.printf(reg,0,100,720,'right')end if val then gc.printf(val,0,150,720,'right')end - if sym then setFont(50)gc.print(sym,126,150)end + if sym then FONT.get(50)gc.print(sym,126,150)end end scene.widgetList={ diff --git a/parts/scenes/app_cannon.lua b/parts/scenes/app_cannon.lua index 31818b8d..2d72bb49 100644 --- a/parts/scenes/app_cannon.lua +++ b/parts/scenes/app_cannon.lua @@ -103,7 +103,7 @@ function scene.draw() end --Info - setFont(40) + FONT.get(40) if combo>1 then gc.setColor(1,1,.6) gc.print("x"..combo,300,80) diff --git a/parts/scenes/app_cubefield.lua b/parts/scenes/app_cubefield.lua index 05444749..3af843e0 100644 --- a/parts/scenes/app_cubefield.lua +++ b/parts/scenes/app_cubefield.lua @@ -1,10 +1,7 @@ -local gc=love.graphics -local kb=love.keyboard -local tc=love.touch - +local gc,kb,tc=love.graphics,love.keyboard,love.touch local rnd,int,abs=math.random,math.floor,math.abs local max,min=math.max,math.min -local setFont=setFont +local setFont,mStr=FONT.get,GC.mStr local cubeColor={ {.88,.75,.00}, diff --git a/parts/scenes/app_dropper.lua b/parts/scenes/app_dropper.lua index 6729d264..a3c5d1b1 100644 --- a/parts/scenes/app_dropper.lua +++ b/parts/scenes/app_dropper.lua @@ -1,10 +1,11 @@ local gc=love.graphics -local rnd=math.random -local int,max=math.floor,math.max +local rnd,int,max=math.random,math.floor,math.max +local setFont,mStr=FONT.get,GC.mStr --This mini-game is written for TI-nSpire CX CAS many years ago. --Deliberately, some grammar mistakes and typos in the 'great' list remained. --So no need to correct them. + local perfect={"Perfect!","Excellent!","Nice!","Good!","Great!","Just!","300"} local great={"Pay attention!","Be carefully!","Teacher behind you!","Feel tired?","You are in danger!","Do your homework!","A good game!","Minecraft!","y=ax^2+bx+c!","No music?","Internet unavailable.","It's raining!","Too hard!","Shorter?","Higher!","English messages!","Hi!","^_^","Drop!","Colorful!",":)","100$","~~~wave~~~","★★★","中文!","NOW!!!!!","Also try the TEN!","I'm a programer!","Also try minesweeperZ!","This si Dropper!","Hold your calculatoor!","Look! UFO!","Bonjour!","[string]","Author:MrZ","Boom!","PvZ!","China!","TI-nspire!","I love LUA!"} local miss={"Oops!","Uh-oh","Ouch!","Oh no."} diff --git a/parts/scenes/app_dtw.lua b/parts/scenes/app_dtw.lua index 9dee2ed4..c793abc5 100644 --- a/parts/scenes/app_dtw.lua +++ b/parts/scenes/app_dtw.lua @@ -1,4 +1,5 @@ local gc=love.graphics +local setFont,mStr=FONT.get,GC.mStr local int,rnd=math.floor,math.random local ins,rem=table.insert,table.remove diff --git a/parts/scenes/app_link.lua b/parts/scenes/app_link.lua index c3ed84e0..c849d435 100644 --- a/parts/scenes/app_link.lua +++ b/parts/scenes/app_link.lua @@ -2,7 +2,7 @@ local ms=love.mouse local msIsDown,kbIsDown=ms.isDown,love.keyboard.isDown local gc=love.graphics local gc_setColor,gc_rectangle,gc_draw=gc.setColor,gc.rectangle,gc.draw -local setFont=setFont +local setFont,mStr=FONT.get,GC.mStr local int,rnd,abs=math.floor,math.random,math.abs local max,min=math.max,math.min diff --git a/parts/scenes/app_polyforge.lua b/parts/scenes/app_polyforge.lua index 7f9193eb..c31a4888 100644 --- a/parts/scenes/app_polyforge.lua +++ b/parts/scenes/app_polyforge.lua @@ -1,5 +1,7 @@ local gc=love.graphics local rnd,sin,cos=math.random,math.sin,math.cos +local setFont,mStr=FONT.get,GC.mStr + local tau=math.pi*2 local state diff --git a/parts/scenes/app_pong.lua b/parts/scenes/app_pong.lua index 5d566c29..aef286fc 100644 --- a/parts/scenes/app_pong.lua +++ b/parts/scenes/app_pong.lua @@ -151,10 +151,10 @@ end function scene.draw() --Draw score - setFont(100) gc.setColor(.4,.4,.4) - mStr(p1.score,470,20) - mStr(p2.score,810,20) + FONT.get(100) + GC.mStr(p1.score,470,20) + GC.mStr(p2.score,810,20) --Draw boundary gc.setColor(COLOR.Z) diff --git a/parts/scenes/app_reflect.lua b/parts/scenes/app_reflect.lua index 14d114fc..e722d683 100644 --- a/parts/scenes/app_reflect.lua +++ b/parts/scenes/app_reflect.lua @@ -1,5 +1,6 @@ local gc=love.graphics local rnd=math.random +local setFont,mStr=FONT.get,GC.mStr local scene={} diff --git a/parts/scenes/app_schulteG.lua b/parts/scenes/app_schulteG.lua index c4ef1084..ec346a3b 100644 --- a/parts/scenes/app_schulteG.lua +++ b/parts/scenes/app_schulteG.lua @@ -1,10 +1,7 @@ -local gc=love.graphics -local ms=love.mouse - +local gc,ms=love.graphics,love.mouse local int,rnd=math.floor,math.random local rem=table.remove -local setFont=setFont -local mStr=mStr +local setFont,mStr=FONT.get,GC.mStr local scene={} diff --git a/parts/scenes/app_tap.lua b/parts/scenes/app_tap.lua index 1e03209c..e99db293 100644 --- a/parts/scenes/app_tap.lua +++ b/parts/scenes/app_tap.lua @@ -1,7 +1,7 @@ local gc=love.graphics local max=math.max local ins=table.insert -local mStr=mStr +local setFont,mStr=FONT.get,GC.mStr local scene={} diff --git a/parts/scenes/app_ten.lua b/parts/scenes/app_ten.lua index d7f808f4..a39fb463 100644 --- a/parts/scenes/app_ten.lua +++ b/parts/scenes/app_ten.lua @@ -4,11 +4,12 @@ local setColor,rectangle=gc.setColor,gc.rectangle local int,rnd=math.floor,math.random local ins,rem=table.insert,table.remove -local mStr=mStr +local setFont,mStr=FONT.get,GC.mStr local scene={} local previewX={245,186,129,78,35} +local previewY={435,442,449,456,463} local tileColor={ {.39, 1.0, .39}, {.39, .39, 1.0}, @@ -246,7 +247,7 @@ function scene.draw() for i=1,5 do setFont(85-10*i) gc.setColor(tileColor[preview[i]]) - gc.print(preview[i],previewX[i],428+i*7) + gc.print(preview[i],previewX[i],previewY[i]) end end @@ -257,8 +258,8 @@ function scene.draw() end gc.setLineWidth(10) setColor(COLOR[ - state==0 and'G'or state==1 and(fast and'R'or'W')or + state==0 and'G'or state==2 and'Y' ]) rectangle('line',315,35,650,650)