diff --git a/Client.net.dll b/Client.net.dll new file mode 100644 index 0000000..bc03596 Binary files /dev/null and b/Client.net.dll differ diff --git a/Server.net.dll b/Server.net.dll new file mode 100644 index 0000000..3b5a599 Binary files /dev/null and b/Server.net.dll differ diff --git a/__resource.lua b/__resource.lua index 4a10b78..fa85888 100644 --- a/__resource.lua +++ b/__resource.lua @@ -6,12 +6,15 @@ client_scripts { 'global.lua', 'respawn.lua', 'mood.lua', - 'client.lua' + 'reticule.lua', + 'client.lua', + 'Client.net.dll', } server_scripts { 'config.lua', 'server.lua', + 'Server.net.dll', } dependencies { @@ -21,6 +24,7 @@ ui_page('html/index.html') files { 'html/index.html', + 'html/img/reticle.png', 'html/css/main.css', 'html/css/DIN-Medium.ttf', 'html/js/howler.min.js', diff --git a/html/css/main.css b/html/css/main.css index f3ae454..4aad98a 100644 --- a/html/css/main.css +++ b/html/css/main.css @@ -59,3 +59,16 @@ body,html {margin:0;padding:0;height:100%;} .scoreboard tbody td { padding-top: 20px; } + + +#reticle-container { + position: absolute; + top:0; + left:0; + right:0; + height:100%; + display: flex; + align-items: center; + justify-content: center; + display: none; +} \ No newline at end of file diff --git a/html/img/reticle.png b/html/img/reticle.png new file mode 100644 index 0000000..c71ece2 Binary files /dev/null and b/html/img/reticle.png differ diff --git a/html/index.html b/html/index.html index b3f98ba..d27257e 100644 --- a/html/index.html +++ b/html/index.html @@ -12,6 +12,7 @@ +
08:59
@@ -49,14 +50,39 @@ document.getElementById("scoreboard-container").style.display = "flex"; break; case "onResetRound": - document.getElementById("scoreboard-container").style.display = "none"; + document.getElementById("scoreboard-container").style.display = "none"; break; - + case "showReticule": + ShowReticle(Number(event.data.type)); + break; + case "hideReticule": + HideReticle(); + break; } }); }); + function ShowReticle(type) { + var reticuleImg = document.getElementById("reticle"); + var reticuleCont = document.getElementById("reticle-container"); + + switch(type) { + default: + case 0: + reticuleImg.src = "img/reticle.png"; + break; + case 1: + reticuleImg.src = "img/reticle_shotgun.png"; + break; + } + + reticuleCont.style.display = "flex"; + } + + function HideReticle() { + document.getElementById("reticle-container").style.display = "none"; + } function UpdateTime(sec_num) { var timerDiv = document.getElementById("timer"); diff --git a/reticule.lua b/reticule.lua new file mode 100644 index 0000000..ab82c31 --- /dev/null +++ b/reticule.lua @@ -0,0 +1,11 @@ +Citizen.CreateThread(function() + while true do + if IsPlayerFreeAiming(PlayerId()) then + SendNUIMessage({name = 'showReticule', type = 0}) + else + SendNUIMessage({name = 'hideReticule'}) + end + + Citizen.Wait(100) + end +end) \ No newline at end of file diff --git a/server.lua b/server.lua index 1db7a5f..d748cf3 100644 --- a/server.lua +++ b/server.lua @@ -43,4 +43,4 @@ end) AddEventHandler("factions:foo", function(args, cbId) TriggerClientEvent('factions:cl_onCallback_OneParam', source, cbId, "bar") end) -RegisterServerEvent("factions:foo") \ No newline at end of file +RegisterServerEvent("factions:foo") \ No newline at end of file