Skip to content
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

Add new DLC weapons, add missing weapons from past DLC, update weapon labels #1024

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Add new DLC weapons, add missing weapons from past DLC, update weapon labels #1024

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b0ca23
tweak(resource/cl_logger) update weapon labels & hashes
Gravxd Jan 15, 2025
48b8f16
Merge branch 'tabarra:develop' into develop
Gravxd Feb 17, 2025
35ab379
Merge branch 'tabarra:develop' into develop
Gravxd Feb 20, 2025
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
39 changes: 22 additions & 17 deletions resource/cl_logger.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
-- Death reasons
-- https://docs.fivem.net/docs/game-references/weapon-models/
local fivemDeathHashTable = {
[GetHashKey('WEAPON_ANIMAL')] = 'Animal',
[GetHashKey('WEAPON_COUGAR')] = 'Cougar',
Expand All @@ -8,7 +9,7 @@ local fivemDeathHashTable = {
[GetHashKey('WEAPON_ASSAULTRIFLE_MK2')] = 'Assault Rifke Mk2',
[GetHashKey('WEAPON_ASSAULTSHOTGUN')] = 'Assault Shotgun',
[GetHashKey('WEAPON_ASSAULTSMG')] = 'Assault SMG',
[GetHashKey('WEAPON_AUTOSHOTGUN')] = 'Automatic Shotgun',
[GetHashKey('WEAPON_AUTOSHOTGUN')] = 'Sweeper Shotgun',
[GetHashKey('WEAPON_BULLPUPRIFLE')] = 'Bullpup Rifle',
[GetHashKey('WEAPON_BULLPUPRIFLE_MK2')] = 'Bullpup Rifle Mk2',
[GetHashKey('WEAPON_BULLPUPSHOTGUN')] = 'Bullpup Shotgun',
Expand All @@ -21,7 +22,7 @@ local fivemDeathHashTable = {
[GetHashKey('WEAPON_COMPACTRIFLE')] = 'Compact Rifle',
[GetHashKey('WEAPON_DBSHOTGUN')] = 'Double Barrel Shotgun',
[GetHashKey('WEAPON_DOUBLEACTION')] = 'Double Action Revolver',
[GetHashKey('WEAPON_GUSENBERG')] = 'Gusenberg',
[GetHashKey('WEAPON_GUSENBERG')] = 'Gusenberg Sweeper',
[GetHashKey('WEAPON_HEAVYPISTOL')] = 'Heavy Pistol',
[GetHashKey('WEAPON_HEAVYSHOTGUN')] = 'Heavy Shotgun',
[GetHashKey('WEAPON_HEAVYSNIPER')] = 'Heavy Sniper',
Expand All @@ -43,7 +44,7 @@ local fivemDeathHashTable = {
[GetHashKey('WEAPON_RAILGUN')] = 'Railgun',
[GetHashKey('WEAPON_REVOLVER')] = 'Revolver',
[GetHashKey('WEAPON_REVOLVER_MK2')] = 'Revolver Mk2',
[GetHashKey('WEAPON_SAWNOFFSHOTGUN')] = 'Sawnoff Shotgun',
[GetHashKey('WEAPON_SAWNOFFSHOTGUN')] = 'Sawed-Off Shotgun',
[GetHashKey('WEAPON_SMG')] = 'SMG',
[GetHashKey('WEAPON_SMG_MK2')] = 'SMG Mk2',
[GetHashKey('WEAPON_SNIPERRIFLE')] = 'Sniper Rifle',
Expand All @@ -59,7 +60,7 @@ local fivemDeathHashTable = {
[GetHashKey('WEAPON_FLARE')] = 'Flare',
[GetHashKey('WEAPON_FLAREGUN')] = 'Flaregun',
[GetHashKey('WEAPON_MOLOTOV')] = 'Molotov',
[GetHashKey('WEAPON_PETROLCAN')] = 'Petrol Can',
[GetHashKey('WEAPON_PETROLCAN')] = 'Jerry Can',
[GetHashKey('WEAPON_HELI_CRASH')] = 'Helicopter Crash',
[GetHashKey('WEAPON_RAMMED_BY_CAR')] = 'Rammed by Vehicle',
[GetHashKey('WEAPON_RUN_OVER_BY_CAR')] = 'Ranover by Vehicle',
Expand All @@ -81,45 +82,46 @@ local fivemDeathHashTable = {
[GetHashKey('WEAPON_VEHICLE_ROCKET')] = 'Vehicle Rocket',
[GetHashKey('WEAPON_BZGAS')] = 'BZ Gas',
[GetHashKey('WEAPON_FIREEXTINGUISHER')] = 'Fire Extinguisher',
[GetHashKey('WEAPON_SMOKEGRENADE')] = 'Smoke Grenade',
[GetHashKey('WEAPON_BATTLEAXE')] = 'Battleaxe',
[GetHashKey('WEAPON_SMOKEGRENADE')] = 'Tear Gas',
[GetHashKey('WEAPON_BATTLEAXE')] = 'Battle Axe',
[GetHashKey('WEAPON_BOTTLE')] = 'Bottle',
[GetHashKey('WEAPON_KNIFE')] = 'Knife',
[GetHashKey('WEAPON_MACHETE')] = 'Machete',
[GetHashKey('WEAPON_SWITCHBLADE')] = 'Switch Blade',
[GetHashKey('OBJECT')] = 'Object',
[GetHashKey('VEHICLE_WEAPON_ROTORS')] = 'Vehicle Rotors',
[GetHashKey('WEAPON_BALL')] = 'Ball',
[GetHashKey('WEAPON_BAT')] = 'Bat',
[GetHashKey('WEAPON_BAT')] = 'Baseball Bat',
[GetHashKey('WEAPON_CROWBAR')] = 'Crowbar',
[GetHashKey('WEAPON_FLASHLIGHT')] = 'Flashlight',
[GetHashKey('WEAPON_GOLFCLUB')] = 'Golfclub',
[GetHashKey('WEAPON_HAMMER')] = 'Hammer',
[GetHashKey('WEAPON_HATCHET')] = 'Hatchet',
[GetHashKey('WEAPON_HIT_BY_WATER_CANNON')] = 'Water Cannon',
[GetHashKey('WEAPON_KNUCKLE')] = 'Knuckle',
[GetHashKey('WEAPON_KNUCKLE')] = 'Knuckle Duster',
[GetHashKey('WEAPON_NIGHTSTICK')] = 'Night Stick',
[GetHashKey('WEAPON_POOLCUE')] = 'Pool Cue',
[GetHashKey('WEAPON_SNOWBALL')] = 'Snowball',
[GetHashKey('WEAPON_UNARMED')] = 'Fist',
[GetHashKey('WEAPON_WRENCH')] = 'Wrench',
[GetHashKey('WEAPON_WRENCH')] = 'Pipe Wrench',
[GetHashKey('WEAPON_DROWNING')] = 'Drowned',
[GetHashKey('WEAPON_DROWNING_IN_VEHICLE')] = 'Drowned in Vehicle',
[GetHashKey('WEAPON_BARBED_WIRE')] = 'Barbed Wire',
[GetHashKey('WEAPON_BLEEDING')] = 'Bleed',
[GetHashKey('WEAPON_ELECTRIC_FENCE')] = 'Electric Fence',
[GetHashKey('WEAPON_EXHAUSTION')] = 'Exhaustion',
[GetHashKey('WEAPON_FALL')] = 'Falling',
[GetHashKey('WEAPON_RAYPISTOL')] = 'Ray Pistol',
[GetHashKey('WEAPON_RAYCARBINE')] = 'Ray Carbine',
[GetHashKey('WEAPON_RAYMINIGUN')] = 'Ray Minigun',
[GetHashKey('WEAPON_RAYPISTOL')] = 'Up-n-Atomizer',
[GetHashKey('WEAPON_RAYCARBINE')] = 'Unholy Hellbringer',
[GetHashKey('WEAPON_RAYMINIGUN')] = 'Widowmaker',
[GetHashKey('WEAPON_STONE_HATCHET')] = 'Stone Hatchet',
[GetHashKey('WEAPON_DAGGER')] = "Antique Cavalry Dagger", -- MPHIPSTER
-- MPHEIST3 DLC (v 1868)
[GetHashKey('WEAPON_CERAMICPISTOL')] = 'Ceramic Pistol',
[GetHashKey('WEAPON_NAVYREVOLVER')] = 'Navy Revolver',
[GetHashKey('WEAPON_HAZARDCAN')] = 'Hazard Can',
[GetHashKey('WEAPON_HAZARDCAN')] = 'Hazardous Jerry Can',
-- MPHEIST4 DLC (v 2189)
[GetHashKey('WEAPON_GADGETPISTOL')] = 'Gadget Pistol',
[GetHashKey('WEAPON_GADGETPISTOL')] = 'Perico Pistol',
[GetHashKey('WEAPON_MILITARYRIFLE')] = 'Military Rifle',
[GetHashKey('WEAPON_COMBATSHOTGUN')] = 'Combat Shotgun',
-- MPSECURITY DLC (v 2545)
Expand All @@ -131,15 +133,18 @@ local fivemDeathHashTable = {
[GetHashKey('WEAPON_TACTICALRIFLE')] = 'Tactical Rifle',
[GetHashKey('WEAPON_PRECISIONRIFLE')] = 'Precision Rifle',
-- MPCHRISTMAS3 DLC (V 2802)
[GetHashKey('WEAPON_PISTOLXM3')] = 'Pistol XM3',
[GetHashKey('WEAPON_PISTOLXM3')] = 'WM 29 Pistol',
[GetHashKey('WEAPON_CANDYCANE')] = 'Candy Cane',
[GetHashKey('WEAPON_RAILGUNXM3')] = 'Railgun XM3',
[GetHashKey('WEAPON_ACIDPACKAGE')] = 'Acid Package',
-- MP2023_01 DLC (V 2944)
[GetHashKey('WEAPON_TECPISTOL')] = 'Tec Pistol',
[GetHashKey('WEAPON_TECPISTOL')] = 'Tactical SMG',
-- MP2023_02 DLC (V 3095)
[GetHashKey('WEAPON_BATTLERIFLE')] = 'Battle Rifle',
[GetHashKey('WEAPON_SNOWLAUNCHER')] = 'Snow Launcher',
[GetHashKey('WEAPON_SNOWLAUNCHER')] = 'Snowball Launcher',
[GetHashKey('WEAPON_HACKINGDEVICE')] = 'Hacking Device',
-- MP2024_01 DLC (V 3258)
[GetHashKey('weapon_stunrod')] = 'The Shocker',
}

-- https://github.com/femga/rdr3_discoveries/blob/master/weapons/weapons.lua
Expand Down
Loading