From fe7033f747219517b16942b8e63b18e13324b3a6 Mon Sep 17 00:00:00 2001
From: PHILIP White <PW259246@falmouth.ac.uk>
Date: Wed, 22 Mar 2023 16:34:48 +0000
Subject: [PATCH] Added 3 More Combos

---
 .../Architecture/Floor_400x400.uasset         |  4 ++--
 .../StarterContent/Audio/Collapse01.uasset    |  4 ++--
 .../GOAP/Actions/COMBO_A.cpp                  | 12 ++++++++++++
 .../GOAP/Actions/COMBO_A.h                    | 19 +++++++++++++++++++
 .../GOAP/Actions/COMBO_AA.cpp                 | 12 ++++++++++++
 .../GOAP/Actions/COMBO_AA.h                   | 19 +++++++++++++++++++
 .../GOAP/Actions/COMBO_AAA.cpp                | 12 ++++++++++++
 .../GOAP/Actions/COMBO_AAA.h                  | 19 +++++++++++++++++++
 8 files changed, 97 insertions(+), 4 deletions(-)
 create mode 100644 COMP250_1_2101327_AI/Source/COMP250_1_2101327_AI/GOAP/Actions/COMBO_A.cpp
 create mode 100644 COMP250_1_2101327_AI/Source/COMP250_1_2101327_AI/GOAP/Actions/COMBO_A.h
 create mode 100644 COMP250_1_2101327_AI/Source/COMP250_1_2101327_AI/GOAP/Actions/COMBO_AA.cpp
 create mode 100644 COMP250_1_2101327_AI/Source/COMP250_1_2101327_AI/GOAP/Actions/COMBO_AA.h
 create mode 100644 COMP250_1_2101327_AI/Source/COMP250_1_2101327_AI/GOAP/Actions/COMBO_AAA.cpp
 create mode 100644 COMP250_1_2101327_AI/Source/COMP250_1_2101327_AI/GOAP/Actions/COMBO_AAA.h

