Revamped Brawler's Finishing Moves tree to make it more appealing

@@ -305,6 +305,7 @@ newBirthDescriptor{
 		[ActorTalents.T_DOUBLE_STRIKE] = 1,
 		[ActorTalents.T_WEAPON_COMBAT] = 1,
 		[ActorTalents.T_ARMOUR_TRAINING] = 1,
+		[ActorTalents.T_UNARMED_MASTERY] = 1, -- early game is absolutely stupid without this
 	},
 	copy = {
 		resolvers.equip{ id=true,

@@ -2069,3 +2069,60 @@ newTalent{
 		format(t.getDuration(self, t), damDesc(self, DamageType.COLD, self:combatTalentSpellDamage(t, 5, 140)))
 	end,
 }
+
+
+newTalent{
+	name = "Body Shot",
+	type = {"technique/other", 1},
+	points = 5,
+	cooldown = 10,
+	stamina = 10,
+	message = "@Source@ throws a body shot.",
+	tactical = { ATTACK = { weapon = 2 }, DISABLE = { stun = 2 } },
+	requires_target = true,
+	--on_pre_use = function(self, t, silent) if not self:hasEffect(self.EFF_COMBO) then if not silent then game.logPlayer(self, "You must have a combo going to use this ability.") end return false end return true end,
+	getDamage = function(self, t) return self:combatTalentWeaponDamage(t, 1.1, 1.8) + getStrikingStyle(self, dam) end,
+	getDuration = function(self, t, comb) return math.ceil(self:combatTalentScale(t, 1, 5) * (0.25 + comb/5)) end,
+	getDrain = function(self, t) return self:combatTalentScale(t, 2, 10, 0.75) * self:getCombo(combo) end,
+	action = function(self, t)
+		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 core.fov.distance(self.x, self.y, x, y) > 1 then return nil end
+
+		-- breaks active grapples if the target is not grappled
+		if target:isGrappled(self) then
+			grappled = true
+		else
+			self:breakGrapples()
+		end
+
+		local hit = self:attackTarget(target, nil, t.getDamage(self, t), true)
+
+		if hit then
+			-- try to daze
+			if target:canBe("stun") then
+				target:setEffect(target.EFF_DAZED, t.getDuration(self, t, self:getCombo(combo)), {apply_power=self:combatPhysicalpower()})
+			else
+				game.logSeen(target, "%s resists the body shot!", target.name:capitalize())
+			end
+
+			target:incStamina(- t.getDrain(self, t))
+
+		end
+
+		self:clearCombo()
+
+		return true
+	end,
+	info = function(self, t)
+		local damage = t.getDamage(self, t) * 100
+		local drain = self:getTalentLevel(t) * 2
+		local daze = t.getDuration(self, t, 0)
+		local dazemax = t.getDuration(self, t, 5)
+		return ([[A punch to the body that deals %d%% damage, drains %d of the target's stamina per combo point, and dazes the target for %d to %d turns, depending on the amount of combo points you've accumulated.
+		The daze chance will increase with your Physical Power.
+		Using this talent removes your combo points.]])
+		:format(damage, drain, daze, dazemax)
+	end,
+}

@@ -81,9 +81,9 @@ newTalent{
 	tactical = { ATTACK = { weapon = 2 }, },
 	requires_target = true,
 	--on_pre_use = function(self, t, silent) if not self:hasEffect(self.EFF_COMBO) then if not silent then game.logPlayer(self, "You must have a combo going to use this ability.") end return false end return true end,
-	getDamage = function(self, t) return self:combatTalentWeaponDamage(t, 0.1, 0.8) + getStrikingStyle(self, dam) end,
-	getAreaDamage = function(self, t) return self:combatTalentStatDamage(t, "str", 10, 300) * (1 + getStrikingStyle(self, dam)) end,
-	radius = function(self, t) return math.floor(self:combatTalentScale(t, 1.25, 2.25)) end,
+	getDamage = function(self, t) return self:combatTalentWeaponDamage(t, 0.6, 1.5) + getStrikingStyle(self, dam) end,
+	getAreaDamage = function(self, t) return self:combatTalentStatDamage(t, "str", 20, 600) * (1 + getStrikingStyle(self, dam)) end,
+	radius = function(self, t) return (1 + self:getCombo(combo) ) end,
 	action = function(self, t)
 		local tg = {type="hit", range=self:getTalentRange(t)}
 		local x, y, target = self:getTarget(tg)
@@ -117,67 +117,73 @@ newTalent{
 		local areamax = t.getAreaDamage(self, t) * 1.25
 		local radius = self:getTalentRadius(t)
 		return ([[A powerful concussive punch that deals %d%% weapon damage to your target.  If the punch hits, all targets in a radius of %d will take %0.2f to %0.2f damage, depending on the amount of combo points you've accumulated.
-		The area damage will scale with your Strength, and the radius will increase by 1 for every four talent levels.
+		The area damage will scale with your Strength, and the radius will increase by 1 per combo point.
 		Using this talent removes your combo points.]])
 		:format(damage, radius, damDesc(self, DamageType.PHYSICAL, area), damDesc(self, DamageType.PHYSICAL, areamax))
 	end,
 }
 
 newTalent{
-	name = "Body Shot",
+	name = "Butterfly Kick",
 	type = {"technique/finishing-moves", 3},
 	require = techs_dex_req3,
 	points = 5,
 	random_ego = "attack",
-	cooldown = 10,
+	cooldown = function(self, t)
+		return self:combatTalentScale(t, 30, 10)
+	end,
 	stamina = 10,
-	message = "@Source@ throws a body shot.",
-	tactical = { ATTACK = { weapon = 2 }, DISABLE = { stun = 2 } },
+	range = function(self, t)
+		return (2 + self:getCombo(combo) ) or 1
+	end,
+	radius = function(self, t)
+		return 1
+	end,
+	getDamage = function(self, t)
+		return self:combatTalentWeaponDamage(t, 1, 1.5) + getStrikingStyle(self, dam) 
+	end,
+	getBonusDamage = function(self, t) return (self:getCombo(combo)/10) or 0 end, 
 	requires_target = true,
-	--on_pre_use = function(self, t, silent) if not self:hasEffect(self.EFF_COMBO) then if not silent then game.logPlayer(self, "You must have a combo going to use this ability.") end return false end return true end,
-	getDamage = function(self, t) return self:combatTalentWeaponDamage(t, 1.1, 1.8) + getStrikingStyle(self, dam) end,
-	getDuration = function(self, t, comb) return math.ceil(self:combatTalentScale(t, 1, 5) * (0.25 + comb/5)) end,
-	getDrain = function(self, t) return self:combatTalentScale(t, 2, 10, 0.75) * self:getCombo(combo) end,
+	no_npc_use = true, -- I mark this by default if I don't understand how the AI might use something, which is always
+	target = function(self, t)
+		return {type="ball", range=self:getTalentRange(t), selffire=false, radius=self:getTalentRadius(t)}
+	end,
 	action = function(self, t)
-		local tg = {type="hit", range=self:getTalentRange(t)}
+		if not (self:getCombo(combo) > 0) then return end -- abort if we have no CP, this is to make it base 2+requires CP because base 1 autotargets in melee range
+		local tg = self:getTalentTarget(t)
 		local x, y, target = self:getTarget(tg)
-		if not x or not y or not target then return nil end
-		if core.fov.distance(self.x, self.y, x, y) > 1 then return nil end
+		if not x or not y then return nil end
+		local _ _, x, y = self:canProject(tg, x, y)
 
-		-- breaks active grapples if the target is not grappled
-		if target:isGrappled(self) then
-			grappled = true
-		else
-			self:breakGrapples()
+		if game.level.map(x, y, Map.ACTOR) then
+			x, y = util.findFreeGrid(x, y, 1, true, {[Map.ACTOR]=true})
+			if not x then return end
 		end
 
-		local hit = self:attackTarget(target, nil, t.getDamage(self, t), true)
-
-		if hit then
-			-- try to daze
-			if target:canBe("stun") then
-				target:setEffect(target.EFF_DAZED, t.getDuration(self, t, self:getCombo(combo)), {apply_power=self:combatPhysicalpower()})
-			else
-				game.logSeen(target, "%s resists the body shot!", target.name:capitalize())
-			end
-
-			target:incStamina(- t.getDrain(self, t))
+		if game.level.map:checkAllEntities(x, y, "block_move") then return end
 
+		local ox, oy = self.x, self.y
+		self:move(x, y, true)
+		if config.settings.tome.smooth_move > 0 then
+			self:resetMoveAnim()
+			self:setMoveAnim(ox, oy, 8, 5)
 		end
 
-		self:clearCombo()
+		self:project(tg, self.x, self.y, function(px, py, tg, self)
+			local target = game.level.map(px, py, Map.ACTOR)
+			if target and target ~= self then
+				local totalDamage = t.getDamage(self, t) * (1 + t.getBonusDamage(self, t) )
+				
 
+				local hit = self:attackTarget(target, nil, totalDamage, true)
+			end
+		end)
+		
+		self:clearCombo()
 		return true
 	end,
 	info = function(self, t)
-		local damage = t.getDamage(self, t) * 100
-		local drain = self:getTalentLevel(t) * 2
-		local daze = t.getDuration(self, t, 0)
-		local dazemax = t.getDuration(self, t, 5)
-		return ([[A punch to the body that deals %d%% damage, drains %d of the target's stamina per combo point, and dazes the target for %d to %d turns, depending on the amount of combo points you've accumulated.
-		The daze chance will increase with your Physical Power.
-		Using this talent removes your combo points.]])
-		:format(damage, drain, daze, dazemax)
+		return ([[You spin into a flying leap and deliver a powerful kick dealing %d%% weapon damage to all enemies in a radius of 1 as you land.  The range will increase by 1 per combo point and total damage will increase by 10%% per combo point.  You must have at least 1 CP to use this talent.]]):format(t.getDamage(self, t)*100)	
 	end,
 }
 
@@ -193,8 +199,8 @@ newTalent{
 	tactical = { ATTACK = { weapon = 2 } },
 	requires_target = true,
 	--on_pre_use = function(self, t, silent) if not self:hasEffect(self.EFF_COMBO) then if not silent then game.logPlayer(self, "You must have a combo going to use this ability.") end return false end return true end,
-	getDamage = function(self, t) return self:combatTalentWeaponDamage(t, 1.4, 2.1) + getStrikingStyle(self, dam) end,
-	getBonusDamage = function(self, t) return self:getCombo(combo)/10 end,
+	getDamage = function(self, t) return self:combatTalentWeaponDamage(t, 2, 3.5) + getStrikingStyle(self, dam) end, 
+	getBonusDamage = function(self, t) return self:getCombo(combo)/5 end, -- shift more of the damage to CP
 	getStamina = function(self, t, comb)
 		return self:combatLimit((self:getTalentLevel(t) + comb), 0.5, 0, 0, 0.2, 10) * self.max_stamina
 	end, -- Limit 50% stamina gain
@@ -211,7 +217,7 @@ newTalent{
 			self:breakGrapples()
 		end
 
-		local damage = t.getDamage(self, t) + (t.getBonusDamage(self, t) or 0)
+		local damage = t.getDamage(self, t) * (1 + (t.getBonusDamage(self, t) or 0))
 
 		local hit = self:attackTarget(target, nil, damage, true)
 
@@ -237,12 +243,12 @@ newTalent{
 	end,
 	info = function(self, t)
 		local damage = t.getDamage(self, t) * 100
+		local maxDamage = damage * 2
 		local stamina = t.getStamina(self, t, 0)/self.max_stamina*100
 		local staminamax = t.getStamina(self, t, 5)/self.max_stamina*100
-		return ([[A vicious finishing strike that deals %d%% damage + 10%% damage per combo point you have.  If the target ends up with low enough life (<20%%), it might be instantly killed.
+		return ([[A vicious finishing strike that deals %d%% damage increased by 20%% per combo point you have up to a max of %d%%.  If the target ends up with low enough life (<20%%), it might be instantly killed.
 		Killing a target with Haymaker will instantly restore %d%% to %d%% of your maximum stamina, depending on the amount of combo points you've accumulated.
 		Using this talent removes your combo points.]])
-		:format(damage, stamina, staminamax)
+		:format(damage, maxDamage, stamina, staminamax)
 	end,
 }
-

@@ -160,7 +160,7 @@ newTalent{
 	random_ego = "attack",
 	cooldown = function(self, t) return math.ceil(12 * getRelentless(self, cd)) end,
 	stamina = 12,
-	range = function(self, t) return math.ceil(self:combatTalentScale(t, 2.2, 4.3)) end,
+	range = function(self, t) return math.ceil(2 + self:combatTalentScale(t, 2.2, 4.3)) end, -- being able to use this over rush without massive investment is much more fun
 	chargeBonus = function(self, t, dist) return self:combatScale(dist, 0.15, 1, 0.50, 5) end,
 	message = "@Source@ lashes out with a spinning backhand.",
 	tactical = { ATTACKAREA = { weapon = 2 }, CLOSEIN = 1 },