Compare commits
3 Commits
afc30330a7
...
deabd0b223
Author | SHA1 | Date |
---|---|---|
baz | deabd0b223 | |
baz | 957867ecd4 | |
baz | 957da3946a |
BIN
Content/AnimStarterPack/ABP_Manequin.uasset (Stored with Git LFS)
BIN
Content/AnimStarterPack/ABP_Manequin.uasset (Stored with Git LFS)
Binary file not shown.
BIN
Content/AnimStarterPack/Throw_Montage.uasset (Stored with Git LFS)
BIN
Content/AnimStarterPack/Throw_Montage.uasset (Stored with Git LFS)
Binary file not shown.
BIN
Content/AnimStarterPack/dash_Montage.uasset (Stored with Git LFS)
BIN
Content/AnimStarterPack/dash_Montage.uasset (Stored with Git LFS)
Binary file not shown.
BIN
Content/Player/PlayerCharacter.uasset (Stored with Git LFS)
BIN
Content/Player/PlayerCharacter.uasset (Stored with Git LFS)
Binary file not shown.
|
@ -384,6 +384,8 @@ void UNakatomiCMC::PerformDash()
|
||||||
FQuat NewRotation = FRotationMatrix::MakeFromXZ(DashDirection, FVector::UpVector).ToQuat();
|
FQuat NewRotation = FRotationMatrix::MakeFromXZ(DashDirection, FVector::UpVector).ToQuat();
|
||||||
FHitResult Hit;
|
FHitResult Hit;
|
||||||
SafeMoveUpdatedComponent(FVector::ZeroVector, NewRotation, false, Hit);
|
SafeMoveUpdatedComponent(FVector::ZeroVector, NewRotation, false, Hit);
|
||||||
|
|
||||||
|
NakatomiCharacterOwner->PlayAnimMontage(Dash_Montage);
|
||||||
|
|
||||||
SetMovementMode(MOVE_Falling);
|
SetMovementMode(MOVE_Falling);
|
||||||
|
|
||||||
|
|
|
@ -94,6 +94,9 @@ class NAKATOMI_API UNakatomiCMC : public UCharacterMovementComponent
|
||||||
UPROPERTY(EditDefaultsOnly)
|
UPROPERTY(EditDefaultsOnly)
|
||||||
float Dash_CooldownDuration = 1.0f;
|
float Dash_CooldownDuration = 1.0f;
|
||||||
|
|
||||||
|
UPROPERTY(EditDefaultsOnly)
|
||||||
|
UAnimMontage* Dash_Montage;
|
||||||
|
|
||||||
bool Safe_bWantsToSprint;
|
bool Safe_bWantsToSprint;
|
||||||
bool Safe_bWantsToSlide;
|
bool Safe_bWantsToSlide;
|
||||||
bool Safe_bWantsToAds;
|
bool Safe_bWantsToAds;
|
||||||
|
|
|
@ -703,6 +703,8 @@ void APlayerCharacter::ThrowWeaponCallback()
|
||||||
{
|
{
|
||||||
if (CurrentWeapon)
|
if (CurrentWeapon)
|
||||||
{
|
{
|
||||||
|
PlayAnimMontage(ThrowAnimMontage);
|
||||||
|
|
||||||
FVector Location;
|
FVector Location;
|
||||||
FVector BoxExtent;
|
FVector BoxExtent;
|
||||||
GetActorBounds(true, Location, BoxExtent, false);
|
GetActorBounds(true, Location, BoxExtent, false);
|
||||||
|
@ -726,6 +728,8 @@ void APlayerCharacter::ThrowExplosiveCallback()
|
||||||
{
|
{
|
||||||
if (ThrowableInventory.Num() > 0)
|
if (ThrowableInventory.Num() > 0)
|
||||||
{
|
{
|
||||||
|
PlayAnimMontage(ThrowAnimMontage);
|
||||||
|
|
||||||
FVector Location;
|
FVector Location;
|
||||||
FVector BoxExtent;
|
FVector BoxExtent;
|
||||||
GetActorBounds(true, Location, BoxExtent, false);
|
GetActorBounds(true, Location, BoxExtent, false);
|
||||||
|
@ -759,3 +763,13 @@ bool APlayerCharacter::GetPressedJump()
|
||||||
{
|
{
|
||||||
return jumpPressed;
|
return jumpPressed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool APlayerCharacter::GetCrouched()
|
||||||
|
{
|
||||||
|
if (UNakatomiCMC* cmc = GetCharacterMovementComponent())
|
||||||
|
{
|
||||||
|
return cmc->IsCrouching();
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
|
@ -83,6 +83,9 @@ public:
|
||||||
|
|
||||||
FOnEnemyHitDelegate OnEnemyHit;
|
FOnEnemyHitDelegate OnEnemyHit;
|
||||||
|
|
||||||
|
UPROPERTY(EditDefaultsOnly)
|
||||||
|
UAnimMontage* ThrowAnimMontage;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
|
UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
|
||||||
float SprintSpeedMultiplier = 2.0f;
|
float SprintSpeedMultiplier = 2.0f;
|
||||||
|
@ -221,6 +224,9 @@ public:
|
||||||
UFUNCTION(BlueprintCallable)
|
UFUNCTION(BlueprintCallable)
|
||||||
bool GetPressedJump();
|
bool GetPressedJump();
|
||||||
|
|
||||||
|
UFUNCTION(BlueprintCallable)
|
||||||
|
bool GetCrouched();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void CalculateHits(TArray<FHitResult>* hits) override;
|
virtual void CalculateHits(TArray<FHitResult>* hits) override;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue