From 7b44801a20bb6da6a2d4433f7f6e9936f625967f Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Sat, 5 Jun 2021 17:31:17 -0500 Subject: [PATCH] Rebrand --- IDEAS.md | 1 - README.md | 14 +- meta.xml | 2 +- scripts/client/afk.js | 4 +- scripts/client/chatbox.js | 4 +- scripts/client/event.js | 16 +- scripts/client/gui.js | 134 ++++---- scripts/client/item.js | 6 +- scripts/client/job.js | 14 +- scripts/client/keybind.js | 14 +- scripts/client/label.js | 24 +- scripts/client/logo.js | 6 +- scripts/client/messaging.js | 6 +- scripts/client/nametag.js | 4 +- scripts/client/scoreboard.js | 4 +- scripts/client/server.js | 10 +- scripts/client/skin-select.js | 4 +- scripts/client/utilities.js | 50 +-- scripts/server/account.js | 110 +++---- scripts/server/anticheat.js | 22 +- scripts/server/ban.js | 30 +- scripts/server/bitflag.js | 4 +- scripts/server/business.js | 100 +++--- scripts/server/chat.js | 4 +- scripts/server/clan.js | 28 +- scripts/server/class.js | 30 +- scripts/server/client.js | 154 ++++----- scripts/server/command.js | 16 +- scripts/server/config.js | 20 +- scripts/server/const.js | 454 +++++++++++++-------------- scripts/server/database.js | 32 +- scripts/server/developer.js | 4 +- scripts/server/discord.js | 4 +- scripts/server/economy.js | 4 +- scripts/server/email.js | 4 +- scripts/server/event.js | 98 +++--- scripts/server/fishing.js | 4 +- scripts/server/gui.js | 30 +- scripts/server/help.js | 4 +- scripts/server/house.js | 66 ++-- scripts/server/item.js | 154 ++++----- scripts/server/item/handcuff.js | 8 +- scripts/server/item/phone.js | 2 +- scripts/server/item/rope.js | 6 +- scripts/server/item/tazer.js | 6 +- scripts/server/item/walkie-talkie.js | 6 +- scripts/server/job.js | 156 ++++----- scripts/server/job/police.js | 16 +- scripts/server/job/taxi.js | 2 +- scripts/server/keybind.js | 6 +- scripts/server/messaging.js | 22 +- scripts/server/misc.js | 24 +- scripts/server/moderation.js | 4 +- scripts/server/radio.js | 8 +- scripts/server/startup.js | 16 +- scripts/server/subaccount.js | 36 +-- scripts/server/timers.js | 4 +- scripts/server/trigger.js | 4 +- scripts/server/utilities.js | 14 +- scripts/server/vehicle.js | 70 ++--- scripts/shared/const.js | 50 +-- 61 files changed, 1075 insertions(+), 1078 deletions(-) diff --git a/IDEAS.md b/IDEAS.md index 598125be..1ee07900 100644 --- a/IDEAS.md +++ b/IDEAS.md @@ -1,5 +1,4 @@ # Ideas -## For Asshat Gaming RP ============================================================================================================== diff --git a/README.md b/README.md index a4f1fd43..1b633ad8 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,12 @@ -# Asshat Gaming -## GTA Connected Roleplay Division +# Vortrex's Roleplay Resource ### Description -This is the roleplay resource for Asshat Gaming's GTAC servers +This is Vortrex's Roleplay Resource ### Git Branches * master/main - The current release. *Never commit to this branch directly* -* testing - The next upcoming release. All feature/fix/change branches are merged into this one -* feature/fix/change - This is where the stuff you're currently working on goes into. +* nightly - The next upcoming release. All feature/fix/change branches are merged into this one +* feature/fix/change - This is where the stuff currently being working on goes into. ### Scripting Style * Always use camelCase, even for event names. @@ -15,7 +14,8 @@ This is the roleplay resource for Asshat Gaming's GTAC servers * Keep opening curly brackets in-line. Don't linebreak before an opening curly brackets. * Use sentence case instead of adjacent uppercase letters in class/member names. (i.e. Id instead of ID) * Use generic, non-specific class member names wherever possible. (i.e. databaseId instead of accountId) -* All communications from server to client are handled in `client.js` script file via utils +* All communications from server to client are handled in server-side `client.js` script file via utils +* All communications from client to server are handled in client-side `server.js` script file via utils * All server events are handled in `event.js` script file, sometimes with utils. ### Database Style @@ -29,7 +29,5 @@ This is the roleplay resource for Asshat Gaming's GTAC servers ### Notes * The resource is designed to load the script files first, then initialize after that's done. -* Never edit scripts directly on the server. Always edit in the cloned repo on your PC. -* Never upload scripts to the main server. Vortrex will handle deployment of public releases. * The IDEAS.md file is not a to-do list. It's just a random file to throw ideas into when they come to mind. * Delete the row containing the bug or idea from the database once you've scripted and tested it and it works. diff --git a/meta.xml b/meta.xml index cebbc90b..8d8b7a7c 100644 --- a/meta.xml +++ b/meta.xml @@ -1,5 +1,5 @@ - +