From a442ad10798b16ed066d627c45ad62fa5540acd6 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Fri, 7 Dec 2012 11:22:16 +0000
Subject: [PATCH] Summoner's Detonate doesnt hit friends
git-svn-id: http://svn.net-core.org/repos/t-engine4@5979 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/data/talents/gifts/summon-distance.lua | 8 ++++----
game/modules/tome/data/talents/gifts/summon-melee.lua | 8 ++++----
game/modules/tome/data/talents/gifts/summon-utility.lua | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/game/modules/tome/data/talents/gifts/summon-distance.lua b/game/modules/tome/data/talents/gifts/summon-distance.lua
index 7c4c40653f..92e8e3f5df 100644
--- a/game/modules/tome/data/talents/gifts/summon-distance.lua
+++ b/game/modules/tome/data/talents/gifts/summon-distance.lua
@@ -228,7 +228,7 @@ newTalent{
return not checkMaxSummon(self, silent)
end,
on_detonate = function(self, t, m)
- local tg = {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t), talent=t, x=m.x, y=m.y}
+ local tg = {type="ball", range=self:getTalentRange(t), friendlyfire=false, radius=self:getTalentRadius(t), talent=t, x=m.x, y=m.y}
self:project(tg, m.x, m.y, DamageType.FIREBURN, self:mindCrit(self:combatTalentMindDamage(t, 30, 300)), {type="flame"})
end,
on_arrival = function(self, t, m)
@@ -326,7 +326,7 @@ newTalent{
return not checkMaxSummon(self, silent)
end,
on_detonate = function(self, t, m)
- local tg = {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t), talent=t, x=m.x, y=m.y}
+ local tg = {type="ball", range=self:getTalentRange(t), friendlyfire=false, radius=self:getTalentRadius(t), talent=t, x=m.x, y=m.y}
self:project(tg, m.x, m.y, rng.table{DamageType.LIGHTNING,DamageType.ACID,DamageType.POISON}, self:mindCrit(self:combatTalentMindDamage(t, 30, 250)), {type="flame"})
end,
on_arrival = function(self, t, m)
@@ -431,7 +431,7 @@ newTalent{
return not checkMaxSummon(self, silent)
end,
on_detonate = function(self, t, m)
- local tg = {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t), talent=t, x=m.x, y=m.y}
+ local tg = {type="ball", range=self:getTalentRange(t), friendlyfire=false, radius=self:getTalentRadius(t), talent=t, x=m.x, y=m.y}
self:project(tg, m.x, m.y, DamageType.ICE, self:mindCrit(self:combatTalentMindDamage(t, 30, 300)), {type="freeze"})
end,
on_arrival = function(self, t, m)
@@ -537,7 +537,7 @@ newTalent{
self:getTalentRadius(t),
5, nil,
{type="inferno"},
- nil, true
+ nil, false, false
)
end,
on_arrival = function(self, t, m)
diff --git a/game/modules/tome/data/talents/gifts/summon-melee.lua b/game/modules/tome/data/talents/gifts/summon-melee.lua
index 50fbc3242c..24b9c5e662 100644
--- a/game/modules/tome/data/talents/gifts/summon-melee.lua
+++ b/game/modules/tome/data/talents/gifts/summon-melee.lua
@@ -35,7 +35,7 @@ newTalent{
return not checkMaxSummon(self, silent)
end,
on_detonate = function(self, t, m)
- local tg = {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t), talent=t, x=m.x, y=m.y}
+ local tg = {type="ball", range=self:getTalentRange(t), friendlyfire=false, radius=self:getTalentRadius(t), talent=t, x=m.x, y=m.y}
self:project(tg, m.x, m.y, DamageType.PHYSICAL, self:mindCrit(self:combatTalentMindDamage(t, 30, 250)), {type="flame"})
end,
on_arrival = function(self, t, m)
@@ -128,7 +128,7 @@ newTalent{
return not checkMaxSummon(self, silent)
end,
on_detonate = function(self, t, m)
- local tg = {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t), talent=t, x=m.x, y=m.y}
+ local tg = {type="ball", range=self:getTalentRange(t), friendlyfire=false, radius=self:getTalentRadius(t), talent=t, x=m.x, y=m.y}
self:project(tg, m.x, m.y, DamageType.SLIME, self:mindCrit(self:combatTalentMindDamage(t, 30, 200)), {type="flame"})
end,
on_arrival = function(self, t, m)
@@ -230,7 +230,7 @@ newTalent{
return not checkMaxSummon(self, silent)
end,
on_detonate = function(self, t, m)
- local tg = {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t), talent=t, x=m.x, y=m.y}
+ local tg = {type="ball", range=self:getTalentRange(t), friendlyfire=false, radius=self:getTalentRadius(t), talent=t, x=m.x, y=m.y}
self:project(tg, m.x, m.y, DamageType.BLEED, self:mindCrit(self:combatTalentMindDamage(t, 30, 350)), {type="flame"})
end,
on_arrival = function(self, t, m)
@@ -329,7 +329,7 @@ newTalent{
return not checkMaxSummon(self, silent)
end,
on_detonate = function(self, t, m)
- local tg = {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t), talent=t, x=m.x, y=m.y}
+ local tg = {type="ball", range=self:getTalentRange(t), friendlyfire=false, radius=self:getTalentRadius(t), talent=t, x=m.x, y=m.y}
self:project(tg, m.x, m.y, DamageType.PHYSKNOCKBACK, {dam=self:mindCrit(self:combatTalentMindDamage(t, 30, 150)), dist=4}, {type="flame"})
end,
on_arrival = function(self, t, m)
diff --git a/game/modules/tome/data/talents/gifts/summon-utility.lua b/game/modules/tome/data/talents/gifts/summon-utility.lua
index fa25458abf..4f9cd7d133 100644
--- a/game/modules/tome/data/talents/gifts/summon-utility.lua
+++ b/game/modules/tome/data/talents/gifts/summon-utility.lua
@@ -210,7 +210,7 @@ newTalent{
end,
requires_target = true,
on_detonate = function(self, t, m)
- local tg = {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t), talent=t, x=m.x, y=m.y}
+ local tg = {type="ball", range=self:getTalentRange(t), friendlyfire=false, radius=self:getTalentRadius(t), talent=t, x=m.x, y=m.y}
self:project(tg, m.x, m.y, function(px, py)
local target = game.level.map(px, py, Map.ACTOR)
if not target or self:reactionToward(target) >= 0 then return end
--
GitLab