Skip to content

Commit

Permalink
Added missing weapon IDs. (#81)
Browse files Browse the repository at this point in the history
* Fixed errors when all enemies were dead in competitive.
* Added MP5-SD into weapons.
* Added missing knives and fixed M4 names.
* Fixed SG name, added healthshot and fixed M4 again xD
  • Loading branch information
PetrSeifert committed Oct 16, 2023
1 parent b3904c1 commit 8aabc2e
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions controller/src/weapon.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,10 @@ define_weapons! {
G3SG1 { id: 11, name: "G3SG1", flags: WEAPON_FLAG_TYPE_SNIPER_RIFLE },
Galilar { id: 13, name: "Galil AR", flags: WEAPON_FLAG_TYPE_RIFLE },
M249 { id: 14, name: "M249", flags: WEAPON_FLAG_TYPE_MACHINE_GUN },
M4A1 { id: 16, name: "M4A1", flags: WEAPON_FLAG_TYPE_RIFLE },
M4A4 { id: 16, name: "M4A4", flags: WEAPON_FLAG_TYPE_RIFLE },
Mac10 { id: 17, name: "MAC-10", flags: WEAPON_FLAG_TYPE_SMG },
P90 { id: 19, name: "P90", flags: WEAPON_FLAG_TYPE_SMG },
MP5SD { id: 23, name: "MP5-SD", flags: WEAPON_FLAG_TYPE_SMG },
Ump45 { id: 24, name: "UMP-45", flags: WEAPON_FLAG_TYPE_SMG },
XM1014 { id: 25, name: "XM1014", flags: WEAPON_FLAG_TYPE_SHOTGUN },
Bizon { id: 26, name: "PP-Bizon", flags: WEAPON_FLAG_TYPE_SMG },
Expand All @@ -85,7 +86,7 @@ define_weapons! {
Nova { id: 35, name: "Nova", flags: WEAPON_FLAG_TYPE_SHOTGUN },
P250 { id: 36, name: "P250", flags: WEAPON_FLAG_TYPE_PISTOL },
Scar20 { id: 38, name: "SCAR-20", flags: WEAPON_FLAG_TYPE_SNIPER_RIFLE },
Sg556 { id: 39, name: "SG 556", flags: WEAPON_FLAG_TYPE_RIFLE },
Sg553 { id: 39, name: "SG 553", flags: WEAPON_FLAG_TYPE_RIFLE },
Ssg08 { id: 40, name: "SSG 08", flags: WEAPON_FLAG_TYPE_SNIPER_RIFLE },
Knife { id: 42, name: "Knife", flags: WEAPON_FLAG_TYPE_KNIFE },
Flashbang { id: 43, name: "Flashbang", flags: WEAPON_FLAG_TYPE_GRANADE },
Expand All @@ -95,13 +96,15 @@ define_weapons! {
Decoy { id: 47, name: "Decoy Grenade", flags: WEAPON_FLAG_TYPE_GRANADE },
Incendiary { id: 48, name: "Incendiary", flags: WEAPON_FLAG_TYPE_GRANADE },
C4 { id: 49, name: "C4", flags: 0 },
Healthshot { id: 57, name: "Healthshot", flags: 0 },
KnifeT { id: 59, name: "Knife (T)", flags: WEAPON_FLAG_TYPE_KNIFE },
M4A1Silencer { id: 60, name: "M4A1-S", flags: WEAPON_FLAG_TYPE_RIFLE },
USPS { id: 61, name: "USP-S", flags: WEAPON_FLAG_TYPE_RIFLE },
CZ75a { id: 63, name: "CZ75-Auto", flags: WEAPON_FLAG_TYPE_RIFLE },
Revolver { id: 64, name: "Revolver", flags: WEAPON_FLAG_TYPE_RIFLE },

KnifeBayonet { id: 500, name: "Knife (Bayonet)", flags: WEAPON_FLAG_TYPE_KNIFE },
KnifesClassic { id: 503, name: "Knife (Classic)", flags: WEAPON_FLAG_TYPE_KNIFE },
KnifeFlip { id: 505, name: "Knife (Flip)", flags: WEAPON_FLAG_TYPE_KNIFE },
KnifeGut { id: 506, name: "Knife (Gut)", flags: WEAPON_FLAG_TYPE_KNIFE },
KnifeKarambit { id: 507, name: "Knife (Karambit)", flags: WEAPON_FLAG_TYPE_KNIFE },
Expand All @@ -111,5 +114,13 @@ define_weapons! {
KnifeSurvivalBowie { id: 514, name: "Knife (Survival Bowie)", flags: WEAPON_FLAG_TYPE_KNIFE },
KnifeButterfly { id: 515, name: "Knife (Butterfly)", flags: WEAPON_FLAG_TYPE_KNIFE },
KnifePush { id: 516, name: "Knife (Push)", flags: WEAPON_FLAG_TYPE_KNIFE },
KnifeCord { id: 517, name: "Knife (Cord)", flags: WEAPON_FLAG_TYPE_KNIFE },
KnifeSurvival { id: 518, name: "Knife (Survival)", flags: WEAPON_FLAG_TYPE_KNIFE },
KnifeUrsus { id: 519, name: "Knife (Ursus)", flags: WEAPON_FLAG_TYPE_KNIFE },
KnifesNavaja { id: 520, name: "Knife (Navaja)", flags: WEAPON_FLAG_TYPE_KNIFE },
KnifesNomad { id: 521, name: "Knife (Nomad)", flags: WEAPON_FLAG_TYPE_KNIFE },
KnifesStiletto { id: 522, name: "Knife (Stiletto)", flags: WEAPON_FLAG_TYPE_KNIFE },
KnifesTalon { id: 523, name: "Knife (Talon)", flags: WEAPON_FLAG_TYPE_KNIFE },
KnifesSkeleton { id: 525, name: "Knife (Skeleton)", flags: WEAPON_FLAG_TYPE_KNIFE },
}
}

0 comments on commit 8aabc2e

Please sign in to comment.