diff --git a/EndlessVendetta/Content/AI/PartyCrowd/Base/BP_PartyArea.uasset b/EndlessVendetta/Content/AI/PartyCrowd/Base/BP_PartyArea.uasset index 38c3cbd7..85228a29 100644 --- a/EndlessVendetta/Content/AI/PartyCrowd/Base/BP_PartyArea.uasset +++ b/EndlessVendetta/Content/AI/PartyCrowd/Base/BP_PartyArea.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca9dd6fc3e8c3832877edfcb1770e2022251ef98009d8d808c372cbf13f115e0 -size 63775 +oid sha256:4b7711721e4ac69734e98b538d8a4120895d5c9786407711f0065dc8a9bf7530 +size 98194 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/LevelSpecificCheckpoints/CP_ElimTImothyHuntsmer.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/LevelSpecificCheckpoints/CP_ElimTImothyHuntsmer.uasset index 0c36336d..136eecb0 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/LevelSpecificCheckpoints/CP_ElimTImothyHuntsmer.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/LevelSpecificCheckpoints/CP_ElimTImothyHuntsmer.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a69b5ac177318fba00ee4cbc5e3f7599db981ac6495b1c69984f3e63498d1a6 -size 100050 +oid sha256:8f0943f1ab63be65eac18beb5fd4f9af3957ac29977f8cabd411ee4b9dd9643e +size 99619 diff --git a/EndlessVendetta/Content/Levels/Apartment_hit.umap b/EndlessVendetta/Content/Levels/Apartment_hit.umap index ac7a2757..164606d1 100644 --- a/EndlessVendetta/Content/Levels/Apartment_hit.umap +++ b/EndlessVendetta/Content/Levels/Apartment_hit.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf0f521867ef8ae7f7d54e6b1d9323989f1d85d26684a947018e5003db2402d6 -size 1016921 +oid sha256:0268f573172a85cbed0ebff602394fe7429e5c00743043ae0c95a49bdc0ba94e +size 1017973 diff --git a/EndlessVendetta/EndlessVendetta.sln.DotSettings.user b/EndlessVendetta/EndlessVendetta.sln.DotSettings.user new file mode 100644 index 00000000..2b08f3a1 --- /dev/null +++ b/EndlessVendetta/EndlessVendetta.sln.DotSettings.user @@ -0,0 +1,2 @@ + + C:\Users\Rafal\AppData\Local\JetBrains\Rider2023.3\resharper-host\temp\Rider\vAny\CoverageData\_EndlessVendetta.-1253833435\Snapshot\snapshot.utdcvr \ No newline at end of file diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index 9e655970..5de27d68 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -413,6 +413,7 @@ void AEndlessVendettaCharacter::ToggleCombat() } GadgetManager->EquipCombat(); + EquippedWeapon.Broadcast(); } @@ -486,6 +487,7 @@ void AEndlessVendettaCharacter::EquipPrimary() bHasRifle = true; SetOverlayState(EOverlayState::AssaultRifle); TempEquippedPrimary(); + EquippedWeapon.Broadcast(); } } @@ -544,6 +546,7 @@ void AEndlessVendettaCharacter::EquipSecondary() bIsCurrentlyHoldingWeapon = true; SetOverlayState(EOverlayState::Pistol); GetWorldTimerManager().ClearTimer(SecondaryWeapon->reloadTimerHandle); + EquippedWeapon.Broadcast(); } } diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h index 1553a34d..8255dd6d 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h @@ -31,6 +31,8 @@ enum class EOverlayState : uint8 Sniper UMETA(DisplayName = "Sniper") }; +DECLARE_DYNAMIC_MULTICAST_DELEGATE(FEquippedWeapon); + UCLASS(config=Game) class AEndlessVendettaCharacter : public ACharacter { @@ -52,6 +54,9 @@ protected: UFUNCTION(BlueprintImplementableEvent) void ShowInteractPropmpt(); + UPROPERTY(BlueprintAssignable) + FEquippedWeapon EquippedWeapon; + private: /** First person camera */ UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = Camera, meta = (AllowPrivateAccess = "true")) @@ -101,7 +106,7 @@ private: UInputAction* SprintAction; UPROPERTY(EditAnywhere, Category = "Sensitivity") - float MouseSens = 1; + float MouseSens = 0.3; public: AEndlessVendettaCharacter();