diff --git a/client/damage/damage.lua b/client/damage/damage.lua index dc8d402..67c27a8 100644 --- a/client/damage/damage.lua +++ b/client/damage/damage.lua @@ -2,7 +2,7 @@ local config = require 'config.client' local sharedConfig = require 'config.shared' local playerArmor = nil local damageEffectsEnabled = true -local WEAPONS = exports.qbx_core:GetWeapons() +local damageReasons = require 'config.damage_reasons' ---Increases severity of an injury ---@param bodyPartKey BodyPartKey @@ -208,7 +208,7 @@ local function checkForDamage() TriggerEvent('chat:addMessage', { color = { 255, 0, 0 }, multiline = false, - args = { Lang:t('info.status'), WEAPONS[weaponHash].damagereason } + args = { Lang:t('info.status'), damageReasons[weaponHash] } }) WeaponsThatDamagedPlayer[weaponHash] = true end diff --git a/client/dead.lua b/client/dead.lua index 6a12790..3aa1a16 100644 --- a/client/dead.lua +++ b/client/dead.lua @@ -1,5 +1,5 @@ local sharedConfig = require 'config.shared' -local WEAPONS = exports.qbx_core:GetWeapons() +local qbShared = require '@qbx_core.shared.main' local allowRespawn = false local function playDeadAnimation() @@ -95,8 +95,8 @@ local function logDeath(victim, attacker, weapon) local playerName = (' %s (%d)'):format(GetPlayerName(playerId), GetPlayerServerId(playerId)) or Lang:t('info.self_death') local killerId = NetworkGetPlayerIndexFromPed(attacker) local killerName = ('%s (%d)'):format(GetPlayerName(killerId), GetPlayerServerId(killerId)) or Lang:t('info.self_death') - local weaponLabel = WEAPONS[weapon].label or 'Unknown' - local weaponName = WEAPONS[weapon].name or 'Unknown' + local weaponLabel = qbShared.WeaponHashes[weapon].label or 'Unknown' + local weaponName = qbShared.WeaponHashes[weapon].name or 'Unknown' local message = Lang:t('logs.death_log_message', { killername = killerName, playername = playerName, weaponlabel = weaponLabel, weaponname = weaponName }) lib.callback.await('qbx_medical:server:log', false, 'logDeath', message) diff --git a/client/laststand.lua b/client/laststand.lua index c8aafef..b9c7c1a 100644 --- a/client/laststand.lua +++ b/client/laststand.lua @@ -1,6 +1,6 @@ local config = require 'config.client' local sharedConfig = require 'config.shared' -local WEAPONS = exports.qbx_core:GetWeapons() +local qbShared = require '@qbx_core.shared.main' ---blocks until ped is no longer moving function WaitForPlayerToStopMoving() @@ -36,7 +36,7 @@ local function logPlayerKiller() local killerId = NetworkGetPlayerIndexFromPed(killer) local killerName = killerId ~= -1 and (' %s (%d)'):format(GetPlayerName(killerId), GetPlayerServerId(killerId)) or Lang:t('info.self_death') - local weaponItem = WEAPONS[killerWeapon] + local weaponItem = qbShared.WeaponHashes[killerWeapon] local weaponLabel = Lang:t('info.wep_unknown') or (weaponItem and weaponItem.label) local weaponName = Lang:t('info.wep_unknown') or (weaponItem and weaponItem.name) local message = Lang:t('logs.death_log_message', { killername = killerName, playername = GetPlayerName(cache.playerId), weaponlabel = weaponLabel, weaponname = weaponName }) diff --git a/config/damage_reasons.lua b/config/damage_reasons.lua new file mode 100644 index 0000000..28bfbef --- /dev/null +++ b/config/damage_reasons.lua @@ -0,0 +1,149 @@ +return { + -- Melee + [`weapon_unarmed`] = 'Melee killed / Whacked / Executed / Beat down / Murdered / Battered', + [`weapon_dagger`] = 'Knifed / Stabbed / Eviscerated', + [`weapon_bat`] = 'Melee killed / Whacked / Executed / Beat down / Murdered / Battered', + [`weapon_bottle`] = 'Knifed / Stabbed / Eviscerated', + [`weapon_crowbar`] = 'Melee killed / Whacked / Executed / Beat down / Murdered / Battered', + [`weapon_flashlight`] = 'Melee killed / Whacked / Executed / Beat down / Murdered / Battered', + [`weapon_golfclub`] = 'Melee killed / Whacked / Executed / Beat down / Murdered / Battered', + [`weapon_hammer`] = 'Melee killed / Whacked / Executed / Beat down / Murdered / Battered', + [`weapon_hatchet`] = 'Knifed / Stabbed / Eviscerated', + [`weapon_knuckle`] = 'Melee killed / Whacked / Executed / Beat down / Murdered / Battered', + [`weapon_knife`] = 'Knifed / Stabbed / Eviscerated', + [`weapon_machete`] = 'Knifed / Stabbed / Eviscerated', + [`weapon_switchblade`] = 'Knifed / Stabbed / Eviscerated', + [`weapon_nightstick`] = 'Melee killed / Whacked / Executed / Beat down / Murdered / Battered', + [`weapon_wrench`] = 'Melee killed / Whacked / Executed / Beat down / Murdered / Battered', + [`weapon_battleaxe`] = 'Knifed / Stabbed / Eviscerated', + [`weapon_poolcue`] = 'Melee killed / Whacked / Executed / Beat down / Murdered / Battered', + [`weapon_briefcase`] = 'Melee killed / Whacked / Executed / Beat down / Murdered / Battered', + [`weapon_briefcase_02`] = 'Melee killed / Whacked / Executed / Beat down / Murdered / Battered', + [`weapon_garbagebag`] = 'Melee killed / Whacked / Executed / Beat down / Murdered / Battered', + [`weapon_handcuffs`] = 'Melee killed / Whacked / Executed / Beat down / Murdered / Battered', + [`weapon_bread`] = 'Melee killed / Whacked / Executed / Beat down / Murdered / Battered', + [`weapon_stone_hatchet`] = 'Knifed / Stabbed / Eviscerated', + + -- Pistols + [`weapon_pistol`] = 'Pistoled / Blasted / Plugged / Bust a cap in', + [`weapon_pistol_mk2`] = 'Pistoled / Blasted / Plugged / Bust a cap in', + [`weapon_combatpistol`] = 'Pistoled / Blasted / Plugged / Bust a cap in', + [`weapon_appistol`] = 'Pistoled / Blasted / Plugged / Bust a cap in', + [`weapon_stungun`] = 'Died', + [`weapon_pistol50`] = 'Pistoled / Blasted / Plugged / Bust a cap in', + [`weapon_snspistol`] = 'Pistoled / Blasted / Plugged / Bust a cap in', + [`weapon_snspistol_mk2`] = 'Pistoled / Blasted / Plugged / Bust a cap in', + [`weapon_heavypistol`] = 'Pistoled / Blasted / Plugged / Bust a cap in', + [`weapon_vintagepistol`] = 'Pistoled / Blasted / Plugged / Bust a cap in', + [`weapon_flaregun`] = 'Died', + [`weapon_marksmanpistol`] = 'Pistoled / Blasted / Plugged / Bust a cap in', + [`weapon_revolver`] = 'Pistoled / Blasted / Plugged / Bust a cap in', + [`weapon_revolver_mk2`] = 'Pistoled / Blasted / Plugged / Bust a cap in', + [`weapon_doubleaction`] = 'Pistoled / Blasted / Plugged / Bust a cap in', + [`weapon_raypistol`] = 'Pistoled / Blasted / Plugged / Bust a cap in', + [`weapon_ceramicpistol`] = 'Pistoled / Blasted / Plugged / Bust a cap in', + [`weapon_navyrevolver`] = 'Pistoled / Blasted / Plugged / Bust a cap in', + [`weapon_gadgetpistol`] = 'Pistoled / Blasted / Plugged / Bust a cap in', + [`weapon_stungun_mp`] = 'Died', + + -- Submachine Guns + [`weapon_microsmg`] = 'Riddled / Drilled / Finished / Submachine Gunned', + [`weapon_smg`] = 'Riddled / Drilled / Finished / Submachine Gunned', + [`weapon_smg_mk2`] = 'Riddled / Drilled / Finished / Submachine Gunned', + [`weapon_assaultsmg`] = 'Riddled / Drilled / Finished / Submachine Gunned', + [`weapon_combatpdw`] = 'Riddled / Drilled / Finished / Submachine Gunned', + [`weapon_machinepistol`] = 'Riddled / Drilled / Finished / Submachine Gunned', + [`weapon_minismg`] = 'Riddled / Drilled / Finished / Submachine Gunned', + [`weapon_raycarbine`] = 'Riddled / Drilled / Finished / Submachine Gunned', + + -- Shotguns + [`weapon_pumpshotgun`] = 'Devastated / Pulverized / Shotgunned', + [`weapon_pumpshotgun_mk2`] = 'Devastated / Pulverized / Shotgunned', + [`weapon_sawnoffshotgun`] = 'Devastated / Pulverized / Shotgunned', + [`weapon_assaultshotgun`] = 'Devastated / Pulverized / Shotgunned', + [`weapon_bullpupshotgun`] = 'Devastated / Pulverized / Shotgunned', + [`weapon_musket`] = 'Devastated / Pulverized / Shotgunned', + [`weapon_heavyshotgun`] = 'Devastated / Pulverized / Shotgunned', + [`weapon_dbshotgun`] = 'Devastated / Pulverized / Shotgunned', + [`weapon_autoshotgun`] = 'Devastated / Pulverized / Shotgunned', + [`weapon_combatshotgun`] = 'Devastated / Pulverized / Shotgunned', + + -- Assault Rifles + [`weapon_assaultrifle`] = 'Ended / Rifled / Shot down / Floored', + [`weapon_assaultrifle_mk2`] = 'Ended / Rifled / Shot down / Floored', + [`weapon_carbinerifle`] = 'Ended / Rifled / Shot down / Floored', + [`weapon_carbinerifle_mk2`] = 'Ended / Rifled / Shot down / Floored', + [`weapon_advancedrifle`] = 'Ended / Rifled / Shot down / Floored', + [`weapon_specialcarbine`] = 'Ended / Rifled / Shot down / Floored', + [`weapon_specialcarbine_mk2`] = 'Ended / Rifled / Shot down / Floored', + [`weapon_bullpuprifle`] = 'Ended / Rifled / Shot down / Floored', + [`weapon_bullpuprifle_mk2`] = 'Ended / Rifled / Shot down / Floored', + [`weapon_compactrifle`] = 'Ended / Rifled / Shot down / Floored', + [`weapon_militaryrifle`] = 'Ended / Rifled / Shot down / Floored', + [`weapon_heavyrifle`] = 'Ended / Rifled / Shot down / Floored', + [`weapon_tacticalrifle`] = 'Ended / Rifled / Shot down / Floored', + + -- Light Machine Guns + [`weapon_mg`] = 'Machine gunned / Sprayed / Ruined', + [`weapon_combatmg`] = 'Machine gunned / Sprayed / Ruined', + [`weapon_combatmg_mk2`] = 'Machine gunned / Sprayed / Ruined', + [`weapon_gusenberg`] = 'Machine gunned / Sprayed / Ruined', + + -- Sniper Rifles + [`weapon_sniperrifle`] = 'Sniped / Picked off / Scoped', + [`weapon_heavysniper`] = 'Sniped / Picked off / Scoped', + [`weapon_heavysniper_mk2`] = 'Sniped / Picked off / Scoped', + [`weapon_marksmanrifle`] = 'Sniped / Picked off / Scoped', + [`weapon_marksmanrifle_mk2`] = 'Sniped / Picked off / Scoped', + [`weapon_remotesniper`] = 'Sniped / Picked off / Scoped', + [`weapon_precisionrifle`] = 'Sniped / Picked off / Scoped', + + -- Heavy Weapons + [`weapon_rpg`] = 'Killed / Exploded / Obliterated / Destroyed / Erased / Annihilated', + [`weapon_grenadelauncher`] = 'Killed / Exploded / Obliterated / Destroyed / Erased / Annihilated', + [`weapon_grenadelauncher_smoke`] = 'Killed / Exploded / Obliterated / Destroyed / Erased / Annihilated', + [`weapon_minigun`] = 'Killed / Exploded / Obliterated / Destroyed / Erased / Annihilated', + [`weapon_firework`] = 'Killed / Exploded / Obliterated / Destroyed / Erased / Annihilated', + [`weapon_railgun`] = 'Killed / Exploded / Obliterated / Destroyed / Erased / Annihilated', + [`weapon_hominglauncher`] = 'Killed / Exploded / Obliterated / Destroyed / Erased / Annihilated', + [`weapon_compactlauncher`] = 'Killed / Exploded / Obliterated / Destroyed / Erased / Annihilated', + [`weapon_rayminigun`] = 'Killed / Exploded / Obliterated / Destroyed / Erased / Annihilated', + [`weapon_emplauncher`] = 'Died', + + -- Throwables + [`weapon_grenade`] = 'Bombed / Exploded / Detonated / Blew up', + [`weapon_bzgas`] = 'Died', + [`weapon_molotov`] = 'Torched / Flambeed / Barbecued', + [`weapon_stickybomb`] = 'Bombed / Exploded / Detonated / Blew up', + [`weapon_proxmine`] = 'Bombed / Exploded / Detonated / Blew up', + [`weapon_snowball`] = 'Died', + [`weapon_pipebomb`] = 'Bombed / Exploded / Detonated / Blew up', + [`weapon_ball`] = 'Died', + [`weapon_smokegrenade`] = 'Died', + [`weapon_flare`] = 'Died', + + -- Miscellaneous + [`weapon_petrolcan`] = 'Died', + [`gadget_parachute`] = 'Died', + [`weapon_fireextinguisher`] = 'Died', + [`weapon_hazardcan`] = 'Died', + [`weapon_fertilizercan`] = 'Died', + [`weapon_barbed_wire`] = 'Prodded', + [`weapon_drowning`] = 'Died', + [`weapon_drowning_in_vehicle`] = 'Died', + [`weapon_bleeding`] = 'Bled out', + [`weapon_electric_fence`] = 'Fried', + [`weapon_explosion`] = 'Killed / Exploded / Obliterated / Destroyed / Erased / Annihilated', + [`weapon_fall`] = 'Committed suicide', + [`weapon_exhaustion`] = 'Died', + [`weapon_hit_by_water_cannon`] = 'Died', + [`weapon_rammed_by_car`] = 'Flattened / Ran over / Ran down', + [`weapon_run_over_by_car`] = 'Flattened / Ran over / Ran down', + [`weapon_heli_crash`] = 'Helicopter Crash', + [`weapon_fire`] = 'Torched / Flambeed / Barbecued', + [`weapon_metaldetector`] = 'Died', + + -- Animals + [`weapon_animal`] = 'Mauled', + [`weapon_cougar`] = 'Mauled' +} \ No newline at end of file diff --git a/fxmanifest.lua b/fxmanifest.lua index 27023c9..6cd444e 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -32,6 +32,7 @@ server_scripts { files { 'config/client.lua', 'config/shared.lua', + 'config/damage_reasons.lua' } dependencies {