From 7c015c2472bbd101541dd399699ca4d86c753fc5 Mon Sep 17 00:00:00 2001 From: Nordi98 Date: Sun, 20 Jul 2025 01:29:28 +0200 Subject: [PATCH] ed --- .../[inventory]/cs_shops/config/config.lua | 34 +++++++++--- .../[weapons]/Klog19FDE/cl_weaponNames.lua | 2 +- .../weaponcomponents.meta | 54 +++++++++++++++++++ .../weaponcomponents.meta | 30 +++++++++++ .../weaponcomponents.meta | 30 +++++++++++ .../weaponcomponents.meta | 28 ++++++++++ .../Klog19FDE/meta/pedpersonality.meta | 38 ++++++------- .../Klog19FDE/meta/weaponanimations.meta | 12 ++--- .../[weapons]/Klog19FDE/meta/weapons.meta | 47 ++++++++++++++-- 9 files changed, 238 insertions(+), 37 deletions(-) create mode 100644 resources/[jobs]/[weapons]/Klog19FDE/meta/components/COMPONENT_AT_PI_FLSH_02/weaponcomponents.meta create mode 100644 resources/[jobs]/[weapons]/Klog19FDE/meta/components/COMPONENT_AT_PI_RAIL/weaponcomponents.meta create mode 100644 resources/[jobs]/[weapons]/Klog19FDE/meta/components/COMPONENT_AT_SCOPE_MACRO/weaponcomponents.meta create mode 100644 resources/[jobs]/[weapons]/Klog19FDE/meta/components/COMPONENT_PISTOL_MK2_CLIP_01/weaponcomponents.meta diff --git a/resources/[inventory]/cs_shops/config/config.lua b/resources/[inventory]/cs_shops/config/config.lua index e316a1b94..b0514e40a 100644 --- a/resources/[inventory]/cs_shops/config/config.lua +++ b/resources/[inventory]/cs_shops/config/config.lua @@ -1500,7 +1500,7 @@ CodeStudio.Products = { itemInfo = "", }, ['weapon_klog19fde'] = { - itemName = "Klog 19 FDE", + itemName = "Klog 19 FD", itemStock = 50, itemPrice = 0, itemInfo = "", @@ -3036,17 +3036,15 @@ CodeStudio.Shops = { }, }, [4] = { - ShopName = 'Admin Shop', + ShopName = 'Crime Waffen', Category = { [1] = 'weapons', - [2] = 'police_weapons', - [3] = 'ammo', - [4] = 'attachtments', + [2] = 'ammo', }, requiredJob = { - ['admin'] = {0} + ['sud'] = {0} }, Locations = { vector4(4435.1216, -4470.0146, 4.3284, 3) @@ -3330,6 +3328,30 @@ CodeStudio.Shops = { }, }, + [17] = { + ShopName = 'Legale Waffen', + Category = { + [1] = 'police_weapons', + [2] = 'ammo', + + }, + requiredJob = { + ['sud'] = {0} + }, + Locations = { + vector4(150.3828, 288.1915, 109.9736, 3) + }, + Interaction = { + targetIcon = 'fas fa-gun', + targetLabel = 'Admin Shop öffnen', + spawnPed = false, -- Put false if you dont need ped + scenario = 'WORLD_HUMAN_STAND_MOBILE', --Ped Scenario Animation put false if you dont need + radius = 2.5, + }, + }, + + + } \ No newline at end of file diff --git a/resources/[jobs]/[weapons]/Klog19FDE/cl_weaponNames.lua b/resources/[jobs]/[weapons]/Klog19FDE/cl_weaponNames.lua index 51b02f1c7..23c721af5 100644 --- a/resources/[jobs]/[weapons]/Klog19FDE/cl_weaponNames.lua +++ b/resources/[jobs]/[weapons]/Klog19FDE/cl_weaponNames.lua @@ -1 +1 @@ -AddTextEntry("WEAPON_KLOG19FDE", "Klog 19 FDE") +AddTextEntry("weapon_klog19fde", "Klog 19 FDE") diff --git a/resources/[jobs]/[weapons]/Klog19FDE/meta/components/COMPONENT_AT_PI_FLSH_02/weaponcomponents.meta b/resources/[jobs]/[weapons]/Klog19FDE/meta/components/COMPONENT_AT_PI_FLSH_02/weaponcomponents.meta new file mode 100644 index 000000000..26ef5de0d --- /dev/null +++ b/resources/[jobs]/[weapons]/Klog19FDE/meta/components/COMPONENT_AT_PI_FLSH_02/weaponcomponents.meta @@ -0,0 +1,54 @@ + + + + + + COMPONENT_AT_PI_FLSH_02 + w_at_pi_flsh_2 + WCT_FLASH + WCD_FLASH + AAPFlsh + WAPFlshLasr + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Gun_FLMuzzle + Bulb_On + Bulb_Off + + + + + diff --git a/resources/[jobs]/[weapons]/Klog19FDE/meta/components/COMPONENT_AT_PI_RAIL/weaponcomponents.meta b/resources/[jobs]/[weapons]/Klog19FDE/meta/components/COMPONENT_AT_PI_RAIL/weaponcomponents.meta new file mode 100644 index 000000000..124bd0585 --- /dev/null +++ b/resources/[jobs]/[weapons]/Klog19FDE/meta/components/COMPONENT_AT_PI_RAIL/weaponcomponents.meta @@ -0,0 +1,30 @@ + + + + + + COMPONENT_AT_PI_RAIL + w_at_pi_rail_1 + WCT_SCOPE_MAC + WCD_SCOPE_MAC + AAPScop + WAPScop + + + + + + + + + + + + + + + + + + + diff --git a/resources/[jobs]/[weapons]/Klog19FDE/meta/components/COMPONENT_AT_SCOPE_MACRO/weaponcomponents.meta b/resources/[jobs]/[weapons]/Klog19FDE/meta/components/COMPONENT_AT_SCOPE_MACRO/weaponcomponents.meta new file mode 100644 index 000000000..befc01418 --- /dev/null +++ b/resources/[jobs]/[weapons]/Klog19FDE/meta/components/COMPONENT_AT_SCOPE_MACRO/weaponcomponents.meta @@ -0,0 +1,30 @@ + + + + + + COMPONENT_AT_SCOPE_MACRO + w_at_pi_rail_1 + WCT_SCOPE_MAC + WCD_SCOPE_MAC + AAPScop + WAPScop + + + + + + + + + + + + + + + + + + + diff --git a/resources/[jobs]/[weapons]/Klog19FDE/meta/components/COMPONENT_PISTOL_MK2_CLIP_01/weaponcomponents.meta b/resources/[jobs]/[weapons]/Klog19FDE/meta/components/COMPONENT_PISTOL_MK2_CLIP_01/weaponcomponents.meta new file mode 100644 index 000000000..dcf03be52 --- /dev/null +++ b/resources/[jobs]/[weapons]/Klog19FDE/meta/components/COMPONENT_PISTOL_MK2_CLIP_01/weaponcomponents.meta @@ -0,0 +1,28 @@ + + + + + + COMPONENT_PISTOL_MK2_CLIP_01 + w_pi_pistolmk2_mag2 + WCT_CLIP1 + WCD_P_CLIP1 + AAPClip + WAPClip + + + + + + + + + + + + + + + + + diff --git a/resources/[jobs]/[weapons]/Klog19FDE/meta/pedpersonality.meta b/resources/[jobs]/[weapons]/Klog19FDE/meta/pedpersonality.meta index 214d6266e..9ad8606af 100644 --- a/resources/[jobs]/[weapons]/Klog19FDE/meta/pedpersonality.meta +++ b/resources/[jobs]/[weapons]/Klog19FDE/meta/pedpersonality.meta @@ -7,7 +7,7 @@ - WEAPON_KLOG19FDE + weapon_klog19fde unarmed_holster_1h @@ -18,7 +18,7 @@ - WEAPON_KLOG19FDE + weapon_klog19fde 2h_melee_holster_1h @@ -29,7 +29,7 @@ - WEAPON_KLOG19FDE + weapon_klog19fde 1h_holster_1h @@ -40,7 +40,7 @@ - WEAPON_KLOG19FDE + weapon_klog19fde 2h_holster_1h @@ -51,7 +51,7 @@ - WEAPON_KLOG19FDE + weapon_klog19fde mini_holster_1h @@ -62,7 +62,7 @@ - WEAPON_KLOG19FDE + weapon_klog19fde unarmed_holster_1h @@ -73,7 +73,7 @@ - WEAPON_KLOG19FDE + weapon_klog19fde unarmed_holster_1h @@ -84,7 +84,7 @@ - WEAPON_KLOG19FDE + weapon_klog19fde 1h_holster_1h @@ -95,7 +95,7 @@ - WEAPON_KLOG19FDE + weapon_klog19fde 2h_holster_1h @@ -109,7 +109,7 @@ - WEAPON_KLOG19FDE + weapon_klog19fde @@ -133,7 +133,7 @@ - WEAPON_KLOG19FDE + weapon_klog19fde @@ -164,7 +164,7 @@ - WEAPON_KLOG19FDE + weapon_klog19fde @@ -188,7 +188,7 @@ - WEAPON_KLOG19FDE + weapon_klog19fde @@ -219,7 +219,7 @@ - WEAPON_KLOG19FDE + weapon_klog19fde @@ -243,7 +243,7 @@ - WEAPON_KLOG19FDE + weapon_klog19fde @@ -274,7 +274,7 @@ - WEAPON_KLOG19FDE + weapon_klog19fde @@ -298,7 +298,7 @@ - WEAPON_KLOG19FDE + weapon_klog19fde @@ -329,7 +329,7 @@ - WEAPON_KLOG19FDE + weapon_klog19fde @@ -353,7 +353,7 @@ - WEAPON_KLOG19FDE + weapon_klog19fde diff --git a/resources/[jobs]/[weapons]/Klog19FDE/meta/weaponanimations.meta b/resources/[jobs]/[weapons]/Klog19FDE/meta/weaponanimations.meta index fae79a217..c17f7f647 100644 --- a/resources/[jobs]/[weapons]/Klog19FDE/meta/weaponanimations.meta +++ b/resources/[jobs]/[weapons]/Klog19FDE/meta/weaponanimations.meta @@ -4,7 +4,7 @@ - + cover@move@ai@base@1h @@ -53,7 +53,7 @@ Default - + @@ -102,7 +102,7 @@ Default - + move_m@generic @@ -166,7 +166,7 @@ Default - + cover@move@ai@base@1h @@ -228,7 +228,7 @@ Default - + cover@move@ai@base@1h @@ -289,7 +289,7 @@ Default - + cover@move@ai@base@1h diff --git a/resources/[jobs]/[weapons]/Klog19FDE/meta/weapons.meta b/resources/[jobs]/[weapons]/Klog19FDE/meta/weapons.meta index c8034fa60..ce9cd1da3 100644 --- a/resources/[jobs]/[weapons]/Klog19FDE/meta/weapons.meta +++ b/resources/[jobs]/[weapons]/Klog19FDE/meta/weapons.meta @@ -6,7 +6,7 @@ - SLOT_WEAPON_KLOG19FDE + SLOT_weapon_klog19fde @@ -15,10 +15,10 @@ - WEAPON_KLOG19FDE + weapon_klog19fde w_pi_klog19fde - SLOT_WEAPON_KLOG19FDE + SLOT_weapon_klog19fde BULLET DONTCARE @@ -245,13 +245,50 @@ PICKUP_WEAPON_COMBATPISTOL PICKUP_AMMO_BULLET_MP - WEAPON_KLOG19FDE + weapon_klog19fde MMI_1Handed CMBTPISTOL Normal - + + + WAPScop + + + + COMPONENT_AT_SCOPE_MACRO + + + + + WAPScop + + + + COMPONENT_AT_PI_RAIL + + + + + WAPClip + + + + COMPONENT_PISTOL_MK2_CLIP_01 + + + + + WAPFlshLasr + + + + COMPONENT_AT_PI_FLSH_02 + + + + CarriedInHand Gun CanLockonOnFoot CanLockonInVehicle CanFreeAim AnimReload AnimCrouchFire UsableOnFoot UsableClimbing UsableInCover AllowCloseQuarterKills HasLowCoverReloads HasLowCoverSwaps QuitTransitionToIdleIntroOnWeaponChange DisableLeftHandIkWhenOnFoot TorsoIKForWeaponBlock UseFPSAimIK UseFPSSecondaryMotion