Add Line of Sight (Visibility) system

Source/ETV/ETVAction.cpp

@@ -3,6 +3,7 @@
 #include "ETVAction.h"
 #include "ETVGameModeBase.h" // Not in .h due to circular dependency
 #include "ETVShipStatusUIWidget.h"
+#include "ETVShip.h"
 
 // Sets default values
 UETVAction::UETVAction() : Super()
@@ -19,8 +20,8 @@ UETVAction::UETVAction() : Super()
 	// Available
 	Available = EETVActionAvailability::ActionAvailable;
 
-	// Does not end turn
-	bEndsTurn = false;
+	// Ends turn after use
+	bEndsTurn = true;
 
 	// Takes at most one turn to complete
 	MaxPerforms = 1;
@@ -108,9 +109,11 @@ void UETVAction::OnBeginPerform()
 
 void UETVAction::OnEndPerform()
 {
+	AETVGameModeBase* GameMode = Cast<AETVGameModeBase>(GetWorld()->GetAuthGameMode());
+	GameMode->UpdateVisibleTiles(EETVShipType::PlayerShip);
+
 	if (bEndsTurn)
 	{
-		AETVGameModeBase* GameMode = Cast<AETVGameModeBase>(GetWorld()->GetAuthGameMode());
 		// TODO Delay this until all effects are done
 		GameMode->EndTurn();
 	}

Source/ETV/ETVAction.h

@@ -95,10 +95,10 @@ class ETV_API UETVAction : public UObject
 	virtual bool Perform();
 
 	UFUNCTION()
-	virtual void OnBeginPerform();
+	void OnBeginPerform();
 
 	UFUNCTION()
-	virtual void OnEndPerform();
+	void OnEndPerform();
 
     UFUNCTION()
 	virtual void ApplyEffectsSelf() {}

Source/ETV/ETVActionTarget.cpp

@@ -10,8 +10,7 @@ UETVActionTarget::UETVActionTarget() : Super()
 	FailureChance = 0.0f;
 
 	SelectedTarget = nullptr;
-	TileX = -1;
-	TileY = -1;
+	Tile = FVector2D(-1, -1);
 }
 
 void UETVActionTarget::Init(AETVShip* OwnerShipPtr, AETVWeapon* OwnerWeaponPtr)
@@ -28,20 +27,13 @@ void UETVActionTarget::Init(AETVShip* OwnerShipPtr, AETVWeapon* OwnerWeaponPtr)
 void UETVActionTarget::SetTarget(AActor* Target, int32 X, int32 Y)
 {
 	SelectedTarget = Target;
-	TileX = X;
-	TileY = Y;
+	Tile = FVector2D(X, Y);
 }
 
 bool UETVActionTarget::IsTargetValid()
 {
-	// Are required variables set
-	if (SelectedTarget == nullptr || RequiredTargetType == nullptr)
-	{
-		return false;
-	}
-
-	// Is correct type
-	return SelectedTarget->IsA(RequiredTargetType);
+	// Are required variables set and is correct type
+	return SelectedTarget != nullptr && RequiredTargetType != nullptr && SelectedTarget->IsA(RequiredTargetType);
 }
 
 bool UETVActionTarget::CanActivate()
@@ -51,7 +43,19 @@ bool UETVActionTarget::CanActivate()
 
 bool UETVActionTarget::CanPerform()
 {
-	return Super::CanPerform() && IsTargetValid();
+	if (Super::CanPerform() && IsTargetValid())
+	{
+		if (OwnerWeapon != nullptr && Tile.X != -1 && Tile.Y != -1) {
+			AETVGameModeBase* GameMode = Cast<AETVGameModeBase>(GetWorld()->GetAuthGameMode());
+			float Distance = GameMode->GetTiledDistance(OwnerShip->GetTilePosition(), Tile);
+
+			return Distance <= OwnerWeapon->GetFiringRange();
+		}
+
+		return true;
+	}
+
+	return false;
 }
 
 bool UETVActionTarget::Activate()

Source/ETV/ETVActionTarget.h

@@ -24,13 +24,9 @@ class ETV_API UETVActionTarget : public UETVAction
 	UPROPERTY(BlueprintReadOnly, Category = "ETV Action|Target")
 	AActor* SelectedTarget;
 
