From e29bf420dedb768aff64b18c69da970b3a533848 Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Thu, 15 Jul 2021 09:47:57 -0500 Subject: [PATCH] Add hospitals, fix get closest hospital util --- scripts/server/gamedata.js | 16 +++++++++++++++- scripts/server/utilities.js | 12 ++++++------ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/scripts/server/gamedata.js b/scripts/server/gamedata.js index a2be3b38..9ab15dcf 100644 --- a/scripts/server/gamedata.js +++ b/scripts/server/gamedata.js @@ -2912,7 +2912,9 @@ let gameData = { hospitals: [ [], [ // GTA III - + [1144.25, -596.875, 14.97], // Portland + [183.5, -17.75, 16.21], // Staunton Island + [-1259.5, -44.5, 58.89], // Shoreside Vale ], [ // GTA Vice City @@ -2920,6 +2922,18 @@ let gameData = { [-885.08, -470.44, 13.11], // Little Havana (West Haven Community Health Care Center) [-133.19, -980.76, 10.46], // Ocean Beach (Ocean View Hospital) ], + + [ // GTA San Andreas + [1182.67, -1323.81, 13.579], // Los Santos West (All Saints General Hospital) + [2034.7567,-1403.1083,17.293], // Los Santos East (County General) + ], + + [ // GTA IV + [1199.59, 196.78, 33.554], // Shottler Medical Center + [980.71, 1831.61, 23.898], // Northern Gardens Medical Center + [-1317.27, 1277.20, 22.370], // Leftwood Hospital + [-1538.43, 344.58, 20.943], // Acter Medical Center + ], ], payAndSprays: [ [], diff --git a/scripts/server/utilities.js b/scripts/server/utilities.js index 9b4afec0..d8787323 100644 --- a/scripts/server/utilities.js +++ b/scripts/server/utilities.js @@ -926,26 +926,26 @@ function getSkinIdFromName(params, gameId = getServerGame()) { function getClosestHospital(position) { let closest = 0; - for(let i in getServerData().hospitals[getServerGame()]) { - if(getDistance(getServerData().hospitals[getServerGame()][i].position, position) < getDistance(getServerData().hospitals[getServerGame()][closest].position, position)) { + for(let i in getGameData().hospitals[getServerGame()]) { + if(getDistance(getGameData().hospitals[getServerGame()][i], position) < getDistance(getGameData().hospitals[getServerGame()][closest], position)) { closest = i; } } - return getServerData().hospitals[getServerGame()][closest]; + return getGameData().hospitals[getServerGame()][closest]; } // =========================================================================== function getClosestPoliceStation(position) { let closest = 0; - for(let i in getServerData().policeStations[getServerGame()]) { - if(getServerData().policeStations[getServerGame()][i].position.distance(position) < getServerData().policeStations[getServerGame()][closest].position) { + for(let i in getGameData().policeStations[getServerGame()]) { + if(getGameData().policeStations[getServerGame()][i].distance(position) < getGameData().policeStations[getServerGame()][closest]) { closest = i; } } - return getServerData().policeStations[getServerGame()][closest]; + return getGameData().policeStations[getServerGame()][closest]; } // ===========================================================================