Merge branch 'Book-UI' into dev

Config/DefaultInput.ini

@@ -81,7 +81,7 @@ DoubleClickTime=0.200000
 +ActionMappings=(ActionName="Jump",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Bottom)
 +ActionMappings=(ActionName="Jump",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=SpaceBar)
 +ActionMappings=(ActionName="Interact",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=E)
-+ActionMappings=(ActionName="RightClick",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftMouseButton)
++ActionMappings=(ActionName="Click",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftMouseButton)
 +ActionMappings=(ActionName="Sneak",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftControl)
 +AxisMappings=(AxisName="Look Up / Down Gamepad",Scale=1.000000,Key=Gamepad_RightY)
 +AxisMappings=(AxisName="Look Up / Down Mouse",Scale=-1.000000,Key=MouseY)

Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp

@@ -28,6 +28,11 @@ ATempCharacter::ATempCharacter()
 void ATempCharacter::BeginPlay()
 {
 	Super::BeginPlay();
+
+	FirstPlayerController = GetWorld()->GetFirstPlayerController();
+	CombatSystem = Cast<ATurnBaseCombatV2>(GetWorld()->GetGameState());
+	WidgetPointer = Cast<UWidgetInteractionComponent>(this->GetComponentByClass(UWidgetInteractionComponent::StaticClass()));
+
 	Health = 100;
 	ThisCamera = Cast<UCameraComponent>(this->FindComponentByClass<UCameraComponent>());
 	PlayerCapsule = GetCapsuleComponent();
@@ -93,6 +98,13 @@ void ATempCharacter::Sneak()
 void ATempCharacter::Tick(float DeltaTime)
 {
 	Super::Tick(DeltaTime);
+	if (CombatSystem->bIsInCombat)
+	{
+		FVector VectorRotation;
+		FVector WidgetLocation;
+		FirstPlayerController->DeprojectMousePositionToWorld(WidgetLocation, VectorRotation);
+		WidgetPointer->SetWorldLocationAndRotation(WidgetLocation, VectorRotation.Rotation().Quaternion());
+	}
 }
 
 // Gives the character the functionality

Source/the_twilight_abyss/PlayerTemp/TempCharacter.h

@@ -7,6 +7,8 @@
 #include "the_twilight_abyss/BaseItems/Items/BaseItem.h"
 #include "Camera/CameraComponent.h"
 #include "Engine/PostProcessVolume.h"
+#include "Components/WidgetInteractionComponent.h"
+#include "../TurnBasedCombatV2/TurnBaseCombatV2.h"
 #include "TempCharacter.generated.h"
 
 UCLASS()
@@ -29,6 +31,12 @@ protected:
 	void Sneak();
 
 	UCapsuleComponent* PlayerCapsule;
+	UPROPERTY()
+	APlayerController* FirstPlayerController;
+	UPROPERTY()
+	UWidgetInteractionComponent* WidgetPointer;
+	UPROPERTY()
+	ATurnBaseCombatV2* CombatSystem;
 
 public:
 	// Called every frame

Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp

@@ -9,7 +9,6 @@
 #include "BehaviorTree/BlackboardComponent.h"
 #include "Components/TextBlock.h"
 #include "Components/ProgressBar.h"
-#include "GameFramework/Character.h"
 #include "Kismet/GameplayStatics.h"
 #include "the_twilight_abyss/PlayerTemp/TempCharacter.h"
 
@@ -36,6 +35,12 @@ ATurnBaseCombatV2::ATurnBaseCombatV2()
 void ATurnBaseCombatV2::StartCombat(AActor* Enemy)
 {
 	if (Enemy == nullptr) return;
+	if (bIsInCombat) return;
+	EscapePercentage = CalculateEscapePercentage();
+	EscapePercentageTextBlock->SetText(FText::Join(FText::FromString(""), FText::FromString(FString::FromInt(EscapePercentage * 100)), FText::FromString("%")));
+	const FVector2D ViewportSize = FVector2D(GEngine->GameViewport->Viewport->GetSizeXY());
+	GetWorld()->GetFirstPlayerController()->SetMouseLocation(ViewportSize.X / 2, ViewportSize.Y / 2);
+	bIsInCombat = true;
 	UBlackboardComponent* EnemyBlackboard = Cast<AAIController>(Enemy->GetInstigatorController())->GetBlackboardComponent();
 	if (!HasSeenTutorial)
 	{
@@ -62,7 +67,7 @@ void ATurnBaseCombatV2::StartCombat(AActor* Enemy)
 	}
 
 	if (HUD->IsInViewport()) return;
-	HUD->AddToViewport();
+	//HUD->AddToViewport();
 	EnemyActor = Enemy;
 
 	ProbertiumResource = 10;
@@ -71,13 +76,10 @@ void ATurnBaseCombatV2::StartCombat(AActor* Enemy)
 	IroquoidResource = 10;
 
 	//Disable Character Movement
-	if (ACharacter* PlayerCharacter = Cast<ACharacter>(GetWorld()->GetFirstPlayerController()->GetPawn()))
-	{
-		PlayerCharacter->DisableInput(GetWorld()->GetFirstPlayerController());
-	}
-	//Set to UI Mode Only
 	APlayerController* PlayerController = GetWorld()->GetFirstPlayerController();
-	PlayerController->SetInputMode(FInputModeUIOnly());
+	PlayerController->SetIgnoreMoveInput(true);
+	PlayerController->SetIgnoreLookInput(true);
+	PlayerController->SetInputMode(FInputModeGameAndUI());
 	PlayerController->bShowMouseCursor = true;
 
 	FVector Direction = Enemy->GetActorLocation() - PlayerActor->GetActorLocation();
@@ -98,8 +100,12 @@ void ATurnBaseCombatV2::StartCombat(AActor* Enemy)
 
 void ATurnBaseCombatV2::EndCombat()
 {
+	const FVector2D ViewportSize = FVector2D(GEngine->GameViewport->Viewport->GetSizeXY());
+	TurnIndicatorTextBlock->SetText(FText::FromString(""));
+	GetWorld()->GetFirstPlayerController()->SetMouseLocation(ViewportSize.X / 2, ViewportSize.Y / 2);
 	bEnemyHasExtraTurn = false;
 	bPlayerHasExtraTurn = false;
+	bIsInCombat = false;
 	for (UStatusEffect* StatusEffect : StatusEffects)
 	{
 		StatusEffect->OnExpiry(PlayerActor);
@@ -110,12 +116,10 @@ void ATurnBaseCombatV2::EndCombat()
 	PlayerPawn->bUseControllerRotationYaw = true;
 	PlayerPawn->bUseControllerRotationPitch = true;
 	//Enable Character Movement
-	if (ACharacter* PlayerCharacter = Cast<ACharacter>(GetWorld()->GetFirstPlayerController()->GetPawn()))
-	{
-		PlayerCharacter->EnableInput(GetWorld()->GetFirstPlayerController());
-	}
 	//Set to Game Mode Only
 	APlayerController* PlayerController = GetWorld()->GetFirstPlayerController();
+	PlayerController->SetIgnoreMoveInput(false);
+	PlayerController->SetIgnoreLookInput(false);
 	PlayerController->SetInputMode(FInputModeGameOnly());
 	PlayerController->bShowMouseCursor = false;
 }
@@ -123,6 +127,8 @@ void ATurnBaseCombatV2::EndCombat()
 void ATurnBaseCombatV2::BeginPlay()
 {
 	Super::BeginPlay();
+	const FVector2D ViewportSize = FVector2D(GEngine->GameViewport->Viewport->GetSizeXY());
+	GetWorld()->GetFirstPlayerController()->SetMouseLocation(ViewportSize.X / 2, ViewportSize.Y / 2);
 
 	TArray<AActor*> AllCharacterActorsInScene;
 
@@ -140,24 +146,25 @@ void ATurnBaseCombatV2::BeginPlay()
 	PlayerWidget->InitWidget();
 	BookHUD = PlayerWidget->GetWidget();
 
-	TurnIndicatorTextBlock = Cast<UTextBlock>(HUD->GetWidgetFromName("TurnIndicator"));
+	TurnIndicatorTextBlock = Cast<UTextBlock>(BookHUD->GetWidgetFromName("TurnIndicator"));
 	CurrentComboTextBlock = Cast<UTextBlock>(BookHUD->GetWidgetFromName("CurrentCombo"));
 	CurrentComboTextBlock1 = Cast<UTextBlock>(BookHUD->GetWidgetFromName("CurrentCombo_1"));
 	CurrentComboTextBlock2 = Cast<UTextBlock>(BookHUD->GetWidgetFromName("CurrentCombo_2"));
 	BattleLogTextBlock = Cast<UTextBlock>(HUD->GetWidgetFromName("BattleLog"));
+	EscapePercentageTextBlock = Cast<UTextBlock>(BookHUD->GetWidgetFromName("EscapePercentage_Text"));
 	PlayerHealthBar = Cast<UProgressBar>(BookHUD->GetWidgetFromName("PlayerHealthBar"));
 	EnemyHealthBar = Cast<UProgressBar>(HUD->GetWidgetFromName("EnemyHealthBar"));
 	ProbertiumResourceBar = Cast<UProgressBar>(BookHUD->GetWidgetFromName("ProbertiumResourceBar"));
 	EisResourceBar = Cast<UProgressBar>(BookHUD->GetWidgetFromName("EisResourceBar"));
 	AzosResourceBar = Cast<UProgressBar>(BookHUD->GetWidgetFromName("AzosResourceBar"));
 	IroquoidResourceBar = Cast<UProgressBar>(BookHUD->GetWidgetFromName("IroquoidResourceBar"));
-	CastButton = Cast<UButton>(HUD->GetWidgetFromName("CastButton"));
+	CastButton = Cast<UButton>(BookHUD->GetWidgetFromName("Cast_Button"));
-	PButton = Cast<UButton>(HUD->GetWidgetFromName("PButton"));
+	PButton = Cast<UButton>(BookHUD->GetWidgetFromName("Probertium_Button"));
-	EButton = Cast<UButton>(HUD->GetWidgetFromName("EButton"));
+	EButton = Cast<UButton>(BookHUD->GetWidgetFromName("Eis_Button"));
-	AButton = Cast<UButton>(HUD->GetWidgetFromName("AButton"));
+	AButton = Cast<UButton>(BookHUD->GetWidgetFromName("Azos_Button"));
-	IButton = Cast<UButton>(HUD->GetWidgetFromName("IButton"));
+	IButton = Cast<UButton>(BookHUD->GetWidgetFromName("Iroquoid_Button"));
-	BackspaceButton = Cast<UButton>(HUD->GetWidgetFromName("BackspaceButton"));
+	BackspaceButton = Cast<UButton>(BookHUD->GetWidgetFromName("Clear_Button"));
-	RunButton = Cast<UButton>(HUD->GetWidgetFromName("RunButton"));
+	RunButton = Cast<UButton>(BookHUD->GetWidgetFromName("Escape_Button"));
 	CastButton->OnClicked.AddDynamic(this, &ATurnBaseCombatV2::CastButtonOnClick);
 	PButton->OnClicked.AddDynamic(this, &ATurnBaseCombatV2::PButtonOnClick);
 	EButton->OnClicked.AddDynamic(this, &ATurnBaseCombatV2::EButtonOnClick);
@@ -217,7 +224,7 @@ void ATurnBaseCombatV2::ExecuteCast(FString Combo)
 		}
 	}
 
-	if (GunEffect)
+	if (GunEffect && !bIsInCombat)
 	{
 		const UStaticMeshComponent* GunComponent = Cast<UStaticMeshComponent>(PlayerActor->GetComponentsByTag(UPrimitiveComponent::StaticClass(), FName("Gun"))[0]);
 		const FVector GunLocationOffset = GunComponent->GetSocketTransform("Muzzle").TransformPosition(FVector(-100, 0, 0));
@@ -300,10 +307,14 @@ void ATurnBaseCombatV2::DamageEnemy(int Damage, FString DamageType)
 
 void ATurnBaseCombatV2::UpdateProgressBars() const
 {
-	//PlayerHealthBar->SetPercent(*PlayerHealth / 100.0f);
 	EnemyHealthBar->SetPercent(*EnemyHealth / 100.0f);
 }
 
+float ATurnBaseCombatV2::CalculateEscapePercentage() const
+{
+	return FMath::RandRange(0.1f, 0.9f);
+}
+
 bool ATurnBaseCombatV2::IsValidCombo(const FString Combo) const
 {
 	return ValidCombos.Contains(Combo);
@@ -415,32 +426,63 @@ void ATurnBaseCombatV2::BackspaceButtonOnClick()
 		GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Red, TEXT("Blank Combo"));
 		return;
 	}
-	ReuseActionPoint();
+	for (int i = 0; i < CurrentComboString.Len(); i++)
-	if (CurrentComboString.Right(1) == "P")
 	{
-		ProbertiumResource += 1;
+		if (CurrentComboString[i] == 'P')
+		{
+			ProbertiumResource += 1;
+		}
+		else if (CurrentComboString[i] == 'E')
+		{
+			EisResource += 1;
+		}
+		else if (CurrentComboString[i] == 'A')
+		{
+			AzosResource += 1;
+		}
+		else if (CurrentComboString[i] == 'I')
+		{
+			IroquoidResource += 1;
+		}
 	}
-	else if (CurrentComboString.Right(1) == "E")
+	CurrentComboString = "";
-	{
-		EisResource += 1;
-	}
-	else if (CurrentComboString.Right(1) == "A")
-	{
-		AzosResource += 1;
-	}
-	else if (CurrentComboString.Right(1) == "I")
-	{
-		IroquoidResource += 1;
-	}
-	CurrentComboString.RemoveAt(CurrentComboString.Len() - 1);
 	UpdateComboString(CurrentComboString);
+	RevertActionPoints();
+	UpdateActionPoints();
 	UpdateResourceBars();
+	// ReuseActionPoint();
+	// if (CurrentComboString.Right(1) == "P")
+	// {
+	// 	ProbertiumResource += 1;
+	// }
+	// else if (CurrentComboString.Right(1) == "E")
+	// {
+	// 	EisResource += 1;
+	// }
+	// else if (CurrentComboString.Right(1) == "A")
+	// {
+	// 	AzosResource += 1;
+	// }
+	// else if (CurrentComboString.Right(1) == "I")
+	// {
+	// 	IroquoidResource += 1;
+	// }
+	// CurrentComboString.RemoveAt(CurrentComboString.Len() - 1);
+	// UpdateComboString(CurrentComboString);
+	// UpdateResourceBars();
 }
 
 void ATurnBaseCombatV2::RunButtonOnClick()
 {
+	if (FMath::RandRange(0.0f, 1.0f) >= EscapePercentage)
+	{
+		EscapePercentage = CalculateEscapePercentage();
+		EscapePercentageTextBlock->SetText(FText::Join(FText::FromString(""), FText::FromString(FString::FromInt(EscapePercentage * 100)), FText::FromString("%")));
+		SwitchTurn();
+		return;
+	}
 	UBlackboardComponent* EnemyBlackboard = Cast<AAIController>(EnemyActor->GetInstigatorController())->GetBlackboardComponent();
-
+	EscapePercentageTextBlock->SetText(FText::Join(FText::FromString(""), FText::FromString("--"), FText::FromString("%")));
 	EnemyBlackboard->SetValueAsBool("IsInCombat", false);
 	EnemyBlackboard->SetValueAsBool("WasInCombat", true);
 	EndCombat();

Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h

@@ -26,6 +26,8 @@ public:
 
 	int* EnemyHealth = nullptr;
 	float* PlayerHealth = nullptr;
+	bool bIsInCombat = false;
+
 	UPROPERTY(EditDefaultsOnly)
 	int DefaultActionPoints = 2;
 	UPROPERTY(EditDefaultsOnly)
@@ -126,6 +128,9 @@ protected:
 	bool bPlayerHasExtraTurn = false;
 	bool bEnemyHasExtraTurn = false;
 
+	float EscapePercentage = 0.0f;
+	float CalculateEscapePercentage() const;
+
 private:
 	bool IsValidCombo(FString Combo) const;
 	bool IsSpecialCombo(FString Combo) const;
@@ -156,6 +161,8 @@ private:
 	UTextBlock* CurrentComboTextBlock2;
 	UPROPERTY(VisibleAnywhere)
 	UTextBlock* BattleLogTextBlock;
+	UPROPERTY(VisibleAnywhere)
+	UTextBlock* EscapePercentageTextBlock;
 
 	UPROPERTY(VisibleAnywhere)
 	UProgressBar* PlayerHealthBar;