Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev

Source/the_twilight_abyss/BaseItems/Items/BaseItem.h

@@ -54,7 +54,16 @@ public:
 	bool isDamageBuffItem;
 
 	UPROPERTY(EditAnywhere, Category = "Item")
-	bool isAmmoItemType;
+	bool isProbertiumType;
+
+	UPROPERTY(EditAnywhere, Category = "Item")
+	bool isEisType;
+
+	UPROPERTY(EditAnywhere, Category = "Item")
+	bool isAzosType;
+	
+	UPROPERTY(EditAnywhere, Category = "Item")
+	bool isIroquoidType;
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item")
 	int32 StackCount = 1;

Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp

@@ -39,18 +39,48 @@ void UEatableItems::Use(ATempCharacter* Character)
 			Character->Inventory->RemoveItem(this);
 		}
 
-		if (isAmmoItemType)
+		if (isProbertiumType)
 		{
 			TurnBaseCombat = GetWorld()->GetGameState<ATurnBaseCombatV2>();
-			if (TurnBaseCombat->ProbertiumResource > 10)
+			if (TurnBaseCombat->ProbertiumResource < 10)
 			{
+				UE_LOG(LogTemp, Warning, TEXT("Probertium eaten"));
 				TurnBaseCombat->ProbertiumResource += 5;
+				Character->Inventory->RemoveItem(this);
 			}
-			if (TurnBaseCombat->EisResource > 10)
+		}
+
+		if (isEisType)
 		{
+			TurnBaseCombat = GetWorld()->GetGameState<ATurnBaseCombatV2>();
+			if (TurnBaseCombat->EisResource < 10)
+			{
+				UE_LOG(LogTemp, Warning, TEXT("Eis eaten"));
 				TurnBaseCombat->EisResource += 5;
+				Character->Inventory->RemoveItem(this);
 			}
+		}
+		
+		if (isAzosType)
+		{
+			TurnBaseCombat = GetWorld()->GetGameState<ATurnBaseCombatV2>();
+			if (TurnBaseCombat->AzosResource < 10)
+			{
+				UE_LOG(LogTemp, Warning, TEXT("Azos eaten"));
+				TurnBaseCombat->AzosResource += 5;
+				Character->Inventory->RemoveItem(this);
+			}
+		}
+
+		if (isIroquoidType)
+		{
+			TurnBaseCombat = GetWorld()->GetGameState<ATurnBaseCombatV2>();
+			if (TurnBaseCombat->IroquoidResource < 10)
+			{
+				UE_LOG(LogTemp, Warning, TEXT("Iroq eaten"));
+				TurnBaseCombat->IroquoidResource += 5;
 				Character->Inventory->RemoveItem(this);
 			}
 		}
 	}
+}

Source/the_twilight_abyss/PlayerTemp/TempCharacter.h

@@ -102,4 +102,6 @@ public:
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Widgets")
 	UUserWidget* ImportantStats;
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Widgets")
+	UUserWidget* MainMenuWidget;
 };