Merge branch 'master' of git.net-core.org:tome/t-engine4

game/modules/tome/data/talents/chronomancy/guardian.lua

@@ -102,7 +102,7 @@ newTalent{
 				m:takeHit(split, src)
 				m:setTarget(src or nil)
 				game:delayedLogMessage(self, nil, "guardian_damage", "#STEEL_BLUE##Source# shares damage with %s guardian!", string.his_her(self))
-				game:delayedLogDamage(src or self, self, 0, ("#STEEL_BLUE#(%d shared)#LAST#"):tformat(split), nil)
+				game:delayedLogDamage(src or self, self, 0, ("#STEEL_BLUE#(%d shared)#LAST#"):tformat(split*2), nil)
 
 			else
 				game.logPlayer(self, "Not enough space to summon warden!")

game/modules/tome/data/talents/techniques/archery.lua

@@ -61,8 +61,8 @@ newTalent{
 		if self.mark_steady then self.mark_steady = nil end
 	end,
 	archery_onhit = function(self, t, target, x, y)
-		if self:knowTalent(self.T_MASTER_MARKSMAN) then
-			local chance = 15 + (self.mark_steady or 0)
+		if self:knowTalent(self.T_MASTER_MARKSMAN) or self.mark_steady then
+			local chance = (self:knowTalent(self.T_MASTER_MARKSMAN) and 15 or 0) + (self.mark_steady or 0)
 			if self:hasEffect(self.EFF_TRUESHOT) then chance = chance + (chance * self:callTalent(self.T_TRUESHOT, "getMarkChance")/100) end
 			if self:isTalentActive(self.T_AIM) then	
 				chance = chance + self:callTalent(self.T_AIM, "getMarkChance") 

game/modules/tome/data/talents/techniques/grappling.lua

@@ -167,7 +167,6 @@ newTalent{
 	getDamage = function(self, t)
 		return self:combatTalentWeaponDamage(t, .1, 1)
 	end,
-	range = 1,
 	target = function(self, t)
 		if self:hasEffect(self.EFF_GRAPPLING) then return {type="ball", range=1, radius=5, selffire=false} end
 		return {type="hit", range=self:getTalentRange(t)}
@@ -190,7 +189,11 @@ newTalent{
 			local tg = self:getTalentTarget(t)
 			local x, y, target = self:getTarget(tg)
 			if not target or not self:canProject(tg, x, y) then return nil end
-
+            
+            if core.fov.distance(self.x, self.y, x, y) > 1 and self:attr("never_move") then
+                game.logPlayer(self, "You cannot move!")
+                return nil
+            end
 			local grappled = false
 
 			-- do the rush

game/modules/tome/data/timed_effects/other.lua

@@ -3847,7 +3847,7 @@ newEffect{
 		if eff.resistGain and eff.resistGain > 0 then
 			local gainList = {}
 			for id, resist in pairs(eff.target.resists) do
-				if resist > 0 and id ~= "all" then
+				if resist > 0 and id ~= "all" and id ~= "absolute" then
 					gainList[id] = eff.resistGain * 0.01 * resist
 				end
 			end
@@ -3940,7 +3940,7 @@ newEffect{
 		if eff.resistLoss and eff.resistLoss < 0 then
 			local lossList = {}
 			for id, resist in pairs(self.resists) do
-				if resist > 0 and id ~= "all" then
+				if resist > 0 and id ~= "all" and id ~= "absolute" then
 					lossList[id] = eff.resistLoss * 0.01 * resist
 				end
 			end