整理代码

Author: MrZ626

assets/game/acryPlayer.lua

@@ -581,7 +581,7 @@ function AP:tickStep()
         end
     end
 
-    if love.keyboard.isDown('f4') then
+    if IsKeyDown('f4') then
         local acry=F[1][1]
         if acry then
             print("--------------------------")

assets/game/exteriorMap.lua

@@ -297,9 +297,9 @@ end
 function map:update(dt)
     -- if selected then
     --     selected.pos={
-    --         selected.pos[1]+.026*((love.keyboard.isDown('w') and 1 or 0)-(love.keyboard.isDown('s') and 1 or 0)),
-    --         selected.pos[2]+.026*((love.keyboard.isDown('a') and 1 or 0)-(love.keyboard.isDown('d') and 1 or 0)),
-    --         selected.pos[3]+.026*((love.keyboard.isDown('q') and 1 or 0)-(love.keyboard.isDown('e') and 1 or 0)),
+    --         selected.pos[1]+.026*((IsKeyDown('w') and 1 or 0)-(IsKeyDown('s') and 1 or 0)),
+    --         selected.pos[2]+.026*((IsKeyDown('a') and 1 or 0)-(IsKeyDown('d') and 1 or 0)),
+    --         selected.pos[3]+.026*((IsKeyDown('q') and 1 or 0)-(IsKeyDown('e') and 1 or 0)),
     --     }
     --     selected.x=30*(selected.pos[1]-selected.pos[2])*(3^.5/2)
     --     selected.y=30*(selected.pos[3]-(selected.pos[1]+selected.pos[2])*.5)
@@ -330,19 +330,19 @@ function map:update(dt)
         end
     end
     if full then
-        if love.keyboard.isDown('up','down','left','right') then
+        if IsKeyDown('up','down','left','right') then
             self:showCursor()
             if IsCtrlDown() then
-                if love.keyboard.isDown('up')    then cam:scale(2.6^dt) end
-                if love.keyboard.isDown('down')  then cam:scale(1/2.6^dt) end
-                if love.keyboard.isDown('right') then cam:rotate(dt*3.55) end
-                if love.keyboard.isDown('left')  then cam:rotate(-dt*3.55) end
+                if IsKeyDown('up')    then cam:scale(2.6^dt) end
+                if IsKeyDown('down')  then cam:scale(1/2.6^dt) end
+                if IsKeyDown('right') then cam:rotate(dt*3.55) end
+                if IsKeyDown('left')  then cam:rotate(-dt*3.55) end
             else
                 local dx,dy=0,0
-                if love.keyboard.isDown('up')    then dy=dy+dt*1260 end
-                if love.keyboard.isDown('down')  then dy=dy-dt*1260 end
-                if love.keyboard.isDown('left')  then dx=dx+dt*1260 end
-                if love.keyboard.isDown('right') then dx=dx-dt*1260 end
+                if IsKeyDown('up')    then dy=dy+dt*1260 end
+                if IsKeyDown('down')  then dy=dy-dt*1260 end
+                if IsKeyDown('left')  then dx=dx+dt*1260 end
+                if IsKeyDown('right') then dx=dx-dt*1260 end
                 cam:move(dx,dy)
             end
         end

assets/game/init.lua

@@ -341,8 +341,8 @@ function GAME.cursorMove(x,y,dx,dy,tid,id)
         x,y=GAME.camera.transform:inverseTransformPoint(SCR.xOy_m:inverseTransformPoint(SCR.xOy:transformPoint(x,y)))
         p:mouseMove(x,y,dx,dy,
             tid or
-            love.mouse.isDown(1) and 1 or
-            love.mouse.isDown(2) and 2 or
+            IsMouseDown(1) and 1 or
+            IsMouseDown(2) and 2 or
             3
         )
     elseif SETTINGS.system.touchControl then

assets/gamefunc.lua

@@ -331,10 +331,9 @@ GetTouches=love.touch.getTouches
 IsMouseDown=love.mouse.isDown
 IsKeyDown=love.keyboard.isDown
 IsSCDown=love.keyboard.isScancodeDown
-local IsKeyDown=IsKeyDown
 function IsCtrlDown() return IsKeyDown('lctrl','rctrl') end
 function IsShiftDown() return IsKeyDown('lshift','rshift') end
-function isAltDown() return IsKeyDown('lalt','ralt') end
+function IsAltDown() return IsKeyDown('lalt','ralt') end
 
 local function _getActMode(mode,key)
     local act=KEYMAP[mode]:getAction(key)

assets/progress.lua

@@ -251,8 +251,8 @@ function PROGRESS.applyEnv(env)
                 gc.setColor(1,1,1)
                 gc.setLineWidth(2)
                 gc.translate(x,y)
