From 17ecf7a3e63e8f354ffee024dbd78cc3ab06fe57 Mon Sep 17 00:00:00 2001
From: PHILIP WHITE <PW259246@falmouth.ac.uk>
Date: Fri, 13 Oct 2023 20:10:51 +0100
Subject: [PATCH] Update Base Item for BP Properties

---
 .../.idea.EndlessVendetta.dir/.idea/vcs.xml   |  6 +++
 .../AI/Enemy/Basic/BT_BasicEnemy.uasset       |  4 +-
 .../EndlessVendetta/Inventory/BaseItem.h      | 48 +++++++++++++------
 3 files changed, 41 insertions(+), 17 deletions(-)
 create mode 100644 EndlessVendetta/.idea/.idea.EndlessVendetta.dir/.idea/vcs.xml

diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta.dir/.idea/vcs.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta.dir/.idea/vcs.xml
new file mode 100644
index 00000000..6c0b8635
--- /dev/null
+++ b/EndlessVendetta/.idea/.idea.EndlessVendetta.dir/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/EndlessVendetta/Content/AI/Enemy/Basic/BT_BasicEnemy.uasset b/EndlessVendetta/Content/AI/Enemy/Basic/BT_BasicEnemy.uasset
index 45c0d2a1..615de8fc 100644
--- a/EndlessVendetta/Content/AI/Enemy/Basic/BT_BasicEnemy.uasset
+++ b/EndlessVendetta/Content/AI/Enemy/Basic/BT_BasicEnemy.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b818b3645e40ca126811ffdc0a3d59b41fec38fc50f493cf9a7f9b78aa41554e
-size 60604
+oid sha256:26f40ffcc7b5be8434ade7524abecd41141b751f268291f5966f6e3ef6a3fc7a
+size 63113
diff --git a/EndlessVendetta/Source/EndlessVendetta/Inventory/BaseItem.h b/EndlessVendetta/Source/EndlessVendetta/Inventory/BaseItem.h
index f2c70656..10d36545 100644
--- a/EndlessVendetta/Source/EndlessVendetta/Inventory/BaseItem.h
+++ b/EndlessVendetta/Source/EndlessVendetta/Inventory/BaseItem.h
@@ -6,37 +6,55 @@
 #include "UObject/NoExportTypes.h"
 #include "BaseItem.generated.h"
 
-USTRUCT()
-struct FItemSize 
+USTRUCT(BlueprintType)
+struct FItemSize
 {
 	GENERATED_BODY()
 
-	int x;
-	int y;
+	int X;
+	int Y;
 
-	FItemSize(int _x, int _y)
+	FItemSize(const int _X, const int _Y)
 	{
-		x = _x;
-		y = _y;
+		X = _X;
+		Y = _Y;
 	}
+
 	FItemSize()
 	{
-		x = 1;
-		y = 1;
+		X = 1;
+		Y = 1;
 	}
 };
 
+UENUM(BlueprintType)
+enum EItemRotation
+{
+	Horizontal UMETA(DisplayName = "Up"),
+	Vertical UMETA(DisplayName = "Down")
+};
+
 /**
  * 
  */
-UCLASS()
+UCLASS(Abstract)
 class ENDLESSVENDETTA_API UBaseItem : public UObject
 {
 	GENERATED_BODY()
-	
-public:
 
-	const FName ItemName;
-	const FText Description;
-	const FItemSize ItemSize = FItemSize(1, 1);
+public:
+	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item")
+	int ItemID;
+	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item")
+	FName ItemName;
+	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item")
+	FText Description;
+	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item")
+	FItemSize ItemSize = FItemSize();
+	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Instanced, Category = "Item")
+	TArray<UTexture2D*> ItemTextures;
+	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item")
+	TEnumAsByte<EItemRotation> CurrentItemRotation = Horizontal;
+	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item")
+	TSubclassOf<AActor> ItemActor;
 };