From 7973927cf0b0c46beda28634e7ad91be2e81e8fa Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Fri, 6 May 2022 12:58:48 -0500 Subject: [PATCH] Add custom int prop to biz & house data --- scripts/server/business.js | 13 +- scripts/server/class.js | 17 +-- scripts/server/house.js | 16 ++- scripts/shared/gamedata.js | 284 ++++++++++++++++++------------------- 4 files changed, 168 insertions(+), 162 deletions(-) diff --git a/scripts/server/business.js b/scripts/server/business.js index 39d5aac8..4015f8cf 100644 --- a/scripts/server/business.js +++ b/scripts/server/business.js @@ -860,6 +860,7 @@ function setBusinessInteriorTypeCommand(command, params, client) { getBusinessData(businessId).hasInterior = false; getBusinessData(businessId).interiorCutscene = ""; getBusinessData(businessId).exitPickupModel = -1; + getBusinessData(businessId).customInterior = false; messageAdmins(`{adminOrange}${getPlayerName(client)}{MAINCOLOUR} removed business {businessBlue}${getBusinessData(businessId).name}{MAINCOLOUR} interior`); return false; } @@ -880,10 +881,9 @@ function setBusinessInteriorTypeCommand(command, params, client) { getBusinessData(businessId).exitInterior = getGameConfig().interiors[getGame()][typeParam][1]; getBusinessData(businessId).exitDimension = getBusinessData(businessId).databaseId+getGlobalConfig().businessDimensionStart; getBusinessData(businessId).exitPickupModel = getGameConfig().pickupModels[getGame()].Exit; - if(getGameConfig().interiors[getGame()][typeParam].length == 3) { - getBusinessData(businessId).interiorCutscene = getGameConfig().interiors[getGame()][typeParam][2]; - } getBusinessData(businessId).hasInterior = true; + getBusinessData(businessId).customInterior = getGameConfig().interiors[getGame()][typeParam][2]; + getBusinessData(businessId).interiorCutscene = getGameConfig().interiors[getGame()][typeParam][3]; } //deleteBusinessExitPickup(businessId); @@ -1576,8 +1576,6 @@ function saveBusinessToDatabase(businessId) { let dbConnection = connectToDatabase(); if(dbConnection) { let safeBusinessName = escapeDatabaseString(dbConnection, tempBusinessData.name); - let safeExitCutscene = escapeDatabaseString(dbConnection, tempBusinessData.exitCustscene); - let safeEntranceCutscene = escapeDatabaseString(dbConnection, tempBusinessData.entranceCutscene); let data = [ ["biz_server", getServerId()], @@ -1595,7 +1593,7 @@ function saveBusinessToDatabase(businessId) { ["biz_entrance_vw", tempBusinessData.entranceDimension], ["biz_entrance_pickup", tempBusinessData.entrancePickupModel], ["biz_entrance_blip", tempBusinessData.entranceBlipModel], - ["biz_entrance_cutscene", safeEntranceCutscene], + ["biz_entrance_cutscene", tempBusinessData.entranceCutscene], ["biz_exit_pos_x", tempBusinessData.exitPosition.x], ["biz_exit_pos_y", tempBusinessData.exitPosition.y], ["biz_exit_pos_z", tempBusinessData.exitPosition.z], @@ -1604,11 +1602,12 @@ function saveBusinessToDatabase(businessId) { ["biz_exit_vw", tempBusinessData.exitDimension], ["biz_exit_pickup", tempBusinessData.exitPickupModel], ["biz_exit_blip", tempBusinessData.exitBlipModel], - ["biz_exit_cutscene", safeExitCutscene], + ["biz_exit_cutscene", tempBusinessData.exitCutscene], ["biz_has_interior", boolToInt(tempBusinessData.hasInterior)], ["biz_interior_lights", boolToInt(tempBusinessData.interiorLights)], ["biz_label_help_type", tempBusinessData.labelHelpType], ["biz_radiostation", tempBusinessData.streamingRadioStation], + ["biz_custom_interior", boolToInt(tempBusinessData.customInterior)], ]; let dbQuery = null; diff --git a/scripts/server/class.js b/scripts/server/class.js index 21049a0b..6e1e41be 100644 --- a/scripts/server/class.js +++ b/scripts/server/class.js @@ -534,7 +534,6 @@ class BusinessData { this.entranceBlipModel = -1; this.entrancePickup = null; this.entranceBlip = null; - this.entranceCutscene = ""; this.exitPosition = false; this.exitRotation = 0.0; @@ -555,6 +554,8 @@ class BusinessData { this.triggers = []; + this.customInterior = false; + if(dbAssoc) { this.databaseId = toInteger(dbAssoc["biz_id"]); this.name = toString(dbAssoc["biz_name"]); @@ -571,7 +572,6 @@ class BusinessData { this.entranceDimension = toInteger(dbAssoc["biz_entrance_vw"]); this.entrancePickupModel = toInteger(dbAssoc["biz_entrance_pickup"]); this.entranceBlipModel = toInteger(dbAssoc["biz_entrance_blip"]); - this.entranceCutscene = toString(dbAssoc["biz_entrance_cutscene"]); this.exitPosition = toVector3(dbAssoc["biz_exit_pos_x"], dbAssoc["biz_exit_pos_y"], dbAssoc["biz_exit_pos_z"]); this.exitRotation = toInteger(dbAssoc["biz_exit_rot_z"]); @@ -579,14 +579,13 @@ class BusinessData { this.exitDimension = toInteger(dbAssoc["biz_exit_vw"]); this.exitPickupModel = toInteger(dbAssoc["biz_exit_pickup"]); this.exitBlipModel = toInteger(dbAssoc["biz_exit_blip"]); - this.exitCutscene = toString(dbAssoc["biz_exit_cutscene"]); this.entranceFee = toInteger(dbAssoc["biz_entrance_fee"]); this.till = toInteger(dbAssoc["biz_till"]); this.labelHelpType = toInteger(dbAssoc["biz_label_help_type"]); this.streamingRadioStation = toInteger(dbAssoc["biz_radiostation"]); - + this.customInterior = intToBool(toInteger(dbAssoc["biz_custom_interior"])); } }; }; @@ -675,7 +674,6 @@ class HouseData { this.entranceBlipModel = -1; this.entrancePickup = null; this.entranceBlip = null; - this.entranceCutscene = ""; this.exitPosition = false; this.exitRotation = 0.0; @@ -685,12 +683,13 @@ class HouseData { this.exitBlipModel = -1; this.exitPickup = null; this.exitBlip = null; - this.exitCutscene = ""; this.streamingRadioStation = -1; this.triggers = []; + this.customInterior = false; + if(dbAssoc) { this.databaseId = toInteger(dbAssoc["house_id"]); this.description = toString(dbAssoc["house_description"]); @@ -709,7 +708,7 @@ class HouseData { this.entranceDimension = toInteger(dbAssoc["house_entrance_vw"]); this.entrancePickupModel = toInteger(dbAssoc["house_entrance_pickup"]); this.entranceBlipModel = toInteger(dbAssoc["house_entrance_blip"]); - this.entranceCutscene = toString(dbAssoc["house_entrance_cutscene"]); + this.entranceCutscene = toInteger(dbAssoc["house_entrance_cutscene"]); this.exitPosition = toVector3(toFloat(dbAssoc["house_exit_pos_x"]), toFloat(dbAssoc["house_exit_pos_y"]), toFloat(dbAssoc["house_exit_pos_z"])); this.exitRotation = toFloat(dbAssoc["house_exit_rot_z"]); @@ -717,7 +716,9 @@ class HouseData { this.exitDimension = toInteger(dbAssoc["house_exit_vw"]); this.exitPickupModel = toInteger(dbAssoc["house_exit_pickup"]); this.exitBlipModel = toInteger(dbAssoc["house_exit_blip"]); - this.exitCutscene = toString(dbAssoc["house_exit_cutscene"]); + this.exitCutscene = toInteger(dbAssoc["house_exit_cutscene"]); + + this.customInterior = intToBool(toInteger(dbAssoc["house_custom_interior"])); } } }; diff --git a/scripts/server/house.js b/scripts/server/house.js index ff258777..8e58ebdb 100644 --- a/scripts/server/house.js +++ b/scripts/server/house.js @@ -723,12 +723,14 @@ function saveAllHousesToDatabase() { function saveHouseToDatabase(houseId) { let tempHouseData = getServerData().houses[houseId]; + if(!tempHouseData.needsSaved) { + return false; + } + logToConsole(LOG_VERBOSE, `[VRR.House]: Saving house '${tempHouseData.databaseId}' to database ...`); let dbConnection = connectToDatabase(); if(dbConnection) { let safeHouseDescription = escapeDatabaseString(dbConnection, tempHouseData.description); - let safeExitCutscene = escapeDatabaseString(dbConnection, tempHouseData.exitCutscene); - let safeEntranceCutscene = escapeDatabaseString(dbConnection, tempHouseData.entranceCutscene); let data = [ ["house_server", getServerId()], @@ -745,7 +747,7 @@ function saveHouseToDatabase(houseId) { ["house_entrance_vw", tempHouseData.entranceDimension], ["house_entrance_pickup", tempHouseData.entrancePickupModel], ["house_entrance_blip", tempHouseData.entranceBlipModel], - ["house_entrance_cutscene", safeEntranceCutscene], + ["house_entrance_cutscene", tempHouseData.entranceCutscene], ["house_exit_pos_x", tempHouseData.exitPosition.x], ["house_exit_pos_y", tempHouseData.exitPosition.y], ["house_exit_pos_z", tempHouseData.exitPosition.z], @@ -754,12 +756,12 @@ function saveHouseToDatabase(houseId) { ["house_exit_vw", tempHouseData.exitDimension], ["house_exit_pickup", tempHouseData.exitPickupModel], ["house_exit_blip", tempHouseData.exitBlipModel], - ["house_exit_cutscene", safeExitCutscene], + ["house_exit_cutscene", tempHouseData.exitCutscene], ["house_buy_price", tempHouseData.buyPrice], ["house_rent_price", tempHouseData.rentPrice], ["house_has_interior", boolToInt(tempHouseData.hasInterior)], ["house_interior_lights", boolToInt(tempHouseData.interiorLights)], - + ["house_custom_interior", boolToInt(tempHouseData.customInterior)], ]; let dbQuery = null; @@ -788,6 +790,10 @@ function saveHouseToDatabase(houseId) { function saveHouseLocationToDatabase(houseId, locationId) { let tempHouseLocationData = getServerData().houses[houseId].locations[locationId]; + if(!tempHouseLocationData.needsSaved) { + return false; + } + logToConsole(LOG_VERBOSE, `[VRR.House]: Saving house location '${locationId}' for house '${getHouseData(houseId).databaseId}' to database ...`); let dbConnection = connectToDatabase(); if(dbConnection) { diff --git a/scripts/shared/gamedata.js b/scripts/shared/gamedata.js index dbceec45..873c9af3 100644 --- a/scripts/shared/gamedata.js +++ b/scripts/shared/gamedata.js @@ -4017,154 +4017,154 @@ let gameData = { }, interiors: { [VRR_GAME_GTA_VC]: { // GTA VC - Mall: [toVector3(379.62, 1007.00, 19.22), 4], - MalibuClub: [toVector3(489.83, -76.49, 11.48), 17], - PoliceStation: [toVector3(396.38, -472.96, 12.34), 12], - Apartment: [toVector3(26.67, -1328.89, 13.00), 11], - HotelLobby: [toVector3(228.53, -1277.12, 12.07), 1], - BikerBar: [toVector3(-597.41, 651.84, 11.30), 11], - Mansion: [toVector3(-379.14, -551.65, 19.32), 2], - GunRange: [toVector3(-667.79, 1217.51, 11.10), 10], - Bank: [toVector3(-894.52, -341.16, 13.45), 3], - StripClub: [toVector3(97.53, -1472.06, 10.43), 5], - RosenbergOffice: [toVector3(137.29, -1370.20, 13.18), 6], - Arena: [toVector3(-1080.49, 1331.16, 13.91), 15], - GhettoShack: [toVector3(-962.74, 146.96, 9.40), 12], - HotelRoom: [toVector3(226.47, -1274.98, 19.271), 2], - ConcertHall: [toVector3(-925.417, 1053.4, 13.2005), 8], - RecordingStudio: [toVector3(-879.767, 1156.88, 17.8115), 9], - PrintWorks: [toVector3(-1064.98, -279.093, 12.0882), 18], + Mall: [toVector3(379.62, 1007.00, 19.22), 4, false, -1], + MalibuClub: [toVector3(489.83, -76.49, 11.48), 17, false, -1], + PoliceStation: [toVector3(396.38, -472.96, 12.34), 12, false, -1], + Apartment: [toVector3(26.67, -1328.89, 13.00), 11, false, -1], + HotelLobby: [toVector3(228.53, -1277.12, 12.07), 1, false, -1], + BikerBar: [toVector3(-597.41, 651.84, 11.30), 11, false, -1], + Mansion: [toVector3(-379.14, -551.65, 19.32), 2, false, -1], + GunRange: [toVector3(-667.79, 1217.51, 11.10), 10, false, -1], + Bank: [toVector3(-894.52, -341.16, 13.45), 3, false, -1], + StripClub: [toVector3(97.53, -1472.06, 10.43), 5, false, -1], + RosenbergOffice: [toVector3(137.29, -1370.20, 13.18), 6, false, -1], + Arena: [toVector3(-1080.49, 1331.16, 13.91), 15, false, -1], + GhettoShack: [toVector3(-962.74, 146.96, 9.40), 12, false, -1], + HotelRoom: [toVector3(226.47, -1274.98, 19.271), 2, false, -1], + ConcertHall: [toVector3(-925.417, 1053.4, 13.2005), 8, false, -1], + RecordingStudio: [toVector3(-879.767, 1156.88, 17.8115), 9, false, -1], + PrintWorks: [toVector3(-1064.98, -279.093, 12.0882), 18, false, -1], }, [VRR_GAME_GTA_SA]: { // GTA SA - LSPD: [toVector3(247.113, 62.929, 1003.64), 2], - LVPD: [toVector3(288.82, 167.39, 1007.17), 3], - SFPD: [toVector3(246.40, 110.84, 1003.22), 10], - ReeceBarberShop: [toVector3(411.62, -21.43, 1001.80), 2], - FourDragons: [toVector3(2016.26, 1017.77, 996.87), 10], - Caligula: [toVector3(2233.8, 1712.23, 1011.76), 1], - GenericCasino: [toVector3(1118.88, -10.27, 1002.08), 12], - CluckinBell: [toVector3(365.71, -9.88, 1001.85), 9], - PizzaStack: [toVector3(372.35, -131.65, 1001.49), 5], - BurgerShot: [toVector3(375.96, -65.81, 1001.50), 10], - TattooParlor: [toVector3(-203.07, -24.16, 1002.27), 16], - Bank: [toVector3(2305.14, -16.274, 26.74), 1], - Gas1: [toVector3(-25.96, -187.67, 1003.54), 17], - Gas2: [toVector3(6.09, -29.27, 1003.54), 10], - Gas3: [toVector3(-30.94, -89.60, 1003.54), 18], - Gas4: [toVector3(-25.13, -139.06, 1003.54), 16], - Gas5: [toVector3(-27.31, -29.27, 1003.54), 4], - Gas6: [toVector3(-26.69, -55.71, 1003.54), 6], - Shamal: [toVector3(2.38, 33.10, 1199.84), 1], - Andromeda: [toVector3(315.85, 1024.49, 1949.79), 9], - AirportTickets: [toVector3(-1827.14, 7.20, 1061.14), 14], - AirportBaggage: [toVector3(-1855.56, 41.26, 1061.14), 14], - Ammu1: [toVector3(286.14, -40.64, 1001.56), 1], - Ammu2: [toVector3(286.80, -82.54, 1001.53), 4], - Ammu3: [toVector3(296.91, -108.07, 1001.56), 6], - Ammu4: [toVector3(314.82, -141.43, 999.66), 7], - Ammu5: [toVector3(316.52, -167.70, 999.66), 6], - AmmuBooth: [toVector3(302.29, -143.13, 1004.06), 7], - AmmuRange: [toVector3(280.79, -135.20, 1004.06), 7], - House1: [toVector3(235.51, 1189.17, 1080.34), 3], - House2: [toVector3(225.76, 1240.00, 1082.15), 2], - House3: [toVector3(223.04, 1289.26, 1082.20), 1], - House4: [toVector3(225.63, 1022.48, 1084.07), 7], - House5: [toVector3(295.14, 1474.47, 1080.52), 15], - House6: [toVector3(328.49, 1480.59, 1084.45), 15], - House7: [toVector3(385.80, 1471.77, 1080.21), 15], - Atrium: [toVector3(1726.18, -1641.00, 20.23), 18], - CrackPalace: [toVector3(2,567.52, -1294.59, 1063.25), 2], - BloodbowlStadium: [toVector3(-1394.20, 987.62, 1023.96), 15], - BurningDesireHouse: [toVector3(2338.32, -1180.61, 1027.98), 5], - FurhbergerHouse: [toVector3(2807.63, -1170.15, 1025.57), 8], - DillimoreGas: [toVector3(664.19, -570.73, 16.34), 0], - DonutShop: [toVector3(377.19, -192.90, 1000.64), 17], - Airport: [toVector3(-1830.81, 16.83, 1061.14), 14], - JeffersonMotel: [toVector3(2220.26, -1,148.01, 1025.80), 15], - KickstartStadium: [toVector3(-1410.72, 1,591.16, 1052.53), 14], - LibertyCity: [toVector3(-750.80, 491.00, 1371.70), 1], - LSXBaggageReclaim: [toVector3(-1870.80, 59.81, 1056.25), 14], - JizzyClub: [toVector3(-2637.69, 1404.24, 906.46), 3], - RCBattlefield: [toVector3(-1079.99, 1061.58, 1343.04), 10], - RyderHouse: [toVector3(2451.77, -1699.80, 1013.51), 2], - SFGarage: [toVector3(-2042.42, 178.59, 28.84), 1], - SweetHouse: [toVector3(2535.83, -1,674.32, 1015.50), 1], - KatieHouse: [toVector3(267.22, 304.71, 999.14), 2], - HelenaHouse: [toVector3(292.44, 308.77, 999.14), 3], - WelcomePump: [toVector3(681.66, -453.32, -25.61), 1], - WoozieApartment: [toVector3(-2158.72, 641.29, 1052.38), 1], - EightTrackStadium: [toVector3(-1395.96, -208.20, 1051.17), 7], - DirtBikeStadium: [toVector3(-1424.93, -664.59, 1059.86), 4], - CrackDen: [toVector3(75.0475, 1094.6, 18.7597), 5], - MotelRoom: [toVector3(2251.85, -1138.16, 1050.63), 9], - HashburyHouse: [toVector3(2260.76, -1210.45, 1049.02), 10], - CJHouse: [toVector3(2496.65, -1696.55, 1014.74), 3], - MaddDoggMansion: [toVector3(1299.14, -794.77, 1084.00), 5], - MotelRoom2: [toVector3(2262.83, -1137.71, 1050.63), 10], - SafeHouse1: [toVector3(2365.42, -1131.85, 1050.88), 8], - SafeHouse2: [toVector3(2324.33, -1144.79, 1050.71), 12], - ZeroStore: [toVector3(-2240.00, 131.00, 1035.40), 6], - Brothel1: [toVector3(940.65, -18.48, 1000.93), 3], - Brothel2: [toVector3(967.53, -53.02, 1001.12), 3], - Brothel3: [toVector3(744.27, 1437.25, 1102.70), 6], - ProlapsStore: [toVector3(207.35, -138.00, 1003.31), 3], - VictimStore: [toVector3(221.33, -6.61, 1005.19), 5], - SuburbanStore: [toVector3(203.81, -46.53, 1001.80), 1], - SexShop: [toVector3(-106.72, -19.64, 1000.71), 3], - BincoStore: [toVector3(207.54, -109.00, 1005.13), 15], - Wardrobe: [toVector3(255.71, -41.13, 1002.02), 14], - CityHall: [toVector3(389.538, 173.652, 1008.38), 3], - GantonGym: [toVector3(772.11,-3.89,1000.72), 5], - KungFuGym: [toVector3(774.21, -48.92, 1000.58), 6], - LVGym: [toVector3(773.57, -77.09, 1000.65), 7], - InsuranceCompany: [toVector3(-2029.76, -119.624, 1035.17), 1], - StripClub1: [toVector3(1204.80,-11.58,1000.92), 2], - StripClub1Private: [toVector3(1204.80, 13.89, 1000.92), 2], - NightClub: [toVector3(493.39,-22.72,1000.67), 17], - Warehouse1: [toVector3(1412.63, -1.78, 1000.92), 1], - Warehouse2: [toVector3(1302.51, -1.78, 1001.02), 18], - Warehouse3: [toVector3(76.63, -301.15, 1.57), 0], - Warehouse4: [toVector3(1059.89, 2081.68, 10.82), 0], - BikeSchool: [toVector3(1494.32, 1304.94, 1093.28), 3], - Bar1: [toVector3(501.98,-69.15,998.75), 11], - Diner1: [toVector3(459.58, -88.60, 999.55), 4], - //Diner2: [toVector3(454.97, -110.10, 1000.07), 4], - //Diner3: [toVector3(435.27, -80.95, 999.55), 5], - SmallPoliceStation: [toVector3(322.19, 302.49, 999.14), 5], - Cinema: [toVector3(2179.95,-1009.75,1021.68), 0], - Courthouse: [toVector3(1219.51, -1792.69, 2431.34), 0], + LSPD: [toVector3(247.113, 62.929, 1003.64), 2, false, -1], + LVPD: [toVector3(288.82, 167.39, 1007.17), 3, false, -1], + SFPD: [toVector3(246.40, 110.84, 1003.22), 10, false, -1], + ReeceBarberShop: [toVector3(411.62, -21.43, 1001.80), 2, false, -1], + FourDragons: [toVector3(2016.26, 1017.77, 996.87), 10, false, -1], + Caligula: [toVector3(2233.8, 1712.23, 1011.76), 1, false, -1], + GenericCasino: [toVector3(1118.88, -10.27, 1002.08), 12, false, -1], + CluckinBell: [toVector3(365.71, -9.88, 1001.85), 9, false, -1], + PizzaStack: [toVector3(372.35, -131.65, 1001.49), 5, false, -1], + BurgerShot: [toVector3(375.96, -65.81, 1001.50), 10, false, -1], + TattooParlor: [toVector3(-203.07, -24.16, 1002.27), 16, false, -1], + Bank: [toVector3(2305.14, -16.274, 26.74), 1, false, -1], + Gas1: [toVector3(-25.96, -187.67, 1003.54), 17, false, -1], + Gas2: [toVector3(6.09, -29.27, 1003.54), 10, false, -1], + Gas3: [toVector3(-30.94, -89.60, 1003.54), 18, false, -1], + Gas4: [toVector3(-25.13, -139.06, 1003.54), 16, false, -1], + Gas5: [toVector3(-27.31, -29.27, 1003.54), 4, false, -1], + Gas6: [toVector3(-26.69, -55.71, 1003.54), 6, false, -1], + Shamal: [toVector3(2.38, 33.10, 1199.84), 1, false, -1], + Andromeda: [toVector3(315.85, 1024.49, 1949.79), 9, false, -1], + AirportTickets: [toVector3(-1827.14, 7.20, 1061.14), 14, false, -1], + AirportBaggage: [toVector3(-1855.56, 41.26, 1061.14), 14, false, -1], + Ammu1: [toVector3(286.14, -40.64, 1001.56), 1, false, -1], + Ammu2: [toVector3(286.80, -82.54, 1001.53), 4, false, -1], + Ammu3: [toVector3(296.91, -108.07, 1001.56), 6, false, -1], + Ammu4: [toVector3(314.82, -141.43, 999.66), 7, false, -1], + Ammu5: [toVector3(316.52, -167.70, 999.66), 6, false, -1], + AmmuBooth: [toVector3(302.29, -143.13, 1004.06), 7, false, -1], + AmmuRange: [toVector3(280.79, -135.20, 1004.06), 7, false, -1], + House1: [toVector3(235.51, 1189.17, 1080.34), 3, false, -1], + House2: [toVector3(225.76, 1240.00, 1082.15), 2, false, -1], + House3: [toVector3(223.04, 1289.26, 1082.20), 1, false, -1], + House4: [toVector3(225.63, 1022.48, 1084.07), 7, false, -1], + House5: [toVector3(295.14, 1474.47, 1080.52), 15, false, -1], + House6: [toVector3(328.49, 1480.59, 1084.45), 15, false, -1], + House7: [toVector3(385.80, 1471.77, 1080.21), 15, false, -1], + Atrium: [toVector3(1726.18, -1641.00, 20.23), 18, false, -1], + CrackPalace: [toVector3(2,567.52, -1294.59, 1063.25), 2, false, -1], + BloodbowlStadium: [toVector3(-1394.20, 987.62, 1023.96), 15, false, -1], + BurningDesireHouse: [toVector3(2338.32, -1180.61, 1027.98), 5, false, -1], + FurhbergerHouse: [toVector3(2807.63, -1170.15, 1025.57), 8, false, -1], + DillimoreGas: [toVector3(664.19, -570.73, 16.34), 0, false, -1], + DonutShop: [toVector3(377.19, -192.90, 1000.64), 17, false, -1], + Airport: [toVector3(-1830.81, 16.83, 1061.14), 14, false, -1], + JeffersonMotel: [toVector3(2220.26, -1,148.01, 1025.80), 15, false, -1], + KickstartStadium: [toVector3(-1410.72, 1,591.16, 1052.53), 14, false, -1], + LibertyCity: [toVector3(-750.80, 491.00, 1371.70), 1, false, -1], + LSXBaggageReclaim: [toVector3(-1870.80, 59.81, 1056.25), 14, false, -1], + JizzyClub: [toVector3(-2637.69, 1404.24, 906.46), 3, false, -1], + RCBattlefield: [toVector3(-1079.99, 1061.58, 1343.04), 10, false, -1], + RyderHouse: [toVector3(2451.77, -1699.80, 1013.51), 2, false, -1], + SFGarage: [toVector3(-2042.42, 178.59, 28.84), 1, false, -1], + SweetHouse: [toVector3(2535.83, -1,674.32, 1015.50), 1, false, -1], + KatieHouse: [toVector3(267.22, 304.71, 999.14), 2, false, -1], + HelenaHouse: [toVector3(292.44, 308.77, 999.14), 3, false, -1], + WelcomePump: [toVector3(681.66, -453.32, -25.61), 1, false, -1], + WoozieApartment: [toVector3(-2158.72, 641.29, 1052.38), 1, false, -1], + EightTrackStadium: [toVector3(-1395.96, -208.20, 1051.17), 7, false, -1], + DirtBikeStadium: [toVector3(-1424.93, -664.59, 1059.86), 4, false, -1], + CrackDen: [toVector3(75.0475, 1094.6, 18.7597), 5, false, -1], + MotelRoom: [toVector3(2251.85, -1138.16, 1050.63), 9, false, -1], + HashburyHouse: [toVector3(2260.76, -1210.45, 1049.02), 10, false, -1], + CJHouse: [toVector3(2496.65, -1696.55, 1014.74), 3, false, -1], + MaddDoggMansion: [toVector3(1299.14, -794.77, 1084.00), 5, false, -1], + MotelRoom2: [toVector3(2262.83, -1137.71, 1050.63), 10, false, -1], + SafeHouse1: [toVector3(2365.42, -1131.85, 1050.88), 8, false, -1], + SafeHouse2: [toVector3(2324.33, -1144.79, 1050.71), 12, false, -1], + ZeroStore: [toVector3(-2240.00, 131.00, 1035.40), 6, false, -1], + Brothel1: [toVector3(940.65, -18.48, 1000.93), 3, false, -1], + Brothel2: [toVector3(967.53, -53.02, 1001.12), 3, false, -1], + Brothel3: [toVector3(744.27, 1437.25, 1102.70), 6, false, -1], + ProlapsStore: [toVector3(207.35, -138.00, 1003.31), 3, false, -1], + VictimStore: [toVector3(221.33, -6.61, 1005.19), 5, false, -1], + SuburbanStore: [toVector3(203.81, -46.53, 1001.80), 1, false, -1], + SexShop: [toVector3(-106.72, -19.64, 1000.71), 3, false, -1], + BincoStore: [toVector3(207.54, -109.00, 1005.13), 15, false, -1], + Wardrobe: [toVector3(255.71, -41.13, 1002.02), 14, false, -1], + CityHall: [toVector3(389.538, 173.652, 1008.38), 3, false, -1], + GantonGym: [toVector3(772.11,-3.89,1000.72), 5, false, -1], + KungFuGym: [toVector3(774.21, -48.92, 1000.58), 6, false, -1], + LVGym: [toVector3(773.57, -77.09, 1000.65), 7, false, -1], + InsuranceCompany: [toVector3(-2029.76, -119.624, 1035.17), 1, false, -1], + StripClub1: [toVector3(1204.80,-11.58,1000.92), 2, false, -1], + StripClub1Private: [toVector3(1204.80, 13.89, 1000.92), 2, false, -1], + NightClub: [toVector3(493.39,-22.72,1000.67), 17, false, -1], + Warehouse1: [toVector3(1412.63, -1.78, 1000.92), 1, false, -1], + Warehouse2: [toVector3(1302.51, -1.78, 1001.02), 18, false, -1], + Warehouse3: [toVector3(76.63, -301.15, 1.57), 0, false, -1], + Warehouse4: [toVector3(1059.89, 2081.68, 10.82), 0, false, -1], + BikeSchool: [toVector3(1494.32, 1304.94, 1093.28), 3, false, -1], + Bar1: [toVector3(501.98,-69.15,998.75), 11, false, -1], + Diner1: [toVector3(459.58, -88.60, 999.55), 4, false, -1], + //Diner2: [toVector3(454.97, -110.10, 1000.07), 4, false, -1], + //Diner3: [toVector3(435.27, -80.95, 999.55), 5, false, -1], + SmallPoliceStation: [toVector3(322.19, 302.49, 999.14), 5, false, -1], + Cinema: [toVector3(2179.95,-1009.75,1021.68), 0, true, -1], + Courthouse: [toVector3(1219.51, -1792.69, 2431.34), 0, true, -1], }, [VRR_GAME_GTA_IV]: { // GTA IV - Office2: [toVector3(-1153.30, 417.37, 5.578), 0], - House1: [toVector3(-426.16, 1466.52, 38.971), 0], - House2: [toVector3(-969.77, 883.27, 18.817), 0], - House3: [toVector3(95.75, 851.68, 45.051), 0], - House4: [toVector3(603.04, 1404.06, 17.479), 0], - House5: [toVector3(892.56, -502.13, 19.407), 0], - House6: [toVector3(-524.09, 830.54, 23.627), 0], - House7: [toVector3(806.36, 146.68, 29.243), 0], - House8: [toVector3(356.91, 1511.28, 21.432), 0], - House9: [toVector3(1319.40, -847.02, 8.872), 0], - House10: [toVector3(1331.40, 126.60, 36.558), 0], - House11: [toVector3(1387.81, 622.66, 35.857), 0], - House12: [toVector3(932.74, -189.29, 35.143), 0], - House13: [toVector3(-1397.85, 1473.89, 26.447), 0], - House14: [toVector3(806.36, 146.68, 29.243), 0], - House15: [toVector3(-526.49, 829.41, 23.627), 0], - Gym: [toVector3(403.31, 1480.32, 11.834), 0], - PoliceStation: [toVector3(-406.52, 286.57, 13.682), 0], - FancyRestaurant: [toVector3(-118.24, -259.06, 12.654), 0], - Basement: [toVector3(1304.38, -856.66, 5.490), 0], - Office1: [toVector3(-409.31, 285.49, 18.592), 0], - Office2: [toVector3(-1153.30, 417.37, 5.578), 0], - Office3: [toVector3(817.64, -259.77, 15.343), 0], - Office4: [toVector3(-86.35, 56.70, 75.953), 0], - HospitalRoom: [toVector3(1240.00, 192.44, 33.553), 0], - Church: [toVector3(-286.72, -282.36, 15.632), 0], - Prison: [toVector3(-1082.69, -364.05, 7.404), 0], - Ship: [toVector3(-336.53, -1494.56, 9.945), 0], + Office2: [toVector3(-1153.30, 417.37, 5.578), 0, false, -1], + House1: [toVector3(-426.16, 1466.52, 38.971), 0, false, -1], + House2: [toVector3(-969.77, 883.27, 18.817), 0, false, -1], + House3: [toVector3(95.75, 851.68, 45.051), 0, false, -1], + House4: [toVector3(603.04, 1404.06, 17.479), 0, false, -1], + House5: [toVector3(892.56, -502.13, 19.407), 0, false, -1], + House6: [toVector3(-524.09, 830.54, 23.627), 0, false, -1], + House7: [toVector3(806.36, 146.68, 29.243), 0, false, -1], + House8: [toVector3(356.91, 1511.28, 21.432), 0, false, -1], + House9: [toVector3(1319.40, -847.02, 8.872), 0, false, -1], + House10: [toVector3(1331.40, 126.60, 36.558), 0, false, -1], + House11: [toVector3(1387.81, 622.66, 35.857), 0, false, -1], + House12: [toVector3(932.74, -189.29, 35.143), 0, false, -1], + House13: [toVector3(-1397.85, 1473.89, 26.447), 0, false, -1], + House14: [toVector3(806.36, 146.68, 29.243), 0, false, -1], + House15: [toVector3(-526.49, 829.41, 23.627), 0, false, -1], + Gym: [toVector3(403.31, 1480.32, 11.834), 0, false, -1], + PoliceStation: [toVector3(-406.52, 286.57, 13.682), 0, false, -1], + FancyRestaurant: [toVector3(-118.24, -259.06, 12.654), 0, false, -1], + Basement: [toVector3(1304.38, -856.66, 5.490), 0, false, -1], + Office1: [toVector3(-409.31, 285.49, 18.592), 0, false, -1], + Office2: [toVector3(-1153.30, 417.37, 5.578), 0, false, -1], + Office3: [toVector3(817.64, -259.77, 15.343), 0, false, -1], + Office4: [toVector3(-86.35, 56.70, 75.953), 0, false, -1], + HospitalRoom: [toVector3(1240.00, 192.44, 33.553), 0, false, -1], + Church: [toVector3(-286.72, -282.36, 15.632), 0, false, -1], + Prison: [toVector3(-1082.69, -364.05, 7.404), 0, false, -1], + Ship: [toVector3(-336.53, -1494.56, 9.945), 0, false, -1], }, [VRR_GAME_GTA_IV_EFLC]: {}, // GTA IV EFLC [VRR_GAME_MAFIA_ONE]: { // Mafia 1