diff --git a/conf.lua b/conf.lua index b2d1a53e..f0ba4c5d 100644 --- a/conf.lua +++ b/conf.lua @@ -3,7 +3,7 @@ VERSION={ code=1600, short="V0.16.0", string="Alpha V0.16.0", - room="V1.0", + room="V1.1", name="空间站 Space station", } function love.conf(t) diff --git a/parts/player/init.lua b/parts/player/init.lua index be44e0e1..d3d87ded 100644 --- a/parts/player/init.lua +++ b/parts/player/init.lua @@ -350,9 +350,9 @@ local function applyGameEnv(P)--Finish gameEnv processing if ENV.splashFX==0 then ENV.splashFX=false end if ENV.shakeFX==0 then ENV.shakeFX=false end if ENV.atkFX==0 then ENV.atkFX=false end - if ENV.ghost==0 then ENV.ghost=false end - if ENV.grid==0 then ENV.grid=false end - if ENV.center==0 then ENV.center=false end + if ENV.ghost==0 then ENV.ghost=false end + if ENV.grid==0 then ENV.grid=false end + if ENV.center==0 then ENV.center=false end end ---------------------------------------------------- @@ -408,7 +408,6 @@ function PLY.newRemotePlayer(id,mini,ply) loadRemoteEnv(P,ply.config) applyGameEnv(P) end - function PLY.newAIPlayer(id,AIdata,mini) local P=newEmptyPlayer(id,mini) P.type='computer' diff --git a/parts/player/player.lua b/parts/player/player.lua index ec4cb1d8..1b70523f 100644 --- a/parts/player/player.lua +++ b/parts/player/player.lua @@ -222,7 +222,7 @@ function Player:setInvisible(time)--Time in frames end end function Player:setRS(RSname) - self.RS=kickList[RSname] + self.RS=kickList[RSname]or kickList.TRS end function Player:getHolePos()--Get a good garbage-line hole position