Merge pull request #92 from MashdorDev/mapOrg

Organized Map Folder
MashdorDev · Feb 19, 2024 · d300a11 · d300a11
2 parents a3f8444 + 34da0fe
commit d300a11
Show file tree

Hide file tree

Showing 19 changed files with 30 additions and 49 deletions.
diff --git a/Content/Unbread/Maps/AudioTest.umap b/Content/Unbread/Maps/AudioTest.umap
diff --git a/Content/Unbread/Maps/BlockoutLevelTest.umap b/Content/Unbread/Maps/BlockoutLevelTest.umap
diff --git a/Content/Unbread/Maps/CharacterMeshTesting.umap b/Content/Unbread/Maps/CharacterMeshTesting.umap
diff --git a/Content/Unbread/Maps/CharacterTestMaps/CharacterTest02.umap b/Content/Unbread/Maps/CharacterTestMaps/CharacterTest02.umap
diff --git a/Content/Unbread/Maps/DeathTesting.umap b/Content/Unbread/Maps/DeathTesting.umap
diff --git a/Content/Unbread/Maps/DynamicCameraTest01.umap b/Content/Unbread/Maps/DynamicCameraTest01.umap
diff --git a/Content/Unbread/Maps/HazardsTest01.umap b/Content/Unbread/Maps/HazardsTest01.umap
diff --git a/Content/Unbread/Maps/Level2Test1.umap b/Content/Unbread/Maps/Level2Test1.umap
diff --git a/Content/Unbread/Maps/ModelTestLevel.umap b/Content/Unbread/Maps/ModelTestLevel.umap
diff --git a/Content/Unbread/Maps/ObjectiveMaterial.uasset b/Content/Unbread/Maps/ObjectiveMaterial.uasset
diff --git a/Content/Unbread/Maps/ObjectiveMaterial2.uasset b/Content/Unbread/Maps/ObjectiveMaterial2.uasset
diff --git a/Content/Unbread/Maps/PuzzleMechanicTesting.umap b/Content/Unbread/Maps/PuzzleMechanicTesting.umap
diff --git a/Content/Unbread/Maps/RangedAI.umap b/Content/Unbread/Maps/RangedAI.umap
diff --git a/Content/Unbread/Maps/Testing_Maps/AudioTest.umap b/Content/Unbread/Maps/Testing_Maps/AudioTest.umap
diff --git a/Content/Unbread/Maps/Testing_Maps/BlockoutLevelTest.umap b/Content/Unbread/Maps/Testing_Maps/BlockoutLevelTest.umap
diff --git a/Content/Unbread/Maps/Testing_Maps/CharacterTestMaps/CharacterTest02.umap b/Content/Unbread/Maps/Testing_Maps/CharacterTestMaps/CharacterTest02.umap
diff --git a/Content/Unbread/Maps/Testing_Maps/HazardsTest01.umap b/Content/Unbread/Maps/Testing_Maps/HazardsTest01.umap
diff --git a/Content/Unbread/Maps/Testing_Maps/RangedAI.umap b/Content/Unbread/Maps/Testing_Maps/RangedAI.umap
diff --git a/Source/unbread/Private/SRangedAICharacter.cpp b/Source/unbread/Private/SRangedAICharacter.cpp
@@ -38,10 +38,10 @@ FHitResult ASRangedAICharacter::CapsuleTrace()
 {
 	FHitResult OutHit;
 	TArray<AActor*> ActorsToIgnore;
-	
+
 	TArray<AActor*> IgnoredActors;
 	ActorsToIgnore.AddUnique(this);
-	
+
 	FVector EyesLoc;
 	FRotator EyesRot;
 	GetController()->GetPlayerViewPoint(EyesLoc, EyesRot);
@@ -64,13 +64,13 @@ void ASRangedAICharacter::StartWaponFire()
 
 	ToggleADS(true);
 	AnimValues.bIsShooting = true;
-	
+
 	FVector launchLocation = GetActorLocation() + GetActorForwardVector() * 120.0f;
-	
+
 	ASProjectile* pr = GetWorld()->SpawnActor<ASProjectile>(Projectile, launchLocation, GetActorRotation());
 	pr->SetInstigator(this);
 	pr->SetActorScale3D({0.5f, 0.5f, 0.5f});
-	
+
 	if(FireHandle.IsValid())
 	{
 		return;
@@ -98,16 +98,15 @@ void ASRangedAICharacter::BeginPlay()
 
 float ASRangedAICharacter::TakeDamage(float DamageAmount, FDamageEvent const& DamageEvent, AController* EventInstigator, AActor* DamageCauser)
 {
-
 	const float DamageApplied = Super::TakeDamage(DamageAmount, DamageEvent, EventInstigator, DamageCauser);
 
 	const ASRangedAICharacter* chr = Cast<ASRangedAICharacter>(DamageCauser->GetInstigator());
-	
-	if(chr && (chr == this || chr->faction == faction)) 
+
+	if(chr && (chr == this || chr->faction == faction))
 	{
 		return 0.0f;
 	}
-	
+
 	Health -= DamageApplied;
 
 	if(ControllerRef)
@@ -149,7 +148,7 @@ bool ASRangedAICharacter::CanBeSeenFrom(const FVector& ObserverLocation, FVector
                                         int32* UserData) const
 {
 	static const FName NAME_AILineOfSight = FName(TEXT("TestPawnLineOfSight"));
-	
+
 	FHitResult HitResult;
 	FVector SocketLocaiton = GetMesh()->GetSocketLocation(PerceptionTarget);
 
@@ -172,7 +171,7 @@ bool ASRangedAICharacter::CanBeSeenFrom(const FVector& ObserverLocation, FVector
 		FCollisionQueryParams(NAME_AILineOfSight, true, IgnoreActor));
 
 	NumberOfLoSChecksPerformed++;
-	
+
 	if(bHitSocket == false || (HitResult.GetActor()->IsOwnedBy(this)))
 	{
 		OutSeenLocation = GetActorLocation();
@@ -181,7 +180,7 @@ bool ASRangedAICharacter::CanBeSeenFrom(const FVector& ObserverLocation, FVector
 		return true;
 	}
 	OutSightStrength = 0;
-	
+
 	return false;
 }