sixam/creatura
1
0
Fork 0
mirror of https://github.com/ElCeejo/creatura.git synced 2025-04-30 13:51:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update Step Delay method

Browse source
This commit is contained in:
ElCeejo 2022-08-06 21:47:14 -07:00
parent 6457f301b8
commit 27f4ffe167
1 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
mob_meta.lua
View file

@ -666,6 +666,10 @@ function mob:set_utility_score(n)
self._utility_data.score = n or 0 self._utility_data.score = n or 0
end end
function mob:get_utility_score(n)
return (self._utility_data and self._utility_data.score) or 0
end
function mob:try_initiate_utility(utility, score, ...) function mob:try_initiate_utility(utility, score, ...)
if self._utility_data if self._utility_data
and score >= self._utility_data.score then and score >= self._utility_data.score then
@ -802,6 +806,10 @@ function mob:on_step(dtime, moveresult)
self.touching_ground = moveresult.touching_ground self.touching_ground = moveresult.touching_ground
end end
if step_tick <= 0 then if step_tick <= 0 then
-- Physics
if self._physics then
self:_physics(moveresult)
end
-- Vitals -- Vitals
if self._vitals then if self._vitals then
self:_vitals() self:_vitals()
@ -811,13 +819,6 @@ function mob:on_step(dtime, moveresult)
self.width = self:get_hitbox()[4] or 0.5 self.width = self:get_hitbox()[4] or 0.5
self.height = self:get_height() or 1 self.height = self:get_height() or 1
end end
local step_delay = self.step_delay and (self._step_delay or 0)
if (step_delay or step_tick) <= 0 then
-- Physics
if self._physics then
self:_physics(moveresult)
end
end
self:do_velocity() self:do_velocity()
self:do_turn() self:do_turn()
if self.utility_stack if self.utility_stack
@ -1060,12 +1061,14 @@ function mob:_execute_utilities()
self._utility_data = { self._utility_data = {
utility = nil, utility = nil,
func = nil, func = nil,
step_delay = nil,
score = 0 score = 0
} }
end end
local loop_data = { local loop_data = {
utility = nil, utility = nil,
func = nil, func = nil,
step_delay = nil,
score = 0 score = 0
} }
if (self:timer(self.util_timer or 1) if (self:timer(self.util_timer or 1)
@ -1074,6 +1077,7 @@ function mob:_execute_utilities()
for i = 1, #self.utility_stack do for i = 1, #self.utility_stack do
local utility = self.utility_stack[i].utility local utility = self.utility_stack[i].utility
local get_score = self.utility_stack[i].get_score local get_score = self.utility_stack[i].get_score
local step_delay = self.utility_stack[i].step_delay
local score, args = get_score(self) local score, args = get_score(self)
if self._utility_data.utility if self._utility_data.utility
and utility == self._utility_data.utility and utility == self._utility_data.utility
@ -1082,6 +1086,7 @@ function mob:_execute_utilities()
self._utility_data = { self._utility_data = {
utility = nil, utility = nil,
func = nil, func = nil,
step_delay = nil,
score = 0 score = 0
} }
end end
@ -1091,6 +1096,7 @@ function mob:_execute_utilities()
loop_data = { loop_data = {
utility = utility, utility = utility,
score = score, score = score,
step_delay = step_delay,
args = args args = args
} }
end end
@ -1112,10 +1118,17 @@ function mob:_execute_utilities()
end end
end end
if self._utility_data.utility then if self._utility_data.utility then
if not self._utility_data.func then local util_data = self._utility_data
self:initiate_utility(self._utility_data.utility, unpack(self._utility_data.args)) if not util_data.func then
self:initiate_utility(util_data.utility, unpack(util_data.args))
end
local func = util_data.func
if util_data.step_delay then
self.step_delay = util_data.step_delay
else
self.step_delay = nil
self._step_delay = 0
end end
local func = self._utility_data.func
local step_delay = self.step_delay and (self._step_delay or 0) local step_delay = self.step_delay and (self._step_delay or 0)
if not func then return end if not func then return end
if step_delay then if step_delay then