Assets/Prefabs/Parcelles/Raffael_village.prefab

@@ -3067,6 +3067,16 @@ Tilemap:
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
       m_AllTileFlags: 1073741825
+  - first: {x: 2, y: 2, z: 0}
+    second:
+      serializedVersion: 2
+      m_TileIndex: 65
+      m_TileSpriteIndex: 65
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_TileObjectToInstantiateIndex: 65535
+      dummyAlignment: 0
+      m_AllTileFlags: 1073741825
   - first: {x: -3, y: 3, z: 0}
     second:
       serializedVersion: 2
@@ -3287,6 +3297,16 @@ Tilemap:
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
       m_AllTileFlags: 1073741825
+  - first: {x: -4, y: 5, z: 0}
+    second:
+      serializedVersion: 2
+      m_TileIndex: 68
+      m_TileSpriteIndex: 68
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_TileObjectToInstantiateIndex: 65535
+      dummyAlignment: 0
+      m_AllTileFlags: 1073741825
   - first: {x: -3, y: 5, z: 0}
     second:
       serializedVersion: 2
@@ -3397,6 +3417,16 @@ Tilemap:
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
       m_AllTileFlags: 1073741825
+  - first: {x: -4, y: 6, z: 0}
+    second:
+      serializedVersion: 2
+      m_TileIndex: 69
+      m_TileSpriteIndex: 69
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_TileObjectToInstantiateIndex: 65535
+      dummyAlignment: 0
+      m_AllTileFlags: 1073741825
   - first: {x: -3, y: 6, z: 0}
     second:
       serializedVersion: 2
@@ -3627,6 +3657,36 @@ Tilemap:
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
       m_AllTileFlags: 1073741825
+  - first: {x: 0, y: 8, z: 0}
+    second:
+      serializedVersion: 2
+      m_TileIndex: 68
+      m_TileSpriteIndex: 68
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_TileObjectToInstantiateIndex: 65535
+      dummyAlignment: 0
+      m_AllTileFlags: 1073741825
+  - first: {x: 1, y: 8, z: 0}
+    second:
+      serializedVersion: 2
+      m_TileIndex: 66
+      m_TileSpriteIndex: 66
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_TileObjectToInstantiateIndex: 65535
+      dummyAlignment: 0
+      m_AllTileFlags: 1073741825
+  - first: {x: 2, y: 8, z: 0}
+    second:
+      serializedVersion: 2
+      m_TileIndex: 67
+      m_TileSpriteIndex: 67
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_TileObjectToInstantiateIndex: 65535
+      dummyAlignment: 0
+      m_AllTileFlags: 1073741825
   - first: {x: 3, y: 8, z: 0}
     second:
       serializedVersion: 2
@@ -3657,6 +3717,16 @@ Tilemap:
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
       m_AllTileFlags: 1073741825
+  - first: {x: 0, y: 9, z: 0}
+    second:
+      serializedVersion: 2
+      m_TileIndex: 69
+      m_TileSpriteIndex: 69
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_TileObjectToInstantiateIndex: 65535
+      dummyAlignment: 0
+      m_AllTileFlags: 1073741825
   - first: {x: 3, y: 9, z: 0}
     second:
       serializedVersion: 2
@@ -3798,7 +3868,7 @@ Tilemap:
   - m_RefCount: 1
     m_Data: {fileID: 11400000, guid: 07175304739116a4f8e6cfd86e993414, type: 2}
   - m_RefCount: 1
-    m_Data: {fileID: 11400000, guid: ef9eb3c0f6a18d7439d8035ecbeaa216, type: 2}
+    m_Data: {fileID: 11400000, guid: 54d7a5abe052c8241bc7c603ddaaad0a, type: 2}
   - m_RefCount: 1
     m_Data: {fileID: 11400000, guid: 11e46816b761a5748bb73f7e1119afa5, type: 2}
   - m_RefCount: 1
@@ -3819,6 +3889,16 @@ Tilemap:
     m_Data: {fileID: 11400000, guid: bc06d4b443aecd048842537d4276f520, type: 2}
   - m_RefCount: 1
     m_Data: {fileID: 11400000, guid: a655ee4846392e2419ece79d0c2f3958, type: 2}
