diff --git a/Assets/Arts/Temporaires/Sprites/Sink.png b/Assets/Arts/Temporaires/Sprites/Sink.png new file mode 100644 index 0000000..e6d6722 Binary files /dev/null and b/Assets/Arts/Temporaires/Sprites/Sink.png differ diff --git a/Assets/Arts/Temporaires/Sprites/Sink.png.meta b/Assets/Arts/Temporaires/Sprites/Sink.png.meta new file mode 100644 index 0000000..1c79452 --- /dev/null +++ b/Assets/Arts/Temporaires/Sprites/Sink.png.meta @@ -0,0 +1,106 @@ +fileFormatVersion: 2 +guid: fee52cc4fd1c52f48af7aef1ce478530 +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: 7 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 2000 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + 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/Arts/Temporaires/Sprites/barrel.png b/Assets/Arts/Temporaires/Sprites/barrel.png new file mode 100644 index 0000000..19165bb Binary files /dev/null and b/Assets/Arts/Temporaires/Sprites/barrel.png differ diff --git a/Assets/Arts/Temporaires/Sprites/barrel.png.meta b/Assets/Arts/Temporaires/Sprites/barrel.png.meta new file mode 100644 index 0000000..4c2df70 --- /dev/null +++ b/Assets/Arts/Temporaires/Sprites/barrel.png.meta @@ -0,0 +1,154 @@ +fileFormatVersion: 2 +guid: bfabe3920bf35724b9a95bf95f5431a9 +TextureImporter: + internalIDToNameTable: + - first: + 213: -8568042794190644651 + second: barrel_0 + - first: + 213: -1209127185579228243 + second: barrel_1 + 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: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 600 + spriteBorder: {x: 0, y: 0, z: 143, w: 4} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + 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: + - serializedVersion: 2 + name: barrel_0 + rect: + serializedVersion: 2 + x: 10 + y: 5 + width: 140 + height: 190 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 55adbef5972381980800000000000000 + internalID: -8568042794190644651 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: barrel_1 + rect: + serializedVersion: 2 + x: 175 + y: 40 + width: 105 + height: 120 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: da3484f1b31583fe0800000000000000 + internalID: -1209127185579228243 + vertices: [] + indices: + edges: [] + weights: [] + 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/Characters/Tavernkeeper.prefab b/Assets/Prefabs/Characters/Tavernkeeper.prefab index 69a0b0b..2730758 100644 --- a/Assets/Prefabs/Characters/Tavernkeeper.prefab +++ b/Assets/Prefabs/Characters/Tavernkeeper.prefab @@ -152,7 +152,7 @@ Rigidbody2D: m_Interpolate: 0 m_SleepingMode: 1 m_CollisionDetection: 0 - m_Constraints: 0 + m_Constraints: 4 --- !u!114 &5841415790350674207 MonoBehaviour: m_ObjectHideFlags: 0 @@ -166,4 +166,4 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mvt_speed: 5 - action_dist: 1.5 + action_dist: 1 diff --git a/Assets/Scenes/Tests/SampleScene.unity b/Assets/Scenes/Tests/SampleScene.unity index 5013464..451d2ec 100644 --- a/Assets/Scenes/Tests/SampleScene.unity +++ b/Assets/Scenes/Tests/SampleScene.unity @@ -363,10 +363,9 @@ GameObject: - component: {fileID: 698542427} - component: {fileID: 698542426} - component: {fileID: 698542425} - - component: {fileID: 698542428} - m_Layer: 8 + m_Layer: 0 m_Name: Chicken - m_TagString: Workshop + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -463,22 +462,129 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &698542428 +--- !u!1 &706948613 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 706948617} + - component: {fileID: 706948616} + - component: {fileID: 706948615} + - component: {fileID: 706948614} + m_Layer: 8 + m_Name: Sink + m_TagString: Cleaning_workshop + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &706948614 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 698542424} + m_GameObject: {fileID: 706948613} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5e4020837a3c5214f90b5688a1e4faa2, type: 3} + m_Script: {fileID: 11500000, guid: faa67d8085483414c947fc626db5d950, type: 3} m_Name: m_EditorClassIdentifier: - product_name: beer - product_value: 1 - product_sprite: {fileID: 21300000, guid: 17d59b2d4d882c04480a40119a442279, type: 3} - prepTime: 2 + cleanTime: 2 +--- !u!61 &706948615 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 706948613} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0.4825} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0} + oldSize: {x: 0.5235, y: 0.965} + newSize: {x: 1, y: 1.843362} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.5235, y: 0.965} + m_EdgeRadius: 0 +--- !u!212 &706948616 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 706948613} + 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: fee52cc4fd1c52f48af7aef1ce478530, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1.843362} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 1 +--- !u!4 &706948617 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 706948613} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.13952124, y: 1.3589283, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1163880821 GameObject: m_ObjectHideFlags: 0 @@ -511,6 +617,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: size: 1 + dirty: 0 --- !u!212 &1163880823 SpriteRenderer: m_ObjectHideFlags: 0 @@ -602,6 +709,134 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 0.25, y: 0.25} m_EdgeRadius: 0 +--- !u!1 &1165291007 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1165291011} + - component: {fileID: 1165291010} + - component: {fileID: 1165291009} + - component: {fileID: 1165291008} + m_Layer: 8 + m_Name: Barrel + m_TagString: Workshop + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1165291008 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1165291007} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e4020837a3c5214f90b5688a1e4faa2, type: 3} + m_Name: + m_EditorClassIdentifier: + product_name: beer + product_value: 1 + product_sprite: {fileID: 21300000, guid: 17d59b2d4d882c04480a40119a442279, type: 3} + prepTime: 2 + stock: 5 +--- !u!61 &1165291009 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1165291007} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.23333333, y: 0.31666666} + newSize: {x: 1.4, y: 1.9} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.23333333, y: 0.31666666} + m_EdgeRadius: 0 +--- !u!212 &1165291010 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1165291007} + 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: -8568042794190644651, guid: bfabe3920bf35724b9a95bf95f5431a9, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.4, y: 1.9} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1165291011 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1165291007} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.8068105, y: 0.6139275, z: 0} + 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 &5841415791122168402 PrefabInstance: m_ObjectHideFlags: 0 @@ -614,16 +849,6 @@ PrefabInstance: propertyPath: m_Name value: Tavernkeeper objectReference: {fileID: 0} - - target: {fileID: 5841415790350674203, guid: dc287deb81f09d8419a5051e1d177e74, - type: 3} - propertyPath: m_TagString - value: Untagged - objectReference: {fileID: 0} - - target: {fileID: 5841415790350674204, guid: dc287deb81f09d8419a5051e1d177e74, - type: 3} - propertyPath: m_Constraints - value: 4 - objectReference: {fileID: 0} - target: {fileID: 5841415790350674206, guid: dc287deb81f09d8419a5051e1d177e74, type: 3} propertyPath: m_RootOrder @@ -679,10 +904,5 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5841415790350674207, guid: dc287deb81f09d8419a5051e1d177e74, - type: 3} - propertyPath: action_dist - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: dc287deb81f09d8419a5051e1d177e74, type: 3} diff --git a/Assets/Scripts/Cleaning_workshop.cs b/Assets/Scripts/Cleaning_workshop.cs new file mode 100644 index 0000000..6fa7366 --- /dev/null +++ b/Assets/Scripts/Cleaning_workshop.cs @@ -0,0 +1,37 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +//Define the behavior of a cleaning workshop +public class Cleaning_workshop : MonoBehaviour +{ + public float cleanTime=2.0f; //Time to clean a mug + // List stock = new List(); //List of mug in workshop + + //Handle objects interactions w/ Workshop + //Return wether the object is taken from tavernkeeper + public bool use(GameObject object_used) + { + if(object_used != null && object_used.tag=="Mug") + { + Mug mug = object_used.GetComponent(); + if (mug!= null && mug.content is null && mug.dirty) //Mug dirty & empty + { + Debug.Log(object_used.name+ "cleaned by"+gameObject.name); + mug.dirty=false; + return false; + } + } + return false; + } + // Start is called before the first frame update + void Start() + { + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/Cleaning_workshop.cs.meta b/Assets/Scripts/Cleaning_workshop.cs.meta new file mode 100644 index 0000000..5b60018 --- /dev/null +++ b/Assets/Scripts/Cleaning_workshop.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: faa67d8085483414c947fc626db5d950 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 2b7b398..04f6c45 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -7,6 +7,7 @@ TagManager: - Client - Mug - Workshop + - Cleaning_workshop layers: - Default - TransparentFX