Ships now correctly work :)

harrisonv789 · Apr 22, 2022 · 13e52bd · 13e52bd
1 parent 5860f8d
commit 13e52bd
Show file tree

Hide file tree

Showing 25 changed files with 349 additions and 66 deletions.
diff --git a/A2_Goals/Content/Blueprints/BP_Gold.uasset b/A2_Goals/Content/Blueprints/BP_Gold.uasset
diff --git a/A2_Goals/Content/Blueprints/BP_Ship.uasset b/A2_Goals/Content/Blueprints/BP_Ship.uasset
diff --git a/A2_Goals/Content/Levels/MainLevel.umap b/A2_Goals/Content/Levels/MainLevel.umap
diff --git a/A2_Goals/Content/Materials/Mat_Ship.uasset b/A2_Goals/Content/Materials/Mat_Ship.uasset
diff --git a/A2_Goals/Content/Textures/action.png b/A2_Goals/Content/Textures/action.png
diff --git a/A2_Goals/Content/Textures/action.uasset b/A2_Goals/Content/Textures/action.uasset
diff --git a/A2_Goals/Content/Textures/idle.png b/A2_Goals/Content/Textures/idle.png
diff --git a/A2_Goals/Content/Textures/idle.uasset b/A2_Goals/Content/Textures/idle.uasset
diff --git a/A2_Goals/Content/Textures/movement.png b/A2_Goals/Content/Textures/movement.png
diff --git a/A2_Goals/Content/Textures/movement.uasset b/A2_Goals/Content/Textures/movement.uasset
diff --git a/A2_Goals/Content/Textures/view.png b/A2_Goals/Content/Textures/view.png
diff --git a/A2_Goals/Content/Textures/view.uasset b/A2_Goals/Content/Textures/view.uasset
diff --git a/A2_Goals/Content/UI/MainInterface.uasset b/A2_Goals/Content/UI/MainInterface.uasset
diff --git a/A2_Goals/Content/UI/ShipInformation.uasset b/A2_Goals/Content/UI/ShipInformation.uasset
diff --git a/A2_Goals/Source/A2_Goals/Private/Actions/CollectResourceAction.cpp b/A2_Goals/Source/A2_Goals/Private/Actions/CollectResourceAction.cpp
@@ -30,6 +30,7 @@ void CollectResourceAction::Reset()
 	// Ensure the in range is false
 	SetInRange(false);
 	Target = nullptr;
+	TargetNode = nullptr;
 	ResourceGathered = 0;
 	ActionTime = 0.0;
 }
@@ -49,14 +50,15 @@ bool CollectResourceAction::CheckProceduralPreconditions(AShip* ship)
 		return false;
 
 	// Calculate the nearest resource
-	GridNode* goalNode = ship->Level->CalculateNearestGoal(ship->XPos, ship->YPos, ResourceType);
+	GridNode* goalNode = ship->Level->CalculateNearestGoal(ship->XPos, ship->YPos, ResourceType, true);
 
 	// Check if the resource exists
 	if (!goalNode || !goalNode->ResourceAtLocation)
 		return false;
 
 	// Get the target
 	Target = goalNode->ResourceAtLocation;
+	TargetNode = goalNode;
 
 	// Get the distance to the target
 	const FVector distance = ship->GetActorLocation() - Target->GetActorLocation();
@@ -114,6 +116,7 @@ bool CollectResourceAction::PerformAction(AShip* ship, float deltaTime)
 		{
 			// Remove the target
 			Target = nullptr;
+			TargetNode = nullptr;
 
 			// Decrease the morale
 			ship->Morale--;

diff --git a/A2_Goals/Source/A2_Goals/Private/Actions/CollectTreasureAction.cpp b/A2_Goals/Source/A2_Goals/Private/Actions/CollectTreasureAction.cpp
@@ -26,6 +26,7 @@ void CollectTreasureAction::Reset()
 	// Ensure the in range is false
 	SetInRange(false);
 	Target = nullptr;
+	TargetNode = nullptr;
 	TreasureGathered = 0;
 	ActionTime = 0.0;
 }
@@ -55,13 +56,7 @@ bool CollectTreasureAction::CheckProceduralPreconditions(AShip* ship)
 
 	// Get the target
 	Target = goalNode->ResourceAtLocation;
-
-	// Get the distance to the target
-	const FVector distance = ship->GetActorLocation() - Target->GetActorLocation();
-
-	// Check if the distance is less than some amount
-	// TODO update with some actual collision system
-	SetInRange(distance.Size() <= 5);
+	TargetNode = goalNode;
 
 	// Return a success
 	return true;
@@ -85,12 +80,13 @@ bool CollectTreasureAction::PerformAction(AShip* ship, float deltaTime)
 	{
 		// Increase the morale and gold
 		TreasureGathered++;
-		ship->Morale = 200;
-		ship->NumGold++;
-		ship->Level->CollectGold(goldResource);
+
+		// Call the collect gold action
+		ship->CollectGold(goldResource);
 
 		// Remove the target
 		Target = nullptr;
+		TargetNode = nullptr;
 	}
 
 	// Return a success

diff --git a/A2_Goals/Source/A2_Goals/Private/Actions/DepositResourceAction.cpp b/A2_Goals/Source/A2_Goals/Private/Actions/DepositResourceAction.cpp
@@ -33,6 +33,7 @@ void DepositResourceAction::Reset()
 	// Ensure the in range is false
 	SetInRange(false);
 	Target = nullptr;
+	TargetNode = nullptr;
 	ResourcesDeposited = 0;
 	ActionTime = 0.0;
 }
@@ -52,14 +53,15 @@ bool DepositResourceAction::CheckProceduralPreconditions(AShip* ship)
 		return false;
 
 	// Calculate the nearest resource
-	GridNode* goalNode = ship->Level->CalculateNearestGoal(ship->XPos, ship->YPos, HOME);
+	GridNode* goalNode = ship->Level->CalculateNearestGoal(ship->XPos, ship->YPos, HOME, true);
 
 	// Check if the resource exists
 	if (!goalNode || !goalNode->ResourceAtLocation)
 		return false;
 
 	// Get the target
 	Target = goalNode->ResourceAtLocation;
+	TargetNode = goalNode;
 
 	// Get the distance to the target
 	const FVector distance = ship->GetActorLocation() - Target->GetActorLocation();
@@ -117,6 +119,7 @@ bool DepositResourceAction::PerformAction(AShip* ship, float deltaTime)
 		{
 			// Remove the target
 			Target = nullptr;
+			TargetNode = nullptr;
 
 			// Decrease the morale
 			ship->Morale--;