diff --git a/Content/Assets/MilitaryWeapSilver/Weapons/Grenade_Launcher_A.uasset b/Content/Assets/MilitaryWeapSilver/Weapons/Grenade_Launcher_A.uasset index 5a0e49b..efdcb77 100644 Binary files a/Content/Assets/MilitaryWeapSilver/Weapons/Grenade_Launcher_A.uasset and b/Content/Assets/MilitaryWeapSilver/Weapons/Grenade_Launcher_A.uasset differ diff --git a/Content/Assets/MilitaryWeapSilver/Weapons/Grenade_Launcher_A_Skeleton.uasset b/Content/Assets/MilitaryWeapSilver/Weapons/Grenade_Launcher_A_Skeleton.uasset index 5cacc49..4208dc4 100644 Binary files a/Content/Assets/MilitaryWeapSilver/Weapons/Grenade_Launcher_A_Skeleton.uasset and b/Content/Assets/MilitaryWeapSilver/Weapons/Grenade_Launcher_A_Skeleton.uasset differ diff --git a/Content/Blueprints/Weapon/BP_GenadeLauncher.uasset b/Content/Blueprints/Weapon/BP_GenadeLauncher.uasset new file mode 100644 index 0000000..12663ea Binary files /dev/null and b/Content/Blueprints/Weapon/BP_GenadeLauncher.uasset differ diff --git a/Content/Maps/BlasterMap.umap b/Content/Maps/BlasterMap.umap index b362bcf..c2f73c4 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 fd7ff16..20721b7 100644 --- a/Source/Blaster/Character/BlasterCharacter.cpp +++ b/Source/Blaster/Character/BlasterCharacter.cpp @@ -286,6 +286,9 @@ void ABlasterCharacter::PlayReloadMontage() case EWeaponType::EWT_SniperRifle: SectionName = FName("Rifle"); // Todo: create Sniper reload montage section break; + case EWeaponType::EWT_GrenadeLauncher: + SectionName = FName("Rifle"); // Todo: create Grenade Launcher reload montage section + break; default: SectionName = FName("Rifle"); break; diff --git a/Source/Blaster/Components/CombatComponent.cpp b/Source/Blaster/Components/CombatComponent.cpp index 2fe5004..f0e0813 100644 --- a/Source/Blaster/Components/CombatComponent.cpp +++ b/Source/Blaster/Components/CombatComponent.cpp @@ -464,4 +464,5 @@ void UCombatComponent::InitializeCarriedAmmo() CarriedAmmoMap.Emplace(EWeaponType::EWT_SubmachineGun, StartingSMGAmmo); CarriedAmmoMap.Emplace(EWeaponType::EWT_Shotgun, StartingShotgunAmmo); CarriedAmmoMap.Emplace(EWeaponType::EWT_SniperRifle, StartingSniperAmmo); + CarriedAmmoMap.Emplace(EWeaponType::EWT_GrenadeLauncher, StartingGrenadeLauncherAmmo); } diff --git a/Source/Blaster/Components/CombatComponent.h b/Source/Blaster/Components/CombatComponent.h index 822844a..cc4ee43 100644 --- a/Source/Blaster/Components/CombatComponent.h +++ b/Source/Blaster/Components/CombatComponent.h @@ -128,7 +128,7 @@ private: int32 StartingPistolAmmo = 15; UPROPERTY(EditAnywhere) - int32 StartingSMGAmmo = 15; + int32 StartingSMGAmmo = 100; UPROPERTY(EditAnywhere) int32 StartingShotgunAmmo = 15; @@ -136,6 +136,9 @@ private: UPROPERTY(EditAnywhere) int32 StartingSniperAmmo = 15; + UPROPERTY(EditAnywhere) + int32 StartingGrenadeLauncherAmmo = 15; + void InitializeCarriedAmmo(); UPROPERTY(ReplicatedUsing=OnRep_CombatState) diff --git a/Source/Blaster/Weapon/WeaponTypes.h b/Source/Blaster/Weapon/WeaponTypes.h index 90f512e..22c62dd 100644 --- a/Source/Blaster/Weapon/WeaponTypes.h +++ b/Source/Blaster/Weapon/WeaponTypes.h @@ -11,6 +11,7 @@ enum class EWeaponType: uint8 EWT_SubmachineGun UMETA(DisplayName="Submachine Gun"), EWT_Shotgun UMETA(DisplayName="Shotgun"), EWT_SniperRifle UMETA(DisplayName="Sniper Rifle"), + EWT_GrenadeLauncher UMETA(DisplayName="Grenade Launcher"), EWT_MAX UMETA(DisplayName="DefaultMAX") }; \ No newline at end of file