From a661dbea3f511c7d02e82344affb05afd44d96fc Mon Sep 17 00:00:00 2001
From: Mittendrein Markus <maxmitti@gmx.net>
Date: Tue, 1 Mar 2016 21:28:53 +0100
Subject: Pushing does damage to the stoneshield

---
 TemplePushing.c4s/System.c4g/Clonk.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'TemplePushing.c4s/System.c4g/Clonk.c')

diff --git a/TemplePushing.c4s/System.c4g/Clonk.c b/TemplePushing.c4s/System.c4g/Clonk.c
index d28032a..d94381c 100644
--- a/TemplePushing.c4s/System.c4g/Clonk.c
+++ b/TemplePushing.c4s/System.c4g/Clonk.c
@@ -55,15 +55,22 @@ protected func ControlSpecial()
 		Find_InRect(-20 + GetDir() * 29, 0, 12, 10),
 		Find_OCF(OCF_Alive),
 		Find_Hostile(GetOwner()),
-		Find_Not(Find_Action("Tumble")),
-		Find_Not(Find_Effect("StoneShieldPSpell")));
+		Find_Not(Find_Action("Tumble")));
 		
 	if (GetLength(clonks) == 0) return 0;
 
 	// Randomly select clonk to be pushed
 	var target = clonks[Random(GetLength(clonks))];
-	Fling(target, -1 + GetDir() * 2, -1);
-	target->SetKiller(GetOwner());
+	var effect;
+	if(effect = GetEffect("StoneShieldPSpell", target))
+	{
+		EffectCall(target, effect, "Damage", -3000, FX_Call_EngGetPunched);
+	}
+	else
+	{
+		Fling(target, -1 + GetDir() * 2, -1);
+		target->SetKiller(GetOwner());
+	}
 
 	return 1;
 }
-- 
cgit v1.2.3-54-g00ecf