diff options
| author | Mittendrein Markus <maxmitti@gmx.net> | 2016-03-03 15:05:19 +0100 |
|---|---|---|
| committer | Mittendrein Markus <maxmitti@gmx.net> | 2016-03-03 15:05:19 +0100 |
| commit | e1b30572d41977d9c57982873103437de367311e (patch) | |
| tree | b866311c38edc309064f4c6ae04db4ecea9ae2c1 | |
| parent | 21c1fd36600dfb3edccbbf8df1075243002b2b90 (diff) | |
| download | tempelschubsen-e1b30572d41977d9c57982873103437de367311e.tar.gz tempelschubsen-e1b30572d41977d9c57982873103437de367311e.zip | |
Crystal spikes dont hit attached objects
| -rw-r--r-- | TemplePushing.c4s/Misc.c4d/AdditionalSpells.c4d/CrystalSpikes.c4d/Kristall.c4d/Script.c | 4 | ||||
| -rw-r--r-- | TemplePushing.c4s/System.c4g/Find_Criterions.c (renamed from TemplePushing.c4s/System.c4g/Find_Angle.c) | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/TemplePushing.c4s/Misc.c4d/AdditionalSpells.c4d/CrystalSpikes.c4d/Kristall.c4d/Script.c b/TemplePushing.c4s/Misc.c4d/AdditionalSpells.c4d/CrystalSpikes.c4d/Kristall.c4d/Script.c index 2f5cc9b..09d958b 100644 --- a/TemplePushing.c4s/Misc.c4d/AdditionalSpells.c4d/CrystalSpikes.c4d/Kristall.c4d/Script.c +++ b/TemplePushing.c4s/Misc.c4d/AdditionalSpells.c4d/CrystalSpikes.c4d/Kristall.c4d/Script.c @@ -28,7 +28,7 @@ func StossEffect() if (!GetEffect("NoCrystalAttack", pClonk)) HitObject(pClonk); } } - for (var pDing in FindObjects(Find_Distance(30), Find_Category(C4D_Object), Find_NoContainer(), Find_Not(Find_ID(QBCY)))) + for (var pDing in FindObjects(Find_Distance(30), Find_Category(C4D_Object), Find_NoContainer(), Find_Not(Find_ID(QBCY)), Find_Not(Find_Procedure("ATTACH")))) { HitDing(pDing); } @@ -62,6 +62,7 @@ global func CreateBigCrystal(int iX, int iY, int iCon, int iMTime, int iOwner) func HitObject(object pClonk) { + DebugLog("HitObject(%v)", pClonk); Sound("Crystal2", 0, pClonk); DoEnergy(-20, pClonk); Fling(pClonk, RandomX(-4, 4), RandomX(-5, -9)); @@ -70,6 +71,7 @@ func HitObject(object pClonk) func HitDing(object pDing) { + DebugLog("HitDing(%v)", pDing); if (pDing) { SetSpeed(RandomX(-4, 4), RandomX(-20, -40), pDing); diff --git a/TemplePushing.c4s/System.c4g/Find_Angle.c b/TemplePushing.c4s/System.c4g/Find_Criterions.c index 4d403d6..406bb5a 100644 --- a/TemplePushing.c4s/System.c4g/Find_Angle.c +++ b/TemplePushing.c4s/System.c4g/Find_Criterions.c @@ -31,3 +31,8 @@ global func Find_AngleCheck(int angleStart, int angleEnd, bool biggerPart, int x else ret = inside;
return ret;
}
+
+global func Find_Procedure(string procedure)
+{
+ return Find_FuncEqual("GetProcedure()", procedure);
+}
|