+  - m_RefCount: 1
+    m_Data: {fileID: 11400000, guid: b9ae39cac0fc74c49b0fa52a89d540b8, type: 2}
+  - m_RefCount: 1
+    m_Data: {fileID: 11400000, guid: 99c234a39a8a33647a23934ae06c0e19, type: 2}
+  - m_RefCount: 1
+    m_Data: {fileID: 11400000, guid: b2eae4a922d13a1449e31d555553eced, type: 2}
+  - m_RefCount: 2
+    m_Data: {fileID: 11400000, guid: fd2e1e2a462b94e49bc4f8836a6a6372, type: 2}
+  - m_RefCount: 2
+    m_Data: {fileID: 11400000, guid: 667c665a14fb8434ca9e4e4a01c6800f, type: 2}
   m_TileSpriteArray:
   - m_RefCount: 1
     m_Data: {fileID: -5472138256812182249, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
@@ -3929,7 +4009,7 @@ Tilemap:
   - m_RefCount: 1
     m_Data: {fileID: -4035382832446957438, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
   - m_RefCount: 1
-    m_Data: {fileID: 4020740420307960919, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
+    m_Data: {fileID: 162598280021495188, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
   - m_RefCount: 1
     m_Data: {fileID: -1147168906562122949, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
   - m_RefCount: 1
@@ -3950,8 +4030,18 @@ Tilemap:
     m_Data: {fileID: 3995621719808928692, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
   - m_RefCount: 1
     m_Data: {fileID: 618283605872952514, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
+  - m_RefCount: 1
+    m_Data: {fileID: 6986815404043503449, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
+  - m_RefCount: 1
+    m_Data: {fileID: 7808538442560958302, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
+  - m_RefCount: 1
+    m_Data: {fileID: 8725674123217878092, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
+  - m_RefCount: 2
+    m_Data: {fileID: 7609906820474631096, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
+  - m_RefCount: 2
+    m_Data: {fileID: 2519681813242796523, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
   m_TileMatrixArray:
-  - m_RefCount: 71
+  - m_RefCount: 78
     m_Data:
       e00: 1
       e01: 0
@@ -3970,7 +4060,7 @@ Tilemap:
       e32: 0
       e33: 1
   m_TileColorArray:
-  - m_RefCount: 71
+  - m_RefCount: 78
     m_Data: {r: 1, g: 1, b: 1, a: 1}
   m_TileObjectToInstantiateArray: []
   m_AnimationFrameRate: 1

Assets/Prefabs/SignItem.prefab

@@ -10,8 +10,9 @@ GameObject:
   m_Component:
   - component: {fileID: 6288745984921166911}
   - component: {fileID: 6288745984921166908}
-  - component: {fileID: 6288745984921166910}
   - component: {fileID: 6288745984921166905}
+  - component: {fileID: 705135520614132026}
+  - component: {fileID: 5994298442114251217}
   m_Layer: 0
   m_Name: SignItem
   m_TagString: Untagged
@@ -84,8 +85,8 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
---- !u!60 &6288745984921166910
-PolygonCollider2D:
+--- !u!61 &6288745984921166905
+BoxCollider2D:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -94,10 +95,10 @@ PolygonCollider2D:
   m_Enabled: 1
   m_Density: 1
   m_Material: {fileID: 0}
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_UsedByEffector: 0
   m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0}
+  m_Offset: {x: 0.012557507, y: -0.16248411}
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0.5, y: 0.5}
@@ -107,16 +108,10 @@ PolygonCollider2D:
     drawMode: 0
     adaptiveTiling: 0
   m_AutoTiling: 0
-  m_Points:
-    m_Paths:
-    - - {x: -0.5, y: 0.5}
-      - {x: -0.5105486, y: 0.20357698}
-      - {x: -0.18839645, y: 0.21643811}
-      - {x: -0.16719246, y: 0.21728462}
-      - {x: 0.15664482, y: 0.21728459}
-      - {x: 0.5, y: 0.22388381}
-      - {x: 0.5, y: 0.5}
---- !u!61 &6288745984921166905
+  serializedVersion: 2
+  m_Size: {x: 1.1155329, y: 1.9197317}
+  m_EdgeRadius: 0
+--- !u!61 &705135520614132026
 BoxCollider2D:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -126,10 +121,10 @@ BoxCollider2D:
   m_Enabled: 1
   m_Density: 1
   m_Material: {fileID: 0}
-  m_IsTrigger: 1
+  m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
-  m_Offset: {x: 0, y: -0.45885122}
+  m_Offset: {x: 0, y: -0.37267074}
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0.5, y: 0.5}
@@ -140,5 +135,20 @@ BoxCollider2D:
     adaptiveTiling: 0
   m_AutoTiling: 0
   serializedVersion: 2
-  m_Size: {x: 1, y: 1.3269975}
+  m_Size: {x: 1, y: 0.6229455}
   m_EdgeRadius: 0
+--- !u!114 &5994298442114251217
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6288745984921166909}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4c8875f970794c24fb1d22c9a0d2bb56, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  TextToDisplay: Ceci est le texte de base du panneau
+  backgroundPanelDisplay: {fileID: 0}
+  textPanelDisplay: {fileID: 0}

Assets/Prefabs/Stove.prefab

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6742524767965565839
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2052134386649845870}
+  - component: {fileID: 6082533222092643988}
+  m_Layer: 0
+  m_Name: Stove
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2052134386649845870
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6742524767965565839}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -41.625496, y: 35.23956, z: 0}
+  m_LocalScale: {x: 0.03, y: 0.03, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &6082533222092643988
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6742524767965565839}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 2045603605
+  m_SortingLayer: 3
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: 2d69e0f0370a1464c9f0da7d8e4f2a63, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 50, y: 50}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0

Assets/Scenes/sceneMelvyn.unity.meta → Assets/Prefabs/Stove.prefab.meta

 fileFormatVersion: 2
-guid: 1b0bebe128a4e8345a1550a68ad23be1
-DefaultImporter:
+guid: a4179d20809394cfda68d226fc249d0b
+PrefabImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

Assets/Prefabs/Verdure/Arbre.prefab

@@ -173,4 +173,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c2eed50797895184ab44621a154ad526, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  nbPoints: 8
+  nbPoints: 5

Assets/Prefabs/baton.prefab

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2815113491261155828
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1497669276832756932}
+  - component: {fileID: 1822726001044331824}
+  m_Layer: 0
+  m_Name: canne
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1497669276832756932
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2815113491261155828}
+  m_LocalRotation: {x: 0, y: 0, z: -0.6279631, w: 0.7782431}
+  m_LocalPosition: {x: 0.93, y: 12.57, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: -77.8}
+--- !u!212 &1822726001044331824
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2815113491261155828}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 2045603605
+  m_SortingLayer: 3
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: afaeb0fb02930884d9aac3ba46cb1adb, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 11.23, y: 11.84}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0

