diff --git a/Assets/Import/ShopItems/Stove.png b/Assets/Import/ShopItems/Stove.png
new file mode 100644
index 0000000000000000000000000000000000000000..efc2e3f936d497b0614e157e82a5d1702fffdae0
Binary files /dev/null and b/Assets/Import/ShopItems/Stove.png differ
diff --git a/Assets/Import/ShopItems/Stove.png.meta b/Assets/Import/ShopItems/Stove.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..e394e5c41c6a09f6e6b54b91a43abe390f66659c
--- /dev/null
+++ b/Assets/Import/ShopItems/Stove.png.meta
@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 2d69e0f0370a1464c9f0da7d8e4f2a63
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 0
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 16
+ spriteBorder: {x: 167, y: 253, z: 171, w: 251}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Prefabs/Stove.prefab b/Assets/Prefabs/Stove.prefab
new file mode 100644
index 0000000000000000000000000000000000000000..ac08e2f30b799e1b50d8a36d7f14793f585a6360
--- /dev/null
+++ b/Assets/Prefabs/Stove.prefab
@@ -0,0 +1,84 @@
+%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: 0
+ m_SortingLayer: 0
+ 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
diff --git a/Assets/Prefabs/Stove.prefab.meta b/Assets/Prefabs/Stove.prefab.meta
new file mode 100644
index 0000000000000000000000000000000000000000..e6d061b425898f90d2a1fca3012884aa2fa89c71
--- /dev/null
+++ b/Assets/Prefabs/Stove.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a4179d20809394cfda68d226fc249d0b
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/Niveau1.unity b/Assets/Scenes/Niveau1.unity
index f193dbe0d617b9ac78f664ad13e151a78ed63b68..0b4ca2308a563b37941df65772b948bd2379a116 100644
--- a/Assets/Scenes/Niveau1.unity
+++ b/Assets/Scenes/Niveau1.unity
@@ -3171,87 +3171,6 @@ TilemapCollider2D:
m_Offset: {x: 0, y: 0}
m_MaximumTileChangeCount: 1000
m_ExtrusionFactor: 0.00001
---- !u!1 &256649259
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 256649263}
- - component: {fileID: 256649262}
- - component: {fileID: 256649261}
- - component: {fileID: 256649260}
- m_Layer: 0
- m_Name: SceneController
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!95 &256649260
-Animator:
- serializedVersion: 3
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 256649259}
- m_Enabled: 1
- m_Avatar: {fileID: 0}
- m_Controller: {fileID: 9100000, guid: 9b389855dca6c1a409f7f8c6b5762d70, type: 2}
- m_CullingMode: 0
- m_UpdateMode: 0
- m_ApplyRootMotion: 0
- m_LinearVelocityBlending: 0
- m_WarningMessage:
- m_HasTransformHierarchy: 1
- m_AllowConstantClipSamplingOptimization: 1
- m_KeepAnimatorControllerStateOnDisable: 0
---- !u!114 &256649261
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 256649259}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5d888d62879d8e841bb450bce623de31, type: 3}
- m_Name:
- m_EditorClassIdentifier:
---- !u!114 &256649262
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 256649259}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5dcebe77ef51f6b409b7e10aa9028a43, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- nextYear: 1876
- year: {fileID: 1841673933}
- city: {fileID: 1393222696}
- scene: Niveau2
- animmator: {fileID: 920174281}
---- !u!4 &256649263
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 256649259}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 431.38956, y: 435.6071, z: -68.97981}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 6
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &286967853
PrefabInstance:
m_ObjectHideFlags: 0
@@ -14728,7 +14647,7 @@ RectTransform:
m_Children:
- {fileID: 878493812}
m_Father: {fileID: 0}
- m_RootOrder: 7
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
diff --git a/Documents/CahierDesCharges.md b/Documents/CahierDesCharges.md
index c2cfb985c55fd109c63eb6490d7d56545f8055ae..bc28e2e57e5b849f6b8c0ea1cfa651d5006f6f3c 100644
--- a/Documents/CahierDesCharges.md
+++ b/Documents/CahierDesCharges.md
@@ -3,9 +3,28 @@
## Objectifs pédagogiques
**Objectif pédagogique général** :
-L'objectif pedagogique principal de ce jeu, est d'apprendre au joueur comment c'est devellopé la randonner en Allemagne a partir de 1870
+Apprendre au joueur comment c'est devellopé la randonner en Allemagne a partir de 1870, et pourquoi cette pratique c'est devellopé.
-### Description des objectifs pédagogiques
+## Description des objectifs pédagogiques
+
+**Mettre en avant le lien entre industrialisation et devellopement de la randonner**
+
+- Notre jeux montre un industrialisaton et le paradoxe entre
+
+### Membre du projet tuteuré
+
+- Tanguy Gimenez
+- Melvyn FIscher
+- Raffael DI-Pietro
+- Valentin Bloch
+
+### Objectifs d'un projet tuteuré
+
+Les objectifs de ce projet fixés par Claire Milon, notre tutrice pedagogique, etaient multiple est nous avons donc du choisir quelle approche nous . C'est pourquoi nous nous sommes concentrer sur le liens entre l'industrialisation et le devellopement de la randonner.
+
+### Délais
+
+Le délais de 6 jours était plutot serré, au vu du nombre d'informations fournis par notre tutrice pedagogique, et ne nous a pas permis d'implementer autant de choses que nous aurions voulus, mais les mechaniques les plus importantes elles, ont ete implementé dans le délais imparti.