From 0099bf53cbe4045905261a9cbaccf6765bebbeda Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Sun, 17 Oct 2021 00:49:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E6=A1=86=E6=9E=B6=E6=9B=B4=E7=8B=AC=E7=AB=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Zframework/init.lua              |  3 ---
 Zframework/widget.lua            |  2 +-
 main.lua                         | 10 +++++++---
 parts/netPlayer.lua              |  2 +-
 parts/player/draw.lua            |  2 +-
 parts/scenes/custom_sequence.lua |  2 +-
 parts/scenes/game.lua            |  2 +-
 parts/scenes/launchpad.lua       |  2 +-
 parts/scenes/mode.lua            |  2 +-
 parts/scenes/music.lua           |  2 +-
 parts/scenes/net_game.lua        |  2 +-
 parts/scenes/pause.lua           |  9 ++++-----
 parts/scenes/replays.lua         |  2 +-
 parts/scenes/setting_key.lua     |  2 +-
 parts/scenes/stat.lua            |  2 +-
 15 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/Zframework/init.lua b/Zframework/init.lua
index 24269f17..8074dd8a 100644
--- a/Zframework/init.lua
+++ b/Zframework/init.lua
@@ -46,9 +46,6 @@ LIGHT=      require'Zframework.light'
 
 --Love-based modules (complex)
 GC=         require'Zframework.gcExtend'
-    mStr=GC.mStr
-    mText=GC.simpX
-    mDraw=GC.draw
 FONT=       require'Zframework.font'
 TEXT=       require'Zframework.text'
 SYSFX=      require'Zframework.sysFX'
diff --git a/Zframework/widget.lua b/Zframework/widget.lua
index adb035e4..38b6a432 100644
--- a/Zframework/widget.lua
+++ b/Zframework/widget.lua
@@ -18,7 +18,7 @@ local sub,ins,rem=string.sub,table.insert,table.remove
 local mDraw,mDraw_X,mDraw_Y=GC.draw,GC.simpX,GC.simpY
 local xOy=SCR.xOy
 local FONT=FONT
-local mStr=mStr
+local mStr=GC.mStr
 
 local downArrowIcon=GC.DO{40,25,{'fPoly',0,0,20,25,40,0}}
 local upArrowIcon=GC.DO{40,25,{'fPoly',0,25,20,0,40,25}}
diff --git a/main.lua b/main.lua
index b78aa046..e65ff34d 100644
--- a/main.lua
+++ b/main.lua
@@ -44,13 +44,17 @@ end
 
 --Load modules
 Z=require'Zframework'
-
 FONT.init('parts/fonts/proportional.ttf')
-    setFont=FONT.set
-    getFont=FONT.get
 SCR.setSize(1280,720)--Initialize Screen size
 BGM.setChange(function(name)MES.new('music',text.nowPlaying..name,5)end)
 
+--Create shortcuts
+setFont=FONT.set
+getFont=FONT.get
+mStr=GC.mStr
+mText=GC.simpX
+mDraw=GC.draw
+
 --Delete all naked files (from too old version)
 FILE.clear('')
 
diff --git a/parts/netPlayer.lua b/parts/netPlayer.lua
index 4ccc2e62..1d55ac01 100644
--- a/parts/netPlayer.lua
+++ b/parts/netPlayer.lua
@@ -6,7 +6,7 @@ local gc_stencil,gc_setStencilTest=gc.stencil,gc.setStencilTest
 local rnd,min=math.random,math.min
 local sin,cos=math.sin,math.cos
 local ins,rem=table.insert,table.remove
