From 8219bcfda212edf318fc5d326ae81a24f7d9347a Mon Sep 17 00:00:00 2001
From: Rafal Swierczek <RS258946@falmouth.ac.uk>
Date: Sun, 14 Jan 2024 01:11:33 +0000
Subject: [PATCH] Added Gadget Room

---
 .../.idea.EndlessVendetta/.idea/workspace.xml | 73 +++++++++++++++++++
 EndlessVendetta/Config/DefaultEngine.ini      |  2 +-
 .../ModularPieces/BP_TempRailing.uasset       |  4 +-
 .../BP_CombatWorkbench.uasset                 |  4 +-
 .../GunRangeMechanics/BP_DroppableWall.uasset |  4 +-
 .../BP_ReconWorkbench.uasset                  |  4 +-
 .../GadgetRoom/BP_CombatWorkbench.uasset      |  3 +
 .../GadgetRoom/BP_GadgetWall.uasset           |  3 +
 .../GadgetRoom/BP_ReconWorkbench.uasset       |  3 +
 .../Parkour/BP_SprintWall1.uasset             |  4 +-
 .../Parkour/BP_SprintWall2.uasset             |  4 +-
 .../Parkour/BP_SprintWall3.uasset             |  4 +-
 .../Target/BP_NonShootableTarget.uasset       |  3 +
 .../Blueprints/BP_FirstPersonCharacter.uasset |  4 +-
 .../Content/Levels/ControlTutorialLevel.umap  |  4 +-
 .../HDRI/HDRI_Epic_Courtyard_Daylight.uasset  |  2 +-
 .../Source/EndlessVendetta/DroppableWall.cpp  | 27 +++++++
 .../Source/EndlessVendetta/DroppableWall.h    | 28 +++++++
 18 files changed, 160 insertions(+), 20 deletions(-)
 create mode 100644 EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/GadgetRoom/BP_CombatWorkbench.uasset
 create mode 100644 EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/GadgetRoom/BP_GadgetWall.uasset
 create mode 100644 EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/GadgetRoom/BP_ReconWorkbench.uasset
 create mode 100644 EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Target/BP_NonShootableTarget.uasset
 create mode 100644 EndlessVendetta/Source/EndlessVendetta/DroppableWall.cpp
 create mode 100644 EndlessVendetta/Source/EndlessVendetta/DroppableWall.h

diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
index 18b2937a..69cf729c 100644
--- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
+++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
@@ -1,5 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="AutoGeneratedRunConfigurationManager">
+    <projectFile>Intermediate/ProjectFiles/EndlessVendetta.vcxproj</projectFile>
+  </component>
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="42162083-13f4-4956-90b7-146c4a08f785" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Parkour/BP_SprintWall1.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Parkour/BP_SprintWall1.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Parkour/BP_SprintWall2.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Parkour/BP_SprintWall2.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Parkour/BP_SprintWall3.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Parkour/BP_SprintWall3.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Levels/ControlTutorialLevel.umap" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Levels/ControlTutorialLevel.umap" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
+  </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
+  <component name="ProjectColorInfo"><![CDATA[{
+  "customColor": "",
+  "associatedIndex": 5
+}]]></component>
+  <component name="ProjectId" id="2auydcK0pfqmRApN6dV8N1lcbgi" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "C++ Project.EndlessVendetta.executor": "Run",
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "git-widget-placeholder": "GunRange-2.0",
+    "ignore.virus.scanning.warn.message": "true",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "vue.rearranger.settings.migration": "true"
+  },
+  "keyToStringList": {
+    "rider.external.source.directories": [
+      "C:\\Users\\Rafal\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\DecompilerCache",
+      "C:\\Users\\Rafal\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\SourcesCache",
+      "C:\\Users\\Rafal\\AppData\\Local\\Symbols\\src"
+    ]
+  }
+}]]></component>
   <component name="RunManager">
     <configuration name="EndlessVendetta" type="CppProject" factoryName="C++ Project">
       <configuration_1>
@@ -63,4 +118,22 @@
       </method>
     </configuration>
   </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="42162083-13f4-4956-90b7-146c4a08f785" name="Changes" comment="" />
