Merge branch 'nightly' into 1.4.0-prep

IDEAS.md

@@ -365,3 +365,12 @@ Obviously this would still be using slashes for commands still. The way this wor
         * Set drop position offset
         * Set drop rotation offset
 ---
+### Tutorial
+    * Pick up item (grab bottle of beer off ground)
+    * Equip item (switch to bottle of beer item)
+    * Use item (drink bottle of beer item)
+    * Drop item (drop empty bottle on ground)
+    * Take item from vehicle trunk (grab crate from vehicle)
+    * Place item on ground (crate)
+    * Take second beer from crate
+    * Store second beer in trunk

TODO.md

@@ -1,21 +1,5 @@
-## Ice cream job
+* Finish auto-translate
-    * VC: -862.39, -578.35, 11.10
+* Add /autotranslate to enable/disable automatic chat translations for all languages, or specific ones by short code (RU, ES, etc)
-------------------------------------------------------
+* Finish working on the new job route system
-* Cut down on engine/lights/lock messages.
+* Add ways to acquire drugs. Pot/coke plants, meth labs, etc
-* Get coords for more bus routes.
+* Finish setting up the persistent NPC system
-* Add more jobs
-------------------------------------------------------
-## Tutorial
-    - Pick up item (grab bottle of beer off ground)
-    - Equip item (switch to bottle of beer item)
-    - Use item (drink bottle of beer item)
-    - Drop item (drop empty bottle on ground)
-    - Take item from vehicle trunk (grab crate from vehicle)
-    - Place item on ground (crate)
-    - Take second beer from crate
-    - Store second beer in trunk
-
-------------------------------------------------------
-
-------------------------------------------------------
-* Change pizza delivery job to pick a random house door instead of pre-established places on the street.

config/accents.json

@@ -0,0 +1,26 @@
+[
+    "English",
+    "French",
+    "Russian",
+    "Scottish",
+    "Irish",
+    "Spanish",
+    "Southern American",
+    "Italian",
+    "Australian",
+    "Jamaican",
+    "Israeli",
+    "Dutch",
+    "Brazilian",
+    "Portuguese",
+    "German",
+    "Canadian",
+    "Chinese",
+    "Japanese",
+    "Turkish",
+    "Korean",
+    "Estonian",
+    "Sicilian",
+    "Indian",
+    "Rough"
+]

config/animations.json

