From 6d94aa6654513eb5d90ba90ca6c16562ccad1d27 Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Mon, 31 Jan 2022 12:34:07 -0600 Subject: [PATCH] Rename some SA vehicles to reduce duplicates --- scripts/shared/gamedata.js | 148 +++++++++++++++++++++++-------------- 1 file changed, 92 insertions(+), 56 deletions(-) diff --git a/scripts/shared/gamedata.js b/scripts/shared/gamedata.js index fecb4b39..a5470816 100644 --- a/scripts/shared/gamedata.js +++ b/scripts/shared/gamedata.js @@ -1975,7 +1975,7 @@ let gameData = { [235, "Bloodring Banger 2"], [236, "VCPD Cheetah"], ], - [ + [ // GTA San Andreas [400, "Landstalker" ], [401, "Bravura" ], [402, "Buffalo" ], @@ -2011,7 +2011,7 @@ let gameData = { [432, "Rhino" ], [433, "Barracks" ], [434, "Hotknife" ], - [435, "Trailer" ], + [435, "Box Trailer" ], [436, "Previon" ], [437, "Coach" ], [438, "Cabbie" ], @@ -2026,7 +2026,7 @@ let gameData = { [447, "Seasparrow" ], [448, "Pizzaboy" ], [449, "Tram" ], - [450, "Trailer" ], + [450, "Grain Trailer" ], [451, "Turismo" ], [452, "Speeder" ], [453, "Reefer" ], @@ -2160,14 +2160,14 @@ let gameData = { [581, "BF-400" ], [582, "Newsvan" ], [583, "Tug" ], - [584, "Trailer" ], + [584, "Tanker Trailer" ], [585, "Emperor" ], [586, "Wayfarer" ], [587, "Euros" ], [588, "Hotdog" ], [589, "Club" ], - [590, "Trailer" ], - [591, "Trailer" ], + [590, "Freight Boxcar" ], + [591, "Short Box Trailer"], [592, "Andromada" ], [593, "Dodo" ], [594, "RC Cam" ], @@ -3398,60 +3398,66 @@ let gameData = { {}, { // GTA 3 - policeStation: 1361, - fireStation: 1361, - hospital: 1361, + PoliceStation: 1361, + FireStation: 1361, + Hospital: 1361, ammunation: 1361, - payAndSpray: 1361, - vehicleDealership: 1361, - restaurant: 1361, - fastFood: 1361, - bank: 1323, - fuelStation: 1361, - business: 1361, - house: 1361, - clothes: 1361, - misc: 1361, - exit: 1361, - job: 1361, + PayAndSpray: 1361, + VehicleDealership: 1361, + Restaurant: 1361, + FastFood: 1361, + Bank: 1323, + FuelStation: 1361, + Business: 1361, + House: 1361, + Clothes: 1361, + Misc: 1361, + Exit: 1361, + Job: 1361, }, { // GTA Vice City - policeStation: 375, - fireStation: 406, - hospital: 366, + PoliceStation: 375, + FireStation: 406, + Hospital: 366, ammunation: 406, - payAndSpray: 406, - vehicleDealership: 406, - restaurant: 406, - fastFood: 406, - bank: 408, - fuelStation: 406, - business: 406, - house: 407, - clothes: 409, - misc: 406, - exit: 406, - job: 406, + PayAndSpray: 406, + VehicleDealership: 406, + Restaurant: 406, + FastFood: 406, + Bank: 408, + FuelStation: 406, + Business: 406, + House: 407, + Clothes: 409, + Misc: 406, + Exit: 406, + Job: 406, }, { // GTA San Andreas - policeStation: 1247, - fireStation: 1318, - hospital: 1240, - ammunation: 1239, - payAndSpray: 1239, - vehicleDealership: 1239, - restaurant: 1239, - fastFood: 1239, - bank: 1274, - fuelStation: 1239, - business: 1272, - house: 1273, - clothes: 1275, - misc: 1239, - exit: 1318, - job: 1239, + PoliceStation: 1247, + FireStation: 1318, + Hospital: 1240, + Ammunation: 1239, + PayAndSpray: 1239, + VehicleDealership: 1239, + Restaurant: 1239, + FastFood: 1239, + Bank: 1274, + FuelStation: 1239, + Business: 1272, + House: 1273, + Clothes: 1275, + Misc: 1239, + Exit: 1318, + Job: 1239, + SaveDisk: 1277, + Pill: 1241, + Camera: 1253, + TwoPlayer: 1314, + RampageSkull: 1254, + TwoPlayerRampage: 1313, }, { // GTA Underground @@ -4266,11 +4272,11 @@ let gameData = { 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.88, -185.86, 1003.54), 17], + 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], + 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], @@ -4296,7 +4302,7 @@ let gameData = { 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(376.99, -191.21, 1000.63), 17], + 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], @@ -4345,7 +4351,7 @@ let gameData = { 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(457.30, -88.42, 999.55), 4], + 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], @@ -4457,6 +4463,18 @@ let gameData = { blip: false, name: "San Fierro", }, + { + position: toVector3(-212.65, 977.99, 19.33), + heading: 0.0, + blip: false, + name: "Fort Carson", + }, + { + position: toVector3(-212.65, 977.99, 19.33), + heading: 0.0, + blip: false, + name: "Dillimore", + }, ], [ // GTA UG @@ -4668,6 +4686,24 @@ let gameData = { blip: false, name: "County General Hospital", }, + { + position: toVector3(-2654.14, 635.36, 14.45), + heading: 0.0, + blip: false, + name: "San Fierro Medical Center", + }, + { + position: toVector3(1607.44, 1819.85, 10.83), + heading: 0.0, + blip: false, + name: "Las Venturas Hospital", + }, + { + position: toVector3(-316.84, 1056.59, 19.74), + heading: 0.0, + blip: false, + name: "Fort Carson Medical Center", + }, ], [ // GTA UG