Assets/Scenes/Niveau2.unity.meta → Assets/Prefabs/baton.prefab.meta

 fileFormatVersion: 2
-guid: 4ae30febc4f91474fa9164b85521aaf5
-DefaultImporter:
+guid: 075eeb49ca9e1064ea07781a2deba9ae
+PrefabImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

Assets/Prefabs/tent.prefab

@@ -10,7 +10,7 @@ GameObject:
   m_Component:
   - component: {fileID: 2594227356551208515}
   - component: {fileID: 7604435187626042244}
-  - component: {fileID: 3737178317091432126}
+  - component: {fileID: 4313274779673652663}
   m_Layer: 0
   m_Name: tent
   m_TagString: Untagged
@@ -83,8 +83,8 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
---- !u!60 &3737178317091432126
-PolygonCollider2D:
+--- !u!61 &4313274779673652663
+BoxCollider2D:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -96,7 +96,7 @@ PolygonCollider2D:
   m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0}
+  m_Offset: {x: 0.0000009536743, y: -1.9999735}
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0.5, y: 0.5}
@@ -106,20 +106,6 @@ PolygonCollider2D:
     drawMode: 0
     adaptiveTiling: 0
   m_AutoTiling: 0
-  m_Points:
-    m_Paths:
-    - - {x: 4.625, y: -3.6875}
-      - {x: 4.125, y: -3.5}
-      - {x: 4.625, y: 0.4375}
-      - {x: 4.625, y: 2.75}
-      - {x: 3.5625, y: 2.6875}
-      - {x: 0.5, y: 5}
-      - {x: -0.3125, y: 5}
-      - {x: -3.9375, y: 2.625}
-      - {x: -4.4375, y: 2.5625}
-      - {x: -4.625, y: 2.375}
-      - {x: -4.625, y: 1.125}
-      - {x: -4.125, y: 0.9375}
-      - {x: -4.625, y: -2.5625}
-      - {x: -4.625, y: -5}
-      - {x: 4.625, y: -5}
+  serializedVersion: 2
+  m_Size: {x: 8.993399, y: 7.271563}
+  m_EdgeRadius: 0