+      <created>1705182847910</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1705182847910</updated>
+      <workItem from="1705182850227" duration="655000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+  <component name="VcsManagerConfiguration">
+    <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/EndlessVendetta/Config/DefaultEngine.ini b/EndlessVendetta/Config/DefaultEngine.ini
index d13429f4..92c03963 100644
--- a/EndlessVendetta/Config/DefaultEngine.ini
+++ b/EndlessVendetta/Config/DefaultEngine.ini
@@ -60,7 +60,7 @@
 +CollisionChannelRedirects=(OldName="PawnMovement",NewName="Pawn")
 
 [/Script/EngineSettings.GameMapsSettings]
-EditorStartupMap=/Game/Levels/TrainingFacility.TrainingFacility
+EditorStartupMap=/Game/Levels/ControlTutorialLevel.ControlTutorialLevel
 LocalMapOptions=
 TransitionMap=None
 bUseSplitscreen=True
diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/BP_TempRailing.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/BP_TempRailing.uasset
index da4c1a8e..570c4090 100644
--- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/BP_TempRailing.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/BP_TempRailing.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:49166b9ed78cc161e0f22173e0ca7ca4bc6d6044e9024bf1994b3bdae1356624
-size 29674
+oid sha256:8a7ad8cdca5b405b8684664639be8ddffa4d82db49315236ac703079fd024a2e
+size 31554
diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/BP_CombatWorkbench.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/BP_CombatWorkbench.uasset
index 98aa211c..61ff3b15 100644
--- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/BP_CombatWorkbench.uasset
+++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/BP_CombatWorkbench.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6e6d46036402091aadb0a47275d0039b8bc86472201a5d3a6186325f89203787
-size 23563
+oid sha256:62ee6facf2a63f60f1d057899ce4e80c5eb84389b939b2c146628fda8f895c43
+size 2783
diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/BP_DroppableWall.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/BP_DroppableWall.uasset
index 610facc2..bab23348 100644
--- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/BP_DroppableWall.uasset
+++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/BP_DroppableWall.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c05c73a88e5d2df03e707e179828bdc61c82a5b233a6263c01a77eddb3a2b8f4
-size 75528
+oid sha256:d503f14cd7a769493cf5f4740e84910e4c3caafafd8f6406ba1701879b5603f6
+size 78176
diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/BP_ReconWorkbench.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/BP_ReconWorkbench.uasset
index 20511a07..5a55bff8 100644
--- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/BP_ReconWorkbench.uasset
+++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/BP_ReconWorkbench.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6addab12e7e52b98478d0bdc2db88e878432bf429772efa22b8da78dad0ed6d4
-size 23646
+oid sha256:0441dbf253174c2b1ea779f66c680ce130cdc801e0458f561558a44a9ae4c336
+size 2763
diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/GadgetRoom/BP_CombatWorkbench.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/GadgetRoom/BP_CombatWorkbench.uasset
new file mode 100644
index 00000000..ac8bd1a3
--- /dev/null
+++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/GadgetRoom/BP_CombatWorkbench.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bba29d903bd71cd8616cb0d7fac5d27b6f96532ca0f79a8ec153e2de884045c3
+size 22827
diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/GadgetRoom/BP_GadgetWall.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/GadgetRoom/BP_GadgetWall.uasset
new file mode 100644
index 00000000..66bf5551
--- /dev/null
+++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/GadgetRoom/BP_GadgetWall.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:370cad49c42aa8322993053abfa0955b5aeb9c6035392c82a01d7bf12c7e6e3f
+size 93912
diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/GadgetRoom/BP_ReconWorkbench.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/GadgetRoom/BP_ReconWorkbench.uasset
new file mode 100644
index 00000000..4161fe1b
--- /dev/null
+++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/GadgetRoom/BP_ReconWorkbench.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:589125c0e5dd3e531117df471dc16a549d3ef6f72ddd7ceed1b6832b9f75371a
+size 22912
diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Parkour/BP_SprintWall1.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Parkour/BP_SprintWall1.uasset
index 85120d34..e63ad1c3 100644
--- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Parkour/BP_SprintWall1.uasset
+++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Parkour/BP_SprintWall1.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5e9bc8ab73466dab75493b53d5d881d84184e1ed5a82703f16c89483d23c116d
-size 105081
+oid sha256:007c41e02175f5148b70e70402ff985c1d343b0ce85f5b5845f82351aeb6c8b6
+size 105113
diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Parkour/BP_SprintWall2.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Parkour/BP_SprintWall2.uasset
index 95b93d82..ad3cfd25 100644
--- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Parkour/BP_SprintWall2.uasset
+++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Parkour/BP_SprintWall2.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1491a7ed8a6b6466305a83a8de724ef881b761a49f1445d3f8906823600ab76b
-size 111558
+oid sha256:2b24b7285a71d441bb8813d55db2341fe7e99b97fb25b33a84ca1e1c4a7bee0f
+size 111590
diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Parkour/BP_SprintWall3.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Parkour/BP_SprintWall3.uasset
index 37042f73..9905d716 100644
--- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Parkour/BP_SprintWall3.uasset
+++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Parkour/BP_SprintWall3.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:873f2a0fd08004522926c05fc31eac2468827ad9a1909cef04ebf1dd1c71907f
-size 110892
+oid sha256:ed77e01ce92927b44b11dc1b5515bdac53fe8c0669c02884850972d491a74381
+size 110924
diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Target/BP_NonShootableTarget.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Target/BP_NonShootableTarget.uasset
new file mode 100644
index 00000000..2f3a6471
--- /dev/null
+++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Target/BP_NonShootableTarget.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9da4b09d534f6e2890b12d0dbaacba8204da954d9c88f454395070346a61c993
+size 63628
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
index d0c2e67b..c330a926 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b71918df1041e3db67a88e3c6ca3131317688654043de70e6893560a23753b18
-size 69276
+oid sha256:22cfe5fb6fc5e12348a76a250e903d182d8950b6cb54aba5a557ed0a643791e5
+size 68896
diff --git a/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap b/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap
index 44f7ebfc..cabd5c22 100644
--- a/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap
+++ b/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:334aae3a08d9acfa4d78c3267303928dc55b2e6f62e793f4360c5dd3ed2dcef4
-size 1607087
+oid sha256:6537a51bef8d8a9f5cfe87d0e8648f7e72c995544b8bec1208cbf7c4e59bfa40
+size 2149246
diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
index 522d727f..2883abf3 100644
--- a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
+++ b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f3f4224ee360d97f9dba14904fc87fb84fd1ab1c79909382ec9c878c0fe1e811
+oid sha256:4859d43a803b89375bb161775fc6318ef1e9fc5318f8836540265573c3bcae3b
 size 66790690
