kingsmedia
/
blaster
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

218 - Preventing Friendly Fire

This commit is contained in:
Kingsmedia 2022-05-30 19:31:37 +02:00
parent 19b84ff30f
commit 5d3c2aacf7
7 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/Blueprints/GameModes/BP_TeamsGameMode.uasset
View File

Binary file not shown.

17
Source/Blaster/Character/BlasterCharacter.cpp
View File

@ -249,7 +249,7 @@ void ABlasterCharacter::MulticastEliminated_Implementation(bool bPlayerLeftGame)
void ABlasterCharacter::EliminationTimerFinished()
{
ABlasterGameMode* BlasterGameMode = GetWorld()->GetAuthGameMode<ABlasterGameMode>();
BlasterGameMode = BlasterGameMode == nullptr ? GetWorld()->GetAuthGameMode<ABlasterGameMode>() : BlasterGameMode;
if (BlasterGameMode && !bLeftGame)
{
BlasterGameMode->RequestRespawn(this, Controller);
@ -262,7 +262,7 @@ void ABlasterCharacter::EliminationTimerFinished()
void ABlasterCharacter::ServerLeaveGame_Implementation()
{
ABlasterGameMode* BlasterGameMode = GetWorld()->GetAuthGameMode<ABlasterGameMode>();
BlasterGameMode = BlasterGameMode == nullptr ? GetWorld()->GetAuthGameMode<ABlasterGameMode>() : BlasterGameMode;
BlasterPlayerState = BlasterPlayerState == nullptr ? GetPlayerState<ABlasterPlayerState>() : BlasterPlayerState;
if (BlasterGameMode && BlasterPlayerState)
{
@ -279,7 +279,7 @@ void ABlasterCharacter::Destroyed()
EliminationBotComponent->DestroyComponent();
}
ABlasterGameMode* BlasterGameMode = Cast<ABlasterGameMode>(UGameplayStatics::GetGameMode(this));
BlasterGameMode = (BlasterGameMode == nullptr) ? GetWorld()->GetAuthGameMode<ABlasterGameMode>() : BlasterGameMode;
bool bMatchNotInProgress = BlasterGameMode && BlasterGameMode->GetMatchState() != MatchState::InProgress;
if (Combat && Combat->EquippedWeapon && bMatchNotInProgress)
{
@ -538,7 +538,9 @@ void ABlasterCharacter::GrenadeButtonPressed()
void ABlasterCharacter::ReceiveDamage(AActor* DamagedActor, float Damage, const UDamageType* DamageType, AController* InstigatorController, AActor* DamageCauser)
{
if (bEliminated) return;
BlasterGameMode = (BlasterGameMode == nullptr) ? GetWorld()->GetAuthGameMode<ABlasterGameMode>() : BlasterGameMode;
if (bEliminated || BlasterGameMode == nullptr) return;
Damage = BlasterGameMode->CalculateDamage(InstigatorController, Controller, Damage);
float DamageToHealth = Damage;
if (Shield > 0.f)
@ -559,10 +561,7 @@ void ABlasterCharacter::ReceiveDamage(AActor* DamagedActor, float Damage, const
UpdateHUDHealth();
UpdateHUDShield();
if (Health > 0.f)
{
PlayHitReactMontage();
}
if (Health == 0.f)
{
@ -571,7 +570,7 @@ void ABlasterCharacter::ReceiveDamage(AActor* DamagedActor, float Damage, const
Eliminated(false);
return;
}
ABlasterGameMode* BlasterGameMode = GetWorld()->GetAuthGameMode<ABlasterGameMode>();
BlasterGameMode = (BlasterGameMode == nullptr) ? GetWorld()->GetAuthGameMode<ABlasterGameMode>() : BlasterGameMode;
if (BlasterGameMode)
{
BlasterPlayerController = BlasterPlayerController == nullptr ? Cast<ABlasterPlayerController>(Controller) : BlasterPlayerController;
@ -903,7 +902,7 @@ void ABlasterCharacter::UpdateHUDAmmo()
void ABlasterCharacter::SpawnDefaultWeapon()
{
const ABlasterGameMode* BlasterGameMode = Cast<ABlasterGameMode>(UGameplayStatics::GetGameMode(this));
BlasterGameMode = (BlasterGameMode == nullptr) ? GetWorld()->GetAuthGameMode<ABlasterGameMode>() : BlasterGameMode;
UWorld* World = GetWorld();
if (BlasterGameMode && World && !bEliminated && DefaultWeaponClass)
{

3
Source/Blaster/Character/BlasterCharacter.h
View File

@ -323,6 +323,9 @@ private:
UPROPERTY(VisibleAnywhere)
UStaticMeshComponent* AttachedGrenade;
UPROPERTY()
class ABlasterGameMode* BlasterGameMode;
public:
void SetOverlappingWeapon(AWeapon* Weapon);
bool IsWeaponEquipped();

6
Source/Blaster/GameMode/BlasterGameMode.cpp
View File

@ -72,6 +72,12 @@ void ABlasterGameMode::OnMatchStateSet()
}
}
float ABlasterGameMode::CalculateDamage(AController* Attacker, AController* Victim, float BaseDamage)
{
return BaseDamage;
}
void ABlasterGameMode::PlayerEliminated(class ABlasterCharacter* EliminatedCharacter, class ABlasterPlayerController* VictimController, ABlasterPlayerController* AttackerController)
{
if (AttackerController == nullptr || AttackerController->PlayerState == nullptr) return;

1
Source/Blaster/GameMode/BlasterGameMode.h
View File

@ -28,6 +28,7 @@ public:
class ABlasterPlayerController* AttackerController);
virtual void RequestRespawn(ACharacter* EliminatedCharacter, AController* EliminatedController);
void PlayerLeftGame(ABlasterPlayerState* PlayerLeaving);
virtual float CalculateDamage(AController* Attacker, AController* Victim, float BaseDamage);
UPROPERTY(EditDefaultsOnly)
float WarmupTime = 10.f;

12
Source/Blaster/GameMode/TeamsGameMode.cpp
View File

@ -65,3 +65,15 @@ void ATeamsGameMode::AssignToTeam(APlayerState* PlayerState)
}
}
}
float ATeamsGameMode::CalculateDamage(AController* Attacker, AController* Victim, float BaseDamage)
{
ABlasterPlayerState* AttackerPState = Attacker->GetPlayerState<ABlasterPlayerState>();
ABlasterPlayerState* VictimPState = Victim->GetPlayerState<ABlasterPlayerState>();
if (AttackerPState == nullptr || VictimPState == nullptr) return BaseDamage;
if (VictimPState == AttackerPState) return BaseDamage;
if (AttackerPState->GetTeam() == VictimPState->GetTeam() && !FriendlyFire) return 0.f;
return BaseDamage;
}

4
Source/Blaster/GameMode/TeamsGameMode.h
View File

@ -17,6 +17,7 @@ class BLASTER_API ATeamsGameMode : public ABlasterGameMode
public:
virtual void PostLogin(APlayerController* NewPlayer) override;
virtual void Logout(AController* Exiting) override;
virtual float CalculateDamage(AController* Attacker, AController* Victim, float BaseDamage) override;
protected:
virtual void HandleMatchHasStarted() override;
@ -25,6 +26,9 @@ private:
UPROPERTY()
class ABlasterGameState* BGameState;
UPROPERTY(EditAnywhere)
bool FriendlyFire = false;
void AssignToTeam(APlayerState* PlayerState);
};