diff --git a/resources/[inventory]/cs_shops/config/config.lua b/resources/[inventory]/cs_shops/config/config.lua index b0514e40a..f5477116a 100644 --- a/resources/[inventory]/cs_shops/config/config.lua +++ b/resources/[inventory]/cs_shops/config/config.lua @@ -1499,8 +1499,8 @@ CodeStudio.Products = { itemPrice = 0, itemInfo = "", }, - ['weapon_klog19fde'] = { - itemName = "Klog 19 FD", + ['weapon_combatpistol'] = { + itemName = "Klog 17", itemStock = 50, itemPrice = 0, itemInfo = "", diff --git a/resources/[inventory]/tgiann-inventory/configs/configAttachment.lua b/resources/[inventory]/tgiann-inventory/configs/configAttachment.lua index c101f5770..4d3d1b471 100644 --- a/resources/[inventory]/tgiann-inventory/configs/configAttachment.lua +++ b/resources/[inventory]/tgiann-inventory/configs/configAttachment.lua @@ -95,22 +95,6 @@ config.attachment.weaponAttachment = { { item = "free", component = "COMPONENT_AT_PI_SUPP_02" }, }, }, - ["weapon_klog19fde"] = { - ["magazine"] = { - { item = "free", component = "COMPONENT_PISTOL_MK2_CLIP_01", default = true }, - { item = "free", component = "COMPONENT_PISTOL_MK2_CLIP_02" }, - }, - ["flashlight"] = { - { item = "free", component = "COMPONENT_AT_PI_FLSH_02" }, - }, - ["scope"] = { - { item = "free", component = "COMPONENT_AT_PI_RAIL" }, - }, - ["muzzle"] = { - { item = "free", component = "COMPONENT_AT_PI_COMP" }, - { item = "free", component = "COMPONENT_AT_PI_SUPP_02" }, - }, - }, diff --git a/resources/[inventory]/tgiann-inventory/items/items.lua b/resources/[inventory]/tgiann-inventory/items/items.lua index aa8f668ff..f39fde9fa 100644 --- a/resources/[inventory]/tgiann-inventory/items/items.lua +++ b/resources/[inventory]/tgiann-inventory/items/items.lua @@ -5630,7 +5630,7 @@ itemsData = { unique = true, description = 'Eine kompakte, zuverlässige 9mm-Dienstpistole mit 17 Schuss Magazin.', image = 'screenshot_434-removebg-preview.png', - label = 'Bretta Storm', + label = 'Klog 17', ammotype = 'AMMO_PISTOL', name = 'weapon_combatpistol', }, @@ -10731,17 +10731,7 @@ itemsData = { image = 'line_coke.png', name = 'line_coke', }, - weapon_klog19fde = { - shouldClose = true, - type = 'weapon', - description = '', - weight = 1000, - label = 'Klog 19 FDE', - unique = true, - useable = true, - image = 'weapon_klog19fde.png', - name = 'weapon_klog19fde', - }, + } diff --git a/resources/[inventory]/tgiann-inventory/items/weapons.lua b/resources/[inventory]/tgiann-inventory/items/weapons.lua index 70cd2b173..b6b9ca315 100644 --- a/resources/[inventory]/tgiann-inventory/items/weapons.lua +++ b/resources/[inventory]/tgiann-inventory/items/weapons.lua @@ -28,7 +28,7 @@ local weaponsList = { -- Handguns weapon_pistol = { name = 'weapon_pistol', label = 'Bretta', weight = 1000, ammotype = 'AMMO_PISTOL', image = 'weapon_pistol.png', description = 'A small firearm designed to be held in one hand' }, weapon_pistol_mk2 = { name = 'weapon_pistol_mk2', label = 'Klog 19', weight = 1000, ammotype = 'AMMO_PISTOL', image = 'weapon_pistol_mk2.png', description = 'An upgraded small firearm designed to be held in one hand' }, - weapon_combatpistol = { name = 'weapon_combatpistol', label = 'Bretta Storm', weight = 1000, ammotype = 'AMMO_PISTOL', image = 'weapon_combatpistol.png', description = 'A combat version small firearm designed to be held in one hand' }, + weapon_combatpistol = { name = 'weapon_combatpistol', label = 'Klog 17', weight = 1000, ammotype = 'AMMO_PISTOL', image = 'weapon_combatpistol.png', description = 'A combat version small firearm designed to be held in one hand' }, weapon_appistol = { name = 'weapon_appistol', label = 'Klog 19A', weight = 1000, ammotype = 'AMMO_PISTOL', image = 'weapon_appistol.png', description = 'A small firearm designed to be held in one hand that is automatic' }, weapon_stungun = { name = 'weapon_stungun', label = 'Taser X2', weight = 1000, ammotype = 'AMMO_STUNGUN', image = 'weapon_stungun.png', description = 'Unbegrenzte Maaaaacht!!!' }, weapon_pistol50 = { name = 'weapon_pistol50', label = 'Tropical Eagle', weight = 1000, ammotype = 'AMMO_PISTOL', image = 'weapon_pistol50.png', description = 'A .50 caliber firearm designed to be held with both hands' }, @@ -137,8 +137,7 @@ local weaponsList = { weapon_airsoftak74 = { name = 'weapon_airsoftak74', label = 'Softair AK75', weight = 1000, ammotype = 'AMMO_AIRSOFT', image = 'weapon_airsoftak74.png', description = '' }, -- Addon - weapon_klog19fde = { name = 'weapon_klog19fde', label = 'Klog 19 FDE', weight = 1000, ammotype = 'AMMO_PISTOL', image = 'weapon_klog19fde.png', description = '' }, - + } local ammoTypeToPolice = {