-	// Currently selected tile map X coordinate (-1 if unset)
+	// Currently selected tile map coordinate ((-1, -1) if unset)
 	UPROPERTY(BlueprintReadOnly, Category = "ETV Action|Target")
-	int32 TileX;
-
-	// Currently selected tile map Y coordinate (-1 if unset)
-	UPROPERTY(BlueprintReadOnly, Category = "ETV Action|Target")
-	int32 TileY;
+	FVector2D Tile;
 
 	// Required type of target
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "ETV Action|Target")
@@ -53,5 +49,5 @@ class ETV_API UETVActionTarget : public UETVAction
 	bool CanPerform() override;
 	bool Activate() override;
 	bool Perform() override;
-	void OnEndPerform() override;
+	void OnEndPerform(); // Hides UETVAction member function on purpose
 };

Source/ETV/ETVActionTarget_Fire.cpp

@@ -1,7 +1,9 @@
 // Copyright (C) Team13. All rights reserved.
 
 #include "ETVActionTarget_Fire.h"
+#include "ETVGameModeBase.h"
 #include "ETVCalculator.h"
+#include "PaperTileMapActor.h"
 
 // Sets default values
 UETVActionTarget_Fire::UETVActionTarget_Fire() : Super()
@@ -12,6 +14,31 @@ UETVActionTarget_Fire::UETVActionTarget_Fire() : Super()
 	RequiredTargetType = AETVShip::StaticClass();
 }
 
