From bd5027e1ef023b378301f8e3e02d3da70d06d6fd Mon Sep 17 00:00:00 2001 From: aaron1a12 <65295020+aaron1a12@users.noreply.github.com> Date: Mon, 1 Mar 2021 12:12:34 -0500 Subject: [PATCH] Custom reticles --- Client.net.dll | Bin 0 -> 7168 bytes Server.net.dll | Bin 0 -> 5120 bytes __resource.lua | 6 +++++- html/css/main.css | 13 +++++++++++++ html/img/reticle.png | Bin 0 -> 6917 bytes html/index.html | 30 ++++++++++++++++++++++++++++-- reticule.lua | 11 +++++++++++ server.lua | 2 +- 8 files changed, 58 insertions(+), 4 deletions(-) create mode 100644 Client.net.dll create mode 100644 Server.net.dll create mode 100644 html/img/reticle.png create mode 100644 reticule.lua diff --git a/Client.net.dll b/Client.net.dll new file mode 100644 index 0000000000000000000000000000000000000000..bc0359675098c453523b3776072320149def56c1 GIT binary patch literal 7168 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 literal 0 HcmV?d00001 diff --git a/Server.net.dll b/Server.net.dll new file mode 100644 index 0000000000000000000000000000000000000000..3b5a5990db8a46f4261d3759a54347f05bc901fa GIT binary patch literal 5120 zcmeHLTWlOx8UAK{sbe=z>^NxxX_&@FP26O(-Z&SV((c;p8^jm9jvJ_@WOny>J#-!7X4yHfE&Gp|g)RxzE5nVrv>Wv{5L-Mc#n>ZTVafb&KRD)+y9 zsWI9cIBIqoN#K4`+9T@VAm1jRG#_BE?k6I@g-{m*ZV(||S_>|JN<`&v^Ib=U#P+M> zz`S(QKve>9 zV%oPfJF-ySd}1w4?=4@s9t9<2xXedv_40|eG%yxJb+=36$|k-g(1vfCz@7U5Lx}%F zJCZoo19T4VOSWLDuHWL(kxri`tH<`SccQ1or%?64XZCX-uaBg4bFg~T3wog(dc9!E&uZwUOG?tfAD*EGDT;a4^NI@TzY)$rGv@*4hNbmI4k z)96IX5V#0|)0)zWpBwG?QKDD768RxfGw9=?L?)5Z{RLC}eCFUhZ5z0#v77i#VwjlB zDw)`YdCsDTupNg8J8_(FFNQQ6(J-UojD{c5@WUF~g!|#>{zo<3(C|48KS$V(n;O1| zLA(oJ#sfHl7xA0K00!_$qzwyQ7=?v>7$F|~44H)) zl!JojyG|Z6!GddVC_htB8Q1l$sv=4%yfkfBimt-A6FS#bW%8mm?)eH+HK&*fxi|B* zP+`*d$~mv*Q?p6Ss(h_fvh!|?Htv;|oxs^b%LIWc=iQAZCya|W$-Z4wW!t~9X?e-^ z>DVOCXm!<#Ga5RRj;ofHA2?oRQ>(!o_bRJSspi|^j_j-o3cgd_%A8nNl`sl~ziE-P zsXDH#S22G5Hv`Q;b$tL^1Z4kI|X$QJBp_AoBU`4(Od3TichJKJ99z# zWhao84KSa7iXO)1f+a??qORq zg$gA{`7H`}fixQ%?EBl~Gqk0UA>XB~tLztn2e;bH(L#;(rZhzEza4d}-d3C2M#QK8 z`FO|jU#!eCf9hR+a?ku%&}te+M~exgjh&tzLAwPcNb7DxBGKL5ZYGTG2M>3=e0^p4 z(C{12iDd6=hfz=ZN94R+N*s8?x2tnrW#U>v=}%&5&G)Vb2IZpDq{~2ieK(*@pVbc- z=xy$6^9Q$0GnJGCcig~$eRf!loK2lQIW(eHPY$11RVVW!!^xA$(`QD`o>Qr!JwnM& z18pfQWwC&oHE`IPn^nG}a`2EbCr>zuy?CxtavrbUu2{y-bp-;5TCdbs$4;wf- z=PfF3PFIaaZjau(txruQ2N!qFMXq}<4e0mZhUkltJYcPRLeY0R+_G?M6RrO`KMNRkSOlk zI!S+^)ncB?ZElgv@4gpiR7uD5-|4=sA|N#)a4@<>#bzd_8Sg4P&_zh@ z4j0ovU+n(W*D_4%GIPKs!U>-IIj~N|9Pt^#$>`RF@3sE> zHL8Ks>jtgb%qWx0Hq)~%Dg_LqgFYRDS z4lP!~&EGJqP{x4us>EZQ_R9Q4*-l?D$U7S2RrUBAoUN_p>VxA9?xR%0^DHd{%!J}c zmHuq{Df!dKx`v{Ag7=0^y=6@gV)7~0x$=mQk6{mGB`TqotI!8G=1JVPMJdVD7W1#< zVrkR7JQ_GpdP!@_Y^%)T;$;bIl;(MS56#4F9ug+KNb;T_*RnxciQ9=*rAWJF+VxqT zHzEf{M0}pFk0GlfJ~!edm_!@8u4u$%C*Lg{-v!$7IHMY48^&h7RiEbQtHgDy{PyU^ tV|$KC-eBDl@F(-g)5{Ic`akPLYa(O4<(e7&&)~%9Th6n09Qr>*;NL~J#c==t literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c71ece25f85da72192cc6682a75aede5c6835c9e GIT binary patch literal 6917 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 literal 0 HcmV?d00001 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