From 0c7afe2bb59192013bc39db9e3db9feb8cb62800 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Fri, 10 May 2024 19:35:13 +0100 Subject: [PATCH] Polished Greasy Rick --- .../ApartmentBounty/AI/GreasyRick/AI_GreasyRick.uasset | 4 ++-- .../ApartmentBounty/AI/GreasyRick/BP_GreasyRick.uasset | 4 ++-- .../AI/GreasyRick/Waypoint/BP_GreasyRickWaypoint.uasset | 4 ++-- .../OpenWorldCheckpoints/OWCP_ElimThugsAtTheMarket.uasset | 4 ++-- .../OpenWorldCheckpoints/OWCP_FollowGreasyRick.uasset | 4 ++-- .../OWCP_GoOverPlanWithGreasyRick.uasset | 4 ++-- .../OWCP_TalkToGreasyRickOutsideTheMarket.uasset | 4 ++-- .../OpenWorldCheckpoints/OWCP_TalkWithStranger.uasset | 4 ++-- .../Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset | 4 ++-- .../Workbench_UI/WBP_Workbench.uasset | 4 ++-- EndlessVendetta/Content/Levels/OpenWorldRework.umap | 4 ++-- .../StarterContent/Architecture/Floor_400x400.uasset | 4 ++-- .../StarterContent/Blueprints/Blueprint_CeilingLight.uasset | 4 ++-- .../EndlessVendetta/Characters/BountyHunterCharacter.cpp | 2 +- .../Source/EndlessVendetta/DialogueSystem/AC_Dialogue.h | 5 +++++ .../Source/EndlessVendetta/EndlessVendettaCharacter.cpp | 6 +----- 16 files changed, 33 insertions(+), 32 deletions(-) diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/AI_GreasyRick.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/AI_GreasyRick.uasset index 3cc9cb95..ce461dd0 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/AI_GreasyRick.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/AI_GreasyRick.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0b7181f04db7e3672ac4f69dd1b36fe71042c8741667dd9bbfea396fb26b702 -size 45308 +oid sha256:0f516c3216d814d15fd7429c9611fc32b52f4c959e3dae3f17cbf0f147093551 +size 46034 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/BP_GreasyRick.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/BP_GreasyRick.uasset index a2c91669..a2deb9d9 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/BP_GreasyRick.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/BP_GreasyRick.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e4708a9787d1249f550ecbc6c7d1f9fe2ef05f034515623dc6ac4576b5f2631 -size 167391 +oid sha256:7f98eb94b0fe16092c23712bb69f6171a2d0b7b1aa5beb3a8c8052447dd0adad +size 199294 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Waypoint/BP_GreasyRickWaypoint.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Waypoint/BP_GreasyRickWaypoint.uasset index 93242c83..47c2380a 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Waypoint/BP_GreasyRickWaypoint.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Waypoint/BP_GreasyRickWaypoint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e42b92883d3bcbfc1b4d46642fbed40a5dd91e27d8b9cf25eaf367a99b0346c9 -size 41050 +oid sha256:92f81fceb09fa5426e95e5bd3f09fee7031273622a9d5ba9ce94e18ac8909e84 +size 40994 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_ElimThugsAtTheMarket.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_ElimThugsAtTheMarket.uasset index 68dc0082..48de7ee4 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_ElimThugsAtTheMarket.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_ElimThugsAtTheMarket.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be29bc6768b5afc59cfd3fa6d713d07babb28d6791106ea5d683c53b105e8eb4 -size 135686 +oid sha256:1a0491dbb715d761f51a1469dd6da26cd977d90747fbb6c7c93f3ab474d034ef +size 143751 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_FollowGreasyRick.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_FollowGreasyRick.uasset index 46743159..c7abb0c8 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_FollowGreasyRick.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_FollowGreasyRick.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b201075b6299128beaccc4d8beb05b413bc982b04f90b684a0bc4ac836f8c76c -size 69070 +oid sha256:014ab8529e34de20c95356934406a88b9f90a629a8fbee058ef7ae349cb31316 +size 91862 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_GoOverPlanWithGreasyRick.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_GoOverPlanWithGreasyRick.uasset index 9370e23a..92ead818 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_GoOverPlanWithGreasyRick.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_GoOverPlanWithGreasyRick.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:783fff875b73e04b7a06aa7b050efc056bebeed2956f2414fea675a4e2dbbc12 -size 77690 +oid sha256:c721e48fa8b5ddde68275d29b9e63dc2a655c53774fa8aa88a317262febb59d7 +size 99339 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_TalkToGreasyRickOutsideTheMarket.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_TalkToGreasyRickOutsideTheMarket.uasset index 80daea92..470cbb9e 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_TalkToGreasyRickOutsideTheMarket.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_TalkToGreasyRickOutsideTheMarket.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e711954777be0822ef9185bc183299eb6acd89fe266c913a4295eada9d2184db -size 52784 +oid sha256:7bdfcdaefb35ac9d8a53fceac563da190b98e3a34979112328fed1af5202e333 +size 80347 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_TalkWithStranger.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_TalkWithStranger.uasset index 3b797c6b..0d303052 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_TalkWithStranger.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_TalkWithStranger.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3bf597513e3b3fc0e5fc182d067c1e9064a9313e950a11060fbcf8c4ad849f4 -size 62766 +oid sha256:ee3cd92aa6f7493350ef8df9962207b75157c41786039e707373112b45464ef7 +size 55056 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset index 8e05cbb9..1c0cae2b 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:516d59566172f77af5eb14a46b7ed7f08017d89ad3afb06360458a612bce99d6 -size 199161 +oid sha256:698644a0e32468a5a14de2ac04f7eb1a4dcffe79834b0d798f252c8b1b3b439a +size 190082 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset index acf50662..fb68f124 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:96119ee10f40e0f3f0e3854e7eaaa506c8ff2b9aa323ba6dbd23b7f68031a379 -size 555209 +oid sha256:0c6965c12453ad31a81fd13b0ac2027c12614b5bf59fe1e66da0607c17bfa8a3 +size 545265 diff --git a/EndlessVendetta/Content/Levels/OpenWorldRework.umap b/EndlessVendetta/Content/Levels/OpenWorldRework.umap index 893ba831..b19da649 100644 --- a/EndlessVendetta/Content/Levels/OpenWorldRework.umap +++ b/EndlessVendetta/Content/Levels/OpenWorldRework.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c73a11398ed33a2bc0e092e0b4d57d2a58620c843a15f5c501bb6ccbb4858b22 -size 45169031 +oid sha256:89f6eff292412bc8d44dbbc42266556843e79748e9c3e642204da745b95c88c0 +size 45362574 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index 25d3ac06..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:85c5b82c5facd7784cdd0a7a7d3b97fe85d26b6d8772a5f8764e1d348bf179ea -size 14831 +oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 +size 14948 diff --git a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset index c5c3b84e..58a48886 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:bec39c8c27008a50743dfb21b1be81be42cb5dc558492e10c9506b60b1784d6d +size 43745 diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp index 7029904d..b5fae2c7 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp @@ -133,7 +133,7 @@ void ABountyHunterCharacter::BeginPlay() UGameplayStatics::SaveGameToSlot(GI->MainSaveGameInstanceRef, "MainSave", 0); } InOpenWorld = true; - SpawnBikeUI(); + //SpawnBikeUI(); SpawnSideBounties(GI); if (GI->MainSaveGameInstanceRef->PlayerOpenWorldSpawnTransformSave.GetLocation() != FVector(0 ,0 ,0)) { diff --git a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_Dialogue.h b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_Dialogue.h index 0671f4b2..1767eed5 100644 --- a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_Dialogue.h +++ b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_Dialogue.h @@ -11,6 +11,7 @@ #include "Kismet/GameplayStatics.h" #include "AC_Dialogue.generated.h" +DECLARE_DYNAMIC_MULTICAST_DELEGATE(FStartedDialogue); UCLASS(ClassGroup=(Custom), meta=(BlueprintSpawnableComponent)) class ENDLESSVENDETTA_API UAC_Dialogue : public UActorComponent @@ -22,6 +23,9 @@ public: UPROPERTY(BlueprintReadWrite, EditDefaultsOnly, Category = "Dialogue") UDialogueTree* DialogueTree; + + UPROPERTY(BlueprintAssignable) + FStartedDialogue StartedDialogue; }; inline void UAC_Dialogue::Interact() const @@ -32,4 +36,5 @@ inline void UAC_Dialogue::Interact() const if (!IsValid(Cast(Character->GetComponentByClass(UAC_PlayerDialogueInterpreter::StaticClass())))) return; Cast(Character->GetComponentByClass(UAC_PlayerDialogueInterpreter::StaticClass()))->StartDialogue(DialogueTree); Character->bIsInDialogue = true; + StartedDialogue.Broadcast(); } diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index 3fd0666e..3461898b 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -326,10 +326,6 @@ void AEndlessVendettaCharacter::SetupPlayerInputComponent(class UInputComponent* //Interacting EnhancedInputComponent->BindAction(InteractAction, ETriggerEvent::Started, this, &AEndlessVendettaCharacter::Interact); - EnhancedInputComponent->BindAction(InteractAction, ETriggerEvent::Triggered, this, - &AEndlessVendettaCharacter::HoldInteract); - EnhancedInputComponent->BindAction(InteractAction, ETriggerEvent::Canceled, this, - &AEndlessVendettaCharacter::StoppedHoldingInteract); } } @@ -344,7 +340,7 @@ void AEndlessVendettaCharacter::Interact() NextDialogue(); return; } - StartedHoldingInteract(1.f / HoldForInteractionDuration); + //StartedHoldingInteract(1.f / HoldForInteractionDuration); if (PlayerOnShip) { SpaceShip->PlayerInteracting();