Lots of stuff

This commit is contained in:
Vortrex
2020-12-11 01:51:55 -06:00
parent ecc495de5c
commit fbaafa6c0c
67 changed files with 5755 additions and 4208 deletions

View File

@@ -71,10 +71,13 @@ let serverData = {
"rankTitle",
"clanTag",
"clanName",
"manageVehicles",
"manageHouses",
"manageBusinesses",
"owner"
],
accountSettingsFlagKeys: [
"None",
"none",
"useWhiteList",
"useBlackList",
"twoStepAuth",
@@ -82,6 +85,7 @@ let serverData = {
"alertWithGUI",
"errorWithGUI",
"askWithGUI",
"autoLoginIP",
],
subAccountSettingsFlagKeys: [],
staffFlags: {},
@@ -243,19 +247,19 @@ let serverData = {
false,
[ // GTA 3
{
position: new Vec3(1143.875, -675.1875, 14.97),
position: toVector3(1143.875, -675.1875, 14.97),
heading: 1.5,
blip: false,
name: "Portland",
},
{
position: new Vec3(340.25, -1123.375, 25.98),
position: toVector3(340.25, -1123.375, 25.98),
heading: 3.14,
blip: false,
name: "Staunton Island",
},
{
position: new Vec3(-1253.0, -138.1875, 58.75),
position: toVector3(-1253.0, -138.1875, 58.75),
heading: 1.5,
blip: false,
name: "Shoreside Vale",
@@ -263,25 +267,25 @@ let serverData = {
],
[ // GTA VC
{
position: new Vec3(399.77, -468.90, 11.73),
position: toVector3(399.77, -468.90, 11.73),
heading: 0.0,
blip: false,
name: "Washington Beach",
},
{
position: new Vec3(508.96, 512.07, 12.10),
position: toVector3(508.96, 512.07, 12.10),
heading: 0.0,
blip: false,
name: "Vice Point",
},
{
position: new Vec3(-657.43, 762.31, 11.59),
position: toVector3(-657.43, 762.31, 11.59),
heading: 0.0,
blip: false,
name: "Downtown",
},
{
position: new Vec3(-885.08, -470.44, 13.11),
position: toVector3(-885.08, -470.44, 13.11),
heading: 0.0,
blip: false,
name: "Little Havana",
@@ -289,7 +293,7 @@ let serverData = {
],
[ // GTA SA
{
position: new Vec3(1545.53, -1675.64, 13.561),
position: toVector3(1545.53, -1675.64, 13.561),
heading: -1.575,
blip: false,
name: "Los Santos",
@@ -302,67 +306,67 @@ let serverData = {
[ // GTA IV
{
position: new Vec3(894.99, -357.39, 18.185),
position: toVector3(894.99, -357.39, 18.185),
heading: 2.923,
blip: false,
name: "Broker",
},
{
position: new Vec3(435.40, 1592.29, 17.353),
position: toVector3(435.40, 1592.29, 17.353),
heading: 3.087,
blip: false,
name: "South Bohan",
},
{
position: new Vec3(974.93, 1870.45, 23.073),
position: toVector3(974.93, 1870.45, 23.073),
heading: -1.621,
blip: false,
name: "Northern Gardens",
},
{
position: new Vec3(1233.25, -89.13, 28.034),
position: toVector3(1233.25, -89.13, 28.034),
heading: 1.568,
blip: false,
name: "South Slopes",
},
{
position: new Vec3(50.12, 679.88, 15.316),
position: toVector3(50.12, 679.88, 15.316),
heading: 1.569,
blip: false,
name: "Middle Park East",
},
{
position: new Vec3(85.21, 1189.82, 14.755),
position: toVector3(85.21, 1189.82, 14.755),
heading: 3.127,
blip: false,
name: "East Holland",
},
{
position: new Vec3(2170.87, 448.87, 6.085),
position: toVector3(2170.87, 448.87, 6.085),
heading: 1.501,
blip: false,
name: "Francis International Airport",
},
{
position: new Vec3(213.12, -211.70, 10.752),
position: toVector3(213.12, -211.70, 10.752),
heading: 0.200,
blip: false,
name: "Chinatown",
},
{
position: new Vec3(-1714.95, 276.31, 22.134),
position: toVector3(-1714.95, 276.31, 22.134),
heading: 1.127,
blip: false,
name: "Acter",
},
{
position: new Vec3(-1220.73, -231.53, 3.024),
position: toVector3(-1220.73, -231.53, 3.024),
heading: 2.210,
blip: false,
name: "Port Tudor",
},
{
position: new Vec3(-927.66, 1263.63, 24.587),
position: toVector3(-927.66, 1263.63, 24.587),
heading: -0.913,
blip: false,
name: "Leftwood",
@@ -373,19 +377,19 @@ let serverData = {
false,
[ // GTA 3
{
position: new Vec3(1103.70, -52.45, 7.49),
position: toVector3(1103.70, -52.45, 7.49),
heading: 1.5,
blip: false,
name: "Portland",
},
{
position: new Vec3(-78.48, -436.80, 16.17),
position: toVector3(-78.48, -436.80, 16.17),
heading: 3.14,
blip: false,
name: "Staunton Island",
},
{
position: new Vec3(-1202.10, -14.67, 53.20),
position: toVector3(-1202.10, -14.67, 53.20),
heading: 1.5,
blip: false,
name: "Shoreside Vale",
@@ -402,31 +406,31 @@ let serverData = {
],
[ // GTA IV
{
position: new Vec3(953.13, 95.90, 35.004),
position: toVector3(953.13, 95.90, 35.004),
heading: 1.595,
blip: false,
name: "Broker",
},
{
position: new Vec3(-271.02, 1542.15, 20.420),
position: toVector3(-271.02, 1542.15, 20.420),
heading: -1.160,
blip: false,
name: "Northwood",
},
{
position: new Vec3(1120.47, 1712.36, 10.534),
position: toVector3(1120.47, 1712.36, 10.534),
heading: -0.682,
blip: false,
name: "Northern Gardens",
},
{
position: new Vec3(2364.87, 166.83, 5.813),
position: toVector3(2364.87, 166.83, 5.813),
heading: 0.156,
blip: false,
name: "Francis International Airport",
},
{
position: new Vec3(295.40, -336.88, 4.963),
position: toVector3(295.40, -336.88, 4.963),
heading: 2.887,
blip: false,
name: "Chinatown",
@@ -437,54 +441,76 @@ let serverData = {
false,
[ // GTA 3
{
position: new Vec3(1144.25, -596.875, 14.97),
position: toVector3(1144.25, -596.875, 14.97),
heading: 1.5,
blip: false,
name: "Portland",
},
{
position: new Vec3(183.5, -17.75, 16.21),
position: toVector3(183.5, -17.75, 16.21),
heading: 3.14,
blip: false,
name: "Staunton Island",
},
{
position: new Vec3(-1259.5, -44.5, 58.89),
position: toVector3(-1259.5, -44.5, 58.89),
heading: 1.5,
blip: false,
name: "Shoreside Vale",
},
],
[ // GTA VC
{
position: toVector3(493.14, 709.31, 11.80),
heading: 1.5,
blip: false,
name: "Unknown",
},
{
position: toVector3(-826.06, 1144.41, 12.41),
heading: 1.5,
blip: false,
name: "Unknown",
},
],
[ // GTA SA
{
position: toVector3(1172.96, -1323.42, 15.40),
heading: 1.5,
blip: false,
name: "All Saints",
},
{
position: toVector3(2034.04, -1405.07, 17.24),
heading: 1.5,
blip: false,
name: "County General",
},
],
[ // GTA UG
],
[ // GTA IV
{
position: new Vec3(1199.59, 196.78, 33.554),
position: toVector3(1199.59, 196.78, 33.554),
heading: 1.633,
blip: false,
name: "Schottler",
},
{
position: new Vec3(980.71, 1831.61, 23.898),
position: toVector3(980.71, 1831.61, 23.898),
heading: -0.049,
blip: false,
name: "Northern Gardens",
},
{
position: new Vec3(-1317.27, 1277.20, 22.370),
position: toVector3(-1317.27, 1277.20, 22.370),
heading: 2.246,
blip: false,
name: "Leftwood",
},
{
position: new Vec3(-1538.43, 344.58, 20.943),
position: toVector3(-1538.43, 344.58, 20.943),
heading: -0.156,
blip: false,
name: "Acter",
@@ -495,17 +521,17 @@ let serverData = {
false,
[ // GTA 3
{
position: new Vec3(925.4, -360.3, 10.83),
position: toVector3(925.4, -360.3, 10.83),
blip: false,
name: "Portland",
},
{
position: new Vec3(381.8, -493.8, 25.95),
position: toVector3(381.8, -493.8, 25.95),
blip: false,
name: "Staunton Island",
},
{
position: new Vec3(-1142.4, 35.01, 58.61),
position: toVector3(-1142.4, 35.01, 58.61),
blip: false,
name: "Shoreside Vale",
},
@@ -528,12 +554,12 @@ let serverData = {
false,
[ // GTA 3
{
position: new Vec3(1068.3, -400.9, 15.24),
position: toVector3(1068.3, -400.9, 15.24),
blip: false,
name: "Portland",
},
{
position: new Vec3(348.2, -717.9, 26.43),
position: toVector3(348.2, -717.9, 26.43),
blip: false,
name: "Staunton Island",
},
@@ -556,7 +582,7 @@ let serverData = {
[ // GTA 3
{
position: new Vec3(1161.9, -76.73, 7.27),
position: toVector3(1161.9, -76.73, 7.27),
blip: false,
name: "Portland",
},
@@ -572,548 +598,18 @@ let serverData = {
],
[ // GTA IV
]
]
],
jobs: [
false,
[ // GTA 3
{
name: "Police Officer",
position: new Vec3(1143.87, -675.18, 14.97),
pickup: false,
pickupModel: 1383,
blip: false,
jobType: AG_JOB_POLICE,
jobSkin: 1,
jobColour: serverConfig.colour.byName.policeBlue,
enabled: true,
weapons: [[1,1], [2, 150], [4,20]],
equipment: [
{ // Standard police officer equipment
requiredRank: 0,
weapons: [
[1,1], // Baseball Bat (Nitestick alternative)
[2,150], // Pistol
[4,20], // Shotgun
]
},
{ // Detective Equipment
requiredRank: 1,
weapons: [
[4,1], // Nitestick
[17,150], // Colt 45
[19,20], // Shotgun
[34,100], // Camera
]
},
{ // Supervisor Equipment
requiredRank: 3,
weapons: [
[4,1], // Nitestick
[17,150], // Colt 45
[19,20], // Shotgun
[25,300], // MP5
]
},
{ // SWAT Equipment
requiredRank: 2,
weapons: [
[4,1], // Nitestick
[17,150], // Colt 45
[19,20], // Shotgun
[25,300], // MP5
[26,300], // M4
]
},
]
},
{
name: "Paramedic",
position: new Vec3(1144.25, -596.87, 14.97),
pickup: false,
pickupModel: 1362,
blip: false,
jobType: AG_JOB_MEDICAL,
jobSkin: 5,
jobColour: serverConfig.colour.byName.medicPink,
enabled: true
},
{
name: "Firefighter",
position: new Vec3(1103.70, -52.45, 7.49),
pickup: false,
pickupModel: 1364,
blip: false,
jobType: AG_JOB_FIRE,
jobSkin: 6,
jobColour: serverConfig.colour.byName.firefighterRed,
enabled: true
},
{
name: "Trash Collector",
position: new Vec3(1121.8, 27.8, 1.99),
pickup: false,
pickupModel: 1351,
blip: false,
jobType: AG_JOB_GARBAGE,
jobSkin: 53,
jobColour: 2,
enabled: true
},
{
name: "Trash Collector",
position: new Vec3(-66.83, -932.2, 16.47),
pickup: false,
pickupModel: 1351,
blip: false,
jobType: AG_JOB_GARBAGE,
jobSkin: 53,
jobColour: 2,
enabled: true
},
{
name: "Taxi Driver",
position: new Vec3(1229.2, -740.1, 15.17),
pickup: false,
pickupModel: 1361,
blip: false,
jobType: AG_JOB_TAXI,
jobSkin: 8,
jobColour: 3,
enabled: true
},
{
name: "Bus Driver",
position: new Vec3(1310.20, -1016.30, 14.88),
pickup: false,
pickupModel: 1361,
blip: false,
jobType: AG_JOB_BUS,
jobSkin: 121,
jobColour: 3,
enabled: true
},
{
name: "Police Officer",
position: new Vec3(340.25, -1123.37, 25.98),
pickup: false,
pickupModel: 1361,
blip: false,
jobType: AG_JOB_POLICE,
jobSkin: 1,
jobColour: serverConfig.colour.byName.policeBlue,
enabled: true,
weapons: [[1,1], [2, 150], [4,20]],
},
{
name: "Police Officer",
position: new Vec3(-1253.0, -138.18, 58.75),
pickup: false,
pickupModel: 1361,
blip: false,
jobType: AG_JOB_POLICE,
jobSkin: 1,
jobColour: serverConfig.colour.byName.policeBlue,
enabled: true,
weapons: [[1,1], [2, 150], [4,20]],
},
{
name: "Paramedic",
position: new Vec3(183.5, -17.75, 16.21),
pickup: false,
pickupModel: 1361,
blip: false,
jobType: AG_JOB_MEDICAL,
jobSkin: 5,
jobColour: serverConfig.colour.byName.medicPink,
enabled: true
},
{
name: "Paramedic",
position: new Vec3(-1259.5, -44.5, 58.89),
pickup: false,
pickupModel: 1361,
blip: false,
jobType: AG_JOB_MEDICAL,
jobSkin: 5,
jobColour: serverConfig.colour.byName.medicPink,
enabled: true
} ,
{
name: "Firefighter",
position: new Vec3(-78.48, -436.80, 16.17),
pickup: false,
pickupModel: 1361,
blip: false,
jobType: AG_JOB_FIRE,
jobSkin: 6,
jobColour: serverConfig.colour.byName.firefighterRed,
enabled: true
},
{
name: "Firefighter",
position: new Vec3(-1202.10, -14.67, 53.20),
pickup: false,
pickupModel: 1361,
blip: false,
jobType: AG_JOB_FIRE,
jobSkin: 6,
jobColour: serverConfig.colour.byName.firefighterRed,
enabled: true
},
{
name: "Taxi Driver",
position: new Vec3(1229.2, -740.1, 15.17),
pickup: false,
pickupModel: 1361,
blip: false,
jobType: AG_JOB_TAXI,
jobSkin: 8,
jobColour: 3,
enabled: true
},
{
name: "Bus Driver",
position: new Vec3(-57.1661, -334.266, 16.9324),
pickup: false,
pickupModel: 1361,
blip: false,
jobType: AG_JOB_BUS,
jobSkin: 121,
jobColour: 3,
enabled: true
},
],
[ // GTA VC
{
name: "Police Officer",
position: new Vec3(399.77, -468.90, 11.73),
pickup: false,
pickupModel: 375,
blip: false,
jobType: AG_JOB_POLICE,
jobSkin: 1,
jobColour: serverConfig.colour.byName.policeBlue,
enabled: true,
equipment: [
{ // Standard police officer equipment
requiredRank: 0,
weapons: [
[4,1], // Nitestick
[17,150], // Colt 45
[19,20], // Shotgun
]
},
{ // Detective Equipment
requiredRank: 1,
weapons: [
[4,1], // Nitestick
[17,150], // Colt 45
[19,20], // Shotgun
[34,100], // Camera
]
},
{ // Supervisor Equipment
requiredRank: 3,
weapons: [
[4,1], // Nitestick
[17,150], // Colt 45
[19,20], // Shotgun
[25,300], // MP5
]
},
{ // SWAT Equipment
requiredRank: 2,
weapons: [
[4,1], // Nitestick
[17,150], // Colt 45
[19,20], // Shotgun
[25,300], // MP5
[26,300], // M4
]
},
]
},
{
name: "Police Officer",
position: new Vec3(508.96, 512.07, 12.10),
pickup: false,
pickupModel: 375,
blip: false,
jobType: AG_JOB_POLICE,
jobSkin: 1,
jobColour: serverConfig.colour.byName.policeBlue,
enabled: true,
equipment: [
{ // Standard police officer equipment
requiredRank: 0,
weapons: [
[4,1], // Nitestick
[17,150], // Colt 45
[19,20], // Shotgun
]
},
{ // Detective Equipment
requiredRank: 1,
weapons: [
[4,1], // Nitestick
[17,150], // Colt 45
[19,20], // Shotgun
[34,100], // Camera
]
},
{ // Supervisor Equipment
requiredRank: 3,
weapons: [
[4,1], // Nitestick
[17,150], // Colt 45
[19,20], // Shotgun
[25,300], // MP5
]
},
{ // SWAT Equipment
requiredRank: 2,
weapons: [
[4,1], // Nitestick
[17,150], // Colt 45
[19,20], // Shotgun
[25,300], // MP5
[26,300], // M4
]
},
]
},
{
name: "Police Officer",
position: new Vec3(-657.43, 762.31, 11.59),
pickup: false,
pickupModel: 375,
blip: false,
jobType: AG_JOB_POLICE,
jobSkin: 1,
jobColour: serverConfig.colour.byName.policeBlue,
enabled: true,
equipment: [
{ // Standard police officer equipment
requiredRank: 0,
weapons: [
[4,1], // Nitestick
[17,150], // Colt 45
[19,20], // Shotgun
]
},
{ // Detective Equipment
requiredRank: 1,
weapons: [
[4,1], // Nitestick
[17,150], // Colt 45
[19,20], // Shotgun
[34,100], // Camera
]
},
{ // Supervisor Equipment
requiredRank: 3,
weapons: [
[4,1], // Nitestick
[17,150], // Colt 45
[19,20], // Shotgun
[25,300], // MP5
]
},
{ // SWAT Equipment
requiredRank: 2,
weapons: [
[4,1], // Nitestick
[17,150], // Colt 45
[19,20], // Shotgun
[25,300], // MP5
[26,300], // M4
]
},
]
},
{
name: "Police Officer",
position: new Vec3(-885.08, -470.44, 13.11),
pickup: false,
pickupModel: 375,
blip: false,
jobType: AG_JOB_POLICE,
jobSkin: 1,
jobColour: serverConfig.colour.byName.policeBlue,
enabled: true,
equipment: [
{ // Standard police officer equipment
requiredRank: 0,
weapons: [
[4,1], // Nitestick
[17,150], // Colt 45
[19,20], // Shotgun
]
},
{ // Detective Equipment
requiredRank: 1,
weapons: [
[4,1], // Nitestick
[17,150], // Colt 45
[19,20], // Shotgun
[34,100], // Camera
]
},
{ // Supervisor Equipment
requiredRank: 3,
weapons: [
[4,1], // Nitestick
[17,150], // Colt 45
[19,20], // Shotgun
[25,300], // MP5
]
},
{ // SWAT Equipment
requiredRank: 2,
weapons: [
[4,1], // Nitestick
[17,150], // Colt 45
[19,20], // Shotgun
[25,300], // MP5
[26,300], // M4
]
},
]
},
],
[ // GTA SA
],
[ // GTA UG
],
[ // GTA IV
]
//{ name: "Postal Worker" , position: Vector ( ) , pickup: false, pickupModel: 1361, blip: false, jobType: 7 },
//{ name: "Delivery Worker" , position: Vector ( ) , pickup: false, pickupModel: 1361, blip: false, jobType: 8 },
//{ name: "Mechanic" , position: Vector ( ) , pickup: false, pickupModel: 1361, blip: false, jobType: 9 },
],
policeJobSkins: [
false,
[ // GTA III
1, 92,
],
[ // GTA VC
1,
],
[ // GTA SA
280, 281, 282, 283, 284, 285, 28, 288,
],
[ // GTA UG
],
[ // GTA IV
]
],
medicalJobSkins: [
false,
[ // GTA III
5, 72, 73
],
[ // GTA VC
5,
],
[ // GTA SA
274, 275, 276
],
[ // GTA UG
],
[ // GTA IV
]
],
fireJobSkins: [
false,
[ // GTA III
6
],
[ // GTA VC
6,
],
[ // GTA SA
277, 278, 279
],
[ // GTA UG
],
[ // GTA IV
]
],
taxiJobSkins: [
false,
[ // GTA III
8,
],
[ // GTA VC
8,
],
[ // GTA SA
7, 142
],
[ // GTA UG
],
[ // GTA IV
]
],
busJobSkins: [
false,
[ // GTA III
8,
],
[ // GTA VC
8,
],
[ // GTA SA
7, 142
],
[ // GTA UG
],
[ // GTA IV
]
],
garbageJobSkins: [
false,
[ // GTA III
53, 54,
],
[ // GTA VC
53, 54,
],
[ // GTA SA
16,
],
[ // GTA UG
],
[ // GTA IV
]
],
};
// ----------------------------------------------------------------------------
function initServerData() {
// Pre-allocate translation cache language slots
global.serverData.translation.cache = new Array(global.serverData.translation.languages.length);
let translationCacheFrom = new Array(global.serverData.translation.languages.length);
global.getServerData().translation.cache = new Array(global.getServerData().translation.languages.length);
let translationCacheFrom = new Array(global.getServerData().translation.languages.length);
translationCacheFrom.fill([]);
global.serverData.translation.cache.fill(translationCacheFrom);
global.getServerData().translation.cache.fill(translationCacheFrom);
}
// ----------------------------------------------------------------------------
@@ -1124,9 +620,8 @@ function getServerId() {
// ----------------------------------------------------------------------------
function getServerGame() {
return server.game;
function getServerData() {
return serverData;
}
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------