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

Blighted Maul correctly specifies it hits both friends and foes

Autoexplore tries vault doors last


git-svn-id: http://svn.net-core.org/repos/t-engine4@5707 51575b47-30f0-44d4-a5cc-537603b46e54
parent 6f3a577f
No related branches found
No related tags found
No related merge requests found
......@@ -2187,7 +2187,7 @@ function _M:autoExplore()
for _, c in ipairs(unseen_doors) do
local x, y = toDouble(c)
local terrain = game.level.map(x, y, Map.TERRAIN)
if not terrain.door_player_check then
if not terrain.door_player_check and not terrain.door_player_stop then
target_type = "door"
choices[#choices + 1] = c
-- we may take an extra step to approach a door squarely from a cardinal direction, so let's account for this
......@@ -2230,7 +2230,7 @@ function _M:autoExplore()
for _, c in ipairs(unseen_doors) do
local x, y = toDouble(c)
local terrain = game.level.map(x, y, Map.TERRAIN)
if terrain.door_player_check then
if terrain.door_player_check or terrain.door_player_stop then
target_type = "door"
choices[#choices + 1] = c
local dist = core.fov.distance(self.x, self.y, x, y, true) + 10*door_values[c]
......
......@@ -1400,7 +1400,7 @@ newEntity{ base = "BASE_GREATMAUL", define_as="ROTTING_MAUL",
dammod = {str=1.4},
convert_damage = {[DamageType.BLIGHT] = 20},
melee_project={[DamageType.CORRUPTED_BLOOD] = 30},
special_on_hit = {desc="25% to damage nearby foes", on_kill=true, fct=function(combat, who, target)
special_on_hit = {desc="25% to damage nearby creatures", on_kill=true, fct=function(combat, who, target)
if rng.percent(25) then
local o, item, inven_id = who:findInAllInventoriesBy("define_as", "ROTTING_MAUL")
local dam = rng.avg(1,2) * (70+ who:getStr() * 1.8)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment