From a87d99b3f3a330d303f9e67869115f83766d7762 Mon Sep 17 00:00:00 2001 From: magn9775 Date: Tue, 12 Mar 2024 13:49:58 +0100 Subject: [PATCH 01/12] L til Noah --- Assets/Scenes/Noahs kælder.unity | 443 +++++++++++++++++++- Assets/Sprites/dårlig_toast.png.meta | 140 +++++++ Assets/Sprites/flour.png.meta | 140 +++++++ Assets/Sprites/meat_sauce_and_rice.png.meta | 140 +++++++ Assets/Sprites/onion.png.meta | 140 +++++++ Assets/Sprites/steak.png.meta | 140 +++++++ 6 files changed, 1130 insertions(+), 13 deletions(-) create mode 100644 Assets/Sprites/dårlig_toast.png.meta create mode 100644 Assets/Sprites/flour.png.meta create mode 100644 Assets/Sprites/meat_sauce_and_rice.png.meta create mode 100644 Assets/Sprites/onion.png.meta create mode 100644 Assets/Sprites/steak.png.meta diff --git a/Assets/Scenes/Noahs kælder.unity b/Assets/Scenes/Noahs kælder.unity index 53ab1c3..e12d5b3 100644 --- a/Assets/Scenes/Noahs kælder.unity +++ b/Assets/Scenes/Noahs kælder.unity @@ -256,6 +256,7 @@ MonoBehaviour: transform: {fileID: 143107363} IngredientIn: - {fileID: 1790468147} + - {fileID: 1714471222} --- !u!212 &143107366 SpriteRenderer: m_ObjectHideFlags: 0 @@ -401,7 +402,8 @@ MonoBehaviour: m_EditorClassIdentifier: transform: {fileID: 389679691} IngredientIn: - - {fileID: 867381650} + - {fileID: 460072661} + - {fileID: 1525651426} --- !u!212 &389679694 SpriteRenderer: m_ObjectHideFlags: 0 @@ -443,7 +445,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 61bff863e0634224292012df22bcdef5, type: 3} + m_Sprite: {fileID: 21300000, guid: 168c51d9cab206d42a3c6aabeff98162, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -454,6 +456,108 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &460072661 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 460072664} + - component: {fileID: 460072663} + - component: {fileID: 460072662} + m_Layer: 0 + m_Name: GroundBeef + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &460072662 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 460072661} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: af04675200abb744bb6ce073aae8899d, type: 3} + m_Name: + m_EditorClassIdentifier: + RequiredIngredients: + - {fileID: 389679690} + - {fileID: 1274549341} + - {fileID: 1420342329} + - {fileID: 885031692} +--- !u!212 &460072663 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 460072661} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: 6658aaa835fd0354c8369158b264a7d7, 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} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &460072664 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 460072661} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 4, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1325490341} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &537514707 GameObject: m_ObjectHideFlags: 0 @@ -555,6 +659,7 @@ MonoBehaviour: transform: {fileID: 537514709} IngredientIn: - {fileID: 867381650} + - {fileID: 1714471222} --- !u!61 &537514711 BoxCollider2D: m_ObjectHideFlags: 0 @@ -600,6 +705,107 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 0.64, y: 0.64} m_EdgeRadius: 0 +--- !u!1 &578240409 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 578240412} + - component: {fileID: 578240411} + - component: {fileID: 578240410} + m_Layer: 0 + m_Name: Burger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &578240410 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 578240409} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: af04675200abb744bb6ce073aae8899d, type: 3} + m_Name: + m_EditorClassIdentifier: + RequiredIngredients: + - {fileID: 1001436608} + - {fileID: 1274549341} + - {fileID: 1659394507} +--- !u!212 &578240411 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 578240409} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: 6658aaa835fd0354c8369158b264a7d7, 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} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &578240412 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 578240409} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 6, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1325490341} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &759826127 GameObject: m_ObjectHideFlags: 0 @@ -720,7 +926,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 2, y: 2, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1325490341} @@ -766,7 +972,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Sprite: {fileID: 21300000, guid: d5d8b548c18b7ef47985238815778a0a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -884,7 +1090,7 @@ MonoBehaviour: m_EditorClassIdentifier: transform: {fileID: 885031693} IngredientIn: - - {fileID: 867381650} + - {fileID: 460072661} --- !u!212 &885031696 SpriteRenderer: m_ObjectHideFlags: 0 @@ -1030,7 +1236,8 @@ MonoBehaviour: m_EditorClassIdentifier: transform: {fileID: 1001436609} IngredientIn: - - {fileID: 867381650} + - {fileID: 1790468147} + - {fileID: 578240409} --- !u!212 &1001436612 SpriteRenderer: m_ObjectHideFlags: 0 @@ -1107,7 +1314,7 @@ SpriteRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1147379266} - m_Enabled: 0 + m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 @@ -1261,6 +1468,9 @@ MonoBehaviour: transform: {fileID: 1274549342} IngredientIn: - {fileID: 1790468147} + - {fileID: 460072661} + - {fileID: 578240409} + - {fileID: 1525651426} --- !u!212 &1274549345 SpriteRenderer: m_ObjectHideFlags: 0 @@ -1302,7 +1512,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 61bff863e0634224292012df22bcdef5, type: 3} + m_Sprite: {fileID: 21300000, guid: b4d7d234e66457440bf28b559697e18f, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -1344,6 +1554,10 @@ Transform: m_Children: - {fileID: 867381651} - {fileID: 1790468148} + - {fileID: 460072664} + - {fileID: 578240412} + - {fileID: 1714471225} + - {fileID: 1525651427} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1420342329 @@ -1439,7 +1653,7 @@ MonoBehaviour: m_EditorClassIdentifier: transform: {fileID: 1420342330} IngredientIn: - - {fileID: 867381650} + - {fileID: 460072661} --- !u!212 &1420342333 SpriteRenderer: m_ObjectHideFlags: 0 @@ -1663,6 +1877,107 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 7 +--- !u!1 &1525651426 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1525651427} + - component: {fileID: 1525651429} + - component: {fileID: 1525651428} + m_Layer: 0 + m_Name: CowboyToast + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1525651427 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1525651426} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 10, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1325490341} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1525651428 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1525651426} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: af04675200abb744bb6ce073aae8899d, type: 3} + m_Name: + m_EditorClassIdentifier: + RequiredIngredients: + - {fileID: 1659394507} + - {fileID: 1274549341} + - {fileID: 389679690} +--- !u!212 &1525651429 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1525651426} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: 6658aaa835fd0354c8369158b264a7d7, 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} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1659394507 GameObject: m_ObjectHideFlags: 0 @@ -1756,7 +2071,8 @@ MonoBehaviour: m_EditorClassIdentifier: transform: {fileID: 1659394508} IngredientIn: - - {fileID: 867381650} + - {fileID: 578240409} + - {fileID: 1525651426} --- !u!212 &1659394511 SpriteRenderer: m_ObjectHideFlags: 0 @@ -1798,7 +2114,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 61bff863e0634224292012df22bcdef5, type: 3} + m_Sprite: {fileID: 21300000, guid: dfaf1935e2abff14da7316045bc12c66, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -1809,6 +2125,106 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1714471222 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1714471225} + - component: {fileID: 1714471224} + - component: {fileID: 1714471223} + m_Layer: 0 + m_Name: ChickenCurry + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1714471223 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1714471222} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: af04675200abb744bb6ce073aae8899d, type: 3} + m_Name: + m_EditorClassIdentifier: + RequiredIngredients: + - {fileID: 143107362} + - {fileID: 537514707} +--- !u!212 &1714471224 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1714471222} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: 6658aaa835fd0354c8369158b264a7d7, 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} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1714471225 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1714471222} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 8, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1325490341} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1790468147 GameObject: m_ObjectHideFlags: 0 @@ -1837,7 +2253,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 2, y: 2, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1325490341} @@ -1857,6 +2273,7 @@ MonoBehaviour: RequiredIngredients: - {fileID: 143107362} - {fileID: 1274549341} + - {fileID: 1001436608} --- !u!212 &1790468150 SpriteRenderer: m_ObjectHideFlags: 0 @@ -1898,7 +2315,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Sprite: {fileID: 21300000, guid: 6658aaa835fd0354c8369158b264a7d7, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 diff --git a/Assets/Sprites/dårlig_toast.png.meta b/Assets/Sprites/dårlig_toast.png.meta new file mode 100644 index 0000000..8321993 --- /dev/null +++ b/Assets/Sprites/dårlig_toast.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: dfaf1935e2abff14da7316045bc12c66 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + 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: 100 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/flour.png.meta b/Assets/Sprites/flour.png.meta new file mode 100644 index 0000000..6a80742 --- /dev/null +++ b/Assets/Sprites/flour.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 0b40c517a63588746a7668929bfc8ca7 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + 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: 100 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/meat_sauce_and_rice.png.meta b/Assets/Sprites/meat_sauce_and_rice.png.meta new file mode 100644 index 0000000..81a2ee4 --- /dev/null +++ b/Assets/Sprites/meat_sauce_and_rice.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 6658aaa835fd0354c8369158b264a7d7 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + 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: 100 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/onion.png.meta b/Assets/Sprites/onion.png.meta new file mode 100644 index 0000000..e6c3921 --- /dev/null +++ b/Assets/Sprites/onion.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 168c51d9cab206d42a3c6aabeff98162 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + 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: 100 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/steak.png.meta b/Assets/Sprites/steak.png.meta new file mode 100644 index 0000000..19c794d --- /dev/null +++ b/Assets/Sprites/steak.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: b4d7d234e66457440bf28b559697e18f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + 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: 100 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: From c889a936f796b33877ab0923b1a52bc2c35e6883 Mon Sep 17 00:00:00 2001 From: Ciakon Date: Tue, 12 Mar 2024 13:50:20 +0100 Subject: [PATCH 02/12] Added nutrionional value --- Assets/Scripts/Cooking.cs | 22 ++-- Assets/Scripts/Ingredient.cs | 1 + Assets/Sprites/dårlig_toast.png.meta | 127 ++++++++++++++++++++ Assets/Sprites/flour.png.meta | 127 ++++++++++++++++++++ Assets/Sprites/meat_sauce_and_rice.png.meta | 127 ++++++++++++++++++++ Assets/Sprites/onion.png.meta | 127 ++++++++++++++++++++ Assets/Sprites/steak.png.meta | 127 ++++++++++++++++++++ 7 files changed, 643 insertions(+), 15 deletions(-) create mode 100644 Assets/Sprites/dårlig_toast.png.meta create mode 100644 Assets/Sprites/flour.png.meta create mode 100644 Assets/Sprites/meat_sauce_and_rice.png.meta create mode 100644 Assets/Sprites/onion.png.meta create mode 100644 Assets/Sprites/steak.png.meta diff --git a/Assets/Scripts/Cooking.cs b/Assets/Scripts/Cooking.cs index d592768..3fe7b3f 100644 --- a/Assets/Scripts/Cooking.cs +++ b/Assets/Scripts/Cooking.cs @@ -4,29 +4,16 @@ using UnityEngine; public class Cooking : MonoBehaviour { - - private string[] ingrediens = {"L","Egg"}; - - - - List GetIngredients() - { - - - - return currentCollisions; - } - void CheckDishes() { foreach (GameObject ingredient in currentCollisions) { Debug.Log(ingredient.name); + Debug.Log(ingredient.GetComponent().NutritionalValue); } } - - + // Keep track of ingredients going on and off the cooker. List currentCollisions = new List (); @@ -44,5 +31,10 @@ public class Cooking : MonoBehaviour GetIngredients(); } + List GetIngredients() + { + return currentCollisions; + } + } diff --git a/Assets/Scripts/Ingredient.cs b/Assets/Scripts/Ingredient.cs index 9907f88..f500919 100644 --- a/Assets/Scripts/Ingredient.cs +++ b/Assets/Scripts/Ingredient.cs @@ -9,6 +9,7 @@ public class Ingredient : MonoBehaviour Vector3 mousePosition; new public Transform transform; public List IngredientIn; + public int NutritionalValue; bool isMoving = false; //public GameObject table; void Start() diff --git a/Assets/Sprites/dårlig_toast.png.meta b/Assets/Sprites/dårlig_toast.png.meta new file mode 100644 index 0000000..783bd5d --- /dev/null +++ b/Assets/Sprites/dårlig_toast.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 55aa772debf415445ad407407fda730b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + 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: 100 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/flour.png.meta b/Assets/Sprites/flour.png.meta new file mode 100644 index 0000000..937994a --- /dev/null +++ b/Assets/Sprites/flour.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 9a214110406ce4c46b321f25182d929f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + 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: 100 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/meat_sauce_and_rice.png.meta b/Assets/Sprites/meat_sauce_and_rice.png.meta new file mode 100644 index 0000000..92ecb85 --- /dev/null +++ b/Assets/Sprites/meat_sauce_and_rice.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 72abe25f265d220419f4031009164cb2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + 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: 100 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/onion.png.meta b/Assets/Sprites/onion.png.meta new file mode 100644 index 0000000..94e905c --- /dev/null +++ b/Assets/Sprites/onion.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: c9ff353953cc92841af8c10f5fa8ef79 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + 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: 100 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/steak.png.meta b/Assets/Sprites/steak.png.meta new file mode 100644 index 0000000..4e6cf3f --- /dev/null +++ b/Assets/Sprites/steak.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: b7c1d78f668acb24fb5f1ade1fafe261 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + 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: 100 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: From 0f25538814ee16f8ae9eb3f697bfa72dada5b079 Mon Sep 17 00:00:00 2001 From: Ciakon Date: Tue, 12 Mar 2024 13:55:11 +0100 Subject: [PATCH 03/12] Fixed sprites --- Assets/Sprites/dårlig_toast.png.meta | 32 ++++----------------- Assets/Sprites/flour.png.meta | 32 ++++----------------- Assets/Sprites/meat_sauce_and_rice.png.meta | 32 ++++----------------- Assets/Sprites/onion.png.meta | 32 ++++----------------- Assets/Sprites/steak.png.meta | 32 ++++----------------- 5 files changed, 30 insertions(+), 130 deletions(-) diff --git a/Assets/Sprites/dårlig_toast.png.meta b/Assets/Sprites/dårlig_toast.png.meta index 33de534..a71e4a3 100644 --- a/Assets/Sprites/dårlig_toast.png.meta +++ b/Assets/Sprites/dårlig_toast.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: dfaf1935e2abff14da7316045bc12c66 -======= -guid: 55aa772debf415445ad407407fda730b ->>>>>>> c889a936f796b33877ab0923b1a52bc2c35e6883 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -43,7 +39,7 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -67,16 +63,16 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 - applyGammaDecoding: 0 + applyGammaDecoding: 1 swizzle: 50462976 - cookieLightType: 0 + cookieLightType: 2 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,27 +81,11 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 -<<<<<<< HEAD - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 -======= ->>>>>>> c889a936f796b33877ab0923b1a52bc2c35e6883 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -118,7 +98,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Sprites/flour.png.meta b/Assets/Sprites/flour.png.meta index 5fb28ed..dd262e7 100644 --- a/Assets/Sprites/flour.png.meta +++ b/Assets/Sprites/flour.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 0b40c517a63588746a7668929bfc8ca7 -======= -guid: 9a214110406ce4c46b321f25182d929f ->>>>>>> c889a936f796b33877ab0923b1a52bc2c35e6883 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -43,7 +39,7 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -67,16 +63,16 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 - applyGammaDecoding: 0 + applyGammaDecoding: 1 swizzle: 50462976 - cookieLightType: 0 + cookieLightType: 2 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,27 +81,11 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 -<<<<<<< HEAD - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 -======= ->>>>>>> c889a936f796b33877ab0923b1a52bc2c35e6883 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -118,7 +98,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Sprites/meat_sauce_and_rice.png.meta b/Assets/Sprites/meat_sauce_and_rice.png.meta index 45bd744..34db4de 100644 --- a/Assets/Sprites/meat_sauce_and_rice.png.meta +++ b/Assets/Sprites/meat_sauce_and_rice.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 6658aaa835fd0354c8369158b264a7d7 -======= -guid: 72abe25f265d220419f4031009164cb2 ->>>>>>> c889a936f796b33877ab0923b1a52bc2c35e6883 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -43,7 +39,7 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -67,16 +63,16 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 - applyGammaDecoding: 0 + applyGammaDecoding: 1 swizzle: 50462976 - cookieLightType: 0 + cookieLightType: 2 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,27 +81,11 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 -<<<<<<< HEAD - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 -======= ->>>>>>> c889a936f796b33877ab0923b1a52bc2c35e6883 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -118,7 +98,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Sprites/onion.png.meta b/Assets/Sprites/onion.png.meta index f36019e..25e9dbb 100644 --- a/Assets/Sprites/onion.png.meta +++ b/Assets/Sprites/onion.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 168c51d9cab206d42a3c6aabeff98162 -======= -guid: c9ff353953cc92841af8c10f5fa8ef79 ->>>>>>> c889a936f796b33877ab0923b1a52bc2c35e6883 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -43,7 +39,7 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -67,16 +63,16 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 - applyGammaDecoding: 0 + applyGammaDecoding: 1 swizzle: 50462976 - cookieLightType: 0 + cookieLightType: 2 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,27 +81,11 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 -<<<<<<< HEAD - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 -======= ->>>>>>> c889a936f796b33877ab0923b1a52bc2c35e6883 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -118,7 +98,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Sprites/steak.png.meta b/Assets/Sprites/steak.png.meta index 04e8eee..4794d44 100644 --- a/Assets/Sprites/steak.png.meta +++ b/Assets/Sprites/steak.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: b4d7d234e66457440bf28b559697e18f -======= -guid: b7c1d78f668acb24fb5f1ade1fafe261 ->>>>>>> c889a936f796b33877ab0923b1a52bc2c35e6883 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -43,7 +39,7 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -67,16 +63,16 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 - applyGammaDecoding: 0 + applyGammaDecoding: 1 swizzle: 50462976 - cookieLightType: 0 + cookieLightType: 2 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,27 +81,11 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 -<<<<<<< HEAD - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 -======= ->>>>>>> c889a936f796b33877ab0923b1a52bc2c35e6883 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -118,7 +98,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 From d668718f124fd4efcbaa599fdf1bd37ad6fcf282 Mon Sep 17 00:00:00 2001 From: Ciakon Date: Tue, 12 Mar 2024 14:42:25 +0100 Subject: [PATCH 04/12] Added function that finds all possible dishes from ingredients --- Assets/Scenes/Noahs kælder.unity | 52 ++++++++++++++-------- Assets/Scripts/Cooking.cs | 75 +++++++++++++++++++++++++------- Assets/Scripts/Dish.cs | 1 + Assets/Scripts/Ingredient.cs | 3 -- 4 files changed, 94 insertions(+), 37 deletions(-) diff --git a/Assets/Scenes/Noahs kælder.unity b/Assets/Scenes/Noahs kælder.unity index e12d5b3..7bb0a01 100644 --- a/Assets/Scenes/Noahs kælder.unity +++ b/Assets/Scenes/Noahs kælder.unity @@ -257,6 +257,7 @@ MonoBehaviour: IngredientIn: - {fileID: 1790468147} - {fileID: 1714471222} + NutritionalValue: 0 --- !u!212 &143107366 SpriteRenderer: m_ObjectHideFlags: 0 @@ -380,7 +381,7 @@ BoxCollider2D: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} oldSize: {x: 0.64, y: 0.64} - newSize: {x: 1, y: 1} + newSize: {x: 0.64, y: 0.64} adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 @@ -404,6 +405,7 @@ MonoBehaviour: IngredientIn: - {fileID: 460072661} - {fileID: 1525651426} + NutritionalValue: 0 --- !u!212 &389679694 SpriteRenderer: m_ObjectHideFlags: 0 @@ -450,7 +452,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 0.64, y: 0.64} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -491,6 +493,7 @@ MonoBehaviour: - {fileID: 1274549341} - {fileID: 1420342329} - {fileID: 885031692} + NutritionalValue: 0 --- !u!212 &460072663 SpriteRenderer: m_ObjectHideFlags: 0 @@ -537,7 +540,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 0.64, y: 0.64} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -617,7 +620,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 1 m_Sprite: {fileID: 21300000, guid: d5d8b548c18b7ef47985238815778a0a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -638,7 +641,7 @@ Transform: m_GameObject: {fileID: 537514707} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 2.04, y: -2.51, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] @@ -660,6 +663,7 @@ MonoBehaviour: IngredientIn: - {fileID: 867381650} - {fileID: 1714471222} + NutritionalValue: 0 --- !u!61 &537514711 BoxCollider2D: m_ObjectHideFlags: 0 @@ -739,6 +743,7 @@ MonoBehaviour: - {fileID: 1001436608} - {fileID: 1274549341} - {fileID: 1659394507} + NutritionalValue: 0 --- !u!212 &578240411 SpriteRenderer: m_ObjectHideFlags: 0 @@ -785,7 +790,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 0.64, y: 0.64} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -997,6 +1002,7 @@ MonoBehaviour: m_EditorClassIdentifier: RequiredIngredients: - {fileID: 537514707} + NutritionalValue: 0 --- !u!1 &885031692 GameObject: m_ObjectHideFlags: 0 @@ -1025,7 +1031,7 @@ Transform: m_GameObject: {fileID: 885031692} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2, y: 0, z: 0} + m_LocalPosition: {x: 3.06, y: -2.09, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1091,6 +1097,7 @@ MonoBehaviour: transform: {fileID: 885031693} IngredientIn: - {fileID: 460072661} + NutritionalValue: 0 --- !u!212 &885031696 SpriteRenderer: m_ObjectHideFlags: 0 @@ -1238,6 +1245,7 @@ MonoBehaviour: IngredientIn: - {fileID: 1790468147} - {fileID: 578240409} + NutritionalValue: 0 --- !u!212 &1001436612 SpriteRenderer: m_ObjectHideFlags: 0 @@ -1347,7 +1355,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: -1 m_Sprite: {fileID: 21300000, guid: a28e0f4904f55524ea2137416707b61b, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -1368,7 +1376,7 @@ Transform: m_GameObject: {fileID: 1147379266} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 1.1} m_LocalScale: {x: 1.7, y: 1.7, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1445,7 +1453,7 @@ BoxCollider2D: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} oldSize: {x: 0.64, y: 0.64} - newSize: {x: 1, y: 1} + newSize: {x: 0.64, y: 0.64} adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 @@ -1471,6 +1479,7 @@ MonoBehaviour: - {fileID: 460072661} - {fileID: 578240409} - {fileID: 1525651426} + NutritionalValue: 0 --- !u!212 &1274549345 SpriteRenderer: m_ObjectHideFlags: 0 @@ -1517,7 +1526,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 0.64, y: 0.64} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -1654,6 +1663,7 @@ MonoBehaviour: transform: {fileID: 1420342330} IngredientIn: - {fileID: 460072661} + NutritionalValue: 0 --- !u!212 &1420342333 SpriteRenderer: m_ObjectHideFlags: 0 @@ -1811,7 +1821,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: -1 m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -1821,7 +1831,7 @@ SpriteRenderer: m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 + m_MaskInteraction: 2 m_SpriteSortPoint: 0 --- !u!4 &1517788315 Transform: @@ -1832,7 +1842,7 @@ Transform: m_GameObject: {fileID: 1517788312} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.19, y: 3.03, z: -1} + m_LocalPosition: {x: -0.19, y: 3.03, z: 1} m_LocalScale: {x: 4.0825, y: 3.375, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1926,6 +1936,7 @@ MonoBehaviour: - {fileID: 1659394507} - {fileID: 1274549341} - {fileID: 389679690} + NutritionalValue: 0 --- !u!212 &1525651429 SpriteRenderer: m_ObjectHideFlags: 0 @@ -1972,7 +1983,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 0.64, y: 0.64} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -2049,7 +2060,7 @@ BoxCollider2D: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} oldSize: {x: 0.64, y: 0.64} - newSize: {x: 1, y: 1} + newSize: {x: 0.64, y: 0.64} adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 @@ -2073,6 +2084,7 @@ MonoBehaviour: IngredientIn: - {fileID: 578240409} - {fileID: 1525651426} + NutritionalValue: 0 --- !u!212 &1659394511 SpriteRenderer: m_ObjectHideFlags: 0 @@ -2119,7 +2131,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 0.64, y: 0.64} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -2158,6 +2170,7 @@ MonoBehaviour: RequiredIngredients: - {fileID: 143107362} - {fileID: 537514707} + NutritionalValue: 0 --- !u!212 &1714471224 SpriteRenderer: m_ObjectHideFlags: 0 @@ -2204,7 +2217,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 0.64, y: 0.64} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -2274,6 +2287,7 @@ MonoBehaviour: - {fileID: 143107362} - {fileID: 1274549341} - {fileID: 1001436608} + NutritionalValue: 0 --- !u!212 &1790468150 SpriteRenderer: m_ObjectHideFlags: 0 @@ -2320,7 +2334,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 0.64, y: 0.64} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 diff --git a/Assets/Scripts/Cooking.cs b/Assets/Scripts/Cooking.cs index 3fe7b3f..90abb21 100644 --- a/Assets/Scripts/Cooking.cs +++ b/Assets/Scripts/Cooking.cs @@ -4,37 +4,82 @@ using UnityEngine; public class Cooking : MonoBehaviour { - void CheckDishes() - { - foreach (GameObject ingredient in currentCollisions) { + // void CheckDishes() + // { + // foreach (GameObject ingredient in currentCollisions) { - Debug.Log(ingredient.name); - Debug.Log(ingredient.GetComponent().NutritionalValue); - } + // Debug.Log(ingredient.name); + // Debug.Log(ingredient.GetComponent().NutritionalValue); + // } - } + // } + void CreateDish() { + List Ingredients = GetIngredients(); + + List AllDishes = new List (); + + // Find all dishes ingredients can make + + foreach (GameObject Ingredient in Ingredients) { + List Dishes = Ingredient.GetComponent().IngredientIn; + + foreach (GameObject Dish in Dishes) { + AllDishes.Add(Dish); + } + } + + List PossibleDishes = new List (); + + // Find the dishes, where all ingredients exist + + foreach (GameObject Dish in AllDishes) { + List RequiredIngredients = Dish.GetComponent().RequiredIngredients; + + int NumberOfIngredients = RequiredIngredients.Count; + int IngredientsFulfilled = 0; + + foreach (GameObject Ingredient in Ingredients) { + + if (RequiredIngredients.Contains(Ingredient)) { + IngredientsFulfilled++; + } + } + + if (IngredientsFulfilled == NumberOfIngredients) { + PossibleDishes.Add(Dish); + } + } + + foreach (GameObject Dish in PossibleDishes) { + Debug.Log(Dish); + } + + + + } // Keep track of ingredients going on and off the cooker. List currentCollisions = new List (); private void OnTriggerEnter2D(Collider2D other) { currentCollisions.Add (other.gameObject); - CheckDishes(); + CreateDish(); } private void OnTriggerExit2D(Collider2D other) { currentCollisions.Remove (other.gameObject); } - - - void Update() - { - GetIngredients(); - } - List GetIngredients() { return currentCollisions; } + // void Update() + // { + // GetIngredients(); + // } + + + + } diff --git a/Assets/Scripts/Dish.cs b/Assets/Scripts/Dish.cs index b2f4675..a1dba51 100644 --- a/Assets/Scripts/Dish.cs +++ b/Assets/Scripts/Dish.cs @@ -5,6 +5,7 @@ using UnityEngine; public class Dish : MonoBehaviour { public List RequiredIngredients; + public int NutritionalValue; // Start is called before the first frame update diff --git a/Assets/Scripts/Ingredient.cs b/Assets/Scripts/Ingredient.cs index f500919..2ea459e 100644 --- a/Assets/Scripts/Ingredient.cs +++ b/Assets/Scripts/Ingredient.cs @@ -33,9 +33,6 @@ public class Ingredient : MonoBehaviour void OnMouseUp() { if (isMoving) - - - isMoving = false; else isMoving = true; From 2aa0ee96812218ebbfa6f6631d7be7e3deb9b849 Mon Sep 17 00:00:00 2001 From: magn9775 Date: Tue, 12 Mar 2024 14:43:55 +0100 Subject: [PATCH 05/12] idk --- Assets/Sprites/Pancake.png | Bin 0 -> 1087 bytes Assets/Sprites/Pancake.png.meta | 140 ++++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+) create mode 100644 Assets/Sprites/Pancake.png create mode 100644 Assets/Sprites/Pancake.png.meta diff --git a/Assets/Sprites/Pancake.png b/Assets/Sprites/Pancake.png new file mode 100644 index 0000000000000000000000000000000000000000..dacf2c50abb466780a1d46d3289e556b84562880 GIT binary patch literal 1087 zcmV-F1i<@=P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1Jp@GK~#8N?U=o9 z6EPUZouv7wLWl@-=*qPY<-RZz>+cI?K$%ETYgiKVOz`~#JcDwS3+R_XvNY%Ht{ z1ktoYv@1LIPnp`Wjd%Bj6`rT)` zc7<&U3^B}z)#qctBuuz1I7^{PAX6MhI5ox@5Qw*hn}Wf0iZa2XIP zKI%??eEmT@c=AvmWdr&&arF-)(wGosfS34pFW!n3;s1+;$4Ipkh9*Z6f_f(U~XinQ@Dt`9!8va*CrVC6aZ=| z*us-6g|MfD55DW&6b_P#2TlXc4rs3Tm$L7aHtyr>D? z6oG99;cJQyreI+1L$0;%BOZ7efDh9I!d@Qq7gqmxKw3lWDGq!#IA8I=tC1#nk#Lz| z{vAdg|L<)>l9E6);jJr)0VWd&Lm&f$)YhAw9c2QRg>43vm>o1rOrwB#&BQ(?78e)o zK2m8(Ye0}0l7U>{%<}T`8B$@$5OupZjwnS+6=r?Alr)sCK974Z>+Dce=C>EqEspcvjvGy%$`c6qC~e^EtOA1 z5){`V7DD&-_8PK}z6{*zF3PMk!<=>xb#>eSYxGQUf;K+w7=~dOhG7_nVHk#C7$yxu`~shQ@L9yF#ZUkM002ovPDHLk FV1mtK;&=c6 literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Pancake.png.meta b/Assets/Sprites/Pancake.png.meta new file mode 100644 index 0000000..3af8636 --- /dev/null +++ b/Assets/Sprites/Pancake.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 9d5546e944495894ea0b92618b863083 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + 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: 100 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: From 2672e3417cc1b17d697ea6b5509f6a9c6e175857 Mon Sep 17 00:00:00 2001 From: magn9775 Date: Tue, 12 Mar 2024 14:49:26 +0100 Subject: [PATCH 06/12] redo --- Assets/Scenes/Noahs kælder.unity | 455 +++++++++++++++++++++++++++++++ 1 file changed, 455 insertions(+) diff --git a/Assets/Scenes/Noahs kælder.unity b/Assets/Scenes/Noahs kælder.unity index 7bb0a01..5adac32 100644 --- a/Assets/Scenes/Noahs kælder.unity +++ b/Assets/Scenes/Noahs kælder.unity @@ -160,6 +160,7 @@ Transform: - {fileID: 1659394508} - {fileID: 389679691} - {fileID: 1420342330} + - {fileID: 1575942282} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &143107362 @@ -811,6 +812,108 @@ Transform: m_Children: [] m_Father: {fileID: 1325490341} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &755662324 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 755662325} + - component: {fileID: 755662327} + - component: {fileID: 755662326} + m_Layer: 0 + m_Name: Toast + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &755662325 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 755662324} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 14, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1325490341} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &755662326 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 755662324} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: af04675200abb744bb6ce073aae8899d, type: 3} + m_Name: + m_EditorClassIdentifier: + RequiredIngredients: + - {fileID: 1420342329} + - {fileID: 1575942281} + - {fileID: 885031692} + NutritionalValue: 0 +--- !u!212 &755662327 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 755662324} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: dfaf1935e2abff14da7316045bc12c66, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.64, y: 0.64} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &759826127 GameObject: m_ObjectHideFlags: 0 @@ -1532,6 +1635,107 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1325467679 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1325467680} + - component: {fileID: 1325467682} + - component: {fileID: 1325467681} + m_Layer: 0 + m_Name: Bagel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1325467680 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1325467679} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 16, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1325490341} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1325467681 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1325467679} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: af04675200abb744bb6ce073aae8899d, type: 3} + m_Name: + m_EditorClassIdentifier: + RequiredIngredients: + - {fileID: 1575942281} + - {fileID: 885031692} + NutritionalValue: 0 +--- !u!212 &1325467682 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1325467679} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: dfaf1935e2abff14da7316045bc12c66, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.64, y: 0.64} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1325490340 GameObject: m_ObjectHideFlags: 0 @@ -1567,6 +1771,9 @@ Transform: - {fileID: 578240412} - {fileID: 1714471225} - {fileID: 1525651427} + - {fileID: 1680633070} + - {fileID: 755662325} + - {fileID: 1325467680} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1420342329 @@ -1989,6 +2196,153 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1575942281 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1575942282} + - component: {fileID: 1575942285} + - component: {fileID: 1575942284} + - component: {fileID: 1575942283} + m_Layer: 0 + m_Name: Flour + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1575942282 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1575942281} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 16, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 24980076} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &1575942283 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1575942281} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + 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.64, y: 0.64} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.64, y: 0.64} + m_EdgeRadius: 0 +--- !u!114 &1575942284 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1575942281} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bc5b15c2c5f208b4d95341de4aa7e2f6, type: 3} + m_Name: + m_EditorClassIdentifier: + transform: {fileID: 1575942282} + IngredientIn: + - {fileID: 1680633067} + NutritionalValue: 0 +--- !u!212 &1575942285 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1575942281} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: 0b40c517a63588746a7668929bfc8ca7, 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} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1659394507 GameObject: m_ObjectHideFlags: 0 @@ -2137,6 +2491,107 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1680633067 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1680633070} + - component: {fileID: 1680633069} + - component: {fileID: 1680633068} + m_Layer: 0 + m_Name: Pancake + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1680633068 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1680633067} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: af04675200abb744bb6ce073aae8899d, type: 3} + m_Name: + m_EditorClassIdentifier: + RequiredIngredients: + - {fileID: 1420342329} + - {fileID: 1575942281} + NutritionalValue: 0 +--- !u!212 &1680633069 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1680633067} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: 9d5546e944495894ea0b92618b863083, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.64, y: 0.64} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1680633070 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1680633067} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 12, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1325490341} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1714471222 GameObject: m_ObjectHideFlags: 0 From 35211790a4a4b1ceb4898bb57d43851703ba6773 Mon Sep 17 00:00:00 2001 From: Ciakon Date: Tue, 12 Mar 2024 14:57:25 +0100 Subject: [PATCH 07/12] Cooking function can find the best dish possible --- Assets/Scenes/Noahs kælder.unity | 4 ++-- Assets/Scripts/Cooking.cs | 27 +++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/Assets/Scenes/Noahs kælder.unity b/Assets/Scenes/Noahs kælder.unity index 7bb0a01..69f21ff 100644 --- a/Assets/Scenes/Noahs kælder.unity +++ b/Assets/Scenes/Noahs kælder.unity @@ -641,7 +641,7 @@ Transform: m_GameObject: {fileID: 537514707} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.04, y: -2.51, z: 0} + m_LocalPosition: {x: 0.19, y: -0.12, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1031,7 +1031,7 @@ Transform: m_GameObject: {fileID: 885031692} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 3.06, y: -2.09, z: 0} + m_LocalPosition: {x: 2.08, y: -0.27, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Scripts/Cooking.cs b/Assets/Scripts/Cooking.cs index 90abb21..bd1bff5 100644 --- a/Assets/Scripts/Cooking.cs +++ b/Assets/Scripts/Cooking.cs @@ -29,8 +29,9 @@ public class Cooking : MonoBehaviour } } - List PossibleDishes = new List (); + + List PossibleDishes = new List (); // Find the dishes, where all ingredients exist foreach (GameObject Dish in AllDishes) { @@ -51,11 +52,29 @@ public class Cooking : MonoBehaviour } } - foreach (GameObject Dish in PossibleDishes) { - Debug.Log(Dish); + // No dishes possible + + if (PossibleDishes.Count < 1) { + return; } - + GameObject BestDish = null; + foreach (GameObject Dish in PossibleDishes) { + + if (BestDish == null) { + BestDish = Dish; + continue; + } + + int CurrentNutritionalValue = Dish.GetComponent().NutritionalValue; + int BestNutrionnalValue = BestDish.GetComponent().NutritionalValue; + + if (CurrentNutritionalValue > BestNutrionnalValue) { + BestDish = Dish; + } + } + + Debug.Log(BestDish.name); } From 71e0cbbd17c993f5626e36c7569dd238ae64bd74 Mon Sep 17 00:00:00 2001 From: magn9775 Date: Tue, 12 Mar 2024 15:18:35 +0100 Subject: [PATCH 08/12] burger --- Assets/Sprites/burger.png | Bin 0 -> 1388 bytes Assets/Sprites/burger.png.meta | 140 +++++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+) create mode 100644 Assets/Sprites/burger.png create mode 100644 Assets/Sprites/burger.png.meta diff --git a/Assets/Sprites/burger.png b/Assets/Sprites/burger.png new file mode 100644 index 0000000000000000000000000000000000000000..e94d630b3feceb76293c2609c290bc401e08193c GIT binary patch literal 1388 zcmV-y1(W)TP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1p!G!K~#8N?U>t( z97Pny&s;ZwUE?O0sGvyv3j`B2!X|hPfruA~5b#L_$%~-mB?uv2@}@7szKBmkg!teM z#oI$zBPt2_7bubkb)%b&yA$Wu7wbD+r*l%%voqauQAquurmL&FtLyvDshXN0kH_Qj zcsw4D$K&yMJRZ+=M#&y0O>B=FF|Dy&!z5nXBlgQnbFsa&a0)f@%13$YO{NUdt_$8*BM@%Lq9|r_Izhng_ddUm&Y9<){K!&DAGYH-W3iIF+>suNauBPy;4cU*D56z6B>ctFgB5o zs2zlSO=xxkHb8@C1j&kVm~ge%;ph?n$kC_lr35T!98n_zLb!yXId&MLussEPM_-sOu)T+Up#1AMx(F+Q54eI#jhzc(RKOZoijXtL6YiW zDlDr&5WsW8ubFr@01jh#(#& z9A5l_8`qm1J|Y`}pvwjIjgZW6fmjz;d<~1K5|6PMFg7W<8P+|He&e@9c=&5XD^FbJ zI?!K%15n_U%%@F#Tq7CWyTR=n$BHjvinV11We0pvh9a>-E6Fn_} zYle_zii;~$BdHFwcr}*X!i7Qx0K6Cm=tyk;X)Bwc2dv35XwbddJpDdB4ntuBhW!>u zxy_{Qy!o{U+`)h?dk%1vP%hqeiHkd5UEF(7(2tlS{mc74zTqYw1I98cxibJC-*4GY z4ZC?+jgv@8MgW}^Ku;B&1tJiFvz`HHhXFJAePM??XX@a-zc2F9P&fl}8*t(LEZu&0 zgG~@%#=~oW+Oq^FMN>g~&5+D+GfAEizA_QVKxeIR0P!*w!}JVj{5(&WR=e_IMrVZ3 zHpzmYHHi0z&I>gJ=0$Qw~BF^Hs&ev%6&Q+XF*8l($1lJ4~n6qvS(MAY^ zgu9{zhzHX&pwLzmh$$;(y_j)cDT1}of)p|#mjU>{@8FxC(20ecZBs%R#b&!&;y*ZE z|8AMvbhLDa^dsy3SMJ|ow!mhw#773lm;T^CTXExc>1ig(FGhoE4XO~G9%|Xb5CfQZ9QP-mN z-|NEv!T?Ryo?aHtjj)SZ4_Tr$(>4GMG{FUf+{groA0#x3QN@Fz53>ovFlO{K;lC6Q zM(H5^S{&94*Mz*{t!QCn@n9^S7&6Tev?*G|Fybd6S~K Date: Tue, 12 Mar 2024 15:32:44 +0100 Subject: [PATCH 09/12] button --- Assets/Sprites/button.png | Bin 0 -> 812 bytes Assets/Sprites/button.png.meta | 140 +++++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+) create mode 100644 Assets/Sprites/button.png create mode 100644 Assets/Sprites/button.png.meta diff --git a/Assets/Sprites/button.png b/Assets/Sprites/button.png new file mode 100644 index 0000000000000000000000000000000000000000..f126d367dbd82a2d0940642c71a0e165d7010e64 GIT binary patch literal 812 zcmV+{1JnG8P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0>Mc{K~#8N?U&DP z6fq3OhZYH`LR{ztCTW!EyiQ^}$?Qt?Pa4giWD8j58^)_8C z$<5hfg3ExCcq-f?x&#`cn0L4V+3b%HPT^I-WAIjirL!o0v~US(293vKg2{lK__c&{ zq@|H!QtLWN=Nj`T4}eJyEgrzRN#>D7yd|_w&DlQ&;T&EGmMYLzz=C5E546N%GC(M` zqrwxPdI_X+*6r6{uF}e@=)>Ho4Y+T0DLC3 z!F>3f&rPvzh)op$0YJ9D{kcz1_Onlcwo*H%lwnD{hb996$o$LG-Eyl{K@Lf1P9Uv> z9=HtP0fX?HWW=lI`MsyqrV&-D2rupm!171VQWbD`&|t#m>@?lk>6v|?c?m$)@yIO! z9yHxE4vpFX_9H`F1~sgkphWLw;Hm(g(bC$^;Sr)Kf1aosS_4FdAHHuF;_+*s#k-yr z=BWcQRRDDtgU4XrzBtKN0``G+IIKodN~T$}4_FM?i<+8{%L?xU2UHG+zn>cqDYTp1 zwWi{62dn)l0;Eh~pHdrz_Jj7)z4cEJ;;BV2;rhXZi{0(v@rnmL1_0SgSeq8{fY$(E z{-7Vqh*t4Hivh^$)xdW9CJj9d09L7np2Cq{1|Z#yV4{JpG50nAnT Date: Tue, 12 Mar 2024 15:34:00 +0100 Subject: [PATCH 10/12] Finished cooking function --- .vscode/extensions.json | 5 ++ .vscode/launch.json | 10 +++ .vscode/settings.json | 60 ++++++++++++++++++ Assets/Scenes/Noahs kælder.unity | 102 +++++++++++++++++++++++++++--- Assets/Scripts/CookButton.cs | 8 +++ Assets/Scripts/CookButton.cs.meta | 11 ++++ Assets/Scripts/Cooking.cs | 13 +++- Packages/manifest.json | 2 +- Packages/packages-lock.json | 2 +- 9 files changed, 201 insertions(+), 12 deletions(-) create mode 100644 .vscode/extensions.json create mode 100644 .vscode/launch.json create mode 100644 .vscode/settings.json create mode 100644 Assets/Scripts/CookButton.cs create mode 100644 Assets/Scripts/CookButton.cs.meta diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..ddb6ff8 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,5 @@ +{ + "recommendations": [ + "visualstudiotoolsforunity.vstuc" + ] +} diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..da60e25 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,10 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "Attach to Unity", + "type": "vstuc", + "request": "attach" + } + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..4f0fdb8 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,60 @@ +{ + "files.exclude": { + "**/.DS_Store": true, + "**/.git": true, + "**/.vs": true, + "**/.gitmodules": true, + "**/.vsconfig": true, + "**/*.booproj": true, + "**/*.pidb": true, + "**/*.suo": true, + "**/*.user": true, + "**/*.userprefs": true, + "**/*.unityproj": true, + "**/*.dll": true, + "**/*.exe": true, + "**/*.pdf": true, + "**/*.mid": true, + "**/*.midi": true, + "**/*.wav": true, + "**/*.gif": true, + "**/*.ico": true, + "**/*.jpg": true, + "**/*.jpeg": true, + "**/*.png": true, + "**/*.psd": true, + "**/*.tga": true, + "**/*.tif": true, + "**/*.tiff": true, + "**/*.3ds": true, + "**/*.3DS": true, + "**/*.fbx": true, + "**/*.FBX": true, + "**/*.lxo": true, + "**/*.LXO": true, + "**/*.ma": true, + "**/*.MA": true, + "**/*.obj": true, + "**/*.OBJ": true, + "**/*.asset": true, + "**/*.cubemap": true, + "**/*.flare": true, + "**/*.mat": true, + "**/*.meta": true, + "**/*.prefab": true, + "**/*.unity": true, + "build/": true, + "Build/": true, + "Library/": true, + "library/": true, + "obj/": true, + "Obj/": true, + "Logs/": true, + "logs/": true, + "ProjectSettings/": true, + "UserSettings/": true, + "temp/": true, + "Temp/": true + }, + "dotnet.defaultSolution": "Let-Him-Cook.sln" +} \ No newline at end of file diff --git a/Assets/Scenes/Noahs kælder.unity b/Assets/Scenes/Noahs kælder.unity index 862bccf..c88ef41 100644 --- a/Assets/Scenes/Noahs kælder.unity +++ b/Assets/Scenes/Noahs kælder.unity @@ -311,6 +311,90 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &228737563 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 228737564} + - component: {fileID: 228737565} + m_Layer: 0 + m_Name: CookButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &228737564 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 228737563} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -1} + m_LocalScale: {x: 0, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1517788315} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &228737565 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 228737563} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, 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} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &389679690 GameObject: m_ObjectHideFlags: 0 @@ -555,13 +639,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 460072661} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 4, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: 0.011939, w: -0.9999287} + m_LocalPosition: {x: 4.06, y: 0.01, z: 0} m_LocalScale: {x: 2, y: 2, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1325490341} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -1.368} --- !u!1 &537514707 GameObject: m_ObjectHideFlags: 0 @@ -642,7 +726,7 @@ Transform: m_GameObject: {fileID: 537514707} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.19, y: -0.12, z: 0} + m_LocalPosition: {x: 12.08, y: -4.04, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1033,7 +1117,7 @@ Transform: m_GameObject: {fileID: 867381650} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0.34, y: 0, z: 0} m_LocalScale: {x: 2, y: 2, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1134,7 +1218,7 @@ Transform: m_GameObject: {fileID: 885031692} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.08, y: -0.27, z: 0} + m_LocalPosition: {x: 11.83, y: -2.66, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1281,7 +1365,7 @@ Transform: m_GameObject: {fileID: 1001436608} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 4, y: 0, z: 0} + m_LocalPosition: {x: 11.03, y: -4.47, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2052,7 +2136,8 @@ Transform: m_LocalPosition: {x: -0.19, y: 3.03, z: 1} m_LocalScale: {x: 4.0825, y: 3.375, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 228737564} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1517788316 @@ -2067,6 +2152,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 84e0c3f7dac20fb428c544f192588d80, type: 3} m_Name: m_EditorClassIdentifier: + FinishedDishPosition: {x: -4.66, y: 2.89, z: 0} --- !u!50 &1517788317 Rigidbody2D: serializedVersion: 4 diff --git a/Assets/Scripts/CookButton.cs b/Assets/Scripts/CookButton.cs new file mode 100644 index 0000000..f3d5313 --- /dev/null +++ b/Assets/Scripts/CookButton.cs @@ -0,0 +1,8 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class CookButton : MonoBehaviour +{ + +} diff --git a/Assets/Scripts/CookButton.cs.meta b/Assets/Scripts/CookButton.cs.meta new file mode 100644 index 0000000..e0fed74 --- /dev/null +++ b/Assets/Scripts/CookButton.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 30e28733a4100f84e806c42e84c6d4ba +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Cooking.cs b/Assets/Scripts/Cooking.cs index bd1bff5..83b126b 100644 --- a/Assets/Scripts/Cooking.cs +++ b/Assets/Scripts/Cooking.cs @@ -14,6 +14,8 @@ public class Cooking : MonoBehaviour // } + public Vector3 FinishedDishPosition; + void CreateDish() { List Ingredients = GetIngredients(); @@ -74,12 +76,19 @@ public class Cooking : MonoBehaviour } } - Debug.Log(BestDish.name); + // Remove ingredients and add the dish + foreach (GameObject Ingredient in Ingredients) { + Transform transform = Ingredient.GetComponent().transform; + transform.position = Vector3.up * 50; + } + + BestDish.transform.position = FinishedDishPosition; + } // Keep track of ingredients going on and off the cooker. - List currentCollisions = new List (); + List currentCollisions = new List (); private void OnTriggerEnter2D(Collider2D other) { currentCollisions.Add (other.gameObject); CreateDish(); diff --git a/Packages/manifest.json b/Packages/manifest.json index 5077cac..40c3510 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -3,7 +3,7 @@ "com.unity.collab-proxy": "2.2.0", "com.unity.feature.2d": "2.0.0", "com.unity.ide.rider": "3.0.24", - "com.unity.ide.visualstudio": "2.0.18", + "com.unity.ide.visualstudio": "2.0.22", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.7.5", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 202403f..45116dd 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -152,7 +152,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.18", + "version": "2.0.22", "depth": 0, "source": "registry", "dependencies": { From 39c74200203d9e9c8458a8e64c50491948968c3b Mon Sep 17 00:00:00 2001 From: Ciakon Date: Tue, 12 Mar 2024 16:02:45 +0100 Subject: [PATCH 11/12] You can cook --- Assets/Scenes/Noahs kælder.unity | 284 ++++++++++++++++++++----------- Assets/Scripts/CookButton.cs | 6 + Assets/Scripts/Cooking.cs | 35 +++- ProjectSettings/TagManager.asset | 3 +- 4 files changed, 225 insertions(+), 103 deletions(-) diff --git a/Assets/Scenes/Noahs kælder.unity b/Assets/Scenes/Noahs kælder.unity index c88ef41..1bfdbf0 100644 --- a/Assets/Scenes/Noahs kælder.unity +++ b/Assets/Scenes/Noahs kælder.unity @@ -177,7 +177,7 @@ GameObject: - component: {fileID: 143107364} m_Layer: 0 m_Name: Rice - m_TagString: Untagged + m_TagString: Ingredient m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -311,90 +311,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &228737563 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 228737564} - - component: {fileID: 228737565} - m_Layer: 0 - m_Name: CookButton - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &228737564 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 228737563} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -1} - m_LocalScale: {x: 0, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1517788315} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &228737565 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 228737563} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - 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: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, 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} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &389679690 GameObject: m_ObjectHideFlags: 0 @@ -409,7 +325,7 @@ GameObject: - component: {fileID: 389679692} m_Layer: 0 m_Name: Onion - m_TagString: Untagged + m_TagString: Ingredient m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -660,7 +576,7 @@ GameObject: - component: {fileID: 537514711} m_Layer: 0 m_Name: Chimken - m_TagString: Untagged + m_TagString: Ingredient m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -726,7 +642,7 @@ Transform: m_GameObject: {fileID: 537514707} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 12.08, y: -4.04, z: 0} + m_LocalPosition: {x: 1.97, y: -0.06, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1204,7 +1120,7 @@ GameObject: - component: {fileID: 885031694} m_Layer: 0 m_Name: Egg - m_TagString: Untagged + m_TagString: Ingredient m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1218,7 +1134,7 @@ Transform: m_GameObject: {fileID: 885031692} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 11.83, y: -2.66, z: 0} + m_LocalPosition: {x: -0.01, y: -0.03, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1351,7 +1267,7 @@ GameObject: - component: {fileID: 1001436610} m_Layer: 0 m_Name: Tomato - m_TagString: Untagged + m_TagString: Ingredient m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1365,7 +1281,7 @@ Transform: m_GameObject: {fileID: 1001436608} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 11.03, y: -4.47, z: 0} + m_LocalPosition: {x: 3.84, y: -0.11, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1583,7 +1499,7 @@ GameObject: - component: {fileID: 1274549343} m_Layer: 0 m_Name: Beef - m_TagString: Untagged + m_TagString: Ingredient m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1874,7 +1790,7 @@ GameObject: - component: {fileID: 1420342331} m_Layer: 0 m_Name: Milk - m_TagString: Untagged + m_TagString: Ingredient m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -2137,7 +2053,7 @@ Transform: m_LocalScale: {x: 4.0825, y: 3.375, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 228737564} + - {fileID: 1639705739} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1517788316 @@ -2296,7 +2212,7 @@ GameObject: - component: {fileID: 1575942283} m_Layer: 0 m_Name: Flour - m_TagString: Untagged + m_TagString: Ingredient m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -2429,6 +2345,178 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1639705738 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1639705739} + - component: {fileID: 1639705740} + - component: {fileID: 1639705741} + - component: {fileID: 1639705742} + - component: {fileID: 1639705743} + m_Layer: 0 + m_Name: CookButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1639705739 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1639705738} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.033, y: -0.604, z: -1} + m_LocalScale: {x: 0.4, y: 0.4, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1517788315} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1639705740 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1639705738} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: 5c352ce85017d554694d2fe2623b1f8a, 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} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &1639705741 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1639705738} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30e28733a4100f84e806c42e84c6d4ba, type: 3} + m_Name: + m_EditorClassIdentifier: + Button: {fileID: 1639705738} +--- !u!61 &1639705742 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1639705738} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + 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.64, y: 0.64} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.64, y: 0.64} + m_EdgeRadius: 0 +--- !u!50 &1639705743 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1639705738} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 7 --- !u!1 &1659394507 GameObject: m_ObjectHideFlags: 0 @@ -2443,7 +2531,7 @@ GameObject: - component: {fileID: 1659394509} m_Layer: 0 m_Name: Toast - m_TagString: Untagged + m_TagString: Ingredient m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -2711,7 +2799,7 @@ MonoBehaviour: RequiredIngredients: - {fileID: 143107362} - {fileID: 537514707} - NutritionalValue: 0 + NutritionalValue: 25 --- !u!212 &1714471224 SpriteRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/CookButton.cs b/Assets/Scripts/CookButton.cs index f3d5313..2eb9dca 100644 --- a/Assets/Scripts/CookButton.cs +++ b/Assets/Scripts/CookButton.cs @@ -1,8 +1,14 @@ using System.Collections; using System.Collections.Generic; +using Unity.VisualScripting; using UnityEngine; public class CookButton : MonoBehaviour { + public GameObject Button; + void OnMouseUp() { + Debug.Log("L"); + Button.GetComponentInParent().CreateDish(); + } } diff --git a/Assets/Scripts/Cooking.cs b/Assets/Scripts/Cooking.cs index 83b126b..74471b2 100644 --- a/Assets/Scripts/Cooking.cs +++ b/Assets/Scripts/Cooking.cs @@ -16,14 +16,21 @@ public class Cooking : MonoBehaviour public Vector3 FinishedDishPosition; - void CreateDish() { + public void CreateDish() { List Ingredients = GetIngredients(); List AllDishes = new List (); // Find all dishes ingredients can make + if (Ingredients.Count < 1) { + return; + } + foreach (GameObject Ingredient in Ingredients) { + + Debug.Log(Ingredient.name); + List Dishes = Ingredient.GetComponent().IngredientIn; foreach (GameObject Dish in Dishes) { @@ -76,8 +83,22 @@ public class Cooking : MonoBehaviour } } - // Remove ingredients and add the dish + // Find used ingredients + List IngredientsInDish = BestDish.GetComponent().RequiredIngredients; + List UsedIngredients = new(); + List UnusedIngredients = new(); + foreach (GameObject Ingredient in Ingredients) { + if (IngredientsInDish.Contains(Ingredient)) { + UsedIngredients.Add(Ingredient); + } + else { + UnusedIngredients.Add(Ingredient); + } + } + + // Remove ingredients and add the dish + foreach (GameObject Ingredient in UsedIngredients) { Transform transform = Ingredient.GetComponent().transform; transform.position = Vector3.up * 50; } @@ -91,14 +112,20 @@ public class Cooking : MonoBehaviour List currentCollisions = new List (); private void OnTriggerEnter2D(Collider2D other) { currentCollisions.Add (other.gameObject); - CreateDish(); } private void OnTriggerExit2D(Collider2D other) { currentCollisions.Remove (other.gameObject); } List GetIngredients() { - return currentCollisions; + List Ingredients = new List (); + + foreach (GameObject collision in currentCollisions) { + if (collision.tag == "Ingredient") { + Ingredients.Add(collision); + } + } + return Ingredients; } diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 1c92a78..ec9d4b3 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -3,7 +3,8 @@ --- !u!78 &1 TagManager: serializedVersion: 2 - tags: [] + tags: + - Ingredient layers: - Default - TransparentFX From 787261376911aaf05c4b5afa2274df692fd11d8a Mon Sep 17 00:00:00 2001 From: magn9775 Date: Tue, 12 Mar 2024 16:06:45 +0100 Subject: [PATCH 12/12] toast --- Assets/Sprites/Toast.png | Bin 0 -> 663 bytes Assets/Sprites/Toast.png.meta | 140 +++++++++++++++++++++++++++++++ Assets/Sprites/ToastEgg.png | Bin 0 -> 1412 bytes Assets/Sprites/ToastEgg.png.meta | 140 +++++++++++++++++++++++++++++++ 4 files changed, 280 insertions(+) create mode 100644 Assets/Sprites/Toast.png create mode 100644 Assets/Sprites/Toast.png.meta create mode 100644 Assets/Sprites/ToastEgg.png create mode 100644 Assets/Sprites/ToastEgg.png.meta diff --git a/Assets/Sprites/Toast.png b/Assets/Sprites/Toast.png new file mode 100644 index 0000000000000000000000000000000000000000..ef5bf545b35e0070f54209944dbbf537f275c92d GIT binary patch literal 663 zcmV;I0%-k-P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0xU^HK~#8N?U>C` z#4rqnv(UnFpdvcpKq(YJDIDm4ia4+>Fo74Wpm^e}CCfiE=$r8*Tok?cWGC$8IF92u zj^j9v<2e71Q@D=E9Iix_UPm)v75#O24R^oXo}a>*w9E!J0 znZxT2XFv_nxzl51g0#SD0veE>1u=VKL5`6<44BzFczqvBOvp_)7Yh@_25@o=u-+!9 zM>Q-AP=5$PJPZj0jv5AlEE9T(<}^281ks#Y27rwT#0a7})eV4{(L{4&C}lt| x(VXT6j3AoRqJj8V+wP(r$8j9TaU5rwz5#=dX*2)_bK(F1002ovPDHLkV1n)-9A*Fj literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Toast.png.meta b/Assets/Sprites/Toast.png.meta new file mode 100644 index 0000000..a4f21c9 --- /dev/null +++ b/Assets/Sprites/Toast.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: e3fe901e976d53d4fa9e377a7018c79b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + 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: 100 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/ToastEgg.png b/Assets/Sprites/ToastEgg.png new file mode 100644 index 0000000000000000000000000000000000000000..46bb6ba2a3e840af26a7a3618dba1f9bf2a2efb6 GIT binary patch literal 1412 zcmV-~1$+95P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1sO?1K~#8N?U_$+ z95oomJ=ty>rKLfr2~>@cQpABfltYy>5+8sAUxOPTfE!CcCdq?W8bum&{Gw zhR*ug)s1VS|9Se*Uq5gfuYBTL_N+@y2iHaSz##(++R+ai6> zV4q9U(#n9`!nx?HvmZ=r!QkH4x^_LY&D2OWpp|$>gf+Hk7ce4c8e$Ddj(uo!W65bk zi~(AFs_?d=IUxgpm9U^ji2+fgZav&PmpP%&xZaZvf+P)128c&pGScY$WlAw%x1!xsl7GOR0`cJQCr@-O!3^e-E|&q`c~9ac@W`)kZ0I_LVfkGeeSmszZ%?;Dj0rBB2}lut zc6wYDh(9_!)YsdH2Srh+XMcRJ@9QJdgjx!01H939!9|06TlaM##?z^3Ei?S>qpIBa z^Rue$!oIJa0w6KLHLyzw@GX3}P74q~n>xlji0d>*-`(8Q^%B2)Xd0#CgZET1SXXa0 z9;^BAzSo4zR0GWo2#!9c0QO)AM4@&PbC!&?TjjogqrCR2G~n8pCUT{qmH^-Ab08c= z!ug9Ard4OkrbaP6R>jqsDrU!OZTzcF1W$o|4hXFUk>~+;E`kzp8gr$9M&|J7NKIb9 z_L?xdyil_%vn{_FX(Q&vdTGY<#Wf2&#}=O>1!4m*uOYe#-bpgSX88G;8a{faCgTe= zes%pm#E&Oyx^R#JY^m>m@=a|q%mF_c1%JmUXSw4v6=00LMN%?g-0sefZf|dI>zXtF z_h&Wx{mVsru&Hi-dZ61b_=%8%XVJn7Bqu~V8OBb5Y5AZTf0z$+k|MgZyQ}WrxuXTx z6z@D*B%&-K@c?HEB*C6`ZHO`8sw~5@luLGfN`!Ul)D*-TpyMxvgk$xlbt7d8U@N5p zW@Q4f!?=j~6&Z*PU^lKE@Ixu!M`VCbBLyxKaE+IflM`L|IRaZMb|c&eqm5DL;I&!Z z#ncRl{jwAuPi_J)1Qtsa>>S{)gM+G&aF=)>T@$!Y`!6JofA23x013cuPy?L`oeKau zNK=8%1_TM_-*X9S5-vH;(;1-p!O-Vp$$`jXS{g8HG5~7=Uk?B!!}a+PTr@ow;Mq+k zgbV;75cB6_RNXi$pZ1$pAM0y#@f$|Nb0F z$YMf@XpXP%ws_FW0AME})qpmlrG4emC%gvWhxEpP8zD7e6`~2(=mVbtAld`~BSHqO zQZ&KD1F-=h$pnChaubMEi6(p_Pc#_-l1v~2AZFE~i6-$tVgN`s0r(8)LNp-}52OYF zZ32*X)@4AKq6w*Z5Muxll?K)sO;@6c81W#*01%yquCa_3>q<3%NLm|mk}8~NYXJCP z($H2ok;4F@G6HmAMlR8uoCa`eW`Gn!EWt$9K6hn+&5|Jztg4SaJw0z7O8o}|lvWO{ Sp!Q|}0000