@@ -1,134 +0,0 @@
-{
-    "gta:iii": [
-        ["walk", 0, 0, 1, 0.0, null, null, null, null, 0],
-        ["jog", 0, 1, 1, 0.0, null, null, null, null, 0],
-        ["look1", 0, 7, 1, 0.0, null, null, null, null, 0],
-        ["tired", 0, 9, 1, 0.0, null, null, null, null, 0],
-        ["raisegun", 0, 10, 1, 0.0, null, null, null, null, 0],
-        ["wave", 0, 12, 1, 0.0, null, null, null, null, 0],
-        ["talk", 0, 11, 1, 0.0, null, null, null, null, 0],
-        ["stomachhit", 0, 18, 1, 0.0, null, null, null, null, 0],
-        ["headhit", 0, 18, 1, 0.0, null, null, null, null, 0],
-        ["throw1", 0, 53, 1, 0.0, null, null, null, null, 0],
-        ["throw2", 0, 54, 1, 0.0, null, null, null, null, 0],
-        ["punch1", 0, 54, 1, 0.0, null, null, null, null, 0],
-        ["headbutt", 0, 70, 1, 0.0, null, null, null, null, 0],
-        ["kick", 0, 71, 1, 0.0, null, null, null, null, 0],
-        ["kneekick", 0, 72, 1, 0.0, null, null, null, null, 0],
-        ["punch2", 0, 73, 1, 0.0, null, null, null, null, 0],
-        ["flipkick", 0, 74, 1, 0.0, null, null, null, null, 0],
-        ["bow", 0, 126, 1, 0.0, null, null, null, null, 0],
-        ["opendoor1", 0, 127, 1, 0.0, null, null, null, null, 0],
-        ["opendoor2", 0, 128, 1, 0.0, null, null, null, null, 0],
-        ["falling", 0, 151, 1, 0.0, null, null, null, null, 0],
-        ["dive", 0, 156, 1, 0.0, null, null, null, null, 0],
-        ["headscratch", 0, 157, 1, 0.0, null, null, null, null, 0],
-        ["look2", 0, 158, 1, 0.0, null, null, null, null, 0],
-        ["plant", 0, 162, 1, 0.0, null, null, null, null, 0],
-        ["cower", 0, 163, 1, 0.0, null, null, null, null, 0],
-        ["aimdown", 0, 160, 1, 0.0, null, null, null, null, 0],
-        ["aimcrouch", 0, 165, 1, 0.0, null, null, null, null, 0],
-        ["throw3", 0, 166, 1, 0.0, null, null, null, null, 0],
-        ["handsup", 0, 167, 1, 0.0, null, null, null, null, 0]
-    ],
-    "gta:vc": [
-        ["walk", 0, 0, 1, 0.0, null, null, null, null, 0],
-        ["jog", 0, 1, 1, 0.0, null, null, null, null, 0],
-        ["handcuffs", 0, 7, 1, 0.0, null, null, null, null, 0],
-        ["tired", 0, 9, 1, 0.0, null, null, null, null, 0],
-        ["raisegun", 0, 10, 1, 0.0, null, null, null, null, 0],
-        ["wave", 0, 12, 1, 0.0, null, null, null, null, 0],
-        ["talk", 0, 11, 1, 0.0, null, null, null, null, 0],
-        ["stomachhit", 0, 18, 1, 0.0, null, null, null, null, 0],
-        ["headhit", 0, 18, 1, 0.0, null, null, null, null, 0],
-        ["headbutt", 0, 49, 1, 0.0, null, null, null, null, 0],
-        ["kick", 0, 50, 1, 0.0, null, null, null, null, 0],
-        ["kneekick", 0, 51, 1, 0.0, null, null, null, null, 0],
-        ["throw2", 0, 54, 1, 0.0, null, null, null, null, 0],
-        ["punch1", 0, 52, 1, 0.0, null, null, null, null, 0],
-        ["punch2", 0, 53, 1, 0.0, null, null, null, null, 0],
-        ["flipkick", 0, 54, 1, 0.0, null, null, null, null, 0],
-        ["headscratch", 0, 152, 1, 0.0, null, null, null, null, 0],
-        ["aimdown", 0, 155, 1, 0.0, null, null, null, null, 0],
-        ["look2", 0, 153, 1, 0.0, null, null, null, null, 0],
-        ["handsup", 0, 161, 1, 0.0, null, null, null, null, 0],
-        ["cower", 0, 162, 1, 0.0, null, null, null, null, 0],
-        ["fucku", 0, 163, 1, 0.0, null, null, null, null, 0],
-        ["phone", 0, 166, 1, 0.0, null, null, null, null, 0],
-        ["sit", 0, 169, 1, 1.0, null, null, null, null, 0],
-        ["atm", 0, 171, 1, 0.0, null, null, null, null, 0],
-        ["cpr", 24, 214, 1, 0.0, null, null, null, null, 0],
-        ["idle1", 26, 215, 1, 0.0, null, null, null, null, 0],
-        ["idle2", 26, 216, 1, 0.0, null, null, null, null, 0],
-        ["idle3", 26, 217, 1, 0.0, null, null, null, null, 0],
-        ["idle4", 26, 218, 1, 0.0, null, null, null, null, 0],
-        ["dance1", 28, 226, 1, 0.0, null, null, null, null, 0],
-        ["dance2", 28, 227, 1, 0.0, null, null, null, null, 0],
-        ["dance3", 28, 228, 1, 0.0, null, null, null, null, 0],
-        ["dance4", 28, 229, 1, 0.0, null, null, null, null, 0],
-        ["dance5", 28, 230, 1, 0.0, null, null, null, null, 0],
-        ["dance6", 28, 231, 1, 0.0, null, null, null, null, 0],
-        ["dance7", 28, 232, 1, 0.0, null, null, null, null, 0],
-        ["sitright", 0, 169, 1, 0.0, null, null, null, null, 4],
-        ["sitleft", 0, 169, 1, 0.0, null, null, null, null, 3],
-        ["sitforward", 0, 169, 1, 0.0, null, null, null, null, 1],
-        ["sitback", 0, 169, 1, 0.0, null, null, null, null, 2]
-    ],
-    "gta:sa":[
-        ["walk", 0, 0, 1, 0.0, null, null, null, null, 0],
-        ["jog", 0, 1, 1, 0.0, null, null, null, null, 0],
-        ["look1", 0, 4, 1, 0.0, null, null, null, null, 0],
-        ["holdrifle", 0, 11, 1, 0.0, null, null, null, null, 0],
-        ["talk1", 0, 12, 1, 0.0, null, null, null, null, 0],
-        ["wave1", 0, 13, 1, 0.0, null, null, null, null, 0],
-        ["swim1", 0, 14, 1, 0.0, null, null, null, null, 0],
-        ["die1", 0, 15, 1, 0.0, null, null, null, null, 0],
-        ["die2", 0, 16, 1, 0.0, null, null, null, null, 0],
-        ["diehead", 0, 19, 1, 0.0, null, null, null, null, 0],
-        ["diestomach", 0, 20, 1, 0.0, null, null, null, null, 0],
-        ["choke", 0, 21, 1, 0.0, null, null, null, null, 0],
-        ["remotepress", 0, 48, 1, 0.0, null, null, null, null, 0],
-        ["pickup1", 0, 99, 1, 0.0, null, null, null, null, 0],
-        ["pickup2", 0, 100, 1, 0.0, null, null, null, null, 0],
-        ["backhandright", 0, 103, 1, 0.0, null, null, null, null, 0],
-        ["backhandleft", 0, 104, 1, 0.0, null, null, null, null, 0],
-        ["knockback", 0, 105, 1, 0.0, null, null, null, null, 0],
-        ["idle1", 0, 135, 1, 0.0, null, null, null, null, 0],
-        ["knockback", 0, 105, 1, 0.0, null, null, null, null, 0],
-        ["cower", 0, 141, 1, 0.0, null, null, null, null, 0],
-        ["handsup", 0, 142, 1, 0.0, null, null, null, null, 0],
-        ["fucku", 0, 144, 1, 0.0, null, null, null, null, 0],
-        ["phoneout", 0, 145, 1, 0.0, null, null, null, null, 0],
-        ["phonein", 0, 146, 1, 0.0, null, null, null, null, 0],
-        ["phonetalk", 0, 146, 1, 0.0, null, null, null, null, 0],
-        ["sit1", 0, 150, 1, 0.0, null, null, null, null, 0],
-        ["atm", 0, 151, 1, 0.0, null, null, null, null, 0],
-        ["mindtrick", 0, 153, 1, 0.0, null, null, null, null, 0],
-        ["faceshocked", 0, 150, 1, 0.0, null, null, null, null, 0],
-        ["facesurprised", 0, 150, 1, 0.0, null, null, null, null, 0],
-        ["faceconfused", 0, 150, 1, 0.0, null, null, null, null, 0],
-        ["faceangry", 0, 159, 1, 0.0, null, null, null, null, 0],
-        ["facetalk1", 0, 160, 1, 0.0, null, null, null, null, 0],
-        ["look2", 0, 165, 1, 0.0, null, null, null, null, 0],
-        ["gestureno", 0, 166, 1, 0.0, null, null, null, null, 0],
-        ["gestureyes", 0, 167, 1, 0.0, null, null, null, null, 0],
-        ["wave2", 0, 168, 1, 0.0, null, null, null, null, 0],
-        ["snort", 0, 169, 1, 0.0, null, null, null, null, 0],
-        ["sitright", 0, 150, 1, 0.0, null, null, null, null, 4],
-        ["sitleft", 0, 150, 1, 0.0, null, null, null, null, 3],
-        ["sitforward", 0, 150, 1, 0.0, null, null, null, null, 1],
-        ["sitback", 0, 150, 1, 0.0, null, null, null, null, 2]
-    ],
-    "invalid1": [
-
-    ],
-    "gta:iv": [
-        ["dance1", "DAN_LOOP_A", "DANCING", 1, 16.0, true, false, true, false, 0]
-    ],
-    "mafia:one": [
-        ["phonepickup", "TelVytoceni"],
-        ["phonetalk", "TelStativ"],
-        ["phonehangup", "TelZaveseni"],
-        ["phonehangup", "TelZaveseni"]
-    ]
-}

