diff --git a/shared/items.lua b/shared/items.lua index 65e529a..ba27953 100644 --- a/shared/items.lua +++ b/shared/items.lua @@ -25,6 +25,7 @@ QBShared.Items = { ['weapon_handcuffs'] = {['name'] = 'weapon_handcuffs', ['label'] = 'Handcuffs', ['weight'] = 1000, ['type'] = 'weapon', ['ammotype'] = nil, ['image'] = 'weapon_handcuffs.png', ['unique'] = true, ['useable'] = false, ['description'] = 'A pair of lockable linked metal rings for securing a prisoner\'s wrists'}, ['weapon_bread'] = {['name'] = 'weapon_bread', ['label'] = 'Baquette', ['weight'] = 1000, ['type'] = 'weapon', ['ammotype'] = nil, ['image'] = 'baquette.png', ['unique'] = true, ['useable'] = false, ['description'] = 'Bread...?'}, ['weapon_stone_hatchet'] = {['name'] = 'weapon_stone_hatchet', ['label'] = 'Stone Hatchet', ['weight'] = 1000, ['type'] = 'weapon', ['ammotype'] = nil, ['image'] = 'weapon_stone_hatchet.png', ['unique'] = true, ['useable'] = true, ['description'] = 'Stone ax'}, + ['weapon_candycane'] = {['name'] = 'weapon_candycane', ['label'] = 'Candy Cane', ['weight'] = 1000, ['type'] = 'weapon', ['ammotype'] = nil, ['image'] = 'weapon_candycande', ['unique'] = true, ['useable'] = true, ['description'] = 'Candy Cane'}, -- Handguns ['weapon_pistol'] = {['name'] = 'weapon_pistol', ['label'] = 'Walther P99', ['weight'] = 1000, ['type'] = 'weapon', ['ammotype'] = 'AMMO_PISTOL', ['image'] = 'weapon_pistol.png', ['unique'] = true, ['useable'] = false, ['description'] = 'A small firearm designed to be held in one hand'}, @@ -46,6 +47,7 @@ QBShared.Items = { ['weapon_ceramicpistol'] = {['name'] = 'weapon_ceramicpistol', ['label'] = 'Ceramic Pistol', ['weight'] = 1000, ['type'] = 'weapon', ['ammotype'] = 'AMMO_PISTOL', ['image'] = 'weapon_ceramicpistol.png', ['unique'] = true, ['useable'] = true, ['description'] = 'Weapon Ceramicpistol'}, ['weapon_navyrevolver'] = {['name'] = 'weapon_navyrevolver', ['label'] = 'Navy Revolver', ['weight'] = 1000, ['type'] = 'weapon', ['ammotype'] = 'AMMO_PISTOL', ['image'] = 'weapon_navyrevolver.png', ['unique'] = true, ['useable'] = true, ['description'] = 'Weapon Navyrevolver'}, ['weapon_gadgetpistol'] = {['name'] = 'weapon_gadgetpistol', ['label'] = 'Perico Pistol', ['weight'] = 1000, ['type'] = 'weapon', ['ammotype'] = 'AMMO_PISTOL', ['image'] = 'weapon_gadgetpistol.png', ['unique'] = true, ['useable'] = true, ['description'] = 'Weapon Gadgetpistol'}, + ['weapon_pistolxm3'] = {['name'] = 'weapon_pistolxm3', ['label'] = 'Pistol XM3', ['weight'] = 1000, ['type'] = 'weapon', ['ammotype'] = 'AMMO_PISTOL', ['image'] = 'weapon_pistolxm3.png', ['unique'] = true, ['useable'] = true, ['description'] = 'Pistol XM3'}, -- Submachine Guns ['weapon_microsmg'] = {['name'] = 'weapon_microsmg', ['label'] = 'Micro SMG', ['weight'] = 1000, ['type'] = 'weapon', ['ammotype'] = 'AMMO_SMG', ['image'] = 'weapon_microsmg.png', ['unique'] = true, ['useable'] = false, ['description'] = 'A handheld lightweight machine gun'}, @@ -103,6 +105,7 @@ QBShared.Items = { ['weapon_minigun'] = {['name'] = 'weapon_minigun', ['label'] = 'Minigun', ['weight'] = 1000, ['type'] = 'weapon', ['ammotype'] = 'AMMO_MINIGUN', ['image'] = 'weapon_minigun.png', ['unique'] = true, ['useable'] = false, ['description'] = 'A portable machine gun consisting of a rotating cluster of six barrels and capable of variable rates of fire of up to 6,000 rounds per minute'}, ['weapon_firework'] = {['name'] = 'weapon_firework', ['label'] = 'Firework Launcher', ['weight'] = 1000, ['type'] = 'weapon', ['ammotype'] = nil, ['image'] = 'weapon_firework.png', ['unique'] = true, ['useable'] = false, ['description'] = 'A device containing gunpowder and other combustible chemicals that causes a spectacular explosion when ignited'}, ['weapon_railgun'] = {['name'] = 'weapon_railgun', ['label'] = 'Railgun', ['weight'] = 1000, ['type'] = 'weapon', ['ammotype'] = nil, ['image'] = 'weapon_railgun.png', ['unique'] = true, ['useable'] = false, ['description'] = 'A weapon that uses electromagnetic force to launch high velocity projectiles'}, + ['weapon_railgunxm3'] = {['name'] = 'weapon_railgunxm3', ['label'] = 'Railgun XM3', ['weight'] = 1000, ['type'] = 'weapon', ['ammotype'] = nil, ['image'] = 'weapon_railgunxm3.png', ['unique'] = true, ['useable'] = false, ['description'] = 'A weapon that uses electromagnetic force to launch high velocity projectiles'}, ['weapon_hominglauncher'] = {['name'] = 'weapon_hominglauncher', ['label'] = 'Homing Launcher', ['weight'] = 1000, ['type'] = 'weapon', ['ammotype'] = 'AMMO_STINGER', ['image'] = 'weapon_hominglauncher.png', ['unique'] = true, ['useable'] = false, ['description'] = 'A weapon fitted with an electronic device that enables it to find and hit a target'}, ['weapon_compactlauncher'] = {['name'] = 'weapon_compactlauncher', ['label'] = 'Compact Launcher', ['weight'] = 1000, ['type'] = 'weapon', ['ammotype'] = nil, ['image'] = 'weapon_compactlauncher.png', ['unique'] = true, ['useable'] = false, ['description'] = 'A compact grenade launcher'}, ['weapon_rayminigun'] = {['name'] = 'weapon_rayminigun', ['label'] = 'Widowmaker', ['weight'] = 1000, ['type'] = 'weapon', ['ammotype'] = 'AMMO_MINIGUN', ['image'] = 'weapon_rayminigun.png', ['unique'] = true, ['useable'] = true, ['description'] = 'Weapon Rayminigun'}, @@ -381,7 +384,7 @@ QBShared.Items = { ['antipatharia_coral'] = {['name'] = 'antipatharia_coral', ['label'] = 'Antipatharia', ['weight'] = 1000, ['type'] = 'item', ['image'] = 'antipatharia_coral.png', ['unique'] = false, ['useable'] = false, ['shouldClose'] = true, ['combinable'] = nil, ['description'] = 'Its also known as black corals or thorn corals'}, ['diving_gear'] = {['name'] = 'diving_gear', ['label'] = 'Diving Gear', ['weight'] = 30000, ['type'] = 'item', ['image'] = 'diving_gear.png', ['unique'] = true, ['useable'] = true, ['shouldClose'] = true, ['combinable'] = nil, ['description'] = 'An oxygen tank and a rebreather'}, ['diving_fill'] = {['name'] = 'diving_fill', ['label'] = 'Diving Tube', ['weight'] = 3000, ['type'] = 'item', ['image'] = 'diving_tube.png', ['unique'] = true, ['useable'] = true, ['shouldClose'] = true, ['combinable'] = nil, ['discription'] = 'An oxygen tube and a rebreather'}, - + -- Other Tools ['casinochips'] = {['name'] = 'casinochips', ['label'] = 'Casino Chips', ['weight'] = 0, ['type'] = 'item', ['image'] = 'casinochips.png', ['unique'] = false, ['useable'] = false, ['shouldClose'] = false, ['combinable'] = nil, ['description'] = 'Chips For Casino Gambling'}, ['stickynote'] = {['name'] = 'stickynote', ['label'] = 'Sticky note', ['weight'] = 0, ['type'] = 'item', ['image'] = 'stickynote.png', ['unique'] = true, ['useable'] = false, ['shouldClose'] = false, ['combinable'] = nil, ['description'] = 'Sometimes handy to remember something :)'}, diff --git a/shared/vehicles.lua b/shared/vehicles.lua index 476cac4..b114d3f 100644 --- a/shared/vehicles.lua +++ b/shared/vehicles.lua @@ -5397,4 +5397,154 @@ QBShared.Vehicles = { ['hash'] = `tiptruck2`, ['shop'] = 'truck', }, -} + ['entity3'] = { --DLC +set sv_enforceGameBuild 2802 + ['name'] = 'Entity MT', + ['brand'] = 'Overflod', + ['model'] = 'entity3', + ['price'] = 200000, + ['category'] = 'super', + ['categoryLabel'] = 'Super', + ['hash'] = `entity3`, + ['shop'] = 'luxury', + }, + ['everon2'] = { + ['name'] = 'Everon Hotring', + ['brand'] = 'Karin', + ['model'] = 'everon2', + ['price'] = 80000, + ['category'] = 'sports', + ['categoryLabel'] = 'Sports', + ['hash'] = `everon`, + ['shop'] = 'pdm', + }, + ['issi8'] = { + ['name'] = 'Issi Rally', + ['brand'] = 'Weeny', + ['model'] = 'issi8', + ['price'] = 10000, + ['category'] = 'sports', + ['categoryLabel'] = 'Sports', + ['hash'] = `issi8`, + ['shop'] = 'pdm', + }, + ['journey2'] = { + ['name'] = 'Journey II', + ['brand'] = 'Zirconium', + ['model'] = 'journey2', + ['price'] = 7000, + ['category'] = 'vans', + ['categoryLabel'] = 'Vans', + ['hash'] = `journey2`, + ['shop'] = 'pdm', + }, + ['manchez3'] = { + ['name'] = 'Manchez Scout Classic', + ['brand'] = 'Maibatsu', + ['model'] = 'manchez3', + ['price'] = 15000, + ['category'] = 'motorcycles', + ['categoryLabel'] = 'Motorcycles', + ['hash'] = `manchez3`, + ['shop'] = 'pdm', + }, + ['r300'] = { + ['name'] = '300R', + ['brand'] = 'Annis', + ['model'] = 'r300', + ['price'] = 56000, + ['category'] = 'sports', + ['categoryLabel'] = 'Sports', + ['hash'] = `r300`, + ['shop'] = 'pdm', + }, + ['surfer3'] = { + ['name'] = 'Surfer Custom', + ['brand'] = 'BF', + ['model'] = 'surfer3', + ['price'] = 15000, + ['category'] = 'vans', + ['categoryLabel'] = 'Vans', + ['hash'] = `surfer3`, + ['shop'] = 'pdm', + }, + ['tahoma'] = { + ['name'] = 'Tahoma Coupe', + ['brand'] = 'Declasse', + ['model'] = 'tahoma', + ['price'] = 12000, + ['category'] = 'coupes', + ['categoryLabel'] = 'Coupes', + ['hash'] = `tahoma`, + ['shop'] = 'pdm', + }, + ['tulip2'] = { + ['name'] = 'Tulip M-100', + ['brand'] = 'Declasse', + ['model'] = 'tulip2', + ['price'] = 80000, + ['category'] = 'muscle', + ['categoryLabel'] = 'Muscle', + ['hash'] = `tulip2`, + ['shop'] = 'pdm', + }, + ['powersurge'] = { + ['name'] = 'Powersurge', + ['brand'] = 'Western', + ['model'] = 'powersurge', + ['price'] = 7000, + ['category'] = 'motorcycles', + ['categoryLabel'] = 'Motorcycles', + ['hash'] = `powersurge`, + ['shop'] = 'pdm', + }, + ['broadway'] = { + ['name'] = 'Broadway', + ['brand'] = 'Classique', + ['model'] = 'broadway', + ['price'] = 20000, + ['category'] = 'coupes', + ['categoryLabel'] = 'Coupes', + ['hash'] = `broadway`, + ['shop'] = 'pdm', + }, + ['panthere'] = { + ['name'] = 'Panthere', + ['brand'] = 'Toundra', + ['model'] = 'panthere', + ['price'] = 55000, + ['category'] = 'sports', + ['categoryLabel'] = 'Sports', + ['hash'] = `panthere`, + ['shop'] = 'pdm', + }, + ['boor'] = { + ['name'] = 'Boor', + ['brand'] = 'Karin', + ['model'] = 'boor', + ['price'] = 23000, + ['category'] = 'compacts', + ['categoryLabel'] = 'Compacts', + ['hash'] = `boor`, + ['shop'] = 'pdm', + }, + ['eudora'] = { + ['name'] = 'Eudora', + ['brand'] = 'Willard', + ['model'] = 'eudora', + ['price'] = 17000, + ['category'] = 'sedans', + ['categoryLabel'] = 'Sedans', + ['hash'] = `eudora`, + ['shop'] = 'pdm', + }, + ['virtue'] = { + ['name'] = 'Virtue', + ['brand'] = 'Ocelot', + ['model'] = 'virtue', + ['price'] = 72000, + ['category'] = 'super', + ['categoryLabel'] = 'Super', + ['hash'] = `virtue`, + ['shop'] = 'luxury', + }, +} \ No newline at end of file diff --git a/shared/weapons.lua b/shared/weapons.lua index 1982c4a..29c9062 100644 --- a/shared/weapons.lua +++ b/shared/weapons.lua @@ -25,6 +25,7 @@ QBShared.Weapons = { [`weapon_handcuffs`] = {['name'] = 'weapon_handcuffs', ['label'] = 'Handcuffs', ['weapontype'] = 'Melee', ['ammotype'] = nil, ['damagereason'] = 'Melee killed / Whacked / Executed / Beat down / Murdered / Battered'}, [`weapon_bread`] = {['name'] = 'weapon_bread', ['label'] = 'Baquette', ['weapontype'] = 'Melee', ['ammotype'] = nil, ['damagereason'] = 'Melee killed / Whacked / Executed / Beat down / Murdered / Battered'}, [`weapon_stone_hatchet`] = {['name'] = 'weapon_stone_hatchet', ['label'] = 'Stone Hatchet', ['weapontype'] = 'Melee', ['ammotype'] = nil, ['damagereason'] = 'Knifed / Stabbed / Eviscerated'}, + [`weapon_candycane`] = {['name'] = 'weapon_candycane', ['label'] = 'Candy Cane', ['weapontype'] = 'Melee', ['ammotype'] = nil, ['damagereason'] = 'Melee Killed / Whacked / Executed / Beat down / Musrdered / Battered / Candy Caned'}, -- Handguns [`weapon_pistol`] = {['name'] = 'weapon_pistol', ['label'] = 'Pistol', ['weapontype'] = 'Pistol', ['ammotype'] = 'AMMO_PISTOL', ['damagereason'] = 'Pistoled / Blasted / Plugged / Bust a cap in'}, @@ -47,6 +48,7 @@ QBShared.Weapons = { [`weapon_navyrevolver`] = {['name'] = 'weapon_navyrevolver', ['label'] = 'Navy Revolver', ['weapontype'] = 'Pistol', ['ammotype'] = 'AMMO_PISTOL', ['damagereason'] = 'Pistoled / Blasted / Plugged / Bust a cap in'}, [`weapon_gadgetpistol`] = {['name'] = 'weapon_gadgetpistol', ['label'] = 'Gadget Pistol', ['weapontype'] = 'Pistol', ['ammotype'] = 'AMMO_PISTOL', ['damagereason'] = 'Pistoled / Blasted / Plugged / Bust a cap in'}, [`weapon_stungun_mp`] = {['name'] = 'weapon_stungun_mp', ['label'] = 'Taser', ['weapontype'] = 'Pistol', ['ammotype'] = 'AMMO_STUNGUN', ['damagereason'] = 'Died'}, + [`weapon_pistolxm3`] = {['name'] = 'weapon_pistolxm3', ['label'] = 'Pistol XM3', ['weapontype'] = 'Pistol', ['ammotype'] = 'AMMO_PISTOL', ['damagereason'] = 'Pistoled / Blasted / Plaugged / Bust a cap in'}, -- Submachine Guns [`weapon_microsmg`] = {['name'] = 'weapon_microsmg', ['label'] = 'Micro SMG', ['weapontype'] = 'Submachine Gun', ['ammotype'] = 'AMMO_SMG', ['damagereason'] = 'Riddled / Drilled / Finished / Submachine Gunned'}, @@ -105,6 +107,7 @@ QBShared.Weapons = { [`weapon_minigun`] = {['name'] = 'weapon_minigun', ['label'] = 'Minigun', ['weapontype'] = 'Heavy Weapons', ['ammotype'] = 'AMMO_MINIGUN', ['damagereason'] = 'Killed / Exploded / Obliterated / Destroyed / Erased / Annihilated'}, [`weapon_firework`] = {['name'] = 'weapon_firework', ['label'] = 'Firework Launcher', ['weapontype'] = 'Heavy Weapons', ['ammotype'] = nil, ['damagereason'] = 'Killed / Exploded / Obliterated / Destroyed / Erased / Annihilated'}, [`weapon_railgun`] = {['name'] = 'weapon_railgun', ['label'] = 'Railgun', ['weapontype'] = 'Heavy Weapons', ['ammotype'] = nil, ['damagereason'] = 'Killed / Exploded / Obliterated / Destroyed / Erased / Annihilated'}, + [`weapon_railgunxm3`] = {['name'] = 'weapon_railgunxm3', ['label'] = 'Railgun XM3', ['weapontype'] = 'Heavy Weapons', ['ammotype'] = nil, ['damagereason'] = 'Killed / Exploded / Obliterated / Destroyed / Erased / Annihilated'}, [`weapon_hominglauncher`] = {['name'] = 'weapon_hominglauncher', ['label'] = 'Homing Launcher', ['weapontype'] = 'Heavy Weapons', ['ammotype'] = 'AMMO_STINGER', ['damagereason'] = 'Killed / Exploded / Obliterated / Destroyed / Erased / Annihilated'}, [`weapon_compactlauncher`] = {['name'] = 'weapon_compactlauncher', ['label'] = 'Compact Launcher', ['weapontype'] = 'Heavy Weapons', ['ammotype'] = nil, ['damagereason'] = 'Killed / Exploded / Obliterated / Destroyed / Erased / Annihilated'}, [`weapon_rayminigun`] = {['name'] = 'weapon_rayminigun', ['label'] = 'Ray Minigun', ['weapontype'] = 'Heavy Weapons', ['ammotype'] = 'AMMO_MINIGUN', ['damagereason'] = 'Killed / Exploded / Obliterated / Destroyed / Erased / Annihilated'},