diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua index f4776d224fbc241c2ee86768623e9331b1b19e9e..1fe81183dac179c6a23b84fe07d0a75919a02837 100644 --- a/game/modules/tome/class/Actor.lua +++ b/game/modules/tome/class/Actor.lua @@ -276,7 +276,8 @@ function _M:TextSizeCategory() elseif self.size_category == 2 then sizecat = "small" elseif self.size_category == 3 then sizecat = "medium" elseif self.size_category == 4 then sizecat = "big" - elseif self.size_category >= 5 then sizecat = "huge" + elseif self.size_category == 5 then sizecat = "huge" + elseif self.size_category >= 6 then sizecat = "gargantuan" end return sizecat end diff --git a/game/modules/tome/class/interface/Combat.lua b/game/modules/tome/class/interface/Combat.lua index 6d06d6b046deffea20244a95ac39d9a95068e005..afa460c5dc2a9ecbd3e4eb326ac7f82fffe720fb 100644 --- a/game/modules/tome/class/interface/Combat.lua +++ b/game/modules/tome/class/interface/Combat.lua @@ -203,8 +203,8 @@ function _M:archeryShoot(damtype, mult, on_hit, tg, params) end end) - if ret.hitted and not sound then sound = realweapon.sound - elseif not ret.hitted and not sound_miss then sound_miss = realweapon.sound_miss end + if ret.hitted and not sound then sound = weapon.sound + elseif not ret.hitted and not sound_miss then sound_miss = weapon.sound_miss end print("[SHOOT] speed", ret.speed or 1, "=>", game.energy_to_act * (ret.speed or 1)) self:useEnergy(game.energy_to_act * (ret.speed or 1)) diff --git a/game/modules/tome/data/general/objects/2haxes.lua b/game/modules/tome/data/general/objects/2haxes.lua index f9c80f3dde4126686742d6ef72ea58419d679a54..9718a5fe50236785030d7f88f7b47cb4199d84c6 100644 --- a/game/modules/tome/data/general/objects/2haxes.lua +++ b/game/modules/tome/data/general/objects/2haxes.lua @@ -24,10 +24,9 @@ newEntity{ type = "weapon", subtype="battleaxe", add_name = " (#COMBAT#)", display = "/", color=colors.SLATE, - sound = "actions/melee", sound_miss = "actions/melee_miss", encumber = 3, rarity = 5, - combat = { talented = "axe", damrange = 1.5 }, + combat = { talented = "axe", damrange = 1.5, sound = "actions/melee", sound_miss = "actions/melee_miss", }, desc = [[Massive two-handed battleaxes.]], twohanded = true, egos = "/data/general/objects/egos/weapon.lua", egos_chance = resolvers.mbonus(40, 5), diff --git a/game/modules/tome/data/general/objects/2hmaces.lua b/game/modules/tome/data/general/objects/2hmaces.lua index 7960cf9aefbfacb048768cd982de97cef68bb112..02abfef30007e016ebfebf9c83feaabfec0faf35 100644 --- a/game/modules/tome/data/general/objects/2hmaces.lua +++ b/game/modules/tome/data/general/objects/2hmaces.lua @@ -24,10 +24,9 @@ newEntity{ type = "weapon", subtype="greatmaul", add_name = " (#COMBAT#)", display = "\\", color=colors.SLATE, - sound = "actions/melee", sound_miss = "actions/melee_miss", encumber = 5, rarity = 5, - combat = { talented = "mace", damrange = 1.5, physspeed=1.2 }, + combat = { talented = "mace", damrange = 1.5, physspeed=1.2, sound = "actions/melee", sound_miss = "actions/melee_miss", }, desc = [[Massive two-handed maul.]], twohanded = true, egos = "/data/general/objects/egos/weapon.lua", egos_chance = resolvers.mbonus(40, 5), diff --git a/game/modules/tome/data/general/objects/2hswords.lua b/game/modules/tome/data/general/objects/2hswords.lua index fe82dcfe6d997345e4a1c6d04d1fda72ce82e3e6..2440c228e61cf74bdcb071c67f0b4171d4b201e5 100644 --- a/game/modules/tome/data/general/objects/2hswords.lua +++ b/game/modules/tome/data/general/objects/2hswords.lua @@ -24,10 +24,9 @@ newEntity{ type = "weapon", subtype="greatsword", add_name = " (#COMBAT#)", display = "/", color=colors.SLATE, - sound = "actions/melee", sound_miss = "actions/melee_miss", encumber = 3, rarity = 5, - combat = { talented = "sword", damrange = 1.6 }, + combat = { talented = "sword", damrange = 1.6, sound = "actions/melee", sound_miss = "actions/melee_miss", }, desc = [[Massive two-handed swords.]], twohanded = true, egos = "/data/general/objects/egos/weapon.lua", egos_chance = resolvers.mbonus(40, 5), diff --git a/game/modules/tome/data/general/objects/axes.lua b/game/modules/tome/data/general/objects/axes.lua index e53b8157d4ad383942a2032d2bf378ee0c199b16..d27e1966c9fbd26e51131d8a0296097993835cdd 100644 --- a/game/modules/tome/data/general/objects/axes.lua +++ b/game/modules/tome/data/general/objects/axes.lua @@ -23,10 +23,9 @@ newEntity{ type = "weapon", subtype="waraxe", add_name = " (#COMBAT#)", display = "/", color=colors.SLATE, - sound = "actions/melee", sound_miss = "actions/melee_miss", encumber = 3, rarity = 3, - combat = { talented = "axe", damrange = 1.4}, + combat = { talented = "axe", damrange = 1.4, sound = "actions/melee", sound_miss = "actions/melee_miss",}, desc = [[One-handed war axes.]], egos = "/data/general/objects/egos/weapon.lua", egos_chance = resolvers.mbonus(40, 5), } diff --git a/game/modules/tome/data/general/objects/bows.lua b/game/modules/tome/data/general/objects/bows.lua index d137587005a6e26f3e0f06e482edf365eb04ed0c..e4d612640d02e203f398d943292ffb782a6ffd51 100644 --- a/game/modules/tome/data/general/objects/bows.lua +++ b/game/modules/tome/data/general/objects/bows.lua @@ -23,10 +23,9 @@ newEntity{ slot_forbid = "OFFHAND", type = "weapon", subtype="longbow", display = "}", color=colors.UMBER, - sound = "actions/arrow", sound_miss = "actions/arrow", encumber = 4, rarity = 5, - combat = { talented = "bow", damrange = 1.4}, + combat = { talented = "bow", damrange = 1.4, sound = "actions/arrow", sound_miss = "actions/arrow",}, archery = "bow", desc = [[Longbows are used to shoot arrows at your foes.]], } diff --git a/game/modules/tome/data/general/objects/knifes.lua b/game/modules/tome/data/general/objects/knifes.lua index 33ddb83f8e93fde3fe5f985455bf16bf2adca784..161ca434fbc7e7fc504eefd2e4442d217f7a98d0 100644 --- a/game/modules/tome/data/general/objects/knifes.lua +++ b/game/modules/tome/data/general/objects/knifes.lua @@ -23,10 +23,9 @@ newEntity{ type = "weapon", subtype="dagger", add_name = " (#COMBAT#)", display = "/", color=colors.WHITE, - sound = "actions/melee", sound_miss = "actions/melee_miss", encumber = 1, rarity = 5, - combat = { talented = "knife", damrange = 1.3 }, + combat = { talented = "knife", damrange = 1.3, sound = "actions/melee", sound_miss = "actions/melee_miss", }, desc = [[Sharp, long, and deadly.]], egos = "/data/general/objects/egos/weapon.lua", egos_chance = resolvers.mbonus(40, 5), } diff --git a/game/modules/tome/data/general/objects/maces.lua b/game/modules/tome/data/general/objects/maces.lua index ca52cb55071373e509d29fce5a809aa1682778dc..eae2f746bdd6d713cf2797d149c767053430a4ec 100644 --- a/game/modules/tome/data/general/objects/maces.lua +++ b/game/modules/tome/data/general/objects/maces.lua @@ -23,10 +23,9 @@ newEntity{ type = "weapon", subtype="mace", add_name = " (#COMBAT#)", display = "/", color=colors.SLATE, - sound = "actions/melee", sound_miss = "actions/melee_miss", encumber = 3, rarity = 5, - combat = { talented = "mace", damrange = 1.4}, + combat = { talented = "mace", damrange = 1.4, sound = "actions/melee", sound_miss = "actions/melee_miss",}, desc = [[Blunt and deadly.]], egos = "/data/general/objects/egos/weapon.lua", egos_chance = resolvers.mbonus(40, 5), } diff --git a/game/modules/tome/data/general/objects/slings.lua b/game/modules/tome/data/general/objects/slings.lua index 75292ed8b6c62b80c13a9b2d5010d1e850de98a6..9fca9a50bb6fd2ff8330a7d20d26fec4f799a3c1 100644 --- a/game/modules/tome/data/general/objects/slings.lua +++ b/game/modules/tome/data/general/objects/slings.lua @@ -22,10 +22,9 @@ newEntity{ slot = "MAINHAND", type = "weapon", subtype="sling", display = "}", color=colors.UMBER, - sound = "actions/arrow", sound_miss = "actions/arrow", encumber = 4, rarity = 5, - combat = { talented = "sling", }, + combat = { talented = "sling", sound = "actions/arrow", sound_miss = "actions/arrow", }, archery = "sling", desc = [[Slings are used to shoot peebles at your foes.]], } diff --git a/game/modules/tome/data/general/objects/swords.lua b/game/modules/tome/data/general/objects/swords.lua index d4f76005bca7c67eef383052a713235cef35cf40..d9dd1315df6e75b0a31731519ac828aeb37d882c 100644 --- a/game/modules/tome/data/general/objects/swords.lua +++ b/game/modules/tome/data/general/objects/swords.lua @@ -23,10 +23,9 @@ newEntity{ type = "weapon", subtype="longsword", add_name = " (#COMBAT#)", display = "/", color=colors.SLATE, - sound = "actions/melee", sound_miss = "actions/melee_miss", encumber = 3, rarity = 5, - combat = { talented = "sword", damrange = 1.4}, + combat = { talented = "sword", damrange = 1.4, sound = "actions/melee", sound_miss = "actions/melee_miss",}, desc = [[Sharp, long, and deadly.]], egos = "/data/general/objects/egos/weapon.lua", egos_chance = resolvers.mbonus(40, 5), } diff --git a/game/modules/tome/data/sound/actions/melee.lua b/game/modules/tome/data/sound/actions/melee.lua new file mode 100644 index 0000000000000000000000000000000000000000..44dfe2b2e2c462ab23fb7b44dbfb515788bb3944 --- /dev/null +++ b/game/modules/tome/data/sound/actions/melee.lua @@ -0,0 +1,4 @@ +return { + file = "actions/melee.wav", + volume = 30, +} diff --git a/game/modules/tome/data/sound/actions/melee_miss.lua b/game/modules/tome/data/sound/actions/melee_miss.lua new file mode 100644 index 0000000000000000000000000000000000000000..9c6d62483dbbdf145167686556905221a3204672 --- /dev/null +++ b/game/modules/tome/data/sound/actions/melee_miss.lua @@ -0,0 +1,4 @@ +return { + file = "actions/melee_miss.wav", + volume = 30, +}