housing update

resources/[housing]/brutal_housing/config.lua

@@ -11,12 +11,12 @@ More informations about the script:   https://docs.brutalscripts.com
 
 Config = {
     Core = 'QBCORE',  -- 'ESX' / 'QBCORE' | Other core setting on the 'core' folder.
-    VoiceSytem = 'yaca-voice', -- "pma-voice" / "mumble" / "SaltyChat"
-    Inventory = 'qb_inventory_new', -- 'ox_inventory' / 'qb_inventory_old'/ 'qb_inventory_new' / 'quasar_inventory' / 'chezza_inventory' / 'codem_inventory' / 'core_inventory' // Custom can be add in the cl_utils.lua!!!
-    Wardrobe = 'illenium_appearance', -- 'default' / 'ak47_clothing' / 'codem_apperance' / 'fivem_appearance' / 'illenium_appearance' / 'qb_clothing' / 'raid_clothes' / 'rcore_clothes' / 'rcore_clothing' / 'sleek_clothestore' / 'tgiann_clothing' // Custom can be add in the cl_utils.lua!!!
-    TextUI = 'ox_lib', -- false / 'brutal_textui' / 'ox_lib' / 'okokTextUI' / 'ESXTextUI' / 'QBDrawText' // Custom can be add in the cl_utils.lua!!!
+    VoiceSytem = 'pma-voice', -- "pma-voice" / "mumble" / "SaltyChat"
+    Inventory = 'ox_inventory', -- 'ox_inventory' / 'qb_inventory_old'/ 'qb_inventory_new' / 'quasar_inventory' / 'chezza_inventory' / 'codem_inventory' / 'core_inventory' // Custom can be add in the cl_utils.lua!!!
+    Wardrobe = 'default', -- 'default' / 'ak47_clothing' / 'codem_apperance' / 'fivem_appearance' / 'illenium_appearance' / 'qb_clothing' / 'raid_clothes' / 'rcore_clothes' / 'rcore_clothing' / 'sleek_clothestore' / 'tgiann_clothing' // Custom can be add in the cl_utils.lua!!!
+    TextUI = 'brutal_textui', -- false / 'brutal_textui' / 'ox_lib' / 'okokTextUI' / 'ESXTextUI' / 'QBDrawText' // Custom can be add in the cl_utils.lua!!!
     BrutalKeys = true, -- Buy here: https://store.brutalscripts.com
-    BrutalPoliceJob = false, -- Buy here: https://store.brutalscripts.com | Better connection
+    BrutalPoliceJob = true, -- Buy here: https://store.brutalscripts.com | Better connection
     BrutalNotify = false, -- Buy here: (4€+VAT) https://store.brutalscripts.com | Or set up your own notify >> cl_utils.lua
     
     SteamName = false, -- true = Steam name | false = character name
@@ -36,14 +36,16 @@ Config = {
 
     Blips = {
         available = true,
-            availableHouse = {label = "Kaufbares Haus", size = 0.7, sprite = 40, color = 2},
-            availableGarage = {label = "Kaufbare Garage", size = 0.7, sprite = 357, color = 2},
-        owned = false,
+            availableHouse = {label = "Available House", size = 0.7, sprite = 40, color = 2},
+            availableGarage = {label = "Available Garage", size = 0.7, sprite = 357, color = 2},
+        myproperties = true,
             myHouse = {label = "Mein Haus", size = 0.7, sprite = 40, color = 53},
             myGarage = {label = "Meine Garage", size = 0.7, sprite = 357, color = 53},
-            hasKeyHouse = {label = "Haus", size = 0.7, sprite = 40, color = 53},
-            hasKeyGarage = {label = "Haus", size = 0.7, sprite = 40, color = 53},
-            ownedHouse = {label = "Haus", size = 0.7, sprite = 40, color = 1},
+        haskey = true,
+            hasKeyHouse = {label = "House", size = 0.7, sprite = 40, color = 53},
+            hasKeyGarage = {label = "Garage", size = 0.7, sprite = 40, color = 53},
+        owned = false,
+            ownedHouse = {label = "House", size = 0.7, sprite = 40, color = 1},
             ownedGarage = {label = "Garage", size = 0.7, sprite = 357, color = 1},
         police = true,
             burglarAlarm = {label = "Einbruch Alarm", size = 1.0, sprite = 161, color = 1},
@@ -171,7 +173,7 @@ Config = {
         MyProperties = {
             Command = 'myproperties', 
             Suggestion = 'To manage your propertys',
-            Control = 'F7',  -- Controls list:  https://docs.fivem.net/docs/game-references/input-mapper-parameter-ids/keyboard/
+            Control = '',  -- Controls list:  https://docs.fivem.net/docs/game-references/input-mapper-parameter-ids/keyboard/
         },
 
         ServerDestroy = {

resources/[housing]/brutal_housing/core/server-core.lua

@@ -68,6 +68,11 @@ if Config['Core']:upper() == 'ESX' then
     function GetItemCount(source, item)
         local xPlayer = GETPFI(source)
 
+        if xPlayer.getInventoryItem(item) == nil then
+            print("^1PROBLEM!^7 The ^3" ..item.. "^7 item is not created.")
+            return 0
+        end
+
         if _esx_ == 'new' then
             return xPlayer.getInventoryItem(item).count
         else
@@ -151,7 +156,7 @@ elseif Config['Core']:upper() == 'QBCORE' then
     RESCB = Core.Functions.CreateCallback
     GETPFI = Core.Functions.GetPlayer
     RUI = Core.Functions.CreateUseableItem
-    SetJobEvent = 'QBCore:Server:SetGang'
+    SetJobEvent = 'QBCore:Server:SetJob'
     onPlayerDeath = GetResourceState("brutal_ambulancejob") == "started" and 'onPlayerDeath' or 'hospital:server:SetDeathStatus'
     SQLData = {
         players = 'players',
@@ -232,7 +237,7 @@ elseif Config['Core']:upper() == 'QBCORE' then
 
     function GetPlayerJob(source)
         local xPlayer = GETPFI(source)
-        return xPlayer.PlayerData.gang.name
+        return xPlayer.PlayerData.job.name
     end
 
     function CreateCoreJob(name, label, grades)

resources/[housing]/brutal_housing/fxmanifest.lua

@@ -4,7 +4,7 @@ lua54 'yes'
 
 author 'Keres & Dév'
 description 'Brutal Housing - store.brutalscripts.com'
-version '1.1.5'
+version '1.2.0'
 
 client_scripts { 
 	'config.lua',

resources/[housing]/brutal_housing/html/script.js

@@ -63,10 +63,6 @@ function t(key) {
 window.addEventListener('message', function(event) {
     let data = event.data
 
-    if (data.action == "NUILanguage") {
-        
-    }
-
     if (data.action === "OpenDuiMenu") {
         
         let DoorStatus = data.dooropen
@@ -1622,7 +1618,7 @@ function SwitchPage(id, noanim){
                <div class="key_section float-end home_con">
                     <div class="key_hider"></div>
                     <div class="lock"><i class="fa-solid fa-lock"></i></div>
-                    <div class="key_text">Buy the keys at<br><a onclick="window.invokeNative('openUrl', 'https://store.brutalscripts.com')" href="https://store.brutalscripts.com" rel="noopener noreferrer" target="_blank">store.brutalscripts.com</a></div>
+                    <div class="key_text">Key System Locked<br><a onclick="window.invokeNative('openUrl', 'https://store.brutalscripts.com')" href="https://store.brutalscripts.com" rel="noopener noreferrer" target="_blank">store.brutalscripts.com</a></div>
                     <div class="small_icon gold"><img src="assets/key.png"></div>
                     <div class="title">${t('remained')}</div>
                     <div class="key_count"></div>

resources/[housing]/brutal_housing/html/style.css

@@ -617,10 +617,10 @@ hr{
 .properties_menu .panel .key_section .key_hider{
     position: absolute;
     top: 100%;
-    left: 80%;
+    left: 20%;
     height: 300px;
     width: 500px;
-    transform: translate(-50%, -50%) rotate(-45deg);
+    transform: translate(-50%, -50%) rotate(45deg);
     background-color: rgba(33, 41, 50, 0.8);
     backdrop-filter: blur(5px) brightness(50%);
     z-index: 1000;
@@ -629,9 +629,9 @@ hr{
 .properties_menu .panel .key_section .key_text{
     position: absolute;
     bottom: 20px;
-    right: 20px;
+    left: 20px;
     width: 200px;
-    text-align: right;
+    text-align: left;
     font-size: 25px;
     line-height: 23px;
     font-weight: 500;
@@ -646,7 +646,7 @@ hr{
 .properties_menu .panel .key_section .lock{
     position: absolute;
     top: 50px;
-    right: 50px;
+    left: 50px;
     font-size: 40px;
     color: rgba(255, 255, 255, 0.747);
     z-index: 10000;