From 8a9836ea4a7a4bca6915dc44a26e7fca55653d01 Mon Sep 17 00:00:00 2001
From: Ny Bruker <robinhs@stud.ntnu.no>
Date: Fri, 14 Oct 2022 18:21:16 +0200
Subject: [PATCH] Fixed compile error related to previous commit.
---
.../Assets/Code/Item/Base/ConditionalItemBase.cs | 2 +-
.../Assets/Code/Item/Base/IConditionalItem.cs.meta | 11 +++++++++++
MrBigsock/Assets/Code/Item/Base/IInactiveItem.cs.meta | 11 +++++++++++
MrBigsock/Assets/Code/Item/Base/IPassiveItem.cs.meta | 11 +++++++++++
MrBigsock/Assets/Code/Item/Base/PassiveItemBase.cs | 2 +-
5 files changed, 35 insertions(+), 2 deletions(-)
create mode 100644 MrBigsock/Assets/Code/Item/Base/IConditionalItem.cs.meta
create mode 100644 MrBigsock/Assets/Code/Item/Base/IInactiveItem.cs.meta
create mode 100644 MrBigsock/Assets/Code/Item/Base/IPassiveItem.cs.meta
diff --git a/MrBigsock/Assets/Code/Item/Base/ConditionalItemBase.cs b/MrBigsock/Assets/Code/Item/Base/ConditionalItemBase.cs
index 319f9114..3b9ba976 100644
--- a/MrBigsock/Assets/Code/Item/Base/ConditionalItemBase.cs
+++ b/MrBigsock/Assets/Code/Item/Base/ConditionalItemBase.cs
@@ -10,7 +10,7 @@ namespace BigSock.Item {
/*
A class that represents an item that an effect when a condition is meet.
*/
- public abstract class ConditionalItemBase : IConditionalItem {
+ public abstract class ConditionalItemBase : ItemBase, IConditionalItem {
public static readonly System.Random RND = new System.Random();
diff --git a/MrBigsock/Assets/Code/Item/Base/IConditionalItem.cs.meta b/MrBigsock/Assets/Code/Item/Base/IConditionalItem.cs.meta
new file mode 100644
index 00000000..b744ec58
--- /dev/null
+++ b/MrBigsock/Assets/Code/Item/Base/IConditionalItem.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7f746e9fa2e053641875903d549b140a
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/MrBigsock/Assets/Code/Item/Base/IInactiveItem.cs.meta b/MrBigsock/Assets/Code/Item/Base/IInactiveItem.cs.meta
new file mode 100644
index 00000000..0819f5f0
--- /dev/null
+++ b/MrBigsock/Assets/Code/Item/Base/IInactiveItem.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 93e248179b4fee8428e39b1579ae6df0
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/MrBigsock/Assets/Code/Item/Base/IPassiveItem.cs.meta b/MrBigsock/Assets/Code/Item/Base/IPassiveItem.cs.meta
new file mode 100644
index 00000000..36821ebd
--- /dev/null
+++ b/MrBigsock/Assets/Code/Item/Base/IPassiveItem.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a3123e6cdf218144cb7916a122b22aa1
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/MrBigsock/Assets/Code/Item/Base/PassiveItemBase.cs b/MrBigsock/Assets/Code/Item/Base/PassiveItemBase.cs
index f0a246d1..c5a96e99 100644
--- a/MrBigsock/Assets/Code/Item/Base/PassiveItemBase.cs
+++ b/MrBigsock/Assets/Code/Item/Base/PassiveItemBase.cs
@@ -10,7 +10,7 @@ namespace BigSock.Item {
/*
A class that represents an item that provides passive stat boosts.
*/
- public abstract class PassiveItemBase : IPassiveItem {
+ public abstract class PassiveItemBase : ItemBase, IPassiveItem {
/*
The modifier of the item.
*/
--
GitLab