diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index a1cce59..0cdccbd 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -123,6 +123,158 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &60367258 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 60367260} + - component: {fileID: 60367259} + m_Layer: 0 + m_Name: EventHandler + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &60367259 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 60367258} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 005bf73dff204914c9e1bbd60c843451, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &60367260 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 60367258} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.079972744, y: -0.13946426, z: 32.651897} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &183708901 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 183708906} + - component: {fileID: 183708905} + - component: {fileID: 183708904} + - component: {fileID: 183708903} + - component: {fileID: 183708902} + m_Layer: 0 + m_Name: Sphere + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &183708902 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 183708901} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 44966bb2b773ce145a9d6c7c9f42aeba, type: 3} + m_Name: + m_EditorClassIdentifier: + id: 0 +--- !u!135 &183708903 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 183708901} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 4 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &183708904 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 183708901} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &183708905 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 183708901} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &183708906 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 183708901} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} + m_Children: [] + m_Father: {fileID: 1881828094} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &349701919 GameObject: m_ObjectHideFlags: 0 @@ -738,7 +890,7 @@ Rigidbody: m_IsKinematic: 0 m_Interpolate: 0 m_Constraints: 112 - m_CollisionDetection: 0 + m_CollisionDetection: 1 --- !u!1 &1444606336 GameObject: m_ObjectHideFlags: 0 @@ -1046,6 +1198,162 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1553332533 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1553332535} + - component: {fileID: 1553332534} + m_Layer: 0 + m_Name: Inventory + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1553332534 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1553332533} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6be0ffc922ae4ac4cb7568e04674a61c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1553332535 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1553332533} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.079972744, y: -0.13946426, z: 32.651897} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1881828089 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1881828094} + - component: {fileID: 1881828093} + - component: {fileID: 1881828092} + - component: {fileID: 1881828091} + - component: {fileID: 1881828090} + m_Layer: 0 + m_Name: Artefact + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1881828090 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1881828089} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e26cf8dbdb474db49ac6dadf49ceade2, type: 3} + m_Name: + m_EditorClassIdentifier: + artefactID: 0 + artefactDialogue: + canInteract: 0 +--- !u!136 &1881828091 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1881828089} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.5000001 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697} +--- !u!23 &1881828092 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1881828089} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1881828093 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1881828089} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1881828094 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1881828089} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.38, y: 0.5, z: 38.53155} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_Children: + - {fileID: 183708906} + m_Father: {fileID: 0} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1908415559 GameObject: m_ObjectHideFlags: 0 @@ -1141,3 +1449,225 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1932564749 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1932564754} + - component: {fileID: 1932564753} + - component: {fileID: 1932564752} + - component: {fileID: 1932564751} + - component: {fileID: 1932564750} + m_Layer: 0 + m_Name: Artefact (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1932564750 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1932564749} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e26cf8dbdb474db49ac6dadf49ceade2, type: 3} + m_Name: + m_EditorClassIdentifier: + artefactID: 1 + artefactDialogue: + canInteract: 0 +--- !u!136 &1932564751 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1932564749} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.5000001 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697} +--- !u!23 &1932564752 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1932564749} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1932564753 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1932564749} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1932564754 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1932564749} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -12, y: 0.5, z: 46.5} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_Children: + - {fileID: 2142420295} + m_Father: {fileID: 0} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2142420290 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2142420295} + - component: {fileID: 2142420294} + - component: {fileID: 2142420293} + - component: {fileID: 2142420292} + - component: {fileID: 2142420291} + m_Layer: 0 + m_Name: Sphere (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2142420291 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2142420290} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 44966bb2b773ce145a9d6c7c9f42aeba, type: 3} + m_Name: + m_EditorClassIdentifier: + id: 1 +--- !u!135 &2142420292 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2142420290} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 4 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &2142420293 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2142420290} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &2142420294 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2142420290} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &2142420295 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2142420290} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} + m_Children: [] + m_Father: {fileID: 1932564754} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/game/Assets/Scripts/Artefacts.meta b/game/Assets/Scripts/Artefacts.meta new file mode 100644 index 0000000..efd9a2e --- /dev/null +++ b/game/Assets/Scripts/Artefacts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 769687da190b8df4d9b78745674ad9aa +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/Artefacts/Artefact.cs b/game/Assets/Scripts/Artefacts/Artefact.cs new file mode 100644 index 0000000..82e2125 --- /dev/null +++ b/game/Assets/Scripts/Artefacts/Artefact.cs @@ -0,0 +1,69 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Artefact : MonoBehaviour +{ + + public int artefactID; + public enum Type { PhysicalArtefact, PowerArtefact, WrittenArtefact } + public string artefactDialogue; + + private bool show = false; + public bool canInteract = false; + + private void Start() + { + EventHandler.current.onArtefactTriggerEnter += NearArtefact; + EventHandler.current.onArtefactTriggerExit += AwayArtefact; + EventHandler.current.onArtefactPickUp += PickUp; + } + + private void NearArtefact(int id) + { + if(id == this.artefactID) + { + show = true; + this.canInteract = true; + } + + } + + private void AwayArtefact(int id) + { + if(id == this.artefactID) + { + show = false; + this.canInteract = false; + } + + } + + private void PickUp(int id) + { + if (id == this.artefactID) + { + if ( canInteract == true ) + { + foreach (var x in ArtefactInventory.artefactList) + { + Debug.Log(x.ToString()); + } + ArtefactInventory.addA(this); + } + //show artifact dialogue + + + } + } + + + void OnGUI() + { + if(show) + { + GUI.Label(new Rect(Screen.width / 2 - 50, 5, 100, 100), "Press E to pickup"); + } + } + +} \ No newline at end of file diff --git a/game/Assets/Scripts/Artefacts/Artefact.cs.meta b/game/Assets/Scripts/Artefacts/Artefact.cs.meta new file mode 100644 index 0000000..c86f739 --- /dev/null +++ b/game/Assets/Scripts/Artefacts/Artefact.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e26cf8dbdb474db49ac6dadf49ceade2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/Artefacts/ArtefactInventory.cs b/game/Assets/Scripts/Artefacts/ArtefactInventory.cs new file mode 100644 index 0000000..12de86b --- /dev/null +++ b/game/Assets/Scripts/Artefacts/ArtefactInventory.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ArtefactInventory : MonoBehaviour +{ + public static List artefactList = new List(); + private static bool exists = false; + + public static void addA(Artefact a) + { + //check if duplicate in the list + exists = false; + foreach (Artefact x in artefactList) + { + if (x.artefactID == a.artefactID) + exists = true; + } + + if ( exists == false) + { + artefactList.Add(a); + } + + + + } + + +} diff --git a/game/Assets/Scripts/Artefacts/ArtefactInventory.cs.meta b/game/Assets/Scripts/Artefacts/ArtefactInventory.cs.meta new file mode 100644 index 0000000..5b00538 --- /dev/null +++ b/game/Assets/Scripts/Artefacts/ArtefactInventory.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6be0ffc922ae4ac4cb7568e04674a61c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/Artefacts/ArtefactTriggerArea.cs b/game/Assets/Scripts/Artefacts/ArtefactTriggerArea.cs new file mode 100644 index 0000000..191cd72 --- /dev/null +++ b/game/Assets/Scripts/Artefacts/ArtefactTriggerArea.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ArtefactTriggerArea : MonoBehaviour +{ + public int id; + private void OnTriggerEnter(Collider Player) + { + EventHandler.current.ArtefactTriggerEnter(id); + PlayerInputHandler.id = id; + } + + private void OnTriggerExit(Collider Player) + { + EventHandler.current.ArtefactTriggerExit(id); + } + +} \ No newline at end of file diff --git a/game/Assets/Scripts/Artefacts/ArtefactTriggerArea.cs.meta b/game/Assets/Scripts/Artefacts/ArtefactTriggerArea.cs.meta new file mode 100644 index 0000000..7a926c9 --- /dev/null +++ b/game/Assets/Scripts/Artefacts/ArtefactTriggerArea.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 44966bb2b773ce145a9d6c7c9f42aeba +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/Artefacts/EventHandler.cs b/game/Assets/Scripts/Artefacts/EventHandler.cs new file mode 100644 index 0000000..ec427b2 --- /dev/null +++ b/game/Assets/Scripts/Artefacts/EventHandler.cs @@ -0,0 +1,45 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class EventHandler : MonoBehaviour +{ + + public static EventHandler current; + + private void Awake() + { + current = this; + } + + public event Action onArtefactTriggerEnter; + public void ArtefactTriggerEnter(int id) + { + if (onArtefactTriggerEnter != null) + { + onArtefactTriggerEnter(id); + } + + } + + public event Action onArtefactTriggerExit; + public void ArtefactTriggerExit(int id) + { + if (onArtefactTriggerExit != null) + { + onArtefactTriggerExit(id); + } + + } + + public event Action onArtefactPickUp; + public void ArtefactPickUp(int id) + { + if (onArtefactPickUp != null) + { + onArtefactPickUp(id); + } + } + +} diff --git a/game/Assets/Scripts/Artefacts/EventHandler.cs.meta b/game/Assets/Scripts/Artefacts/EventHandler.cs.meta new file mode 100644 index 0000000..292a2f7 --- /dev/null +++ b/game/Assets/Scripts/Artefacts/EventHandler.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 005bf73dff204914c9e1bbd60c843451 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/Player/PlayerInputHandler.cs b/game/Assets/Scripts/Player/PlayerInputHandler.cs index ef4997d..edb6bc5 100644 --- a/game/Assets/Scripts/Player/PlayerInputHandler.cs +++ b/game/Assets/Scripts/Player/PlayerInputHandler.cs @@ -6,6 +6,9 @@ using UnityEngine.InputSystem; public class PlayerInputHandler : MonoBehaviour { + //to get the artifact id you are near to + public static int id; + [SerializeField] private PlayerInputSettings _inputSettings; @@ -26,8 +29,8 @@ public class PlayerInputHandler : MonoBehaviour { _state = new PlayerInputState(); - _state.Jump = new BufferedInput( _inputSettings.JumpBufferTime ); - _state.Use = new BufferedInput( _inputSettings.UseBufferTime ); + _state.Jump = new BufferedInput(_inputSettings.JumpBufferTime); + _state.Use = new BufferedInput(_inputSettings.UseBufferTime); _state.Move = new CameraRelativeInput(); _state.Look = Vector2.zero; } @@ -36,22 +39,27 @@ public class PlayerInputHandler : MonoBehaviour { float deltaTime = Time.fixedDeltaTime; - _state.Jump.Update( deltaTime ); - _state.Use.Update( deltaTime ); + _state.Jump.Update(deltaTime); + _state.Use.Update(deltaTime); } - public void SetCameraRotation( float angle ) - => _state.Move.SetAngle( angle ); + public void SetCameraRotation(float angle) + => _state.Move.SetAngle(angle); - public void Look( InputAction.CallbackContext context ) + public void Look(InputAction.CallbackContext context) => _state.Look = context.ReadValue(); - public void Move( InputAction.CallbackContext context ) - => _state.Move.SetValue( context.ReadValue() ); + public void Move(InputAction.CallbackContext context) + => _state.Move.SetValue(context.ReadValue()); - public void Jump( InputAction.CallbackContext context ) - => _state.Jump.Set( context.ReadValue() > 0.5f ); + public void Jump(InputAction.CallbackContext context) + => _state.Jump.Set(context.ReadValue() > 0.5f); - public void Use( InputAction.CallbackContext context ) - => _state.Use.Set( context.ReadValue() > 0.5f ); + // public void Use( InputAction.CallbackContext context ) + // => _state.Use.Set( context.ReadValue() > 0.5f ); + public void Use(InputAction.CallbackContext context) + { + //Debug.Log("pressed e"); + EventHandler.current.ArtefactPickUp(id); + } } \ No newline at end of file