Assets/Scenes/Menu.unity

@@ -759,9 +759,9 @@ MonoBehaviour:
   nextYear: 1875
   year: {fileID: 672131795}
   city: {fileID: 1075515021}
-  scene: Niveau1
+  scene: sceneRaffael
   animmator: {fileID: 1460786684}
-  name: DUSSELDORF
+  nom: DUSSELDORF
 --- !u!4 &1459655252
 Transform:
   m_ObjectHideFlags: 0

Assets/Physics.meta → Assets/Scripts/Factory.meta

 fileFormatVersion: 2
-guid: 5097a5d46361eda43b5a45ce166e49aa
+guid: 81e39c4f6e44e7345849a14cbef3b3ea
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Scripts/Factory/LoseNature.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class LoseNature : MonoBehaviour
+{
+    private bool lostLife = false;
+    private int nbFactory = 0;
+    public int damageByFactory = 20;
+
+    private void OnTriggerEnter2D(Collider2D collision)
+    {
+        if (collision.CompareTag("Player"))
+        {
+            if (!lostLife)
+            {
+                nbFactory = GameObject.FindGameObjectsWithTag("factory").Length;
+                Debug.Log("il pert de la vie: " + nbFactory * damageByFactory);
+                collision.GetComponent<PlayerNature>().LooseNature(damageByFactory * nbFactory);
+                this.lostLife = true;
+            }
+        }
+    }
+}

Assets/Scenes/Melvyn.unity.meta → Assets/Scripts/Factory/LoseNature.cs.meta

 fileFormatVersion: 2
-guid: 02c5de57794c3474fb978ab6e3487fb4
-DefaultImporter:
+guid: acdefb31f22c752ac90ddf2bf056e45c
+MonoImporter:
   externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Scripts/GUI/Dialog.cs

@@ -14,7 +14,7 @@ public class Dialog : MonoBehaviour
     // singleton
     public static Dialog instance;
 
