From ca61c54b9bd69af897e4cc9d4385137fb56fd11a Mon Sep 17 00:00:00 2001
From: Jan <>
Date: Mon, 2 Feb 2015 17:58:18 +0100
Subject: TemplePushingBeta.c4s

---
 TemplePushing.c4s/System.c4g/ShootInventory.c | 53 +++++++++++++++++++++++----
 1 file changed, 45 insertions(+), 8 deletions(-)

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

diff --git a/TemplePushing.c4s/System.c4g/ShootInventory.c b/TemplePushing.c4s/System.c4g/ShootInventory.c
index f2636dd..20bfef3 100644
--- a/TemplePushing.c4s/System.c4g/ShootInventory.c
+++ b/TemplePushing.c4s/System.c4g/ShootInventory.c
@@ -4,10 +4,13 @@
 
 #appendto AXE1
 #appendto EGBL
+#appendto SFLN
 #appendto EFLN
 #appendto GBLT
 #appendto ROCK
 #appendto SWOR
+#appendto SPER
+#appendto TSWB
 
 protected func Activate(object clonk)
 {
@@ -16,38 +19,72 @@ protected func Activate(object clonk)
 	// Sound
 	if (GetID() == EGBL)
 	{
+		Sound("Blast*");
 		Sound("Crystal3");
 	}
+	else if (GetID() == SPER)
+	{
+		Sound("Arrow");
+	}
+	else if (GetID() == TSWB)
+	{
+		Sound("Arrow");
+	}
 	else if (GetID() == GBLT)
 	{
+        Sound("Blast*");	
 		Sound("Crystal3");
 	}
+	else if (GetID() == SWOR)
+	{
+		Sound("Blast*");
+		Sound("SwordHit*");
+	}
+	else if (GetID() == AXE1)
+	{
+		Sound("Blast*");
+		Sound("AxeHit*");
+	}
 	else
 	{
-		Sound("Blast2");
+		Sound("Blast*");
 	}
 
-	// Make shooting clonk responsible for possible kill
+	// Make shooting clonk responsible for possible kill and owner of object to be shot
 	SetController(clonk->GetOwner());
+	SetOwner(clonk->GetOwner());
 
 	// Shoot
 	if (GetID() == EGBL)
 	{
-		Exit(0, -20 + 40 * clonk->GetDir());
+		Exit(0, -10 + 20 * clonk->GetDir());
+		SetYDir(-10);
 		SetXDir(-100 + 200 * clonk->GetDir());
 	}
 	else if (GetID() == ROCK)
 	{
-		Exit(0, -15 + 30 * clonk->GetDir());
+		Exit(0, -10 + 20 * clonk->GetDir());
+		SetYDir(-15);
 		SetXDir(-100 + 200 * clonk->GetDir());
 	}
+	else if (GetID() == TSWB)
+	{
+		Exit(0, -5 + 10 * clonk->GetDir());
+		SetYDir(-30);
+		SetXDir(-50 + 100 * clonk->GetDir());
+	}
+	else if (GetID() == SPER)
+	{
+		Exit(0, -10 + 20 * clonk->GetDir(), -4, 0 + 180 * clonk->GetDir(), -150 + 300 * clonk->GetDir(), -7);
+		SetYDir(-7);
+		SetXDir(-175 + 350 * clonk->GetDir());
+	}
 	else
 	{
-		Exit(0, -10 + 20 * clonk->GetDir());
+		Exit(0, -10 + 20 * clonk->GetDir(), 0, 0 + 180 * clonk->GetDir(), -80 + 160 * clonk->GetDir(), -15);
+		SetYDir(-15);
 		SetXDir(-80 + 160 * clonk->GetDir());
 	}
-
-	SetYDir(-10);
-
+	
 	return 1;
 }
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf