nalc/advanced_npc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bug with 'ignore' nodes when some map areas are not fully loaded but NPC try to perform actions on them.

Browse Source
This commit is contained in:
Hector Franqui
2017-06-27 18:38:28 -04:00
parent cc56446206
commit e70888c3e5
3 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
actions/actions.lua
View File

@ -604,6 +604,10 @@ function npc.actions.use_bed(self, args)
if action == npc.actions.const.beds.LAY then
-- Get position
-- Error here due to ignore. Need to come up with better solution
if node.name == "ignore" then
return
end
local bed_pos = npc.actions.nodes.beds[node.name].get_lay_pos(pos, dir)
-- Sit down on bed, rotate to correct direction
npc.add_action(self, npc.actions.cmd.SIT, {pos=bed_pos, dir=(node.param2 + 2) % 4})
@ -611,6 +615,10 @@ function npc.actions.use_bed(self, args)
npc.add_action(self, npc.actions.cmd.LAY, {})
else
-- Calculate position to get up
-- Error here due to ignore. Need to come up with better solution
if node.name == "ignore" then
return
end
local bed_pos_y = npc.actions.nodes.beds[node.name].get_lay_pos(pos, dir).y
local bed_pos = {x = pos.x, y = bed_pos_y, z = pos.z}
-- Sit up
@ -662,6 +670,10 @@ function npc.actions.use_sittable(self, args)
if action == npc.actions.const.sittable.SIT then
-- Calculate position depending on bench
-- Error here due to ignore. Need to come up with better solution
if node.name == "ignore" then
return
end
local sit_pos = npc.actions.nodes.sittable[node.name].get_sit_pos(pos, node.param2)
-- Sit down on bench/chair/stairs
npc.add_action(self, npc.actions.cmd.SIT, {pos=sit_pos, dir=(node.param2 + 2) % 4})