-    private void Awake() 
+    private void Awake()
     {
         if (instance != null)
         {
@@ -29,6 +29,7 @@ public class Dialog : MonoBehaviour
 
     public GameObject dialogBox;
     public Text dialogText;
+    public Text instructionText;
     public int dialog;
     public bool dialogActive;
     public string situation;
@@ -45,44 +46,55 @@ public class Dialog : MonoBehaviour
         this.dialog = 0;
 
         string[] DialogsLvl1 = {
-            "Coucou",
-            "Je fais un test pour le niveau 1",
-            "Ca marche bien nan ?",
-            "Melvyn t moch",
-            "Valentin aussi",
-            "Raff est pas bo"
+             "Ach... Encore eine gute chournée dans mon fillage!",
+                "Ch'ai très enfie te me balader",
+                "Che defrai aller au Nord dans la forêt ja !",
+                "pour me déplacer, je dois utiliser mes  muscles 'flèches directionnelles'"
             };
+        this.ListDialogs.Add("start", DialogsLvl1);
 
 
-        this.ListDialogs.Add("start", DialogsLvl1);
+        string[] boutiqueChaussure = {
+            "Je fous prendrais zes chauzzures en taille Zweiundvierzig Bitte !",
+        };
+        this.ListDialogs.Add("boutiqueChaussure", boutiqueChaussure);
 
-        string[] Dialogsraff = {
-            "Salut",
-            "cava ?",
-            "Je te mange tes morts"
+        string[] boutiqueBaton = {
+            "Ze bâton me semble assez long et solide pour moi ! J'achète !",
         };
+        this.ListDialogs.Add("boutiqueBaton", boutiqueBaton);
 
-        this.ListDialogs.Add("pnj", Dialogsraff);
+        string[] boutiqueRechaud = {
+            " Ze réchaud fa être SEHR PRAKTISCH !", "j'achète tout de zuite !"
+        };
+        this.ListDialogs.Add("boutiqueRechaud", boutiqueRechaud);
 
-        string[] DialogsTest = {
-            "Je fais un test",
-            "ca marche ? ou pas ?",
-            "bisous"
+        string[] boutiqueTente = {
+            "J'adore ta tente, mais elle est un peu grosse non ?", "Ach, tant pis, CH'ACHETE !"
         };
+        this.ListDialogs.Add("boutiqueTente", boutiqueTente);
 
-        this.ListDialogs.Add("test", DialogsTest);
 
-        string[] DialogMarchand = {
-            "Ouvrir le menu c'est avec",
-            "la touche E chacal"
+
+        string[] borderChaussure = {
+            "NEIN NEIN NEIN ! Il fa me falloir des chaussures pour marcher plus loin !"
         };
-        this.ListDialogs.Add("Marchand", DialogMarchand);
+        this.ListDialogs.Add("borderChaussure", borderChaussure);
 
-        string[] DialogChaussure = {
-            "J'ai mal au pied",
-            "Faux an acheté des mieu"
+        string[] borderBaton = {
+            "ACH SCHEISSE !", "Ch'ai ouplié mes patons te marches ! Che suis trop fatigué !"
         };
-        this.ListDialogs.Add("Chaussures", DialogChaussure);
+        this.ListDialogs.Add("borderBaton", borderBaton);
+
+        string[] borderRechaud = {
+            "Kopfertami, je commence à afoir faim !", "il me faudrait eine réchaud pour mancher !"
+        };
+        this.ListDialogs.Add("borderRechaud", borderRechaud);
+
+        string[] borderTente = {
+            "Hopla, c'est bientôt l'heure de la sièste !", "Si che n'ai pas de tente che ne pourrait pas continuer !"
+        };
+        this.ListDialogs.Add("borderTente", borderTente);
 
 
         if (this.dialogActive)
@@ -95,27 +107,17 @@ public class Dialog : MonoBehaviour
         if ((Input.GetKeyDown(KeyCode.Space) || Input.GetKeyDown("joystick button 0")) && dialogActive)
             this.Next();
 
-        // DEBUG
-        if ((Input.GetKeyDown(KeyCode.H) || Input.GetKeyDown("joystick button 1")))
-            this.dialogActive = !this.dialogActive;
-
-        // DEBUG
-        if (Input.GetKeyDown(KeyCode.F))
-        {
-            Debug.Log("tut");
-            
-            this.setSituation("marchand");
-        }
-            
-        if(this.dialogActive)
+        if (this.dialogActive)
         {
             this.dialogBox.GetComponent<CanvasRenderer>().SetAlpha(1f);
             this.dialogText.GetComponent<CanvasRenderer>().SetAlpha(1f);
+            this.instructionText.GetComponent<CanvasRenderer>().SetAlpha(1f);
         }
         else
         {
             this.dialogBox.GetComponent<CanvasRenderer>().SetAlpha(0f);
             this.dialogText.GetComponent<CanvasRenderer>().SetAlpha(0f);
+            this.instructionText.GetComponent<CanvasRenderer>().SetAlpha(0f);
         }
     }
 
@@ -132,9 +134,7 @@ public class Dialog : MonoBehaviour
 
     public void setSituation(string sit)
     {
-        Debug.Log("actionvation: " + sit);
         this.situation = sit;
-        Debug.Log("situation" + this.situation);
         this.dialog = 0;
 
         this.dialogActive = true;

Assets/Scripts/GUI/InventoryDisplay.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class InventoryDisplay : MonoBehaviour
+{
+    // Start is called before the first frame update
+    public Text inventoryText;
+    void Start()
+    {
+        inventoryText.text = "";
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        inventoryText.text = "";
+        foreach(Item item in Inventory.instance.getItemList()){
+            inventoryText.text += "\n1x " + item.nom;
+        }
+    }
+}