-                if love.mouse.isDown(1) then GC.mRect('fill',0,0,10,10) end
-                if love.mouse.isDown(2) then GC.mRect('line',0,0,16,16) end
+                if IsMouseDown(1) then GC.mRect('fill',0,0,10,10) end
+                if IsMouseDown(2) then GC.mRect('line',0,0,16,16) end
                 gc.setColor(1,1,1,.626)
                 gc.setLineWidth(4)
                 gc.line(0,-15,0,15)
@@ -329,7 +329,7 @@ function PROGRESS.applyEnv(env)
             end
         end
         function ZENITHA.globalEvent.mouseUp(x,y,k)
-            if not love.mouse.isDown(1,2,3) then
+            if not IsMouseDown(1,2,3) then
                 TWEEN.tag_kill('cursor_anim')
                 _wid1,_wid2=W,.55
                 TWEEN.new(cursor_anim):setTag('cursor_anim'):setDuration(.0626):run()

assets/scene/dictionary.lua

@@ -4,7 +4,6 @@ local gc_stc_reset,gc_stc_rect,gc_stc_stop=GC.stc_reset,GC.stc_rect,GC.stc_stop
 local gc_translate,gc_replaceTransform=GC.translate,GC.replaceTransform
 
 local ins=table.insert
-local kbIsDown=love.keyboard.isDown
 ---@type Zenitha.Scene
 local scene={}
 
@@ -349,7 +348,7 @@ function scene.keyDown(key,isRep)
     if WIDGET.isFocus(inputBox) and #key==1 then return true end
     local act=KEYMAP.sys:getAction(key)
     if act=='up' or act=='down' then
-        if not (IsCtrlDown() or IsShiftDown() or isAltDown()) then
+        if not (IsCtrlDown() or IsShiftDown() or IsAltDown()) then
             local sel=listBox:getItem()
             listBox:arrowKey(key)
             if listBox:getItem()~=sel then
@@ -396,7 +395,7 @@ local function scroll(dy)
     contents.scroll=MATH.clamp(contents.scroll-dy,0,contents.maxScroll)
 end
 function scene.mouseMove(x,y,_,dy)
-    if not WIDGET.isFocus(listBox) and love.mouse.isDown(1) and x and y and inScreen(x,y) then
+    if not WIDGET.isFocus(listBox) and IsMouseDown(1) and x and y and inScreen(x,y) then
         scroll(dy)
     end
 end
@@ -442,8 +441,8 @@ function scene.update(dt)
         end
         searchTimer=0
     end
-    if kbIsDown('up','down') and (IsCtrlDown() or IsShiftDown() or isAltDown()) then
-        scroll(260*dt*(kbIsDown('up') and 1 or -1))
+    if IsKeyDown('up','down') and (IsCtrlDown() or IsShiftDown() or IsAltDown()) then
+        scroll(260*dt*(IsKeyDown('up') and 1 or -1))
     end
 end
 
@@ -501,7 +500,7 @@ function scene.draw()
         local fontH=FONT.get(selected.contentSize):getHeight()
         gc_translate(0,-mainH/2+5)
         for _,line in next,contents.texts do
-            if love.keyboard.isDown('f1') then
+            if IsKeyDown('f1') then
                 gc_setLineWidth(1)
                 gc_rectangle('line',15,0,mainW-25,line.height)
             end

assets/scene/game_out.lua

@@ -105,9 +105,9 @@ function scene.mouseUp(x,y,button)
 end
 
 function scene.update(dt)
-    if love.keyboard.isDown('f1') then
+    if IsKeyDown('f1') then
         dt=dt*.1
-    elseif love.keyboard.isDown('f2') then
+    elseif IsKeyDown('f2') then
         dt=dt*2.6
     else
         dt=dt*timeScale

assets/scene/mode_exterior.lua

@@ -81,7 +81,7 @@ end
 
 function scene.mouseMove(x,y,dx,dy)
     exMap:hideCursor()
-    if love.mouse.isDown(1) then
+    if IsMouseDown(1) then
         exMap:moveCam(dx,dy)
     else
         x,y=SCR.xOy:transformPoint(x,y)

assets/scene/musicroom.lua

@@ -266,7 +266,7 @@ function scene.update(dt)
             end
         end
     end
-    if WIDGET.sel~=progressBar or not love.mouse.isDown(1,2,3) and FMOD.music.getPlaying() then
+    if WIDGET.sel~=progressBar or not IsMouseDown(1,2,3) and FMOD.music.getPlaying() then
         local v=FMOD.music.tell()/FMOD.music.getDuration()%1
         if _glitchProtect then
             if math.abs(fakeProgress-v)<.0026 then