Merge branch 'master' of https://git.evolution-state-life.de/Evolution-State-Life/Main

resources/[carscripts]/mh_garage/config/config.lua

@@ -35,7 +35,26 @@ Config.Zonen = {
             vector4(239.2613, -808.8478, 29.8017, 339.9538),
             vector4(242.8265, -809.7695, 29.7245, 338.3645)
         }
-    }
+    },
+    {
+        name = "southsidegarage",
+        price = nil, --pro FZ
+        NPC = {
+            spawn = vector4(-75.0640, -1825.1317, 16.9420, 247.3029),
+            model = "s_m_m_security_01",
+            distance = 30.0
+        },
+        vehicle_spawn = {
+            vector4(-63.1251, -1840.9729, 26.6839, 333.5259),
+            vector4(-59.9826, -1842.8257, 26.5781, 309.9320),
+            vector4(-57.7272, -1845.1802, 26.4850, 299.0940),
+            vector4(-54.8302, -1847.1196, 26.3812, 301.5244)
+        }
+    },
+
+
+
+
 }
 
 Config.Log = {

resources/[jobs]/[civ]/nordi_delivery/config.lua

@@ -8,11 +8,11 @@ return {
             vehicleSpawn = vec4(816.1749, -119.5066, 80.3096, 241.5598),
             blipName = "Zum Durstigen Dackel"
         },
-        -- Pizzeria 2
+        -- Kayas
         {
-            coords = vec4(1250.35, -359.8, 68.54, 164.05),
-            vehicleSpawn = vec4(1246.3, -365.58, 68.32, 159.15),
-            blipName = "Pizza Job - Vinewood"
+            coords = vec4(1549.1619, 3795.8757, 24.5129, 47.2426),
+            vehicleSpawn = vec4(1573.0295, 3795.8474, 34.4144, 140.1099),
+            blipName = "Kayas Restaurant"
         },
         -- Füge weitere Locations nach Bedarf hinzu
     },
@@ -23,7 +23,7 @@ return {
     AllowedJobs = {
         'dackel',
         'delivery',
-        'restaurant'
+        'kayas'
     },
     RequiredJobGrade = 0
 }

resources/[jobs]/[weapons]/cavok_weapon_handling/config.lua

@@ -383,6 +383,8 @@ Config.WeaponDamage = {
     [205991906]     = 0.0,       --WEAPON_HEAVYSNIPER
     [177293209]     = 1.0,       --WEAPON_HEAVYSNIPERMK2
     [-952879014]    = 0.2,       --WEAPON_MARKSMANRIFLE
+    [-1327835241]    = 0.2,       --Huntingrifle
+    [1785463520]    = 0.2,       --weapon_marksmanrifle_mk2
 
     --SHOTGUNS
     [487013001]     = 0.6,        --WEAPON_PUMPSHOTGUN

resources/[phone]/roadphone/addons/jobcalls/config.lua

@@ -3,14 +3,36 @@ JobCalls = {}
 JobCalls.Positions = {
     {
         name = "Police",
-        coords = vector3(441.0, -981.0, 29.7),
+        coords = vector3(454.1935, -984.5326, 30.6610),
+                 vector3(1825.2719, 3670.9895, 34.4050),
         number = 911,
         needjob = "police",
-        useMarker = false,
+        useMarker = true,
         marker = {
             drawDistance = 10.0,
             type = 25,
-            size = {x = 4.0, y = 4.0, z = 4.0},
+            size = {x = 1.0, y = 1.0, z = 1.0},
+            color =  {r = 50, g = 50, b = 204}
+        },
+        blip = {
+            active = false,
+            name = "Police Control center",
+            sprite = 60,
+            color = 38,
+            scale = 0.8,
+            display = 4
+        }
+    },
+    {
+        name = "Marshals",
+        coords = vector3(-451.4551, 6009.3691, 31.9537),
+        number = 916,
+        needjob = "marshal",
+        useMarker = true,
+        marker = {
+            drawDistance = 10.0,
+            type = 25,
+            size = {x = 1.0, y = 1.0, z = 1.0},
             color =  {r = 50, g = 50, b = 204}
         },
         blip = {
@@ -24,14 +46,14 @@ JobCalls.Positions = {
     },
     {
         name = "Ambulance",
-        coords = vector3(298.0, -584.0, 42.3),
-        number = 112,
+        coords = vector3(-1850.4585, -335.7708, 49.4513),
+        number = 912,
         needjob = "ambulance",
-        useMarker = false,
+        useMarker =true,
         marker = {
             drawDistance = 10.0,
             type = 25,
-            size = {x = 4.0, y = 4.0, z = 4.0},
+            size = {x = 1.0, y = 1.0, z = 1.0},
             color =  {r = 50, g = 50, b = 204}
         },
         blip = {
@@ -42,5 +64,71 @@ JobCalls.Positions = {
             scale = 0.8,
             display = 4
         }
-    }
+    },
+    {
+        name = "PHP",
+        coords = vector3(-922.4119, -2034.5383, 9.5075),
+        number = 5556969,
+        needjob = "mechanic",
+        useMarker = true,
+        marker = {
+            drawDistance = 10.0,
+            type = 25,
+            size = {x = 1.0, y = 1.0, z = 1.0},
+            color =  {r = 50, g = 50, b = 204}
+        },
+        blip = {
+            active = false,
+            name = "Petrol Head Control Center",
+            sprite = 60,
+            color = 38,
+            scale = 0.8,
+            display = 4
+        }
+    },
+    {
+        name = "Taxi",
+        coords = vector3(-1249.6287, -285.1877, 37.7370),
+        number = 555,
+        needjob = "cab",
+        useMarker = true,
+        marker = {
+            drawDistance = 10.0,
+            type = 25,
+            size = {x = 1.0, y = 1.0, z = 1.0},
+            color =  {r = 50, g = 50, b = 204}
+        },
+        blip = {
+            active = false,
+            name = "Taxi Control Center",
+            sprite = 60,
+            color = 38,
+            scale = 0.8,
+            display = 4
+        }
+        },
+    {
+        name = "Kayas",
+        coords = vector3(1532.6082, 3781.7351, 34.5125),
+        number = 5553022,
+        needjob = "kayas",
+        useMarker = true,
+        marker = {
+            drawDistance = 10.0,
+            type = 25,
+            size = {x = 1.0, y = 1.0, z = 1.0},
+            color =  {r = 50, g = 50, b = 204}
+        },
+        blip = {
+            active = false,
+            name = "Kayas Control Center",
+            sprite = 60,
+            color = 38,
+            scale = 0.8,
+            display = 4
+        }
+        },
+
+
+
 }

resources/[phone]/roadphone/config.lua

@@ -32,8 +32,8 @@ Config.Items = {
 }
 
 -- Target System
-Config.UseTarget = false 
-Config.TargetSystem = "ox_target" -- Options: qb-target, ox_target
+Config.UseTarget = true
+Config.TargetSystem = "qb_target" -- Options: qb-target, ox_target
 
 -- Voice Chat Integration
 Config.MumbleExport = "mumble-voip"

resources/[phone]/roadphone/public/static/config/config.json

@@ -7,7 +7,7 @@
     "unemployedJob": "unemployed",
     "mail_domain": "@cloud.org",
     "IngameTime": false,
-    "DeliverCar": true,
+    "DeliverCar": false,
     "FaceTime": true,
     "NewsAppAccess": [
         "police",
@@ -71,7 +71,15 @@
             "number": 5556969,
             "img": "/public/img/service/php.png",
             "acceptMessage": false
+        },
+        {
+            "name": "Kayas Restaurant",
+            "number": 5553022,
+            "img": "/public/img/service/kayas.png",
+            "acceptMessage": false
         }
+
+
         
     ],
     "Ringtones": {
@@ -97,7 +105,7 @@
     },
     "Service": [
         {
-            "name": "LSPD",
+            "name": "Los Santos Police Department",
             "jobname": "police",
             "img": "/public/img/service/police.png",
             "coords": {
@@ -320,7 +328,7 @@
             "default": true,
             "category": "apps",
             "redirect": "fractions",
-            "allowJobs": ["police"],
+            "allowJobs": ["police","ambulance","cab","sud","mechanic","marshal","odin"],
             "disallowJobs": ["unemployed"]
         },
         {

resources/[standalone]/cs_license/config/config.lua

@@ -89,13 +89,6 @@ CodeStudio.Licenses = {
         price = 0,
         expire = false,
     },
-    ['ems_card'] = {
-        label = "Mediziner Ausweis",
-        type = "job",
-        job = "ambulance",
-        price = 0,
-        expire = false,
-    },
     ['doj_card'] = {
         label = "Justiz Ausweis",
         type = "job",
@@ -177,6 +170,8 @@ CodeStudio.LicenseMenu = {
         location = {     
             vector4(-435.0517, 1098.1042, 329.7664, 3),
             vector4(448.6075, -975.8693, 30.6610, 10.7146),
+            vector4(-1842.1836, -362.7046, 83.9981, 307.2072),
+            vector4(-445.5861, 6002.0762, 31.9537, 146.8319),
 
         },
         types = {   
@@ -212,13 +207,13 @@ CodeStudio.Management = {
         }
     },
 
-    ['ems'] = {
+    ['ambulance'] = {
         minRank = 10,    
         JobBadge = {
             Enable = true,                  
             Name = "Ocean Medical Center",        
             Logo = 'image/ocean.png',     
-            ThemeColor = '#FFB6C1',         
+            ThemeColor = '#009bcf',         
             Price = 0,                      
             ItemName = 'ems_card'           
         },
@@ -231,15 +226,15 @@ CodeStudio.Management = {
         minRank = 11,    
         JobBadge = {
             Enable = true,                  
-            Name = "San Andrea Marshal Agency",        
-            Logo = 'image/ocean.png',     
-            ThemeColor = '#FFB6C1',         
+            Name = "San Andreas Marshal Agency",        
+            Logo = 'image/marshal.png',     
+            ThemeColor = '#666565',         
             BadgeStyle = true,               
             Price = 0,                      
             ItemName = 'marshal_card'           
         },
         location = {        
-            vector4(-433.7445, 1095.0703, 329.7667, 3)
+            vector4(-449.5226, 6006.7539, 31.9537, 3)
         }
     },