hamyack/GTA4RP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add job wl/bl and fill some empty classes

Browse Source
This commit is contained in:
Vortrex
2020-12-27 21:25:41 -06:00
parent 9dabdc9fc3
commit d3e9cf8958
1 changed files with 121 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

169
scripts/server/class.js
View File

@@ -92,7 +92,7 @@ function initClassTable() {
this.accountData = accountData; this.accountData = accountData;
this.subAccounts = subAccounts; // Characters this.subAccounts = subAccounts; // Characters
this.client = client; this.client = client;
this.currentSubAccount = 0; this.currentSubAccount = -1;
this.loggedIn = false; this.loggedIn = false;
this.busRoute = null; this.busRoute = null;
@@ -105,7 +105,13 @@ function initClassTable() {
this.spawned = false; this.spawned = false;
this.rentingVehicle = false;
this.buyingVehicle = false; this.buyingVehicle = false;
this.lastVehicle = false;
this.returnToJobVehicleTick = 0;
this.returnToJobVehicleTimer = null;
} }
}, },
accountData: class { accountData: class {
@@ -481,80 +487,147 @@ function initClassTable() {
}, },
jobData: class { jobData: class {
constructor(jobAssoc) { constructor(jobAssoc) {
if(!jobAssoc) { this.databaseId = 0;
return; this.type = AG_JOB_NONE;
} this.name = "Unnamed";
this.enabled = true;
this.databaseId = jobAssoc["job_id"]; this.blipModel = -1
this.type = jobAssoc["job_type"]; this.pickupModel = -1
this.name = jobAssoc["job_name"]; this.colour = toColour(0, 0, 0, 255);
this.enabled = jobAssoc["job_enabled"]; this.whiteListEnabled = false;
this.blipModel = jobAssoc["job_blip"]; this.blackListEnabled = false;
this.pickupModel = jobAssoc["job_pickup"];
this.colour = toColour(jobAssoc["job_colour_r"], jobAssoc["job_colour_g"], jobAssoc["job_colour_b"], 255);
this.whitelist = jobAssoc["job_whitelist"];
this.equipment = []; this.equipment = [];
this.uniforms = []; this.uniforms = [];
this.locations = []; this.locations = [];
this.whiteList = [];
this.blackList = [];
if(jobAssoc) {
this.databaseId = jobAssoc["job_id"];
this.type = jobAssoc["job_type"];
this.name = jobAssoc["job_name"];
this.enabled = jobAssoc["job_enabled"];
this.blipModel = jobAssoc["job_blip"];
this.pickupModel = jobAssoc["job_pickup"];
this.colour = toColour(jobAssoc["job_colour_r"], jobAssoc["job_colour_g"], jobAssoc["job_colour_b"], 255);
this.whiteListEnabled = jobAssoc["job_whitelist"];
this.blackListEnabled = jobAssoc["job_blacklist"];
this.equipment = [];
this.uniforms = [];
this.locations = [];
this.whiteList = [];
this.blackList = [];
}
} }
}, },
jobEquipmentData: class { jobEquipmentData: class {
constructor(jobEquipmentAssoc) { constructor(jobEquipmentAssoc) {
if(!jobEquipmentAssoc) { this.databaseId = 0;
return; this.job = 0;
} this.name = "Unnamed";
this.requiredRank = 0;
this.enabled = false;
this.databaseId = jobEquipmentAssoc["job_equip_id"]; if(jobEquipmentAssoc) {
this.job = jobEquipmentAssoc["job_equip_job"]; this.databaseId = jobEquipmentAssoc["job_equip_id"];
this.name = jobEquipmentAssoc["job_equip_name"]; this.job = jobEquipmentAssoc["job_equip_job"];
this.requiredRank = jobEquipmentAssoc["job_equip_minrank"]; this.name = jobEquipmentAssoc["job_equip_name"];
this.enabled = jobEquipmentAssoc["job_equip_enabled"]; this.requiredRank = jobEquipmentAssoc["job_equip_minrank"];
this.enabled = jobEquipmentAssoc["job_equip_enabled"];
}
} }
}, },
jobEquipmentWeaponData: class { jobEquipmentWeaponData: class {
constructor(jobEquipmentWeaponAssoc) { constructor(jobEquipmentWeaponAssoc) {
if(!jobEquipmentWeaponAssoc) { this.databaseId = 0;
return; this.equipmentId = 0;
} this.weaponId = 0;
this.ammo = 0;
this.enabled = false;
this.databaseId = jobEquipmentWeaponAssoc["job_equip_wep_id"]; if(!jobEquipmentWeaponAssoc) {
this.equipmentId = jobEquipmentWeaponAssoc["job_equip_wep_equip"]; this.databaseId = jobEquipmentWeaponAssoc["job_equip_wep_id"];
this.weaponId = jobEquipmentWeaponAssoc["job_equip_wep_wep"]; this.equipmentId = jobEquipmentWeaponAssoc["job_equip_wep_equip"];
this.ammo = jobEquipmentWeaponAssoc["job_equip_wep_ammo"]; this.weaponId = jobEquipmentWeaponAssoc["job_equip_wep_wep"];
this.enabled = jobEquipmentWeaponAssoc["job_equip_wep_enabled"]; this.ammo = jobEquipmentWeaponAssoc["job_equip_wep_ammo"];
this.enabled = jobEquipmentWeaponAssoc["job_equip_wep_enabled"];
}
} }
}, },
jobUniformData: class { jobUniformData: class {
constructor(jobUniformAssoc) { constructor(jobUniformAssoc) {
if(!jobUniformAssoc) { this.databaseId = 0;
return; this.job = 0;
} this.name = "Unnamed";
this.requiredRank = 0
this.skin = -1;
this.enabled = false;
this.databaseId = jobUniformAssoc["job_uniform_id"]; if(!jobUniformAssoc) {
this.job = jobUniformAssoc["job_uniform_job"]; this.databaseId = jobUniformAssoc["job_uniform_id"];
this.name = jobUniformAssoc["job_uniform_name"]; this.job = jobUniformAssoc["job_uniform_job"];
this.requiredRank = jobUniformAssoc["job_uniform_minrank"]; this.name = jobUniformAssoc["job_uniform_name"];
this.skin = jobUniformAssoc["job_uniform_skin"]; this.requiredRank = jobUniformAssoc["job_uniform_minrank"];
this.enabled = jobUniformAssoc["job_uniform_skin"]; this.skin = jobUniformAssoc["job_uniform_skin"];
this.enabled = jobUniformAssoc["job_uniform_skin"];
}
} }
}, },
jobLocationData: class { jobLocationData: class {
constructor(jobLocationAssoc) { constructor(jobLocationAssoc) {
if(!jobLocationAssoc) { this.databaseId = 0;
return; this.job = 0;
} this.position = toVector3(0.0, 0.0, 0.0);
this.databaseId = jobLocationAssoc["job_loc_id"];
this.job = jobLocationAssoc["job_loc_job"];
this.position = toVector3(jobLocationAssoc["job_loc_pos_x"], jobLocationAssoc["job_loc_pos_y"], jobLocationAssoc["job_loc_pos_z"]);
//this.blipModel = jobAssoc["job_blip"]; //this.blipModel = jobAssoc["job_blip"];
//this.pickupModel = jobAssoc["job_pickup"]; //this.pickupModel = jobAssoc["job_pickup"];
this.blip = false; this.blip = false;
this.pickup = false; this.pickup = false;
this.enabled = jobLocationAssoc["job_loc_enabled"]; this.enabled = false;
if(!jobLocationAssoc) {
this.databaseId = jobLocationAssoc["job_loc_id"];
this.job = jobLocationAssoc["job_loc_job"];
this.position = toVector3(jobLocationAssoc["job_loc_pos_x"], jobLocationAssoc["job_loc_pos_y"], jobLocationAssoc["job_loc_pos_z"]);
//this.blipModel = jobAssoc["job_blip"];
//this.pickupModel = jobAssoc["job_pickup"];
this.blip = false;
this.pickup = false;
this.enabled = jobLocationAssoc["job_loc_enabled"];
}
} }
}, },
jobWhiteListData: class {
constructor(jobWhiteListAssoc) {
this.databaseId = 0;
this.job = 0;
this.subAccount = 0
this.enabled = false;
if(!jobWhiteListAssoc) {
this.databaseId = jobWhiteListAssoc["job_wl_id"];
this.job = jobWhiteListAssoc["job_wl_job"];
this.subAccount = jobWhiteListAssoc["job_wl_sacct"]
this.enabled = jobWhiteListAssoc["job_wl_enabled"];
}
}
},
jobBlackListData: class {
constructor(jobBlackListAssoc) {
this.databaseId = 0;
this.job = 0;
this.subAccount = 0
this.enabled = false;
if(!jobBlackListAssoc) {
this.databaseId = jobBlackListAssoc["job_bl_id"];
this.job = jobBlackListAssoc["job_bl_job"];
this.subAccount = jobBlackListAssoc["job_bl_sacct"]
this.enabled = jobBlackListAssoc["job_bl_enabled"];
}
}
},
keyBindData: class { keyBindData: class {
constructor(keyBindAssoc, key = 0, commandString = "") { constructor(keyBindAssoc, key = 0, commandString = "") {
this.databaseId = 0; this.databaseId = 0;
@@ -565,10 +638,10 @@ function initClassTable() {
this.enabled = true; this.enabled = true;
this.keyState = false; this.keyState = false;
if(keyBindAssoc != null) { if(keyBindAssoc) {
this.databaseId = keyBindAssoc["acct_hotkey_id"]; this.databaseId = keyBindAssoc["acct_hotkey_id"];
this.key = toInteger(keyBindAssoc["acct_hotkey_key"]); this.key = toInteger(keyBindAssoc["acct_hotkey_key"]);
this.account = keyBindAssoc["acct_hotkey_acct"]; this.account = toInteger(keyBindAssoc["acct_hotkey_acct"]);
this.commandString = keyBindAssoc["acct_hotkey_cmdstr"]; this.commandString = keyBindAssoc["acct_hotkey_cmdstr"];
this.whenAdded = keyBindAssoc["acct_hotkey_when_added"]; this.whenAdded = keyBindAssoc["acct_hotkey_when_added"];
this.enabled = intToBool(keyBindAssoc["acct_hotkey_enabled"]); this.enabled = intToBool(keyBindAssoc["acct_hotkey_enabled"]);