Skip to content
Snippets Groups Projects
Commit 8aca9043 authored by dg's avatar dg
Browse files

Move Actor:attr(), Actor:addTemporaryValue(), Actor:removeTemporaryValue() and... 

Move Actor:attr(), Actor:addTemporaryValue(), Actor:removeTemporaryValue() and Actor:onTemporaryValueChange() to Entity


git-svn-id: http://svn.net-core.org/repos/t-engine4@2314 51575b47-30f0-44d4-a5cc-537603b46e54
parent 046752fd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
game/engines/default/engine/Actor.lua
+ 0
− 109
View file @ 8aca9043
......@@ -43,8 +43,6 @@ function _M:init(t, no_default)
self.faction = t.faction or "enemies"
self.changed = true
Entity.init(self, t, no_default)
self.compute_vals = {n=0}
end
--- Called when it is time to act
......@@ -316,113 +314,6 @@ function _M:hasLOS(x, y, what)
return false, lx, ly
end
local function gettable(base, name)
for w in name:gmatch("[^.]+") do
base = base[w]
end
return base
end
--- Computes a "temporary" value into a property
-- Example: You cant to give an actor a boost to life_regen, but you do not want it to be permanent<br/>
-- You cannot simply increase life_regen, so you use this method which will increase it AND
-- store the increase. it will return an "increase id" that can be passed to removeTemporaryValue()
-- to remove the effect.
-- @param prop the property to affect
-- @param v the value to add (only numbers supported for now)
-- @param noupdate if true the actual property is not changed and needs to be changed by the caller
-- @return an id that can be passed to removeTemporaryValue() to delete this value
function _M:addTemporaryValue(prop, v, noupdate)
local t = self.compute_vals
local id = t.n + 1
while t[id] ~= nil do id = id + 1 end
t[id] = v
t.n = id
-- Update the base prop
if not noupdate then
if type(v) == "number" then
-- Simple addition
self[prop] = (self[prop] or 0) + v
self:onTemporaryValueChange(prop, nil, v)
print("addTmpVal", prop, v, " :=: ", #t, id)
elseif type(v) == "table" then
for k, e in pairs(v) do
self[prop][k] = (self[prop][k] or 0) + e
self:onTemporaryValueChange(prop, k, e)
print("addTmpValTable", prop, k, e, " :=: ", #t, id)
if #t == 0 then print("*******************************WARNING") end
end
-- elseif type(v) == "boolean" then
-- -- False has precedence over true
-- if v == false then
-- self[prop] = false
-- elseif self[prop] ~= false then
-- self[prop] = true
-- end
else
error("unsupported temporary value type: "..type(v))
end
end
return id
end
--- Removes a temporary value, see addTemporaryValue()
-- @param prop the property to affect
-- @param id the id of the increase to delete
-- @param noupdate if true the actual property is not changed and needs to be changed by the caller
function _M:removeTemporaryValue(prop, id, noupdate)
local oldval = self.compute_vals[id]
print("removeTempVal", prop, oldval, " :=: ", id)
self.compute_vals[id] = nil
if not noupdate then
if type(oldval) == "number" then
self[prop] = self[prop] - oldval
self:onTemporaryValueChange(prop, nil, -oldval)
print("delTmpVal", prop, oldval)
elseif type(oldval) == "table" then
for k, e in pairs(oldval) do
self[prop][k] = self[prop][k] - e
self:onTemporaryValueChange(prop, k, -e)
print("delTmpValTable", prop, k, e)
end
-- elseif type(oldval) == "boolean" then
else
error("unsupported temporary value type: "..type(oldval))
end
end
end
--- Called when a temporary value changes (added or deleted)
-- This does nothing by default, you can overload it to react to changes
-- @param prop the property changing
-- @param sub the sub element of the property if it is a table, or nil
-- @param v the value of the change
function _M:onTemporaryValueChange(prop, sub, v)
end
--- Increases/decreases an attribute
-- The attributes are just actor properties, but this ensures they are numbers and not booleans
-- thus making them compatible with temporary values system
-- @param prop the property to use
-- @param v the value to add, if nil this the function return
-- @param fix forces the value to v, do not add
-- @return nil if v was specified. If not then it returns the current value if it exists and is not 0 otherwise returns nil
function _M:attr(prop, v, fix)
if v then
if fix then self[prop] = v
else self[prop] = (self[prop] or 0) + v
end
else
if self[prop] and self[prop] ~= 0 then
return self[prop]
else
return nil
end
end
end
--- Are we within a certain distance of the target
-- @param x the spot we test for nearness
-- @param y the spot we test for nearness
......
game/engines/default/engine/Entity.lua
+ 102
− 0
View file @ 8aca9043
......@@ -384,6 +384,108 @@ function _M:check(prop, ...)
end
end
--- Computes a "temporary" value into a property
-- Example: You cant to give an actor a boost to life_regen, but you do not want it to be permanent<br/>
-- You cannot simply increase life_regen, so you use this method which will increase it AND
-- store the increase. it will return an "increase id" that can be passed to removeTemporaryValue()
-- to remove the effect.
-- @param prop the property to affect
-- @param v the value to add (only numbers supported for now)
-- @param noupdate if true the actual property is not changed and needs to be changed by the caller
-- @return an id that can be passed to removeTemporaryValue() to delete this value
function _M:addTemporaryValue(prop, v, noupdate)
if not self.compute_vals then self.compute_vals = {n=0} end
local t = self.compute_vals
local id = t.n + 1
while t[id] ~= nil do id = id + 1 end
t[id] = v
t.n = id
-- Update the base prop
if not noupdate then
if type(v) == "number" then
-- Simple addition
self[prop] = (self[prop] or 0) + v
self:onTemporaryValueChange(prop, nil, v)
print("addTmpVal", prop, v, " :=: ", #t, id)
elseif type(v) == "table" then
for k, e in pairs(v) do
self[prop][k] = (self[prop][k] or 0) + e
self:onTemporaryValueChange(prop, k, e)
print("addTmpValTable", prop, k, e, " :=: ", #t, id)
if #t == 0 then print("*******************************WARNING") end
end
-- elseif type(v) == "boolean" then
-- -- False has precedence over true
-- if v == false then
-- self[prop] = false
-- elseif self[prop] ~= false then
-- self[prop] = true
-- end
else
error("unsupported temporary value type: "..type(v))
end
end
return id
end
--- Removes a temporary value, see addTemporaryValue()
-- @param prop the property to affect
-- @param id the id of the increase to delete
-- @param noupdate if true the actual property is not changed and needs to be changed by the caller
function _M:removeTemporaryValue(prop, id, noupdate)
local oldval = self.compute_vals[id]
print("removeTempVal", prop, oldval, " :=: ", id)
self.compute_vals[id] = nil
if not noupdate then
if type(oldval) == "number" then
self[prop] = self[prop] - oldval
self:onTemporaryValueChange(prop, nil, -oldval)
print("delTmpVal", prop, oldval)
elseif type(oldval) == "table" then
for k, e in pairs(oldval) do
self[prop][k] = self[prop][k] - e
self:onTemporaryValueChange(prop, k, -e)
print("delTmpValTable", prop, k, e)
end
-- elseif type(oldval) == "boolean" then
else
error("unsupported temporary value type: "..type(oldval))
end
end
end
--- Called when a temporary value changes (added or deleted)
-- This does nothing by default, you can overload it to react to changes
-- @param prop the property changing
-- @param sub the sub element of the property if it is a table, or nil
-- @param v the value of the change
function _M:onTemporaryValueChange(prop, sub, v)
end
--- Increases/decreases an attribute
-- The attributes are just actor properties, but this ensures they are numbers and not booleans
-- thus making them compatible with temporary values system
-- @param prop the property to use
-- @param v the value to add, if nil this the function return
-- @param fix forces the value to v, do not add
-- @return nil if v was specified. If not then it returns the current value if it exists and is not 0 otherwise returns nil
function _M:attr(prop, v, fix)
if v then
if fix then self[prop] = v
else self[prop] = (self[prop] or 0) + v
end
else
if self[prop] and self[prop] ~= 0 then
return self[prop]
else
return nil
end
end
end
--- Loads a list of entities from a definition file
-- @param file the file to load from
-- @param no_default if true then no default values will be assigned
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment