diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index 25236c1e..49e89891 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -9,6 +9,13 @@ + + + + + + + diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index 173b36fe..8a5364f1 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:6b0713a508a47897e5751ea178e02c2d9627e12f34565f3a08f9a605b4ea2736 -size 455809 +oid sha256:4eb5c92180442aaa9dae7586d0d0effec22d5dc4ca432330aac7899e893ba608 +size 458530 diff --git a/EndlessVendetta/Content/Levels/MainMenuLevel.umap b/EndlessVendetta/Content/Levels/MainMenuLevel.umap index ee514e21..3680fc8b 100644 --- a/EndlessVendetta/Content/Levels/MainMenuLevel.umap +++ b/EndlessVendetta/Content/Levels/MainMenuLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd3739eda1c2496b7c5dc172fff7a588154fdcd821c612726eb87f03056f4d59 -size 298322 +oid sha256:fb7901ee6817276134b5a654dd76bdffbeec528eb8c6d20e2632dc2109b84a1b +size 299666 diff --git a/EndlessVendetta/Content/Levels/TempOpenWorld.umap b/EndlessVendetta/Content/Levels/TempOpenWorld.umap index eb20bf8b..5f12a7eb 100644 --- a/EndlessVendetta/Content/Levels/TempOpenWorld.umap +++ b/EndlessVendetta/Content/Levels/TempOpenWorld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72268ce2c312e91ebe26900c51cd832b04ab9575f17ebcf77940391fcbb5f1ec -size 13860483 +oid sha256:6aa987a4adaa4132382a1af348224f2ba5f444a7b030773bf82793802838143b +size 13860728 diff --git a/EndlessVendetta/Content/MainMenu/BP_MainSaveGame.uasset b/EndlessVendetta/Content/MainMenu/BP_MainSaveGame.uasset new file mode 100644 index 00000000..7293f3ec --- /dev/null +++ b/EndlessVendetta/Content/MainMenu/BP_MainSaveGame.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b13376b6f65cf5b384ddd7fed1bf5e9493e3781fdf90fab77ac437d77400f8ea +size 6083 diff --git a/EndlessVendetta/Content/MainMenu/Gameplay/MainMenuPlayerController.uasset b/EndlessVendetta/Content/MainMenu/Gameplay/MainMenuPlayerController.uasset index b92e3904..b4ff8728 100644 --- a/EndlessVendetta/Content/MainMenu/Gameplay/MainMenuPlayerController.uasset +++ b/EndlessVendetta/Content/MainMenu/Gameplay/MainMenuPlayerController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e43597b76b2e65851699082975c5d4d329bf07743e22ac19089e90b7c72b0a0 -size 81778 +oid sha256:e53b5a7db63663ecc7aa6f67855b9933f0a7e19b00d5f828c45e44e44729a0ca +size 138439 diff --git a/EndlessVendetta/Content/MainMenu/Widgets/WBP_MainMenu.uasset b/EndlessVendetta/Content/MainMenu/Widgets/WBP_MainMenu.uasset index a0aa11a1..289edced 100644 --- a/EndlessVendetta/Content/MainMenu/Widgets/WBP_MainMenu.uasset +++ b/EndlessVendetta/Content/MainMenu/Widgets/WBP_MainMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad2145bd0966472427ae089a6cd1bb36889010361d292d8db90663410e96e909 -size 76701 +oid sha256:bb7364e8bc0576814cbb1332a7dc1c0468f3a04d683b98e4b117b2cab0033bf1 +size 114749 diff --git a/EndlessVendetta/Content/StarterContent/Audio/Collapse01.uasset b/EndlessVendetta/Content/StarterContent/Audio/Collapse01.uasset index 5e3ff30e..77bff400 100644 --- a/EndlessVendetta/Content/StarterContent/Audio/Collapse01.uasset +++ b/EndlessVendetta/Content/StarterContent/Audio/Collapse01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:85c827023ee4b466228ec65e92b4b4a0415a106de041ac1c2cab481a2a5dfa8d -size 348532 +oid sha256:daf33f5c8c538d4454a1c4e29006d0c94de0bdb68e394a4364edf543b61905d3 +size 353648 diff --git a/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset b/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset index 9e0086d5..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:15d4eb8d338ada66c517c7456f15f4382c8b63ccb2bb10170cd5b6b9a7fae19e -size 47710 +oid sha256:3a8777c01491888bba9f40eda9d2bed76a611f0e80f75917501ce69c1a321342 +size 47333 diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp index 61d9e08f..c43e3494 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp @@ -10,8 +10,6 @@ void ABountyHunterCharacter::SpawnBounties() if (MainBountyClasses.IsEmpty() || !IsValid(MainBountyClasses[CurrentMainBountyIndex])) return; UE_LOG(LogTemp, Warning, TEXT("Spawning Bounty...")); - - UGameplayStatics::save CurrentMainBounty = GetWorld()->SpawnActor(MainBountyClasses[CurrentMainBountyIndex]); const FAttachmentTransformRules AttachmentTransformRules(EAttachmentRule::SnapToTarget, true); diff --git a/EndlessVendetta/Source/EndlessVendetta/MainSaveGameClass.cpp b/EndlessVendetta/Source/EndlessVendetta/MainSaveGameClass.cpp new file mode 100644 index 00000000..dc698695 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/MainSaveGameClass.cpp @@ -0,0 +1,5 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "MainSaveGameClass.h" + diff --git a/EndlessVendetta/Source/EndlessVendetta/MainSaveGameClass.h b/EndlessVendetta/Source/EndlessVendetta/MainSaveGameClass.h new file mode 100644 index 00000000..3f9d5606 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/MainSaveGameClass.h @@ -0,0 +1,22 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "GameFramework/SaveGame.h" +#include "MainSaveGameClass.generated.h" + +/** + * + */ +UCLASS() +class ENDLESSVENDETTA_API UMainSaveGameClass : public USaveGame +{ + GENERATED_BODY() + +public: + bool HasCompletedCurrentMainBounty_Save; + + int CurrentMainBountyIndex_Save; + +};