+bool UETVActionTarget_Fire::IsTargetValid()
+{
+	if (Super::IsTargetValid())
+	{
+		return true;
+	}
+
+	// Are required variables set (repeated check from parent due to special condition)
+	if (SelectedTarget != nullptr && RequiredTargetType != nullptr)
+	{
+		// Is target a valid tile
+		if (SelectedTarget->IsA(APaperTileMapActor::StaticClass()) && Tile.X != -1 && Tile.Y != -1)
+		{
+			// Is tile not visible (fog is accessible no matter the content)
+			AETVGameModeBase* GameMode = Cast<AETVGameModeBase>(GetWorld()->GetAuthGameMode());
+			if (!GameMode->IsTileVisible(Tile, OwnerShip->GetType()))
+			{
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
 bool UETVActionTarget_Fire::CanActivate()
 {
 	// Check if a weapon is set
@@ -22,6 +49,12 @@ bool UETVActionTarget_Fire::CanPerform()
 {
 	if (Super::CanPerform())
 	{
+		// Check if fog
+		if (SelectedTarget->IsA(APaperTileMapActor::StaticClass()))
+		{
+			return true;
+		}
+
 		// Check if enemy
 		AETVShip* SelectedShip = Cast<AETVShip>(SelectedTarget); // Required type is ship (checked in parent) so casting is safe
 		return SelectedShip->IsEnemy();
@@ -36,8 +69,21 @@ void UETVActionTarget_Fire::ApplyEffectsTarget()
 
 	// TODO Show explosion animation
 
-	AETVShip* SelectedShip = Cast<AETVShip>(SelectedTarget); // Required type is ship (checked in parent) so casting is safe
-	UETVCalculator::CalculateWeaponEffect(OwnerShip, OwnerWeapon, SelectedShip);
+	AETVShip* SelectedShip = nullptr;
+	if (!SelectedTarget->IsA(APaperTileMapActor::StaticClass()))
+	{
+		AETVGameModeBase* GameMode = Cast<AETVGameModeBase>(GetWorld()->GetAuthGameMode());
+		SelectedShip = GameMode->GetShipActor(Tile.X, Tile.Y);
+	}
+	else
+	{
+		SelectedShip = Cast<AETVShip>(SelectedTarget); // Required type is ship (checked in parent) so casting is safe
+	}
+
+	if (SelectedShip != nullptr)
+	{
+		UETVCalculator::CalculateWeaponEffect(OwnerShip, OwnerWeapon, SelectedShip);
+	}
 }
 
 void UETVActionTarget_Fire::ApplyEffectsSelf()

Source/ETV/ETVActionTarget_Fire.h

@@ -19,6 +19,8 @@ class ETV_API UETVActionTarget_Fire : public UETVActionTarget
 	UETVActionTarget_Fire();
 
 public:
+	bool IsTargetValid() override;
+
 	bool CanActivate() override;
 	bool CanPerform() override;
 

Source/ETV/ETVActionTarget_Move.cpp

@@ -1,6 +1,7 @@
 // Copyright (C) Team13. All rights reserved.
 
 #include "ETVActionTarget_Move.h"
+#include "ETVGameModeBase.h"
 #include "ETVShip.h"
 #include "PaperTileMapActor.h"
 
@@ -20,8 +21,15 @@ bool UETVActionTarget_Move::CanActivate()
 
 bool UETVActionTarget_Move::CanPerform()
 {
-	// TODO Check distance (Ship's MoveRange vs distance)
-	return Super::CanPerform() && TileX != -1 && TileY != -1;
+	if (Super::CanPerform() && Tile.X != -1 && Tile.Y != -1)
+	{
+		AETVGameModeBase* GameMode = Cast<AETVGameModeBase>(GetWorld()->GetAuthGameMode());
+		float Distance = GameMode->GetTiledDistance(OwnerShip->GetTilePosition(), Tile);
+
+		return Distance <= OwnerShip->GetMoveRange();
+	}
+
+	return false;
 }
 
 void UETVActionTarget_Move::ApplyEffectsSelf()
@@ -33,6 +41,6 @@ void UETVActionTarget_Move::ApplyEffectsSelf()
 		// TODO Do animation
 
 		// Move ship
-		OwnerShip->MoveToTile(TileX, TileY);
+		OwnerShip->MoveToTile(Tile.X, Tile.Y);
 	}
 }

Source/ETV/ETVCalculator.cpp

@@ -74,23 +74,27 @@ void UETVCalculator::CalculateWeaponEffect(AETVShip *User, AETVWeapon *WeaponUse
 	UE_LOG(LogTemp, Warning, TEXT("%s"), *Msg2);
 	/**/
 
-	// Add new Message to UETVActionLogWidget by calling event NewLogEntry
+	// Log if target visible
 	AETVGameModeBase* GameMode = Cast<AETVGameModeBase>(User->GetWorld()->GetAuthGameMode());
-	UETVActionLogWidget *LogWidget = GameMode->GetLogWidget();
-	if (ActionHP != "") {
-		FString ShipName = User->GetShipName();
-		FString ChangeValueS = FString::FromInt(ChangeValue);
-		FString TargetName = Target->GetShipName();
+	if (GameMode->IsTileVisible(Target->GetTilePosition()))
+	{
+		// Add new Message to UETVActionLogWidget by calling event NewLogEntry
+		UETVActionLogWidget *LogWidget = GameMode->GetLogWidget();
+		if (ActionHP != "") {
+			FString ShipName = User->GetShipName();
+			FString ChangeValueS = FString::FromInt(ChangeValue);
+			FString TargetName = Target->GetShipName();
 
-		FString Message = ShipName + ";" + ActionHP + ";" + ChangeValueS + ";" + TargetName;
-		LogWidget->NewLogEntry(Message);
-	}
-	if (ActionShields != "") {
-		FString ShipName = User->GetShipName();
-		FString ChangeValueS = FString::FromInt(ChangeValue);
-		FString TargetName = Target->GetShipName();
+			FString Message = ShipName + ";" + ActionHP + ";" + ChangeValueS + ";" + TargetName;
+			LogWidget->NewLogEntry(Message);
+		}
+		if (ActionShields != "") {
+			FString ShipName = User->GetShipName();
+			FString ChangeValueS = FString::FromInt(ChangeValue);
+			FString TargetName = Target->GetShipName();
 
-		FString Message = ShipName + ";" + ActionShields + ";" + ChangeValueS + ";" + TargetName;
-		LogWidget->NewLogEntry(Message);
+			FString Message = ShipName + ";" + ActionShields + ";" + ChangeValueS + ";" + TargetName;
+			LogWidget->NewLogEntry(Message);
+		}
 	}
 }

Source/ETV/ETVCalculator.h

@@ -1,4 +1,4 @@
-// Copyright (C) Team13. All rights reserved.
+// Copyright (C) Team13. All rights reserved.
 
 #pragma once
 
@@ -19,6 +19,7 @@ class ETV_API UETVCalculator : public UObject
 
 
 public:
+	// Calculates weapon effect, applies it to involved ships/weapons and logs to Combat Log
 	UFUNCTION(BlueprintCallable)
 	static void CalculateWeaponEffect(AETVShip *Atacker, AETVWeapon *WeaponUsed, AETVShip *Target);