diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua index a0fc6fc5e57f933a1c8c393804c6f6aebd4e6251..c7cce14efa87ea7b46d720ac89194ba85331c7fa 100644 --- a/game/modules/tome/class/Actor.lua +++ b/game/modules/tome/class/Actor.lua @@ -186,7 +186,7 @@ function _M:init(t, no_default) mod.class.interface.ActorInscriptions.init(self, t) -- Default melee barehanded damage - self.combat = self.combat or { dam=1, atk=1, apr=0, physcrit=0, physspeed =1, dammod={str=1} } + self.combat = self.combat or { dam=1, atk=1, apr=0, physcrit=0, physspeed =1, dammod={str=1}, damrange=1.1 } self.talents[self.T_ATTACK] = self.talents[self.T_ATTACK] or 1 self:resetCanSeeCache() diff --git a/game/modules/tome/data/general/objects/boss-artifacts.lua b/game/modules/tome/data/general/objects/boss-artifacts.lua index 3273026f7c54e1d5d36de71343c576420385bce0..a04be0bee93e3f5199ab7841df70c6d65943dd7e 100644 --- a/game/modules/tome/data/general/objects/boss-artifacts.lua +++ b/game/modules/tome/data/general/objects/boss-artifacts.lua @@ -754,13 +754,12 @@ newEntity{ base = "BASE_GLOVES", define_as = "FLAMEWROUGHT", resists = { [DamageType.FIRE]= 10, }, inc_damage = { [DamageType.FIRE]= 5, }, combat = { - dam = 10, - apr = 1, - physcrit = 7, + dam = 5, + apr = 7, + physcrit = 1, physspeed = -0.4, dammod = {dex=0.4, str=-0.6, cun=0.4 }, - damtype = DamageType.FIRE, - damrange = 1.2, + melee_project={[DamageType.FIRE] = 10}, }, }, max_power = 24, power_regen = 1, diff --git a/game/modules/tome/data/general/objects/gauntlets.lua b/game/modules/tome/data/general/objects/gauntlets.lua index 6239468cde4f93d15a93dfa89de43f17cacc2477..e754c1cde834e5e03bcc57cb2111a624f1023dc5 100644 --- a/game/modules/tome/data/general/objects/gauntlets.lua +++ b/game/modules/tome/data/general/objects/gauntlets.lua @@ -30,7 +30,6 @@ newEntity{ encumber = 1.5, rarity = 9, metallic = true, - combat = { talented = "unarmed" ,}, desc = [[Metal gloves protecting the hands up to the middle of the lower arm.]], randart_able = { attack=10, physical=10, spell=10, def=40, misc=30 }, egos = "/data/general/objects/egos/gloves.lua", egos_chance = { prefix=resolvers.mbonus(40, 5), suffix=resolvers.mbonus(40, 5) }, @@ -49,7 +48,7 @@ newEntity{ base = "BASE_GAUNTLETS", physcrit = 1, physspeed = -0.2, dammod = {dex=0.4, str=-0.6, cun=0.4 }, - damrange = 1.4, + damrange = 0.3, }, }, } @@ -67,7 +66,7 @@ newEntity{ base = "BASE_GAUNTLETS", physcrit = 1, physspeed = -0.2, dammod = {dex=0.4, str=-0.6, cun=0.4 }, - damrange = 1.4, + damrange = 0.3, }, }, } @@ -85,7 +84,7 @@ newEntity{ base = "BASE_GAUNTLETS", physcrit = 3, physspeed = -0.2, dammod = {dex=0.4, str=-0.6, cun=0.4 }, - damrange = 1.4, + damrange = 0.3, }, }, } diff --git a/game/modules/tome/data/general/objects/gloves.lua b/game/modules/tome/data/general/objects/gloves.lua index 1bd4469bf428220f404c37784324accc634d0c79..3db0f062df54e9c2f74ea0950592398244652698 100644 --- a/game/modules/tome/data/general/objects/gloves.lua +++ b/game/modules/tome/data/general/objects/gloves.lua @@ -28,7 +28,6 @@ newEntity{ image = resolvers.image_material("gloves", "leather"), encumber = 1, rarity = 9, - unarmed_combat = { talented = "unarmed", damrange = 1.4, sound = "actions/melee", sound_miss = "actions/melee_miss", }, desc = [[Light gloves which do not seriously hinder finger movements, while still protecting the hands somewhat.]], randart_able = { attack=10, physical=10, spell=10, def=30, misc=10 }, egos = "/data/general/objects/egos/gloves.lua", egos_chance = { prefix=resolvers.mbonus(40, 5), suffix=resolvers.mbonus(40, 5) }, @@ -47,7 +46,6 @@ newEntity{ base = "BASE_GLOVES", physcrit = 4, physspeed = -0.4, dammod = {dex=0.4, str=-0.6, cun=0.4 }, - damrange = 1.2, }, }, } @@ -65,7 +63,6 @@ newEntity{ base = "BASE_GLOVES", physcrit = 7, physspeed = -0.4, dammod = {dex=0.4, str=-0.6, cun=0.4 }, - damrange = 1.2, }, }, } @@ -83,7 +80,6 @@ newEntity{ base = "BASE_GLOVES", physcrit = 10, physspeed = -0.4, dammod = {dex=0.4, str=-0.6, cun=0.4 }, - damrange = 1.2, }, }, } diff --git a/game/modules/tome/data/general/objects/world-artifacts.lua b/game/modules/tome/data/general/objects/world-artifacts.lua index 1d7371d3b97ceb5ac5ec56fcd8f444222b0a9d92..c8a76ee2af7c164685d8be27a0b79a4e72aac354 100644 --- a/game/modules/tome/data/general/objects/world-artifacts.lua +++ b/game/modules/tome/data/general/objects/world-artifacts.lua @@ -1109,7 +1109,6 @@ newEntity{ base = "BASE_GLOVES", physcrit = 7, physspeed = -0.4, dammod = {dex=0.4, str=-0.6, cun=0.4 }, - damrange = 1.2 }, }, } @@ -1137,7 +1136,7 @@ newEntity{ base = "BASE_GAUNTLETS", physspeed = -0.2, dammod = {dex=0.4, str=-0.6, cun=0.4 }, melee_project={[DamageType.ARCANE] = 20}, - damrange = 1.4 + damrange = 0.3, }, }, } @@ -1164,7 +1163,6 @@ newEntity{ base = "BASE_GLOVES", physspeed = -0.4, dammod = {dex=0.4, str=-0.6, cun=0.4 }, melee_project={ [DamageType.COLD] = 10, [DamageType.LIGHTNING] = 10, }, - damrange = 1.2 }, }, max_power = 6, power_regen = 1, @@ -1197,7 +1195,7 @@ newEntity{ base = "BASE_GAUNTLETS", dammod = {dex=0.4, str=-0.6, cun=0.4 }, melee_project={ [DamageType.LIGHTNING] = 20, }, talent_on_hit = { [Talents.T_LIGHTNING] = {level=3, chance=10} }, - damrange = 1.4 + damrange = 0.3, }, }, max_power = 16, power_regen = 1, @@ -1926,7 +1924,7 @@ newEntity{ base = "BASE_GAUNTLETS", physspeed = 1, dammod = {dex=0.3, str=-0.4, cun=0.3 }, melee_project={[DamageType.ACID] = 10}, - damrange = 1.4, + damrange = 0.3, }, }, }