diff --git a/EndlessVendetta/Source/EndlessVendetta/DroppableWall.cpp b/EndlessVendetta/Source/EndlessVendetta/DroppableWall.cpp
new file mode 100644
index 00000000..dac265c7
--- /dev/null
+++ b/EndlessVendetta/Source/EndlessVendetta/DroppableWall.cpp
@@ -0,0 +1,27 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+
+#include "DroppableWall.h"
+
+// Sets default values
+ADroppableWall::ADroppableWall()
+{
+ 	// Set this actor to call Tick() every frame.  You can turn this off to improve performance if you don't need it.
+	PrimaryActorTick.bCanEverTick = true;
+
+}
+
+// Called when the game starts or when spawned
+void ADroppableWall::BeginPlay()
+{
+	Super::BeginPlay();
+	
+}
+
+// Called every frame
+void ADroppableWall::Tick(float DeltaTime)
+{
+	Super::Tick(DeltaTime);
+
+}
+
diff --git a/EndlessVendetta/Source/EndlessVendetta/DroppableWall.h b/EndlessVendetta/Source/EndlessVendetta/DroppableWall.h
new file mode 100644
index 00000000..015bd01f
--- /dev/null
+++ b/EndlessVendetta/Source/EndlessVendetta/DroppableWall.h
@@ -0,0 +1,28 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "GameFramework/Actor.h"
+#include "DroppableWall.generated.h"
+
+UCLASS()
+class ENDLESSVENDETTA_API ADroppableWall : public AActor
+{
+	GENERATED_BODY()
+
+protected:
+	// Called when the game starts or when spawned
+	virtual void BeginPlay() override;
+
+public:
+	// Sets default values for this actor's properties
+	ADroppableWall();
+	
+	// Called every frame
+	virtual void Tick(float DeltaTime) override;
+
+	UFUNCTION(BlueprintImplementableEvent)
+	void ActivateWall();
+
+};