Updated Party NPCs to React to Player Equipping their Gun
This commit is contained in:
parent
11a4767a29
commit
b64e55a7db
BIN
EndlessVendetta/Content/AI/PartyCrowd/Base/BP_PartyArea.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/AI/PartyCrowd/Base/BP_PartyArea.uasset
(Stored with Git LFS)
Binary file not shown.
@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:5a69b5ac177318fba00ee4cbc5e3f7599db981ac6495b1c69984f3e63498d1a6
|
oid sha256:8f0943f1ab63be65eac18beb5fd4f9af3957ac29977f8cabd411ee4b9dd9643e
|
||||||
size 100050
|
size 99619
|
||||||
|
BIN
EndlessVendetta/Content/Levels/Apartment_hit.umap
(Stored with Git LFS)
BIN
EndlessVendetta/Content/Levels/Apartment_hit.umap
(Stored with Git LFS)
Binary file not shown.
2
EndlessVendetta/EndlessVendetta.sln.DotSettings.user
Normal file
2
EndlessVendetta/EndlessVendetta.sln.DotSettings.user
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
|
||||||
|
<s:String x:Key="/Default/Environment/Highlighting/HighlightingSourceSnapshotLocation/@EntryValue">C:\Users\Rafal\AppData\Local\JetBrains\Rider2023.3\resharper-host\temp\Rider\vAny\CoverageData\_EndlessVendetta.-1253833435\Snapshot\snapshot.utdcvr</s:String></wpf:ResourceDictionary>
|
@ -413,6 +413,7 @@ void AEndlessVendettaCharacter::ToggleCombat()
|
|||||||
}
|
}
|
||||||
|
|
||||||
GadgetManager->EquipCombat();
|
GadgetManager->EquipCombat();
|
||||||
|
EquippedWeapon.Broadcast();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -486,6 +487,7 @@ void AEndlessVendettaCharacter::EquipPrimary()
|
|||||||
bHasRifle = true;
|
bHasRifle = true;
|
||||||
SetOverlayState(EOverlayState::AssaultRifle);
|
SetOverlayState(EOverlayState::AssaultRifle);
|
||||||
TempEquippedPrimary();
|
TempEquippedPrimary();
|
||||||
|
EquippedWeapon.Broadcast();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -544,6 +546,7 @@ void AEndlessVendettaCharacter::EquipSecondary()
|
|||||||
bIsCurrentlyHoldingWeapon = true;
|
bIsCurrentlyHoldingWeapon = true;
|
||||||
SetOverlayState(EOverlayState::Pistol);
|
SetOverlayState(EOverlayState::Pistol);
|
||||||
GetWorldTimerManager().ClearTimer(SecondaryWeapon->reloadTimerHandle);
|
GetWorldTimerManager().ClearTimer(SecondaryWeapon->reloadTimerHandle);
|
||||||
|
EquippedWeapon.Broadcast();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -31,6 +31,8 @@ enum class EOverlayState : uint8
|
|||||||
Sniper UMETA(DisplayName = "Sniper")
|
Sniper UMETA(DisplayName = "Sniper")
|
||||||
};
|
};
|
||||||
|
|
||||||
|
DECLARE_DYNAMIC_MULTICAST_DELEGATE(FEquippedWeapon);
|
||||||
|
|
||||||
UCLASS(config=Game)
|
UCLASS(config=Game)
|
||||||
class AEndlessVendettaCharacter : public ACharacter
|
class AEndlessVendettaCharacter : public ACharacter
|
||||||
{
|
{
|
||||||
@ -52,6 +54,9 @@ protected:
|
|||||||
UFUNCTION(BlueprintImplementableEvent)
|
UFUNCTION(BlueprintImplementableEvent)
|
||||||
void ShowInteractPropmpt();
|
void ShowInteractPropmpt();
|
||||||
|
|
||||||
|
UPROPERTY(BlueprintAssignable)
|
||||||
|
FEquippedWeapon EquippedWeapon;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
/** First person camera */
|
/** First person camera */
|
||||||
UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = Camera, meta = (AllowPrivateAccess = "true"))
|
UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = Camera, meta = (AllowPrivateAccess = "true"))
|
||||||
@ -101,7 +106,7 @@ private:
|
|||||||
UInputAction* SprintAction;
|
UInputAction* SprintAction;
|
||||||
|
|
||||||
UPROPERTY(EditAnywhere, Category = "Sensitivity")
|
UPROPERTY(EditAnywhere, Category = "Sensitivity")
|
||||||
float MouseSens = 1;
|
float MouseSens = 0.3;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
AEndlessVendettaCharacter();
|
AEndlessVendettaCharacter();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user