Philip/AzureAbyss
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Bugfix Character Unable to Climb Stairs Consistently

Browse Source
This commit is contained in:
Philip W 2023-05-20 00:43:05 +01:00
parent bc98daea6f
commit 8108050bd6
9 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/Blueprints/Combat_UI/CombatCharacter.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Blueprints/Combat_UI/CombatInit.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Blueprints/Game_UI/WBP_IntroText.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Blueprints/Game_UI/WBP_Settings.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Blueprints/Player/BP_MyTempCharacter.uasset (Stored with Git LFS)
View File

Binary file not shown.

2
Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp
View File

@ -142,6 +142,7 @@ void UDialogueNPC::TickComponent(float DeltaTime, ELevelTick TickType, FActorCom
void UDialogueNPC::StartDialogue() void UDialogueNPC::StartDialogue()
{ {
Cast<ATempCharacter>(GetWorld()->GetFirstPlayerController()->GetPawn())->bIsInDialogue = true;
bIsInDialogue = true; bIsInDialogue = true;
Quests.Empty(); Quests.Empty();
BlueprintFunctions.Empty(); BlueprintFunctions.Empty();
@ -179,6 +180,7 @@ void UDialogueNPC::StartDialogue()
void UDialogueNPC::EndDialogue() void UDialogueNPC::EndDialogue()
{ {
Cast<ATempCharacter>(GetWorld()->GetFirstPlayerController()->GetPawn())->bIsInDialogue = false;
bIsInDialogue = false; bIsInDialogue = false;
TextAnimationTimerHandle.Invalidate(); TextAnimationTimerHandle.Invalidate();
DialogueWidgetInstance->RemoveFromParent(); DialogueWidgetInstance->RemoveFromParent();

12
Source/the_twilight_abyss/PlayerTemp/TempCharacter.h
View File

@ -21,6 +21,9 @@ public:
ATempCharacter(); ATempCharacter();
void ResetWidgetPointer() const; void ResetWidgetPointer() const;
UPROPERTY(BlueprintReadOnly)
bool bIsInDialogue = false;
protected: protected:
// Called when the game starts or when spawned // Called when the game starts or when spawned
virtual void BeginPlay() override; virtual void BeginPlay() override;
@ -45,8 +48,8 @@ public:
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Inventory, meta = (AllowPrivateAccess = "true")) UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Inventory, meta = (AllowPrivateAccess = "true"))
class UInventoryComponent* Inventory; //Using the InventoryComponent class class UInventoryComponent* Inventory; //Using the InventoryComponent class
// Called to bind functionality to input // Called to bind functionality to input
virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override; virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override;
@ -111,7 +114,7 @@ public:
UPROPERTY() UPROPERTY()
UUserWidget* ImportantStatsWidget; UUserWidget* ImportantStatsWidget;
UPROPERTY() UPROPERTY()
UUserWidget* CrossHairWidget; UUserWidget* CrossHairWidget;
@ -123,7 +126,7 @@ public:
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Widgets") UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Widgets")
UUserWidget* EscapeMenuWidget; UUserWidget* EscapeMenuWidget;
UPROPERTY(EditAnywhere, Category= "Widgets") UPROPERTY(EditAnywhere, Category= "Widgets")
TSubclassOf<UUserWidget> ImportantStatsSub; TSubclassOf<UUserWidget> ImportantStatsSub;
@ -137,7 +140,6 @@ public:
TSubclassOf<UUserWidget> CrossHairSub; TSubclassOf<UUserWidget> CrossHairSub;
private: private:
UPROPERTY() UPROPERTY()
FHitResult OutHit; FHitResult OutHit;

3
Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp
View File

@ -9,6 +9,7 @@
#include "Blueprint/UserWidget.h" #include "Blueprint/UserWidget.h"
#include "Camera/CameraComponent.h" #include "Camera/CameraComponent.h"
#include "Misc/OutputDeviceNull.h" #include "Misc/OutputDeviceNull.h"
#include "the_twilight_abyss/PlayerTemp/TempCharacter.h"
// Sets default values for this component's properties // Sets default values for this component's properties
@ -72,7 +73,7 @@ void UHoldToInitCombat::OnClickDown()
const AActor* PlayerActor = GetWorld()->GetFirstPlayerController()->GetPawn(); const AActor* PlayerActor = GetWorld()->GetFirstPlayerController()->GetPawn();
const UStaticMeshComponent* GunComponent = Cast<UStaticMeshComponent>(PlayerActor->GetComponentsByTag(UPrimitiveComponent::StaticClass(), FName("Gun"))[0]); const UStaticMeshComponent* GunComponent = Cast<UStaticMeshComponent>(PlayerActor->GetComponentsByTag(UPrimitiveComponent::StaticClass(), FName("Gun"))[0]);
const FVector GunLocationOffset = GunComponent->GetSocketTransform("Muzzle").GetLocation(); const FVector GunLocationOffset = GunComponent->GetSocketTransform("Muzzle").GetLocation();
UNiagaraFunctionLibrary::SpawnSystemAtLocation(GetWorld(), GunEffect, GunLocationOffset, PlayerActor->GetActorRotation()); UNiagaraFunctionLibrary::SpawnSystemAtLocation(GetWorld(), GunEffect, GunLocationOffset, Cast<ATempCharacter>(PlayerActor)->Controller->GetControlRotation());
FOutputDeviceNull AR; FOutputDeviceNull AR;
const FString Command = FString::Printf(TEXT("PlayCameraShakeShoot")); const FString Command = FString::Printf(TEXT("PlayCameraShakeShoot"));
this->GetOwner()->CallFunctionByNameWithArguments(*Command, AR, nullptr, true); this->GetOwner()->CallFunctionByNameWithArguments(*Command, AR, nullptr, true);

2
Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp
View File

@ -359,7 +359,7 @@ void ATurnBaseCombatV2::ExecuteCast(FString Combo)
{ {
const UStaticMeshComponent* GunComponent = Cast<UStaticMeshComponent>(PlayerActor->GetComponentsByTag(UPrimitiveComponent::StaticClass(), FName("Gun"))[0]); const UStaticMeshComponent* GunComponent = Cast<UStaticMeshComponent>(PlayerActor->GetComponentsByTag(UPrimitiveComponent::StaticClass(), FName("Gun"))[0]);
const FVector GunLocationOffset = GunComponent->GetSocketTransform("Muzzle").GetLocation(); const FVector GunLocationOffset = GunComponent->GetSocketTransform("Muzzle").GetLocation();
UNiagaraFunctionLibrary::SpawnSystemAtLocation(GetWorld(), GunEffect, GunLocationOffset, PlayerActor->GetActorRotation()); UNiagaraFunctionLibrary::SpawnSystemAtLocation(GetWorld(), GunEffect, GunLocationOffset, Cast<ATempCharacter>(PlayerActor)->Controller->GetControlRotation());
FOutputDeviceNull AR; FOutputDeviceNull AR;
const FString Command = FString::Printf(TEXT("PlayCameraShakeShoot")); const FString Command = FString::Printf(TEXT("PlayCameraShakeShoot"));
PlayerActor->CallFunctionByNameWithArguments(*Command, AR, nullptr, true); PlayerActor->CallFunctionByNameWithArguments(*Command, AR, nullptr, true);