diff --git a/game/modules/tome/class/Object.lua b/game/modules/tome/class/Object.lua index a6021fe2b6dce1e2984562757df2b1ebea5c3241..4d7fb0ea4e6747f53061a9b9b5ad867d11e1e6dd 100644 --- a/game/modules/tome/class/Object.lua +++ b/game/modules/tome/class/Object.lua @@ -172,6 +172,7 @@ function _M:getDesc() dm[#dm+1] = ("+%d%% %s"):format(i * 100, Stats.stats_def[stat].name) end desc[#desc+1] = ("%d Damage [Range %0.2f] (%s), %d Attack, %d Armor Penetration, Crit %d%%"):format(self.combat.dam or 0, self.combat.damrange or 1.1, table.concat(dm, ','), self.combat.atk or 0, self.combat.apr or 0, self.combat.physcrit or 0) + if self.combat.range then desc[#desc+1] = "Firing range: "..self.combat.range end desc[#desc+1] = "" end diff --git a/game/modules/tome/class/generator/map/Wilderness.lua b/game/modules/tome/class/generator/map/Wilderness.lua deleted file mode 100644 index 7af95214b1882247878fdee6a64950b06ef49ae8..0000000000000000000000000000000000000000 --- a/game/modules/tome/class/generator/map/Wilderness.lua +++ /dev/null @@ -1,31 +0,0 @@ --- ToME - Tales of Middle-Earth --- Copyright (C) 2009, 2010 Nicolas Casalini --- --- This program is free software: you can redistribute it and/or modify --- it under the terms of the GNU General Public License as published by --- the Free Software Foundation, either version 3 of the License, or --- (at your option) any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public License --- along with this program. If not, see <http://www.gnu.org/licenses/>. --- --- Nicolas Casalini "DarkGod" --- darkgod@te4.org - -require "engine.class" -require "engine.generator.map.Static" - ---- Make the wilderness map, loaded from the player's current wilderness -module(..., package.seeall, class.inherit(engine.generator.map.Static)) - -function _M:init(zone, map, level, data) - print("Loading wilderness map: ", game.player.current_wilderness) - data.map = game.player.current_wilderness - - engine.generator.map.Static.init(self, zone, map, level, data) -end diff --git a/game/modules/tome/data/general/objects/bows.lua b/game/modules/tome/data/general/objects/bows.lua index e4d612640d02e203f398d943292ffb782a6ffd51..9b62b2127a669af24f3fc38d9ded647c62d98a54 100644 --- a/game/modules/tome/data/general/objects/bows.lua +++ b/game/modules/tome/data/general/objects/bows.lua @@ -36,6 +36,7 @@ newEntity{ base = "BASE_LONGBOW", require = { stat = { dex=11 }, }, cost = 5, combat = { + range = 8, physspeed = 0.8, }, } @@ -46,6 +47,7 @@ newEntity{ base = "BASE_LONGBOW", require = { stat = { dex=16 }, }, cost = 10, combat = { + range = 10, physspeed = 0.8, }, } @@ -56,6 +58,7 @@ newEntity{ base = "BASE_LONGBOW", require = { stat = { dex=24 }, }, cost = 15, combat = { + range = 12, physspeed = 0.8, }, } @@ -66,6 +69,7 @@ newEntity{ base = "BASE_LONGBOW", require = { stat = { dex=35 }, }, cost = 25, combat = { + range = 15, physspeed = 0.8, }, } @@ -76,6 +80,7 @@ newEntity{ base = "BASE_LONGBOW", require = { stat = { dex=48 }, }, cost = 35, combat = { + range = 18, physspeed = 0.8, }, } diff --git a/game/modules/tome/data/general/objects/slings.lua b/game/modules/tome/data/general/objects/slings.lua index c01ae835e6f3054feaa6cbb5e4903a8dfe0d6f40..ad38dac29e30849e296dd4ffb1d59b30f9891f05 100644 --- a/game/modules/tome/data/general/objects/slings.lua +++ b/game/modules/tome/data/general/objects/slings.lua @@ -35,6 +35,7 @@ newEntity{ base = "BASE_SLING", require = { stat = { dex=11 }, }, cost = 5, combat = { + range = 8, physspeed = 0.8, }, } @@ -45,6 +46,7 @@ newEntity{ base = "BASE_SLING", require = { stat = { dex=16 }, }, cost = 10, combat = { + range = 10, physspeed = 0.8, }, } @@ -55,6 +57,7 @@ newEntity{ base = "BASE_SLING", require = { stat = { dex=24 }, }, cost = 15, combat = { + range = 12, physspeed = 0.8, }, } @@ -65,6 +68,7 @@ newEntity{ base = "BASE_SLING", require = { stat = { dex=35 }, }, cost = 25, combat = { + range = 15, physspeed = 0.8, }, } @@ -75,6 +79,7 @@ newEntity{ base = "BASE_SLING", require = { stat = { dex=48 }, }, cost = 35, combat = { + range = 18, physspeed = 0.8, }, }