diff --git a/Assets/Import/ShopItems/canne.png b/Assets/Import/ShopItems/canne.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7cd2c0b8df605371562b06afaa04bf76bc68db8
Binary files /dev/null and b/Assets/Import/ShopItems/canne.png differ
diff --git a/Assets/Import/ShopItems/canne.png.meta b/Assets/Import/ShopItems/canne.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..053ccc1866c61b4ccfb1e73b7a83b63c00bca5a0
--- /dev/null
+++ b/Assets/Import/ShopItems/canne.png.meta
@@ -0,0 +1,108 @@
+fileFormatVersion: 2
+guid: afaeb0fb02930884d9aac3ba46cb1adb
+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: -1
+ 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: 800
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ 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
+ 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/baton.prefab b/Assets/Prefabs/baton.prefab
new file mode 100644
index 0000000000000000000000000000000000000000..0ab3c3819c0b7904702835afb1bb0bbf2e88fd9f
--- /dev/null
+++ b/Assets/Prefabs/baton.prefab
@@ -0,0 +1,84 @@
+%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
diff --git a/Assets/Prefabs/baton.prefab.meta b/Assets/Prefabs/baton.prefab.meta
new file mode 100644
index 0000000000000000000000000000000000000000..1cc8546ea3c4d4d445ba391c10cef4cf5b5a4159
--- /dev/null
+++ b/Assets/Prefabs/baton.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 075eeb49ca9e1064ea07781a2deba9ae
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/GUI/Dialog.cs b/Assets/Scripts/GUI/Dialog.cs
index 1f6d2ba2f61c9231d21f4232e17979b8fd528134..85c946eec97f8309c79baa4a18cc22f2f558af26 100644
--- a/Assets/Scripts/GUI/Dialog.cs
+++ b/Assets/Scripts/GUI/Dialog.cs
@@ -98,11 +98,25 @@ public class Dialog : MonoBehaviour
- string[] DialogChaussure = {
- "J'ai mal au pied",
- "Faux an acheté des mieu"
+ string[] borderChaussure = {
+ "NEIN NEIN NEIN !", "Il fa me falloir des chaussures", "pour marcher plus loin !"
};
- this.ListDialogs.Add("Chaussures", DialogChaussure);
+ this.ListDialogs.Add("borderChaussure", borderChaussure);
+
+ string[] borderBaton = {
+ "ACH SCHEISSE !", "Ch'ai ouplié mes","patons te marches !","Che suis trop fatigué !"
+ };
+ 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)
diff --git a/Assets/Scripts/Game/GenerateMap.cs b/Assets/Scripts/Game/GenerateMap.cs
index d01850c97fe7a905afa4ecce605c98d4decddbdc..a970868bc53ab0b5d024fea4e1ad1b5302a00b6e 100644
--- a/Assets/Scripts/Game/GenerateMap.cs
+++ b/Assets/Scripts/Game/GenerateMap.cs
@@ -72,7 +72,7 @@ public class GenerateMap : MonoBehaviour
itemToSell = baton;
goToSell = GO_baton;
xOffset = 0;
- yOffset = 0;
+ yOffset = 6.11F;
break;
case "rechaud":
itemToSell = rechaud;
diff --git a/Assets/Scripts/Inventory/Border.cs b/Assets/Scripts/Inventory/Border.cs
index d00772b51c3186435b540bb667a29298edb61bb7..90217c78fe8ec5e9e710205da07f3f827f7152d8 100644
--- a/Assets/Scripts/Inventory/Border.cs
+++ b/Assets/Scripts/Inventory/Border.cs
@@ -22,7 +22,22 @@ public class Border : MonoBehaviour
else
{
Debug.Log("Je n'ai pas l'item nécessaire");
- Dialog.instance.setSituation("Chaussures");
+
+ switch (itemNeeded.id)
+ {
+ case 1:
+ Dialog.instance.setSituation("borderChaussure");
+ break;
+ case 2:
+ Dialog.instance.setSituation("borderBaton");
+ break;
+ case 3:
+ Dialog.instance.setSituation("borderRechaud");
+ break;
+ case 4:
+ Dialog.instance.setSituation("borderTente");
+ break;
+ }
}
}
}