Changes in Artefact inheritance

game/Assets/Prefabs/Artefacts/PowerArtefact.prefab

@@ -12,8 +12,9 @@ GameObject:
   - component: {fileID: 8781564213167799767}
   - component: {fileID: 8781564213167799766}
   - component: {fileID: 8781564213167799761}
+  - component: {fileID: 3201523991801391447}
   m_Layer: 0
-  m_Name: Artefact
+  m_Name: PowerArtefact
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -97,6 +98,20 @@ CapsuleCollider:
   m_Height: 2
   m_Direction: 1
   m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
+--- !u!114 &3201523991801391447
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8781564213167799763}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7d3ed39e75807bc4d865f39b2ef9ea69, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data: {fileID: 0}
+  _nearbyArtefactID: {fileID: 11400000, guid: caba70196fbb1c549a934f7566f7a247, type: 2}
 --- !u!1 &8781564214893312975
 GameObject:
   m_ObjectHideFlags: 0

game/Assets/Scenes/Main.unity

@@ -407,87 +407,17 @@ Transform:
   m_Father: {fileID: 1509348081}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
---- !u!1001 &697904763
+--- !u!114 &898399640 stripped
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 8781564213167799763, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
-      propertyPath: m_Name
-      value: PowerArtefact
-      objectReference: {fileID: 0}
-    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
-      propertyPath: m_RootOrder
-      value: 3
-      objectReference: {fileID: 0}
-    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -28.2
-      objectReference: {fileID: 0}
-    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 5.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8781564214893312972, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
-      propertyPath: _artefact
-      value: 
-      objectReference: {fileID: 697904765}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
---- !u!1 &697904764 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 8781564213167799763, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
-  m_PrefabInstance: {fileID: 697904763}
-  m_PrefabAsset: {fileID: 0}
---- !u!114 &697904765
 MonoBehaviour:
