summaryrefslogtreecommitdiffstats
path: root/TemplePushing.c4s/Misc.c4d/AdditionalSpells.c4d
diff options
context:
space:
mode:
authorMarkus Mittendrein <git@maxmitti.tk>2019-04-09 00:39:10 +0200
committerMarkus Mittendrein <git@maxmitti.tk>2019-04-09 00:39:10 +0200
commite27e48a4642de9451a14f6531b69c34e3e28b93e (patch)
tree6cfb7542d52f27b367feab236aca0421701e76cd /TemplePushing.c4s/Misc.c4d/AdditionalSpells.c4d
parent376c20e8d9d0379ceffa28f459a3475e939cc6eb (diff)
downloadtempelschubsen-e27e48a4642de9451a14f6531b69c34e3e28b93e.tar.gz
tempelschubsen-e27e48a4642de9451a14f6531b69c34e3e28b93e.zip
Add hyper deflection handling to rock strike rocks
Diffstat (limited to 'TemplePushing.c4s/Misc.c4d/AdditionalSpells.c4d')
-rw-r--r--TemplePushing.c4s/Misc.c4d/AdditionalSpells.c4d/Deflection.c4d/Script.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/TemplePushing.c4s/Misc.c4d/AdditionalSpells.c4d/Deflection.c4d/Script.c b/TemplePushing.c4s/Misc.c4d/AdditionalSpells.c4d/Deflection.c4d/Script.c
index 44319f8..19bcede 100644
--- a/TemplePushing.c4s/Misc.c4d/AdditionalSpells.c4d/Deflection.c4d/Script.c
+++ b/TemplePushing.c4s/Misc.c4d/AdditionalSpells.c4d/Deflection.c4d/Script.c
@@ -68,7 +68,7 @@ func FxDeflectionPSpellTimer(pClonk, iEffectNumber, iEffectTime)
var categoryCondition = Find_Category(C4D_Object);
if(hyper)
{
- categoryCondition = Find_Or(categoryCondition, Find_Func("HyperDeflectable", pClonk));
+ categoryCondition = Find_And(Find_Or(categoryCondition, Find_Func("HyperDeflectable", pClonk)), Find_Not(Find_Func("HyperDeflectionIgnore", pClonk)));
}
for(var pObj in FindObjects(Find_Not(Find_And(Find_Func("GetContact", 0, -1, CNAT_Bottom))), Find_Layer(GetObjectLayer()), Find_NoContainer(), categoryCondition, Find_Distance(200, GetX(pClonk), GetY(pClonk)), Find_Not(Find_Distance(11, GetX(pClonk), GetY(pClonk)))))
{