config/economy.json

@@ -3,6 +3,7 @@
     "applyTax": true,
     "applyUpkeep": true,
     "grossIncomeMultiplier": 1.0,
+    "incomeTaxRate": 0.7,
     "upKeepCosts": {
         "upKeepPerVehicle": 250,
         "upKeepPerHouse": 350,

config/email.json

@@ -13,8 +13,10 @@
         "confirmEmail": "Welcome to {SERVERNAME}!\nPlease confirm your email by using the command /verifyemail in-game.\n\nYour verification code is: {VERIFICATIONCODE}",
         "emailConfirmed": "Your email has been confirmed on {SERVERNAME}!\nYou may now use this email to reset your password, require two-factor authentication on login, receive offline notifications, and more!",
         "twoFactorAuthentication": "Please enter the following code to continue on {SERVERNAME} for {GAMENAME}: {2FACODE}",
-        "accountAuthSuccessAlert": "You or someone else has successfully logged in to your account on {SERVERNAME} for {GAMENAME}.\nIP Address: {IPADDRESS}\nLocation: {LOCATION}\nTimestamp: {TIMESTAMP}",
+        "accountAuthSuccessAlert": "You or someone else has successfully logged in to your account on {SERVERNAME} for {GAMENAME}.\n\nIP Address: {IPADDRESS}\nLocation: {LOCATION}\nTimestamp: {TIMESTAMP}\n\nIf you have two-factor authentication enabled (Using /2fa in-game), your account can't be accessed unless a correct 2FA code is entered.",
         "accountAuthFailAlert": "You or someone else has failed to login to your account on {SERVERNAME} for {GAMENAME}.\nIP Address: {IPADDRESS}\nLocation: {LOCATION}\nTimestamp: {TIMESTAMP}",
-        "offlineMessageAlert": "You have received a private message on {SERVERNAME} for {GAMENAME}. \nYou are receiving this notification because you enabled email message notifications when you're not connected to the server.\nFrom: {FROMNAME}\nTimestamp: {TIMESTAMP}\nMessage: {MESSAGE}"
+        "offlineMessageAlert": "You have received a private message on {SERVERNAME} for {GAMENAME}. \nYou are receiving this notification because you enabled email message notifications when you're not connected to the server.\nFrom: {FROMNAME}\nTimestamp: {TIMESTAMP}\nMessage: {MESSAGE}",
+        "confirmPasswordReset": "You (or someone else) requested to reset your password on {SERVERNAME}!\nPlease confirm this request by entering the code below into the password reset window in-game.\n\nYour verification code is: {VERIFICATIONCODE}\n\n\nIf you did not request a password reset, then there's nothing to worry about since your password can only be reset with the code above.",
+        "passwordChanged": "Your password on {SERVERNAME} has been changed successfully!"
     }
 }

