From 61dcacb734a43fd27681a0679497e49f77ff63fd Mon Sep 17 00:00:00 2001
From: max89max <maxime.larivierem@gmail.com>
Date: Sun, 8 Nov 2015 18:40:46 +0100
Subject: [PATCH] FirstPerson

---
 Assets/Prefabs/FirstPerson.prefab       | 13 +++++++++++++
 Assets/Scenes/maxScene.unity            |  8 ++++++++
 Assets/Scripts/FirstPersonController.cs | 23 ++++++++++++-----------
 3 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/Assets/Prefabs/FirstPerson.prefab b/Assets/Prefabs/FirstPerson.prefab
index f305a16..9684a25 100644
--- a/Assets/Prefabs/FirstPerson.prefab
+++ b/Assets/Prefabs/FirstPerson.prefab
@@ -312,6 +312,7 @@ MonoBehaviour:
   - {fileID: 11418934, guid: 303650e9a23c68a42876df290e9d7537, type: 2}
   - {fileID: 11418934, guid: 303650e9a23c68a42876df290e9d7537, type: 2}
   - {fileID: 11418934, guid: 303650e9a23c68a42876df290e9d7537, type: 2}
+  - {fileID: 0}
   m_Allumettes: {fileID: 11455286, guid: bdd994d2c872c9e4d8601100f973be0d, type: 2}
   m_WalkSpeed: 3
   m_RunSpeed: 10
@@ -417,10 +418,22 @@ Prefab:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 0}
+      propertyPath: m_Briquets.Array.size
+      value: 4
+      objectReference: {fileID: 0}
     - target: {fileID: 0}
       propertyPath: m_TagString
       value: AudioSourceBreath
       objectReference: {fileID: 0}
+    - target: {fileID: 0}
+      propertyPath: m_Briquets.Array.data[3]
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 0}
+      propertyPath: m_NbrAllumettes
+      value: 10
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 0}
   m_RootGameObject: {fileID: 117402}
diff --git a/Assets/Scenes/maxScene.unity b/Assets/Scenes/maxScene.unity
index cbf1584..87a28be 100644
--- a/Assets/Scenes/maxScene.unity
+++ b/Assets/Scenes/maxScene.unity
@@ -134,6 +134,10 @@ Prefab:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 11453604, guid: e180da7fedba0004086c3f44426d29c5, type: 2}
+      propertyPath: m_Briquets.Array.size
+      value: 4
+      objectReference: {fileID: 0}
     - target: {fileID: 426836, guid: e180da7fedba0004086c3f44426d29c5, type: 2}
       propertyPath: m_LocalPosition.x
       value: -.469999999
@@ -166,6 +170,10 @@ Prefab:
       propertyPath: m_RootOrder
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 11453604, guid: e180da7fedba0004086c3f44426d29c5, type: 2}
+      propertyPath: m_Briquets.Array.data[3]
+      value: 
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: e180da7fedba0004086c3f44426d29c5, type: 2}
   m_IsPrefabParent: 0
diff --git a/Assets/Scripts/FirstPersonController.cs b/Assets/Scripts/FirstPersonController.cs
index 9620c38..ba6fbe2 100644
--- a/Assets/Scripts/FirstPersonController.cs
+++ b/Assets/Scripts/FirstPersonController.cs
@@ -160,10 +160,10 @@ namespace UnityStandardAssets.Characters.FirstPerson
 
 			PlayRespireSound();
 			//Actions joueur
-			if(Input.GetButton("Briquet"))
+			if(m_Briquets[indexBriquet]!=null)
 			{
 				//allumerBriquet
-				if(m_Briquets[indexBriquet]!=null)
+				if(Input.GetButton("Briquet"))
 				{
 					//Si un briquet n'est pas déja allumé
 					if(!m_Briquets[indexBriquet].activer)
@@ -181,22 +181,23 @@ namespace UnityStandardAssets.Characters.FirstPerson
 							DestroyObject(GameObject.FindGameObjectWithTag("Allumettes"));
 						}
 						m_Briquets[indexBriquet].activer=true;
-						m_Briquets[indexBriquet].enabled = true;
+						m_Briquets[indexBriquet].enabled=true;
 					}
 					//Si le briquet est déja allumé
 					else
 					{
 						m_Briquets[indexBriquet].activer=false;
-						m_Briquets[indexBriquet].enabled = false;
+						m_Briquets[indexBriquet].enabled=false;
 					}
+					
+				}
+				//Si le briquet est vide, le jeté
+				if (m_Briquets[indexBriquet].m_Essence <= 0)
+				{
+					m_Briquets[indexBriquet].activer=false;
+					DestroyObject(m_Briquets[indexBriquet].gameObject);
+					indexBriquet++;
 				}
-			}
-			//Si le briquet est vide, le jeté
-			if (m_Briquets[indexBriquet].m_Essence <= 0)
-			{
-				m_Briquets[indexBriquet].activer=false;
-				DestroyObject(m_Briquets[indexBriquet].gameObject);
-				indexBriquet++;
 			}
 
 			if(Input.GetButton("Alumettes"))