diff --git a/resources/[inventory]/cs_shops/config/config.lua b/resources/[inventory]/cs_shops/config/config.lua index 4ea57f000..421e0c06f 100644 --- a/resources/[inventory]/cs_shops/config/config.lua +++ b/resources/[inventory]/cs_shops/config/config.lua @@ -1011,8 +1011,18 @@ CodeStudio.Products = { itemPrice = 250, itemInfo = "", }, - - + ['ammo_beanbag'] = { + itemName = "Beanbag Munition", + itemStock = 250, + itemPrice = 250, + itemInfo = "", + }, + ['ammo_training'] = { + itemName = "Trainings Munition", + itemStock = 250, + itemPrice = 250, + itemInfo = "", + }, } }, diff --git a/resources/[inventory]/tgiann-inventory/configs/configAmmo.lua b/resources/[inventory]/tgiann-inventory/configs/configAmmo.lua index 6258b0554..4f3fe76f0 100644 --- a/resources/[inventory]/tgiann-inventory/configs/configAmmo.lua +++ b/resources/[inventory]/tgiann-inventory/configs/configAmmo.lua @@ -68,7 +68,18 @@ config.ammo = { ammo = 30, -- Only works on ammoSystem 1 maxAmmoInWeapon = 250 -- Only works on ammoSystem 1 }, - + { + ammoType = "AMMO_BEANBAG", + item = "ammo_beanbag", + ammo = 30, -- Only works on ammoSystem 1 + maxAmmoInWeapon = 250 -- Only works on ammoSystem 1 + }, + { + ammoType = "AMMO_TRAINING", + item = "ammo_training", + ammo = 30, -- Only works on ammoSystem 1 + maxAmmoInWeapon = 250 -- Only works on ammoSystem 1 + }, -- POLICE { diff --git a/resources/[inventory]/tgiann-inventory/items/items.lua b/resources/[inventory]/tgiann-inventory/items/items.lua index 56b8b8c4f..04b4ef26b 100644 --- a/resources/[inventory]/tgiann-inventory/items/items.lua +++ b/resources/[inventory]/tgiann-inventory/items/items.lua @@ -3636,9 +3636,20 @@ itemsData = { description = 'Munition für die Beanbag Shotgun', image = 'beanbag_ammo.png', shouldClose = true, - label = 'Beanbag Ammo', + label = 'Beanbag Munition', name = 'ammo_beanbag', }, + ammo_training = { + useable = true, + weight = 100, + type = 'item', + unique = false, + description = 'Munition für die Trainingwaffen', + image = 'training_ammo.png', + shouldClose = true, + label = 'Trainings Munition', + name = 'ammo_training', + }, burrito = { useable = true, weight = 100, diff --git a/resources/[inventory]/tgiann-inventory/items/weapons.lua b/resources/[inventory]/tgiann-inventory/items/weapons.lua index 0e290fd52..f1a31560d 100644 --- a/resources/[inventory]/tgiann-inventory/items/weapons.lua +++ b/resources/[inventory]/tgiann-inventory/items/weapons.lua @@ -40,7 +40,7 @@ local weaponsList = { weapon_revolver = { name = 'weapon_revolver', label = 'Revolver', weight = 1000, ammotype = 'AMMO_PISTOL', image = 'weapon_revolver.png', description = 'A pistol with revolving chambers enabling several shots to be fired without reloading' }, weapon_revolver_mk2 = { name = 'weapon_revolver_mk2', label = 'Violence', weight = 1000, ammotype = 'AMMO_PISTOL', image = 'weapon_revolver_mk2.png', description = 'da Violence' }, weapon_doubleaction = { name = 'weapon_doubleaction', label = 'Double Action Revolver', weight = 1000, ammotype = 'AMMO_PISTOL', image = 'weapon_doubleaction.png', description = 'Double Action Revolver' }, - weapon_snspistol_mk2 = { name = 'weapon_snspistol_mk2', label = 'Trainings Pistole', weight = 1000, ammotype = 'AMMO_PISTOL', image = 'weapon_snspistol_mk2.png', description = 'SNS Pistol MK2' }, + weapon_snspistol_mk2 = { name = 'weapon_snspistol_mk2', label = 'Trainings Pistole', weight = 1000, ammotype = 'AMMO_TRAINING', image = 'weapon_snspistol_mk2.png', description = 'SNS Pistol MK2' }, weapon_raypistol = { name = 'weapon_raypistol', label = 'Up-n-Atomizer', weight = 1000, ammotype = 'AMMO_PISTOL', image = 'weapon_raypistol.png', description = 'Weapon Raypistol' }, weapon_ceramicpistol = { name = 'weapon_ceramicpistol', label = 'Ceramic Pistol', weight = 1000, ammotype = 'AMMO_PISTOL', image = 'weapon_ceramicpistol.png', description = 'Weapon Ceramicpistol' }, weapon_navyrevolver = { name = 'weapon_navyrevolver', label = 'Navy Revolver', weight = 1000, ammotype = 'AMMO_PISTOL', image = 'weapon_navyrevolver.png', description = 'Weapon Navyrevolver' }, @@ -67,13 +67,13 @@ local weaponsList = { weapon_dbshotgun = { name = 'weapon_dbshotgun', label = 'Double-barrel Shotgun', weight = 1000, ammotype = 'AMMO_SHOTGUN', image = 'weapon_dbshotgun.png', description = 'A shotgun with two parallel barrels, allowing two single shots to be fired in quick succession' }, weapon_autoshotgun = { name = 'weapon_autoshotgun', label = 'Auto Shotgun', weight = 1000, ammotype = 'AMMO_SHOTGUN', image = 'weapon_autoshotgun.png', description = 'A shotgun capable of rapid continous fire' }, weapon_pumpshotgun_mk2 = { name = 'weapon_pumpshotgun_mk2', label = 'Pumpshotgun Mk II', weight = 1000, ammotype = 'AMMO_SHOTGUN', image = 'weapon_pumpshotgun_mk2.png', description = 'Pumpshotgun MK2' }, - weapon_combatshotgun = { name = 'weapon_combatshotgun', label = 'Beanbag Shotgun', weight = 1000, ammotype = 'AMMO_SHOTGUN', image = 'weapon_combatshotgun.png', description = 'Weapon Combatshotgun' }, + weapon_combatshotgun = { name = 'weapon_combatshotgun', label = 'Beanbag Shotgun', weight = 1000, ammotype = 'AMMO_BEANBAG', image = 'weapon_combatshotgun.png', description = 'Weapon Combatshotgun' }, -- Assault Rifles weapon_assaultrifle = { name = 'weapon_assaultrifle', label = 'AK 75', weight = 1000, ammotype = 'AMMO_RIFLE', image = 'weapon_assaultrifle.png', description = 'A rapid-fire, magazine-fed automatic rifle designed for infantry use' }, weapon_assaultrifle_mk2 = { name = 'weapon_assaultrifle_mk2', label = 'Assault Rifle Mk II', weight = 1000, ammotype = 'AMMO_RIFLE', image = 'weapon_assaultrifle_mk2.png', description = 'Assault Rifle MK2' }, weapon_carbinerifle = { name = 'weapon_carbinerifle', label = 'AR 15', weight = 1000, ammotype = 'AMMO_RIFLE', image = 'weapon_carbinerifle.png', description = 'A light weight automatic rifle' }, - weapon_carbinerifle_mk2 = { name = 'weapon_carbinerifle_mk2', label = 'Trainings Gewehr', weight = 1000, ammotype = 'AMMO_RIFLE', image = 'weapon_carbinerifle_mk2.png', description = 'Carbine Rifle MK2' }, + weapon_carbinerifle_mk2 = { name = 'weapon_carbinerifle_mk2', label = 'Trainings Gewehr', weight = 1000, ammotype = 'AMMO_TRAINING', image = 'weapon_carbinerifle_mk2.png', description = 'Carbine Rifle MK2' }, weapon_advancedrifle = { name = 'weapon_advancedrifle', label = 'Advanced Rifle', weight = 1000, ammotype = 'AMMO_RIFLE', image = 'weapon_advancedrifle.png', description = 'An assault version of a rapid-fire, magazine-fed automatic rifle designed for infantry use' }, weapon_specialcarbine = { name = 'weapon_specialcarbine', label = 'KH 450', weight = 1000, ammotype = 'AMMO_RIFLE', image = 'weapon_specialcarbine.png', description = 'An extremely versatile assault rifle for any combat situation' }, weapon_bullpuprifle = { name = 'weapon_bullpuprifle', label = 'QBX-92-3', weight = 1000, ammotype = 'AMMO_RIFLE', image = 'weapon_bullpuprifle.png', description = 'A compact automatic assault rifle' },