Replaced 2handed weapon talent "Crush" with "Blood Frenzy"

git-svn-id: http://svn.net-core.org/repos/t-engine4@885 51575b47-30f0-44d4-a5cc-537603b46e54

game/modules/tome/class/Actor.lua

@@ -172,6 +172,10 @@ function _M:act()
 		local t = self:getTalentFromId(self.T_HYMN_OF_MOONLIGHT)
 		t.do_beams(self, t)
 	end
+	if self:isTalentActive(self.T_BLOOD_FRENZY) then
+		local t = self:getTalentFromId(self.T_BLOOD_FRENZY)
+		t.do_turn(self, t)
+	end
 
 	if self:attr("stunned") then self.energy.value = 0 end
 	if self:attr("dazed") then self.energy.value = 0 end
@@ -525,6 +529,11 @@ function _M:die(src)
 		src:incStamina(src:getTalentLevel(src.T_UNENDING_FRENZY) * 2)
 	end
 
+	-- Increases blood frenzy
+	if src and src.knowTalent and src:knowTalent(src.T_BLOOD_FRENZY) and src:isTalentActive(src.T_BLOOD_FRENZY) then
+		src.blood_frenzy = src.blood_frenzy + src:getTalentLevel(src.T_BLOOD_FRENZY) * 2
+	end
+
 	if src and src.resolveSource and src:resolveSource().player then
 		-- Achievements
 		local p = src:resolveSource()

game/modules/tome/class/interface/Combat.lua

@@ -465,6 +465,9 @@ function _M:combatDamage(weapon)
 	if self:knowTalent(Talents.T_ARCANE_DESTRUCTION) then
 		add = add + self:combatSpellpower() * self:getTalentLevel(Talents.T_ARCANE_DESTRUCTION) / 9
 	end
+	if self:isTalentActive(Talents.T_BLOOD_FRENZY) then
+		add = add + self.blood_frenzy
+	end
 
 	local talented_mod = math.sqrt(self:combatCheckTraining(weapon) / 10) + 1
 	local power = math.max(self.combat_dam + (weapon.dam or 1) + add, 1)

game/modules/tome/data/talents/misc/npcs.lua

@@ -692,3 +692,39 @@ newTalent{
 		return ([[Shriek to call your allies.]])
 	end,
 }
+
+newTalent{
+	name = "Crush",
+	type = {"technique/other", 1},
+	require = techs_req1,
+	points = 5,
+	cooldown = 6,
+	stamina = 12,
+	action = function(self, t)
+		local weapon = self:hasTwoHandedWeapon()
+		if not weapon then
+			game.logPlayer(self, "You cannot use Crush without a two-handed weapon!")
+			return nil
+		end
+
+		local tg = {type="hit", range=self:getTalentRange(t)}
+		local x, y, target = self:getTarget(tg)
+		if not x or not y or not target then return nil end
+		if math.floor(core.fov.distance(self.x, self.y, x, y)) > 1 then return nil end
+		local speed, hit = self:attackTargetWith(target, weapon.combat, nil, self:combatTalentWeaponDamage(t, 1, 1.4))
+
+		-- Try to stun !
+		if hit then
+			if target:checkHit(self:combatAttackStr(weapon.combat), target:combatPhysicalResist(), 0, 95, 10 - self:getTalentLevel(t) / 2) and target:canBe("stun") then
+				target:setEffect(target.EFF_PINNED, 2 + self:getTalentLevel(t), {})
+			else
+				game.logSeen(target, "%s resists the crushing!", target.name:capitalize())
+			end
+		end
+
+		return true
+	end,
+	info = function(self, t)
+		return ([[Hits the target with a mighty blow to the legs doing %d%% weapon damage, if the attack hits, the target is unable to move for %d turns.]]):format(100 * self:combatTalentWeaponDamage(t, 1, 1.4), 2+self:getTalentLevel(t))
+	end,
+}

game/modules/tome/data/talents/techniques/2hweapon.lua

@@ -281,37 +281,36 @@ newTalent{
 }
 
 newTalent{
-	name = "Crush",
+	name = "Blood Frenzy",
 	type = {"technique/2hweapon-cripple", 4},
 	require = techs_req4,
 	points = 5,
-	cooldown = 6,
-	stamina = 12,
-	action = function(self, t)
+	mode = "sustained",
+	cooldown = 15,
+	sustain_stamina = 100,
+	do_turn = function(self, t)
+		if self.blood_frenzy > 0 then
+			self.blood_frenzy = self.blood_frenzy - 2
+		end
+	end,
+	activate = function(self, t)
 		local weapon = self:hasTwoHandedWeapon()
 		if not weapon then
-			game.logPlayer(self, "You cannot use Crush without a two-handed weapon!")
+			game.logPlayer(self, "You cannot use Berserker without a two-handed weapon!")
 			return nil
 		end
-
-		local tg = {type="hit", range=self:getTalentRange(t)}
-		local x, y, target = self:getTarget(tg)
-		if not x or not y or not target then return nil end
-		if math.floor(core.fov.distance(self.x, self.y, x, y)) > 1 then return nil end
-		local speed, hit = self:attackTargetWith(target, weapon.combat, nil, self:combatTalentWeaponDamage(t, 1, 1.4))
-
-		-- Try to stun !
-		if hit then
-			if target:checkHit(self:combatAttackStr(weapon.combat), target:combatPhysicalResist(), 0, 95, 10 - self:getTalentLevel(t) / 2) and target:canBe("stun") then
-				target:setEffect(target.EFF_PINNED, 2 + self:getTalentLevel(t), {})
-			else
-				game.logSeen(target, "%s resists the crushing!", target.name:capitalize())
-			end
-		end
-
+		self.blood_frenzy = 0
+		return {
+			regen = self:addTemporaryValue("stamina_regen", -4),
+		}
+	end,
+	deactivate = function(self, t, p)
+		self.blood_frenzy = nil
+		self:removeTemporaryValue("stamina_regen", p.regen)
 		return true
 	end,
 	info = function(self, t)
-		return ([[Hits the target with a mighty blow to the legs doing %d%% weapon damage, if the attack hits, the target is unable to move for %d turns.]]):format(100 * self:combatTalentWeaponDamage(t, 1, 1.4), 2+self:getTalentLevel(t))
+		return ([[Enter a blood frenzy, draining stamina quickly. Each time you kill a foe while in blood frenzy you gain a cumulative bonus to weapon power of %d.
+		Each turn the bonus decreases by 2.]]):format(2 * self:getTalentLevel(t))
 	end,
 }