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

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

@@ -91,7 +91,9 @@ newTalent{
 	no_npc_use = true,  -- so rares don't learn useless talents
 	allow_temporal_clones = true,  -- let clones copy it anyway so they can benefit from the effects
 	on_pre_use = function(self, t, silent) if self ~= game.player and not self:isTalentActive(t) then return false end return true end,  -- but don't let them cast it
-	callbackOnHit = function(self, t, cb)
+	callbackOnHit = function(self, t, cb, src)
+		if src == self then return cb.value end
+	
 		local p = self:isTalentActive(t.id)
 		local life_after = self.life - cb.value
 		local cont_trigger = self.max_life * t.getTrigger(self, t)

game/modules/tome/data/talents/chronomancy/fate-weaving.lua

@@ -60,7 +60,7 @@ newTalent{
 	points = 5,
 	paradox = function (self, t) return getParadoxCost(self, t, 10) end,
 	cooldown = 12,
-	tactical = { BUFF = 2, DEBUFF = 2 },
+	tactical = { BUFF = 2, DISABLE = 2 },
 	getDuration = function(self, t) return getExtensionModifier(self, t, 5) end,
 	getChance = function(self, t) return self:combatTalentLimit(t, 50, 10, 40) end, -- Limit < 50%end,
 	getProcs = function(self, t) return math.floor(self:combatTalentScale(t, 1, 5)) end,

game/modules/tome/data/talents/chronomancy/spacetime-folding.lua

@@ -397,7 +397,7 @@ newTalent{
 	points = 5,
 	paradox = function (self, t) return getParadoxCost(self, t, 12) end,
 	cooldown = 4,
-	tactical = { ESCAPE = 2, DEBUFF = 2 },
+	tactical = { ESCAPE = 2, DISABLE = 2 },
 	range = function(self, t) return self:callTalent(self.T_WARP_MINES, "getRange") or 5 end,
 	radius = 3,
 	getTeleport = function(self, t) return math.floor(self:combatTalentScale(t, 8, 16)) end,

game/modules/tome/data/talents/chronomancy/timeline-threading.lua

@@ -194,7 +194,7 @@ newTalent{
 	info = function(self, t)
 		local duration = t.getDuration(self, t)
 		return ([[For the next %d turns two alternate versions of you enter your timeline.  While the effect is active all damage done by you or your copies is reduced by two thirds and all damage received is split between the three of you.
-		Temporal Fugue does not normally cooldown while active.  You may take direct control of your clones.
+		Temporal Fugue does not normally cooldown while active.  You may take direct control of your clones, give them orders, and set their talent usage.
 		Damage you deal to Fugue Clones or that they deal to you or each other is reduced to zero.]]):
 		format(duration)
 	end,

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

@@ -27,7 +27,7 @@ newTalent{
 	cooldown = 3,
 	fixed_cooldown = true,
 	paradox = function (self, t) return getParadoxCost(self, t, 10) end,
-	tactical = { ATTACK = {TEMPORAL = 2}, DISABLE = 1 },
+	tactical = { ATTACK = {TEMPORAL = 2} },
 	range = 10,
 	reflectable = true,
 	proj_speed = 3,
@@ -112,7 +112,7 @@ newTalent{
 	points = 5,
 	cooldown = 6,
 	paradox = function (self, t) return getParadoxCost(self, t, 10) end,
-	tactical = { ATTACK = {TEMPORAL = 1}, DISABLE = 2 },
+	tactical = { ATTACK = {TEMPORAL = 1}, DISABLE = 1 },
 	range = 10,
 	direct_hit = true,
 	requires_target = true,