diff options
Diffstat (limited to 'TemplePushing.c4s')
| -rw-r--r-- | TemplePushing.c4s/Misc.c4d/AdditionalSpells.c4d/Deflection.c4d/Script.c | 2 | ||||
| -rw-r--r-- | TemplePushing.c4s/System.c4g/BigRock.c | 11 |
2 files changed, 12 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))))) { diff --git a/TemplePushing.c4s/System.c4g/BigRock.c b/TemplePushing.c4s/System.c4g/BigRock.c index 6e97fe0..35a3094 100644 --- a/TemplePushing.c4s/System.c4g/BigRock.c +++ b/TemplePushing.c4s/System.c4g/BigRock.c @@ -1,4 +1,5 @@ /*-- Prevent rock strike from hitting allies --*/
+/*-- And some hyper deflection stuff --*/
#appendto BIRK
#strict 2
@@ -6,3 +7,13 @@ func QueryOwnCatchBlow(object target) {
return !Hostile(GetOwner(), target->GetOwner());
}
+
+func HyperDeflection(int newAngle, int newSpeed, object by)
+{
+ SetOwner(GetOwner(by));
+}
+
+func HyperDeflectionIgnore(object by)
+{
+ return !Hostile(GetOwner(), GetOwner(by));
+}
\ No newline at end of file |