141 - Grenade Launcher
This commit is contained in:
parent
977cdef60c
commit
d2c9cce7a3
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -286,6 +286,9 @@ void ABlasterCharacter::PlayReloadMontage()
|
||||||
case EWeaponType::EWT_SniperRifle:
|
case EWeaponType::EWT_SniperRifle:
|
||||||
SectionName = FName("Rifle"); // Todo: create Sniper reload montage section
|
SectionName = FName("Rifle"); // Todo: create Sniper reload montage section
|
||||||
break;
|
break;
|
||||||
|
case EWeaponType::EWT_GrenadeLauncher:
|
||||||
|
SectionName = FName("Rifle"); // Todo: create Grenade Launcher reload montage section
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
SectionName = FName("Rifle");
|
SectionName = FName("Rifle");
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -464,4 +464,5 @@ void UCombatComponent::InitializeCarriedAmmo()
|
||||||
CarriedAmmoMap.Emplace(EWeaponType::EWT_SubmachineGun, StartingSMGAmmo);
|
CarriedAmmoMap.Emplace(EWeaponType::EWT_SubmachineGun, StartingSMGAmmo);
|
||||||
CarriedAmmoMap.Emplace(EWeaponType::EWT_Shotgun, StartingShotgunAmmo);
|
CarriedAmmoMap.Emplace(EWeaponType::EWT_Shotgun, StartingShotgunAmmo);
|
||||||
CarriedAmmoMap.Emplace(EWeaponType::EWT_SniperRifle, StartingSniperAmmo);
|
CarriedAmmoMap.Emplace(EWeaponType::EWT_SniperRifle, StartingSniperAmmo);
|
||||||
|
CarriedAmmoMap.Emplace(EWeaponType::EWT_GrenadeLauncher, StartingGrenadeLauncherAmmo);
|
||||||
}
|
}
|
||||||
|
|
|
@ -128,7 +128,7 @@ private:
|
||||||
int32 StartingPistolAmmo = 15;
|
int32 StartingPistolAmmo = 15;
|
||||||
|
|
||||||
UPROPERTY(EditAnywhere)
|
UPROPERTY(EditAnywhere)
|
||||||
int32 StartingSMGAmmo = 15;
|
int32 StartingSMGAmmo = 100;
|
||||||
|
|
||||||
UPROPERTY(EditAnywhere)
|
UPROPERTY(EditAnywhere)
|
||||||
int32 StartingShotgunAmmo = 15;
|
int32 StartingShotgunAmmo = 15;
|
||||||
|
@ -136,6 +136,9 @@ private:
|
||||||
UPROPERTY(EditAnywhere)
|
UPROPERTY(EditAnywhere)
|
||||||
int32 StartingSniperAmmo = 15;
|
int32 StartingSniperAmmo = 15;
|
||||||
|
|
||||||
|
UPROPERTY(EditAnywhere)
|
||||||
|
int32 StartingGrenadeLauncherAmmo = 15;
|
||||||
|
|
||||||
void InitializeCarriedAmmo();
|
void InitializeCarriedAmmo();
|
||||||
|
|
||||||
UPROPERTY(ReplicatedUsing=OnRep_CombatState)
|
UPROPERTY(ReplicatedUsing=OnRep_CombatState)
|
||||||
|
|
|
@ -11,6 +11,7 @@ enum class EWeaponType: uint8
|
||||||
EWT_SubmachineGun UMETA(DisplayName="Submachine Gun"),
|
EWT_SubmachineGun UMETA(DisplayName="Submachine Gun"),
|
||||||
EWT_Shotgun UMETA(DisplayName="Shotgun"),
|
EWT_Shotgun UMETA(DisplayName="Shotgun"),
|
||||||
EWT_SniperRifle UMETA(DisplayName="Sniper Rifle"),
|
EWT_SniperRifle UMETA(DisplayName="Sniper Rifle"),
|
||||||
|
EWT_GrenadeLauncher UMETA(DisplayName="Grenade Launcher"),
|
||||||
|
|
||||||
EWT_MAX UMETA(DisplayName="DefaultMAX")
|
EWT_MAX UMETA(DisplayName="DefaultMAX")
|
||||||
};
|
};
|
Loading…
Reference in New Issue