diff --git a/COMP250_1_2101327_AI/Content/StarterContent/Architecture/Floor_400x400.uasset b/COMP250_1_2101327_AI/Content/StarterContent/Architecture/Floor_400x400.uasset
index c2a34af..633e867 100644
--- a/COMP250_1_2101327_AI/Content/StarterContent/Architecture/Floor_400x400.uasset
+++ b/COMP250_1_2101327_AI/Content/StarterContent/Architecture/Floor_400x400.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6
-size 14948
+oid sha256:5cb77f439981e84f95f1169147733c5c1e014743b1e405e0723b40f23b6b9f68
+size 14831
diff --git a/COMP250_1_2101327_AI/Content/StarterContent/Audio/Collapse01.uasset b/COMP250_1_2101327_AI/Content/StarterContent/Audio/Collapse01.uasset
index 10eb1d7..5e3ff30 100644
--- a/COMP250_1_2101327_AI/Content/StarterContent/Audio/Collapse01.uasset
+++ b/COMP250_1_2101327_AI/Content/StarterContent/Audio/Collapse01.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:054f961ce7befe9c615be25a82ecadf95916f6b86afcb3057979e48be7bc38f5
-size 353935
+oid sha256:85c827023ee4b466228ec65e92b4b4a0415a106de041ac1c2cab481a2a5dfa8d
+size 348532
diff --git a/COMP250_1_2101327_AI/Source/COMP250_1_2101327_AI/GOAP/Actions/COMBO_A.cpp b/COMP250_1_2101327_AI/Source/COMP250_1_2101327_AI/GOAP/Actions/COMBO_A.cpp
new file mode 100644
index 0000000..ea365ce
--- /dev/null
+++ b/COMP250_1_2101327_AI/Source/COMP250_1_2101327_AI/GOAP/Actions/COMBO_A.cpp
@@ -0,0 +1,12 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+
+#include "COMBO_A.h"
+
+void UCOMBO_A::Init()
+{
+	ActionCost = 3.0f;
+	PreConditions.Add("AzosResource", 1);
+	Effects.Add("PlayerHealth", 5);
+	Effects.Add("AzosResource", 1);
+}
\ No newline at end of file
diff --git a/COMP250_1_2101327_AI/Source/COMP250_1_2101327_AI/GOAP/Actions/COMBO_A.h b/COMP250_1_2101327_AI/Source/COMP250_1_2101327_AI/GOAP/Actions/COMBO_A.h
new file mode 100644
index 0000000..4c18a55
--- /dev/null
+++ b/COMP250_1_2101327_AI/Source/COMP250_1_2101327_AI/GOAP/Actions/COMBO_A.h
@@ -0,0 +1,19 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "../GOAPAction.h"
+#include "COMBO_A.generated.h"
+
+/**
+ * 
+ */
+UCLASS()
+class COMP250_1_2101327_AI_API UCOMBO_A : public UGOAPAction
+{
+	GENERATED_BODY()
+	
+public:
+	virtual void Init() override;
+};
diff --git a/COMP250_1_2101327_AI/Source/COMP250_1_2101327_AI/GOAP/Actions/COMBO_AA.cpp b/COMP250_1_2101327_AI/Source/COMP250_1_2101327_AI/GOAP/Actions/COMBO_AA.cpp
new file mode 100644
index 0000000..614b6f5
--- /dev/null
+++ b/COMP250_1_2101327_AI/Source/COMP250_1_2101327_AI/GOAP/Actions/COMBO_AA.cpp
@@ -0,0 +1,12 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+
+#include "COMBO_AA.h"
+
+void UCOMBO_AA::Init()
+{
+	ActionCost = 2.0f;
+	PreConditions.Add("AzosResource", 2);
+	Effects.Add("PlayerHealth", 10);
+	Effects.Add("AzosResource", 2);
+}
\ No newline at end of file
diff --git a/COMP250_1_2101327_AI/Source/COMP250_1_2101327_AI/GOAP/Actions/COMBO_AA.h b/COMP250_1_2101327_AI/Source/COMP250_1_2101327_AI/GOAP/Actions/COMBO_AA.h
new file mode 100644
index 0000000..baa3f1d
--- /dev/null
+++ b/COMP250_1_2101327_AI/Source/COMP250_1_2101327_AI/GOAP/Actions/COMBO_AA.h
@@ -0,0 +1,19 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "../GOAPAction.h"
+#include "COMBO_AA.generated.h"
+
+/**
+ * 
+ */
+UCLASS()
+class COMP250_1_2101327_AI_API UCOMBO_AA : public UGOAPAction
+{
+	GENERATED_BODY()
+	
+public:
+	virtual void Init() override;
+};
diff --git a/COMP250_1_2101327_AI/Source/COMP250_1_2101327_AI/GOAP/Actions/COMBO_AAA.cpp b/COMP250_1_2101327_AI/Source/COMP250_1_2101327_AI/GOAP/Actions/COMBO_AAA.cpp
new file mode 100644
index 0000000..9b5e869
--- /dev/null
+++ b/COMP250_1_2101327_AI/Source/COMP250_1_2101327_AI/GOAP/Actions/COMBO_AAA.cpp
@@ -0,0 +1,12 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+
+#include "COMBO_AAA.h"
+
+void UCOMBO_AAA::Init()
+{
+	ActionCost = 1.0f;
+	PreConditions.Add("AzosResource", 3);
+	Effects.Add("PlayerHealth", 15);
+	Effects.Add("AzosResource", 3);
+}
\ No newline at end of file
diff --git a/COMP250_1_2101327_AI/Source/COMP250_1_2101327_AI/GOAP/Actions/COMBO_AAA.h b/COMP250_1_2101327_AI/Source/COMP250_1_2101327_AI/GOAP/Actions/COMBO_AAA.h
new file mode 100644
index 0000000..31c1aa1
--- /dev/null
+++ b/COMP250_1_2101327_AI/Source/COMP250_1_2101327_AI/GOAP/Actions/COMBO_AAA.h
@@ -0,0 +1,19 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "../GOAPAction.h"
+#include "COMBO_AAA.generated.h"
+
+/**
+ * 
+ */
+UCLASS()
+class COMP250_1_2101327_AI_API UCOMBO_AAA : public UGOAPAction
+{
+	GENERATED_BODY()
+	
+public:
+	virtual void Init() override;
+};