diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset index 47d586c9..fd641fe7 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4febec5729a36774fbc7932a6fec983a74cc9cfac901f131fcbdafe3da17205c -size 29846 +oid sha256:a0da36d309ab31edb443cdd04c208688f52f31579e51532a942a226e3a043a41 +size 31530 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset new file mode 100644 index 00000000..ffa789a6 --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40e8a310391b4641f53daf2e8608e0597638df604749d0db465d4917b0cba8f3 +size 50441 diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h index 6647f0d6..2ea5b812 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h @@ -54,14 +54,17 @@ public: UPROPERTY(EditAnywhere) float FireRate; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, BlueprintReadWrite) int MagazineSize; //how many bullets until the recoil stops going up UPROPERTY(EditAnywhere) int howMnyShotsTillRclStop; - UPROPERTY(EditAnywhere) + UPROPERTY(BlueprintReadWrite) + int currentAmmoCount; + + UPROPERTY(EditAnywhere, BlueprintReadWrite) UTexture2D* WeaponImage; UPROPERTY(EditAnywhere, Category = "ScopedFire") @@ -153,8 +156,6 @@ private: float originalMaxAngleRight; float originalMinMultiplier; - int currentAmmoCount; - float currentPitch; bool bStopShooting = false; };