diff --git a/sonic-radiance.love/scenes/battlesystem/controller/battlearena.lua b/sonic-radiance.love/scenes/battlesystem/controller/battlearena.lua index 2539f76..ab8bc94 100644 --- a/sonic-radiance.love/scenes/battlesystem/controller/battlearena.lua +++ b/sonic-radiance.love/scenes/battlesystem/controller/battlearena.lua @@ -88,12 +88,12 @@ end function BattleArena:getObjectInCase(x, y) for i,v in ipairs(self.entities) do if (v.x == x) and (v.y == y) then - print("one entity found in case " .. x .. ";" .. y) + core.debug:print("cbs/battlearena", "one entity found in case <" .. x .. ";" .. y .. ">") return v end end - print("no entity found in case " .. x .. ";" .. y) + --core.debug:print("cbs/battlearena", "no entity found in case " .. x .. ";" .. y) return nil end diff --git a/sonic-radiance.love/scenes/battlesystem/entities/actor.lua b/sonic-radiance.love/scenes/battlesystem/entities/actor.lua index afbaf1e..e3a7073 100644 --- a/sonic-radiance.love/scenes/battlesystem/entities/actor.lua +++ b/sonic-radiance.love/scenes/battlesystem/entities/actor.lua @@ -11,17 +11,15 @@ function Actor:new(controller, x, y, z) end function Actor:setActive() - print("actor " .. self.id .. " is active") + core.debug:print("cbs/actor","actor " .. self.id .. " is active") self.isActive = true self.debugActiveTimer = 0 - print(self.debugActiveTimer) end function Actor:update(dt) if (self.isActive) then self.debugActiveTimer = self.debugActiveTimer + dt - print(math.floor(self.debugActiveTimer * 60)) - if self.debugActiveTimer >= 1 then + if self.debugActiveTimer >= 0.5 then self.controller.actormanager:switchActiveActor() --self.controller.actormanager.turns.changeActor = false self.isActive = false diff --git a/sonic-radiance.love/scenes/battlesystem/entities/character.lua b/sonic-radiance.love/scenes/battlesystem/entities/character.lua index 0b58790..3da70ab 100644 --- a/sonic-radiance.love/scenes/battlesystem/entities/character.lua +++ b/sonic-radiance.love/scenes/battlesystem/entities/character.lua @@ -11,7 +11,7 @@ function Character:new(controller, x, y, charid) self.directionPrevious = 1 if charid == nil then - err("FATAL ERROR: charid not set") + core.debug:error("FATAL ERROR: charid not set") end self.charid = charid self.actionPerTurn = game.characters.list[self.charid].turns