Philip/EndlessVendetta
Philip/EndlessVendetta
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Merge remote-tracking branch 'origin/AI' into Green-Light/Rafals-Branch

Browse Source
This commit is contained in:
Rafal Swierczek 2024-02-29 10:39:12 +00:00
commit ce7d25f21d
18 changed files with 45 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/UI/UI_Bar_Fill.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Assets/UI/UI_Bar_Outline.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

4
EndlessVendetta/Config/DefaultEngine.ini
View File

@ -154,8 +154,8 @@ ManualIPAddress=
+PropertyRedirects=(OldName="/Script/EndlessVendetta.BaseWeaponClass.player",NewName="/Script/EndlessVendetta.BaseWeaponClass.playerInWorld")
[/Script/NavigationSystem.RecastNavMesh]
AgentMaxStepHeight=73.434059
AgentMaxSlope=64.648003
AgentMaxStepHeight=45.929649
AgentMaxSlope=45.053085
CellSize=10.000000
RuntimeGeneration=Dynamic

BIN
EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacter.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacterSwat.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/AI/Enemy/Basic/BT_BasicEnemy.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_NeedReloadText.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/FirstPerson/Blueprints/UI_Bar_Fill.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/FirstPerson/Blueprints/UI_Bar_Outline.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/FirstPerson/Blueprints/WBP_Crosshair.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/MetaHumans/Dhruv/BP_Dhruv.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/__ExternalActors__/Levels/AITest/4/DF/EI4FFQ2STMC3TRHBQOUNH5.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/__ExternalActors__/Levels/AITest/5/95/31WBX0XWARTHM3RCYSFU9M.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/__ExternalActors__/Levels/AITest/8/OF/W8X5ON78DR25CQV6QFGJO4.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/__ExternalActors__/Levels/AITest/A/9W/KV7XP1AJXG9P45HFKK5F76.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/__ExternalActors__/Levels/AITest/B/8N/O8PP5KE5USY7FTAE75J65R.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/__ExternalActors__/Levels/AITest/B/O6/IM2ZR0FZ5KH20UIRPAQT2P.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

13
EndlessVendetta/Source/EndlessVendetta/AI/Tasks/BTTask_AttackPlayer.cpp
View File

@ -20,16 +20,21 @@ EBTNodeResult::Type UBTTask_AttackPlayer::ExecuteTask(UBehaviorTreeComponent& Ow
{
if (const UBlackboardComponent* const Blackboard = OwnerComp.GetBlackboardComponent())
{
FVector const Origin = AIController->GetPawn()->GetActorLocation();
FVector const Start = Origin + FVector(0.f, 0.f, 30.f);
FVector const PlayerLocation = Blackboard->GetValueAsVector("TargetLocation");
USkeletalMeshComponent* GunSKMesh = nullptr;
if (AIController->GetPawn()->GetComponentsByTag(USkeletalMeshComponent::StaticClass(), "Gun").Num() > 0)
{
GunSKMesh = Cast<USkeletalMeshComponent>(AIController->GetPawn()->GetComponentsByTag(USkeletalMeshComponent::StaticClass(), "Gun")[0]);
}
FVector const Origin = IsValid(GunSKMesh) ? GunSKMesh->GetComponentLocation() : AIController->GetPawn()->GetActorLocation() + FVector(0.f, 0.f, 30.f);
FVector const Start = Origin;
FVector const End = Origin + AIController->GetPawn()->GetActorForwardVector() * 10000.f;
if (AEnemyCharacter* const EnemyCharacter = Cast<AEnemyCharacter>(AIController->GetPawn()))
{
EnemyCharacter->FireWeapon.Broadcast();
EnemyCharacter->SetFiring(true);
FCollisionQueryParams QueryParams;
QueryParams.AddIgnoredActor(AIController->GetPawn());
if (FHitResult HitResult; GetWorld()->LineTraceSingleByChannel(HitResult, Start, PlayerLocation, ECC_Pawn, QueryParams))
if (FHitResult HitResult; GetWorld()->LineTraceSingleByChannel(HitResult, Start, End, ECC_Pawn, QueryParams))
{
if (IsValid(HitResult.GetActor()))
{