Skip to content

Update default weapon info #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NexiusTailer wants to merge 3 commits into
base: master
Choose a base branch
from
+26 −26
Open

Update default weapon info #59

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9de414
Update default weapon info
NexiusTailer Dec 18, 2025
f5bea04
Corrected weapon reload rates
NexiusTailer Dec 18, 2025
f64e59f
Merge branch 'openmultiplayer:master' into patch-1
NexiusTailer Jan 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions include/player.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,43 +329,43 @@ struct WeaponInfo
};

constexpr StaticArray<WeaponInfo, MAX_WEAPON_ID> WeaponInfoList = { {
{ PlayerWeaponType_Melee, 0, 1.6f, 0, 250, 0 }, // 0
{ PlayerWeaponType_Melee, 0, 1.6f, 0, 250, 0 }, // 1
{ PlayerWeaponType_Melee, 1, 1.6f, 0, 250, 0 }, // 2
{ PlayerWeaponType_Melee, 1, 1.6f, 0, 250, 0 }, // 3
{ PlayerWeaponType_Melee, 1, 1.6f, 0, 250, 0 }, // 4
{ PlayerWeaponType_Melee, 1, 1.6f, 0, 250, 0 }, // 5
{ PlayerWeaponType_Melee, 0, 1.76f, 0, 250, 0 }, // 0
{ PlayerWeaponType_Melee, 0, 1.76f, 0, 250, 0 }, // 1
{ PlayerWeaponType_Melee, 1, 1.76f, 0, 250, 0 }, // 2
{ PlayerWeaponType_Melee, 1, 1.76f, 0, 250, 0 }, // 3
{ PlayerWeaponType_Melee, 1, 1.76f, 0, 250, 0 }, // 4
{ PlayerWeaponType_Melee, 1, 1.76f, 0, 250, 0 }, // 5
{ PlayerWeaponType_Melee, 1, 1.6f, 0, 250, 0 }, // 6
{ PlayerWeaponType_Melee, 1, 1.6f, 0, 250, 0 }, // 7
{ PlayerWeaponType_Melee, 1, 1.6f, 0, 250, 0 }, // 8
{ PlayerWeaponType_Melee, 1, 1.6f, 0, 30, 0 }, // 9
{ PlayerWeaponType_Melee, 10, 1.6f, 0, 250, 0 }, // 10
{ PlayerWeaponType_Melee, 10, 1.6f, 0, 250, 0 }, // 11
{ PlayerWeaponType_Melee, 10, 1.6f, 0, 250, 0 }, // 12
{ PlayerWeaponType_Melee, 10, 1.6f, 0, 250, 0 }, // 13
{ PlayerWeaponType_Melee, 10, 1.6f, 0, 250, 0 }, // 14
{ PlayerWeaponType_Melee, 10, 1.6f, 0, 250, 0 }, // 15
{ PlayerWeaponType_Melee, 1, 1.76f, 0, 250, 0 }, // 7
{ PlayerWeaponType_Melee, 1, 1.76f, 0, 250, 0 }, // 8
{ PlayerWeaponType_Melee, 1, 1.76f, 0, 30, 0 }, // 9
{ PlayerWeaponType_Melee, 10, 1.76f, 0, 250, 0 }, // 10
{ PlayerWeaponType_Melee, 10, 1.76f, 0, 250, 0 }, // 11
{ PlayerWeaponType_Melee, 10, 1.76f, 0, 250, 0 }, // 12
{ PlayerWeaponType_Melee, 10, 1.76f, 0, 250, 0 }, // 13
{ PlayerWeaponType_Melee, 10, 1.76f, 0, 250, 0 }, // 14
{ PlayerWeaponType_Melee, 10, 1.76f, 0, 250, 0 }, // 15
{ PlayerWeaponType_Throwable, 8, 40.0f, 1, 500, 0 }, // 16
{ PlayerWeaponType_Throwable, 8, 40.0f, 1, 500, 0 }, // 17
{ PlayerWeaponType_Throwable, 8, 40.0f, 1, 500, 0 }, // 18
{ PlayerWeaponType_None, INVALID_WEAPON_SLOT, 0.0f, 0, 0, 0 }, // 19
{ PlayerWeaponType_None, INVALID_WEAPON_SLOT, 0.0f, 0, 0, 0 }, // 20
{ PlayerWeaponType_None, INVALID_WEAPON_SLOT, 0.0f, 0, 0, 0 }, // 21
{ PlayerWeaponType_Bullet, 2, 35.0f, 17, 350, 1300 }, // 22
{ PlayerWeaponType_Bullet, 2, 35.0f, 17, 450, 1300 }, // 23
{ PlayerWeaponType_Bullet, 2, 35.0f, 7, 950, 1300 }, // 24
{ PlayerWeaponType_Bullet, 2, 35.0f, 17, 320, 1300 }, // 22
{ PlayerWeaponType_Bullet, 2, 35.0f, 17, 460, 1300 }, // 23
{ PlayerWeaponType_Bullet, 2, 35.0f, 7, 800, 1300 }, // 24
{ PlayerWeaponType_Bullet, 3, 40.0f, 1, 1100, 0 }, // 25
{ PlayerWeaponType_Bullet, 3, 35.0f, 2, 300, 1300 }, // 26
{ PlayerWeaponType_Bullet, 3, 40.0f, 7, 400, 1500 }, // 27
{ PlayerWeaponType_Bullet, 4, 35.0f, 50, 110, 1500 }, // 28
{ PlayerWeaponType_Bullet, 4, 45.0f, 30, 95, 1650 }, // 29
{ PlayerWeaponType_Bullet, 5, 70.0f, 30, 120, 1900 }, // 30
{ PlayerWeaponType_Bullet, 5, 90.0f, 50, 120, 1900 }, // 31
{ PlayerWeaponType_Bullet, 4, 45.0f, 30, 90, 1600 }, // 29
{ PlayerWeaponType_Bullet, 5, 70.0f, 30, 110, 1800 }, // 30
{ PlayerWeaponType_Bullet, 5, 90.0f, 50, 110, 1800 }, // 31
{ PlayerWeaponType_Bullet, 4, 35.0f, 50, 110, 1500 }, // 32
{ PlayerWeaponType_Bullet, 6, 100.0f, 1, 1050, 0 }, // 33
{ PlayerWeaponType_Bullet, 6, 100.0f, 1, 1050, 0 }, // 34
{ PlayerWeaponType_Rocket, 7, 55.0f, 1, 1050, 0 }, // 35
{ PlayerWeaponType_Rocket, 7, 55.0f, 1, 1050, 0 }, // 36
{ PlayerWeaponType_Bullet, 6, 100.0f, 1, 1060, 0 }, // 33
{ PlayerWeaponType_Bullet, 6, 200.0f, 1, 1060, 0 }, // 34
{ PlayerWeaponType_Rocket, 7, 55.0f, 1, 1060, 0 }, // 35
{ PlayerWeaponType_Rocket, 7, 55.0f, 1, 1060, 0 }, // 36
{ PlayerWeaponType_Sprayable, 7, 5.1f, 500, 500, 500 }, // 37
{ PlayerWeaponType_Bullet, 7, 75.0f, 500, 20, 200 }, // 38
{ PlayerWeaponType_Special, 8, 40.0f, 1, 500, 0 }, // 39
Expand All @@ -375,7 +375,7 @@ constexpr StaticArray<WeaponInfo, MAX_WEAPON_ID> WeaponInfoList = { {
{ PlayerWeaponType_Special, 9, 100.0f, 1, 1200, 0 }, // 43
{ PlayerWeaponType_Special, 11, 200.0f, 0, 1500, 0 }, // 44
{ PlayerWeaponType_Special, 11, 200.0f, 0, 1500, 0 }, // 45
{ PlayerWeaponType_Special, 11, 1.6f, 1, 1500, 0 } // 46
{ PlayerWeaponType_Special, 11, 1.76f, 1, 250, 0 } // 46
} };

inline const WeaponInfo& WeaponInfo::get(uint8_t weapon)
Expand Down