Merge branch 'dev' into UI-Implementation

# Conflicts:
#	Content/Blueprints/Player/BP_MyTempCharacter.uasset
#	Content/Levels/Top_layer_level.umap

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.cpp

@@ -39,7 +39,7 @@ void ATempCharacter::BeginPlay()
 		PostProcessVolume = Cast<APostProcessVolume>(AllActorsInScene[0]);
 	}
 	Enemy = TEXT("Enemy");
-	UGameplayStatics::GetAllActorsWithTag(GetWorld(), Enemy, AIActors);
+	//UGameplayStatics::GetAllActorsWithTag(GetWorld(), Enemy, AIActors);
 	Ammo = TEXT("Ammo");
 	NoiseEmitter = Cast<UPawnNoiseEmitterComponent>(this->FindComponentByClass(UPawnNoiseEmitterComponent::StaticClass()));
 }
@@ -66,27 +66,27 @@ void ATempCharacter::Sneak()
 		UnCrouch();
 		isInStealth = false;
 		if (PostProcessVolume != nullptr) PostProcessVolume->Settings.VignetteIntensity = 0.0f;
-		for (AActor* Actor : AIActors)
+		//for (AActor* Actor : AIActors)
-		{
+		//{
-			USphereComponent* SphereComponent = Actor->FindComponentByClass<USphereComponent>();
+		//	USphereComponent* SphereComponent = Actor->FindComponentByClass<USphereComponent>();
-			if (SphereComponent != nullptr)
+		//	if (IsValid(SphereComponent))
-			{
+		//	{
-				SphereComponent->SetSphereRadius(40.0f); //default value
+		//		SphereComponent->SetSphereRadius(40.0f); //default value
-			}
+		//	}
-		}
+		//}
 	}
 	else
 	{
 		Crouch();
 		isInStealth = true;
-		for (AActor* Actor : AIActors)
+		/*for (AActor* Actor : AIActors)
 		{
 			USphereComponent* SphereComponent = Actor->FindComponentByClass<USphereComponent>();
 			if (IsValid(SphereComponent))
 			{
 				SphereComponent->SetSphereRadius(5.0f);
 			}
-		}
+		}*/
 		if (PostProcessVolume != nullptr) PostProcessVolume->Settings.VignetteIntensity = 0.8f;
 	}
 }

readme.md

@@ -2,6 +2,10 @@
 
 ## By Team 2:13 
 
+### Trello
+
+https://trello.com/b/umw6SXsi/world-213
+
 ### Character Dialogue 
 
 https://docs.google.com/spreadsheets/d/13iVCQuveBiaihpREnY145OZi5QT-1sseNoI0A5v8D1o/edit?usp=sharing