diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ElimTutorialTarget.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ElimTutorialTarget.uasset index 5883a4f1..6f3dcce1 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ElimTutorialTarget.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ElimTutorialTarget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:727b8060f6720e1de8c6cc5aa95de4e3d2c18b4b6df469c5f1661679379f3054 -size 143152 +oid sha256:eafef3871610bf15d90d680c56e28c40ec4e54d5b735a02ae83706187362aed0 +size 144071 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset index a42c2499..597ba32f 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:09f78d33c2a88b48b438f3382f6db685a54203b9036a09f80f768b17e0c9d77d -size 74030 +oid sha256:cb5d6652ffbeb2dffe9d2c7bf7250396d62c63f29b58fafce029a1ee444d976a +size 74754 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ExitBountySimulationFacility.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ExitBountySimulationFacility.uasset index 478f5860..82b10472 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ExitBountySimulationFacility.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ExitBountySimulationFacility.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e7b67b89169f8856643fa54ad3ee70088d8e57278dda3eae8a67cebae80fc4d -size 49564 +oid sha256:5f20d01e14668043ceba3f5121d5441f9b10bf53ae9b329a67bc52ca2c23abe5 +size 50569 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset index 5d9c77b0..c1b4c121 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:760080e3e99953e11230e2d0611fe20c01daa1e6ea7ef3dd4c5923beb8fbc6a9 -size 38487 +oid sha256:20c146ca9121d08cc486f1d15b935101e2faad580974b40b32144f4f3cf466b6 +size 38506 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset index 9d450f09..80f6d632 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:285081531c73e061d3e6bc5def297852b57b5e3622c3e947cc0b8ceed5752f85 -size 61443 +oid sha256:c983ac6f5ed8e39f4fd28d0d35a06fc6b1d4569f0448a3e6672a1cc664e91175 +size 60950 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutCQCRange.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutCQCRange.uasset index 0fdaf894..b7080ef7 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutCQCRange.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutCQCRange.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5fccc1eabe3bc902abe338f8980b6f249f2578be80c1c8096a5232a132ba42c6 -size 148461 +oid sha256:9a329b5461ac74c60fb7e33cc1369d9985dfb5cf33c1f85ddf207a36f94e3fb8 +size 147979 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutLongRange.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutLongRange.uasset index 8ed828fc..ffe2f671 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutLongRange.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutLongRange.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76ea44d21affaf349e16f27cb6cb3684c9c14ae417f1096846b45711de2a8a3e -size 156411 +oid sha256:e035f7ddd3dcf755fb0ed071ba8d162c3a8b17bb9e5fe788443a35df5a0f5b21 +size 156499 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/CP_CombatTraining.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/CP_CombatTraining.uasset index af179740..36b8ab99 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/CP_CombatTraining.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/CP_CombatTraining.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f7376ac38e90dacafa36fd1b16bbf2227d0b577ba5ad53d43ce0d8df47bbf07 -size 46961 +oid sha256:e05c2b2a67900f795bea030cd060cb7ce55f4801f5573c5e4b5ab22ff5aa4198 +size 47609 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_GoDownstairs.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_GoDownstairs.uasset index a545465a..0edb31b5 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_GoDownstairs.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_GoDownstairs.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0cfa2881e250992ba5cc2fff1a9597d00531cb2732df8405f6b53d76ab675a7 -size 38882 +oid sha256:9f83c02b2613872e32f795c91ce190d44c2cfdf83785965105ed43d9e326ec7e +size 38762 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_ReconTraining.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_ReconTraining.uasset index c32db353..90dbb721 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_ReconTraining.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_ReconTraining.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52fa6f6a84ca059b3f9b57959ee3cfa352d0feb833b8a5d1603bae568c4d4d7d -size 46993 +oid sha256:8c6becce8ef63d5920459cc97049122bbd5c56ff7886c49fbbccd06f2f24d8f1 +size 47510 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset index ba8534c6..c1359493 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:04143e23cb9403f9ae001e7ab261a6c90a890df16f81eb00c35ae1e7305ed249 -size 49046 +oid sha256:5b3d88e0df1c929eb1c4bc13653d6a152930dc9ba8575709ea070bc05c3c26c7 +size 49098 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.png b/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.png new file mode 100644 index 00000000..d5781e4c --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d3cccd91fdbe7e0090f451048771e56d36dbe24c3cb716b63d99261f414f868 +size 2232177 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.uasset new file mode 100644 index 00000000..2bc1ea2a --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f709567521d482b2a611eeb383dde9b4b80fde46087b1e4687da6ef382afcdbb +size 1854378 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset index 09966a1a..cd5166a9 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b58d0ca6a59826731ad87a5a7fc10d3006d44eab8ccba7ef819e065a8c6da9c1 -size 30968 +oid sha256:deb3a67c2bba412bab8428522bf65087efd0927529eeafbb678dda460b6993ab +size 30376 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset index ece0d8c4..0a4f058e 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64fe64e549080d0ddf002d488c0e30412912c0088e529e0895ead72f976b2dad -size 79669 +oid sha256:1a92359cc39feb0549f88beb0aa498c448b67afac995e88ffa2de837ad2024ec +size 80434 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index e06ff1a2..752da19b 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:dcd44c870217e54259c4d1d8f70580c49d4ed89fb9b23ef05b894d9d4a9bd82b -size 649426 +oid sha256:35b3811ccb41bda48b54e51242d49687d08149d0c9440b4c4ddb7ff58aec8d25 +size 654848 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp index bfd9876e..1170079d 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp @@ -91,7 +91,7 @@ void ABountyClass::IncrementBountyCheckpoint() BountyCheckpoints[0]->CheckpointActivated(); BountyCheckpoints[0]->CompletedCheckpoint.AddDynamic(this, &ABountyClass::IncrementBountyCheckpoint); - Cast(GetWorld()->GetFirstPlayerController()->GetPawn())->CheckpointCompletedUI(BountyCheckpoints[0]->GetCheckpointDesc()); + Cast(GetWorld()->GetFirstPlayerController()->GetPawn())->CheckpointCompletedUI(BountyCheckpoints[0]->GetCheckpointTip()); } diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h index 2bc602b1..2797e996 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h @@ -19,6 +19,8 @@ class ENDLESSVENDETTA_API ACheckpointClass : public AActor UPROPERTY(EditDefaultsOnly, Category = "Checkpoint") FString CheckpointDescription; UPROPERTY(EditDefaultsOnly, Category = "Checkpoint") + FString CheckpointTip; + UPROPERTY(EditDefaultsOnly, Category = "Checkpoint") FVector WaypointLoc; UPROPERTY(EditDefaultsOnly, Category = "Checkpoint") UTexture2D* WaypointIcon; @@ -60,6 +62,10 @@ public: { return CheckpointDescription; } + FString GetCheckpointTip() + { + return CheckpointTip; + } FVector GetWaypointLoc() { return WaypointLoc;