Merge branch 'master' into 'master'

ajout de la generation du village dynamiquement

See merge request chirz/cityescape!72

Assets/Scenes/sceneRaffael.unity

@@ -2551,6 +2551,10 @@ PrefabInstance:
       propertyPath: m_Offset.y
       value: -0.17818928
       objectReference: {fileID: 0}
+    - target: {fileID: 1206561506436264875, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
+      propertyPath: speed
+      value: 30
+      objectReference: {fileID: 0}
     - target: {fileID: 1206561506436264875, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
       propertyPath: player
       value: 
@@ -3348,7 +3352,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   itemNeeded: {fileID: 11400000, guid: efcf49924f9a75d4ca34174b60873d06, type: 2}
-  forestCollider: {fileID: 0}
+  forestCollider: {fileID: 785585435}
 --- !u!4 &787488641 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
@@ -5147,7 +5151,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   itemNeeded: {fileID: 11400000, guid: d72fe29080571f44ca0c6bd0d22ece7b, type: 2}
-  forestCollider: {fileID: 0}
+  forestCollider: {fileID: 1348729465}
 --- !u!1001 &1362736781
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -15220,7 +15224,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   itemNeeded: {fileID: 11400000, guid: e217cd1973709d844bb97beb373c5447, type: 2}
-  forestCollider: {fileID: 0}
+  forestCollider: {fileID: 1735684084}
 --- !u!4 &1752424813 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}

Assets/Scripts/Inventory/Border.cs

@@ -6,7 +6,7 @@ public class Border : MonoBehaviour
 {
     public Item itemNeeded;
     public BoxCollider2D forestCollider;
-    private GameObject player = GameObject.FindGameObjectWithTag("Player");
+
 
     private void OnCollisionEnter2D(Collision2D collision)
     {
@@ -16,9 +16,11 @@ public class Border : MonoBehaviour
             Debug.Log("JE TOUCHE LA BORDEER");
             if (Inventory.instance.hasItem(itemNeeded))
             {
-                Debug.Log("Je poss?de l'item n?cessaire");
+                Debug.Log("Je poss?de l'item n?cessaire");  
+                GameObject player = GameObject.FindGameObjectWithTag("Player");
+                //Debug.Log(player.GetComponent<PlayerMovement>().ispassed[itemNeeded.id - 1]);
+                player.GetComponent<PlayerMovement>().ispassed[itemNeeded.id - 1] = true;
                 forestCollider.enabled = false;
-
             }
             else
             {
@@ -28,19 +30,15 @@ public class Border : MonoBehaviour
                 {
                     case 1:
                         Dialog.instance.setSituation("borderChaussure");
-                        player.GetComponent<PlayerMovement>().ispassed[0] = true;
                         break;
                     case 2:
                         Dialog.instance.setSituation("borderBaton");
-                        player.GetComponent<PlayerMovement>().ispassed[1] = true;
                         break;
                     case 3:
                         Dialog.instance.setSituation("borderRechaud");
-                        player.GetComponent<PlayerMovement>().ispassed[2] = true;
                         break;
                     case 4:
-                        Dialog.instance.setSituation("borderTente");
-                        player.GetComponent<PlayerMovement>().ispassed[3] = true;
+                        Dialog.instance.setSituation("borderTente");                
                         break;
                 }
             }

Assets/Scripts/Player/PlayerMovement.cs

@@ -33,6 +33,7 @@ public class PlayerMovement : MonoBehaviour
         animator.SetFloat("moveX", 0);
         animator.SetFloat("moveY", -1);
 
+        ispassed = new bool[] { false, false, false, false };
     }
 
     // Update is called once per frame