From dae7a16d20092e678eec6734d082da03343c5083 Mon Sep 17 00:00:00 2001
From: Markus Mittendrein <git@maxmitti.at>
Date: Fri, 23 Aug 2024 21:25:33 +0200
Subject: Fix loud lavashot sound

---
 .../Lavashot.c4d/Shot.c4d/Script.c                 | 47 +++++++++++-----------
 1 file changed, 23 insertions(+), 24 deletions(-)

(limited to 'TemplePushing.c4s/Misc.c4d/AdditionalSpells.c4d/Lavashot.c4d/Shot.c4d/Script.c')

diff --git a/TemplePushing.c4s/Misc.c4d/AdditionalSpells.c4d/Lavashot.c4d/Shot.c4d/Script.c b/TemplePushing.c4s/Misc.c4d/AdditionalSpells.c4d/Lavashot.c4d/Shot.c4d/Script.c
index 61bfea9..a42a23c 100644
--- a/TemplePushing.c4s/Misc.c4d/AdditionalSpells.c4d/Lavashot.c4d/Shot.c4d/Script.c
+++ b/TemplePushing.c4s/Misc.c4d/AdditionalSpells.c4d/Lavashot.c4d/Shot.c4d/Script.c
@@ -12,7 +12,7 @@ func Initialize() {
   //Killtrace Effect
   AddEffect("KillTraceHelper",this(),175,0,this(),GetID(this()));
   }
-	  
+
 /* Aktivierung */
 
 public func Activate(iStartX, iStartY, iAdvanceX, iRandomX, iAdvanceY, iRandomY)
@@ -42,28 +42,28 @@ public func Launch(pClonk, iDir, iX, iY, iAngle)
 
 private func Timer()
 {
-  
+
   var i=0;
   var pObject = FindObject(0,-2,-2,4,4,OCF_Inflammable);
-  if(pObject) 
-   if(pObject != pCaster) { 
+  if(pObject)
+   if(pObject != pCaster) {
       //Nicht benötigt, macht Query Catch Blow
-      //if(GetEffect("KillSymbols",pObject)) SetKillSymbols(pObject,GetEffect("KillSymbols",pObject),DFLM,GetEffect("KillTraceHelper",this()));	
+      //if(GetEffect("KillSymbols",pObject)) SetKillSymbols(pObject,GetEffect("KillSymbols",pObject),DFLM,GetEffect("KillTraceHelper",this()));
 	Incinerate(pObject);
 	}
   // Partikel-Effekt
   while(i<GetVertexNum()-1)
   {
-    DrawParticleLine ("LightningSpark", GetVertex(i)-GetX(), GetVertex(i, 1)-GetY(), 
+    DrawParticleLine ("LightningSpark", GetVertex(i)-GetX(), GetVertex(i, 1)-GetY(),
 		    GetVertex(i+1)-GetX(), GetVertex(i+1,1)-GetY(), 6, 60, RGB(250,100,0));
-    DrawParticleLine ("LightningSpark", GetVertex(i)-GetX(), GetVertex(i, 1)-GetY(), 
+    DrawParticleLine ("LightningSpark", GetVertex(i)-GetX(), GetVertex(i, 1)-GetY(),
 		    GetVertex(i+1)-GetX(), GetVertex(i+1,1)-GetY(),  3, 25, RGB(250,050,025));
     i++;
- 
+
  //CreateParticle("PSpark", RandomX(-3,4), RandomX(-1,2), RandomX(-2,1), RandomX(-1,2), RandomX(10,20), RGB(250,020,010));
  //CreateParticle("PSpark", RandomX(-3,3), RandomX(-2,2), RandomX(-2,2), RandomX(-2,2), RandomX(20,50), RGB(250,050,020));
 
- 
+
   }
 }
 
@@ -81,7 +81,7 @@ private func Advance()
     return(Remove());
 
   SetPosition(GetVertex(GetVertexNum()), GetVertex(GetVertexNum(), 1));
-  
+
   // Im Wasser?
   if (GBackLiquid(iVtxX-GetX(), iVtxY-GetY() ))
   {
@@ -95,16 +95,16 @@ private func Advance()
   	    Punch(obj, 20);
 		//Regelt Query Catch Blow
                 //if(GetEffect("KillSymbols",obj)) SetKillSymbols(obj,GetEffect("KillSymbols",obj),_LVS);
-            
-        
-           DrawParticleLine ("LightningSpark2", iVtxX-GetX(), iVtxY-GetY(), 
+
+
+           DrawParticleLine ("LightningSpark2", iVtxX-GetX(), iVtxY-GetY(),
 		    GetX(obj)-GetX(), GetY(obj)-GetY(), 6, 60, RGB(255,010,055));
-            DrawParticleLine ("LightningSpark2", iVtxX-GetX(), iVtxY-GetY(), 
+            DrawParticleLine ("LightningSpark2", iVtxX-GetX(), iVtxY-GetY(),
 		    GetX(obj)-GetX(), GetY(obj)-GetY(),  3, 25, RGB(250,050,055));
           }
 	  return(Remove());
   }
-  
+
   // Objektanziehung
   iVtx = GetVertexNum()-1; iVtxX = GetVertex(iVtx, 0); iVtxY = GetVertex(iVtx, 1);
   var obj;
@@ -115,9 +115,9 @@ private func Advance()
     Attraction(obj);
     break;
   }
-  
+
   Timer();
-  // Weiter	
+  // Weiter
   return();
 }
 
@@ -127,7 +127,7 @@ private func Sparkle()
 {
   Timer();
   var iVtx = GetVertexNum()-1, iVtxX = GetVertex(iVtx, 0), iVtxY = GetVertex(iVtx, 1);
- 
+
   return(1);
 }
 
@@ -143,7 +143,7 @@ private func Attraction(obj)
   Punch(obj, 7);
   Incinerate(obj);
   //Übernimmt QueryCatchBlow
-  //if(GetEffect("KillSymbols",obj)) SetKillSymbols(obj,GetEffect("KillSymbols",obj),_LVS,GetEffect("KillTraceHelper",this()));  
+  //if(GetEffect("KillSymbols",obj)) SetKillSymbols(obj,GetEffect("KillSymbols",obj),_LVS,GetEffect("KillTraceHelper",this()));
 }
 
 /* Ende */
@@ -154,13 +154,12 @@ private func Remove()
   // Nachleuchten
   while(i<GetVertexNum()-1)
   {
-    Explode(2,this());
-    DrawParticleLine ("Blast", GetVertex(i)-GetX(), GetVertex(i, 1)-GetY(), 
+    DrawParticleLine ("Blast", GetVertex(i)-GetX(), GetVertex(i, 1)-GetY(),
 		    GetVertex(i+1)-GetX(), GetVertex(i+1,1)-GetY(), 6, 60, RGB(255,100,000));
-    DrawParticleLine ("Blast", GetVertex(i)-GetX(), GetVertex(i, 1)-GetY(), 
+    DrawParticleLine ("Blast", GetVertex(i)-GetX(), GetVertex(i, 1)-GetY(),
 		    GetVertex(i+1)-GetX(), GetVertex(i+1,1)-GetY(),  3, 25, RGB(250,150,155));
     i++;
   }
-  
-  RemoveObject();
+
+  Explode(2, this());
 }
-- 
cgit v1.2.3-54-g00ecf