diff --git a/Assets/Scripts/GUI/Dialog.cs b/Assets/Scripts/GUI/Dialog.cs index d12ef42ba9238178732749b46d35fcc1a911f903..1e073f80c70d1ba4f46726c32b633d0942bc0436 100644 --- a/Assets/Scripts/GUI/Dialog.cs +++ b/Assets/Scripts/GUI/Dialog.cs @@ -77,11 +77,17 @@ public class Dialog : MonoBehaviour "Ouvrir le menu c'est avec", "la touche E chacal" }; + this.ListDialogs.Add("Marchand", DialogMarchand); + + string[] DialogChaussure = { + "Ouvrir le menu c'est avec", + "la touche E chacal" + }; + this.ListDialogs.Add("Chaussures", DialogChaussure); - this.ListDialogs.Add("marchand", DialogMarchand); if (this.dialogActive) - this.Situation("start"); + this.setSituation("start"); } // Update is called once per frame @@ -99,7 +105,7 @@ public class Dialog : MonoBehaviour { Debug.Log("tut"); - this.Situation("marchand"); + this.setSituation("marchand"); } if(this.dialogActive) @@ -126,7 +132,7 @@ public class Dialog : MonoBehaviour } // Ouvre une bulle de dialogue dans une situation donnée - void Situation(string sit) + public void setSituation(string sit) { this.situation = sit; this.dialog = 0; diff --git a/Assets/Scripts/Inventory/Border.cs b/Assets/Scripts/Inventory/Border.cs index 278fed3b532911e3121269546a14d5dbd5400ecb..d00772b51c3186435b540bb667a29298edb61bb7 100644 --- a/Assets/Scripts/Inventory/Border.cs +++ b/Assets/Scripts/Inventory/Border.cs @@ -5,7 +5,6 @@ using UnityEngine; public class Border : MonoBehaviour { public Item itemNeeded; - public Inventory inventory; public BoxCollider2D collider; private void OnCollisionEnter2D(Collision2D collision) @@ -14,15 +13,17 @@ public class Border : MonoBehaviour { Debug.Log("JE TOUCHE LA BORDEER"); - if (inventory.hasItem(itemNeeded)) + if (Inventory.instance.hasItem(itemNeeded)) { Debug.Log("Je possède l'item nécessaire"); collider.enabled = false; } else - Debug.Log("Je ne possède pas l'item nécessaire"); - + { + Debug.Log("Je n'ai pas l'item nécessaire"); + Dialog.instance.setSituation("Chaussures"); + } } }