From 7ad9e95679f6bdedc781e9c74265be768725279a Mon Sep 17 00:00:00 2001 From: Louis Horne Date: Fri, 13 Oct 2023 14:27:56 +0100 Subject: [PATCH 01/27] Update level blockout to include placeholder cover/furniture Its just boxes mostly --- .../Content/LevelPrototyping/Scenes/TutorialHit.umap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap b/EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap index 5054dd42..aeeb8017 100644 --- a/EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap +++ b/EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6803883c719b379495a997464dc8de768c0d39bdc4b88309709d1b0e61a8d294 -size 264200 +oid sha256:5b8416b4069f4e4bc84e2fab2776fe2eb1db3075f56056c9a3b49fa55ece8847 +size 290087 From 776bfc827555aa0472f3d12d34b5be7d9c287ac3 Mon Sep 17 00:00:00 2001 From: Louis Horne Date: Mon, 16 Oct 2023 15:05:48 +0100 Subject: [PATCH 02/27] Updated Conrete texture --- .../Content/LevelPrototyping/Materials/M_Concrete.uasset | 4 ++-- .../LevelPrototyping/Materials/Panel_Concrete_BaseColor.png | 3 +++ .../Materials/Panel_Concrete_BaseColor.uasset | 4 ++-- .../LevelPrototyping/Materials/Panel_Concrete_Normal.png | 3 +++ .../LevelPrototyping/Materials/Panel_Concrete_Normal.uasset | 4 ++-- .../Materials/Panel_Concrete_OcclusionRoughnessMetallic.png | 3 +++ .../Panel_Concrete_OcclusionRoughnessMetallic.uasset | 4 ++-- .../Content/LevelPrototyping/Scenes/TutorialHit.umap | 2 +- 8 files changed, 18 insertions(+), 9 deletions(-) create mode 100644 EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_BaseColor.png create mode 100644 EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_Normal.png create mode 100644 EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_OcclusionRoughnessMetallic.png diff --git a/EndlessVendetta/Content/LevelPrototyping/Materials/M_Concrete.uasset b/EndlessVendetta/Content/LevelPrototyping/Materials/M_Concrete.uasset index 20612d71..b736fc53 100644 --- a/EndlessVendetta/Content/LevelPrototyping/Materials/M_Concrete.uasset +++ b/EndlessVendetta/Content/LevelPrototyping/Materials/M_Concrete.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f229b163290b8a6981b8cc09dd3e1ab594b5cf5dcb73c549bb6480d094f893fa -size 13874 +oid sha256:f82aae23b3e53d90b0591c9235422e2c017b3ab772e027e1716fe0aac09a83a1 +size 13263 diff --git a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_BaseColor.png b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_BaseColor.png new file mode 100644 index 00000000..4f295bb0 --- /dev/null +++ b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71d2f4605a034ab0c38fc4b0986804a663ba255eaa9831423af502ae6e75f460 +size 1392049 diff --git a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_BaseColor.uasset b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_BaseColor.uasset index 6f13c266..69088d24 100644 --- a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_BaseColor.uasset +++ b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_BaseColor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:155948427b3e16c2deef2d5c88c461b37b3ab9b046d5c85cf07a76ab99604444 -size 5030894 +oid sha256:ea14a990e1c2b5228e4eeee129b8fd8c45cbcef9fbce6657ff9e17ffde477b9e +size 1646242 diff --git a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_Normal.png b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_Normal.png new file mode 100644 index 00000000..423d9050 --- /dev/null +++ b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_Normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45a13b4a5f5f5affd3f6555171bfb6b170c33f1b3b50ef4e3109bad578784f53 +size 2595762 diff --git a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_Normal.uasset b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_Normal.uasset index f27c1fd1..5df13d31 100644 --- a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_Normal.uasset +++ b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_Normal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cbec944bbe7edf2fa9ccc095e66f68cc6b5f9f903ba0ed1d0f22e253de3bba9f -size 9567803 +oid sha256:df769b5f2412ac0240e9ac99885e8586a41bc39088fa865a19b341219fa4b020 +size 2966765 diff --git a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_OcclusionRoughnessMetallic.png b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_OcclusionRoughnessMetallic.png new file mode 100644 index 00000000..a07cdf3d --- /dev/null +++ b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_OcclusionRoughnessMetallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba795fa0723b174d757b8490f17e0e94047b817d4769047a3d95568d34d4e414 +size 308098 diff --git a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_OcclusionRoughnessMetallic.uasset b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_OcclusionRoughnessMetallic.uasset index c5cc8616..a26989dc 100644 --- a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_OcclusionRoughnessMetallic.uasset +++ b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_OcclusionRoughnessMetallic.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f80a56edd87e453b6255a75e973cbd8c3fea561bda90be7b7405a4564cb84e77 -size 1217878 +oid sha256:67b12d54ceccb43601d4297a16dc100031cc4dae2296530b48a818fe5f80164d +size 352601 diff --git a/EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap b/EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap index aeeb8017..74f5cc15 100644 --- a/EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap +++ b/EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b8416b4069f4e4bc84e2fab2776fe2eb1db3075f56056c9a3b49fa55ece8847 +oid sha256:2e5cf96d75000f099f5f97ba8e5c27fbdeffc1fb0f9f76cf951baf6e86f3a4cc size 290087 From 055356ec01fc134ccbb8462ccb9e5723f7bbec3f Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Mon, 16 Oct 2023 15:16:57 +0100 Subject: [PATCH 03/27] Tweaked Weapon Values & Added Tick func to Char.cpp --- .../BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset | 4 ++-- .../BaseWeapons/Pistols/BP_BasePistolWeapon.uasset | 4 ++-- .../Source/EndlessVendetta/EndlessVendettaCharacter.cpp | 5 +++++ .../Source/EndlessVendetta/EndlessVendettaCharacter.h | 1 + 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset index 534c1e9e..877f5854 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:215d949e3ea1df83d937e0387115975c9c3e14077a879a6f834831241c154f18 -size 39178 +oid sha256:63a33ee4cfad25c36bd022a8723b9b6ff80d70127366efa8983549044fd1f8ac +size 39198 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset index 75a10fe3..206389d1 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:246a8220f9708873776922ca6683ec085b4447eecd1efd89fd0572c94b9d5956 -size 49471 +oid sha256:2a94e9d1b1b74a330a53970bbb11f1357c02996a00a31d4bdafc5c9313759fb2 +size 49286 diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index 1d8f5d11..7e024eb4 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -66,6 +66,11 @@ void AEndlessVendettaCharacter::BeginPlay() } } +void AEndlessVendettaCharacter::Tick(float DeltaTime) +{ + Super::Tick(DeltaTime); +} + //////////////////////////////////////////////////////////////////////////// Input void AEndlessVendettaCharacter::SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h index cc936f99..346213ab 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h @@ -83,6 +83,7 @@ public: protected: virtual void BeginPlay() override; + virtual void Tick(float DeltaTime) override; UPROPERTY(EditDefaultsOnly, Category = "Gadget") TSubclassOf GadgetManagerClass; From f34d7500f99d8623b88df4214d871790415692fe Mon Sep 17 00:00:00 2001 From: Louis Horne Date: Mon, 16 Oct 2023 15:53:46 +0100 Subject: [PATCH 04/27] Added Placeholder props to tutorial level Added: bed, bookshelf, wardrobe, desk, small desk --- EndlessVendetta/Config/DefaultEditor.ini | 5 ++++- .../Assets/Objects/Tutorial-Level/M_placeholder.uasset | 3 +++ .../Content/Assets/Objects/Tutorial-Level/Sm_Bed01.fbx | 3 +++ .../Content/Assets/Objects/Tutorial-Level/Sm_Bed01.uasset | 3 +++ .../Assets/Objects/Tutorial-Level/Sm_Bookshelf.uasset | 3 +++ .../Content/Assets/Objects/Tutorial-Level/Sm_Desk01.fbx | 3 +++ .../Content/Assets/Objects/Tutorial-Level/Sm_Desk01.uasset | 3 +++ .../Assets/Objects/Tutorial-Level/Sm_SmallTable01.fbx | 3 +++ .../Assets/Objects/Tutorial-Level/Sm_SmallTable01.uasset | 3 +++ .../Content/Assets/Objects/Tutorial-Level/Sm_Wardrobe01.fbx | 3 +++ .../Assets/Objects/Tutorial-Level/Sm_Wardrobe01.uasset | 3 +++ .../Content/LevelPrototyping/Scenes/TutorialHit.umap | 4 ++-- 12 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/M_placeholder.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Bed01.fbx create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Bed01.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Bookshelf.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Desk01.fbx create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Desk01.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_SmallTable01.fbx create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_SmallTable01.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Wardrobe01.fbx create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Wardrobe01.uasset diff --git a/EndlessVendetta/Config/DefaultEditor.ini b/EndlessVendetta/Config/DefaultEditor.ini index 58552fae..e7314343 100644 --- a/EndlessVendetta/Config/DefaultEditor.ini +++ b/EndlessVendetta/Config/DefaultEditor.ini @@ -5,4 +5,7 @@ SimpleMapName=/Game/FirstPerson/Maps/FirstPersonExampleMap bAllowClassAndBlueprintPinMatching=true bReplaceBlueprintWithClass= true bDontLoadBlueprintOutsideEditor= true -bBlueprintIsNotBlueprintType= true \ No newline at end of file +bBlueprintIsNotBlueprintType= true + +[/Script/AdvancedPreviewScene.SharedProfiles] + diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/M_placeholder.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/M_placeholder.uasset new file mode 100644 index 00000000..82165576 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/M_placeholder.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb91e2e9e338cd78311f4464de3645ac1bba08117715942aaa53e20f702d9679 +size 7597 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Bed01.fbx b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Bed01.fbx new file mode 100644 index 00000000..c9a78d2f --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Bed01.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:844761692a9ffeea648f67a580d1024d5bc25acb1e289fe0c958e9eed579760f +size 33568 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Bed01.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Bed01.uasset new file mode 100644 index 00000000..1f75980f --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Bed01.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f8be73bb65b844a191a4163dcb5a15151148afbe1b18b96b909f11842d36cb9 +size 17919 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Bookshelf.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Bookshelf.uasset new file mode 100644 index 00000000..3c60cf9c --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Bookshelf.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0697d795e63b9c1aac0ec4f8846f677a63751543f0b69bb9bd14bd2ab9296efe +size 21726 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Desk01.fbx b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Desk01.fbx new file mode 100644 index 00000000..4fda2021 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Desk01.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70c6e6ece3cd76db669817b5d986348e96a2afd1d62f39f75117072369a79cba +size 34288 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Desk01.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Desk01.uasset new file mode 100644 index 00000000..702d20be --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Desk01.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b486eeb9753b0a304c3fda504f3eff3bd525b7878f255f75a8890f812c12e292 +size 18096 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_SmallTable01.fbx b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_SmallTable01.fbx new file mode 100644 index 00000000..5993bf89 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_SmallTable01.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4bbaf8f6663857c28912f2d3a232e21172d8ae09d603f7345acf9a0e580cf2f +size 33296 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_SmallTable01.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_SmallTable01.uasset new file mode 100644 index 00000000..50a76504 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_SmallTable01.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:afde5420b197ce898e9bd3513928ef2280f67b344cce826c51b19bb446b15b25 +size 17440 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Wardrobe01.fbx b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Wardrobe01.fbx new file mode 100644 index 00000000..38027fdd --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Wardrobe01.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:910f4ad5008f971b166e829ebe27e9783418b76119d7ee8f5978795279f342d5 +size 34928 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Wardrobe01.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Wardrobe01.uasset new file mode 100644 index 00000000..1fecb32f --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Wardrobe01.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc5e2b9bb8e331ae33049e4a6b6da2f4a60c91d9cd200d40a98fc0d07f8ca3da +size 20311 diff --git a/EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap b/EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap index 74f5cc15..36f15ee5 100644 --- a/EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap +++ b/EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e5cf96d75000f099f5f97ba8e5c27fbdeffc1fb0f9f76cf951baf6e86f3a4cc -size 290087 +oid sha256:609efdd8d33b3e588fab3798c966b543cb353408d1aa6d8f78e1e50aed3e8c1c +size 298511 From a3021a27229c96533f9f6e5eedf8a1ceb447a98b Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Mon, 16 Oct 2023 15:54:53 +0100 Subject: [PATCH 05/27] Added Reload Wait Timer To All Weapons --- .../Blueprints/BaseWeapons/WBP_AmmoCount.uasset | 4 ++-- .../FirstPerson/Input/Actions/IA_Reload.uasset | 4 ++-- .../EndlessVendetta/EndlessVendettaCharacter.cpp | 10 ++++++---- .../Source/EndlessVendetta/EndlessVendettaCharacter.h | 1 + .../EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp | 11 +++++++++-- .../EndlessVendetta/WeaponSystem/BaseWeaponClass.h | 8 +++++++- 6 files changed, 27 insertions(+), 11 deletions(-) diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset index 6e0e13d4..1d67df8a 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d593d68d5b9a9fc58b1b7ecc44936b84e361aaa1762ab04c5924e36bfd45bee9 -size 61494 +oid sha256:7cfd791337f79a964dbfef919494665648f1ce39168d4f28cd122e2018c4b694 +size 61741 diff --git a/EndlessVendetta/Content/FirstPerson/Input/Actions/IA_Reload.uasset b/EndlessVendetta/Content/FirstPerson/Input/Actions/IA_Reload.uasset index 5ed3f2f9..803128c2 100644 --- a/EndlessVendetta/Content/FirstPerson/Input/Actions/IA_Reload.uasset +++ b/EndlessVendetta/Content/FirstPerson/Input/Actions/IA_Reload.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:85ff514d76166f7c202ee64b678abe6314dcc24d3d662883b53edb7608ea2bfe -size 1647 +oid sha256:eab7ab2c34f8fe941f0964ebe97c974bbcd4bf68ad27a0f489a65b6cc2c6ddb2 +size 1643 diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index 7e024eb4..4a1bd405 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -256,11 +256,11 @@ void AEndlessVendettaCharacter::EquipSecondary() //Calls the fire function in the baseWeaponClass void AEndlessVendettaCharacter::FireCaller() { - if (IsValid(PrimaryWeapon)) + if (IsValid(PrimaryWeapon) && !bIsReloading) { PrimaryWeapon->Fire(); } - if (IsValid(SecondaryWeapon)) + if (IsValid(SecondaryWeapon) && !bIsReloading) { SecondaryWeapon->Fire(); } @@ -330,11 +330,13 @@ void AEndlessVendettaCharacter::GunReload() { if (IsValid(PrimaryWeapon)) { - PrimaryWeapon->WeaponReload(); + PrimaryWeapon->ReloadTimer(); + bIsReloading = true; } if (IsValid(SecondaryWeapon)) { - SecondaryWeapon->WeaponReload(); + SecondaryWeapon->ReloadTimer(); + bIsReloading = true; } } diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h index 346213ab..ece80c9f 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h @@ -91,6 +91,7 @@ protected: public: int Money = 2000; + bool bIsReloading = false; /** Look Input Action */ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Input, meta = (AllowPrivateAccess = "true")) diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp index d20c1ae8..c053413b 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp @@ -54,6 +54,7 @@ void ABaseWeaponClass::BeginPlay() UE_LOG(LogTemp, Display, TEXT("crnnt ammo: %d"), MagazineSize); } + // Called every frame void ABaseWeaponClass::Tick(float DeltaTime) { @@ -63,7 +64,6 @@ void ABaseWeaponClass::Tick(float DeltaTime) { ApplyRecoil(DeltaTime); } - UE_LOG(LogTemp, Display, TEXT("currnt pitch: %f"), currentPitch); if (currentPitch < 0 && bStopShooting) { float increment = currentPitch * DeltaTime * 8; @@ -213,12 +213,19 @@ void ABaseWeaponClass::WeaponScopedFire() } } +void ABaseWeaponClass::ReloadTimer() +{ + GetWorldTimerManager().SetTimer(reloadTimerHandle, this, &ABaseWeaponClass::WeaponReload, TimeToReload, false); + GLog->Log("ReloadTimer Activated"); +} + void ABaseWeaponClass::WeaponReload() { - if(MagazineSize > currentAmmoCount) + if(MagazineSize >= currentAmmoCount) { UE_LOG(LogTemp, Display, TEXT("Weapon Reloading: mag size: %d"), MagazineSize); currentAmmoCount = MagazineSize; + endlessVendettaChar->bIsReloading = false; } } diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h index 00541047..82e7c1bd 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h @@ -41,10 +41,12 @@ protected: float recoilResultPitch = 0; float recoilResultYaw = 0; + + public: // Called every frame virtual void Tick(float DeltaTime) override; - + void ReloadTimer(); UPROPERTY(EditAnywhere) FName WeaponName; @@ -57,6 +59,9 @@ public: UPROPERTY(EditAnywhere, BlueprintReadWrite) int MagazineSize; + UPROPERTY(EditAnywhere) + float TimeToReload = 3.f; + //how many bullets until the recoil stops going up UPROPERTY(EditAnywhere) int howMnyShotsTillRclStop; @@ -95,6 +100,7 @@ public: APlayerController* playerControllerRef; FTimerHandle timerHandle; + FTimerHandle reloadTimerHandle; bool bFirstBulletShot = false; From b2390124117669ae667aa07b782972ab8033f8c3 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Mon, 16 Oct 2023 16:14:23 +0100 Subject: [PATCH 06/27] Added Reload Text To Weapons When Reloading --- .../FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset | 4 ++-- .../FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset | 4 ++-- .../Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp | 3 ++- .../Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h | 6 ++++++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset index e3885a88..f2c7b766 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1de9565906296c664bb7dd6b3f700d135fa5244e1f625f9f792eba15a9880ae8 -size 48226 +oid sha256:754ba6fc86e8d96dbe2fade3d515f45b10eefd1e3c7ac9115658daa2b251622e +size 76327 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset index 1d67df8a..5f03829f 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7cfd791337f79a964dbfef919494665648f1ce39168d4f28cd122e2018c4b694 -size 61741 +oid sha256:1b199cbe84b6c49806f9646990c9c60ff7199214add19091ea0d7a47896daf53 +size 64350 diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp index c053413b..6db24720 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp @@ -216,7 +216,7 @@ void ABaseWeaponClass::WeaponScopedFire() void ABaseWeaponClass::ReloadTimer() { GetWorldTimerManager().SetTimer(reloadTimerHandle, this, &ABaseWeaponClass::WeaponReload, TimeToReload, false); - GLog->Log("ReloadTimer Activated"); + ShowReloadingWidget(); } void ABaseWeaponClass::WeaponReload() @@ -226,6 +226,7 @@ void ABaseWeaponClass::WeaponReload() UE_LOG(LogTemp, Display, TEXT("Weapon Reloading: mag size: %d"), MagazineSize); currentAmmoCount = MagazineSize; endlessVendettaChar->bIsReloading = false; + HideReloadingWidget(); } } diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h index 82e7c1bd..72ad7ed4 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h @@ -41,6 +41,12 @@ protected: float recoilResultPitch = 0; float recoilResultYaw = 0; + UFUNCTION(BlueprintImplementableEvent) + void ShowReloadingWidget(); + + UFUNCTION(BlueprintImplementableEvent) + void HideReloadingWidget(); + public: From fa0d15aa53c4b58545786884492fdcc9e8072bef Mon Sep 17 00:00:00 2001 From: rebecca wynn Date: Mon, 16 Oct 2023 16:23:55 +0100 Subject: [PATCH 07/27] added lights assets (ceiling 1 and 2) --- .../Content/Assets/Objects/Tutorial-Level/Sm_Bed01.uasset | 4 ++-- .../Content/Assets/Objects/Tutorial-Level/Sm_Desk01.uasset | 4 ++-- .../Assets/Objects/Tutorial-Level/Sm_SmallTable01.uasset | 4 ++-- .../Assets/Objects/Tutorial-Level/Sm_Wardrobe01.uasset | 4 ++-- .../Assets/Objects/Tutorial-Level/ceiling_light_01.uasset | 3 +++ .../Assets/Objects/Tutorial-Level/ceiling_light_02.uasset | 3 +++ .../ceiling_light_01/ceiling_light_01_Normal.uasset | 3 +++ .../ceiling_light_01_OcclusionRoughnessMetallic.uasset | 3 +++ .../ceiling_light_01/ceiling_light_01_bl.uasset | 3 +++ .../ceiling_light_01/ceiling_light_01_bl_BaseColor.uasset | 3 +++ .../ceiling_light_01/ceiling_light_01_or.uasset | 3 +++ .../ceiling_light_01/ceiling_light_01_or_BaseColor.uasset | 3 +++ .../ceiling_light_01/ceiling_light_01_ye.uasset | 3 +++ .../ceiling_light_01/ceiling_light_01_ye_BaseColor.uasset | 3 +++ .../ceiling_light_02/ceiling_light_02_Normal.uasset | 3 +++ .../ceiling_light_02_OcclusionRoughnessMetallic.uasset | 3 +++ .../ceiling_light_02/ceiling_light_02__or.uasset | 3 +++ .../ceiling_light_02/ceiling_light_02_bl.uasset | 3 +++ .../ceiling_light_02/ceiling_light_02_bl_BaseColor.uasset | 3 +++ ...ceiling_light_02_high_ceiling_light_02_or_BaseColor.uasset | 3 +++ ...ceiling_light_02_high_ceiling_light_02_ye_BaseColor.uasset | 3 +++ .../ceiling_light_02/ceiling_light_02_ye.uasset | 3 +++ .../Materials/Panel_Concrete_BaseColor.uasset | 4 ++-- .../LevelPrototyping/Materials/Panel_Concrete_Normal.uasset | 4 ++-- .../Panel_Concrete_OcclusionRoughnessMetallic.uasset | 4 ++-- 25 files changed, 68 insertions(+), 14 deletions(-) create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ceiling_light_01.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ceiling_light_02.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_Normal.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_OcclusionRoughnessMetallic.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_bl.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_bl_BaseColor.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_or.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_or_BaseColor.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_ye.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_ye_BaseColor.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_Normal.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_OcclusionRoughnessMetallic.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02__or.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_bl.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_bl_BaseColor.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_high_ceiling_light_02_or_BaseColor.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_high_ceiling_light_02_ye_BaseColor.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_ye.uasset diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Bed01.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Bed01.uasset index 1f75980f..b7a8e022 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Bed01.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Bed01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f8be73bb65b844a191a4163dcb5a15151148afbe1b18b96b909f11842d36cb9 -size 17919 +oid sha256:6fcb43487faf257a1d6bd07ee96a648ca53488eaad3edd5a3b3ab8c07e3ae536 +size 17747 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Desk01.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Desk01.uasset index 702d20be..d74bf6c6 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Desk01.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Desk01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b486eeb9753b0a304c3fda504f3eff3bd525b7878f255f75a8890f812c12e292 -size 18096 +oid sha256:a91f4e1494cb343bf7ab5c80888a3a1d89fe21198ef5280482273eb8d9ba7530 +size 17924 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_SmallTable01.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_SmallTable01.uasset index 50a76504..58ef35d5 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_SmallTable01.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_SmallTable01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:afde5420b197ce898e9bd3513928ef2280f67b344cce826c51b19bb446b15b25 -size 17440 +oid sha256:24ef74b38ec69cbe179147bd5ac8a53362dfe3169b4d83ebe0ef0d1848f743cd +size 17243 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Wardrobe01.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Wardrobe01.uasset index 1fecb32f..8cec9dc1 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Wardrobe01.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Wardrobe01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc5e2b9bb8e331ae33049e4a6b6da2f4a60c91d9cd200d40a98fc0d07f8ca3da -size 20311 +oid sha256:279be05fb4b4a84ff360ec933a43ef2791643c8840c724691ea6976ae9d4856a +size 20162 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ceiling_light_01.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ceiling_light_01.uasset new file mode 100644 index 00000000..78fca880 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ceiling_light_01.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ce17bf31a4c9625172bf4e48ef6da187ce99088df7645f4f68661e9c63c8e43 +size 78309 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ceiling_light_02.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ceiling_light_02.uasset new file mode 100644 index 00000000..98e326dd --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ceiling_light_02.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:531ed14d50a35fe0ecdb8f46f1346a6383c112275f099c16b790cde86e5be342 +size 60659 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_Normal.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_Normal.uasset new file mode 100644 index 00000000..054b54d4 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61ffbd88183538504364d937cec76e39c3ad3ac50734c4dde05fb753dc19081e +size 24688 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_OcclusionRoughnessMetallic.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_OcclusionRoughnessMetallic.uasset new file mode 100644 index 00000000..98128985 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_OcclusionRoughnessMetallic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa4326b88438248f14e15747e0e35e3c178dd3a39d34dc4a749417be482efb98 +size 772854 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_bl.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_bl.uasset new file mode 100644 index 00000000..7d22df1b --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_bl.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88acde52da1897da720fccb435437f33f2dc544dfbe4d1694a160068361faf14 +size 13261 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_bl_BaseColor.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_bl_BaseColor.uasset new file mode 100644 index 00000000..901b0190 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_bl_BaseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:548714b507d37d4f2d39bd5bcbcb3b6c70c638f3ec664a730eeec2a8b258a648 +size 490848 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_or.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_or.uasset new file mode 100644 index 00000000..47e782f6 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_or.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e9799da9d3e9a9354a2d3d932e07a22a16d39621240b0a0433c26959a2f9b48 +size 13493 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_or_BaseColor.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_or_BaseColor.uasset new file mode 100644 index 00000000..62070b05 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_or_BaseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab47b9df9e80798483661464986d0a44a99678f54ed3d8e79e18a9a7e6daf6d1 +size 319482 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_ye.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_ye.uasset new file mode 100644 index 00000000..61a3c050 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_ye.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e3777c983b68523e9aacf1882fa9f72ac87396cd57c5d1335b17fd52630c363 +size 13456 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_ye_BaseColor.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_ye_BaseColor.uasset new file mode 100644 index 00000000..bf3e48ed --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_01/ceiling_light_01_ye_BaseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2eb40a4c0a54cea0d556376a519b0f61e59a74c7c6e52ae41db86618015cd751 +size 439900 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_Normal.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_Normal.uasset new file mode 100644 index 00000000..cc43b385 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd8a7d3be97bda5691641eff72aafc902c4fc93f5d692ff5594647c3bb62b19b +size 25121 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_OcclusionRoughnessMetallic.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_OcclusionRoughnessMetallic.uasset new file mode 100644 index 00000000..12133670 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_OcclusionRoughnessMetallic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce49e96d0ffebc308d05e43fb3c5bd0739ca37de7fd90fe546c384ee13f4b5e3 +size 634462 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02__or.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02__or.uasset new file mode 100644 index 00000000..a3559f09 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02__or.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06d7604fc47f789a68caf62e5e723fee0eed791eff11ecde616e08d80a8f483e +size 12921 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_bl.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_bl.uasset new file mode 100644 index 00000000..fdfc95d9 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_bl.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a7469474da93d32efe1568683cecaa1e030951bc7823b4036a7174075bbb1e3d +size 13259 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_bl_BaseColor.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_bl_BaseColor.uasset new file mode 100644 index 00000000..f67db4bf --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_bl_BaseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e8ceb4628bffb303d79d43602ab15c3756a0e5c8a5e5a5d2245f180f7096e364 +size 360010 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_high_ceiling_light_02_or_BaseColor.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_high_ceiling_light_02_or_BaseColor.uasset new file mode 100644 index 00000000..189bb9cf --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_high_ceiling_light_02_or_BaseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df446f99d7c243825cd7636d87218c5157b07d95ec75f1fa72517a3a9142a8f9 +size 260585 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_high_ceiling_light_02_ye_BaseColor.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_high_ceiling_light_02_ye_BaseColor.uasset new file mode 100644 index 00000000..22950e2b --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_high_ceiling_light_02_ye_BaseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c445e172f09670d19712822c5113403d266b3f8a4b95f38a94213bd3fecec90f +size 334795 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_ye.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_ye.uasset new file mode 100644 index 00000000..83bef317 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_ye.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31c3bd49836535919ddcc5a500b5bceb7b1b1b1fcb340971c7d8f299582c0c51 +size 13440 diff --git a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_BaseColor.uasset b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_BaseColor.uasset index 69088d24..670a7953 100644 --- a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_BaseColor.uasset +++ b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_BaseColor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea14a990e1c2b5228e4eeee129b8fd8c45cbcef9fbce6657ff9e17ffde477b9e -size 1646242 +oid sha256:afbf0b8a0b4a42008dc0a9110d1dacfcda4b62d391568de0f9cf720191bbac84 +size 1645261 diff --git a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_Normal.uasset b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_Normal.uasset index 5df13d31..358c7c15 100644 --- a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_Normal.uasset +++ b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_Normal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df769b5f2412ac0240e9ac99885e8586a41bc39088fa865a19b341219fa4b020 -size 2966765 +oid sha256:7c65f7761aed5143a2449a2a4911dcc920a848f6cb4762b1a066f26318be8f18 +size 2960090 diff --git a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_OcclusionRoughnessMetallic.uasset b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_OcclusionRoughnessMetallic.uasset index a26989dc..fcb2ac67 100644 --- a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_OcclusionRoughnessMetallic.uasset +++ b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_OcclusionRoughnessMetallic.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67b12d54ceccb43601d4297a16dc100031cc4dae2296530b48a818fe5f80164d -size 352601 +oid sha256:797990c3f21eb6c8703ad1d9aefe0077019aa2fac3499cb2054aa77870cba8ef +size 352560 From ce25923886ff01f93188c04b661c010f50a4f7df Mon Sep 17 00:00:00 2001 From: Chris Farrer Date: Mon, 16 Oct 2023 16:25:50 +0100 Subject: [PATCH 08/27] Added Kitchen Props to tutorial --- .../Content/Assets/Objects/Tutorial-Level/sm_Fridge.uasset | 3 +++ .../Content/Assets/Objects/Tutorial-Level/sm_counter.uasset | 3 +++ .../Content/Assets/Objects/Tutorial-Level/sm_cupboard.uasset | 3 +++ .../Content/Assets/Objects/Tutorial-Level/sm_island.uasset | 3 +++ .../Content/Assets/Objects/Tutorial-Level/sm_oven.uasset | 3 +++ .../Content/Assets/Objects/Tutorial-Level/sm_stall.uasset | 3 +++ .../Content/Assets/Objects/Tutorial-Level/sm_table.uasset | 3 +++ 7 files changed, 21 insertions(+) create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/sm_Fridge.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/sm_counter.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/sm_cupboard.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/sm_island.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/sm_oven.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/sm_stall.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/sm_table.uasset diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/sm_Fridge.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/sm_Fridge.uasset new file mode 100644 index 00000000..c8dffb2f --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/sm_Fridge.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af9a0aaa1b26af930d45571cfdfb184fe3ab6fc2225ddfcdaa5d59a4538ceda5 +size 26970 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/sm_counter.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/sm_counter.uasset new file mode 100644 index 00000000..d6a60e8a --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/sm_counter.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5cccae2553c56af1c52c8dc174735f40d1f4222f4d522702e2486c0d34b4b28 +size 24699 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/sm_cupboard.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/sm_cupboard.uasset new file mode 100644 index 00000000..c3789167 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/sm_cupboard.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95c3a80b1853d38b9bbc59faa6a01fe5128085b446b7f88fda2f1305fba2a261 +size 30929 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/sm_island.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/sm_island.uasset new file mode 100644 index 00000000..af3fa6a5 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/sm_island.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e68719cebb832ecb67c9517da5500ddfde5f9f06fc0e4c5274446e013d5044b3 +size 31980 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/sm_oven.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/sm_oven.uasset new file mode 100644 index 00000000..bf77da29 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/sm_oven.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6d662bfa4b84aa80a3dfddcfc9c27003a56144be5c0157453abd4810c64f32e +size 28647 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/sm_stall.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/sm_stall.uasset new file mode 100644 index 00000000..3173dafa --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/sm_stall.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7342d3ee5ffb4ea9a3a56334ee312d4b8914edbccc58acd8e05c4acb9e8e96c +size 21567 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/sm_table.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/sm_table.uasset new file mode 100644 index 00000000..0a08954a --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/sm_table.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad944c5d572797b79fa86697948b24c955ecc13b545b8e92e79d09f9bbbec241 +size 21801 From dec1d761bf498c4a32b46bba1e20734b721d3bb2 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek <34179rs@gmail.com> Date: Wed, 18 Oct 2023 00:02:16 +0100 Subject: [PATCH 09/27] Replaced Interactable Actor Class with Interaction Interface --- .../Blueprints/BP_FirstPersonCharacter.uasset | 4 +-- .../Architecture/Floor_400x400.uasset | 4 +-- .../HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 4 +-- .../BountySystem/BountyDirector.h | 4 +-- .../EndlessVendettaCharacter.cpp | 8 ++--- .../EndlessVendetta/InteractableActor.cpp | 33 ------------------- .../EndlessVendetta/InteractableActor.h | 26 --------------- .../EndlessVendetta/InteractionInterface.cpp | 6 ++++ .../EndlessVendetta/InteractionInterface.h | 26 +++++++++++++++ 9 files changed, 43 insertions(+), 72 deletions(-) delete mode 100644 EndlessVendetta/Source/EndlessVendetta/InteractableActor.cpp delete mode 100644 EndlessVendetta/Source/EndlessVendetta/InteractableActor.h create mode 100644 EndlessVendetta/Source/EndlessVendetta/InteractionInterface.cpp create mode 100644 EndlessVendetta/Source/EndlessVendetta/InteractionInterface.h diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index 9b6693d3..f851630e 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:fe0a5a1725c7cd65051a510027a14301f6b776fe1a1935d0fb55558f829ee90b -size 42620 +oid sha256:fb7eb23a18c0ad9f5cf37ae72d45bac1d1b1d90fac9281cfa3e3233b9b6a3d44 +size 42950 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index 2c9809cc..c2a34afc 100644 --- a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset +++ b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98e416dff362313306ffaf6a91d7104bef732f215b22e801e4005260f28e7d36 -size 14831 +oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 +size 14948 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index 0f990580..dbd0ea66 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:bc35eb2d43a47427d30aba0196f9eac90d089dd3abca319528c5d25c83510d0d -size 72364642 +oid sha256:fd9c0b90f58f0b317de5aa6a0402935fb88c73e4f74ec14c651ccfcf282feb81 +size 66790690 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyDirector.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyDirector.h index 41fc840c..5c3a9719 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyDirector.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyDirector.h @@ -6,13 +6,13 @@ #include "MainBountyClass.h" #include "SideBountyClass.h" #include "EndlessVendetta/EndlessVendettaCharacter.h" -#include "EndlessVendetta/InteractableActor.h" +#include "EndlessVendetta/InteractionInterface.h" #include "EndlessVendetta/UserWidgets/PC_Display.h" #include "GameFramework/Actor.h" #include "BountyDirector.generated.h" UCLASS() -class ENDLESSVENDETTA_API ABountyDirector : public AInteractableActor +class ENDLESSVENDETTA_API ABountyDirector : public AActor, public IInteractionInterface { GENERATED_BODY() diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index 4a1bd405..bca0966d 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -6,7 +6,7 @@ #include "Components/CapsuleComponent.h" #include "EnhancedInputComponent.h" #include "EnhancedInputSubsystems.h" -#include "InteractableActor.h" +#include "InteractionInterface.h" #include "AI/EnemyCharacter.h" #include "GameFramework/CharacterMovementComponent.h" #include "Kismet/GameplayStatics.h" @@ -124,10 +124,8 @@ void AEndlessVendettaCharacter::Interact() if (!GetWorld()->LineTraceSingleByChannel(OutHit, LT_Start, LT_End, ECC_Camera, QueryParams)) return; AActor* HitActor = OutHit.GetActor(); - AInteractableActor* InteractableActor = Cast(HitActor); - if (!IsValid(InteractableActor)) return; - - InteractableActor->Interact(); + IInteractionInterface* InteractableActor = Cast(HitActor); + if (InteractableActor) InteractableActor->Interact(); } diff --git a/EndlessVendetta/Source/EndlessVendetta/InteractableActor.cpp b/EndlessVendetta/Source/EndlessVendetta/InteractableActor.cpp deleted file mode 100644 index 346e151d..00000000 --- a/EndlessVendetta/Source/EndlessVendetta/InteractableActor.cpp +++ /dev/null @@ -1,33 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - - -#include "InteractableActor.h" - -// Sets default values -AInteractableActor::AInteractableActor() -{ - // 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 AInteractableActor::BeginPlay() -{ - Super::BeginPlay(); - -} - -// Called every frame -void AInteractableActor::Tick(float DeltaTime) -{ - Super::Tick(DeltaTime); - -} - -void AInteractableActor::Interact() -{ - UE_LOG(LogTemp, Warning, TEXT("Interacted with %s"), *GetName()); -} - - diff --git a/EndlessVendetta/Source/EndlessVendetta/InteractableActor.h b/EndlessVendetta/Source/EndlessVendetta/InteractableActor.h deleted file mode 100644 index 4756112c..00000000 --- a/EndlessVendetta/Source/EndlessVendetta/InteractableActor.h +++ /dev/null @@ -1,26 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - -#pragma once - -#include "CoreMinimal.h" -#include "GameFramework/Actor.h" -#include "InteractableActor.generated.h" - -UCLASS() -class ENDLESSVENDETTA_API AInteractableActor : 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 - AInteractableActor(); - // Called every frame - virtual void Tick(float DeltaTime) override; - - virtual void Interact(); - -}; diff --git a/EndlessVendetta/Source/EndlessVendetta/InteractionInterface.cpp b/EndlessVendetta/Source/EndlessVendetta/InteractionInterface.cpp new file mode 100644 index 00000000..cbcd25fe --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/InteractionInterface.cpp @@ -0,0 +1,6 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "InteractionInterface.h" + +// Add default functionality here for any IInteractionInterface functions that are not pure virtual. diff --git a/EndlessVendetta/Source/EndlessVendetta/InteractionInterface.h b/EndlessVendetta/Source/EndlessVendetta/InteractionInterface.h new file mode 100644 index 00000000..29746fab --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/InteractionInterface.h @@ -0,0 +1,26 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "UObject/Interface.h" +#include "InteractionInterface.generated.h" + +// This class does not need to be modified. +UINTERFACE(MinimalAPI) +class UInteractionInterface : public UInterface +{ + GENERATED_BODY() +}; + +/** + * + */ +class ENDLESSVENDETTA_API IInteractionInterface +{ + GENERATED_BODY() + + // Add interface functions to this class. This is the class that will be inherited to implement this interface. +public: + virtual void Interact(){} +}; From 14107df96c1d49a8fb7f9396497fa88dc6a011b8 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek <34179rs@gmail.com> Date: Wed, 18 Oct 2023 18:40:13 +0100 Subject: [PATCH 10/27] Created Training Facility Level --- EndlessVendetta/Config/DefaultEngine.ini | 2 ++ .../Assets/Objects/Tutorial-Level/M_placeholder.uasset | 4 ++-- .../Content/LevelPrototyping/Materials/M_Concrete.uasset | 4 ++-- .../Content/LevelPrototyping/Scenes/TutorialHit.umap | 2 +- EndlessVendetta/Content/Levels/TrainingFacility.umap | 3 +++ .../Content/StarterContent/Architecture/Floor_400x400.uasset | 4 ++-- .../StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 4 ++-- 7 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 EndlessVendetta/Content/Levels/TrainingFacility.umap diff --git a/EndlessVendetta/Config/DefaultEngine.ini b/EndlessVendetta/Config/DefaultEngine.ini index d2549656..ddedfe22 100644 --- a/EndlessVendetta/Config/DefaultEngine.ini +++ b/EndlessVendetta/Config/DefaultEngine.ini @@ -27,6 +27,8 @@ r.DefaultFeature.AutoExposure.ExtendDefaultLuminanceRange=True r.DefaultFeature.AutoExposure.ExtendDefaultLuminanceRange=true r.Shadow.Virtual.Enable=1 r.DefaultFeature.AutoExposure=False +r.DefaultFeature.AutoExposure.Method=1 +r.DefaultFeature.AutoExposure.Bias=1.000000 [/Script/WindowsTargetPlatform.WindowsTargetSettings] DefaultGraphicsRHI=DefaultGraphicsRHI_DX12 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/M_placeholder.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/M_placeholder.uasset index 82165576..dda6e49e 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/M_placeholder.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/M_placeholder.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb91e2e9e338cd78311f4464de3645ac1bba08117715942aaa53e20f702d9679 -size 7597 +oid sha256:f65a6858e0ed048505c2974da8413c4f72db355ffd86b755a0f331ba256d745f +size 7668 diff --git a/EndlessVendetta/Content/LevelPrototyping/Materials/M_Concrete.uasset b/EndlessVendetta/Content/LevelPrototyping/Materials/M_Concrete.uasset index b736fc53..a20b7988 100644 --- a/EndlessVendetta/Content/LevelPrototyping/Materials/M_Concrete.uasset +++ b/EndlessVendetta/Content/LevelPrototyping/Materials/M_Concrete.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f82aae23b3e53d90b0591c9235422e2c017b3ab772e027e1716fe0aac09a83a1 -size 13263 +oid sha256:d5692f37e17b40b81fe2957ab5c5b1911f96fff8f89d93ca6435eab7919707a0 +size 13312 diff --git a/EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap b/EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap index 36f15ee5..1084c025 100644 --- a/EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap +++ b/EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:609efdd8d33b3e588fab3798c966b543cb353408d1aa6d8f78e1e50aed3e8c1c +oid sha256:f53171e2bbc59d22f3017e790d52a9c27e1a17b9c1118f7f4d0e3fe44210789c size 298511 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap new file mode 100644 index 00000000..a922ae09 --- /dev/null +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7e87f12cf0cb5d6772f0c1287907ce497dac824e25a3e2963d9f4ff6e0f412b0 +size 388236 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index c2a34afc..564b7cfc 100644 --- a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset +++ b/EndlessVendetta/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:0d8f35b2f5215938fc1b3ba8692c25a4d6e303fb425dfc910708df5f23115b20 +size 14831 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index dbd0ea66..0f990580 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:fd9c0b90f58f0b317de5aa6a0402935fb88c73e4f74ec14c651ccfcf282feb81 -size 66790690 +oid sha256:bc35eb2d43a47427d30aba0196f9eac90d089dd3abca319528c5d25c83510d0d +size 72364642 From 393b01fdcf812647ae74bee38af3327069773094 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek <34179rs@gmail.com> Date: Wed, 18 Oct 2023 21:57:29 +0100 Subject: [PATCH 11/27] Implemented Intro Cutscene Stand in Frames (Partially) --- EndlessVendetta/Config/DefaultEngine.ini | 4 ++-- .../TutorialFacility/Checkpoints/CP_IntroCinematic.uasset | 3 +++ .../BountySystem/TutorialFacility/IntroCutscene/IntroF1.jpg | 3 +++ .../TutorialFacility/IntroCutscene/IntroF1.uasset | 3 +++ .../BountySystem/TutorialFacility/IntroCutscene/IntroF10.jpg | 3 +++ .../TutorialFacility/IntroCutscene/IntroF10.uasset | 3 +++ .../BountySystem/TutorialFacility/IntroCutscene/IntroF11.jpg | 3 +++ .../TutorialFacility/IntroCutscene/IntroF11.uasset | 3 +++ .../BountySystem/TutorialFacility/IntroCutscene/IntroF12.jpg | 3 +++ .../TutorialFacility/IntroCutscene/IntroF12.uasset | 3 +++ .../BountySystem/TutorialFacility/IntroCutscene/IntroF13.jpg | 3 +++ .../TutorialFacility/IntroCutscene/IntroF13.uasset | 3 +++ .../BountySystem/TutorialFacility/IntroCutscene/IntroF14.jpg | 3 +++ .../TutorialFacility/IntroCutscene/IntroF14.uasset | 3 +++ .../BountySystem/TutorialFacility/IntroCutscene/IntroF15.jpg | 3 +++ .../TutorialFacility/IntroCutscene/IntroF15.uasset | 3 +++ .../BountySystem/TutorialFacility/IntroCutscene/IntroF16.jpg | 3 +++ .../TutorialFacility/IntroCutscene/IntroF16.uasset | 3 +++ .../BountySystem/TutorialFacility/IntroCutscene/IntroF17.jpg | 3 +++ .../TutorialFacility/IntroCutscene/IntroF17.uasset | 3 +++ .../BountySystem/TutorialFacility/IntroCutscene/IntroF18.jpg | 3 +++ .../TutorialFacility/IntroCutscene/IntroF18.uasset | 3 +++ .../BountySystem/TutorialFacility/IntroCutscene/IntroF19.jpg | 3 +++ .../TutorialFacility/IntroCutscene/IntroF19.uasset | 3 +++ .../BountySystem/TutorialFacility/IntroCutscene/IntroF2.jpg | 3 +++ .../TutorialFacility/IntroCutscene/IntroF2.uasset | 3 +++ .../BountySystem/TutorialFacility/IntroCutscene/IntroF3.jpg | 3 +++ .../TutorialFacility/IntroCutscene/IntroF3.uasset | 3 +++ .../BountySystem/TutorialFacility/IntroCutscene/IntroF4.jpg | 3 +++ .../TutorialFacility/IntroCutscene/IntroF4.uasset | 3 +++ .../BountySystem/TutorialFacility/IntroCutscene/IntroF5.jpg | 3 +++ .../TutorialFacility/IntroCutscene/IntroF5.uasset | 3 +++ .../BountySystem/TutorialFacility/IntroCutscene/IntroF6.jpg | 3 +++ .../TutorialFacility/IntroCutscene/IntroF6.uasset | 3 +++ .../BountySystem/TutorialFacility/IntroCutscene/IntroF7.jpg | 3 +++ .../TutorialFacility/IntroCutscene/IntroF7.uasset | 3 +++ .../BountySystem/TutorialFacility/IntroCutscene/IntroF8.jpg | 3 +++ .../TutorialFacility/IntroCutscene/IntroF8.uasset | 3 +++ .../BountySystem/TutorialFacility/IntroCutscene/IntroF9.jpg | 3 +++ .../TutorialFacility/IntroCutscene/IntroF9.uasset | 3 +++ .../TutorialFacility/IntroCutscene/WBP_IntroCutscene.uasset | 3 +++ .../BountySystem/TutorialFacility/MB_TutorialFacility.uasset | 3 +++ .../TutorialFacility/TrainingFacilityBountyDirector.uasset | 3 +++ EndlessVendetta/Content/Levels/TrainingFacility.umap | 4 ++-- .../Content/StarterContent/Architecture/Floor_400x400.uasset | 4 ++-- 45 files changed, 132 insertions(+), 6 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_IntroCinematic.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF1.jpg create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF1.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF10.jpg create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF10.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF11.jpg create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF11.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF12.jpg create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF12.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF13.jpg create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF13.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF14.jpg create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF14.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF15.jpg create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF15.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF16.jpg create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF16.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF17.jpg create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF17.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF18.jpg create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF18.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF19.jpg create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF19.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF2.jpg create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF2.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF3.jpg create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF3.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF4.jpg create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF4.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF5.jpg create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF5.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF6.jpg create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF6.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF7.jpg create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF7.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF8.jpg create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF8.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF9.jpg create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF9.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/WBP_IntroCutscene.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/TrainingFacilityBountyDirector.uasset diff --git a/EndlessVendetta/Config/DefaultEngine.ini b/EndlessVendetta/Config/DefaultEngine.ini index ddedfe22..89d6c838 100644 --- a/EndlessVendetta/Config/DefaultEngine.ini +++ b/EndlessVendetta/Config/DefaultEngine.ini @@ -4,7 +4,7 @@ +EditProfiles=(Name="Trigger",CustomResponses=((Channel=Projectile, Response=ECR_Ignore))) [/Script/EngineSettings.GameMapsSettings] -EditorStartupMap=/Game/LevelPrototyping/Scenes/TutorialHit.TutorialHit +EditorStartupMap=/Game/Levels/TrainingFacility.TrainingFacility LocalMapOptions= TransitionMap=None bUseSplitscreen=True @@ -13,7 +13,7 @@ ThreePlayerSplitscreenLayout=FavorTop FourPlayerSplitscreenLayout=Grid bOffsetPlayerGamepadIds=False GameInstanceClass=/Script/Engine.GameInstance -GameDefaultMap=/Game/LevelPrototyping/Scenes/TutorialHit.TutorialHit +GameDefaultMap=/Game/Levels/TrainingFacility.TrainingFacility ServerDefaultMap=/Engine/Maps/Entry.Entry GlobalDefaultGameMode=/Game/FirstPerson/GunMechanicWorld.GunMechanicWorld_C GlobalDefaultServerGameMode=None diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_IntroCinematic.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_IntroCinematic.uasset new file mode 100644 index 00000000..b5d638b9 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_IntroCinematic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c89ee76412e363ff4a55dd4056cf3714f5b264df72c784ca63effd18d871f14 +size 57524 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF1.jpg b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF1.jpg new file mode 100644 index 00000000..2da0efd2 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF1.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:30e6209982fa8d90b95ddbac1e4005a662c5a6331c9619931f8f953f8fef93dd +size 505928 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF1.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF1.uasset new file mode 100644 index 00000000..b2177ddc --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e53ebd68e7f9506f72441ff7e4f4eb6cd0173fbf3802110c30bddde4b31fa6fc +size 520012 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF10.jpg b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF10.jpg new file mode 100644 index 00000000..7630befc --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF10.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a70c0dcccc333e43e723ef5fbe6abd6e09254ce544cb2ced647df871b85088bb +size 180033 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF10.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF10.uasset new file mode 100644 index 00000000..42790fe0 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF10.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42dfc151f0c43677e9de2950d24dd2a03463ea24a63c8c9aac4cafa523d1012d +size 190048 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF11.jpg b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF11.jpg new file mode 100644 index 00000000..211a6d11 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF11.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ce94e92859f4d3f38b4524959d26ffaee36292eef0ec5bd2d93acc65ec88c80 +size 189799 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF11.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF11.uasset new file mode 100644 index 00000000..b4d02473 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF11.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c5c9345580a99bf8de36edd9f28098fca730f7c3fd342b2d791c0a636e6355d4 +size 199788 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF12.jpg b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF12.jpg new file mode 100644 index 00000000..fc1653fa --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF12.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad40612c0a6ec1b4422941da055a5e48c5cc1e8940c37967d2ac4e74503bdcea +size 267458 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF12.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF12.uasset new file mode 100644 index 00000000..a09442c9 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF12.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d597d5b91326c0a175efa3c642ea9a4e2f55bb744065092d37590b23156f4923 +size 277908 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF13.jpg b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF13.jpg new file mode 100644 index 00000000..49fc5a1c --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF13.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b10efe495ca0136dfb2eabcdd4cb4fd76a81946fe9d127860bf823d496ac194f +size 206195 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF13.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF13.uasset new file mode 100644 index 00000000..708d517e --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF13.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2603328b1f01de6de8c0906680326f35de1b922324a9aa7473b83c599cc9f47 +size 215946 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF14.jpg b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF14.jpg new file mode 100644 index 00000000..3a19ff04 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF14.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0f99f0d9581ca0bc2cec663bab828c9d99c6fb1f345301037dfbb4d8a96440e +size 197616 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF14.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF14.uasset new file mode 100644 index 00000000..63006089 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF14.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40bcc48a1e7c8107bdd704217591310403f0903499e983d35faece67af400ed4 +size 206985 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF15.jpg b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF15.jpg new file mode 100644 index 00000000..88d0ca70 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF15.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c3226503b477885b4be221bcb040d17124a3b27649a150d672aa6322cc768bc5 +size 255456 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF15.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF15.uasset new file mode 100644 index 00000000..4340df4b --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF15.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9db6fde65b4d9d8c3af7626669cac93c8e3168378c60a340fb86b058bdad488 +size 265154 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF16.jpg b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF16.jpg new file mode 100644 index 00000000..db819407 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF16.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f2e161bdae9612209d94c804472a255d16f3f30d257a7e7b0bdc9b53a3f18fe3 +size 276320 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF16.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF16.uasset new file mode 100644 index 00000000..44578aa8 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF16.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:abd81a0a03247cf81dcfe17491296b05ba896f5e8b50b07754aa825c0c1551f4 +size 287203 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF17.jpg b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF17.jpg new file mode 100644 index 00000000..f3fac2b8 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF17.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a3651fc2c201fbaab5b6470ae0b03eecf0e4a931d8c40cd588f7c730a4a96b0 +size 87428 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF17.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF17.uasset new file mode 100644 index 00000000..30857f89 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF17.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0be005d4235da60ddec23a4621b384789270b5ac89f7747844ceefc128b0a05b +size 93774 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF18.jpg b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF18.jpg new file mode 100644 index 00000000..4385cf5b --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF18.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0eaadf0aa1ccc154a31da10d5824f0d834ece9189d67d9ffa81534f014ac6c7 +size 212382 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF18.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF18.uasset new file mode 100644 index 00000000..c52b2a26 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF18.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5fa8e41cb4b170f0814cc418dfb62550105d9da89769686724f6385ce8989552 +size 222769 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF19.jpg b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF19.jpg new file mode 100644 index 00000000..d5853209 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF19.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c18c13050885545575822e12278b6e24de4cb6d6f9e998fb868c22d8f83f7688 +size 338154 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF19.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF19.uasset new file mode 100644 index 00000000..b67d8af7 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF19.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b727640e47e06e249dd77736808ba5820c89f5f1d423de2bb923d8c77c2dac95 +size 349033 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF2.jpg b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF2.jpg new file mode 100644 index 00000000..2ff430ae --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF2.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29db786aac1ce176be86878c8fbac89b29b8a2cb6892ce615d2288f6483321c2 +size 500729 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF2.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF2.uasset new file mode 100644 index 00000000..92f49bff --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f186cf66991e564e88ca899c86e8d1a8518b07ba0ed925a6189144f620485a1 +size 514227 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF3.jpg b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF3.jpg new file mode 100644 index 00000000..07e5a1ef --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF3.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f5a3cf86f2c029fe650a153693aba88358495fc6f572cbfc28c6d48c44dac6f +size 214186 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF3.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF3.uasset new file mode 100644 index 00000000..7cfed0e2 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF3.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8ed19146c886654be53b5ea2a7b715765b9801e4927331da9444334446c746c +size 223740 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF4.jpg b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF4.jpg new file mode 100644 index 00000000..3abd1ff3 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF4.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0304a498c81f1bf86467882f81480426d8e92126b9036ef0ad5d6947a0ae1acd +size 146352 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF4.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF4.uasset new file mode 100644 index 00000000..7a901ccd --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF4.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fdfaaafad92f8538771abcff8cabd3e7b607b696e56ee6f872859b77a6950b87 +size 154056 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF5.jpg b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF5.jpg new file mode 100644 index 00000000..322f1a55 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF5.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:30d48c3431570c7ee4d927c0fbdfd6e3d2def70fa1e2c35a60a9ce039176bed4 +size 187436 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF5.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF5.uasset new file mode 100644 index 00000000..b7986f92 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF5.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d171c88ebceda680bc3513fcd67c2393a1e349dd842ff85a33b69554920ca28f +size 196588 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF6.jpg b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF6.jpg new file mode 100644 index 00000000..7c33b4b8 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF6.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e66210f2c9f7916f9419c60772e459eef98c770ecb5ea848aa13b01acead4e56 +size 220680 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF6.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF6.uasset new file mode 100644 index 00000000..f312e19d --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF6.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:803b48fcdb34bbc29e483f423e66551a54ef96d57b490e8c98f7ff1073a5653c +size 230497 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF7.jpg b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF7.jpg new file mode 100644 index 00000000..7447d443 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF7.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:49abe230a7dac45c574f0876b05b55dfdc195786e8059e99830def819f346bfe +size 223805 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF7.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF7.uasset new file mode 100644 index 00000000..d3017056 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF7.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0551a57ef56e61ca73a37aef557a37cb30da491a5aca06613c27c96515ab8ec +size 233924 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF8.jpg b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF8.jpg new file mode 100644 index 00000000..89fdcb8b --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF8.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aee18e65f532253475f415be35b15ec5ca3ebc57f1d1012a7244ea5a0c5e19bb +size 214541 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF8.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF8.uasset new file mode 100644 index 00000000..0a9af385 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF8.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a60b8463d88f6f7dc19523390d45d050a8878fcf9c2b45e91f268ee606ab933 +size 224899 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF9.jpg b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF9.jpg new file mode 100644 index 00000000..947fe05f --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF9.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bfd01e970b5e52dd7aa94411a12b24ba5e06df11459e7a7872b565c00bb76fa8 +size 240882 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF9.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF9.uasset new file mode 100644 index 00000000..5e39e587 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF9.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6dcf5c2f098347d21854e94c5b8002fe717879a7f4e0f17053c5af02e819acdb +size 251526 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/WBP_IntroCutscene.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/WBP_IntroCutscene.uasset new file mode 100644 index 00000000..b64315bf --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/WBP_IntroCutscene.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c858ff0027ba68a5a46ea94c22f9aa8ffb5c918fd925d7dedee0663285b31e6 +size 17015 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset new file mode 100644 index 00000000..b1c4ef92 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31105f41e86fa2a2f7921c640c940139f3ed1720613b723fcd42a8c2f9abf309 +size 14056 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/TrainingFacilityBountyDirector.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/TrainingFacilityBountyDirector.uasset new file mode 100644 index 00000000..ba4f67f6 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/TrainingFacilityBountyDirector.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:50cf99064b7623a748d250be972c41b82a5abbdf16b677c12d0f77f076b8d208 +size 22391 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index a922ae09..98f3829f 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e87f12cf0cb5d6772f0c1287907ce497dac824e25a3e2963d9f4ff6e0f412b0 -size 388236 +oid sha256:7f03efd925b9dda1a170748f60cd44b9fc6c3ab8775cd38140ebd1b0812f3cc7 +size 388235 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index 564b7cfc..c2a34afc 100644 --- a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset +++ b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d8f35b2f5215938fc1b3ba8692c25a4d6e303fb425dfc910708df5f23115b20 -size 14831 +oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 +size 14948 From a9eb6e3eeaeb740ac2d10e142c800d5858fb9a75 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Thu, 19 Oct 2023 11:19:12 +0100 Subject: [PATCH 12/27] Updated all Classes to have new Interface Function --- .../BaseWeapons/BP_BaseWeapon.uasset | 4 ++-- .../BaseWeapons/WBP_AmmoCount.uasset | 4 ++-- .../BaseWeapons/WBP_WeaponStatsPrompt.uasset | 3 +++ .../LevelPrototyping/Scenes/TutorialHit.umap | 4 ++-- .../BountySystem/BountyDirector.cpp | 5 +++++ .../BountySystem/BountyDirector.h | 2 ++ .../EndlessVendettaCharacter.cpp | 20 +++++++++++++++++++ .../EndlessVendettaCharacter.h | 2 ++ .../EndlessVendetta/InteractionInterface.h | 3 +++ .../WeaponSystem/BaseWeaponClass.cpp | 13 ++++++++++++ .../WeaponSystem/BaseWeaponClass.h | 9 ++++++++- 11 files changed, 62 insertions(+), 7 deletions(-) create mode 100644 EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset index f2c7b766..aa29977b 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:754ba6fc86e8d96dbe2fade3d515f45b10eefd1e3c7ac9115658daa2b251622e -size 76327 +oid sha256:4b77951badd74210f53986b352ed4a4f92520b0ac247bea02c8fe39c6fba0f98 +size 78642 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset index 5f03829f..6101521e 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b199cbe84b6c49806f9646990c9c60ff7199214add19091ea0d7a47896daf53 -size 64350 +oid sha256:10ebd683496c3f12941f3983445288dce63f61464dea90cf666d51f7faf23919 +size 64526 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset new file mode 100644 index 00000000..b3297971 --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53e04069ebf540b1eabcc5f7443809ad8ce7220ad0c86c39bca7befee2fc4ac6 +size 21759 diff --git a/EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap b/EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap index 36f15ee5..1be569be 100644 --- a/EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap +++ b/EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:609efdd8d33b3e588fab3798c966b543cb353408d1aa6d8f78e1e50aed3e8c1c -size 298511 +oid sha256:e1a60c21cb9af1f0efba0eed08d7f08e957185d81139c861473115ec2b2b578d +size 301542 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyDirector.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyDirector.cpp index 56ed2056..7d884ef8 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyDirector.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyDirector.cpp @@ -266,6 +266,11 @@ void ABountyDirector::Interact() PC_Display->LoadOS(); } +void ABountyDirector::InteractPrompt() +{ + +} + void ABountyDirector::DestroyBountyDirectorPCWidget() { if (IsValid(PC_DisplayWidget)) PC_DisplayWidget->RemoveFromParent(); diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyDirector.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyDirector.h index 5c3a9719..b8ac9a66 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyDirector.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyDirector.h @@ -54,6 +54,8 @@ class ENDLESSVENDETTA_API ABountyDirector : public AActor, public IInteractionIn // Opens up Bounty Director PC Interface void Interact() override; + // Prompts player to interact + void InteractPrompt() override; protected: int Favours = 20; diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index bca0966d..f8deed82 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -69,6 +69,24 @@ void AEndlessVendettaCharacter::BeginPlay() void AEndlessVendettaCharacter::Tick(float DeltaTime) { Super::Tick(DeltaTime); + + WeaponPickUpSystem(); + +} + +void AEndlessVendettaCharacter::WeaponPickUpSystem() +{ + FHitResult OutHit; + FCollisionQueryParams QueryParams = FCollisionQueryParams::DefaultQueryParam; + QueryParams.AddIgnoredActor(this); + FVector LT_Start = FirstPersonCameraComponent->GetComponentLocation(); + FVector LT_End = LT_Start + (FirstPersonCameraComponent->GetForwardVector() * InteractionRange); + if (!GetWorld()->LineTraceSingleByChannel(OutHit, LT_Start, LT_End, ECC_Camera, QueryParams)) return; + + AActor* HitActor = OutHit.GetActor(); + UE_LOG(LogTemp, Warning, TEXT("Hit actor: %s"), *HitActor->GetName()); + IInteractionInterface* InteractableActor = Cast(HitActor); + if (InteractableActor) InteractableActor->InteractPrompt(); } //////////////////////////////////////////////////////////////////////////// Input @@ -124,6 +142,7 @@ void AEndlessVendettaCharacter::Interact() if (!GetWorld()->LineTraceSingleByChannel(OutHit, LT_Start, LT_End, ECC_Camera, QueryParams)) return; AActor* HitActor = OutHit.GetActor(); + UE_LOG(LogTemp, Warning, TEXT("Hit actor: %s"), *HitActor->GetName()); IInteractionInterface* InteractableActor = Cast(HitActor); if (InteractableActor) InteractableActor->Interact(); } @@ -151,6 +170,7 @@ float AEndlessVendettaCharacter::TakeDamage(const float DamageAmount, FDamageEve return Super::TakeDamage(DamageAmount, DamageEvent, EventInstigator, DamageCauser); } + void AEndlessVendettaCharacter::ToggleRecon() { if (IsValid(PrimaryWeapon)) EquipPrimary(); diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h index ece80c9f..fd54fc40 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h @@ -173,4 +173,6 @@ public: UFUNCTION(BlueprintCallable, Category = "Damage Control") virtual float TakeDamage(float DamageAmount, FDamageEvent const& DamageEvent, AController* EventInstigator, AActor* DamageCauser) override; + + void WeaponPickUpSystem(); }; diff --git a/EndlessVendetta/Source/EndlessVendetta/InteractionInterface.h b/EndlessVendetta/Source/EndlessVendetta/InteractionInterface.h index 29746fab..f266b10b 100644 --- a/EndlessVendetta/Source/EndlessVendetta/InteractionInterface.h +++ b/EndlessVendetta/Source/EndlessVendetta/InteractionInterface.h @@ -23,4 +23,7 @@ class ENDLESSVENDETTA_API IInteractionInterface // Add interface functions to this class. This is the class that will be inherited to implement this interface. public: virtual void Interact(){} + + + virtual void InteractPrompt() {} }; diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp index 6db24720..ba95f360 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp @@ -230,4 +230,17 @@ void ABaseWeaponClass::WeaponReload() } } +void ABaseWeaponClass::Interact() +{ + GLog->Log("Interact Called"); +} + +void ABaseWeaponClass::InteractPrompt() +{ + WeaponStatsPopUp(); + UE_LOG(LogTemp, Warning, TEXT("InteractPrompt setup")) +} + + + diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h index 72ad7ed4..7d82343a 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h @@ -6,13 +6,14 @@ #include "WeaponItemClass.h" #include "Components/ArrowComponent.h" #include "Kismet/KismetMathLibrary.h" +#include "EndlessVendetta/InteractionInterface.h" #include "BaseWeaponClass.generated.h" class AEndlessVendettaCharacter; class UCapsuleComponent; UCLASS() -class ENDLESSVENDETTA_API ABaseWeaponClass : public AActor +class ENDLESSVENDETTA_API ABaseWeaponClass : public AActor, public IInteractionInterface { GENERATED_BODY() @@ -156,6 +157,12 @@ public: UPROPERTY(EditAnywhere) int bulletCountShoot; //Gets how many bullets shot per + void Interact() override; + + void InteractPrompt() override; + + UFUNCTION(BlueprintImplementableEvent) + void WeaponStatsPopUp(); protected: UArrowComponent* GunStartArrow; From 3631fbe5ba274207e3d8c6e21903492063b3c5e5 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Thu, 19 Oct 2023 12:03:23 +0100 Subject: [PATCH 13/27] Implemented Intro Cutscene --- .../Content/Assets/Objects/Tutorial-Level/Sm_Bed01.uasset | 4 ++-- .../Content/Assets/Objects/Tutorial-Level/Sm_Desk01.uasset | 4 ++-- .../Assets/Objects/Tutorial-Level/Sm_SmallTable01.uasset | 4 ++-- .../Assets/Objects/Tutorial-Level/Sm_Wardrobe01.uasset | 4 ++-- .../Content/BountySystem/BountyDirector/PC_Background.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF1.uasset | 4 ++-- .../TutorialFacility/IntroCutscene/IntroF10.uasset | 4 ++-- .../TutorialFacility/IntroCutscene/IntroF11.uasset | 4 ++-- .../TutorialFacility/IntroCutscene/IntroF12.uasset | 4 ++-- .../TutorialFacility/IntroCutscene/IntroF13.uasset | 4 ++-- .../TutorialFacility/IntroCutscene/IntroF14.uasset | 4 ++-- .../TutorialFacility/IntroCutscene/IntroF15.uasset | 4 ++-- .../TutorialFacility/IntroCutscene/IntroF16.uasset | 4 ++-- .../TutorialFacility/IntroCutscene/IntroF17.uasset | 4 ++-- .../TutorialFacility/IntroCutscene/IntroF18.uasset | 4 ++-- .../TutorialFacility/IntroCutscene/IntroF19.uasset | 4 ++-- .../TutorialFacility/IntroCutscene/IntroF2.uasset | 4 ++-- .../BountySystem/TutorialFacility/IntroCutscene/IntroF20.jpg | 3 +++ .../TutorialFacility/IntroCutscene/IntroF20.uasset | 3 +++ .../BountySystem/TutorialFacility/IntroCutscene/IntroF21.jpg | 3 +++ .../TutorialFacility/IntroCutscene/IntroF21.uasset | 3 +++ .../BountySystem/TutorialFacility/IntroCutscene/IntroF22.jpg | 3 +++ .../TutorialFacility/IntroCutscene/IntroF22.uasset | 3 +++ .../BountySystem/TutorialFacility/IntroCutscene/IntroF23.jpg | 3 +++ .../TutorialFacility/IntroCutscene/IntroF23.uasset | 3 +++ .../BountySystem/TutorialFacility/IntroCutscene/IntroF24.jpg | 3 +++ .../TutorialFacility/IntroCutscene/IntroF24.uasset | 3 +++ .../TutorialFacility/IntroCutscene/IntroF3.uasset | 4 ++-- .../TutorialFacility/IntroCutscene/IntroF4.uasset | 4 ++-- .../TutorialFacility/IntroCutscene/IntroF5.uasset | 4 ++-- .../TutorialFacility/IntroCutscene/IntroF6.uasset | 4 ++-- .../TutorialFacility/IntroCutscene/IntroF7.uasset | 4 ++-- .../TutorialFacility/IntroCutscene/IntroF8.uasset | 4 ++-- .../TutorialFacility/IntroCutscene/IntroF9.uasset | 4 ++-- .../TutorialFacility/IntroCutscene/WBP_IntroCutscene.uasset | 4 ++-- .../Materials/Panel_Concrete_BaseColor.uasset | 4 ++-- .../LevelPrototyping/Materials/Panel_Concrete_Normal.uasset | 4 ++-- .../Panel_Concrete_OcclusionRoughnessMetallic.uasset | 4 ++-- 38 files changed, 85 insertions(+), 55 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF20.jpg create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF20.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF21.jpg create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF21.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF22.jpg create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF22.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF23.jpg create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF23.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF24.jpg create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF24.uasset diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Bed01.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Bed01.uasset index 55e424ea..58f07fd5 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Bed01.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Bed01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc50c3543a327059c08017f0b8a04537afb43e749128c4db5092497cb3d5953d -size 17913 +oid sha256:510cdd364940ec3d074a4d801d97eb2399c478e7abaadbe4a391d1f5d5173d99 +size 17604 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Desk01.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Desk01.uasset index 21bd011f..56d35587 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Desk01.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Desk01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d811cdb5d40293dd0004da6d84068a1e2c57176b9eb78c7f962fd45f02a5cd8 -size 18088 +oid sha256:2b5800271c81b65754f3f21cb67b4cd0deedcbfb0232f2ab22ce604646841f71 +size 17782 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_SmallTable01.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_SmallTable01.uasset index 713a5a9c..3802fc1c 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_SmallTable01.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_SmallTable01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0eeb36176a9c00e72b77045d94a2c5db73716dbc3b8cd30f17ed1e10bd663da4 -size 17430 +oid sha256:dbaa2286c539702b51a5a6174c462bc5fd8e0cd5ee583793f643a49ac7b7e753 +size 17113 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Wardrobe01.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Wardrobe01.uasset index fc827be4..cb8d4719 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Wardrobe01.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Wardrobe01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0072bcd3eb1509d0d10470185cd0a5a0e62c5ae8eea6a6546a2272012a5686d0 -size 20297 +oid sha256:bc48983716b4a41ddac4cdc283559cd56c76280b226550f6278a8104a68edf2c +size 20003 diff --git a/EndlessVendetta/Content/BountySystem/BountyDirector/PC_Background.uasset b/EndlessVendetta/Content/BountySystem/BountyDirector/PC_Background.uasset index 5dc905ef..e1c19927 100644 --- a/EndlessVendetta/Content/BountySystem/BountyDirector/PC_Background.uasset +++ b/EndlessVendetta/Content/BountySystem/BountyDirector/PC_Background.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d1bd2827e82ba55e60dba3a42e89bd1877b0ba33adb9894603ec46705d99243 +oid sha256:7a9e3317f660c27f1e50f6d62dc7c41212247691362563f8ee0d1c0df4d419a3 size 247653 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF1.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF1.uasset index b2177ddc..a77bd9c5 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF1.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e53ebd68e7f9506f72441ff7e4f4eb6cd0173fbf3802110c30bddde4b31fa6fc -size 520012 +oid sha256:afb1af674f0886711bc46edd965062b1c70f843db5717f0805f93bec05d98ecb +size 520107 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF10.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF10.uasset index 42790fe0..18b13d54 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF10.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF10.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42dfc151f0c43677e9de2950d24dd2a03463ea24a63c8c9aac4cafa523d1012d -size 190048 +oid sha256:dfea54512bade08fea6d38d249df1471a97afa83883d0a197c87c0297704c432 +size 190143 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF11.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF11.uasset index b4d02473..cb198274 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF11.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF11.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5c9345580a99bf8de36edd9f28098fca730f7c3fd342b2d791c0a636e6355d4 -size 199788 +oid sha256:90ccbb7936984b7bb2a771875419d5e31d24a2c98f71f95a0b3c05f404ebf263 +size 199883 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF12.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF12.uasset index a09442c9..097e4bb0 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF12.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF12.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d597d5b91326c0a175efa3c642ea9a4e2f55bb744065092d37590b23156f4923 -size 277908 +oid sha256:2199d1967ed03067cd6c682ca01ed36e440713be41562815461b59fb9ec4690f +size 278003 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF13.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF13.uasset index 708d517e..b70cc5b2 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF13.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF13.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2603328b1f01de6de8c0906680326f35de1b922324a9aa7473b83c599cc9f47 -size 215946 +oid sha256:b22afc9e55fb90cebd69c4193e2f151a4974bcda51d731ac233dd7548489e1f5 +size 216041 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF14.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF14.uasset index 63006089..b31ae079 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF14.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF14.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40bcc48a1e7c8107bdd704217591310403f0903499e983d35faece67af400ed4 -size 206985 +oid sha256:0cd9b8e55e5e9f28262566d63785810e116b3ae17e6dbe9566ffaa77d6c4c830 +size 207080 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF15.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF15.uasset index 4340df4b..6f41642b 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF15.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF15.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9db6fde65b4d9d8c3af7626669cac93c8e3168378c60a340fb86b058bdad488 -size 265154 +oid sha256:cea03c89a2284e8ab2167515f5dc2202dca82b1ff42beb9cf99b0864194298b5 +size 265249 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF16.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF16.uasset index 44578aa8..60764b2b 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF16.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF16.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:abd81a0a03247cf81dcfe17491296b05ba896f5e8b50b07754aa825c0c1551f4 -size 287203 +oid sha256:3597a1a414682dc1e0af20bb58411000fa9f53e5cc4bffa0cdef047f5bef5edb +size 287298 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF17.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF17.uasset index 30857f89..c4fc3ca9 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF17.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF17.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0be005d4235da60ddec23a4621b384789270b5ac89f7747844ceefc128b0a05b -size 93774 +oid sha256:9a1154ecb9ec4a484a0dbee1fe88ddfbd43d212be9b1741a2e5f242d26f07109 +size 93869 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF18.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF18.uasset index c52b2a26..a092af28 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF18.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF18.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5fa8e41cb4b170f0814cc418dfb62550105d9da89769686724f6385ce8989552 -size 222769 +oid sha256:fad118773b61f2751df8d7fbfd5d2afdf7bb21363d613da169963e3eaff281a4 +size 222864 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF19.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF19.uasset index b67d8af7..eea44311 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF19.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF19.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b727640e47e06e249dd77736808ba5820c89f5f1d423de2bb923d8c77c2dac95 -size 349033 +oid sha256:5591f94c1ceb0b5d4ca36f75d59eaaa15ad4e134679f1bbe762def817871b7ec +size 349128 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF2.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF2.uasset index 92f49bff..a58ba621 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF2.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f186cf66991e564e88ca899c86e8d1a8518b07ba0ed925a6189144f620485a1 -size 514227 +oid sha256:f309675f2dc38d8c1bf81634b233f6ef0b67802515977b5cd2c4bb9e1d8b5bd0 +size 514322 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF20.jpg b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF20.jpg new file mode 100644 index 00000000..b5388717 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF20.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e8195c7e1155a58dcf96e13cccba2cf2fc62a4d59a19648b6c3e67caa8fc7c33 +size 269403 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF20.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF20.uasset new file mode 100644 index 00000000..980af4e4 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF20.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:990ac7f4b113b80295ab773c84dcceb7b1c9b123036b38a916019780cbd5041a +size 279613 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF21.jpg b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF21.jpg new file mode 100644 index 00000000..2e7cb0e5 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF21.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3fe6f5b7980fb586aee8dcda0d64f936c2b4f8c2dfbf77af334d8a4d5121f663 +size 254886 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF21.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF21.uasset new file mode 100644 index 00000000..9b9ed931 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF21.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4371dd58be0b26deb7f0bea10c7fab7c4fed2fd49ef7291d642e51df044b8ab1 +size 264887 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF22.jpg b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF22.jpg new file mode 100644 index 00000000..e3cefae2 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF22.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66fc81385e3ed3c60c92518871f22fab822b22e0dee595a758c3a56f0ab1682d +size 192507 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF22.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF22.uasset new file mode 100644 index 00000000..e4a47a1d --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF22.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d66b8d6e44e341be36a4f8d11d6759c37186f3e211d0d5ab8f9a13f95b280ee +size 201313 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF23.jpg b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF23.jpg new file mode 100644 index 00000000..26e63f8c --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF23.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8cb67401f2bdd6de8dcefa165a5f9aa54c1be530053959f9d7fdaab5471cf9e3 +size 224057 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF23.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF23.uasset new file mode 100644 index 00000000..44d30062 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF23.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc5fe59a3c6e78123c5376088799fce4c32dfe979695acd272d796c2d31ae516 +size 233776 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF24.jpg b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF24.jpg new file mode 100644 index 00000000..c10c07ee --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF24.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c5780adb92fb4d4073d087000a929a9bf562879d54355a64430cb855c9ff71bb +size 233492 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF24.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF24.uasset new file mode 100644 index 00000000..c16af794 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF24.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4497ac6f5a2b3fc928c08e91ee2d86df317a2311051f49327939f90a0f5e229c +size 243364 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF3.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF3.uasset index 7cfed0e2..cfdb0435 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF3.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF3.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8ed19146c886654be53b5ea2a7b715765b9801e4927331da9444334446c746c -size 223740 +oid sha256:784c85d3d80649ec757ee07cbe99d98f6488acd9e428524f67625928c76e3d59 +size 223835 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF4.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF4.uasset index 7a901ccd..88ebab29 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF4.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF4.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fdfaaafad92f8538771abcff8cabd3e7b607b696e56ee6f872859b77a6950b87 -size 154056 +oid sha256:fb29a34a7f3ce87cd020c3e96973787eae7e13aafa43cd67805fd52c8168772c +size 154151 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF5.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF5.uasset index b7986f92..b3315365 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF5.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF5.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d171c88ebceda680bc3513fcd67c2393a1e349dd842ff85a33b69554920ca28f -size 196588 +oid sha256:b0cc947bdc905e4dbd729f6cad9f2439f02c5d2ec97feb7e81f11f204d5327d8 +size 196683 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF6.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF6.uasset index f312e19d..d9e2446e 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF6.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF6.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:803b48fcdb34bbc29e483f423e66551a54ef96d57b490e8c98f7ff1073a5653c -size 230497 +oid sha256:124c83ecf291fe70581505746b6003214ee069b19d0bf3f15344d3725d5b35b3 +size 230592 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF7.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF7.uasset index d3017056..a6234e17 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF7.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF7.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e0551a57ef56e61ca73a37aef557a37cb30da491a5aca06613c27c96515ab8ec -size 233924 +oid sha256:6946a1336673f93680fed45f0cf9ce3b674b6c761f819bae4fc3e698000502ef +size 234019 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF8.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF8.uasset index 0a9af385..1ca0c611 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF8.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF8.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a60b8463d88f6f7dc19523390d45d050a8878fcf9c2b45e91f268ee606ab933 -size 224899 +oid sha256:0bf5b0fe472badda37b479f17431f96520f1255e527f96638b3e36ed24816a91 +size 224994 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF9.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF9.uasset index 5e39e587..cc9aa2e7 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF9.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF9.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6dcf5c2f098347d21854e94c5b8002fe717879a7f4e0f17053c5af02e819acdb -size 251526 +oid sha256:368df35a657b9b190ad73d14d75e6eaab61187d37de7f2a94cb516e2d5fad769 +size 251621 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/WBP_IntroCutscene.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/WBP_IntroCutscene.uasset index b64315bf..eb8ca835 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/WBP_IntroCutscene.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/WBP_IntroCutscene.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c858ff0027ba68a5a46ea94c22f9aa8ffb5c918fd925d7dedee0663285b31e6 -size 17015 +oid sha256:f110055d11645984154c83cecc0f393295a8b74c7742db34109c1b83a4f26036 +size 133249 diff --git a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_BaseColor.uasset b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_BaseColor.uasset index db9372a8..49b8293c 100644 --- a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_BaseColor.uasset +++ b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_BaseColor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7e3957f747f64afda55ea8781d6d17211c1f615d99039769cabb1eb2d75275f -size 1645653 +oid sha256:0c7959637d99242528a577c02b859fb548fa09c23d492edba47ee16bb993339c +size 1645357 diff --git a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_Normal.uasset b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_Normal.uasset index 71d5fa5f..8785b31f 100644 --- a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_Normal.uasset +++ b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_Normal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:563f8c228e8a4ffd5c7415f83a98407ed9c205c3d136b8de6cd082f295a95979 -size 2960482 +oid sha256:cdb64cb291167601a4b386e10ecea4f3f9dfc775b6bd8ad229316fd4664eefd5 +size 2960186 diff --git a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_OcclusionRoughnessMetallic.uasset b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_OcclusionRoughnessMetallic.uasset index 50f07262..5182b904 100644 --- a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_OcclusionRoughnessMetallic.uasset +++ b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_OcclusionRoughnessMetallic.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30ebba255de23d1b6eaff6d9ff9abd1c9cbbc4e33e18ea4c85e61baeb7e25f2c -size 352952 +oid sha256:645d5fe908bcd3c8b26ec3f63cb9a8e6a746190b0cfe073d130f85c6d720712d +size 352656 From c68c1b70dcc5af3630ef4f6c5aa0312a0d76d1f9 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Thu, 19 Oct 2023 12:08:25 +0100 Subject: [PATCH 14/27] Started adding WeaponStats UI --- .../FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset | 4 ++-- .../Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset | 4 ++-- .../Content/LevelPrototyping/Scenes/TutorialHit.umap | 4 ++-- .../Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h | 3 +++ 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset index aa29977b..aaca57f5 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b77951badd74210f53986b352ed4a4f92520b0ac247bea02c8fe39c6fba0f98 -size 78642 +oid sha256:e657a0654a07a7573dcf638c96b9aa133cb1187ec301825e177dede83106db40 +size 126851 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset index b3297971..e91670eb 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:53e04069ebf540b1eabcc5f7443809ad8ce7220ad0c86c39bca7befee2fc4ac6 -size 21759 +oid sha256:9d594f98e9965fee6c2321d2688890d8d745b135621247d2a34ca8a2f9d7935a +size 83652 diff --git a/EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap b/EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap index 1be569be..50e7b151 100644 --- a/EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap +++ b/EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1a60c21cb9af1f0efba0eed08d7f08e957185d81139c861473115ec2b2b578d -size 301542 +oid sha256:57903d1174f13c4e930113e1f5aba86389d1568b4e42193474fec9da7cfd55aa +size 301943 diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h index 7d82343a..121ac885 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h @@ -60,6 +60,9 @@ public: UPROPERTY(EditAnywhere) int WeaponDamage; + UPROPERTY(EditAnywhere) + FString WeaponDescription; + UPROPERTY(EditAnywhere) float FireRate; From 81105bf0d1b5008470765ff872960525eff0a3c3 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek <34179rs@gmail.com> Date: Thu, 19 Oct 2023 13:59:16 +0100 Subject: [PATCH 15/27] Added Skip Cutscene Functionality --- .../TutorialFacility/Checkpoints/CP_IntroCinematic.uasset | 4 ++-- .../TutorialFacility/IntroCutscene/IntroF20.uasset | 4 ++-- .../TutorialFacility/IntroCutscene/IntroF21.uasset | 4 ++-- .../TutorialFacility/IntroCutscene/IntroF22.uasset | 4 ++-- .../TutorialFacility/IntroCutscene/IntroF23.uasset | 4 ++-- .../TutorialFacility/IntroCutscene/IntroF24.uasset | 4 ++-- .../TutorialFacility/IntroCutscene/WBP_IntroCutscene.uasset | 4 ++-- .../Content/FirstPerson/Input/Actions/IA_Combat.uasset | 2 +- EndlessVendetta/Content/Levels/TrainingFacility.umap | 4 ++-- .../Content/StarterContent/Architecture/Floor_400x400.uasset | 4 ++-- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_IntroCinematic.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_IntroCinematic.uasset index b5d638b9..9baa8118 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_IntroCinematic.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_IntroCinematic.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c89ee76412e363ff4a55dd4056cf3714f5b264df72c784ca63effd18d871f14 -size 57524 +oid sha256:66f9f7016f0fb3d431f16dc9ec1c045a7123a20d7001bb1094c5d43fd7cfcb3b +size 60949 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF20.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF20.uasset index 980af4e4..9497ff40 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF20.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF20.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:990ac7f4b113b80295ab773c84dcceb7b1c9b123036b38a916019780cbd5041a -size 279613 +oid sha256:d0845004d52fda9772f4c34658217b73f74048eae13b3ff38ee9c6e23ec4b31f +size 279708 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF21.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF21.uasset index 9b9ed931..f7a2f316 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF21.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF21.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4371dd58be0b26deb7f0bea10c7fab7c4fed2fd49ef7291d642e51df044b8ab1 -size 264887 +oid sha256:ea43f68bafd93d66443c5985be791c8a450e0a05a8fc6d9d38b94db48c2279b5 +size 264982 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF22.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF22.uasset index e4a47a1d..db16a3a9 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF22.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF22.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d66b8d6e44e341be36a4f8d11d6759c37186f3e211d0d5ab8f9a13f95b280ee -size 201313 +oid sha256:50ceee3af884775b01cb2542007887326beaf0591e3c5b90c401bd90ac44bbe5 +size 201408 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF23.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF23.uasset index 44d30062..8422f8a7 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF23.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF23.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc5fe59a3c6e78123c5376088799fce4c32dfe979695acd272d796c2d31ae516 -size 233776 +oid sha256:0c1a581bd6b07773550a66b223ddbf159b2b354c3d0be9c49fdcf704ce1b090c +size 233871 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF24.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF24.uasset index c16af794..83175dcc 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF24.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF24.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4497ac6f5a2b3fc928c08e91ee2d86df317a2311051f49327939f90a0f5e229c -size 243364 +oid sha256:d50a5ffc3fbe9ddc0e671bc0aba633f21edf0ad70575b4b0ab61c7daa2c03e3f +size 243459 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/WBP_IntroCutscene.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/WBP_IntroCutscene.uasset index eb8ca835..3959c58c 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/WBP_IntroCutscene.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/WBP_IntroCutscene.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f110055d11645984154c83cecc0f393295a8b74c7742db34109c1b83a4f26036 -size 133249 +oid sha256:180441e7a8699c746681518a9eb4ed35ef57a39bb90960f2d7e3f4296e8d33ec +size 140142 diff --git a/EndlessVendetta/Content/FirstPerson/Input/Actions/IA_Combat.uasset b/EndlessVendetta/Content/FirstPerson/Input/Actions/IA_Combat.uasset index 0562b346..a78a79b7 100644 --- a/EndlessVendetta/Content/FirstPerson/Input/Actions/IA_Combat.uasset +++ b/EndlessVendetta/Content/FirstPerson/Input/Actions/IA_Combat.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:00f4ed84367ee429face15faba364bc15ee2d562096d2f845a3a3a6deb69dc3d +oid sha256:0176878a0aaf82e74063ae28ae1e67a94529e1daebcfe824c63b28da5534fd0b size 1360 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 98f3829f..19f57dd6 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f03efd925b9dda1a170748f60cd44b9fc6c3ab8775cd38140ebd1b0812f3cc7 -size 388235 +oid sha256:8ba58db7f928d8f925388a4881468d0576d4f4a748ee0a7368391e6ca732cdb3 +size 388285 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index c2a34afc..fc989d88 100644 --- a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset +++ b/EndlessVendetta/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:6f0925b53326aad3da5286726b9e6c54e9618957e1d5e88484c1911197ae5ba1 +size 14831 From feeb0f36d6d86803028777005d552c60b4c50bef Mon Sep 17 00:00:00 2001 From: MH261677 Date: Thu, 19 Oct 2023 15:30:39 +0100 Subject: [PATCH 16/27] Finished Creating Weapon Stat UI for all Weapons --- .../AssaultRifles/BP_BaseAssaultRifle.uasset | 4 ++-- .../Blueprints/BaseWeapons/BP_BaseWeapon.uasset | 4 ++-- .../Blueprints/BaseWeapons/WBP_AmmoCount.uasset | 4 ++-- .../BaseWeapons/WBP_WeaponStatsPrompt.uasset | 4 ++-- .../EndlessVendetta/WeaponSystem/BaseWeaponClass.h | 13 +++++++------ 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset index 877f5854..4efa20ad 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63a33ee4cfad25c36bd022a8723b9b6ff80d70127366efa8983549044fd1f8ac -size 39198 +oid sha256:f7cb927b0b7296205adad620a38f473c36b2ee787fa7d4c6b12009a4aaf549e9 +size 40029 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset index aaca57f5..cac2db11 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e657a0654a07a7573dcf638c96b9aa133cb1187ec301825e177dede83106db40 -size 126851 +oid sha256:c5ee53e7d84e4e0a3a6941011ad8a3c2718afe0bad7e95cf23f7cc1063476f53 +size 124677 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset index 6101521e..b4d8011b 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:10ebd683496c3f12941f3983445288dce63f61464dea90cf666d51f7faf23919 -size 64526 +oid sha256:dc183a9d9781ca6800fa345b6428f7bf41953180f79e74b96c894a33b9d789e9 +size 64773 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset index e91670eb..88947b41 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d594f98e9965fee6c2321d2688890d8d745b135621247d2a34ca8a2f9d7935a -size 83652 +oid sha256:a45878c4f97b973894f65722a55015a06cb6acc25e913c9d4045fd4532176701 +size 192580 diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h index 121ac885..f09b4492 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h @@ -54,22 +54,23 @@ public: // Called every frame virtual void Tick(float DeltaTime) override; void ReloadTimer(); - UPROPERTY(EditAnywhere) - FName WeaponName; + + UPROPERTY(EditAnywhere, BlueprintReadWrite) + FString WeaponName; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, BlueprintReadWrite) int WeaponDamage; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, BlueprintReadWrite) FString WeaponDescription; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, BlueprintReadWrite) float FireRate; UPROPERTY(EditAnywhere, BlueprintReadWrite) int MagazineSize; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, BlueprintReadWrite) float TimeToReload = 3.f; //how many bullets until the recoil stops going up From aac09873f2ff46f9c67b3019d9bef73f840f5be3 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek <34179rs@gmail.com> Date: Thu, 19 Oct 2023 16:22:13 +0100 Subject: [PATCH 17/27] Implemented Waypoint Functionality and UI To be reworked later down the line --- .../Checkpoints/CP_PickUpWeapons.uasset | 3 ++ .../IntroCutscene/WBP_IntroCutscene.uasset | 4 +- .../MB_TutorialFacility.uasset | 4 +- .../BountySystem/Waypoint/BP_Waypoint.uasset | 3 ++ .../Waypoint/TempMainBountyIcon.png | 3 ++ .../Waypoint/TempMainBountyIcon.uasset | 3 ++ .../Waypoint/WBP_WaypointWidget.uasset | 3 ++ .../BaseWeapons/BP_BaseWeapon.uasset | 4 +- .../Content/Levels/TrainingFacility.umap | 2 +- .../Architecture/Floor_400x400.uasset | 4 +- .../HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 4 +- .../BountySystem/BountyDirector.h | 2 +- .../BountySystem/CheckpointClass.cpp | 13 ++++- .../BountySystem/CheckpointClass.h | 7 +++ .../BountySystem/WaypointActor.cpp | 48 +++++++++++++++++++ .../BountySystem/WaypointActor.h | 47 ++++++++++++++++++ 16 files changed, 141 insertions(+), 13 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapons.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/TempMainBountyIcon.png create mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/TempMainBountyIcon.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset create mode 100644 EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp create mode 100644 EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapons.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapons.uasset new file mode 100644 index 00000000..840c9d68 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapons.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e5c15f23ffe72a5addc71f6982edf1d60d246b1b4a174e9db4f737ee71480dfd +size 23100 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/WBP_IntroCutscene.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/WBP_IntroCutscene.uasset index 3959c58c..1dc0a9e5 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/WBP_IntroCutscene.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/WBP_IntroCutscene.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:180441e7a8699c746681518a9eb4ed35ef57a39bb90960f2d7e3f4296e8d33ec -size 140142 +oid sha256:3a7a738aafe69d411cab17f80fea465b635afdabd14e6df72feea23331cf45a8 +size 137946 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset index b1c4ef92..cdb5de9f 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31105f41e86fa2a2f7921c640c940139f3ed1720613b723fcd42a8c2f9abf309 -size 14056 +oid sha256:264017fbfa9d46717dac13e666eef14f4d1732cd7a3e26ab4a91f5d381586757 +size 14244 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset new file mode 100644 index 00000000..0caa296f --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b261ee9bb3d384362cc7fe462df6c011c322f91efb4722e3a8d1ed5a4e05c69c +size 47976 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/TempMainBountyIcon.png b/EndlessVendetta/Content/BountySystem/Waypoint/TempMainBountyIcon.png new file mode 100644 index 00000000..61ddbe03 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Waypoint/TempMainBountyIcon.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f99a94e75ec8bbb52399da3df66d97452a3028a8503a1945ba03b9618ff979d8 +size 258434 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/TempMainBountyIcon.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/TempMainBountyIcon.uasset new file mode 100644 index 00000000..ecc25e4a --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Waypoint/TempMainBountyIcon.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:390c4b654a6b0b7d80e3324f08f237801727353022d6ae28926992cf0cf4e579 +size 211682 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset new file mode 100644 index 00000000..09b70476 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b07b293876d399dfdce186c99573c335e2e2e509856f7a67a2a463569b4f23d +size 30404 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset index f2c7b766..5995b7ce 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:754ba6fc86e8d96dbe2fade3d515f45b10eefd1e3c7ac9115658daa2b251622e -size 76327 +oid sha256:5fd67b08624a4a707041edc782af848e1042237175152a5faf6db5b2d4ec997c +size 75188 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 19f57dd6..fc188df6 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ba58db7f928d8f925388a4881468d0576d4f4a748ee0a7368391e6ca732cdb3 +oid sha256:50c23f300085d150ffc94cfe05fb67283e7a15ee0bdb526c4473aace7620aa97 size 388285 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index fc989d88..c2a34afc 100644 --- a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset +++ b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f0925b53326aad3da5286726b9e6c54e9618957e1d5e88484c1911197ae5ba1 -size 14831 +oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 +size 14948 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index 0f990580..138b8d8d 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:bc35eb2d43a47427d30aba0196f9eac90d089dd3abca319528c5d25c83510d0d -size 72364642 +oid sha256:dbdee5fb4cee49c21e18629a5c34a184b942058f45eb244b319810963e616c2c +size 66790690 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyDirector.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyDirector.h index 5c3a9719..73795c2e 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyDirector.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyDirector.h @@ -30,7 +30,7 @@ class ENDLESSVENDETTA_API ABountyDirector : public AActor, public IInteractionIn UPROPERTY(EditDefaultsOnly, Category = "Bounty Director") TSubclassOf PC_DisplayWidgetClass; - + UUserWidget* PC_DisplayWidget; UPC_Display* PC_Display; diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp index 630725e4..393b942b 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp @@ -15,7 +15,12 @@ ACheckpointClass::ACheckpointClass() void ACheckpointClass::BeginPlay() { Super::BeginPlay(); - + if (!IsValid(WaypointActorClass)) return; + + FActorSpawnParameters SpawnParams; + SpawnParams.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn; + WaypointActor = Cast(GetWorld()->SpawnActor(WaypointActorClass, WaypointLoc, GetActorRotation(), SpawnParams)); + WaypointActor->SetupWaypoint(WaypointIcon, CheckpointDescription); } // Called every frame @@ -25,3 +30,9 @@ void ACheckpointClass::Tick(float DeltaTime) } +void ACheckpointClass::Destroyed() +{ + if (WaypointActor) WaypointActor->Destroy(); +} + + diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h index 6991181a..13f5c09a 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h @@ -3,6 +3,7 @@ #pragma once #include "CoreMinimal.h" +#include "WaypointActor.h" #include "GameFramework/Actor.h" #include "CheckpointClass.generated.h" @@ -22,6 +23,10 @@ class ENDLESSVENDETTA_API ACheckpointClass : public AActor UTexture2D* WaypointIcon; UPROPERTY(EditDefaultsOnly, Category = "Checkpoint") FTransform CheckpointSpawnTransform; + UPROPERTY(EditDefaultsOnly, Category = "Checkpoint") + TSubclassOf WaypointActorClass; + + AWaypointActor* WaypointActor; // ---------------------------------------- UFUNCTION(BlueprintCallable, Category = "Checkpoint") @@ -34,6 +39,8 @@ class ENDLESSVENDETTA_API ACheckpointClass : public AActor protected: // Called when the game starts or when spawned virtual void BeginPlay() override; + + virtual void Destroyed() override; public: FCompletedCheckpoint CompletedCheckpoint; diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp new file mode 100644 index 00000000..0c9320cb --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp @@ -0,0 +1,48 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "WaypointActor.h" + +#include "EndlessVendetta/EndlessVendettaCharacter.h" + +// Sets default values +AWaypointActor::AWaypointActor() +{ + // 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 AWaypointActor::BeginPlay() +{ + SetActorTickEnabled(false); + Super::BeginPlay(); + + SetActorTickInterval(0.05); + AActor* PlayerActor = Cast(GetWorld()->GetFirstPlayerController()->GetPawn()); + PlayersCam = Cast(PlayerActor->GetComponentByClass(UCameraComponent::StaticClass())); + ScalingMagnitude = (ScaleAtMaxDist - ScaleAtMinDist) / (MaxDist - MinDist); + ScalingY_Intercept = ScaleAtMaxDist - (MaxDist * ScalingMagnitude); + if (PlayersCam) SetActorTickEnabled(true); +} + +// Called every frame +void AWaypointActor::Tick(float DeltaTime) +{ + Super::Tick(DeltaTime); + + if (!PlayersCam) SetActorTickEnabled(false); + + FVector WaypointLoc = GetActorLocation(); + FVector PlayerCamLoc = PlayersCam->GetComponentLocation(); + + FRotator NewRot = UKismetMathLibrary::FindLookAtRotation(WaypointLoc, PlayerCamLoc); + SetActorRotation(NewRot); + + float DistanceToPlayer = FVector::Distance(WaypointLoc, PlayerCamLoc); + // S for Scale + float S = (DistanceToPlayer * ScalingMagnitude) + ScalingY_Intercept; + S = FMath::Clamp(S, ScaleAtMinDist, ScaleAtMaxDist); + SetActorScale3D(FVector(1.f, S, S)); +} + diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h new file mode 100644 index 00000000..0dba8a7b --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h @@ -0,0 +1,47 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "Camera/CameraComponent.h" +#include "GameFramework/Actor.h" +#include "WaypointActor.generated.h" + +UCLASS() +class ENDLESSVENDETTA_API AWaypointActor : public AActor +{ + GENERATED_BODY() + + UCameraComponent* PlayersCam; + + float ScalingMagnitude; + + float ScalingY_Intercept; + + UPROPERTY(EditDefaultsOnly, Category = "Waypoint Scaling") + float MaxDist = 8000.f; + + UPROPERTY(EditDefaultsOnly, Category = "Waypoint Scaling") + float ScaleAtMaxDist = 8.f; + + UPROPERTY(EditDefaultsOnly, Category = "Waypoint Scaling") + float MinDist = 900.f; + + UPROPERTY(EditDefaultsOnly, Category = "Waypoint Scaling") + float ScaleAtMinDist = 0.15; + +protected: + // Called when the game starts or when spawned + virtual void BeginPlay() override; + +public: + // Sets default values for this actor's properties + AWaypointActor(); + + // Called every frame + virtual void Tick(float DeltaTime) override; + + UFUNCTION(BlueprintImplementableEvent) + void SetupWaypoint(UTexture2D* Icon, const FString& Desc); + +}; From 6c1c5ca12ea37da7f123efbe6580ac6f2a23ab21 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Thu, 19 Oct 2023 16:44:35 +0100 Subject: [PATCH 18/27] Added New AR Test & Started working on switching system --- .../Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- .../BaseWeapons/AssaultRifles/BP_ARTEST1.uasset | 3 +++ .../AssaultRifles/BP_BaseAssaultRifle.uasset | 4 ++-- .../EndlessVendetta/EndlessVendettaCharacter.cpp | 14 ++++++++++++-- .../EndlessVendetta/EndlessVendettaCharacter.h | 8 +++++--- .../WeaponSystem/BaseWeaponClass.cpp | 16 +++++++++++++++- .../WeaponSystem/BaseWeaponClass.h | 2 ++ 7 files changed, 41 insertions(+), 10 deletions(-) create mode 100644 EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index f851630e..ef5cc606 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:fb7eb23a18c0ad9f5cf37ae72d45bac1d1b1d90fac9281cfa3e3233b9b6a3d44 -size 42950 +oid sha256:dfeced37123c7e12907f8c5c3882aa970013d96167d07df1d71a464e2f91fd0d +size 42429 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset new file mode 100644 index 00000000..777ad054 --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:00849c635d8e843e1520e12a92f95fd99d9b29e670718919dc847fa283ecc3c9 +size 40704 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset index 4efa20ad..14593b0f 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7cb927b0b7296205adad620a38f473c36b2ee787fa7d4c6b12009a4aaf549e9 -size 40029 +oid sha256:f9481ef86ac85568b121922e82b67586cd754928de5fa47e2c8ef57066b514b3 +size 40119 diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index f8deed82..b752c8e2 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -84,7 +84,6 @@ void AEndlessVendettaCharacter::WeaponPickUpSystem() if (!GetWorld()->LineTraceSingleByChannel(OutHit, LT_Start, LT_End, ECC_Camera, QueryParams)) return; AActor* HitActor = OutHit.GetActor(); - UE_LOG(LogTemp, Warning, TEXT("Hit actor: %s"), *HitActor->GetName()); IInteractionInterface* InteractableActor = Cast(HitActor); if (InteractableActor) InteractableActor->InteractPrompt(); } @@ -144,7 +143,11 @@ void AEndlessVendettaCharacter::Interact() AActor* HitActor = OutHit.GetActor(); UE_LOG(LogTemp, Warning, TEXT("Hit actor: %s"), *HitActor->GetName()); IInteractionInterface* InteractableActor = Cast(HitActor); - if (InteractableActor) InteractableActor->Interact(); + if (InteractableActor) + { + InteractableActor->Interact(); + WeaponSwitcher(OutHit); + } } @@ -271,6 +274,13 @@ void AEndlessVendettaCharacter::EquipSecondary() SecondaryWeapon = Cast(SecondaryWeaponActor); } +void AEndlessVendettaCharacter::WeaponSwitcher(FHitResult Outhit) +{ + if (IsValid(PrimaryWeapon)) PrimaryWeapon->Destroy(); + PrimaryWeapon = Cast(Outhit.GetActor()); + Outhit.GetActor()->Destroy(); +} + //Calls the fire function in the baseWeaponClass void AEndlessVendettaCharacter::FireCaller() { diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h index fd54fc40..9c3468d9 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h @@ -148,9 +148,6 @@ protected: void ToggleRecon(); void ToggleCombat(); - void EquipPrimary(); - void EquipSecondary(); - UPROPERTY(EditDefaultsOnly, Category = "Interaction") float InteractionRange = 250; void Interact(); @@ -175,4 +172,9 @@ public: virtual float TakeDamage(float DamageAmount, FDamageEvent const& DamageEvent, AController* EventInstigator, AActor* DamageCauser) override; void WeaponPickUpSystem(); + + void EquipPrimary(); + void EquipSecondary(); + + void WeaponSwitcher(FHitResult Outhit); }; diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp index ba95f360..503fd58b 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp @@ -232,15 +232,29 @@ void ABaseWeaponClass::WeaponReload() void ABaseWeaponClass::Interact() { + if(!IsValid(this)) return; GLog->Log("Interact Called"); } void ABaseWeaponClass::InteractPrompt() { WeaponStatsPopUp(); - UE_LOG(LogTemp, Warning, TEXT("InteractPrompt setup")) } +// void ABaseWeaponClass::GetOutHit(FHitResult OutHit) +// { +// if(IsValid(this)) +// { +// endlessVendettaChar->PrimaryWeapon->Destroy(); +// } +// if (OutHit.GetActor()->ActorHasTag(FName("AssaultRifle"))) +// { +// endlessVendettaChar->EquipPrimary(); +// } +// //HitActor = Cast(endlessVendettaChar->PrimaryWeaponClass); +// //endlessVendettaChar->PrimaryWeapon = Cast(HitActor); +// } + diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h index f09b4492..caed9bb1 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h @@ -168,6 +168,8 @@ public: UFUNCTION(BlueprintImplementableEvent) void WeaponStatsPopUp(); + //void GetOutHit(FHitResult OutHit); + protected: UArrowComponent* GunStartArrow; bool bStopShooting = false; From a45b7488ba45dedb8449ed4e3e671d9f3db811aa Mon Sep 17 00:00:00 2001 From: MH261677 Date: Thu, 19 Oct 2023 17:38:18 +0100 Subject: [PATCH 19/27] Working weapon switching --- .../Blueprints/BP_FirstPersonCharacter.uasset | 4 +-- .../BaseWeapons/BP_BaseWeapon.uasset | 4 +-- .../Pistols/BP_BasePistolWeapon.uasset | 4 +-- .../BaseWeapons/WBP_AmmoCount.uasset | 4 +-- .../LevelPrototyping/Scenes/TutorialHit.umap | 4 +-- .../EndlessVendettaCharacter.cpp | 27 ++++++++++++------- .../EndlessVendettaCharacter.h | 2 +- .../WeaponSystem/BaseWeaponClass.cpp | 5 ++-- 8 files changed, 31 insertions(+), 23 deletions(-) diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index ef5cc606..1378ceef 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:dfeced37123c7e12907f8c5c3882aa970013d96167d07df1d71a464e2f91fd0d -size 42429 +oid sha256:2ffa922873f3999c8ef2d7ff492cedee047c6e06cc8b56c6ee9aaeab08d8fbad +size 42684 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset index cac2db11..af5ea1b4 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5ee53e7d84e4e0a3a6941011ad8a3c2718afe0bad7e95cf23f7cc1063476f53 -size 124677 +oid sha256:5e1e829f4770985384af4baf7f94ed5089f11e12ec69b2ec09fb5f193a1ab960 +size 124465 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset index 206389d1..f54627fd 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a94e9d1b1b74a330a53970bbb11f1357c02996a00a31d4bdafc5c9313759fb2 -size 49286 +oid sha256:5aebaef6e44e3ebd6edf9b98ada3bdc65e43a0e7372ac8545eee7d3f5f535e21 +size 125647 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset index b4d8011b..ff0850c9 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc183a9d9781ca6800fa345b6428f7bf41953180f79e74b96c894a33b9d789e9 -size 64773 +oid sha256:4aef926e64cc0bd15cd6df6c9683311954a37d3a4576cd79a564efe16ef7920d +size 64353 diff --git a/EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap b/EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap index 50e7b151..3ff2d458 100644 --- a/EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap +++ b/EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57903d1174f13c4e930113e1f5aba86389d1568b4e42193474fec9da7cfd55aa -size 301943 +oid sha256:a81357c429cab843eb8ff42acc335aa7e0ee24d4d441286eb3d80b04a70b1231 +size 307063 diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index b752c8e2..e3285c39 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -138,16 +138,19 @@ void AEndlessVendettaCharacter::Interact() QueryParams.AddIgnoredActor(this); FVector LT_Start = FirstPersonCameraComponent->GetComponentLocation(); FVector LT_End = LT_Start + (FirstPersonCameraComponent->GetForwardVector() * InteractionRange); + if(IsValid(PrimaryWeapon)) + { + QueryParams.AddIgnoredActor(PrimaryWeapon); + } + if(IsValid(SecondaryWeapon)) + { + QueryParams.AddIgnoredActor(SecondaryWeapon); + } if (!GetWorld()->LineTraceSingleByChannel(OutHit, LT_Start, LT_End, ECC_Camera, QueryParams)) return; - AActor* HitActor = OutHit.GetActor(); UE_LOG(LogTemp, Warning, TEXT("Hit actor: %s"), *HitActor->GetName()); IInteractionInterface* InteractableActor = Cast(HitActor); - if (InteractableActor) - { - InteractableActor->Interact(); - WeaponSwitcher(OutHit); - } + if (InteractableActor) InteractableActor->Interact(); } @@ -274,11 +277,15 @@ void AEndlessVendettaCharacter::EquipSecondary() SecondaryWeapon = Cast(SecondaryWeaponActor); } -void AEndlessVendettaCharacter::WeaponSwitcher(FHitResult Outhit) +void AEndlessVendettaCharacter::WeaponSwitcher(AActor* Outhit) { - if (IsValid(PrimaryWeapon)) PrimaryWeapon->Destroy(); - PrimaryWeapon = Cast(Outhit.GetActor()); - Outhit.GetActor()->Destroy(); + if (IsValid(PrimaryWeapon)) + { + EquipPrimary(); + } + PrimaryWeaponClass = Outhit->GetClass(); + Outhit->Destroy(); + EquipPrimary(); } //Calls the fire function in the baseWeaponClass diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h index 9c3468d9..a3d099ce 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h @@ -176,5 +176,5 @@ public: void EquipPrimary(); void EquipSecondary(); - void WeaponSwitcher(FHitResult Outhit); + void WeaponSwitcher(AActor* Outhit); }; diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp index 503fd58b..74dac6e0 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp @@ -234,6 +234,7 @@ void ABaseWeaponClass::Interact() { if(!IsValid(this)) return; GLog->Log("Interact Called"); + endlessVendettaChar->WeaponSwitcher(this); } void ABaseWeaponClass::InteractPrompt() @@ -251,8 +252,8 @@ void ABaseWeaponClass::InteractPrompt() // { // endlessVendettaChar->EquipPrimary(); // } -// //HitActor = Cast(endlessVendettaChar->PrimaryWeaponClass); -// //endlessVendettaChar->PrimaryWeapon = Cast(HitActor); +// AActor* HitActor = Cast(endlessVendettaChar->PrimaryWeaponClass); +// endlessVendettaChar->PrimaryWeapon = Cast(HitActor); // } From 97ac729dd52b01e46c2a46c372f030496fe21674 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek <34179rs@gmail.com> Date: Thu, 19 Oct 2023 18:28:33 +0100 Subject: [PATCH 20/27] Implemented First Two Checkpoints --- .../Checkpoints/BP_WeaponTable.uasset | 3 +++ .../Checkpoints/CP_CheckOutCQCRange.uasset | 3 +++ .../Checkpoints/CP_PickUpWeapons.uasset | 4 ++-- .../IntroCutscene/WBP_IntroCutscene.uasset | 4 ++-- .../MB_TutorialFacility.uasset | 4 ++-- .../Content/Levels/TrainingFacility.umap | 4 ++-- .../Architecture/Floor_400x400.uasset | 4 ++-- .../HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 4 ++-- .../PickUpGunTutorialCheckPoint.cpp | 9 +++++++++ .../CheckPoints/PickUpGunTutorialCheckPoint.h | 20 +++++++++++++++++++ .../BountySystem/CheckpointClass.h | 4 ++-- 11 files changed, 49 insertions(+), 14 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BP_WeaponTable.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutCQCRange.uasset create mode 100644 EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/PickUpGunTutorialCheckPoint.cpp create mode 100644 EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/PickUpGunTutorialCheckPoint.h diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BP_WeaponTable.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BP_WeaponTable.uasset new file mode 100644 index 00000000..8bbe2a74 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BP_WeaponTable.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:acb90ebb48fe601ce45980241ff3ed58a8eefb17c2447d154236917a5894a2ad +size 29632 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutCQCRange.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutCQCRange.uasset new file mode 100644 index 00000000..079cc2d5 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutCQCRange.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e984391ee0807ba5f38142009fa5b39a4cab04bc24a6bea79425f7415c329c9 +size 61638 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapons.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapons.uasset index 840c9d68..0366f5d3 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapons.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapons.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5c15f23ffe72a5addc71f6982edf1d60d246b1b4a174e9db4f737ee71480dfd -size 23100 +oid sha256:ab23608f919ecfc92215a4480723e0e1520ab11a2c64b7ce818aa7eba94dc263 +size 21392 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/WBP_IntroCutscene.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/WBP_IntroCutscene.uasset index 1dc0a9e5..9423ea04 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/WBP_IntroCutscene.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/WBP_IntroCutscene.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a7a738aafe69d411cab17f80fea465b635afdabd14e6df72feea23331cf45a8 -size 137946 +oid sha256:4d72553065b7759af8b25f2f70ded6db41e0f89f9d67aa11a19a9850ceca2562 +size 133720 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset index cdb5de9f..5e108b6c 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:264017fbfa9d46717dac13e666eef14f4d1732cd7a3e26ab4a91f5d381586757 -size 14244 +oid sha256:b09916d29e6da12f59b90803629e9497f462ec6e03fb1a25c314fe1cdcc1a56c +size 14438 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index fc188df6..db1b8d08 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50c23f300085d150ffc94cfe05fb67283e7a15ee0bdb526c4473aace7620aa97 -size 388285 +oid sha256:8d041dd81120eb99204c2ef8f33b5237f80a734ecca524159383263489dfadc1 +size 401728 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index c2a34afc..793e5136 100644 --- a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset +++ b/EndlessVendetta/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:387d11ae8ce183faabc7ea5ec79bf3ff3b1e7c8a885ed79564df665407a203bd +size 14831 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index 138b8d8d..0f990580 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:dbdee5fb4cee49c21e18629a5c34a184b942058f45eb244b319810963e616c2c -size 66790690 +oid sha256:bc35eb2d43a47427d30aba0196f9eac90d089dd3abca319528c5d25c83510d0d +size 72364642 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/PickUpGunTutorialCheckPoint.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/PickUpGunTutorialCheckPoint.cpp new file mode 100644 index 00000000..f08b99ca --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/PickUpGunTutorialCheckPoint.cpp @@ -0,0 +1,9 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "PickUpGunTutorialCheckPoint.h" + +void APickUpGunTutorialCheckPoint::Interact() +{ + BroadcastCompletion(); +} diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/PickUpGunTutorialCheckPoint.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/PickUpGunTutorialCheckPoint.h new file mode 100644 index 00000000..c7fb4973 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/PickUpGunTutorialCheckPoint.h @@ -0,0 +1,20 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "EndlessVendetta/InteractionInterface.h" +#include "EndlessVendetta/BountySystem/CheckpointClass.h" +#include "PickUpGunTutorialCheckPoint.generated.h" + +/** + * + */ +UCLASS() +class ENDLESSVENDETTA_API APickUpGunTutorialCheckPoint : public ACheckpointClass, public IInteractionInterface +{ + GENERATED_BODY() + + void Interact() override; + +}; diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h index 13f5c09a..fca979e4 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h @@ -28,6 +28,7 @@ class ENDLESSVENDETTA_API ACheckpointClass : public AActor AWaypointActor* WaypointActor; // ---------------------------------------- +protected: UFUNCTION(BlueprintCallable, Category = "Checkpoint") void BroadcastCompletion() @@ -35,8 +36,7 @@ class ENDLESSVENDETTA_API ACheckpointClass : public AActor UE_LOG(LogTemp, Warning, TEXT("Completed Checkpoint")); CompletedCheckpoint.Broadcast(); } - -protected: + // Called when the game starts or when spawned virtual void BeginPlay() override; From bae8955a27c2d70fd7869df95adeec5bcc14b4a6 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek <34179rs@gmail.com> Date: Fri, 20 Oct 2023 14:42:12 +0100 Subject: [PATCH 21/27] Fixed Waypoint Appearing for Inactive Checkpoints --- .../Source/EndlessVendetta/BountySystem/BountyClass.cpp | 2 ++ .../Source/EndlessVendetta/BountySystem/CheckpointClass.cpp | 6 +++++- .../Source/EndlessVendetta/BountySystem/CheckpointClass.h | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp index fe2a8c58..d21ffbfe 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp @@ -48,6 +48,7 @@ void ABountyClass::SpawnCheckpoints() // Activate the first checkpoint and listen for its completion BountyCheckpoints[0]->Active = true; + BountyCheckpoints[0]->SpawnWaypoint(); BountyCheckpoints[0]->CompletedCheckpoint.AddDynamic(this, &ABountyClass::IncrementBountyCheckpoint); } @@ -84,6 +85,7 @@ void ABountyClass::IncrementBountyCheckpoint() // Set the new checkpoint in pos 0 to be active and listen for it's completion BountyCheckpoints[0]->Active = true; + BountyCheckpoints[0]->SpawnWaypoint(); BountyCheckpoints[0]->CompletedCheckpoint.AddDynamic(this, &ABountyClass::IncrementBountyCheckpoint); } diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp index 393b942b..f544c729 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp @@ -15,12 +15,16 @@ ACheckpointClass::ACheckpointClass() void ACheckpointClass::BeginPlay() { Super::BeginPlay(); +} + +void ACheckpointClass::SpawnWaypoint() +{ if (!IsValid(WaypointActorClass)) return; FActorSpawnParameters SpawnParams; SpawnParams.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn; WaypointActor = Cast(GetWorld()->SpawnActor(WaypointActorClass, WaypointLoc, GetActorRotation(), SpawnParams)); - WaypointActor->SetupWaypoint(WaypointIcon, CheckpointDescription); + WaypointActor->SetupWaypoint(WaypointIcon, CheckpointDescription); } // Called every frame diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h index fca979e4..d3a104ff 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h @@ -48,6 +48,8 @@ public: UPROPERTY(BlueprintReadOnly, Category = "Checkpoint") bool Active = false; + void SpawnWaypoint(); + // ------ Getters for CP Properties ------ FString GetCheckpointDesc() { From fb8ebc508864980513d870a3e536b795c5331270 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek <34179rs@gmail.com> Date: Fri, 20 Oct 2023 15:02:23 +0100 Subject: [PATCH 22/27] Implemented Temporary Gunrange Functionality to Tutorial Facility --- .../TutorialFacility/Checkpoints/CP_CheckOutCQCRange.uasset | 4 ++-- .../TutorialFacility/Checkpoints/CP_CheckOutLongRange.uasset | 3 +++ .../BountySystem/TutorialFacility/MB_TutorialFacility.uasset | 4 ++-- EndlessVendetta/Content/Levels/TrainingFacility.umap | 4 ++-- .../Content/StarterContent/Architecture/Floor_400x400.uasset | 4 ++-- .../Content/StarterContent/Props/MaterialSphere.uasset | 4 ++-- EndlessVendetta/Source/EndlessVendetta/AI/EnemyCharacter.h | 1 + 7 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutLongRange.uasset diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutCQCRange.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutCQCRange.uasset index 079cc2d5..88d79855 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutCQCRange.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutCQCRange.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e984391ee0807ba5f38142009fa5b39a4cab04bc24a6bea79425f7415c329c9 -size 61638 +oid sha256:21c430ea55778c7514d18bacaebfb42b5f0d288be8e324f32c025f61cd83e1ab +size 144113 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutLongRange.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutLongRange.uasset new file mode 100644 index 00000000..24ea5bf8 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutLongRange.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eeba76adf00d39df5a039526f6f975901d037f4a78489fc3fe6f34e8b485c20c +size 152984 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset index 5e108b6c..9e1f36ef 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b09916d29e6da12f59b90803629e9497f462ec6e03fb1a25c314fe1cdcc1a56c -size 14438 +oid sha256:0743ea5f03e1c33a5c5de9e4f905def38f79efe78b417dc391b964e2f164f536 +size 14634 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index db1b8d08..13f7b40d 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d041dd81120eb99204c2ef8f33b5237f80a734ecca524159383263489dfadc1 -size 401728 +oid sha256:696dc86c40e6047a9988a58efb8c431dfafd11f6842cd997cb092c8101e5e2a5 +size 401729 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index 793e5136..c2a34afc 100644 --- a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset +++ b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:387d11ae8ce183faabc7ea5ec79bf3ff3b1e7c8a885ed79564df665407a203bd -size 14831 +oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 +size 14948 diff --git a/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset b/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset index 56bddfc9..1900b264 100644 --- a/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset +++ b/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a8777c01491888bba9f40eda9d2bed76a611f0e80f75917501ce69c1a321342 -size 47333 +oid sha256:8fdf2542b4c88c882924b48d49eb795361ab9873a9150514267b93a016b1f0ea +size 47710 diff --git a/EndlessVendetta/Source/EndlessVendetta/AI/EnemyCharacter.h b/EndlessVendetta/Source/EndlessVendetta/AI/EnemyCharacter.h index 7b6f23f4..df2b2b89 100644 --- a/EndlessVendetta/Source/EndlessVendetta/AI/EnemyCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/AI/EnemyCharacter.h @@ -26,6 +26,7 @@ protected: public: // Called every frame virtual void Tick(float DeltaTime) override; + UFUNCTION(BlueprintCallable) void SubscribeToGroupAIEvents(class AAIControlHub* ControlHub); void SetLocalAlertLevel(int NewAlertLevel) const; From 3fe90716af3da82e79261ed628bc61839c7e0b09 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek <34179rs@gmail.com> Date: Sat, 21 Oct 2023 12:36:17 +0100 Subject: [PATCH 23/27] Added Parkour Checkpoint to Tutorial --- .../TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset | 3 +++ .../BountySystem/TutorialFacility/MB_TutorialFacility.uasset | 4 ++-- EndlessVendetta/Content/Levels/TrainingFacility.umap | 4 ++-- .../StarterContent/Blueprints/Blueprint_CeilingLight.uasset | 4 ++-- .../Content/StarterContent/Props/MaterialSphere.uasset | 4 ++-- 5 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset new file mode 100644 index 00000000..76d3c2c3 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4098d28d58e506d1cf7d0b06e91c078a8cc5e25eb3176f39fc97bf80bd9334e3 +size 38819 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset index 9e1f36ef..6e1c72f3 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0743ea5f03e1c33a5c5de9e4f905def38f79efe78b417dc391b964e2f164f536 -size 14634 +oid sha256:71f0890fcf786aec9a162787a57cc7eb35e99c52cd428abe0c481e3b9ffcefe0 +size 14826 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 13f7b40d..15dc4ff8 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:696dc86c40e6047a9988a58efb8c431dfafd11f6842cd997cb092c8101e5e2a5 -size 401729 +oid sha256:3d932b420f8bcdf0fd1f99de29aa8798995f820bc1e2b42ef3f5402cf4dde4ef +size 408508 diff --git a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset index c5c3b84e..599ff439 100644 --- a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset +++ b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a60a29ad596546d481e43dfb8698842a78cc07f4a4b1000fa397cfba4e72331 -size 158206 +oid sha256:14fbf76fb0c7252c3f7d8857a9937f9f047f43ad1022885d547a1e50d85f1867 +size 43745 diff --git a/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset b/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset index 1900b264..56bddfc9 100644 --- a/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset +++ b/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8fdf2542b4c88c882924b48d49eb795361ab9873a9150514267b93a016b1f0ea -size 47710 +oid sha256:3a8777c01491888bba9f40eda9d2bed76a611f0e80f75917501ce69c1a321342 +size 47333 From 88f5824f242058a9dcb2ecfc89650605bafe8d96 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek <34179rs@gmail.com> Date: Sat, 21 Oct 2023 14:30:56 +0100 Subject: [PATCH 24/27] Added Enter The Bounty Simulation Facility Checkpoint --- .../CP_EnterBountySimulationFacility.uasset | 3 +++ .../WBP_EnterSimulationCutscene.uasset | 3 +++ .../MB_TutorialFacility.uasset | 4 ++-- .../Content/Levels/TrainingFacility.umap | 4 ++-- .../Blueprints/Blueprint_CeilingLight.uasset | 4 ++-- .../HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 4 ++-- .../InteractableCP_CallBPEvent.cpp | 9 ++++++++ .../InteractableCP_CallBPEvent.h | 23 +++++++++++++++++++ 8 files changed, 46 insertions(+), 8 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_EnterBountySimulationFacility.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/WBP_EnterSimulationCutscene.uasset create mode 100644 EndlessVendetta/Source/EndlessVendetta/InteractableCP_CallBPEvent.cpp create mode 100644 EndlessVendetta/Source/EndlessVendetta/InteractableCP_CallBPEvent.h diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_EnterBountySimulationFacility.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_EnterBountySimulationFacility.uasset new file mode 100644 index 00000000..1e8d35f8 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_EnterBountySimulationFacility.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92908322c75ce1234362b21ada25476a28ee631859d30ad89df3ad654e205737 +size 77065 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/WBP_EnterSimulationCutscene.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/WBP_EnterSimulationCutscene.uasset new file mode 100644 index 00000000..faf0e8c8 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/WBP_EnterSimulationCutscene.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42595da531f4db98b51bb2fdb8f617a91fd9de728df25a64f47b7200947f884c +size 86733 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset index 6e1c72f3..d4cea426 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71f0890fcf786aec9a162787a57cc7eb35e99c52cd428abe0c481e3b9ffcefe0 -size 14826 +oid sha256:ad2c3fac00abe5849662523a1d0fd805b554a62a6600f9e9fee11c5c8b371697 +size 15046 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 15dc4ff8..599f7835 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d932b420f8bcdf0fd1f99de29aa8798995f820bc1e2b42ef3f5402cf4dde4ef -size 408508 +oid sha256:1e8f601f1c0be33c202b9bb03cd129eaa0c44466f712c644c4e4adaccc1d7297 +size 452373 diff --git a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset index 599ff439..c5c3b84e 100644 --- a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset +++ b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:14fbf76fb0c7252c3f7d8857a9937f9f047f43ad1022885d547a1e50d85f1867 -size 43745 +oid sha256:4a60a29ad596546d481e43dfb8698842a78cc07f4a4b1000fa397cfba4e72331 +size 158206 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index 0f990580..b2b61f27 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:bc35eb2d43a47427d30aba0196f9eac90d089dd3abca319528c5d25c83510d0d -size 72364642 +oid sha256:bc6f8d219a0c4995a971e55423f42065c3d648df5166d4e3152f18c9d2bc5947 +size 66790690 diff --git a/EndlessVendetta/Source/EndlessVendetta/InteractableCP_CallBPEvent.cpp b/EndlessVendetta/Source/EndlessVendetta/InteractableCP_CallBPEvent.cpp new file mode 100644 index 00000000..2765c4a1 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/InteractableCP_CallBPEvent.cpp @@ -0,0 +1,9 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "InteractableCP_CallBPEvent.h" + +void AInteractableCP_CallBPEvent::Interact() +{ + PlayerInteracted(); +} diff --git a/EndlessVendetta/Source/EndlessVendetta/InteractableCP_CallBPEvent.h b/EndlessVendetta/Source/EndlessVendetta/InteractableCP_CallBPEvent.h new file mode 100644 index 00000000..3c6dd6e6 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/InteractableCP_CallBPEvent.h @@ -0,0 +1,23 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "InteractionInterface.h" +#include "EndlessVendetta/BountySystem/CheckpointClass.h" +#include "InteractableCP_CallBPEvent.generated.h" + +/** + * + */ +UCLASS() +class ENDLESSVENDETTA_API AInteractableCP_CallBPEvent : public ACheckpointClass, public IInteractionInterface +{ + GENERATED_BODY() + + void Interact() override; + +protected: + UFUNCTION(BlueprintImplementableEvent) + void PlayerInteracted(); +}; From b4c8ac75c67675015d420d90862f8d9136384c15 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek <34179rs@gmail.com> Date: Sat, 21 Oct 2023 17:08:53 +0100 Subject: [PATCH 25/27] Implemented Target Elimination Checkpoint --- .../TutorialFacility/Checkpoints/BP_WeaponTable.uasset | 4 ++-- .../Checkpoints/CP_ElimTutorialTarget.uasset | 3 +++ .../TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset | 3 +++ .../TutorialFacility/Checkpoints/CP_PickUpWeapons.uasset | 3 --- .../Enemies/BedroomEnemy/BE_TF_Bedroom.uasset | 3 +++ .../Enemies/BedroomEnemy/PP_TF_Bedroom.uasset | 3 +++ .../Enemies/DiningRoomEnemy/BE_TF_DiningRoom.uasset | 3 +++ .../Enemies/DiningRoomEnemy/PP_TF_DiningRoom.uasset | 3 +++ .../Enemies/LivingRoomEnemy/BE_TF_LivingRoom.uasset | 3 +++ .../Enemies/LivingRoomEnemy/PP_TF_LivingRoom.uasset | 3 +++ .../Enemies/OutsidePatrolEnemy/BE_TF_OutBack.uasset | 3 +++ .../Enemies/OutsidePatrolEnemy/PP_TF.uasset | 3 +++ .../Enemies/OutsidePatrolEnemy/PP_TF_OutBack.uasset | 3 +++ .../Enemies/OutsidePatrolEnemy/PP_TF_Outside.uasset | 3 +++ .../Enemies/RoamingEnemy/BE_TF_Roaming.uasset | 3 +++ .../Enemies/RoamingEnemy/PP_TF_Roaming.uasset | 3 +++ .../Enemies/TargetEnemy/BE_TF_Target.uasset | 3 +++ .../Enemies/TargetEnemy/PP_TF_Target.uasset | 3 +++ .../Enemies/UpstairsPatrolEnemy/BE_TF_Upstairs.uasset | 3 +++ .../Enemies/UpstairsPatrolEnemy/PP_TF_Upstairs.uasset | 3 +++ .../TutorialFacility/MB_TutorialFacility.uasset | 4 ++-- .../TrainingFacilityBountyDirector.uasset | 4 ++-- EndlessVendetta/Content/Levels/TrainingFacility.umap | 4 ++-- .../HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 4 ++-- .../Content/StarterContent/Materials/M_Wood_Pine.uasset | 4 ++-- .../StarterContent/Materials/M_Wood_Walnut.uasset | 4 ++-- .../Content/StarterContent/Props/MaterialSphere.uasset | 4 ++-- .../Source/EndlessVendetta/AI/AI_EnemyController.cpp | 6 ++++++ .../Source/EndlessVendetta/AI/AI_EnemyController.h | 3 +++ .../Source/EndlessVendetta/BountySystem/BountyClass.cpp | 2 ++ .../CheckPoints}/InteractableCP_CallBPEvent.cpp | 0 .../CheckPoints}/InteractableCP_CallBPEvent.h | 2 +- ...orialCheckPoint.cpp => InteractableCP_CompleteCP.cpp} | 4 ++-- ...nTutorialCheckPoint.h => InteractableCP_CompleteCP.h} | 4 ++-- .../EndlessVendetta/BountySystem/CheckpointClass.cpp | 9 +++++++++ .../EndlessVendetta/BountySystem/CheckpointClass.h | 7 ++++++- 36 files changed, 101 insertions(+), 25 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ElimTutorialTarget.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset delete mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapons.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/BedroomEnemy/BE_TF_Bedroom.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/BedroomEnemy/PP_TF_Bedroom.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/DiningRoomEnemy/BE_TF_DiningRoom.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/DiningRoomEnemy/PP_TF_DiningRoom.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/LivingRoomEnemy/BE_TF_LivingRoom.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/LivingRoomEnemy/PP_TF_LivingRoom.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/BE_TF_OutBack.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/PP_TF.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/PP_TF_OutBack.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/PP_TF_Outside.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/RoamingEnemy/BE_TF_Roaming.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/RoamingEnemy/PP_TF_Roaming.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/TargetEnemy/BE_TF_Target.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/TargetEnemy/PP_TF_Target.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/UpstairsPatrolEnemy/BE_TF_Upstairs.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/UpstairsPatrolEnemy/PP_TF_Upstairs.uasset rename EndlessVendetta/Source/EndlessVendetta/{ => BountySystem/CheckPoints}/InteractableCP_CallBPEvent.cpp (100%) rename EndlessVendetta/Source/EndlessVendetta/{ => BountySystem/CheckPoints}/InteractableCP_CallBPEvent.h (90%) rename EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/{PickUpGunTutorialCheckPoint.cpp => InteractableCP_CompleteCP.cpp} (55%) rename EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/{PickUpGunTutorialCheckPoint.h => InteractableCP_CompleteCP.h} (65%) diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BP_WeaponTable.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BP_WeaponTable.uasset index 8bbe2a74..fd66d6d4 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BP_WeaponTable.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BP_WeaponTable.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:acb90ebb48fe601ce45980241ff3ed58a8eefb17c2447d154236917a5894a2ad -size 29632 +oid sha256:00bbbb9790870bbe08879eec576c3c57f0eca6162cfe7063cb2f2a0c10b87a93 +size 29602 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ElimTutorialTarget.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ElimTutorialTarget.uasset new file mode 100644 index 00000000..448d77a6 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ElimTutorialTarget.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ff92e3fd19f5c6ab5990b04df89fdff800e92817c8590b51529b0d46b7aab46 +size 130912 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset new file mode 100644 index 00000000..4fb55c0f --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:142e42343ef7f5787e23c1d1681e6126c45ef7d93c53b7dc91512ec54e3820ec +size 30032 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapons.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapons.uasset deleted file mode 100644 index 0366f5d3..00000000 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapons.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ab23608f919ecfc92215a4480723e0e1520ab11a2c64b7ce818aa7eba94dc263 -size 21392 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/BedroomEnemy/BE_TF_Bedroom.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/BedroomEnemy/BE_TF_Bedroom.uasset new file mode 100644 index 00000000..a00b83d8 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/BedroomEnemy/BE_TF_Bedroom.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e288ec30f3b26b7bb4874519eca7cf2192fb9d2c09a84cb2dec4bcdff1044d1 +size 54626 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/BedroomEnemy/PP_TF_Bedroom.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/BedroomEnemy/PP_TF_Bedroom.uasset new file mode 100644 index 00000000..7d760e7c --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/BedroomEnemy/PP_TF_Bedroom.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:311f0f503d0da57fc6fbc985d867b9228f21a408771a2fc99529721c8e12c3a0 +size 13004 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/DiningRoomEnemy/BE_TF_DiningRoom.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/DiningRoomEnemy/BE_TF_DiningRoom.uasset new file mode 100644 index 00000000..f264227a --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/DiningRoomEnemy/BE_TF_DiningRoom.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34ede5014ff062f3380f92b939c6b4367cab00507155900653e87091ea9cfb90 +size 54658 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/DiningRoomEnemy/PP_TF_DiningRoom.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/DiningRoomEnemy/PP_TF_DiningRoom.uasset new file mode 100644 index 00000000..58c88511 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/DiningRoomEnemy/PP_TF_DiningRoom.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8b98d4f4b418d7e056899dc8153137c700342c0325dfc4d9bf126d84af445ca +size 13061 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/LivingRoomEnemy/BE_TF_LivingRoom.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/LivingRoomEnemy/BE_TF_LivingRoom.uasset new file mode 100644 index 00000000..8854b272 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/LivingRoomEnemy/BE_TF_LivingRoom.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:abb704094c43932bacf948aa6451819dd13a7b8a461381076432ac89d08be01e +size 54660 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/LivingRoomEnemy/PP_TF_LivingRoom.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/LivingRoomEnemy/PP_TF_LivingRoom.uasset new file mode 100644 index 00000000..65e00893 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/LivingRoomEnemy/PP_TF_LivingRoom.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:966e6cbe348de1734c26bbf2dfadc4238378765a962a155cb7aae81295fd83bb +size 13061 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/BE_TF_OutBack.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/BE_TF_OutBack.uasset new file mode 100644 index 00000000..4c891d07 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/BE_TF_OutBack.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d0078b843c7d067953620918f93d3f3834389e94368a10ff5cf64c072fc3a4d +size 54606 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/PP_TF.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/PP_TF.uasset new file mode 100644 index 00000000..12e36731 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/PP_TF.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc837363528efff7871b4dfcbdc89052ce58dee49ff3ab8fb3bfe7b95be9a05a +size 2682 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/PP_TF_OutBack.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/PP_TF_OutBack.uasset new file mode 100644 index 00000000..4bd16431 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/PP_TF_OutBack.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:406ab0ed0c686c21a00dda4b3d6e268eacf6bfc911cc5fbfc6615897e6e7f4ee +size 2674 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/PP_TF_Outside.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/PP_TF_Outside.uasset new file mode 100644 index 00000000..6cd3336f --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/PP_TF_Outside.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:731235fa24a1937da6099c8925abd34bbf99d4a1a6334c993c89f7a4b3114f0f +size 13791 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/RoamingEnemy/BE_TF_Roaming.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/RoamingEnemy/BE_TF_Roaming.uasset new file mode 100644 index 00000000..54bd64d3 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/RoamingEnemy/BE_TF_Roaming.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:94bfbbff8021abe73e75d71827e07c5baa766e501cabefaeae63ca1f588a7396 +size 54570 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/RoamingEnemy/PP_TF_Roaming.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/RoamingEnemy/PP_TF_Roaming.uasset new file mode 100644 index 00000000..67602f41 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/RoamingEnemy/PP_TF_Roaming.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:062d6ee93303344368b3401d4a0bd412fa1d1af6cc95a81607453054cc697d67 +size 13100 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/TargetEnemy/BE_TF_Target.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/TargetEnemy/BE_TF_Target.uasset new file mode 100644 index 00000000..d01a8310 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/TargetEnemy/BE_TF_Target.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d7bcf8d56e53185921c8a741fe0c75ba93c984c3bf5b8739973156a68297b9c +size 54821 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/TargetEnemy/PP_TF_Target.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/TargetEnemy/PP_TF_Target.uasset new file mode 100644 index 00000000..b7adcb40 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/TargetEnemy/PP_TF_Target.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:496b55e0f80f2e6208269215944632df3161f025bc5888e294cf92b6deb13a2b +size 12985 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/UpstairsPatrolEnemy/BE_TF_Upstairs.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/UpstairsPatrolEnemy/BE_TF_Upstairs.uasset new file mode 100644 index 00000000..a6d730c7 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/UpstairsPatrolEnemy/BE_TF_Upstairs.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a6053e080c36fbe43295469fb7ae72edf2aeb7c01f3f551d60e37275543b23a +size 54630 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/UpstairsPatrolEnemy/PP_TF_Upstairs.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/UpstairsPatrolEnemy/PP_TF_Upstairs.uasset new file mode 100644 index 00000000..9c71a224 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/UpstairsPatrolEnemy/PP_TF_Upstairs.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2f2065e357769a2642143c21eae5fea45a3a60dfe59706f944d18ffe930b205 +size 13071 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset index d4cea426..dd8fa710 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad2c3fac00abe5849662523a1d0fd805b554a62a6600f9e9fee11c5c8b371697 -size 15046 +oid sha256:d73138039ec29e349f1ba70f6e663c7df352a1d4bccf5df3625b9a30ce9c1ed0 +size 14064 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/TrainingFacilityBountyDirector.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/TrainingFacilityBountyDirector.uasset index ba4f67f6..35ada0bc 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/TrainingFacilityBountyDirector.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/TrainingFacilityBountyDirector.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50cf99064b7623a748d250be972c41b82a5abbdf16b677c12d0f77f076b8d208 -size 22391 +oid sha256:a1e75c64d6be90e7099664b99af6b8faab033decb1e269ab3e9f472e0e0fc2eb +size 22314 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 599f7835..01109aea 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e8f601f1c0be33c202b9bb03cd129eaa0c44466f712c644c4e4adaccc1d7297 -size 452373 +oid sha256:6c6110d8157a50cba88d602bfad783df68d380acef66c96145bd841c19096bdd +size 453717 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index b2b61f27..0f990580 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:bc6f8d219a0c4995a971e55423f42065c3d648df5166d4e3152f18c9d2bc5947 -size 66790690 +oid sha256:bc35eb2d43a47427d30aba0196f9eac90d089dd3abca319528c5d25c83510d0d +size 72364642 diff --git a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset index eafee70c..b806f261 100644 --- a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset +++ b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b12c6d7285dd95b1c5669e07fc665f8859a17ee78c51f139170726848c06ee67 -size 31142 +oid sha256:6370ba2220dd39e544670044b08f74bb1270b3ad784be59a4e3a770c9af63f21 +size 31267 diff --git a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset index 2e926194..57cff6fd 100644 --- a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset +++ b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8491e0b8978a41999e0f4fc6520cab088fcbe6ddf8b51655f34753aa45234c66 -size 20495 +oid sha256:fec1a4819a4a6320ab213058a07f234622cee347e705de6a8b90e7e94c2961db +size 20641 diff --git a/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset b/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset index 56bddfc9..d8b842b2 100644 --- a/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset +++ b/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a8777c01491888bba9f40eda9d2bed76a611f0e80f75917501ce69c1a321342 -size 47333 +oid sha256:126010c35504dc5096bcc51b3757550afdcb9b138500cf2e6691d4dd9bc510b5 +size 47710 diff --git a/EndlessVendetta/Source/EndlessVendetta/AI/AI_EnemyController.cpp b/EndlessVendetta/Source/EndlessVendetta/AI/AI_EnemyController.cpp index 3f343fa2..6d354168 100644 --- a/EndlessVendetta/Source/EndlessVendetta/AI/AI_EnemyController.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/AI/AI_EnemyController.cpp @@ -59,6 +59,12 @@ void AAI_EnemyController::Tick(float DeltaTime) } } +void AAI_EnemyController::AssignPatrolPathLate() +{ + Blackboard->SetValueAsBool("IsPatroling", true); +} + + void AAI_EnemyController::SetupPerceptionSystem() { SightConfig = CreateDefaultSubobject(TEXT("Sight Config")); diff --git a/EndlessVendetta/Source/EndlessVendetta/AI/AI_EnemyController.h b/EndlessVendetta/Source/EndlessVendetta/AI/AI_EnemyController.h index ae91c3f4..96c8aa8e 100644 --- a/EndlessVendetta/Source/EndlessVendetta/AI/AI_EnemyController.h +++ b/EndlessVendetta/Source/EndlessVendetta/AI/AI_EnemyController.h @@ -25,6 +25,9 @@ public: // Called every frame virtual void Tick(float DeltaTime) override; + UFUNCTION(BlueprintCallable) + void AssignPatrolPathLate(); + private: UPROPERTY() class UAISenseConfig_Sight* SightConfig; diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp index d21ffbfe..38d939c9 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp @@ -49,6 +49,7 @@ void ABountyClass::SpawnCheckpoints() // Activate the first checkpoint and listen for its completion BountyCheckpoints[0]->Active = true; BountyCheckpoints[0]->SpawnWaypoint(); + BountyCheckpoints[0]->CheckpointActivated(); BountyCheckpoints[0]->CompletedCheckpoint.AddDynamic(this, &ABountyClass::IncrementBountyCheckpoint); } @@ -86,6 +87,7 @@ void ABountyClass::IncrementBountyCheckpoint() // Set the new checkpoint in pos 0 to be active and listen for it's completion BountyCheckpoints[0]->Active = true; BountyCheckpoints[0]->SpawnWaypoint(); + BountyCheckpoints[0]->CheckpointActivated(); BountyCheckpoints[0]->CompletedCheckpoint.AddDynamic(this, &ABountyClass::IncrementBountyCheckpoint); } diff --git a/EndlessVendetta/Source/EndlessVendetta/InteractableCP_CallBPEvent.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/InteractableCP_CallBPEvent.cpp similarity index 100% rename from EndlessVendetta/Source/EndlessVendetta/InteractableCP_CallBPEvent.cpp rename to EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/InteractableCP_CallBPEvent.cpp diff --git a/EndlessVendetta/Source/EndlessVendetta/InteractableCP_CallBPEvent.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/InteractableCP_CallBPEvent.h similarity index 90% rename from EndlessVendetta/Source/EndlessVendetta/InteractableCP_CallBPEvent.h rename to EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/InteractableCP_CallBPEvent.h index 3c6dd6e6..99cc5cec 100644 --- a/EndlessVendetta/Source/EndlessVendetta/InteractableCP_CallBPEvent.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/InteractableCP_CallBPEvent.h @@ -3,8 +3,8 @@ #pragma once #include "CoreMinimal.h" -#include "InteractionInterface.h" #include "EndlessVendetta/BountySystem/CheckpointClass.h" +#include "EndlessVendetta/InteractionInterface.h" #include "InteractableCP_CallBPEvent.generated.h" /** diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/PickUpGunTutorialCheckPoint.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/InteractableCP_CompleteCP.cpp similarity index 55% rename from EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/PickUpGunTutorialCheckPoint.cpp rename to EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/InteractableCP_CompleteCP.cpp index f08b99ca..6c6e3aa8 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/PickUpGunTutorialCheckPoint.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/InteractableCP_CompleteCP.cpp @@ -1,9 +1,9 @@ // Fill out your copyright notice in the Description page of Project Settings. -#include "PickUpGunTutorialCheckPoint.h" +#include "InteractableCP_CompleteCP.h" -void APickUpGunTutorialCheckPoint::Interact() +void AInteractableCP_CompleteCP::Interact() { BroadcastCompletion(); } diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/PickUpGunTutorialCheckPoint.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/InteractableCP_CompleteCP.h similarity index 65% rename from EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/PickUpGunTutorialCheckPoint.h rename to EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/InteractableCP_CompleteCP.h index c7fb4973..ad93548a 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/PickUpGunTutorialCheckPoint.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/InteractableCP_CompleteCP.h @@ -5,13 +5,13 @@ #include "CoreMinimal.h" #include "EndlessVendetta/InteractionInterface.h" #include "EndlessVendetta/BountySystem/CheckpointClass.h" -#include "PickUpGunTutorialCheckPoint.generated.h" +#include "InteractableCP_CompleteCP.generated.h" /** * */ UCLASS() -class ENDLESSVENDETTA_API APickUpGunTutorialCheckPoint : public ACheckpointClass, public IInteractionInterface +class ENDLESSVENDETTA_API AInteractableCP_CompleteCP : public ACheckpointClass, public IInteractionInterface { GENERATED_BODY() diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp index f544c729..5562a2b8 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp @@ -27,6 +27,15 @@ void ACheckpointClass::SpawnWaypoint() WaypointActor->SetupWaypoint(WaypointIcon, CheckpointDescription); } +void ACheckpointClass::UpdateChecpointWaypoint(FString WaypointDesc, FVector WaypointNewLoc) +{ + FActorSpawnParameters SpawnParams; + SpawnParams.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn; + if (WaypointActor) WaypointActor->Destroy(); + WaypointActor = Cast(GetWorld()->SpawnActor(WaypointActorClass, WaypointNewLoc, GetActorRotation(), SpawnParams)); + WaypointActor->SetupWaypoint(WaypointIcon, WaypointDesc); +} + // Called every frame void ACheckpointClass::Tick(float DeltaTime) { diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h index d3a104ff..3086ca39 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h @@ -36,7 +36,9 @@ protected: UE_LOG(LogTemp, Warning, TEXT("Completed Checkpoint")); CompletedCheckpoint.Broadcast(); } - + + UFUNCTION(BlueprintCallable) + void UpdateChecpointWaypoint(FString WaypointDesc, FVector WaypointNewLoc); // Called when the game starts or when spawned virtual void BeginPlay() override; @@ -50,6 +52,9 @@ public: void SpawnWaypoint(); + UFUNCTION(BlueprintImplementableEvent) + void CheckpointActivated(); + // ------ Getters for CP Properties ------ FString GetCheckpointDesc() { From 7191dd7302fdae4e43277d1a355a9ac8fc0d1742 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek <34179rs@gmail.com> Date: Sat, 21 Oct 2023 20:23:13 +0100 Subject: [PATCH 26/27] Implemented Escape From The Area Checkpoint --- .../Content/BountySystem/BountyDirector/BountyDirector.uasset | 2 +- .../TutorialFacility/Checkpoints/CP_ElimTutorialTarget.uasset | 4 ++-- .../Checkpoints/CP_ExitBountySimulationFacility.uasset | 3 +++ .../TutorialFacility/Checkpoints/WBP_HiredCutscene.uasset | 3 +++ .../TutorialFacility/IntroCutscene/PlayersHomeShipImage.jpg | 3 +++ .../IntroCutscene/PlayersHomeShipImage.uasset | 3 +++ .../BountySystem/TutorialFacility/MB_TutorialFacility.uasset | 4 ++-- .../Content/BountySystem/Waypoint/BP_Waypoint.uasset | 4 ++-- EndlessVendetta/Content/Levels/NewMiamiTemp.umap | 3 +++ EndlessVendetta/Content/Levels/TrainingFacility.umap | 4 ++-- EndlessVendetta/Content/Ships/BP_HomeShip.uasset | 3 +++ .../Content/StarterContent/Materials/M_Wood_Pine.uasset | 4 ++-- .../Content/StarterContent/Materials/M_Wood_Walnut.uasset | 4 ++-- .../Content/StarterContent/Particles/P_Ambient_Dust.uasset | 4 ++-- .../Content/StarterContent/Props/MaterialSphere.uasset | 4 ++-- 15 files changed, 35 insertions(+), 17 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ExitBountySimulationFacility.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/WBP_HiredCutscene.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/PlayersHomeShipImage.jpg create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/PlayersHomeShipImage.uasset create mode 100644 EndlessVendetta/Content/Levels/NewMiamiTemp.umap create mode 100644 EndlessVendetta/Content/Ships/BP_HomeShip.uasset diff --git a/EndlessVendetta/Content/BountySystem/BountyDirector/BountyDirector.uasset b/EndlessVendetta/Content/BountySystem/BountyDirector/BountyDirector.uasset index a8ea05a4..2bf1b703 100644 --- a/EndlessVendetta/Content/BountySystem/BountyDirector/BountyDirector.uasset +++ b/EndlessVendetta/Content/BountySystem/BountyDirector/BountyDirector.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:29a1d4cf6379012b45e215995cc8014963f61fb618fbba839ce738f0633cff33 +oid sha256:cb434bd86f5440300a97827c0043b25f804e7648ac189615a90fb0ba61978060 size 22149 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ElimTutorialTarget.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ElimTutorialTarget.uasset index 448d77a6..cd4349b1 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ElimTutorialTarget.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ElimTutorialTarget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ff92e3fd19f5c6ab5990b04df89fdff800e92817c8590b51529b0d46b7aab46 -size 130912 +oid sha256:0c7d0ce998338688348954e6ad13f7bdc380875a7bea05aebddae30c4eb54144 +size 144405 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ExitBountySimulationFacility.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ExitBountySimulationFacility.uasset new file mode 100644 index 00000000..b341ac54 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ExitBountySimulationFacility.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd59f86788932ea7c2a0b171debaff99a819b2d5f94276320b95c1a5825991a7 +size 52271 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/WBP_HiredCutscene.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/WBP_HiredCutscene.uasset new file mode 100644 index 00000000..3abe2366 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/WBP_HiredCutscene.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ddfa2b5455c745aaf63af8000945f2696d2248d6f059347bd4c2dd927910baed +size 104895 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/PlayersHomeShipImage.jpg b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/PlayersHomeShipImage.jpg new file mode 100644 index 00000000..94dd13b9 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/PlayersHomeShipImage.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:840bd7e2cd3410b614e54f31a6800a637a3883a7d3d92b4d87d3d4142432a307 +size 140696 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/PlayersHomeShipImage.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/PlayersHomeShipImage.uasset new file mode 100644 index 00000000..f397cab5 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/PlayersHomeShipImage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e162459c5a175b20f92428ee0d8cfd3a2200d9a361864da545170d409bbe99dd +size 148157 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset index dd8fa710..8d4c6b85 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d73138039ec29e349f1ba70f6e663c7df352a1d4bccf5df3625b9a30ce9c1ed0 -size 14064 +oid sha256:4e770b6fe183a4185c8c7870d6e30c33edb4f4a9eb311760a010e3daaaa670bb +size 15464 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset index 0caa296f..090002c9 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b261ee9bb3d384362cc7fe462df6c011c322f91efb4722e3a8d1ed5a4e05c69c -size 47976 +oid sha256:25a58a287c0b4dc77f3e9bd3bde9fc9b9077deb1189e141c9e6161e75ff9d593 +size 49378 diff --git a/EndlessVendetta/Content/Levels/NewMiamiTemp.umap b/EndlessVendetta/Content/Levels/NewMiamiTemp.umap new file mode 100644 index 00000000..3b8d0ca0 --- /dev/null +++ b/EndlessVendetta/Content/Levels/NewMiamiTemp.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3006f6fb9769c48880863300d73a5a8b6fff1ea6b8e64ca2d115c3a66e33735f +size 105819 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 01109aea..b90e4750 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c6110d8157a50cba88d602bfad783df68d380acef66c96145bd841c19096bdd -size 453717 +oid sha256:ff5dfc4fa731abb78d04a51c72d2ddc89964001d26071efc1102c3751999ad8a +size 453718 diff --git a/EndlessVendetta/Content/Ships/BP_HomeShip.uasset b/EndlessVendetta/Content/Ships/BP_HomeShip.uasset new file mode 100644 index 00000000..2fcb8256 --- /dev/null +++ b/EndlessVendetta/Content/Ships/BP_HomeShip.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5adf54f06d91186e171b05251396919a7994ee9c88964a4a49a4743058b2df8b +size 38469 diff --git a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset index b806f261..6f0b0367 100644 --- a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset +++ b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6370ba2220dd39e544670044b08f74bb1270b3ad784be59a4e3a770c9af63f21 -size 31267 +oid sha256:25bf6d863adc48d1d3786062e9a29cd63d979fa716e5df6829d5bc55f6c28af4 +size 31298 diff --git a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset index 57cff6fd..ed52f264 100644 --- a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset +++ b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fec1a4819a4a6320ab213058a07f234622cee347e705de6a8b90e7e94c2961db -size 20641 +oid sha256:ea0d0b05164ae24c5f4f95ad5f3b59019e8d5b8da047c478486048c88bfe708f +size 20633 diff --git a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset index bf2e4391..a752812e 100644 --- a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset +++ b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01ef616c7a8bd90cd1b7a13efb18a56f33346efbae51efa31f09804478b7621d -size 43456 +oid sha256:6a4fe459ab35cb3c9ee04e4d070f0c2864db92fb1dc63eb53380fb4d3cc91613 +size 53268 diff --git a/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset b/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset index d8b842b2..56bddfc9 100644 --- a/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset +++ b/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:126010c35504dc5096bcc51b3757550afdcb9b138500cf2e6691d4dd9bc510b5 -size 47710 +oid sha256:3a8777c01491888bba9f40eda9d2bed76a611f0e80f75917501ce69c1a321342 +size 47333 From 9c57740b45afd801cb5d6419cbd34e178cd2f985 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Mon, 23 Oct 2023 11:13:23 +0100 Subject: [PATCH 27/27] Fixed Gun Stat Prompt Starting Spawned In --- .../IntroCutscene/PlayersHomeShipImage.uasset | 4 ++-- .../Content/BountySystem/Waypoint/TempMainBountyIcon.uasset | 4 ++-- .../Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset | 4 ++-- EndlessVendetta/Content/Levels/TrainingFacility.umap | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/PlayersHomeShipImage.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/PlayersHomeShipImage.uasset index f397cab5..efda48f0 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/PlayersHomeShipImage.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/PlayersHomeShipImage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e162459c5a175b20f92428ee0d8cfd3a2200d9a361864da545170d409bbe99dd -size 148157 +oid sha256:b8e6a8db373eb4fa31440f3ab4dc6b5e8f745540595237fd7b22fed4859aa8dc +size 148252 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/TempMainBountyIcon.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/TempMainBountyIcon.uasset index ecc25e4a..fd565c3c 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/TempMainBountyIcon.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/TempMainBountyIcon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:390c4b654a6b0b7d80e3324f08f237801727353022d6ae28926992cf0cf4e579 -size 211682 +oid sha256:3f3368bb73bdc87d7c608943acc9ae6c8163e32ae29bfaba6701eb8e6270123f +size 211777 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset index 88947b41..3c992595 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a45878c4f97b973894f65722a55015a06cb6acc25e913c9d4045fd4532176701 -size 192580 +oid sha256:b4ab6367925f65273a78ac37e31eea98096d127474edeb245b8ec54d07e5dbb3 +size 186618 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index b90e4750..3cf7c317 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff5dfc4fa731abb78d04a51c72d2ddc89964001d26071efc1102c3751999ad8a -size 453718 +oid sha256:f48102ee1f547f9038c66283968aab888bf3308cbf9b4897675dc13f387b7532 +size 456336