Skip to content

Commit

Permalink
Merge pull request #1 from jotoland/Level_05_RichardONeal
Browse files Browse the repository at this point in the history
DestroyByContact refactoring
  • Loading branch information
Roneal96 authored Mar 9, 2017
2 parents be690de + bf30221 commit 3d3fd5f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Binary file modified uot/Assets/_Scenes/Level_05.unity
Binary file not shown.
6 changes: 3 additions & 3 deletions uot/Assets/_Scripts/DestroyScripts/DestroyByContact.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ void OnTriggerEnter(Collider other)
Instantiate (explosion, transform.position, transform.rotation);
gameController.spawnRupee (transform.position, other.transform.rotation);
}
// explosion for the missle and the spawning of the explosion collider
if (other.tag == "Missile") {
Instantiate (MissileDamage, other.transform.position, other.transform.rotation);
Instantiate (explosion, transform.position, transform.rotation);
Instantiate (missileExplosion, other.transform.position, other.transform.rotation);
Destroy(other.gameObject);
}
if (other.tag == "SplashDamage") {
Instantiate (explosion, transform.position, transform.rotation);
}

//explosion for ramming the asteroid
if (other.tag == "Player") {
Instantiate (playerExplosion, other.transform.position, other.transform.rotation);
Expand Down

0 comments on commit 3d3fd5f

Please sign in to comment.