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

Align house and biz create funcs

Browse Source
This commit is contained in:
Vortrex
2022-05-06 13:14:37 -05:00
parent b9cb100775
commit 6aa13ff76a
3 changed files with 70 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
scripts/server/business.js
View File

@@ -140,19 +140,9 @@ function loadBusinessGameScriptsFromDatabase(businessId) {
*
*/
function createBusinessCommand(command, params, client) {
let tempBusinessData = createBusiness(params, getPlayerPosition(client), toVector3(0.0, 0.0, 0.0), getGameConfig().pickupModels[getGame()].Business, getGameConfig().blipSprites[getGame()].Business, getPlayerInterior(client), getPlayerDimension(client), getPlayerData(client).interiorCutscene);
tempBusinessData.needsSaved = true;
let businessId = getServerData().businesses.push(tempBusinessData);
setBusinessDataIndexes();
createBusiness(params, getPlayerPosition(client), toVector3(0.0, 0.0, 0.0), getGameConfig().pickupModels[getGame()].Business, -1, getPlayerInterior(client), getPlayerDimension(client), getPlayerData(client).interiorCutscene);
saveAllBusinessesToDatabase();
createBusinessEntrancePickup(businessId-1);
createBusinessExitPickup(businessId-1);
createBusinessEntranceBlip(businessId-1);
createBusinessExitBlip(businessId-1);
messageAdmins(`{adminOrange}${getPlayerName(client)}{MAINCOLOUR} created business {businessBlue}${tempBusinessData.name}`);
messageAdmins(`{adminOrange}${getPlayerName(client)}{MAINCOLOUR} created business: {businessBlue}${params}`);
}
// ===========================================================================
@@ -192,7 +182,7 @@ function createBusinessLocationCommand(command, params, client) {
// ===========================================================================
function createBusiness(name, entrancePosition, exitPosition, entrancePickupModel = -1, entranceBlipModel = -1, entranceInteriorId = 0, entranceVirtualWorld = 0, entranceCutscene = "", exitCutscene = "") {
function createBusiness(name, entrancePosition, exitPosition, entrancePickupModel = -1, entranceBlipModel = -1, entranceInterior = 0, entranceDimension = 0, entranceCutscene = -1) {
let tempBusinessData = new BusinessData(false);
tempBusinessData.name = name;
@@ -200,8 +190,8 @@ function createBusiness(name, entrancePosition, exitPosition, entrancePickupMode
tempBusinessData.entranceRotation = 0.0;
tempBusinessData.entrancePickupModel = entrancePickupModel;
tempBusinessData.entranceBlipModel = entranceBlipModel;
tempBusinessData.entranceInterior = entranceInteriorId;
tempBusinessData.entranceDimension = entranceVirtualWorld;
tempBusinessData.entranceInterior = entranceInterior;
tempBusinessData.entranceDimension = entranceDimension;
tempBusinessData.entranceCutscene = entranceCutscene;
tempBusinessData.exitPosition = exitPosition;
@@ -210,7 +200,15 @@ function createBusiness(name, entrancePosition, exitPosition, entrancePickupMode
tempBusinessData.exitBlipModel = -1;
tempBusinessData.exitInterior = 0;
tempBusinessData.exitDimension = 0;
tempBusinessData.exitCutscene = "";
tempBusinessData.exitCutscene = -1;
tempBusinessData.needsSaved = true;
let businessId = getServerData().businesses.push(tempBusinessData);
setBusinessDataIndexes();
saveAllBusinessesToDatabase();
createBusinessPickups(businessId-1);
createBusinessBlips(businessId-1);
return tempBusinessData;
}
@@ -1701,10 +1699,9 @@ function createBusinessEntrancePickup(businessId) {
setElementOnAllDimensions(entrancePickup, false);
setElementDimension(entrancePickup, getBusinessData(businessId).entranceDimension);
setElementOnAllDimensions(entrancePickup, false);
setElementStreamInDistance(entrancePickup, getGlobalConfig().houseBlipStreamInDistance);
setElementStreamOutDistance(entrancePickup, getGlobalConfig().houseBlipStreamOutDistance);
setElementStreamInDistance(entrancePickup, getGlobalConfig().businessBlipStreamInDistance);
setElementStreamOutDistance(entrancePickup, getGlobalConfig().businessBlipStreamOutDistance);
setElementTransient(entrancePickup, false);
addToWorld(entrancePickup);
getBusinessData(businessId).entrancePickup = entrancePickup;
updateBusinessPickupLabelData(businessId);
@@ -1757,7 +1754,6 @@ function createBusinessEntranceBlip(businessId) {
setElementStreamInDistance(entranceBlip, getGlobalConfig().businessBlipStreamInDistance);
setElementStreamOutDistance(entranceBlip, getGlobalConfig().businessBlipStreamOutDistance);
setElementTransient(entranceBlip, false);
addToWorld(entranceBlip);
getBusinessData(businessId).entranceBlip = entranceBlip;
}

2
scripts/server/class.js
View File

@@ -246,7 +246,7 @@ class ClientData {
this.customDisconnectReason = "";
this.interiorCutscene = "";
this.interiorCutscene = -1;
}
};

109
scripts/server/house.js
View File

@@ -51,35 +51,13 @@ function loadHousesFromDatabase() {
*
*/
function createHouseCommand(command, params, client) {
let entranceLocation = new HouseLocationData(false);
entranceLocation.entrancePosition = getPlayerPosition(client);
entranceLocation.entranceRotation = 0.0;
entranceLocation.entrancePickupModel = getGameConfig().pickupModels[getGame()].House;
entranceLocation.entranceBlipModel = getGameConfig().blipSprites[getGame()].House;
entranceLocation.entranceInterior = 0;
entranceLocation.entranceDimension = 0;
if(areParamsEmpty(params)) {
messagePlayerSyntax(client, getCommandSyntaxText(command));
return false;
}
entranceLocation.exitPosition = toVector3(0.0, 0.0, 0.0);
entranceLocation.exitRotation = 0.0;
entranceLocation.exitPickupModel = getGameConfig().pickupModels[getGame()].Exit;
entranceLocation.exitBlipModel = -1;
entranceLocation.exitInterior = 0;
entranceLocation.exitDimension = 0;
let tempHouseData = createHouse(params, entranceLocation);
let houseId = getServerData().houses.push(tempHouseData);
saveHouseToDatabase(houseId-1);
setHouseDataIndexes();
createHouseEntrancePickup(houseId-1);
createHouseExitPickup(houseId-1);
createHouseEntranceBlip(houseId-1);
createHouseExitBlip(houseId-1);
//getHouseData(houseId).needsSaved = true;
messageAdmins(`{adminOrange}${getPlayerName(client)}{MAINCOLOUR} created house {houseGreen}${tempHouseData.description}`);
createHouse(params, getPlayerPosition(client), toVector3(0.0, 0.0, 0.0), getGameConfig().pickupModels[getGame()].House, -1, getPlayerInterior(client), getPlayerDimension(client), getPlayerData(client).interiorCutscene);
messageAdmins(`{adminOrange}${getPlayerName(client)}{MAINCOLOUR} created house: {houseGreen}${params}`);
}
// ===========================================================================
@@ -133,12 +111,6 @@ function setHouseDescriptionCommand(command, params, client) {
let oldDescription = getHouseData(houseId).description;
getHouseData(houseId).description = newHouseDescription;
//for(let i in getHouseData(houseId).locations) {
// if(getHouseData(houseId).locations[i].type == VRR_HOUSE_LOC_DOOR) {
// setEntityData(getHouseData(houseId).entrancePickup, "vrr.label.name", getHouseData(houseId).description, true);
// }
//}
setEntityData(getHouseData(houseId).entrancePickup, "vrr.label.name", getHouseData(houseId).description, true);
getHouseData(houseId).needsSaved = true;
@@ -619,25 +591,37 @@ function removePlayerFromHouses(client) {
* @return {bool} Whether or not the player was successfully removed from the house
*
*/
function createHouse(description, entranceLocation) {
function createHouse(description, entrancePosition, exitPosition, entrancePickupModel = -1, entranceBlipModel = -1, entranceInterior = 0, entranceDimension = 0, entranceCutscene = -1) {
let tempHouseData = new HouseData(false);
tempHouseData.description = description;
tempHouseData.entrancePosition = entranceLocation.entrancePosition;
tempHouseData.entranceRotation = entranceLocation.entranceRotation;
tempHouseData.entrancePickupModel = entranceLocation.entrancePickupModel;
tempHouseData.entranceBlipModel = entranceLocation.entranceBlipModel;
tempHouseData.entranceInterior = entranceLocation.entranceInterior;
tempHouseData.entranceDimension = entranceLocation.entranceDimension;
tempHouseData.entrancePosition = entrancePosition;
tempHouseData.entranceRotation = 0.0;
tempHouseData.entrancePickupModel = entrancePickupModel;
tempHouseData.entranceBlipModel = entranceBlipModel;
tempHouseData.entranceInterior = entranceInterior;
tempHouseData.entranceDimension = entranceDimension;
tempHouseData.entranceCutscene = entranceCutscene;
tempHouseData.exitPosition = entranceLocation.exitPosition;
tempHouseData.exitRotation = entranceLocation.exitRotation;
tempHouseData.exitPickupModel = entranceLocation.exitPickupModel;
tempHouseData.exitBlipModel = entranceLocation.exitBlipModel;
tempHouseData.exitInterior = entranceLocation.exitInterior;
tempHouseData.entranceDimension = entranceLocation.entranceDimension;
tempHouseData.exitPosition = exitPosition;
tempHouseData.exitRotation = 0.0;
tempHouseData.exitPickupModel = 0;
tempHouseData.exitBlipModel = -1;
tempHouseData.exitInterior = 0;
tempHouseData.exitDimension = 0;
tempHouseData.exitCutscene = -1;
return tempHouseData;
tempHouseData.needsSaved = true;
let houseId = getServerData().houses.push(tempHouseData);
saveHouseToDatabase(houseId-1);
setHouseDataIndexes();
createHousePickups(houseId-1);
createHouseBlips(houseId-1);
return houseId-1;
}
// ===========================================================================
@@ -882,7 +866,6 @@ function createHouseEntrancePickup(houseId) {
setElementStreamInDistance(entrancePickup, getGlobalConfig().housePickupStreamInDistance);
setElementStreamOutDistance(entrancePickup, getGlobalConfig().housePickupStreamOutDistance);
setElementTransient(entrancePickup, false);
addToWorld(entrancePickup);
getHouseData(houseId).entrancePickup = entrancePickup;
updateHousePickupLabelData(houseId);
@@ -915,7 +898,6 @@ function createHouseEntranceBlip(houseId) {
setElementTransient(entranceBlip, false);
setEntityData(entranceBlip, "vrr.owner.type", VRR_BLIP_HOUSE_ENTRANCE, false);
setEntityData(entranceBlip, "vrr.owner.id", houseId, false);
addToWorld(entranceBlip);
getHouseData(houseId).entranceBlip = entranceBlip;
}
@@ -946,7 +928,6 @@ function createHouseExitPickup(houseId) {
setElementStreamInDistance(exitPickup, getGlobalConfig().housePickupStreamInDistance);
setElementStreamOutDistance(exitPickup, getGlobalConfig().housePickupStreamOutDistance);
setElementTransient(exitPickup, false);
addToWorld(exitPickup);
getHouseData(houseId).exitPickup = exitPickup;
updateHousePickupLabelData(houseId);
@@ -981,7 +962,6 @@ function createHouseExitBlip(houseId) {
setElementTransient(exitBlip, false);
setEntityData(exitBlip, "vrr.owner.type", VRR_BLIP_HOUSE_EXIT, false);
setEntityData(exitBlip, "vrr.owner.id", houseId, false);
addToWorld(exitBlip);
getHouseData(houseId).exitBlip = exitBlip;
}
@@ -1000,15 +980,18 @@ function getHouseOwnerTypeText(ownerType) {
case VRR_HOUSEOWNER_PLAYER:
return "player";
case VRR_BIZOWNER_NONE:
case VRR_HOUSEOWNER_NONE:
return "not owned";
case VRR_BIZOWNER_PUBLIC:
case VRR_HOUSEOWNER_PUBLIC:
return "not owned";
case VRR_BIZOWNER_JOB:
case VRR_HOUSEOWNER_JOB:
return "job";
case VRR_HOUSEOWNER_BIZ:
return "business";
default:
return "unknown";
}
@@ -1061,7 +1044,7 @@ function getHouseInfoCommand(command, params, client) {
break;
}
messagePlayerNormal(client, `🏠 {houseGreen}[House Info] {MAINCOLOUR}Description: {ALTCOLOUR}${getHouseData(houseId).description}, {MAINCOLOUR}Owner: {ALTCOLOUR}${ownerName} (${getHouseOwnerTypeText(getHouseData(houseId).ownerType)}), {MAINCOLOUR}Locked: {ALTCOLOUR}${getYesNoFromBool(intToBool(getHouseData(houseId).locked))}, {MAINCOLOUR}ID: {ALTCOLOUR}${houseId}/${getHouseData(houseId).databaseId}`);
messagePlayerNormal(client, `🏠 {houseGreen}[House Info]{MAINCOLOUR} Description: {ALTCOLOUR}${getHouseData(houseId).description}, {MAINCOLOUR}Owner: {ALTCOLOUR}${ownerName} (${getHouseOwnerTypeText(getHouseData(houseId).ownerType)}), {MAINCOLOUR}Locked: {ALTCOLOUR}${getYesNoFromBool(intToBool(getHouseData(houseId).locked))}, {MAINCOLOUR}ID: {ALTCOLOUR}${houseId}/${getHouseData(houseId).databaseId}`);
}
// ===========================================================================
@@ -1544,4 +1527,18 @@ function deleteAllHousePickups() {
}
}
// ===========================================================================
function createHouseBlips(houseId) {
createHouseEntranceBlip(houseId);
createHouseExitBlip(houseId);
}
// ===========================================================================
function createHousePickups(houseId) {
createHouseEntrancePickup(houseId);
createHouseExitPickup(houseId);
}
// ===========================================================================