Added building explosion effect. Fixes #64

brainwipe · Aug 18, 2018 · a070328 · a070328
1 parent c556eb4
commit a070328
Show file tree

Hide file tree

Showing 8 changed files with 23,447 additions and 340 deletions.
diff --git a/Assets/Resources/Buildings/boiler-medium.prefab b/Assets/Resources/Buildings/boiler-medium.prefab
diff --git a/Assets/Resources/Buildings/bridge-standard.prefab b/Assets/Resources/Buildings/bridge-standard.prefab
diff --git a/Assets/Resources/Buildings/house-small-one.prefab b/Assets/Resources/Buildings/house-small-one.prefab
diff --git a/Assets/Resources/Buildings/store-small.prefab b/Assets/Resources/Buildings/store-small.prefab
diff --git a/Assets/Resources/Buildings/weapon-cannon.prefab b/Assets/Resources/Buildings/weapon-cannon.prefab
diff --git a/Assets/Resources/Shaders/Building.ShaderGraph b/Assets/Resources/Shaders/Building.ShaderGraph
diff --git a/Assets/Scripts/Builder/Buildings/Boiler.cs b/Assets/Scripts/Builder/Buildings/Boiler.cs
@@ -4,20 +4,19 @@
 
 public class Boiler : MonoBehaviour 
 {
+	public ParticleSystem smoke;
 	Building building;
-	ParticleSystem particles;
 	FlyingPhysics flyingPhysics;
 	IFly parent;
 
 	void Start () 
 	{
-		particles = GetComponentInChildren<ParticleSystem>();
 		flyingPhysics = GetComponentInParent<FlyingPhysics>();
 		parent = GetComponentInParent<IFly>();		
 		building = GetComponent<Building>();
 
-		var emitter = particles.emission;
-		emitter.enabled = !building.InMenu;
+		var smokeEmitter = smoke.emission;
+		smokeEmitter.enabled = !building.InMenu;
 	}
 
 	void FixedUpdate() 
@@ -27,14 +26,14 @@ void FixedUpdate()
 			return;
 		}
 
-		var main = particles.main;
-		var emitter = particles.emission;
+		var smokeMain = smoke.main;
+		var smokeEmitter = smoke.emission;
 
-		main.startSpeed = Maths.Rescale(6, 10, 0, 1, Mathf.Abs(parent.CommandThrust));
-		emitter.rateOverTime = Maths.Rescale(0.3f, 12, 0, 1f, Mathf.Abs(parent.CommandThrust));
+		smokeMain.startSpeed = Maths.Rescale(6, 10, 0, 1, Mathf.Abs(parent.CommandThrust));
+		smokeEmitter.rateOverTime = Maths.Rescale(0.3f, 12, 0, 1f, Mathf.Abs(parent.CommandThrust));
 
 		var windEffect = flyingPhysics.CycloneForce * 0.002f;
-		var forceOverLifetime = particles.forceOverLifetime;
+		var forceOverLifetime = smoke.forceOverLifetime;
 		forceOverLifetime.x = windEffect.x;
 		forceOverLifetime.y = windEffect.y;
 		forceOverLifetime.z = windEffect.z; 

diff --git a/Assets/Scripts/Builder/Buildings/Building.cs b/Assets/Scripts/Builder/Buildings/Building.cs
@@ -8,6 +8,7 @@ public class Building : MonoBehaviour, IAmBuilding, ITakeDamage, IHaveAbilities
     public static string BuildingTag = "Building";
     public string Id;
     public IAmAShip owner;
+    public ParticleSystem DeathExplosion;
     Renderer[] highlightTargets;
     Rigidbody rigidBody;
 
@@ -208,10 +209,12 @@ public void Damage(float amount)
         }
 
         Health -= amount;
-        SetShaderFloat("Vector1_89360613", Health/MaxHealth);
         if (Health < 1)
         {
-            Remove();
+            DeathExplosion.Play();
+            DeathExplosion.gameObject.transform.parent = null;
+            Destroy(DeathExplosion.gameObject, DeathExplosion.main.duration);
+            Destroy(gameObject, DeathExplosion.main.duration / 2f);
         }
     }