-  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 3201523991801391447, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
-  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 2138848574}
-  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 697904764}
+  m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8ab47b1902ffb4e4eaa7743e63d675a2, type: 3}
+  m_Script: {fileID: 11500000, guid: 7d3ed39e75807bc4d865f39b2ef9ea69, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  data: {fileID: 11400000, guid: 8882f0bc24a2179459b1e851f8645241, type: 2}
-  _nearbyArtefactID: {fileID: 11400000, guid: caba70196fbb1c549a934f7566f7a247, type: 2}
-  _power: {fileID: 11400000, guid: d5ed942937d8cca478f3ec97f6b9c8a2, type: 2}
 --- !u!1 &1148358018
 GameObject:
   m_ObjectHideFlags: 0
@@ -668,6 +598,17 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1515549004 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3201523991801391447, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
+  m_PrefabInstance: {fileID: 1814555656}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7d3ed39e75807bc4d865f39b2ef9ea69, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1551303224
 GameObject:
   m_ObjectHideFlags: 0
@@ -807,6 +748,71 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1814555656
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3201523991801391447, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
+      propertyPath: data
+      value: 
+      objectReference: {fileID: 11400000, guid: 8882f0bc24a2179459b1e851f8645241, type: 2}
+    - target: {fileID: 8781564213167799763, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
+      propertyPath: m_Name
+      value: PowerArtefactBlink
+      objectReference: {fileID: 0}
+    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -22.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 38.53155
+      objectReference: {fileID: 0}
+    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8781564214893312972, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
+      propertyPath: _artefact
+      value: 
+      objectReference: {fileID: 1515549004}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
 --- !u!1 &1908415559
 GameObject:
   m_ObjectHideFlags: 0
@@ -902,6 +908,71 @@ Transform:
   m_Father: {fileID: 1509348081}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &2138848574
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3201523991801391447, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
+      propertyPath: data
+      value: 
+      objectReference: {fileID: 11400000, guid: a071ae87c1fc7554db6ae524b4a6d115, type: 2}
+    - target: {fileID: 8781564213167799763, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
+      propertyPath: m_Name
+      value: PowerArtefactBoost
+      objectReference: {fileID: 0}
+    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -3.4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 38.53155
+      objectReference: {fileID: 0}
+    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8781564214893312972, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
+      propertyPath: _artefact
+      value: 
+      objectReference: {fileID: 898399640}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
 --- !u!1001 &13726837176080777
 PrefabInstance:
   m_ObjectHideFlags: 0

game/Assets/Scripts/Artefacts/Artefact.cs

@@ -4,6 +4,7 @@ using UnityEngine;
 
 public class Artefact : ScriptableObject
 {
+    [SerializeField] private PlayerPower _power;
 
     public int artefactID => _artefactID;
     [SerializeField] private int _artefactID;
@@ -15,4 +16,9 @@ public class Artefact : ScriptableObject
     public bool canInteract => _canInteract;
     private bool _canInteract = false;
 
+    public virtual void PowerUnlock()
+    {
+        _power.Unlock();
+    }
+
 }

game/Assets/Scripts/Artefacts/ArtefactControl.cs

@@ -66,6 +66,7 @@ public class ArtefactControl : MonoBehaviour
             //here put 'show artifact dialogue'
             if (this.gameObject != null)
             {
+                data.PowerUnlock();
                 _nearbyArtefactID.Value = -1;
                 _canInteract = false;
                 //_show = false;

game/Assets/Scripts/Artefacts/Objects/Physical/New Physical Artefact.asset

@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bbf8d803b740a954fbfd10443ef1afdf, type: 3}
+  m_Name: New Physical Artefact
+  m_EditorClassIdentifier: 
+  _power: {fileID: 0}
+  _artefactID: 0
+  _artefactDialogue: 

game/Assets/Scripts/Artefacts/Objects/Physical/New Physical Artefact.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e62a0b30dca3396448ca1d5fed7f01f7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

game/Assets/Scripts/Artefacts/Objects/Power/Power1.asset

@@ -12,5 +12,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0228856d50ce2a845abd7b3eda114390, type: 3}
   m_Name: Power1
   m_EditorClassIdentifier: 
+  _power: {fileID: 11400000, guid: b47ea197a7cc2ed4eb15271cef672997, type: 2}
   _artefactID: 1
   _artefactDialogue: 

game/Assets/Scripts/Artefacts/Objects/Power/Power2.asset

@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0228856d50ce2a845abd7b3eda114390, type: 3}
+  m_Name: Power2
+  m_EditorClassIdentifier: 
+  _power: {fileID: 11400000, guid: d5ed942937d8cca478f3ec97f6b9c8a2, type: 2}
+  _artefactID: 2
+  _artefactDialogue: 

game/Assets/Scripts/Artefacts/Objects/Power/Power2.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a071ae87c1fc7554db6ae524b4a6d115
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

game/Assets/Scripts/Artefacts/Physical/PhysicalArtefact.cs

@@ -5,5 +5,8 @@ using UnityEngine;
 [CreateAssetMenu(fileName = "New Physical Artefact", menuName = "Artefact/PhysicalArtefact")]
 public class PhysicalArtefact : Artefact
 {
-    
+    public override void PowerUnlock()
+    {
+
+    }
 }

game/Assets/Scripts/Artefacts/Physical/PhysicalArtefactControl.cs

@@ -1,8 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class PhysicalArtefactControl : ArtefactControl
-{
-    
-}

game/Assets/Scripts/Artefacts/Physical/PhysicalArtefactControl.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 654aeb2b756db3d4d94f3548d07aaf04
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

game/Assets/Scripts/Artefacts/Power/PowerArtefactControl.cs

@@ -1,19 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class PowerArtefactControl : ArtefactControl
-{
-    [SerializeField] private PlayerPower _power;
-
-    protected override void PickUp(int id)
-    {
-        if (_canInteract == true)
-        {
-            _power.Unlock();
-            Debug.Log("overrided physical");
-        }
-        base.PickUp(id);
-
-    }
-}

game/Assets/Scripts/Artefacts/Power/PowerArtefactControl.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 8ab47b1902ffb4e4eaa7743e63d675a2
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

game/Assets/Scripts/Artefacts/Written/WrittenArtefact.cs

@@ -5,5 +5,8 @@ using UnityEngine;
 [CreateAssetMenu(fileName = "New Written Artefact", menuName = "Artefact/WrittenArtefact")]
 public class WrittenArtefact : Artefact
 {
-   
+    public override void PowerUnlock()
+    {
+
+    }
 }

game/Assets/Scripts/Artefacts/Written/WrittenArtefactControl.cs

@@ -1,23 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class WrittenArtefactControl : ArtefactControl
-{
-    protected override void Start()
-    {
-        base.Start();
-
-    }
-
-    private void enablePower()
-    {
-        //enable power from playerinput
-    }
-
-    protected override void PickUp(int id)
-    {
-        base.PickUp(id);
-        Debug.Log("overrided written");
-    }
-}

game/Assets/Scripts/Artefacts/Written/WrittenArtefactControl.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 2a5ec10e04c618440bb79b9de31e75a8
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: