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

resources/[jobs]/[civ]/nordi_tipjar/tipjars.json

@@ -1 +1 @@
-{"police":100,"ambulance":0,"Zum Durstigen Dackel":200,"cinema":0,"coffe_cute":100,"kayas":0,"odin":0,"dackel":0,"ammu":1000}
+{"police":100,"odin":0,"kayas":0,"Zum Durstigen Dackel":200,"cinema":0,"ambulance":0,"coffe_cute":100,"ammu":1000,"dackel":0}

resources/[qb]/Duck_Relog/client.lua

@@ -0,0 +1,42 @@
+RegisterCommand("relog", function()
+    local ped = PlayerPedId()
+    if not DoesEntityExist(ped) then
+        print("Fehler: Spieler-Entity existiert nicht")
+        return
+    end
+    
+    local coords = GetEntityCoords(ped)
+    local heading = GetEntityHeading(ped)
+
+    
+    TriggerServerEvent("duckrelog:saveCoords", {
+        x = coords.x,
+        y = coords.y,
+        z = coords.z,
+        w = heading
+    })
+end, false)
+
+
+RegisterNetEvent("duckrelog:openCharMenu", function()
+    ShutdownLoadingScreenNui()
+    
+    TriggerEvent("qb-multicharacter:client:chooseChar")
+    TriggerEvent("um-multichar:client:chooseChar")
+end)
+
+
+RegisterNetEvent("duckrelog:setCoords", function(pos)
+    if pos then
+        local ped = PlayerPedId()
+        RequestCollisionAtCoord(pos.x, pos.y, pos.z)
+        SetEntityCoordsNoOffset(ped, pos.x, pos.y, pos.z, false, false, false)
+        SetEntityHeading(ped, pos.w or 0.0)
+    end
+end)
+
+
+RegisterNetEvent("QBCore:Client:OnPlayerLoaded", function()
+    TriggerServerEvent("duckrelog:requestCoords")
+end)
+

resources/[qb]/Duck_Relog/fxmanifest.lua

@@ -0,0 +1,18 @@
+fx_version 'cerulean'
+game 'gta5'
+
+author 'Duck'
+description 'Relog extra. UM-Multi ist erforderlich'
+
+client_scripts {
+    'client.lua'
+}
+
+server_scripts {
+    '@oxmysql/lib/MySQL.lua', 
+    'server.lua'
+}
+
+shared_script '@qb-core/shared/locale.lua'
+
+dependency 'qb-core'

resources/[qb]/Duck_Relog/server.lua

@@ -0,0 +1,32 @@
+local QBCore = exports['qb-core']:GetCoreObject()
+local LastPositions = {}
+
+RegisterServerEvent("duckrelog:saveCoords", function(pos)
+    local src = source
+    LastPositions[src] = pos
+    
+    
+    print("Speichere Position für Spieler " .. src .. " und löse Relog aus")
+    
+    
+    QBCore.Player.Logout(src)
+    
+    
+    SetPlayerRoutingBucket(src, 0)
+    
+    
+    Wait(500)
+    
+    
+    TriggerClientEvent("duckrelog:openCharMenu", src)
+end)
+
+RegisterServerEvent("duckrelog:requestCoords", function()
+    local src = source
+    local pos = LastPositions[src]
+
+    if pos then
+        TriggerClientEvent("duckrelog:setCoords", src, pos)
+        LastPositions[src] = nil
+    end
+end)

resources/[qb]/Duck_relogextra/client.lua

@@ -1,38 +0,0 @@
-local QBCore = exports['qb-core']:GetCoreObject()
-local savedLocation = nil
-
-RegisterCommand("relog", function()
-    local ped = PlayerPedId()
-    local coords = GetEntityCoords(ped)
-    local heading = GetEntityHeading(ped)
-    local cid = QBCore.Functions.GetPlayerData().citizenid
-
-    -- Speicher Ort vor Relog
-    TriggerServerEvent("qb-relogsave:server:saveLocation", cid, {
-        x = coords.x,
-        y = coords.y,
-        z = coords.z
-    }, heading)
-
-    TriggerEvent("qb-multicharacter:client:chooseChar")
-end, false)
-
-RegisterNetEvent("qb-relogsave:client:restoreLocation", function(pos, heading)
-    savedLocation = {
-        pos = pos,
-        heading = heading
-    }
-end)
-
-RegisterNetEvent("qb-spawn:client:spawned", function()
-    if savedLocation then
-        DoScreenFadeOut(500)
-        Wait(500)
-        SetEntityCoords(PlayerPedId(), savedLocation.pos.x, savedLocation.pos.y, savedLocation.pos.z)
-        SetEntityHeading(PlayerPedId(), savedLocation.heading)
-        Wait(500)
-        DoScreenFadeIn(500)
-
-        savedLocation = nil
-    end
-end)

resources/[qb]/Duck_relogextra/fxmanifest.lua

@@ -1,13 +0,0 @@
-fx_version 'cerulean'
-game 'gta5'
-
-description 'relog system'
-author 'Duck'
-version '1.0.1'
-
-client_script 'client.lua'
-server_script 'server.lua'
-
-shared_script '@qb-core/shared/locale.lua'
-dependency 'qb-core'
-dependency 'um-multicharacter'

resources/[qb]/Duck_relogextra/server.lua

@@ -1,34 +0,0 @@
-local savedLocations = {}
-local QBCore = exports['qb-core']:GetCoreObject()
-
-RegisterNetEvent("qb-relogsave:server:saveLocation", function(cid, coords, heading)
-    if not cid or not coords then return end
-    
-    savedLocations[cid] = {
-        pos = coords,
-        heading = heading,
-        timestamp = os.time() 
-    }
-    
-    print("Position für " .. cid .. " gespeichert: " .. json.encode(coords))
-end)
-
-AddEventHandler('QBCore:Server:PlayerLoaded', function(Player)
-    if not Player or not Player.PlayerData then return end
-    
-    local cid = Player.PlayerData.citizenid
-    
-    if savedLocations[cid] then
-        local pos = savedLocations[cid].pos
-        local heading = savedLocations[cid].heading
-        
-        if pos and pos.x and pos.y and pos.z then
-            TriggerClientEvent("qb-relogsave:client:restoreLocation", Player.PlayerData.source, pos, heading)
-            print("Position für " .. cid .. " wiederhergestellt")
-        else
-            print("Ungültige Position für " .. cid .. " gefunden")
-        end
-        
-        savedLocations[cid] = nil
-    end
-end)

resources/[standalone]/nordi_lookchanger/data/saved_looks.json

@@ -1 +1 @@
-{"license:0eafabe308cf0eaca0b0fbf5c1ca13f756d224f2":{"hair":[{"name":"Haare Normal","look":[21,0]},{"name":"Glatze Für Cap","look":[0,0]}],"hat":[null,null,null,{"name":"Slot 4","look":[-1,-1]}]},"license:fff901d8f6568f356416076df59251aede9c6b68":{"hat":[{"name":"Helm motorrad","look":[18,4]},{"name":"Motorrad cappy","look":[182,21]},{"name":"noose hut","look":[105,20]}],"glasses":[{"name":"brille","look":[37,0]},null,{"name":"noose brille","look":[60,1]},{"name":"Slot 4","look":[-1,-1]}]},"license:c75be428593da09374412f912326b4f5b321cb37":{"glasses":[{"name":"1","look":[37,0]}]},"license:da2d0636c57f8f3ae39d17ba03e68816cd10c1e0":{"bag":[{"name":"Bergrettung","look":[116,5]},{"name":"Rettungs Rucksack ","look":[114,0]}],"hat":[{"name":"Medic Cap ","look":[239,0]},{"name":"Helm","look":[292,3]},{"name":"Bergrettung","look":[259,3]}],"glasses":[{"name":"Brille ","look":[15,9]},{"name":"Helm Visier Unten ","look":[81,0]},{"name":"Visier Helm Oben ","look":[82,0]},{"name":"Sonnenbrille","look":[15,0]}],"arms":[{"name":"Handschuhe Polo schirt ","look":[30,0]},{"name":"Arme Ohne Handschuhe ","look":[0,0]},{"name":"Arbeitshandschuhe","look":[171,1]},{"name":"Bergrettung","look":[228,4]}],"vest":[{"name":"Sicherungs Weste Schwarz ","look":[104,3]},{"name":"Funkgerät Tasche ","look":[88,2]},{"name":"Dienstausweis","look":[62,8]}]},"license:90dbf414a332a934f91ba191396929a656bbd7e0":{"hat":[{"name":"wollmütze","look":[175,0]}],"bag":[null,{"name":"marke","look":[128,0]}],"shirt":[{"name":"Sheriff Pulli","look":[596,1]},{"name":"jacke","look":[644,0]}],"vest":[{"name":"Sheriff Weste","look":[82,0]},null,null,{"name":"sheriff","look":[82,0]}]},"license:86cb3ad0d40a434251dd190fd2c644b3143f1655":{"mask":[{"look":[51,1],"name":"maske"}]},"license:60b5f8ebf593295e3f65cbf4cb4c85096b37da2a":{"chain":[null,null,null,{"name":"beinholster","look":[221,0]}],"mask":[{"name":"ohrstecker","look":[121,0]},{"name":"totenkopf maske","look":[169,13]}],"hat":[{"name":"sd back cap","look":[274,1]},{"name":"sd hut","look":[275,0]},{"name":"taktik helm","look":[283,1]},{"name":"nhl cap","look":[304,1]}],"hair":[{"name":"für mützen","look":[4,0]},{"name":"undercut","look":[88,0]}],"bag":[{"name":"sd marke high","look":[127,0]},{"name":"sd marke low","look":[131,0]},{"name":"pmu bag","look":[117,0]},{"name":"kein rucksack","look":[0,0]}],"undershirt":[{"name":"gürtel mit funk und taser","look":[276,0]},{"name":"gürtel ohne funk und taser","look":[280,0]},null,{"name":"nix","look":[14,0]}],"arms":[{"name":"ohne handschuhe kurz","look":[14,0]},{"name":"einmal handschuhe kurz","look":[109,0]},{"name":"handschuhe kurz","look":[260,0]},{"name":"einmal handschuhe lang","look":[101,0]},{"name":"keine handschuhe lang","look":[3,0]},{"name":"handschuhe lang","look":[261,0]}],"vest":[{"name":"sd plate carrier ","look":[86,0]},{"name":"sd weste full","look":[100,9]},{"name":"bodycam + funk","look":[76,0]},{"name":"sd weste clean ","look":[98,6]}],"shirt":[{"name":"sd polo schwarz kurz","look":[647,12]},null,{"name":"sd jacke","look":[635,0]},{"name":"sd k9 shirt","look":[639,1]}],"glasses":[{"name":"sonnenbrille","look":[11,0]},{"name":"brille","look":[41,0]}]},"license:dae8d3f44cc7de24638a82ff53a7643475267ef0":{"undershirt":[{"name":"Weste","look":[0,0]},{"name":"Ohne Weste","look":[1,0]}],"vest":[{"name":"K9 Weste","look":[0,0]},{"name":"Ohne Weste","look":[0,0]}]},"license:7670072db4258a31e67f66e432cd307d9e3495bd":{"undershirt":[null,null,null,{"name":"1","look":[15,0]}]}}
+{"license:0eafabe308cf0eaca0b0fbf5c1ca13f756d224f2":{"hat":[null,null,null,{"name":"Slot 4","look":[-1,-1]}],"hair":[{"name":"Haare Normal","look":[21,0]},{"name":"Glatze Für Cap","look":[0,0]}]},"license:dae8d3f44cc7de24638a82ff53a7643475267ef0":{"vest":[{"name":"K9 Weste","look":[0,0]},{"name":"Ohne Weste","look":[0,0]}],"undershirt":[{"name":"Weste","look":[0,0]},{"name":"Ohne Weste","look":[1,0]}]},"license:c75be428593da09374412f912326b4f5b321cb37":{"glasses":[{"name":"1","look":[37,0]}]},"license:fff901d8f6568f356416076df59251aede9c6b68":{"glasses":[{"name":"brille","look":[37,0]},null,{"name":"noose brille","look":[60,1]},{"name":"Slot 4","look":[-1,-1]}],"hat":[{"name":"Helm motorrad","look":[18,4]},{"name":"Motorrad cappy","look":[182,21]},{"name":"noose hut","look":[105,20]}]},"license:554b0365aa99e238141306feb25c15148c3db7c1":{"vest":[{"name":"Schürze","look":[131,12]}]},"license:90dbf414a332a934f91ba191396929a656bbd7e0":{"bag":[null,{"name":"marke","look":[128,0]}],"hat":[{"name":"wollmütze","look":[175,0]}],"vest":[{"name":"Sheriff Weste","look":[82,0]},null,null,{"name":"sheriff","look":[82,0]}],"shirt":[{"name":"Sheriff Pulli","look":[596,1]},{"name":"jacke","look":[644,0]}]},"license:86cb3ad0d40a434251dd190fd2c644b3143f1655":{"mask":[{"look":[51,1],"name":"maske"}]},"license:da2d0636c57f8f3ae39d17ba03e68816cd10c1e0":{"bag":[{"name":"Bergrettung","look":[116,5]},{"name":"Rettungs Rucksack ","look":[114,0]}],"glasses":[{"name":"Brille ","look":[15,9]},{"name":"Helm Visier Unten ","look":[81,0]},{"name":"Visier Helm Oben ","look":[82,0]},{"name":"Sonnenbrille","look":[15,0]}],"arms":[{"name":"Handschuhe Polo schirt ","look":[30,0]},{"name":"Arme Ohne Handschuhe ","look":[0,0]},{"name":"Arbeitshandschuhe","look":[171,1]},{"name":"Bergrettung","look":[228,4]}],"vest":[{"name":"Sicherungs Weste Schwarz ","look":[104,3]},{"name":"Funkgerät Tasche ","look":[88,2]},{"name":"Dienstausweis","look":[62,8]}],"hat":[{"name":"Medic Cap ","look":[239,0]},{"name":"Helm","look":[292,3]},{"name":"Bergrettung","look":[259,3]}]},"license:7670072db4258a31e67f66e432cd307d9e3495bd":{"undershirt":[null,null,null,{"name":"1","look":[15,0]}]},"license:60b5f8ebf593295e3f65cbf4cb4c85096b37da2a":{"undershirt":[{"name":"gürtel mit funk und taser","look":[276,0]},{"name":"gürtel ohne funk und taser","look":[280,0]},null,{"name":"nix","look":[14,0]}],"chain":[null,null,null,{"name":"beinholster","look":[221,0]}],"shirt":[{"name":"sd polo schwarz kurz","look":[647,12]},null,{"name":"sd jacke","look":[635,0]},{"name":"sd k9 shirt","look":[639,1]}],"vest":[{"name":"sd plate carrier ","look":[86,0]},{"name":"sd weste full","look":[100,9]},{"name":"bodycam + funk","look":[76,0]},{"name":"sd weste clean ","look":[98,6]}],"hair":[{"name":"für mützen","look":[4,0]},{"name":"undercut","look":[88,0]}],"mask":[{"name":"ohrstecker","look":[121,0]},{"name":"totenkopf maske","look":[169,13]}],"glasses":[{"name":"sonnenbrille","look":[11,0]},{"name":"brille","look":[41,0]}],"arms":[{"name":"ohne handschuhe kurz","look":[14,0]},{"name":"einmal handschuhe kurz","look":[109,0]},{"name":"handschuhe kurz","look":[260,0]},{"name":"einmal handschuhe lang","look":[101,0]},{"name":"keine handschuhe lang","look":[3,0]},{"name":"handschuhe lang","look":[261,0]}],"bag":[{"name":"sd marke high","look":[127,0]},{"name":"sd marke low","look":[131,0]},{"name":"pmu bag","look":[117,0]},{"name":"kein rucksack","look":[0,0]}],"hat":[{"name":"sd back cap","look":[274,1]},{"name":"sd hut","look":[275,0]},{"name":"taktik helm","look":[283,1]},{"name":"nhl cap","look":[304,1]}]}}

resources/[tools]/unlimited-spectre/log.log

@@ -6185,3 +6185,23 @@
 [info][UnlSpectre][2025/06/26 06:02:46]: Successfully started PlayerController
 [info][UnlSpectre][2025/06/26 06:02:46]: Successfully started VehicleController
 [info][UnlSpectre][2025/06/26 06:02:57]: HTTP Server started on port 3000.
+[info][UnlSpectre][2025/06/26 16:07:59]: Successfully registered Exports
+[info][UnlSpectre][2025/06/26 16:36:20]: Successfully registered Exports
+[info][UnlSpectre][2025/06/26 16:41:59]: Successfully registered Exports
+[info][UnlSpectre][2025/06/26 16:41:59]: Successfully loaded Items
+[info][UnlSpectre][2025/06/26 16:41:59]: Successfully loaded Jobs
+[info][UnlSpectre][2025/06/26 16:41:59]: Successfully loaded Gangs
+[info][UnlSpectre][2025/06/26 16:41:59]: Successfully loaded Vehicles
+[info][UnlSpectre][2025/06/26 16:41:59]: Successfully started GameController
+[info][UnlSpectre][2025/06/26 16:41:59]: Successfully started PlayerController
+[info][UnlSpectre][2025/06/26 16:41:59]: Successfully started VehicleController
+[info][UnlSpectre][2025/06/26 16:42:07]: HTTP Server started on port 3000.
+[info][UnlSpectre][2025/06/26 18:51:20]: Successfully registered Exports
+[info][UnlSpectre][2025/06/26 18:51:20]: Successfully loaded Items
+[info][UnlSpectre][2025/06/26 18:51:20]: Successfully loaded Jobs
+[info][UnlSpectre][2025/06/26 18:51:20]: Successfully loaded Gangs
+[info][UnlSpectre][2025/06/26 18:51:20]: Successfully loaded Vehicles
+[info][UnlSpectre][2025/06/26 18:51:20]: Successfully started GameController
+[info][UnlSpectre][2025/06/26 18:51:20]: Successfully started PlayerController
+[info][UnlSpectre][2025/06/26 18:51:20]: Successfully started VehicleController
+[info][UnlSpectre][2025/06/26 18:51:44]: HTTP Server started on port 3000.

resources/[tools]/unlimited-spectre/unlWeb/data.json

@@ -4155,6 +4155,6 @@
     }
   ],
   "waypoints": [],
-  "tokenSecret": "XKtQtU8Vgr28xL2KCRLU",
+  "tokenSecret": "eV9hz7BNT77TCxjJwNZn",
   "supporterStash": []
 }

resources/[tools]/unlimited-spectre/unlWeb/logs/dev.log

@@ -8299,3 +8299,8 @@
 [info][2025/06/26 06:08:36]: nordi requested all items.
 [info][2025/06/26 06:08:45]: nordi requested item w_me_colbaton.
 [info][2025/06/26 07:07:35]: nordi requested item w_me_colbaton.
+[info][2025/06/26 16:02:06]: nordi requested item w_me_colbaton.
+[info][2025/06/26 16:03:14]: nordi requested all items.
+[info][2025/06/26 16:03:20]: nordi requested item w_me_pocketlight.
+[info][2025/06/26 16:05:44]: nordi requested all items.
+[info][2025/06/26 16:05:48]: nordi requested item w_me_colbaton.

resources/[tools]/unlimited-spectre/unlWeb/logs/web.log

@@ -6626,3 +6626,4 @@
 [info][2025/06/26 05:21:05]: Login attempt on Nordi from 91.248.233.154
 [info][2025/06/26 06:08:32]: Login attempt on Nordi from 91.248.233.154
 [info][2025/06/26 06:08:33]: Login attempt on Nordi from 91.248.233.154
+[info][2025/06/26 16:42:17]: Login attempt on Nordi from 91.248.233.154