From 2bfff5b899bd3fc35c99ae2ad666f663fd96e310 Mon Sep 17 00:00:00 2001
From: FrancisGallant <gallanker@gmail.com>
Date: Thu, 3 Dec 2015 11:35:20 -0500
Subject: [PATCH] fix de missile

---
 Assets/MissileTravel.cs          |   7 +++++++
 Assets/Prefabs/Missile.prefab    | Bin 7748 -> 7880 bytes
 Assets/Prefabs/megaman.prefab    | Bin 12236 -> 12288 bytes
 Assets/Scenes/Master_Scene.unity | Bin 18564 -> 18620 bytes
 Assets/ShootingScript.cs         |  11 ++++++++++-
 5 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Assets/MissileTravel.cs b/Assets/MissileTravel.cs
index 06f7c27..449dc57 100644
--- a/Assets/MissileTravel.cs
+++ b/Assets/MissileTravel.cs
@@ -3,7 +3,9 @@ using System.Collections;
 
 public class MissileTravel : MonoBehaviour {
     public float missileSpeed;
+    public float range;
     private Transform missilePos;
+    private float startingPosX;
     private bool inContact = false;
 
     // ajouter du damage
@@ -11,6 +13,7 @@ public class MissileTravel : MonoBehaviour {
 	// Use this for initialization
 	void Start () {
         this.missilePos = this.transform;
+        this.startingPosX = this.transform.position.x;
 	}
 	
 	// Update is called once per frame
@@ -19,6 +22,10 @@ public class MissileTravel : MonoBehaviour {
         {
             this.missilePos.Translate(new Vector3(missileSpeed, 0, 0) * Time.deltaTime);
         }
+        if (Mathf.Abs(this.startingPosX - this.missilePos.position.x) >= range)
+        {
+            Destroy(this.gameObject);
+        }
 	}
 
     void OnCollisionEnter2D(Collision2D other) {
diff --git a/Assets/Prefabs/Missile.prefab b/Assets/Prefabs/Missile.prefab
index cc5c902ce8f1de4ff0671f3e599a0715f8baf138..cfdfce5b43dd9d091aa7dc2a715ee44ce61047b4 100644
GIT binary patch
delta 212
zcmX?NbHY}DfkC>9fkEyB0|Ns;kiB4{fTpOCxy#qJ!OmItKXAO=_T}MiDWIhFM!#q#
zF-8VPhJ_3a4W>X579f@cVg`=M4_LJYGmDEeb5er~Qd3hHiW2kEQ#apbN*AB(Bvr@g
zGx?yDIOB)OH>IRmXD~4^OxXNWDwm0Efg=OM0>{ZRvKEu)$hIf}B~Sn>kOwvhNQ2~z
a3?^@sl@j9tGINnEgGvd?DNXK><pBWt>NU*(

delta 101
zcmX?Md&EY7fk8TpfkDoNfq{V^$ZnV@pecIx?l$Z5Wpg>CB_sFkWteLu36wP5=oig2
z`5=?&=08kn;*(RPY8X8xKa>(@d@=c_lr-xECI$wR&63i&OiTrilPAdTnEXIiZ1OHS
FJ^<NUA5{PV

diff --git a/Assets/Prefabs/megaman.prefab b/Assets/Prefabs/megaman.prefab
index d0c7fa6597f3696f6db45dfbbde0e4685b46e476..8ef3d08c1c26aee7d1a8f49f36ad9671fd68cb73 100644
GIT binary patch
delta 70
zcmX>T-;lt;z@WK-fx&=bBgYaA#sizzYUHyqGESD&H)dp>9H^fz$;ZIJkQ*PIUsRHr
Zm+oJbl3K*Tzz7sGoP1DIdGY~$9ssHQ6DI%w

delta 44
zcmZojI1|soz@WK-fkFSwMvf&Kj6IvzYUHyqGEA1$H)dp-9H^f@`GO|L<P2RN05cB_
APXGV_

diff --git a/Assets/Scenes/Master_Scene.unity b/Assets/Scenes/Master_Scene.unity
index 32368b71da788684b6f7e3a98a33e39d77c95496..c0e3e034a511546c3cd179a9e8499ed83e55216a 100644
GIT binary patch
delta 202
zcmZpf$hc=BBL@S6<s}9Nk3AbX)>ufkFflN^WCr2?{~3Tlps2A3L_17AYaz{eVDd{K
znX#GGav>9kktG<IPF`ni#cpT-0w$Z^Tc6}$<epsUDmD4Gt<dJDF8z#?UED+_ceuq&
zZt!4{`orkL2r`ckh;!qE^NUI{^V0o`Qc{a1$JvNY{$R-hQa1UGn+BLI;{Jl^|NqJV
h+@nNx$fY`PT|eyr)Of%ny3Rp#a=ydlhn6BB^#JewLoWaT

delta 186
zcmdlpk+EeWBL@S6<s}9NkCu%bYb+!Km>3vdGK28{{|rDNP}EoiqB$m?wUB1)nEVn*
z8f<2@T*$;>VPa`$WM*MBd7ZTtyQ#6EnUSga=J(boIT*Pn7rIJKzHKYC`Ke1k<769K
zfypgy36noqvP_n7*O~0&{sP2iWS{)d*?#f`caF&o9s)YEW>y|BHg0wR*~V&|<p9GV
JJ~ChdasXeZGo1hc

diff --git a/Assets/ShootingScript.cs b/Assets/ShootingScript.cs
index d1f7036..c45593f 100644
--- a/Assets/ShootingScript.cs
+++ b/Assets/ShootingScript.cs
@@ -16,7 +16,16 @@ public class ShootingScript : MonoBehaviour {
             print("pewpew");
             nextShootTime = Time.time + attackSpeed;
             //avancer le missile au depart quand il va apparaitre (quand je vais avoir anim de combat)
-            GameObject clone = Instantiate( Missile,transform.position,transform.rotation) as GameObject;
+            int valOfLeftOrRight;
+            if (gameObject.transform.rotation.y !=  0)
+            {
+                valOfLeftOrRight = -2;
+            }
+            else {
+                valOfLeftOrRight = 2;
+            }
+            Vector3 missilePos = new Vector3(gameObject.transform.position.x + valOfLeftOrRight, gameObject.transform.position.y, gameObject.transform.position.z);
+            GameObject clone = Instantiate(Missile, missilePos, transform.rotation) as GameObject;
         }
 	}
 }