config/locale.json

@@ -1,3 +1,10 @@
-[
+{
-    ["English", "english"]
+    "apiEmail": "example@example.com",
-]
+    "defaultLanguage": "en",
+    "locales": [
+        ["English", "english", "en"],
+        ["Russian", "russian", "ru"],
+        ["Polish", "polish", "pl"],
+        ["Spanish", "spanish", "es"]
+    ]
+}

config/roleplay.json

@@ -1,56 +0,0 @@
-{
-    "defaultStreamingRadioVolume": 50,
-    "npcFarProximity": 100,
-    "npcMediumProximity": 40,
-    "npcCloseProximity": 12,
-    "meActionDistance": 20,
-    "doActionDistance": 15,
-    "shoutDistance": 30,
-    "talkDistance": 10,
-    "whisperDistance": 2,
-    "megaphoneDistance": 40,
-    "vehicleLockDistance": 5,
-    "startWorkingDistance": 5,
-    "takeJobDistance": 5,
-    "stopWorkingDistance": 10,
-    "spawnCarDistance": 5,
-    "payAndSprayDistance": 5,
-    "exitPropertyDistance": 3.0,
-    "enterPropertyDistance": 3.0,
-    "businessDimensionStart": 5000,
-    "houseDimensionStart": 100,
-    "buyVehicleDriveAwayDistance": 25.0,
-    "returnToJobVehicleTime": 30,
-    "walkieTalkieSpeakerDistance": 10,
-    "walkieTalkieTalkDistance": 10,
-    "phoneSpeakerDistance": 10,
-    "phoneTalkDistance": 10,
-    "tazerEffectDuration": 15000,
-    "subAccountNameAllowedCharacters": "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
-    "accents": [
-        "English",
-        "French",
-        "Russian",
-        "Scottish",
-        "Irish",
-        "Spanish",
-        "Southern American",
-        "Italian",
-        "Australian",
-        "Jamaican",
-        "Israeli",
-        "Dutch",
-        "Brazilian",
-        "Portuguese",
-        "German",
-        "Canadian",
-        "Chinese",
-        "Japanese",
-        "Turkish",
-        "Korean",
-        "Estonian",
-        "Sicilian",
-        "Indian",
-		"Rough"
-    ]
-}