From feeb0f36d6d86803028777005d552c60b4c50bef Mon Sep 17 00:00:00 2001 From: MH261677 Date: Thu, 19 Oct 2023 15:30:39 +0100 Subject: [PATCH] Finished Creating Weapon Stat UI for all Weapons --- .../AssaultRifles/BP_BaseAssaultRifle.uasset | 4 ++-- .../Blueprints/BaseWeapons/BP_BaseWeapon.uasset | 4 ++-- .../Blueprints/BaseWeapons/WBP_AmmoCount.uasset | 4 ++-- .../BaseWeapons/WBP_WeaponStatsPrompt.uasset | 4 ++-- .../EndlessVendetta/WeaponSystem/BaseWeaponClass.h | 13 +++++++------ 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset index 877f5854..4efa20ad 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63a33ee4cfad25c36bd022a8723b9b6ff80d70127366efa8983549044fd1f8ac -size 39198 +oid sha256:f7cb927b0b7296205adad620a38f473c36b2ee787fa7d4c6b12009a4aaf549e9 +size 40029 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset index aaca57f5..cac2db11 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:e657a0654a07a7573dcf638c96b9aa133cb1187ec301825e177dede83106db40 -size 126851 +oid sha256:c5ee53e7d84e4e0a3a6941011ad8a3c2718afe0bad7e95cf23f7cc1063476f53 +size 124677 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset index 6101521e..b4d8011b 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:10ebd683496c3f12941f3983445288dce63f61464dea90cf666d51f7faf23919 -size 64526 +oid sha256:dc183a9d9781ca6800fa345b6428f7bf41953180f79e74b96c894a33b9d789e9 +size 64773 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset index e91670eb..88947b41 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d594f98e9965fee6c2321d2688890d8d745b135621247d2a34ca8a2f9d7935a -size 83652 +oid sha256:a45878c4f97b973894f65722a55015a06cb6acc25e913c9d4045fd4532176701 +size 192580 diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h index 121ac885..f09b4492 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h @@ -54,22 +54,23 @@ public: // Called every frame virtual void Tick(float DeltaTime) override; void ReloadTimer(); - UPROPERTY(EditAnywhere) - FName WeaponName; + + UPROPERTY(EditAnywhere, BlueprintReadWrite) + FString WeaponName; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, BlueprintReadWrite) int WeaponDamage; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, BlueprintReadWrite) FString WeaponDescription; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, BlueprintReadWrite) float FireRate; UPROPERTY(EditAnywhere, BlueprintReadWrite) int MagazineSize; - UPROPERTY(EditAnywhere) + UPROPERTY(EditAnywhere, BlueprintReadWrite) float TimeToReload = 3.f; //how many bullets until the recoil stops going up