From ff29b3e8f1d3c1bb14c04e62a09dbcb4f6eeb41b Mon Sep 17 00:00:00 2001 From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54> Date: Fri, 19 Nov 2010 12:43:55 +0000 Subject: [PATCH] Archmages will not be able to cheese their way through the Charred Scar git-svn-id: http://svn.net-core.org/repos/t-engine4@1946 51575b47-30f0-44d4-a5cc-537603b46e54 --- game/modules/tome/class/Actor.lua | 1 + game/modules/tome/class/Game.lua | 2 +- game/modules/tome/data/general/objects/world-artifacts.lua | 2 +- game/modules/tome/data/zones/charred-scar/grids.lua | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua index 0c32f3c7be..9d7da9f19e 100644 --- a/game/modules/tome/class/Actor.lua +++ b/game/modules/tome/class/Actor.lua @@ -354,6 +354,7 @@ function _M:probabilityTravel(x, y, dist) local tx, ty = x, y while game.level.map:isBound(tx, ty) and game.level.map:checkAllEntities(tx, ty, "block_move", self) and dist > 0 do if game.level.map.attrs(tx, ty, "no_teleport") then break end + if game.level.map:checkAllEntities(tx, ty, "no_prob_travel", self) then break end tx = tx + dirx ty = ty + diry dist = dist - 1 diff --git a/game/modules/tome/class/Game.lua b/game/modules/tome/class/Game.lua index b087953649..14ffc1418d 100644 --- a/game/modules/tome/class/Game.lua +++ b/game/modules/tome/class/Game.lua @@ -706,7 +706,7 @@ function _M:setupCommands() if config.settings.tome.cheat then -- local m = game.zone:makeEntityByName(game.level, "actor", "TEST") -- game.zone:addEntity(game.level, m, "actor", game.player.x, game.player.y+1) - self:changeLevel(15, "high-peak") + self:changeLevel(1, "charred-scar") game.player:magicMap(50) -- self.player:grantQuest("anti-antimagic") end diff --git a/game/modules/tome/data/general/objects/world-artifacts.lua b/game/modules/tome/data/general/objects/world-artifacts.lua index 5b438d780d..5746590131 100644 --- a/game/modules/tome/data/general/objects/world-artifacts.lua +++ b/game/modules/tome/data/general/objects/world-artifacts.lua @@ -1348,7 +1348,7 @@ newEntity{ base = "BASE_GAUNTLETS", name = "Stone Gauntlets of Harkor'Zun", unided_name = "dark stone gauntlets", desc = [[Fashioned in ancient times by cultists of Harkor'Zun, these heavy granite gauntlets where designed to protect the wearer from the wrath of their dark master.]], - level_range = {20, 30}, + level_range = {26, 31}, rarity = 210, encumber = 14, metallic = false, diff --git a/game/modules/tome/data/zones/charred-scar/grids.lua b/game/modules/tome/data/zones/charred-scar/grids.lua index a896efd4e8..f9397a92c9 100644 --- a/game/modules/tome/data/zones/charred-scar/grids.lua +++ b/game/modules/tome/data/zones/charred-scar/grids.lua @@ -33,6 +33,7 @@ newEntity{ always_remember = true, does_block_move = true, block_sight = true, + no_prob_travel = true, air_level = -20, } -- GitLab