From 45469676929109ba30d2fc5940973594cc65e46b Mon Sep 17 00:00:00 2001 From: MrZ_26 <1046101471@qq.com> Date: Thu, 2 Nov 2023 02:17:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=89=80=E6=9C=89---?= =?UTF-8?q?=E5=90=8E=E7=9A=84=E7=A9=BA=E6=A0=BC=EF=BC=88=E5=8C=85=E6=8B=AC?= =?UTF-8?q?=E6=A1=86=E6=9E=B6=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Zenitha | 2 +- assets/game/basePlayer.lua | 6 +- assets/game/classes.lua | 336 +++++++++--------- assets/game/gemPlayer.lua | 6 +- assets/game/init.lua | 6 +- assets/game/mechanicLib/common/timer.lua | 8 +- assets/game/mechanicLib/init.lua | 2 +- assets/game/mechanicLib/mino/acGenerator.lua | 2 +- assets/game/mechanicLib/mino/backfire.lua | 2 +- assets/game/mechanicLib/mino/clearRule.lua | 12 +- .../game/mechanicLib/mino/comboPractice.lua | 2 +- assets/game/mechanicLib/mino/dig.lua | 2 +- assets/game/mechanicLib/mino/hypersonic.lua | 4 +- assets/game/mechanicLib/mino/marathon.lua | 2 +- assets/game/mechanicLib/mino/misc.lua | 2 +- assets/game/mechanicLib/mino/progress.lua | 2 +- assets/game/mechanicLib/mino/sequence.lua | 10 +- assets/game/mechanicLib/mino/sprint.lua | 2 +- assets/game/mechanicLib/mino/squeeze.lua | 26 +- assets/game/mechanicLib/mino/stack.lua | 10 +- assets/game/mechanicLib/mino/statistics.lua | 2 +- assets/game/mechanicLib/mino/survivor.lua | 2 +- .../mechanicLib/mino/techrashChallenge.lua | 2 +- assets/game/mechanicLib/mino/tsdChallenge.lua | 2 +- assets/game/mechanicLib/puyo/sequence.lua | 2 +- assets/game/minoPlayer.lua | 12 +- assets/game/minoes.lua | 30 +- assets/game/minomap.lua | 6 +- .../game/mode/mino/exterior/ac_challenge.lua | 2 +- assets/game/mode/mino/exterior/ac_easy.lua | 2 +- assets/game/mode/mino/exterior/ac_hard.lua | 2 +- .../game/mode/mino/exterior/backfire_100.lua | 2 +- .../mino/exterior/backfire_amplify_100.lua | 2 +- .../mino/exterior/backfire_cheese_100.lua | 2 +- .../mode/mino/exterior/combo_practice.lua | 2 +- assets/game/mode/mino/exterior/dig_100.lua | 2 +- assets/game/mode/mino/exterior/dig_40.lua | 2 +- assets/game/mode/mino/exterior/dig_400.lua | 2 +- .../game/mode/mino/exterior/dig_checker.lua | 2 +- .../game/mode/mino/exterior/dig_practice.lua | 2 +- assets/game/mode/mino/exterior/dig_shale.lua | 2 +- .../game/mode/mino/exterior/dig_volcanics.lua | 2 +- .../game/mode/mino/exterior/hypersonic_hd.lua | 2 +- .../game/mode/mino/exterior/hypersonic_hi.lua | 2 +- .../game/mode/mino/exterior/hypersonic_lo.lua | 2 +- .../game/mode/mino/exterior/hypersonic_ti.lua | 2 +- assets/game/mode/mino/exterior/marathon.lua | 2 +- assets/game/mode/mino/exterior/sprint_10.lua | 2 +- .../game/mode/mino/exterior/sprint_1000.lua | 2 +- assets/game/mode/mino/exterior/sprint_200.lua | 2 +- assets/game/mode/mino/exterior/sprint_40.lua | 2 +- .../game/mode/mino/exterior/sprint_big_80.lua | 2 +- .../mode/mino/exterior/sprint_blind_40.lua | 2 +- .../mode/mino/exterior/sprint_delay_20.lua | 2 +- .../mode/mino/exterior/sprint_dizzy_40.lua | 2 +- .../mode/mino/exterior/sprint_drought_40.lua | 2 +- .../game/mode/mino/exterior/sprint_fix_20.lua | 2 +- .../mode/mino/exterior/sprint_flip_40.lua | 2 +- .../mode/mino/exterior/sprint_float_40.lua | 2 +- .../mode/mino/exterior/sprint_flood_40.lua | 2 +- .../mode/mino/exterior/sprint_hide_40.lua | 2 +- .../mode/mino/exterior/sprint_invis_40.lua | 2 +- .../mode/mino/exterior/sprint_lock_20.lua | 2 +- .../game/mode/mino/exterior/sprint_low_40.lua | 2 +- .../game/mode/mino/exterior/sprint_mph_40.lua | 2 +- .../mode/mino/exterior/sprint_obstacle_20.lua | 2 +- .../mode/mino/exterior/sprint_pento_40.lua | 2 +- .../mode/mino/exterior/sprint_randctrl_40.lua | 2 +- .../mode/mino/exterior/sprint_small_20.lua | 2 +- .../game/mode/mino/exterior/sprint_sym_40.lua | 2 +- .../mode/mino/exterior/sprint_wind_40.lua | 2 +- .../game/mode/mino/exterior/survivor_b2b.lua | 2 +- .../mode/mino/exterior/survivor_cheese.lua | 2 +- .../mode/mino/exterior/survivor_spike.lua | 2 +- .../game/mode/mino/exterior/techrash_easy.lua | 2 +- .../game/mode/mino/exterior/techrash_hard.lua | 2 +- assets/game/mode/mino/exterior/test.lua | 2 +- assets/game/mode/mino/exterior/tsd_easy.lua | 2 +- assets/game/mode/mino/exterior/tsd_hard.lua | 2 +- .../game/mode/mino/exterior/tsd_practice.lua | 2 +- assets/game/mode/mino/exterior/ultra.lua | 2 +- assets/game/mode/mino/interior/dig.lua | 2 +- assets/game/mode/mino/interior/marathon.lua | 2 +- assets/game/mode/mino/interior/sprint.lua | 2 +- assets/game/mode/mino/interior/test.lua | 2 +- assets/game/mode/mino/interior/train.lua | 2 +- .../mode/mino/interior/tutorial/1.basic.lua | 2 +- .../mino/interior/tutorial/2.sequence.lua | 2 +- .../mino/interior/tutorial/4.stackBasic.lua | 2 +- .../interior/tutorial/5.twoRotatingKey.lua | 2 +- assets/game/mode/puyo/test.lua | 2 +- assets/game/mode/test/battle.lua | 2 +- assets/game/particleSystemTemplate.lua | 2 +- assets/game/puyoPlayer.lua | 6 +- assets/game/rectField.lua | 6 +- assets/game/rotsys_mino/trs.lua | 2 +- assets/gamefunc.lua | 16 +- assets/scene/simulation.lua | 22 +- 98 files changed, 342 insertions(+), 342 deletions(-) diff --git a/Zenitha b/Zenitha index 89e5b4f4..58873bc1 160000 --- a/Zenitha +++ b/Zenitha @@ -1 +1 @@ -Subproject commit 89e5b4f4417635e5b75bc530582d9f93a51147c7 +Subproject commit 58873bc1ac2b904a15c0816ad47f905f25f0d09c diff --git a/assets/game/basePlayer.lua b/assets/game/basePlayer.lua index fdc96af5..f096881d 100644 --- a/assets/game/basePlayer.lua +++ b/assets/game/basePlayer.lua @@ -5,7 +5,7 @@ local ins,rem=table.insert,table.remove local sign,expApproach=MATH.sign,MATH.expApproach ---- @class Techmino.Player +---@class Techmino.Player local P={} -------------------------------------------------------------- @@ -209,7 +209,7 @@ function P:delEvent(name,F) local pos=TABLE.find(self.event[name],F) if pos then self.event[name][pos]=_scrap end end ---- @param reason Techmino.EndReason +---@param reason Techmino.EndReason function P:finish(reason) if self.finished then return end self.timing=false @@ -641,7 +641,7 @@ local soundTimeMeta={ __index=function(self,k) rawset(self,k,0) return -1e99 end, __metatable=true, } ---- @return Techmino.Player +---@return Techmino.Player function P.new() local self={} self.isMain=false diff --git a/assets/game/classes.lua b/assets/game/classes.lua index 56a4750c..a4fa039f 100644 --- a/assets/game/classes.lua +++ b/assets/game/classes.lua @@ -1,173 +1,173 @@ ---- @alias Techmino.Player.Type 'mino'|'puyo'|'gem' ---- @alias Techmino.Mode.Setting Techmino.Mode.Setting.Mino|Techmino.Mode.Setting.Puyo|Techmino.Mode.Setting.Gem ---- @alias Techmino.EndReason ---- | 'AC' Win ---- | 'WA' Block out ---- | 'CE' Lock out ---- | 'MLE' Top out ---- | 'TLE' Time out ---- | 'OLE' Finesse fault ---- | 'ILE' Ran out pieces ---- | 'PE' Mission failed ---- | 'UKE' Other reason - ---- @alias Techmino.mode.event.basic ---- | 'always' ---- | 'playerInit' ---- | 'gameStart' ---- | 'beforePress' ---- | 'afterPress' ---- | 'beforeRelease' ---- | 'afterRelease' ---- | 'gameOver' - ---- @alias Techmino.mode.event.mino ---- | 'afterResetPos' ---- | 'afterSpawn' ---- | 'afterDrop' ---- | 'afterLock' ---- | 'afterClear' ---- | 'beforeCancel' ---- | 'beforeSend' ---- | 'beforeDiscard' ---- | 'whenSuffocate' ---- | 'extraSolidCheck' ---- | 'changeSpawnPos' +---@alias Techmino.Player.Type 'mino'|'puyo'|'gem' +---@alias Techmino.Mode.Setting Techmino.Mode.Setting.Mino|Techmino.Mode.Setting.Puyo|Techmino.Mode.Setting.Gem +---@alias Techmino.EndReason +---|'AC' Win +---|'WA' Block out +---|'CE' Lock out +---|'MLE' Top out +---|'TLE' Time out +---|'OLE' Finesse fault +---|'ILE' Ran out pieces +---|'PE' Mission failed +---|'UKE' Other reason + +---@alias Techmino.mode.event.basic +---|'always' +---|'playerInit' +---|'gameStart' +---|'beforePress' +---|'afterPress' +---|'beforeRelease' +---|'afterRelease' +---|'gameOver' + +---@alias Techmino.mode.event.mino +---|'afterResetPos' +---|'afterSpawn' +---|'afterDrop' +---|'afterLock' +---|'afterClear' +---|'beforeCancel' +---|'beforeSend' +---|'beforeDiscard' +---|'whenSuffocate' +---|'extraSolidCheck' +---|'changeSpawnPos' --- ---- | 'drawBelowField' ---- | 'drawBelowBlock' ---- | 'drawBelowMarks' ---- | 'drawInField' ---- | 'drawOnPlayer' - ---- @alias Techmino.mode.event.puyo ---- | 'afterSpawn' ---- | 'afterResetPos' ---- | 'afterDrop' ---- | 'afterLock' ---- | 'afterClear' ---- | 'whenSuffocate' ---- | ---- | 'drawBelowField' ---- | 'drawBelowBlock' ---- | 'drawBelowMarks' ---- | 'drawInField' ---- | 'drawOnPlayer' - ---- @alias Techmino.mode.event.gem ---- | 'illegalMove' ---- | 'legalMove' +---|'drawBelowField' +---|'drawBelowBlock' +---|'drawBelowMarks' +---|'drawInField' +---|'drawOnPlayer' + +---@alias Techmino.mode.event.puyo +---|'afterSpawn' +---|'afterResetPos' +---|'afterDrop' +---|'afterLock' +---|'afterClear' +---|'whenSuffocate' +---| +---|'drawBelowField' +---|'drawBelowBlock' +---|'drawBelowMarks' +---|'drawInField' +---|'drawOnPlayer' + +---@alias Techmino.mode.event.gem +---|'illegalMove' +---|'legalMove' --- ---- | 'drawBelowField' ---- | 'drawInField' ---- | 'drawOnPlayer' - ---- @alias Techmino.Mech.basic table ---- @alias Techmino.Mech.mino table ---- @alias Techmino.Mech.puyo table ---- @alias Techmino.Mech.gem table - ---- @class Techmino.ParticleSystems ---- @field rectShade love.ParticleSystem ---- @field spinArrow table ---- @field star love.ParticleSystem ---- @field boardSmoke love.ParticleSystem ---- @field line love.ParticleSystem ---- @field hitSparkle love.ParticleSystem ---- @field cornerCheck love.ParticleSystem ---- @field tiltRect love.ParticleSystem ---- @field trail love.ParticleSystem ---- @field minoMapBack love.ParticleSystem - ---- @alias Techmino.Mino.Shape table> ---- @alias Techmino.Mino.Name 'Z'|'S'|'J'|'L'|'T'|'O'|'I'|'Z5'|'S5'|'P'|'Q'|'F'|'E'|'T5'|'U'|'V'|'W'|'X'|'J5'|'L5'|'R'|'Y'|'N'|'H'|'I5'|'I3'|'C'|'I2'|'O1'|string ---- @alias Techmino.Mino.ID 1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|integer - ---- @class Techmino.Mino ---- @field name Techmino.Mino.Name ---- @field id Techmino.Mino.ID ---- @field shape Techmino.Mino.Shape - ---- @class Techmino.Cell ---- @field cid string cell's mem pointer string ---- @field id number ascending piece number ---- @field color number 0~63 ---- @field conn table ---- @field bias {expBack?:number, lineBack?:number, teleBack?:number, x:number, y:number} ---- @field visTimer? number ---- @field visStep? number ---- @field visMax? number - ---- @class Techmino.RectField ---- @field _width number ---- @field _matrix (Techmino.Cell|false)[][] - ---- @class Techmino.Mode ---- @field initialize function Called when initializing the mode ---- @field settings {mino:Techmino.Mode.Setting.Mino?, puyo:Techmino.Mode.Setting.Puyo?, gem:Techmino.Mode.Setting.Gem?} ---- @field layout 'default' Layout mode ---- @field checkFinish function Return if the game should end when a player finishes ---- @field result function Called when the game ends ---- @field resultPage fun(time:number) Drawing the result page ---- @field name string Mode name, for debug use - ---- @class Techmino.Mode.Setting.Mino ---- @field event table> - ---- @class Techmino.Mode.Setting.Puyo ---- @field event table> - ---- @class Techmino.Mode.Setting.Gem ---- @field event table> - ---- @class Techmino.mino.clearRule ---- @field getDelay fun(P:Techmino.Player.mino, lines:number[]): number? ---- @field isFill fun(P:Techmino.Player.mino, y:number): boolean ---- @field getFill fun(P:Techmino.Player.mino): number[]? ---- @field clear fun(P:Techmino.Player.mino, lines:number[]) - ---- @class Techmino.Game ---- @field playing boolean ---- @field playerList table|false ---- @field playerMap table|false ---- @field camera Zenitha.Camera ---- @field hitWaves table ---- @field seed number|false ---- @field mode Techmino.Mode|false ---- @field mainID number|false ---- @field mainPlayer Techmino.Player|false - ---- @class Techmino.Player ---- @field gameMode Techmino.Player.Type ---- @field id number limited to 1~1000 ---- @field group number ---- @field isMain boolean ---- @field sound boolean ---- @field settings Techmino.Mode.Setting ---- @field buffedKey table ---- @field modeData table ---- @field soundTimeHistory table ---- @field RND love.RandomGenerator ---- @field pos {x:number, y:number, k:number, a:number, dx:number, dy:number, dk:number, da:number, vx:number, vy:number, vk:number, va:number} ---- @field finished Techmino.EndReason|boolean ---- @field realTime number ---- @field time number ---- @field gameTime number ---- @field timing boolean ---- @field texts Zenitha.Text ---- @field particles Techmino.ParticleSystems +---|'drawBelowField' +---|'drawInField' +---|'drawOnPlayer' + +---@alias Techmino.Mech.basic table +---@alias Techmino.Mech.mino table +---@alias Techmino.Mech.puyo table +---@alias Techmino.Mech.gem table + +---@class Techmino.ParticleSystems +---@field rectShade love.ParticleSystem +---@field spinArrow table +---@field star love.ParticleSystem +---@field boardSmoke love.ParticleSystem +---@field line love.ParticleSystem +---@field hitSparkle love.ParticleSystem +---@field cornerCheck love.ParticleSystem +---@field tiltRect love.ParticleSystem +---@field trail love.ParticleSystem +---@field minoMapBack love.ParticleSystem + +---@alias Techmino.Mino.Shape table> +---@alias Techmino.Mino.Name 'Z'|'S'|'J'|'L'|'T'|'O'|'I'|'Z5'|'S5'|'P'|'Q'|'F'|'E'|'T5'|'U'|'V'|'W'|'X'|'J5'|'L5'|'R'|'Y'|'N'|'H'|'I5'|'I3'|'C'|'I2'|'O1'|string +---@alias Techmino.Mino.ID 1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|integer + +---@class Techmino.Mino +---@field name Techmino.Mino.Name +---@field id Techmino.Mino.ID +---@field shape Techmino.Mino.Shape + +---@class Techmino.Cell +---@field cid string cell's mem pointer string +---@field id number ascending piece number +---@field color number 0~63 +---@field conn table +---@field bias {expBack?:number, lineBack?:number, teleBack?:number, x:number, y:number} +---@field visTimer? number +---@field visStep? number +---@field visMax? number + +---@class Techmino.RectField +---@field _width number +---@field _matrix (Techmino.Cell|false)[][] + +---@class Techmino.Mode +---@field initialize function Called when initializing the mode +---@field settings {mino:Techmino.Mode.Setting.Mino?, puyo:Techmino.Mode.Setting.Puyo?, gem:Techmino.Mode.Setting.Gem?} +---@field layout 'default' Layout mode +---@field checkFinish function Return if the game should end when a player finishes +---@field result function Called when the game ends +---@field resultPage fun(time:number) Drawing the result page +---@field name string Mode name, for debug use + +---@class Techmino.Mode.Setting.Mino +---@field event table> + +---@class Techmino.Mode.Setting.Puyo +---@field event table> + +---@class Techmino.Mode.Setting.Gem +---@field event table> + +---@class Techmino.mino.clearRule +---@field getDelay fun(P:Techmino.Player.mino, lines:number[]): number? +---@field isFill fun(P:Techmino.Player.mino, y:number): boolean +---@field getFill fun(P:Techmino.Player.mino): number[]? +---@field clear fun(P:Techmino.Player.mino, lines:number[]) + +---@class Techmino.Game +---@field playing boolean +---@field playerList table|false +---@field playerMap table|false +---@field camera Zenitha.Camera +---@field hitWaves table +---@field seed number|false +---@field mode Techmino.Mode|false +---@field mainID number|false +---@field mainPlayer Techmino.Player|false + +---@class Techmino.Player +---@field gameMode Techmino.Player.Type +---@field id number limited to 1~1000 +---@field group number +---@field isMain boolean +---@field sound boolean +---@field settings Techmino.Mode.Setting +---@field buffedKey table +---@field modeData table +---@field soundTimeHistory table +---@field RND love.RandomGenerator +---@field pos {x:number, y:number, k:number, a:number, dx:number, dy:number, dk:number, da:number, vx:number, vy:number, vk:number, va:number} +---@field finished Techmino.EndReason|boolean +---@field realTime number +---@field time number +---@field gameTime number +---@field timing boolean +---@field texts Zenitha.Text +---@field particles Techmino.ParticleSystems --- ---- @field updateFrame function ---- @field scriptCmd function ---- @field decodeScript function ---- @field checkScriptSyntax function +---@field updateFrame function +---@field scriptCmd function +---@field decodeScript function +---@field checkScriptSyntax function --- ---- @field hand table|false Piece object ---- @field handX number ---- @field handY number ---- @field event table ---- @field soundEvent table ---- @field _actions table +---@field hand table|false Piece object +---@field handX number +---@field handY number +---@field event table +---@field soundEvent table +---@field _actions table --- ---- @field receive function ---- @field render function +---@field receive function +---@field render function diff --git a/assets/game/gemPlayer.lua b/assets/game/gemPlayer.lua index d1ce102e..4f9fe570 100644 --- a/assets/game/gemPlayer.lua +++ b/assets/game/gemPlayer.lua @@ -11,8 +11,8 @@ local ins,rem=table.insert,table.remove local inst=SFX.playSample ---- @class Techmino.Player.gem: Techmino.Player ---- @field field any[][] +---@class Techmino.Player.gem: Techmino.Player +---@field field any[][] local GP=setmetatable({},{__index=require'assets.game.basePlayer',__metatable=true}) --[[ Gem tags: @@ -863,7 +863,7 @@ function GP:checkScriptSyntax(cmd,arg,errMsg) end -------------------------------------------------------------- -- Builder ---- @class Techmino.Mode.Setting.Gem +---@class Techmino.Mode.Setting.Gem local baseEnv={ -- Size fieldSize=8, diff --git a/assets/game/init.lua b/assets/game/init.lua index f7ec1394..4ae4a170 100644 --- a/assets/game/init.lua +++ b/assets/game/init.lua @@ -8,7 +8,7 @@ defaultMinoColor=setmetatable({ 36,52,4,24, },{__index=function() return math.random(64) end}) defaultPuyoColor=setmetatable({2,12,42,22,52},{__index=function() return math.random(64) end}) ---- @type Techmino.Mech +---@type Techmino.Mech mechLib=TABLE.newResourceTable(require'assets.game.mechanicLib',function(path) return FILE.load(path,'-lua') end) regFuncLib(mechLib,"mechLib") require'assets.game.rotsys_mino' @@ -151,7 +151,7 @@ local function task_switchToResult() end end ---- @class Techmino.Game +---@class Techmino.Game local GAME={ playing=false, @@ -170,7 +170,7 @@ local GAME={ GAME.camera.moveSpeed=12 ---- @return Techmino.Mode +---@return Techmino.Mode function GAME.getMode(name) if love.keyboard.isDown('f5') then modeLib[name]=nil diff --git a/assets/game/mechanicLib/common/timer.lua b/assets/game/mechanicLib/common/timer.lua index 11b00ff0..d830e60e 100644 --- a/assets/game/mechanicLib/common/timer.lua +++ b/assets/game/mechanicLib/common/timer.lua @@ -3,7 +3,7 @@ local gc=love.graphics local floatMixList={.3,.7,.9,.7,.6,.5,.42,.36,.3} -- Alpha curve of 'float' timer text, right-to-left ---- @alias mechLib.common.timer.style 'info'|'float' +---@alias mechLib.common.timer.style 'info'|'float' local timer_drawFunc={ info=function(P,time,time0) P:drawInfoPanel(-380,-60,160,120) @@ -27,11 +27,11 @@ local timer_drawFunc={ end, } ---- @type Techmino.Mech.basic +---@type Techmino.Mech.basic local timer={} ---- @param time number milliseconds ---- @param prop {timeUp:function, draw?:mechLib.common.timer.style|function, cancel?:(fun():boolean), alwaysTiming:boolean} +---@param time number milliseconds +---@param prop {timeUp:function, draw?:mechLib.common.timer.style|function, cancel?:(fun():boolean), alwaysTiming:boolean} function timer.new(P,time,prop) if not P.modeData.timerList then P.modeData.timerList={} diff --git a/assets/game/mechanicLib/init.lua b/assets/game/mechanicLib/init.lua index 29bc2f5b..7fe9f320 100644 --- a/assets/game/mechanicLib/init.lua +++ b/assets/game/mechanicLib/init.lua @@ -2,7 +2,7 @@ -- Those files will be loaded in another way, not require local function require(path) return path:gsub('%.','/')..'.lua' end ---- @class Techmino.Mech +---@class Techmino.Mech local mechLib={ common={ timer=require'assets.game.mechanicLib.common.timer', diff --git a/assets/game/mechanicLib/mino/acGenerator.lua b/assets/game/mechanicLib/mino/acGenerator.lua index 0724d4c1..72009fe0 100644 --- a/assets/game/mechanicLib/mino/acGenerator.lua +++ b/assets/game/mechanicLib/mino/acGenerator.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mech.mino +---@type Techmino.Mech.mino local ACGenerator={} local pieceShapes do diff --git a/assets/game/mechanicLib/mino/backfire.lua b/assets/game/mechanicLib/mino/backfire.lua index 5029384a..f49ca696 100644 --- a/assets/game/mechanicLib/mino/backfire.lua +++ b/assets/game/mechanicLib/mino/backfire.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mech.mino +---@type Techmino.Mech.mino local backfire={} function backfire.storePower_event_beforeCancel(P,atk) diff --git a/assets/game/mechanicLib/mino/clearRule.lua b/assets/game/mechanicLib/mino/clearRule.lua index 2305ccf8..fffafca0 100644 --- a/assets/game/mechanicLib/mino/clearRule.lua +++ b/assets/game/mechanicLib/mino/clearRule.lua @@ -1,6 +1,6 @@ local ins,rem=table.insert,table.remove ---- @type table +---@type table local clearRule={} local function setBias(P,x,y,dx,dy,moveType,clearDelay) @@ -17,7 +17,7 @@ local function setBias(P,x,y,dx,dy,moveType,clearDelay) end do -- none (no line clear) - --- @type Techmino.mino.clearRule + ---@type Techmino.mino.clearRule clearRule.none={} function clearRule.none.getDelay() return 0 end clearRule.none.getFill=NULL @@ -25,7 +25,7 @@ do -- none (no line clear) end do -- line (fill row to clear) - --- @type Techmino.mino.clearRule + ---@type Techmino.mino.clearRule clearRule.line={} function clearRule.line.getDelay(P,lines) @@ -76,7 +76,7 @@ do -- line (fill row to clear) end do -- triplets (filled lines which form arithmetic progression to clear, from tetr.js) - --- @type Techmino.mino.clearRule + ---@type Techmino.mino.clearRule clearRule.triplets={} clearRule.triplets.getDelay=clearRule.line.getDelay @@ -119,7 +119,7 @@ do -- triplets (filled lines which form arithmetic progression to clear, from te end do -- cheese (90% fill to clear) - --- @type Techmino.mino.clearRule + ---@type Techmino.mino.clearRule clearRule.cheese={} clearRule.cheese.getDelay=clearRule.line.getDelay @@ -151,7 +151,7 @@ do -- cheese (90% fill to clear) end do -- line_float (fill row to clear, but not move above lines down) - --- @type Techmino.mino.clearRule + ---@type Techmino.mino.clearRule clearRule.line_float={} clearRule.line_float.getDelay=clearRule.line.getDelay diff --git a/assets/game/mechanicLib/mino/comboPractice.lua b/assets/game/mechanicLib/mino/comboPractice.lua index f6077c3a..6cd700a9 100644 --- a/assets/game/mechanicLib/mino/comboPractice.lua +++ b/assets/game/mechanicLib/mino/comboPractice.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mech.mino +---@type Techmino.Mech.mino local comboPractice={} local function newMap(P) diff --git a/assets/game/mechanicLib/mino/dig.lua b/assets/game/mechanicLib/mino/dig.lua index 75061693..bc9aca91 100644 --- a/assets/game/mechanicLib/mino/dig.lua +++ b/assets/game/mechanicLib/mino/dig.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mech.mino +---@type Techmino.Mech.mino local dig={} dig.sprint_event_playerInit=TABLE.newPool(function(self,lineStay) diff --git a/assets/game/mechanicLib/mino/hypersonic.lua b/assets/game/mechanicLib/mino/hypersonic.lua index e7cd7e7c..f00eb5ed 100644 --- a/assets/game/mechanicLib/mino/hypersonic.lua +++ b/assets/game/mechanicLib/mino/hypersonic.lua @@ -1,9 +1,9 @@ local gc=love.graphics ---- @type Techmino.Mech.mino +---@type Techmino.Mech.mino local hypersonic={} ---- @param mode 'low'|'high'|'hidden'|'titanium' +---@param mode 'low'|'high'|'hidden'|'titanium' function hypersonic.event_playerInit_auto(P,mode) hypersonic.event_playerInit(P) if mode=='low' then diff --git a/assets/game/mechanicLib/mino/marathon.lua b/assets/game/mechanicLib/mino/marathon.lua index 96ee15e0..70afbe7d 100644 --- a/assets/game/mechanicLib/mino/marathon.lua +++ b/assets/game/mechanicLib/mino/marathon.lua @@ -1,7 +1,7 @@ local gc=love.graphics local min=math.min ---- @type Techmino.Mech.mino +---@type Techmino.Mech.mino local marathon={} local levels={ diff --git a/assets/game/mechanicLib/mino/misc.lua b/assets/game/mechanicLib/mino/misc.lua index 27851244..5d2d8146 100644 --- a/assets/game/mechanicLib/mino/misc.lua +++ b/assets/game/mechanicLib/mino/misc.lua @@ -1,7 +1,7 @@ local ins,rem=table.insert,table.remove local gc=love.graphics ---- @type Techmino.Mech.mino +---@type Techmino.Mech.mino local misc={} function misc.interior_soundEvent_countDown(num) diff --git a/assets/game/mechanicLib/mino/progress.lua b/assets/game/mechanicLib/mino/progress.lua index 67665358..037f9dc8 100644 --- a/assets/game/mechanicLib/mino/progress.lua +++ b/assets/game/mechanicLib/mino/progress.lua @@ -1,7 +1,7 @@ -- Music Progress: set volume of music tracks -- Game Progress: unlock new game mode ---- @type Techmino.Mech.mino +---@type Techmino.Mech.mino local progress={} do -- sprint_40 diff --git a/assets/game/mechanicLib/mino/sequence.lua b/assets/game/mechanicLib/mino/sequence.lua index 1c6136a1..96209c31 100644 --- a/assets/game/mechanicLib/mino/sequence.lua +++ b/assets/game/mechanicLib/mino/sequence.lua @@ -1,7 +1,7 @@ local min=math.min local ins,rem=table.insert,table.remove ---- @type Techmino.Mech.mino +---@type Techmino.Mech.mino local sequence={} local Tetros={1,2,3,4,5,6,7} @@ -9,10 +9,10 @@ local Pentos={8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25} local easyPentos={10,11,14,19,20,23,24,25} -- P Q T5 J5 L5 N H I5 local hardPentos={8,9,12,13,15,16,17,18,21,22} -- Z5 S5 F E U V W X R Y ---- @param P Techmino.Player.mino ---- @param d table cached data of generator ---- @param init boolean true if this is the first initializating call ---- @diagnostic disable-next-line: unused-local +---@param P Techmino.Player.mino +---@param d table cached data of generator +---@param init boolean true if this is the first initializating call +---@diagnostic disable-next-line: unused-local function sequence.none(P,d,init) end diff --git a/assets/game/mechanicLib/mino/sprint.lua b/assets/game/mechanicLib/mino/sprint.lua index e9c9a765..0308e460 100644 --- a/assets/game/mechanicLib/mino/sprint.lua +++ b/assets/game/mechanicLib/mino/sprint.lua @@ -1,6 +1,6 @@ local gc=love.graphics ---- @type Techmino.Mech.mino +---@type Techmino.Mech.mino local sprint={} sprint.event_afterClear=TABLE.newPool(function(self,lineCount) diff --git a/assets/game/mechanicLib/mino/squeeze.lua b/assets/game/mechanicLib/mino/squeeze.lua index e0d666e8..5a4e6e04 100644 --- a/assets/game/mechanicLib/mino/squeeze.lua +++ b/assets/game/mechanicLib/mino/squeeze.lua @@ -1,12 +1,12 @@ local floor,clamp=math.floor,MATH.clamp ---- @type Techmino.Mech.mino +---@type Techmino.Mech.mino local squeeze={} ---- @param width? number ---- @param wait? number ---- @param depth? number ---- @param speed? number +---@param width? number +---@param wait? number +---@param depth? number +---@param speed? number function squeeze.turnOn_auto(P,width,wait,depth,speed) if not P.modeData.squeeze_enabled then squeeze.switch_auto(P,width,wait,depth,speed) @@ -18,10 +18,10 @@ function squeeze.turnOff_auto(P) end end ---- @param width? number ---- @param wait? number ---- @param depth? number ---- @param speed? number +---@param width? number +---@param wait? number +---@param depth? number +---@param speed? number function squeeze.switch_auto(P,width,wait,depth,speed) squeeze.switch(P,width,wait,depth,speed) local setEvent=P.modeData.squeeze_enabled and P.addEvent or P.delEvent @@ -31,10 +31,10 @@ function squeeze.switch_auto(P,width,wait,depth,speed) setEvent(P,'drawInField',squeeze.event_drawInField) end ---- @param width? number ---- @param wait? number ---- @param depth? number ---- @param speed? number +---@param width? number +---@param wait? number +---@param depth? number +---@param speed? number function squeeze.switch(P,width,wait,depth,speed) local md=P.modeData if not md.squeeze_enabled then diff --git a/assets/game/mechanicLib/mino/stack.lua b/assets/game/mechanicLib/mino/stack.lua index 5b3e1a73..069b6dc9 100644 --- a/assets/game/mechanicLib/mino/stack.lua +++ b/assets/game/mechanicLib/mino/stack.lua @@ -22,11 +22,11 @@ local function outStackState(P) return not P.modeData.stack_enabled end ---- @type Techmino.Mech.mino +---@type Techmino.Mech.mino local stack={} ---- @param fall? boolean ---- @param timeLimit? number Automatically quit when time up (if given) +---@param fall? boolean +---@param timeLimit? number Automatically quit when time up (if given) function stack.turnOn_auto(P,fall,timeLimit) if not P.modeData.stack_enabled then stack.switch_auto(P,fall,timeLimit) @@ -40,8 +40,8 @@ function stack.turnOff_auto(P) end ---- @param fall? boolean ---- @param timeLimit? number Automatically quit when time up (if given) +---@param fall? boolean +---@param timeLimit? number Automatically quit when time up (if given) function stack.switch_auto(P,fall,timeLimit) if fall==nil then fall=true end stack.switch(P) diff --git a/assets/game/mechanicLib/mino/statistics.lua b/assets/game/mechanicLib/mino/statistics.lua index 6dc93f28..76686e1f 100644 --- a/assets/game/mechanicLib/mino/statistics.lua +++ b/assets/game/mechanicLib/mino/statistics.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mech.mino +---@type Techmino.Mech.mino local stat={} function stat.event_playerInit(P) -- Initially used in minoPlayer.lua diff --git a/assets/game/mechanicLib/mino/survivor.lua b/assets/game/mechanicLib/mino/survivor.lua index a43cc1c8..14f8c25d 100644 --- a/assets/game/mechanicLib/mino/survivor.lua +++ b/assets/game/mechanicLib/mino/survivor.lua @@ -2,7 +2,7 @@ local floor,ceil=math.floor,math.ceil local max,min=math.max,math.min local gc=love.graphics ---- @type Techmino.Mech.mino +---@type Techmino.Mech.mino local survivor={} function survivor.event_playerInit(P) diff --git a/assets/game/mechanicLib/mino/techrashChallenge.lua b/assets/game/mechanicLib/mino/techrashChallenge.lua index 0dfe9516..2fa42cce 100644 --- a/assets/game/mechanicLib/mino/techrashChallenge.lua +++ b/assets/game/mechanicLib/mino/techrashChallenge.lua @@ -1,6 +1,6 @@ local gc=love.graphics ---- @type Techmino.Mech.mino +---@type Techmino.Mech.mino local techrash={} function techrash.easy_seqType(P) diff --git a/assets/game/mechanicLib/mino/tsdChallenge.lua b/assets/game/mechanicLib/mino/tsdChallenge.lua index 90516d1f..47586eac 100644 --- a/assets/game/mechanicLib/mino/tsdChallenge.lua +++ b/assets/game/mechanicLib/mino/tsdChallenge.lua @@ -1,6 +1,6 @@ local gc=love.graphics ---- @type Techmino.Mech.mino +---@type Techmino.Mech.mino local tsd={} function tsd.easy_event_playerInit(P) diff --git a/assets/game/mechanicLib/puyo/sequence.lua b/assets/game/mechanicLib/puyo/sequence.lua index 7930d394..41a29c4b 100644 --- a/assets/game/mechanicLib/puyo/sequence.lua +++ b/assets/game/mechanicLib/puyo/sequence.lua @@ -1,6 +1,6 @@ local ins,rem=table.insert,table.remove ---- @type Techmino.Mech.puyo +---@type Techmino.Mech.puyo local sequence={} function sequence.none() diff --git a/assets/game/minoPlayer.lua b/assets/game/minoPlayer.lua index 7464dae8..6a926446 100644 --- a/assets/game/minoPlayer.lua +++ b/assets/game/minoPlayer.lua @@ -11,8 +11,8 @@ local ins,rem=table.insert,table.remove local clamp,expApproach=MATH.clamp,MATH.expApproach local inst=SFX.playSample ---- @class Techmino.Player.mino: Techmino.Player ---- @field field Techmino.RectField +---@class Techmino.Player.mino: Techmino.Player +---@field field Techmino.RectField local MP=setmetatable({},{__index=require'assets.game.basePlayer',__metatable=true}) -------------------------------------------------------------- @@ -650,7 +650,7 @@ end function MP:clearNext() TABLE.cut(self.nextQueue) end ---- @param piece string|number|table +---@param piece string|number|table function MP:pushNext(piece) if type(piece)=='number' then ins(self.nextQueue,self:getMino(Mino.get(piece))) @@ -710,7 +710,7 @@ function MP:popNext(ifHold) self:minoDropped() end end ---- @return Techmino.Cell +---@return Techmino.Cell function MP:newCell(color,id) self.totalCellCount=self.totalCellCount+1 local c={ @@ -1313,7 +1313,7 @@ end {4,6,6,3,0,0,2,2,5,5}, {4,4,3,3,0,0,0,2,2,5}, }]] ---- @param arg {color:'template'|'absolute'|nil, resetHand?:boolean, sudden?:boolean, number:table} +---@param arg {color:'template'|'absolute'|nil, resetHand?:boolean, sudden?:boolean, number:table} function MP:setField(arg) local F=self.field local w=self.settings.fieldW @@ -1864,7 +1864,7 @@ function MP:checkScriptSyntax(cmd,arg,errMsg) end -------------------------------------------------------------- -- Builder ---- @class Techmino.Mode.Setting.Mino +---@class Techmino.Mode.Setting.Mino local baseEnv={ -- Size fieldW=10, -- [WARNING] This is not the real field width, just for generate field object. Change real field size with 'self:changeFieldWidth' diff --git a/assets/game/minoes.lua b/assets/game/minoes.lua index 4af46b99..67d53b99 100644 --- a/assets/game/minoes.lua +++ b/assets/game/minoes.lua @@ -1,7 +1,7 @@ local Mino={} ---- @type table +---@type table local minoes={} function Mino.registerMino(name,id,shape) @@ -55,24 +55,24 @@ do reg('O1', 29, {{O}}) end ---- @param id Techmino.Mino.ID|Techmino.Mino.Name ---- @return Techmino.Mino +---@param id Techmino.Mino.ID|Techmino.Mino.Name +---@return Techmino.Mino function Mino.get(id) return assert(minoes[id],("Mino '$1' not found"):repD(id)) end ---- @param id number|string +---@param id number|string function Mino.getName(id) return Mino.get(id).name end ---- @param id number|string +---@param id number|string function Mino.getID(id) return Mino.get(id).id end ---- @param id number|string +---@param id number|string function Mino.getShape(id) return Mino.get(id).shape end ---- @param shape Techmino.Mino.Shape ---- @return number +---@param shape Techmino.Mino.Shape +---@return number function Mino._size(shape) return #shape+#shape[1] end ---- @param shape Techmino.Mino.Shape ---- @return number,string +---@param shape Techmino.Mino.Shape +---@return number,string function Mino._binarize(shape) local pNum,pStr=0,"" @@ -116,8 +116,8 @@ local function pieceComp(a,b) end end ---- @param piece Techmino.Mino.Shape ---- @return number,string +---@param piece Techmino.Mino.Shape +---@return number,string function Mino.shapeToID(piece) local minNum,minStr=Mino._binarize(piece) for _=1,3 do @@ -128,9 +128,9 @@ function Mino.shapeToID(piece) return minNum,minStr end ---- @param a Techmino.Mino.Shape ---- @param b Techmino.Mino.Shape ---- @return boolean +---@param a Techmino.Mino.Shape +---@param b Techmino.Mino.Shape +---@return boolean function Mino.samePiece(a,b) return Mino.shapeToID(a)==Mino.shapeToID(b) end diff --git a/assets/game/minomap.lua b/assets/game/minomap.lua index 054e3ca0..37409022 100644 --- a/assets/game/minomap.lua +++ b/assets/game/minomap.lua @@ -169,13 +169,13 @@ cam.swing=.00626 cam.maxDist=2600--[[4000]] cam.minK,cam.maxK=.4--[[.2]],1.26 ---- @type table|false +---@type table|false local focused=false ---- @type table|false +---@type table|false local selected=false ---- @type boolean +---@type boolean local full=false local map={} diff --git a/assets/game/mode/mino/exterior/ac_challenge.lua b/assets/game/mode/mino/exterior/ac_challenge.lua index 3918fa63..b4f41c57 100644 --- a/assets/game/mode/mino/exterior/ac_challenge.lua +++ b/assets/game/mode/mino/exterior/ac_challenge.lua @@ -1,3 +1,3 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { } diff --git a/assets/game/mode/mino/exterior/ac_easy.lua b/assets/game/mode/mino/exterior/ac_easy.lua index 1f8ee23d..5248ea1b 100644 --- a/assets/game/mode/mino/exterior/ac_easy.lua +++ b/assets/game/mode/mino/exterior/ac_easy.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/ac_hard.lua b/assets/game/mode/mino/exterior/ac_hard.lua index 3918fa63..b4f41c57 100644 --- a/assets/game/mode/mino/exterior/ac_hard.lua +++ b/assets/game/mode/mino/exterior/ac_hard.lua @@ -1,3 +1,3 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { } diff --git a/assets/game/mode/mino/exterior/backfire_100.lua b/assets/game/mode/mino/exterior/backfire_100.lua index 89530a54..7aa366da 100644 --- a/assets/game/mode/mino/exterior/backfire_100.lua +++ b/assets/game/mode/mino/exterior/backfire_100.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/backfire_amplify_100.lua b/assets/game/mode/mino/exterior/backfire_amplify_100.lua index c846875a..de29dae6 100644 --- a/assets/game/mode/mino/exterior/backfire_amplify_100.lua +++ b/assets/game/mode/mino/exterior/backfire_amplify_100.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/backfire_cheese_100.lua b/assets/game/mode/mino/exterior/backfire_cheese_100.lua index 847fa3e5..e0f28709 100644 --- a/assets/game/mode/mino/exterior/backfire_cheese_100.lua +++ b/assets/game/mode/mino/exterior/backfire_cheese_100.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/combo_practice.lua b/assets/game/mode/mino/exterior/combo_practice.lua index 1ad9df73..b4d80a10 100644 --- a/assets/game/mode/mino/exterior/combo_practice.lua +++ b/assets/game/mode/mino/exterior/combo_practice.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/dig_100.lua b/assets/game/mode/mino/exterior/dig_100.lua index eb8092a2..ff8f45c6 100644 --- a/assets/game/mode/mino/exterior/dig_100.lua +++ b/assets/game/mode/mino/exterior/dig_100.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/dig_40.lua b/assets/game/mode/mino/exterior/dig_40.lua index 90d6d94c..7744269b 100644 --- a/assets/game/mode/mino/exterior/dig_40.lua +++ b/assets/game/mode/mino/exterior/dig_40.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/dig_400.lua b/assets/game/mode/mino/exterior/dig_400.lua index aca04c9f..af4dc53b 100644 --- a/assets/game/mode/mino/exterior/dig_400.lua +++ b/assets/game/mode/mino/exterior/dig_400.lua @@ -1,5 +1,5 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/dig_checker.lua b/assets/game/mode/mino/exterior/dig_checker.lua index ff7bf582..f872cfd4 100644 --- a/assets/game/mode/mino/exterior/dig_checker.lua +++ b/assets/game/mode/mino/exterior/dig_checker.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/dig_practice.lua b/assets/game/mode/mino/exterior/dig_practice.lua index d918be94..0098e654 100644 --- a/assets/game/mode/mino/exterior/dig_practice.lua +++ b/assets/game/mode/mino/exterior/dig_practice.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/dig_shale.lua b/assets/game/mode/mino/exterior/dig_shale.lua index cd2722c4..c96e3350 100644 --- a/assets/game/mode/mino/exterior/dig_shale.lua +++ b/assets/game/mode/mino/exterior/dig_shale.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/dig_volcanics.lua b/assets/game/mode/mino/exterior/dig_volcanics.lua index 626c0726..fe5d13b6 100644 --- a/assets/game/mode/mino/exterior/dig_volcanics.lua +++ b/assets/game/mode/mino/exterior/dig_volcanics.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/hypersonic_hd.lua b/assets/game/mode/mino/exterior/hypersonic_hd.lua index 9e1a1b14..15c81da1 100644 --- a/assets/game/mode/mino/exterior/hypersonic_hd.lua +++ b/assets/game/mode/mino/exterior/hypersonic_hd.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/hypersonic_hi.lua b/assets/game/mode/mino/exterior/hypersonic_hi.lua index 82d472df..218e7372 100644 --- a/assets/game/mode/mino/exterior/hypersonic_hi.lua +++ b/assets/game/mode/mino/exterior/hypersonic_hi.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/hypersonic_lo.lua b/assets/game/mode/mino/exterior/hypersonic_lo.lua index bbea5dbb..365ffd0a 100644 --- a/assets/game/mode/mino/exterior/hypersonic_lo.lua +++ b/assets/game/mode/mino/exterior/hypersonic_lo.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/hypersonic_ti.lua b/assets/game/mode/mino/exterior/hypersonic_ti.lua index 873a8f3f..3c551b71 100644 --- a/assets/game/mode/mino/exterior/hypersonic_ti.lua +++ b/assets/game/mode/mino/exterior/hypersonic_ti.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/marathon.lua b/assets/game/mode/mino/exterior/marathon.lua index b4738019..a52f42ca 100644 --- a/assets/game/mode/mino/exterior/marathon.lua +++ b/assets/game/mode/mino/exterior/marathon.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/sprint_10.lua b/assets/game/mode/mino/exterior/sprint_10.lua index 48d11d45..8b412da1 100644 --- a/assets/game/mode/mino/exterior/sprint_10.lua +++ b/assets/game/mode/mino/exterior/sprint_10.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/sprint_1000.lua b/assets/game/mode/mino/exterior/sprint_1000.lua index 8658c329..3560da59 100644 --- a/assets/game/mode/mino/exterior/sprint_1000.lua +++ b/assets/game/mode/mino/exterior/sprint_1000.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/sprint_200.lua b/assets/game/mode/mino/exterior/sprint_200.lua index 8b737988..49e22742 100644 --- a/assets/game/mode/mino/exterior/sprint_200.lua +++ b/assets/game/mode/mino/exterior/sprint_200.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/sprint_40.lua b/assets/game/mode/mino/exterior/sprint_40.lua index e8a5e898..fe077a3d 100644 --- a/assets/game/mode/mino/exterior/sprint_40.lua +++ b/assets/game/mode/mino/exterior/sprint_40.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/sprint_big_80.lua b/assets/game/mode/mino/exterior/sprint_big_80.lua index ba370a3c..def08cba 100644 --- a/assets/game/mode/mino/exterior/sprint_big_80.lua +++ b/assets/game/mode/mino/exterior/sprint_big_80.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/sprint_blind_40.lua b/assets/game/mode/mino/exterior/sprint_blind_40.lua index 00bf1d31..de93d544 100644 --- a/assets/game/mode/mino/exterior/sprint_blind_40.lua +++ b/assets/game/mode/mino/exterior/sprint_blind_40.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/sprint_delay_20.lua b/assets/game/mode/mino/exterior/sprint_delay_20.lua index 7339a230..513738d5 100644 --- a/assets/game/mode/mino/exterior/sprint_delay_20.lua +++ b/assets/game/mode/mino/exterior/sprint_delay_20.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/sprint_dizzy_40.lua b/assets/game/mode/mino/exterior/sprint_dizzy_40.lua index 87cf020f..473dc1a2 100644 --- a/assets/game/mode/mino/exterior/sprint_dizzy_40.lua +++ b/assets/game/mode/mino/exterior/sprint_dizzy_40.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/sprint_drought_40.lua b/assets/game/mode/mino/exterior/sprint_drought_40.lua index c94c1298..8876f232 100644 --- a/assets/game/mode/mino/exterior/sprint_drought_40.lua +++ b/assets/game/mode/mino/exterior/sprint_drought_40.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/sprint_fix_20.lua b/assets/game/mode/mino/exterior/sprint_fix_20.lua index 3c515f0e..d4df624f 100644 --- a/assets/game/mode/mino/exterior/sprint_fix_20.lua +++ b/assets/game/mode/mino/exterior/sprint_fix_20.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/sprint_flip_40.lua b/assets/game/mode/mino/exterior/sprint_flip_40.lua index e36ca132..0709df03 100644 --- a/assets/game/mode/mino/exterior/sprint_flip_40.lua +++ b/assets/game/mode/mino/exterior/sprint_flip_40.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/sprint_float_40.lua b/assets/game/mode/mino/exterior/sprint_float_40.lua index ea786a9b..a59184d1 100644 --- a/assets/game/mode/mino/exterior/sprint_float_40.lua +++ b/assets/game/mode/mino/exterior/sprint_float_40.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/sprint_flood_40.lua b/assets/game/mode/mino/exterior/sprint_flood_40.lua index e246a8f3..4adebaea 100644 --- a/assets/game/mode/mino/exterior/sprint_flood_40.lua +++ b/assets/game/mode/mino/exterior/sprint_flood_40.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/sprint_hide_40.lua b/assets/game/mode/mino/exterior/sprint_hide_40.lua index 2f2e21de..cdb74a93 100644 --- a/assets/game/mode/mino/exterior/sprint_hide_40.lua +++ b/assets/game/mode/mino/exterior/sprint_hide_40.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/sprint_invis_40.lua b/assets/game/mode/mino/exterior/sprint_invis_40.lua index 6575823d..e576b263 100644 --- a/assets/game/mode/mino/exterior/sprint_invis_40.lua +++ b/assets/game/mode/mino/exterior/sprint_invis_40.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/sprint_lock_20.lua b/assets/game/mode/mino/exterior/sprint_lock_20.lua index 2e5fce42..6bd5c06a 100644 --- a/assets/game/mode/mino/exterior/sprint_lock_20.lua +++ b/assets/game/mode/mino/exterior/sprint_lock_20.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/sprint_low_40.lua b/assets/game/mode/mino/exterior/sprint_low_40.lua index 228e6d25..4d48b195 100644 --- a/assets/game/mode/mino/exterior/sprint_low_40.lua +++ b/assets/game/mode/mino/exterior/sprint_low_40.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/sprint_mph_40.lua b/assets/game/mode/mino/exterior/sprint_mph_40.lua index c64d2968..0cedae6c 100644 --- a/assets/game/mode/mino/exterior/sprint_mph_40.lua +++ b/assets/game/mode/mino/exterior/sprint_mph_40.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/sprint_obstacle_20.lua b/assets/game/mode/mino/exterior/sprint_obstacle_20.lua index 059ced8e..2179bfb3 100644 --- a/assets/game/mode/mino/exterior/sprint_obstacle_20.lua +++ b/assets/game/mode/mino/exterior/sprint_obstacle_20.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/sprint_pento_40.lua b/assets/game/mode/mino/exterior/sprint_pento_40.lua index 139f54d5..950398ce 100644 --- a/assets/game/mode/mino/exterior/sprint_pento_40.lua +++ b/assets/game/mode/mino/exterior/sprint_pento_40.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/sprint_randctrl_40.lua b/assets/game/mode/mino/exterior/sprint_randctrl_40.lua index 17fcfb7c..b0f37367 100644 --- a/assets/game/mode/mino/exterior/sprint_randctrl_40.lua +++ b/assets/game/mode/mino/exterior/sprint_randctrl_40.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/sprint_small_20.lua b/assets/game/mode/mino/exterior/sprint_small_20.lua index 07841be8..eee56269 100644 --- a/assets/game/mode/mino/exterior/sprint_small_20.lua +++ b/assets/game/mode/mino/exterior/sprint_small_20.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/sprint_sym_40.lua b/assets/game/mode/mino/exterior/sprint_sym_40.lua index 62b9b811..ffa274a8 100644 --- a/assets/game/mode/mino/exterior/sprint_sym_40.lua +++ b/assets/game/mode/mino/exterior/sprint_sym_40.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/sprint_wind_40.lua b/assets/game/mode/mino/exterior/sprint_wind_40.lua index 72ae1417..1d9bd433 100644 --- a/assets/game/mode/mino/exterior/sprint_wind_40.lua +++ b/assets/game/mode/mino/exterior/sprint_wind_40.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/survivor_b2b.lua b/assets/game/mode/mino/exterior/survivor_b2b.lua index 4262c01d..5c4d034f 100644 --- a/assets/game/mode/mino/exterior/survivor_b2b.lua +++ b/assets/game/mode/mino/exterior/survivor_b2b.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/survivor_cheese.lua b/assets/game/mode/mino/exterior/survivor_cheese.lua index b5e08628..efd02376 100644 --- a/assets/game/mode/mino/exterior/survivor_cheese.lua +++ b/assets/game/mode/mino/exterior/survivor_cheese.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/survivor_spike.lua b/assets/game/mode/mino/exterior/survivor_spike.lua index a00953c3..607e7666 100644 --- a/assets/game/mode/mino/exterior/survivor_spike.lua +++ b/assets/game/mode/mino/exterior/survivor_spike.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/techrash_easy.lua b/assets/game/mode/mino/exterior/techrash_easy.lua index 23f41e53..27438794 100644 --- a/assets/game/mode/mino/exterior/techrash_easy.lua +++ b/assets/game/mode/mino/exterior/techrash_easy.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/techrash_hard.lua b/assets/game/mode/mino/exterior/techrash_hard.lua index 67411fcb..da1af866 100644 --- a/assets/game/mode/mino/exterior/techrash_hard.lua +++ b/assets/game/mode/mino/exterior/techrash_hard.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/test.lua b/assets/game/mode/mino/exterior/test.lua index fc7a5168..491d827c 100644 --- a/assets/game/mode/mino/exterior/test.lua +++ b/assets/game/mode/mino/exterior/test.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/tsd_easy.lua b/assets/game/mode/mino/exterior/tsd_easy.lua index bf0ffc01..bfb4adb2 100644 --- a/assets/game/mode/mino/exterior/tsd_easy.lua +++ b/assets/game/mode/mino/exterior/tsd_easy.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/tsd_hard.lua b/assets/game/mode/mino/exterior/tsd_hard.lua index 11ad3b94..37e9a537 100644 --- a/assets/game/mode/mino/exterior/tsd_hard.lua +++ b/assets/game/mode/mino/exterior/tsd_hard.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/exterior/tsd_practice.lua b/assets/game/mode/mino/exterior/tsd_practice.lua index 3918fa63..b4f41c57 100644 --- a/assets/game/mode/mino/exterior/tsd_practice.lua +++ b/assets/game/mode/mino/exterior/tsd_practice.lua @@ -1,3 +1,3 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { } diff --git a/assets/game/mode/mino/exterior/ultra.lua b/assets/game/mode/mino/exterior/ultra.lua index 928e0ae6..d219aa36 100644 --- a/assets/game/mode/mino/exterior/ultra.lua +++ b/assets/game/mode/mino/exterior/ultra.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/interior/dig.lua b/assets/game/mode/mino/interior/dig.lua index 475b5262..fc50f215 100644 --- a/assets/game/mode/mino/interior/dig.lua +++ b/assets/game/mode/mino/interior/dig.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/interior/marathon.lua b/assets/game/mode/mino/interior/marathon.lua index 78d9a5e7..83af173e 100644 --- a/assets/game/mode/mino/interior/marathon.lua +++ b/assets/game/mode/mino/interior/marathon.lua @@ -1,7 +1,7 @@ local gc=love.graphics local dropSpeed={1000,833,666,500,400,300,200,150,100,70,50,30,22,16,12,8,7,6,5,4} ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/interior/sprint.lua b/assets/game/mode/mino/interior/sprint.lua index 08512306..fd7cc121 100644 --- a/assets/game/mode/mino/interior/sprint.lua +++ b/assets/game/mode/mino/interior/sprint.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/interior/test.lua b/assets/game/mode/mino/interior/test.lua index fc2c3d3c..63fe3915 100644 --- a/assets/game/mode/mino/interior/test.lua +++ b/assets/game/mode/mino/interior/test.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/interior/train.lua b/assets/game/mode/mino/interior/train.lua index d3d561ce..dce26a89 100644 --- a/assets/game/mode/mino/interior/train.lua +++ b/assets/game/mode/mino/interior/train.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/interior/tutorial/1.basic.lua b/assets/game/mode/mino/interior/tutorial/1.basic.lua index 684c9f1c..822154f9 100644 --- a/assets/game/mode/mino/interior/tutorial/1.basic.lua +++ b/assets/game/mode/mino/interior/tutorial/1.basic.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/interior/tutorial/2.sequence.lua b/assets/game/mode/mino/interior/tutorial/2.sequence.lua index 53453ad5..d448bd0f 100644 --- a/assets/game/mode/mino/interior/tutorial/2.sequence.lua +++ b/assets/game/mode/mino/interior/tutorial/2.sequence.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/interior/tutorial/4.stackBasic.lua b/assets/game/mode/mino/interior/tutorial/4.stackBasic.lua index 70c0f688..bd7f4ab6 100644 --- a/assets/game/mode/mino/interior/tutorial/4.stackBasic.lua +++ b/assets/game/mode/mino/interior/tutorial/4.stackBasic.lua @@ -22,7 +22,7 @@ local correctPositions={ } } ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/mino/interior/tutorial/5.twoRotatingKey.lua b/assets/game/mode/mino/interior/tutorial/5.twoRotatingKey.lua index c6002be3..c0312166 100644 --- a/assets/game/mode/mino/interior/tutorial/5.twoRotatingKey.lua +++ b/assets/game/mode/mino/interior/tutorial/5.twoRotatingKey.lua @@ -53,7 +53,7 @@ local correctPositions={ {x=10, y=1, dir={1,3}}, } ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/mode/puyo/test.lua b/assets/game/mode/puyo/test.lua index 1c6856fe..53157f54 100644 --- a/assets/game/mode/puyo/test.lua +++ b/assets/game/mode/puyo/test.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'puyo') diff --git a/assets/game/mode/test/battle.lua b/assets/game/mode/test/battle.lua index 023aaaf2..d539f40c 100644 --- a/assets/game/mode/test/battle.lua +++ b/assets/game/mode/test/battle.lua @@ -1,4 +1,4 @@ ---- @type Techmino.Mode +---@type Techmino.Mode return { initialize=function() GAME.newPlayer(1,'mino') diff --git a/assets/game/particleSystemTemplate.lua b/assets/game/particleSystemTemplate.lua index 8752c00c..3d6fe319 100644 --- a/assets/game/particleSystemTemplate.lua +++ b/assets/game/particleSystemTemplate.lua @@ -1,4 +1,4 @@ ---- @type Techmino.ParticleSystems +---@type Techmino.ParticleSystems local ps={} do -- Moving diff --git a/assets/game/puyoPlayer.lua b/assets/game/puyoPlayer.lua index 65af5892..a7c210e8 100644 --- a/assets/game/puyoPlayer.lua +++ b/assets/game/puyoPlayer.lua @@ -12,8 +12,8 @@ local ins,rem=table.insert,table.remove local inst=SFX.playSample ---- @class Techmino.Player.puyo: Techmino.Player ---- @field field Techmino.RectField +---@class Techmino.Player.puyo: Techmino.Player +---@field field Techmino.RectField local PP=setmetatable({},{__index=require'assets.game.basePlayer',__metatable=true}) -------------------------------------------------------------- @@ -1202,7 +1202,7 @@ function PP:checkScriptSyntax(cmd,arg,errMsg) end -------------------------------------------------------------- -- Builder ---- @class Techmino.Mode.Setting.Puyo +---@class Techmino.Mode.Setting.Puyo local baseEnv={ -- Size fieldW=6, -- [WARNING] This is not the real field width, just for generate field object. Change real field size with 'self:changeFieldWidth' diff --git a/assets/game/rectField.lua b/assets/game/rectField.lua index def4fe0e..780a7871 100644 --- a/assets/game/rectField.lua +++ b/assets/game/rectField.lua @@ -1,6 +1,6 @@ local gc=love.graphics ---- @class Techmino.RectField +---@class Techmino.RectField local F={} -------------------------------------------------------------- @@ -90,13 +90,13 @@ function F:drawThumbnail_color(step,size) end end ---- @return number +---@return number function F:getHeight() return #self._matrix end local wallCell=setmetatable({},{__newIndex=NULL,__metatable=true}) ---- @return Techmino.Cell|false +---@return Techmino.Cell|false function F:getCell(x,y) if x<=0 or x>self._width or y<=0 then return wallCell end if y>#self._matrix then return false end diff --git a/assets/game/rotsys_mino/trs.lua b/assets/game/rotsys_mino/trs.lua index b16d8102..74589237 100644 --- a/assets/game/rotsys_mino/trs.lua +++ b/assets/game/rotsys_mino/trs.lua @@ -116,7 +116,7 @@ TRS[6]={ [1]={center={1,1}}, [2]={center={1,1}}, [3]={center={1,1}}, - --- @param self Techmino.Player.mino + ---@param self Techmino.Player.mino rotate=function(self,dir,ifInit) local C=self.hand local baseX,baseY=self.handX,self.handY diff --git a/assets/gamefunc.lua b/assets/gamefunc.lua index d2968453..7563003f 100644 --- a/assets/gamefunc.lua +++ b/assets/gamefunc.lua @@ -7,8 +7,8 @@ function sureCheck(event) end local _bgmPlaying,_bgmMode ---- @param mode 'full'|'simp'|'base'|''|nil ---- @param args? string +---@param mode 'full'|'simp'|'base'|''|nil +---@param args? string function playBgm(name,mode,args) if not args then args='' end @@ -57,9 +57,9 @@ local trackNick={ p='drum', s='sfx', } ---- @param name string ---- @param ... string m/a/d/b/p/s(N) ---- @return string[] +---@param name string +---@param ... string m/a/d/b/p/s(N) +---@return string[] function bgmPack(name,...) local tracks={...} for i=1,#tracks do @@ -229,9 +229,9 @@ end regFuncToStr={} regStrToFunc={} ---- Flatten a table of functions into string-to-function and function-to-string maps ---- @param obj table|function ---- @param path string +---Flatten a table of functions into string-to-function and function-to-string maps +---@param obj table|function +---@param path string function regFuncLib(obj,path) if type(obj)=='table' then for k,v in next,obj do diff --git a/assets/scene/simulation.lua b/assets/scene/simulation.lua index 06ac7085..4954466a 100644 --- a/assets/scene/simulation.lua +++ b/assets/scene/simulation.lua @@ -1,16 +1,16 @@ -- Game mode selecting for exterior menu ---- @class Techmino.simulation ---- @field trigger function ---- @field draw function ---- @field valid boolean ---- @field active number ---- @field x number ---- @field y number ---- @field size number ---- @field trigTimer number|false +---@class Techmino.simulation +---@field trigger function +---@field draw function +---@field valid boolean +---@field active number +---@field x number +---@field y number +---@field size number +---@field trigTimer number|false ---- @type Techmino.simulation[] +---@type Techmino.simulation[] local sims={ { -- Mino trigger=function() @@ -70,7 +70,7 @@ local sims={ }, } ---- @type integer|false +---@type integer|false local subjectFocused=false local scene={}