-local setFont=setFont
+local setFont=FONT.set
 
 local posLists={
     --1~5
diff --git a/parts/player/draw.lua b/parts/player/draw.lua
index ab8252c0..763c8466 100644
--- a/parts/player/draw.lua
+++ b/parts/player/draw.lua
@@ -9,7 +9,7 @@ local gc_stencil,gc_setStencilTest=gc.stencil,gc.setStencilTest
 
 local int,ceil,rnd=math.floor,math.ceil,math.random
 local max,min,sin,modf=math.max,math.min,math.sin,math.modf
-local setFont,mDraw,mStr=setFont,mDraw,mStr
+local setFont,mDraw,mStr=FONT.set,GC.draw,GC.mStr
 local SKIN,TEXTURE,IMG=SKIN,TEXTURE,IMG
 local TEXT,COLOR,GAME,TIME=TEXT,COLOR,GAME,TIME
 local shader_alpha,shader_lighter=SHADER.alpha,SHADER.lighter
diff --git a/parts/scenes/custom_sequence.lua b/parts/scenes/custom_sequence.lua
index bc421566..f6892962 100644
--- a/parts/scenes/custom_sequence.lua
+++ b/parts/scenes/custom_sequence.lua
@@ -3,7 +3,7 @@ local kb=love.keyboard
 
 local sin=math.sin
 local ins,rem=table.insert,table.remove
-local setFont=setFont
+local setFont=FONT.set
 local gc_setColor,gc_print=gc.setColor,gc.print
 
 local scene={}
diff --git a/parts/scenes/game.lua b/parts/scenes/game.lua
index 877217ad..28ef93f0 100644
--- a/parts/scenes/game.lua
+++ b/parts/scenes/game.lua
@@ -7,7 +7,7 @@ local sin=math.sin
 
 local SCR,VK=SCR,VK
 local GAME,PLAYERS=GAME,PLAYERS
-local setFont,mStr=setFont,mStr
+local setFont,mStr=FONT.set,GC.mStr
 
 local noTouch,noKey=false,false
 local touchMoveLastFrame=false
diff --git a/parts/scenes/launchpad.lua b/parts/scenes/launchpad.lua
index 44399d82..6d5791a8 100644
--- a/parts/scenes/launchpad.lua
+++ b/parts/scenes/launchpad.lua
@@ -8,7 +8,7 @@ local isDown=love.keyboard.isDown
 
 local int,max,min=math.floor,math.max,math.min
 
-local mStr=mStr
+local mStr=GC.mStr
 
 local scene={}
 
diff --git a/parts/scenes/mode.lua b/parts/scenes/mode.lua
index 05b42c95..d131cdc4 100644
--- a/parts/scenes/mode.lua
+++ b/parts/scenes/mode.lua
@@ -12,7 +12,7 @@ local mt=love.math
 local max,min=math.max,math.min
 local int,abs=math.floor,math.abs
 
-local setFont=setFont
+local setFont=FONT.set
 
 local mapCam={
     sel=false,--Selected mode ID
diff --git a/parts/scenes/music.lua b/parts/scenes/music.lua
index 312d8c7e..e2ea9421 100644
--- a/parts/scenes/music.lua
+++ b/parts/scenes/music.lua
@@ -1,7 +1,7 @@
 local gc=love.graphics
 local gc_setColor,gc_print=gc.setColor,gc.print
 local sin=math.sin
-local setFont=setFont
+local setFont=FONT.set
 
 local author={
     blank="MrZ (old works)",
diff --git a/parts/scenes/net_game.lua b/parts/scenes/net_game.lua
index 832c3fc2..b8a6b3f6 100644
--- a/parts/scenes/net_game.lua
+++ b/parts/scenes/net_game.lua
@@ -3,7 +3,7 @@ local gc,kb,tc=love.graphics,love.keyboard,love.touch
 local gc_setColor=gc.setColor
 local gc_print,gc_printf=gc.print,gc.printf
 local gc_draw=gc.draw
-local setFont,mStr=setFont,mStr
+local setFont,mStr=FONT.set,GC.mStr
 
 local ins=table.insert
 
diff --git a/parts/scenes/pause.lua b/parts/scenes/pause.lua
index 1f59dcfb..b23e7519 100644
--- a/parts/scenes/pause.lua
+++ b/parts/scenes/pause.lua
@@ -2,7 +2,7 @@ local gc=love.graphics
 local sin,log=math.sin,math.log10
 
 local GAME,SCR=GAME,SCR
-local setFont,mStr=setFont,mStr
+local setFont,mStr=FONT.set,GC.mStr
 
 local fnsRankColor={
     Z=COLOR.lY,
@@ -214,16 +214,15 @@ function scene.draw()
     gc.draw(drawableText.modeName,745-drawableText.modeName:getWidth(),143)
 
     --Level rank
-    if GAME.rank>0 then
+    if RANKCHARS[GAME.rank]then
         gc.push('transform')
             gc.translate(1050,5)
-            local str=RANKCHARS[GAME.rank]
             setFont(80)
             gc.setColor(0,0,0,timer1*.7)
-            gc.print(str,-5,-4,nil,1.5)
+            gc.print(RANKCHARS[GAME.rank],-5,-4,nil,1.5)
             local L=rankColor[GAME.rank]
             gc.setColor(L[1],L[2],L[3],timer1)
-            gc.print(str,0,0,nil,1.5)
+            gc.print(RANKCHARS[GAME.rank],0,0,nil,1.5)
         gc.pop()
     end
 
diff --git a/parts/scenes/replays.lua b/parts/scenes/replays.lua
index 95273494..22a8758a 100644
--- a/parts/scenes/replays.lua
+++ b/parts/scenes/replays.lua
@@ -4,7 +4,7 @@ local gc_rectangle=gc.rectangle
 local gc_print,gc_printf=gc.print,gc.printf
 
 local kb=love.keyboard
-local setFont=setFont
+local setFont=FONT.set
 
 local listBox=WIDGET.newListBox{name="list",x=50,y=50,w=1200,h=520,lineH=40,drawF=function(rep,id,ifSel)
     if ifSel then
diff --git a/parts/scenes/setting_key.lua b/parts/scenes/setting_key.lua
index 8d772bde..a7effb3b 100644
--- a/parts/scenes/setting_key.lua
+++ b/parts/scenes/setting_key.lua
@@ -1,6 +1,6 @@
 local gc=love.graphics
-local mStr=mStr
 local ins=table.insert
+local mStr=GC.mStr
 
 local scene={}
 
diff --git a/parts/scenes/stat.lua b/parts/scenes/stat.lua
index d4b115ad..5425689e 100644
--- a/parts/scenes/stat.lua
+++ b/parts/scenes/stat.lua
@@ -5,7 +5,7 @@ local gc_draw,gc_line=gc.draw,gc.line
 local gc_print=gc.print
 
 local int,sin=math.floor,math.sin
-local mStr=mStr
+local mStr=GC.mStr
 
 local scene={}