diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Materials/Ammunition/M_9mm.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Materials/Ammunition/M_9mm.uasset new file mode 100644 index 0000000..afb98ea Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Materials/Ammunition/M_9mm.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Materials/Master_Material/M_Weapon_Master_USE.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Materials/Master_Material/M_Weapon_Master_USE.uasset new file mode 100644 index 0000000..7fe9208 Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Materials/Master_Material/M_Weapon_Master_USE.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Materials/SMG11/M_SMG11.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Materials/SMG11/M_SMG11.uasset new file mode 100644 index 0000000..cbc3d83 Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Materials/SMG11/M_SMG11.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Materials/SMG11/M_SMG11_Rem.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Materials/SMG11/M_SMG11_Rem.uasset new file mode 100644 index 0000000..7a34050 Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Materials/SMG11/M_SMG11_Rem.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_Nostock_X.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_Nostock_X.uasset new file mode 100644 index 0000000..b9cc0bf Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_Nostock_X.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_Nostock_X_Physics.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_Nostock_X_Physics.uasset new file mode 100644 index 0000000..a7e7c9d Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_Nostock_X_Physics.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_Nostock_X_Skeleton.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_Nostock_X_Skeleton.uasset new file mode 100644 index 0000000..23ada33 Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_Nostock_X_Skeleton.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_Nostock_Y.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_Nostock_Y.uasset new file mode 100644 index 0000000..236db52 Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_Nostock_Y.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_Nostock_Y_Physics.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_Nostock_Y_Physics.uasset new file mode 100644 index 0000000..c936893 Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_Nostock_Y_Physics.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_Nostock_Y_Skeleton.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_Nostock_Y_Skeleton.uasset new file mode 100644 index 0000000..c866db8 Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_Nostock_Y_Skeleton.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_X.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_X.uasset new file mode 100644 index 0000000..67c8cc9 Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_X.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_X_Physics.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_X_Physics.uasset new file mode 100644 index 0000000..c4ba924 Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_X_Physics.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_X_Skeleton.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_X_Skeleton.uasset new file mode 100644 index 0000000..9cacaab Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_X_Skeleton.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_Y.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_Y.uasset new file mode 100644 index 0000000..3d8fc74 Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_Y.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_Y_Physics.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_Y_Physics.uasset new file mode 100644 index 0000000..2c54a12 Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_Y_Physics.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_Y_Skeleton.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_Y_Skeleton.uasset new file mode 100644 index 0000000..60f49ac Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SK_SMG11_Y_Skeleton.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SM_SMG11_Mag_Empty_X.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SM_SMG11_Mag_Empty_X.uasset new file mode 100644 index 0000000..8912abe Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SM_SMG11_Mag_Empty_X.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SM_SMG11_Mag_Empty_Y.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SM_SMG11_Mag_Empty_Y.uasset new file mode 100644 index 0000000..f47a0bd Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SM_SMG11_Mag_Empty_Y.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SM_SMG11_Mag_X.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SM_SMG11_Mag_X.uasset new file mode 100644 index 0000000..9a6f37e Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SM_SMG11_Mag_X.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SM_SMG11_Nostock_X.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SM_SMG11_Nostock_X.uasset new file mode 100644 index 0000000..07a231a Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SM_SMG11_Nostock_X.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SM_SMG11_Nostock_Y.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SM_SMG11_Nostock_Y.uasset new file mode 100644 index 0000000..ee26bb6 Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SM_SMG11_Nostock_Y.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SM_SMG11_X.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SM_SMG11_X.uasset new file mode 100644 index 0000000..b5d0fa6 Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SM_SMG11_X.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SM_SMG11_Y.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SM_SMG11_Y.uasset new file mode 100644 index 0000000..4b285ef Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Meshes/SMG11/SM_SMG11_Y.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/Ammunition/T_9mm_ALB.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/Ammunition/T_9mm_ALB.uasset new file mode 100644 index 0000000..01cf429 Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/Ammunition/T_9mm_ALB.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/Ammunition/T_9mm_M_MSK.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/Ammunition/T_9mm_M_MSK.uasset new file mode 100644 index 0000000..680740c Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/Ammunition/T_9mm_M_MSK.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/Ammunition/T_9mm_NRM.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/Ammunition/T_9mm_NRM.uasset new file mode 100644 index 0000000..d5781a3 Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/Ammunition/T_9mm_NRM.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/KA74U/T_KA74U_ALB.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/KA74U/T_KA74U_ALB.uasset new file mode 100644 index 0000000..9c0ab77 Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/KA74U/T_KA74U_ALB.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/KA74U/T_KA74U_M_MSK.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/KA74U/T_KA74U_M_MSK.uasset new file mode 100644 index 0000000..b9f45e0 Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/KA74U/T_KA74U_M_MSK.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/KA74U/T_KA74U_NRM.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/KA74U/T_KA74U_NRM.uasset new file mode 100644 index 0000000..b9e4caa Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/KA74U/T_KA74U_NRM.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/Patterns/T_Stripes__Pattern.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/Patterns/T_Stripes__Pattern.uasset new file mode 100644 index 0000000..bbc22e5 Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/Patterns/T_Stripes__Pattern.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/SMG11/T_SMG11_ALB.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/SMG11/T_SMG11_ALB.uasset new file mode 100644 index 0000000..13eb586 Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/SMG11/T_SMG11_ALB.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/SMG11/T_SMG11_M_MSK.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/SMG11/T_SMG11_M_MSK.uasset new file mode 100644 index 0000000..7498b25 Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/SMG11/T_SMG11_M_MSK.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/SMG11/T_SMG11_NRM.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/SMG11/T_SMG11_NRM.uasset new file mode 100644 index 0000000..9300c28 Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/SMG11/T_SMG11_NRM.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/SMG11/T_SMG11_Rem_ALB.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/SMG11/T_SMG11_Rem_ALB.uasset new file mode 100644 index 0000000..0883350 Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/SMG11/T_SMG11_Rem_ALB.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/SMG11/T_SMG11_Rem_M_MSK.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/SMG11/T_SMG11_Rem_M_MSK.uasset new file mode 100644 index 0000000..da75ad5 Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/SMG11/T_SMG11_Rem_M_MSK.uasset differ diff --git a/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/SMG11/T_SMG11_Rem_NRM.uasset b/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/SMG11/T_SMG11_Rem_NRM.uasset new file mode 100644 index 0000000..404d227 Binary files /dev/null and b/Content/Assets/FPS_Weapon_Bundle/Weapons/Textures/SMG11/T_SMG11_Rem_NRM.uasset differ diff --git a/Content/Assets/Sounds/Gunshots/SMG/SMG_Cue.uasset b/Content/Assets/Sounds/Gunshots/SMG/SMG_Cue.uasset new file mode 100644 index 0000000..2176f2c Binary files /dev/null and b/Content/Assets/Sounds/Gunshots/SMG/SMG_Cue.uasset differ diff --git a/Content/Assets/Sounds/Gunshots/SMG/SMG_Shot_1.uasset b/Content/Assets/Sounds/Gunshots/SMG/SMG_Shot_1.uasset new file mode 100644 index 0000000..43e723d Binary files /dev/null and b/Content/Assets/Sounds/Gunshots/SMG/SMG_Shot_1.uasset differ diff --git a/Content/Assets/Sounds/Gunshots/SMG/SMG_Shot_10.uasset b/Content/Assets/Sounds/Gunshots/SMG/SMG_Shot_10.uasset new file mode 100644 index 0000000..421cd39 Binary files /dev/null and b/Content/Assets/Sounds/Gunshots/SMG/SMG_Shot_10.uasset differ diff --git a/Content/Assets/Sounds/Gunshots/SMG/SMG_Shot_2.uasset b/Content/Assets/Sounds/Gunshots/SMG/SMG_Shot_2.uasset new file mode 100644 index 0000000..0955b96 Binary files /dev/null and b/Content/Assets/Sounds/Gunshots/SMG/SMG_Shot_2.uasset differ diff --git a/Content/Assets/Sounds/Gunshots/SMG/SMG_Shot_3.uasset b/Content/Assets/Sounds/Gunshots/SMG/SMG_Shot_3.uasset new file mode 100644 index 0000000..2c46c8a Binary files /dev/null and b/Content/Assets/Sounds/Gunshots/SMG/SMG_Shot_3.uasset differ diff --git a/Content/Assets/Sounds/Gunshots/SMG/SMG_Shot_4.uasset b/Content/Assets/Sounds/Gunshots/SMG/SMG_Shot_4.uasset new file mode 100644 index 0000000..8cfb74c Binary files /dev/null and b/Content/Assets/Sounds/Gunshots/SMG/SMG_Shot_4.uasset differ diff --git a/Content/Assets/Sounds/Gunshots/SMG/SMG_Shot_5.uasset b/Content/Assets/Sounds/Gunshots/SMG/SMG_Shot_5.uasset new file mode 100644 index 0000000..167fd07 Binary files /dev/null and b/Content/Assets/Sounds/Gunshots/SMG/SMG_Shot_5.uasset differ diff --git a/Content/Assets/Sounds/Gunshots/SMG/SMG_Shot_6.uasset b/Content/Assets/Sounds/Gunshots/SMG/SMG_Shot_6.uasset new file mode 100644 index 0000000..8d0e3b7 Binary files /dev/null and b/Content/Assets/Sounds/Gunshots/SMG/SMG_Shot_6.uasset differ diff --git a/Content/Assets/Sounds/Gunshots/SMG/SMG_Shot_7.uasset b/Content/Assets/Sounds/Gunshots/SMG/SMG_Shot_7.uasset new file mode 100644 index 0000000..02408f9 Binary files /dev/null and b/Content/Assets/Sounds/Gunshots/SMG/SMG_Shot_7.uasset differ diff --git a/Content/Assets/Sounds/Gunshots/SMG/SMG_Shot_8.uasset b/Content/Assets/Sounds/Gunshots/SMG/SMG_Shot_8.uasset new file mode 100644 index 0000000..46fa850 Binary files /dev/null and b/Content/Assets/Sounds/Gunshots/SMG/SMG_Shot_8.uasset differ diff --git a/Content/Assets/Sounds/Gunshots/SMG/SMG_Shot_9.uasset b/Content/Assets/Sounds/Gunshots/SMG/SMG_Shot_9.uasset new file mode 100644 index 0000000..64a8e13 Binary files /dev/null and b/Content/Assets/Sounds/Gunshots/SMG/SMG_Shot_9.uasset differ diff --git a/Content/Blueprints/Weapon/BP_SubmachineGun.uasset b/Content/Blueprints/Weapon/BP_SubmachineGun.uasset new file mode 100644 index 0000000..f9e2fd0 Binary files /dev/null and b/Content/Blueprints/Weapon/BP_SubmachineGun.uasset differ diff --git a/Content/Maps/BlasterMap.umap b/Content/Maps/BlasterMap.umap index c9d053e..a7731c2 100644 Binary files a/Content/Maps/BlasterMap.umap and b/Content/Maps/BlasterMap.umap differ diff --git a/Source/Blaster/Character/BlasterCharacter.cpp b/Source/Blaster/Character/BlasterCharacter.cpp index 9b5ab20..1a7ccdd 100644 --- a/Source/Blaster/Character/BlasterCharacter.cpp +++ b/Source/Blaster/Character/BlasterCharacter.cpp @@ -273,6 +273,9 @@ void ABlasterCharacter::PlayReloadMontage() case EWeaponType::EWT_Pistol: SectionName = FName("Rifle"); // Todo: create pistol reload montage section break; + case EWeaponType::EWT_SubmachineGun: + SectionName = FName("Rifle"); // Todo: create SMG reload montage section + break; default: SectionName = FName("Rifle"); break; diff --git a/Source/Blaster/Components/CombatComponent.cpp b/Source/Blaster/Components/CombatComponent.cpp index 2ad70ac..1690af7 100644 --- a/Source/Blaster/Components/CombatComponent.cpp +++ b/Source/Blaster/Components/CombatComponent.cpp @@ -457,4 +457,5 @@ void UCombatComponent::InitializeCarriedAmmo() CarriedAmmoMap.Emplace(EWeaponType::EWT_AssaultRifle, StartingARAmmo); CarriedAmmoMap.Emplace(EWeaponType::EWT_RocketLauncher, StartingRocketAmmo); CarriedAmmoMap.Emplace(EWeaponType::EWT_Pistol, StartingPistolAmmo); + CarriedAmmoMap.Emplace(EWeaponType::EWT_SubmachineGun, StartingSMGAmmo); } diff --git a/Source/Blaster/Components/CombatComponent.h b/Source/Blaster/Components/CombatComponent.h index 807b834..1835ad3 100644 --- a/Source/Blaster/Components/CombatComponent.h +++ b/Source/Blaster/Components/CombatComponent.h @@ -129,6 +129,9 @@ private: UPROPERTY(EditAnywhere) int32 StartingPistolAmmo = 15; + UPROPERTY(EditAnywhere) + int32 StartingSMGAmmo = 15; + void InitializeCarriedAmmo(); UPROPERTY(ReplicatedUsing=OnRep_CombatState) diff --git a/Source/Blaster/Weapon/HitScanWeapon.cpp b/Source/Blaster/Weapon/HitScanWeapon.cpp index 389ef8f..4b7e93d 100644 --- a/Source/Blaster/Weapon/HitScanWeapon.cpp +++ b/Source/Blaster/Weapon/HitScanWeapon.cpp @@ -58,6 +58,15 @@ void AHitScanWeapon::Fire(const FVector& HitTarget) FireHit.ImpactNormal.Rotation() ); } + + if (HitSound) + { + UGameplayStatics::PlaySoundAtLocation( + this, + HitSound, + FireHit.ImpactPoint + ); + } } if (BeamParticles) @@ -73,5 +82,22 @@ void AHitScanWeapon::Fire(const FVector& HitTarget) } } } + + if (MuzzleFlash) + { + UGameplayStatics::SpawnEmitterAtLocation( + World, + MuzzleFlash, + SocketTransform + ); + } + if (FireSound) + { + UGameplayStatics::PlaySoundAtLocation( + this, + FireSound, + GetActorLocation() + ); + } } } diff --git a/Source/Blaster/Weapon/HitScanWeapon.h b/Source/Blaster/Weapon/HitScanWeapon.h index 328a2ff..7d646ae 100644 --- a/Source/Blaster/Weapon/HitScanWeapon.h +++ b/Source/Blaster/Weapon/HitScanWeapon.h @@ -29,4 +29,12 @@ private: UPROPERTY(EditAnywhere) UParticleSystem* BeamParticles; + UPROPERTY(EditAnywhere) + UParticleSystem* MuzzleFlash; + + UPROPERTY(EditAnywhere) + USoundCue* FireSound; + + UPROPERTY(EditAnywhere) + USoundCue* HitSound; }; diff --git a/Source/Blaster/Weapon/WeaponTypes.h b/Source/Blaster/Weapon/WeaponTypes.h index 07885d8..932979a 100644 --- a/Source/Blaster/Weapon/WeaponTypes.h +++ b/Source/Blaster/Weapon/WeaponTypes.h @@ -6,6 +6,7 @@ enum class EWeaponType: uint8 EWT_AssaultRifle UMETA(DisplayName="Assault Rifle"), EWT_RocketLauncher UMETA(DisplayName="Rocket Launcher"), EWT_Pistol UMETA(DisplayName="Pistol"), + EWT_SubmachineGun UMETA(DisplayName="Submachine Gun"), EWT_MAX UMETA(DisplayName="DefaultMAX") }; \ No newline at end of file