baz/vampires
baz/vampires
1
0
Fork 0
Code Issues 11 Projects 1 Activity

Compare commits

base: baz:0f856ea26d90800bff637e2116a121e5e79fe988
Branches Tags
baz:main
..
compare: baz:02e231876163d10575f593e363ca0de5377ce97b
Branches Tags
baz:main

No commits in common. "0f856ea26d90800bff637e2116a121e5e79fe988" and "02e231876163d10575f593e363ca0de5377ce97b" have entirely different histories.
0f856ea26d ... 02e2318761

12 changed files with 14 additions and 33 deletions
Show Stats Expand all files Collapse all files

BIN
Content/Enemy/DA_Enemy.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Enemy/DA_HeavyEnemy.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Enemy/DA_LightEnemy.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Enemy/DA_NormalEnemy.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Gamemode/BP_DefaultGamemode.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Meshes/SM_Enemy.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Meshes/SM_HeavyEnemy.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Meshes/SM_LightEnemy.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Meshes/SM_NormalEnemy.uasset (Stored with Git LFS)
View File

Binary file not shown.

2
Source/vampires/EnemyCharacter.cpp
View File

@ -118,7 +118,6 @@ void AEnemyCharacter::LoadDataFromDataAsset_Implementation(UEnemyDataAsset* Enem
OnDeathNiagaraSystem = EnemyDataAsset->OnDeathNiagaraSystem; OnDeathNiagaraSystem = EnemyDataAsset->OnDeathNiagaraSystem;
HealthComponent->SetMaxHealth(EnemyDataAsset->MaxHealth); HealthComponent->SetMaxHealth(EnemyDataAsset->MaxHealth);
GetCharacterMovement()->MaxWalkSpeed = EnemyDataAsset->MovementSpeed; GetCharacterMovement()->MaxWalkSpeed = EnemyDataAsset->MovementSpeed;
Damage = EnemyDataAsset->Damage;
PickupArray.Add(EnemyDataAsset->CommonPickupDataAsset); PickupArray.Add(EnemyDataAsset->CommonPickupDataAsset);
PickupArray.Add(EnemyDataAsset->UncommonPickupDataAsset); PickupArray.Add(EnemyDataAsset->UncommonPickupDataAsset);
@ -137,7 +136,6 @@ void AEnemyCharacter::ResetData_Implementation()
OnDeathNiagaraSystem = nullptr; OnDeathNiagaraSystem = nullptr;
HealthComponent->SetMaxHealth(100.0f); HealthComponent->SetMaxHealth(100.0f);
GetCharacterMovement()->MaxWalkSpeed = 300.0f; GetCharacterMovement()->MaxWalkSpeed = 300.0f;
Damage = 5.0f;
} }
float AEnemyCharacter::GetCapsuleRadius_Implementation() float AEnemyCharacter::GetCapsuleRadius_Implementation()

3
Source/vampires/EnemyDataAsset.h
View File

@ -51,7 +51,4 @@ public:
UPROPERTY(EditDefaultsOnly, Category = "Properties") UPROPERTY(EditDefaultsOnly, Category = "Properties")
float MovementSpeed = 300.0f; float MovementSpeed = 300.0f;
UPROPERTY(EditDefaultsOnly, Category = "Properties")
float Damage = 5.0f;
}; };

14
Source/vampires/VampireGameMode.cpp
View File

@ -148,14 +148,12 @@ AObjectPoolManager* AVampireGameMode::GetPickupObjectPoolManager_Implementation(
void AVampireGameMode::AddRandomEnemyTypeToPool() void AVampireGameMode::AddRandomEnemyTypeToPool()
{ {
// if (EnemyDataAssets.Num() > 0) if (EnemyDataAssets.Num() > 0)
// { {
// int32 rand = FMath::RandRange(0, EnemyDataAssets.Num() - 1); int32 rand = FMath::RandRange(0, EnemyDataAssets.Num() - 1);
// SpawnableEnemyDataAssets.Add(EnemyDataAssets[rand]); SpawnableEnemyDataAssets.Add(EnemyDataAssets[rand]);
// EnemyDataAssets.RemoveAt(rand); EnemyDataAssets.RemoveAt(rand);
// } }
SpawnableEnemyDataAssets = EnemyDataAssets;
} }
void AVampireGameMode::OnPlayerDeath(FDamageInfo DamageInfo) void AVampireGameMode::OnPlayerDeath(FDamageInfo DamageInfo)