2 files changed, 15 insertions, 60 deletions

diff --git a/TemplePushing.c4s/Misc.c4d/AdditionalSpells.c4d/Eisnadeln.c4d/Script.c b/TemplePushing.c4s/Misc.c4d/AdditionalSpells.c4d/Eisnadeln.c4d/Script.c
index 1d439bf..eba7696 100644
--- a/TemplePushing.c4s/Misc.c4d/AdditionalSpells.c4d/Eisnadeln.c4d/Script.c
+++ b/TemplePushing.c4s/Misc.c4d/AdditionalSpells.c4d/Eisnadeln.c4d/Script.c
@@ -1,25 +1,17 @@
-/* Eisnadeln */
+/* Ice Needles */
 
 #strict
 
-local Combo;
 
-
-
-func Activate(pCaster,pRealcaster) {
-Combo=0;
-Sound("Magic",0,pCaster);
-if(FindContents(ABRL,pCaster)) 
+func Activate(pCaster,pRealcaster) 
 {
-Combo=1;
-RemoveObject(FindContents(ABRL,pCaster));
-}
+Sound("Magic",0,pCaster);
   var pClonk;
   if(pRealcaster) pClonk=pRealcaster;
   else pClonk=pCaster;
 
   // Zielen wenn möglich
-  if (pClonk->~DoSpellAim(this())) return(1);
+  if (pClonk->~DoSpellAim(this(), pCaster)) return(1);
   
   var angle=-90;
   if(GetDir(pClonk) == DIR_Right()) angle=90;
@@ -30,57 +22,20 @@ RemoveObject(FindContents(ABRL,pCaster));
 
 // Aktivierung nach Zielen (iAngle: -90=links; 0=oben; +90=rechts)
 public func ActivateAngle(object pCaller, int iAngle)
-  {
-  //var pEffer = CreateObject(_WE_,0,0,GetOwner(this()));
-  //GetTarget(object pTarget,int Interval, string Element, int ElementNumber, int R, int G, int B, int a)
-  //pEffer -> GetTarget(pCaller,0, "Water", 0, 100, 100, 255, 120); 
-  var WasserF = FindContents(WBRL,pCaller);
-  if(WasserF)
-  {
-  RemoveObject(WasserF);
-  CreateContents(FLNT,this());
-  }
-  if(!FindContents(FLNT,this()))
-  {
-  for(var cnt=0;cnt<3;cnt++)
-  {
-  var f=CreateObject(ICNA,AbsX(GetX(pCaller))+Cos(iAngle-90,13),AbsY(GetY(pCaller))+Sin(iAngle-90,13),GetOwner(pCaller));
-  f->Activate(pCaller,iAngle);
-  if(Combo==1) f->LocalN("Gift",f)=1;
-  var combo = FindContents(ICE1,pCaller);
-  if(combo)
-  {
-  RemoveObject(combo);
-  f->CreateContents(ROCK);
- }
-   }
-  AddEffect("RecallMFCSAiming",pCaller,20,1,0,GetID(),iAngle);
-  
-  // Objekt löschen
-  RemoveObject();
-  return(1);
-  } 
-    if(FindContents(FLNT,this()))
-  {
-  for(var cnt=0;cnt<6;cnt++)
-  {
-  var f=CreateObject(ICNA,AbsX(GetX(pCaller))+Cos(iAngle-90,13),AbsY(GetY(pCaller))+Sin(iAngle-90,13),GetOwner(pCaller));
-  f->Activate(pCaller,iAngle);
-    if(Combo==1) f->LocalN("Gift",f)=1;
-  var combo1 = FindContents(ICE1,pCaller);
-  if(combo1)
-  {
-  RemoveObject(combo1);
-  f->CreateContents(ROCK);
- }
+{
+	for(var cnt=0;cnt<3;cnt++)
+	{
+		var f=CreateObject(ICNA,AbsX(GetX(pCaller))+Cos(iAngle-90,13),AbsY(GetY(pCaller))+Sin(iAngle-90,13),GetOwner(pCaller));
+		f->Activate(pCaller,iAngle);
    }
+   
   AddEffect("RecallMFCSAiming",pCaller,20,1,0,GetID(),iAngle);
   
   // Objekt löschen
   RemoveObject();
   return(1);
-  } 
-}
+} 
+
 public func HoldAimer(pCaller)
 {
  return(true);
diff --git a/TemplePushing.c4s/Misc.c4d/AdditionalSpells.c4d/Lavashot.c4d/Script.c b/TemplePushing.c4s/Misc.c4d/AdditionalSpells.c4d/Lavashot.c4d/Script.c
index 40c23c1..e5d7e1b 100644
--- a/TemplePushing.c4s/Misc.c4d/AdditionalSpells.c4d/Lavashot.c4d/Script.c
+++ b/TemplePushing.c4s/Misc.c4d/AdditionalSpells.c4d/Lavashot.c4d/Script.c
@@ -11,11 +11,11 @@ func Activate(pCaster,pRealcaster) {
   if (iResult = CheckEffect("Blast", 0, 125)) return(iResult!=-1 && RemoveObject());
   
   // Zielen wenn möglich
-  if (pClonk->~DoSpellAim(this())) return(1);
+  if (pClonk->~DoSpellAim(this(), pCaster)) return(1);
 
   // Schuss erzeugen
-  var obj = CreateObject(_LVS, 0, 0, GetOwner(pClonk));
-  obj->Launch(pClonk, GetDir(pClonk), GetX(pClonk), GetY(pClonk), 0);
+  var obj = CreateObject(LGTS, -GetX(), -GetY(), GetOwner(pClonk));
+  obj->Launch(GetX(pCaster)+GetVertex(0, VTX_X, pCaster), GetY(pCaster)+GetVertex(0, VTX_Y, pCaster), (!GetDir(pCaster))*1800);
   Sound("Inflame");
   RemoveObject();
   return(1);