From 60f9b3fcde2de4cba83fb949fac9a9e7fcc0f05b Mon Sep 17 00:00:00 2001
From: DarkGod <darkgod@net-core.org>
Date: Tue, 22 Oct 2013 11:20:34 +0200
Subject: [PATCH] Unarmed 0.6 attack speed is bound to Empty Hands, not to
being a Brawler
---
game/modules/tome/data/birth/classes/warrior.lua | 1 -
.../tome/data/talents/techniques/unarmed-training.lua | 10 ++++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/game/modules/tome/data/birth/classes/warrior.lua b/game/modules/tome/data/birth/classes/warrior.lua
index 772501ec42..3763dce91b 100644
--- a/game/modules/tome/data/birth/classes/warrior.lua
+++ b/game/modules/tome/data/birth/classes/warrior.lua
@@ -307,7 +307,6 @@ newBirthDescriptor{
[ActorTalents.T_ARMOUR_TRAINING] = 1,
},
copy = {
- combat = { physspeed = 0.6, sound = "actions/melee", sound_miss="actions/melee_miss" },
resolvers.equip{ id=true,
{type="armor", subtype="hands", name="iron gauntlets", autoreq=true, ego_chance=-1000, ego_chance=-1000},
{type="armor", subtype="light", name="rough leather armour", autoreq=true, ego_chance=-1000, ego_chance=-1000},
diff --git a/game/modules/tome/data/talents/techniques/unarmed-training.lua b/game/modules/tome/data/talents/techniques/unarmed-training.lua
index 16a8d4513c..2a7253dd97 100644
--- a/game/modules/tome/data/talents/techniques/unarmed-training.lua
+++ b/game/modules/tome/data/talents/techniques/unarmed-training.lua
@@ -27,6 +27,16 @@ newTalent{
mode = "passive",
points = 1,
no_unlearn_last = true,
+ on_learn = function(self, t)
+ self.before_empty_hands_combat = self.combat
+ self.combat = table.clone(self.combat, true)
+ self.combat.physspeed = 0.6
+ self.combat.sound = "actions/melee"
+ self.combat.sound_miss="actions/melee_miss"
+ end,
+ on_unlearn = function(self, t)
+ self.combat = self.before_empty_hands_combat
+ end,
getDamage = function(self, t) return self.level * 0.5 end,
info = function(self, t)
local damage = t.getDamage(self, t)
--
GitLab