This commit is contained in:
Vortrex
2020-12-31 13:12:34 -06:00
parent e68dfce2bb
commit 8d88b31110
5 changed files with 472 additions and 215 deletions

View File

@@ -294,22 +294,101 @@ function initClassTable() {
}
},
businessLocationData: class {
constructor(businessLocationAssoc) {
if(!businessLocationAssoc) {
return;
constructor(dbAssoc) {
this.databaseId = 0;
this.name = "Unnamed";
this.business = 0;
this.enabled = false;
this.entrancePosition = false;
this.entranceRotation = 0.0;
this.entranceInterior = 0;
this.entranceDimension = 0;
this.entrancePickupModel = -1;
this.entranceBlipModel = -1;
this.entrancePickup = null;
this.entranceBlip = null;
this.exitPosition = false;
this.exitRotation = 0.0;
this.exitInterior = 0;
this.exitDimension = -1;
this.exitPickupModel = -1;
this.exitBlipModel = -1;
this.exitPickup = null;
this.exitBlip = null;
if(dbAssoc) {
this.databaseId = toInteger(dbAssoc("biz_loc_id"));
this.name = toString(dbAssoc("biz_loc_name"));
this.type = toInteger(dbAssoc("biz_loc_type"));
this.business = toInteger(dbAssoc("biz_loc_biz"));
this.enabled = intToBool(toInteger(dbAssoc("biz_loc_enabled")));
this.entrancePosition = toVector3(toFloat(dbAssoc["biz_loc_entrance_pos_x"]), toFloat(dbAssoc["biz_loc_entrance_pos_y"]), toFloat(dbAssoc["biz_loc_entrance_pos_z"]));
this.entranceRotation = toFloat(dbAssoc["biz_loc_entrance_rot_z"]);
this.entranceInterior = toInteger(dbAssoc["biz_loc_entrance_int"]);
this.entranceDimension = toInteger(dbAssoc["biz_loc_entrance_vw"]);
this.entrancePickupModel = toInteger(dbAssoc["biz_loc_entrance_pickup"]);
this.entranceBlipModel = toInteger(dbAssoc["biz_loc_entrance_blip"]);
this.exitPosition = toVector3(toFloat(dbAssoc["biz_loc_exit_pos_x"]), toFloat(dbAssoc["biz_loc_exit_pos_y"]), toFloat(dbAssoc["biz_loc_exit_pos_z"]));
this.exitRotation = toFloat(dbAssoc["biz_loc_exit_rot_z"]);
this.exitInterior = toInteger(dbAssoc["biz_loc_exit_int"]);
this.exitDimension = toInteger(dbAssoc["biz_loc_exit_vw"]);
this.exitPickupModel = toInteger(dbAssoc["biz_loc_exit_pickup"]);
this.exitBlipModel = toInteger(dbAssoc["biz_loc_exit_blip"]);
}
this.databaseId = toInteger(businessLocationAssoc("biz_loc_id"));
this.name = toString(businessLocationAssoc("biz_loc_name"));
this.type = toInteger(businessLocationAssoc("biz_loc_type"));
this.business = toInteger(businessLocationAssoc("biz_loc_biz"));
this.enabled = intToBool(toInteger(businessLocationAssoc("biz_loc_enabled")));
this.position = toVector3(toFloat(businessLocationAssoc("biz_loc_pos_x")), toFloat(businessLocationAssoc("biz_loc_pos_y")), toFloat(businessLocationAssoc("biz_loc_pos_z")));
this.interior = toInteger(businessLocationAssoc["biz_loc_int"]);
this.dimension = toInteger(businessLocationAssoc["biz_loc_vw"]);
}
},
houseLocationData: class {
constructor(dbAssoc) {
this.databaseId = 0;
this.name = "Unnamed";
this.house = 0;
this.enabled = false;
this.entrancePosition = false;
this.entranceRotation = 0.0;
this.entranceInterior = 0;
this.entranceDimension = 0;
this.entrancePickupModel = -1;
this.entranceBlipModel = -1;
this.entrancePickup = null;
this.entranceBlip = null;
this.exitPosition = false;
this.exitRotation = 0.0;
this.exitInterior = 0;
this.exitDimension = -1;
this.exitPickupModel = -1;
this.exitBlipModel = -1;
this.exitPickup = null;
this.exitBlip = null;
if(dbAssoc) {
this.databaseId = toInteger(dbAssoc("house_loc_id"));
this.name = toString(dbAssoc("house_loc_name"));
this.type = toInteger(dbAssoc("house_loc_type"));
this.business = toInteger(dbAssoc("house_loc_biz"));
this.enabled = intToBool(toInteger(dbAssoc("house_loc_enabled")));
this.entrancePosition = toVector3(toFloat(dbAssoc["house_loc_entrance_pos_x"]), toFloat(dbAssoc["house_loc_entrance_pos_y"]), toFloat(dbAssoc["house_loc_entrance_pos_z"]));
this.entranceRotation = toFloat(dbAssoc["house_loc_entrance_rot_z"]);
this.entranceInterior = toInteger(dbAssoc["house_loc_entrance_int"]);
this.entranceDimension = toInteger(dbAssoc["house_loc_entrance_vw"]);
this.entrancePickupModel = toInteger(dbAssoc["house_loc_entrance_pickup"]);
this.entranceBlipModel = toInteger(dbAssoc["house_loc_entrance_blip"]);
this.exitPosition = toVector3(toFloat(dbAssoc["house_loc_exit_pos_x"]), toFloat(dbAssoc["house_loc_exit_pos_y"]), toFloat(dbAssoc["house_loc_exit_pos_z"]));
this.exitRotation = toFloat(dbAssoc["house_loc_exit_rot_z"]);
this.exitInterior = toInteger(dbAssoc["house_loc_exit_int"]);
this.exitDimension = toInteger(dbAssoc["house_loc_exit_vw"]);
this.exitPickupModel = toInteger(dbAssoc["house_loc_exit_pickup"]);
this.exitBlipModel = toInteger(dbAssoc["house_loc_exit_blip"]);
}
}
},
houseData: class {
constructor(houseAssoc) {
this.databaseId = 0
@@ -353,8 +432,6 @@ function initClassTable() {
this.entranceDimension = toInteger(houseAssoc["house_entrance_vw"]);
this.entrancePickupModel = toInteger(houseAssoc["house_entrance_pickup"]);
this.entranceBlipModel = toInteger(houseAssoc["house_entrance_blip"]);
this.entrancePickup = null;
this.entranceBlip = null;
this.exitPosition = toVector3(toFloat(houseAssoc["house_exit_pos_x"]), toFloat(houseAssoc["house_exit_pos_y"]), toFloat(houseAssoc["house_exit_pos_z"]));
this.exitRotation = toFloat(houseAssoc["house_exit_rot_z"]);
@@ -362,8 +439,6 @@ function initClassTable() {
this.exitDimension = toInteger(houseAssoc["house_exit_vw"]);
this.exitPickupModel = toInteger(houseAssoc["house_exit_pickup"]);
this.exitBlipModel = toInteger(houseAssoc["house_exit_blip"]);
this.exitPickup = null;
this.exitBlip = null;
}
}
},
@@ -524,6 +599,7 @@ function initClassTable() {
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.colourArray = [jobAssoc["job_colour_r"], jobAssoc["job_colour_g"], jobAssoc["job_colour_b"]];
this.whiteListEnabled = jobAssoc["job_whitelist"];
this.blackListEnabled = jobAssoc["job_blacklist"];