Added Stations for more maps. Just finishing Italy

This commit is contained in:
Starystars67
2020-05-19 01:18:20 +01:00
parent a6b341a1c8
commit 2fedcff213
2 changed files with 100 additions and 9 deletions

View File

@@ -24,7 +24,93 @@ local stations = {
{vec3(622.667, -186.129, 53.0), vec3(622.667, -186.129, 55.0), "EV"},
{vec3(619.97, -189.098, 53.0), vec3(619.97, -189.098, 55.0), "EV"},
{vec3(617.164, -192.107, 53.0), vec3(617.164, -192.107, 55.0), "EV"},
}
},
["/levels/west_coast_usa/info.json"] = {
{vec3(-480.495, 134.616, 100.212), vec3(-480.495, 134.616, 102.212), "Gas/EV"},
{vec3(-476.888, 133.5, 100.212), vec3(-476.888, 133.5, 102.212), "Gas/EV"},
{vec3(-478.933, 126.744, 100.212), vec3(-478.933, 126.744, 102.212), "Gas/EV"},
{vec3(-482.54, 127.86, 100.212), vec3(-482.54, 127.86, 102.212), "Gas/EV"},
{vec3(-490.042, 130.875, 100.212), vec3(-490.042, 130.875, 102.212), "Gas/EV"},
{vec3(-487.997, 137.631, 100.212), vec3(-487.997, 137.631, 102.212), "Gas/EV"},
{vec3(-484.39, 136.515, 100.212), vec3(-484.39, 136.515, 102.212), "Gas/EV"},
{vec3(-486.435, 129.759, 100.212), vec3(-486.435, 129.759, 102.212), "Gas/EV"},
{vec3(-492.171,138.235,100.211), vec3(-492.171,138.235,102.211), "Gas/EV"},
{vec3(-495.778,139.350,100.211), vec3(-495.778,139.350,102.211), "Gas/EV"},
{vec3(-497.824,132.595,100.211), vec3(-497.824,132.595,102.211), "Gas/EV"},
{vec3(-494.217,131.479,100.211), vec3(-494.217,131.479,102.211), "Gas/EV"},
{vec3(-800.910, 861.350, 74.800), vec3(-800.910, 861.350, 76.800), "Gas/EV"},
{vec3(-794.05, 852.340, 74.800), vec3(-794.05, 852.340, 76.800), "Gas/EV"},
{vec3(-800.636, 852.330, 74.800), vec3(-800.636, 852.330, 76.800), "Gas/EV"},
{vec3(-794.05, 848.565, 74.800), vec3(-794.05, 848.565, 76.800), "Gas/EV"},
{vec3(-800.582, 848.555, 74.800), vec3(-800.582, 848.555, 76.800), "Gas/EV"},
{vec3(-800.856, 857.575, 74.800), vec3(-800.856, 857.575, 76.800), "Gas/EV"},
{vec3(-793.745, 861.358, 74.800), vec3(-793.745, 861.358, 76.800), "Gas/EV"},
{vec3(-793.691, 857.583, 74.800), vec3(-793.691, 857.583, 76.800), "Gas/EV"},
{vec3(-193.984,522.874,74.830), vec3(-193.984,522.874,76.830), "Gas/EV"},
{vec3(-183.978,516.118,74.830), vec3(-183.978,516.118,76.830), "Gas/EV"},
{vec3(-180.021,522.874,74.830), vec3(-180.021,522.874,76.830), "Gas/EV"},
{vec3(-180.021,516.118,74.830), vec3(-180.021,516.118,76.830), "Gas/EV"},
{vec3(-200.020,516.517,74.830), vec3(-200.020,516.517,76.830), "Gas/EV"},
{vec3(-183.978,522.874,74.830), vec3(-183.978,522.874,76.830), "Gas/EV"},
{vec3(-203.978,516.517,74.830), vec3(-203.978,516.517,76.830), "Gas/EV"},
{vec3(-200.020,522.781,74.830), vec3(-200.020,522.781,76.830), "Gas/EV"},
{vec3(-203.978,522.781,74.830), vec3(-203.978,522.781,76.830), "Gas/EV"},
{vec3(-190.027,522.874,74.830), vec3(-190.027,522.874,76.830), "Gas/EV"},
{vec3(-190.019,515.983,74.830), vec3(-190.019,515.983,76.830), "Gas/EV"},
{vec3(-193.976,515.983,74.830), vec3(-193.976,515.983,76.830), "Gas/EV"},
{vec3(417.285,-229.916,145.066), vec3(417.285,-229.916,147.066), "Gas/EV"},
},
["/levels/hirochi_raceway/info.json"] = {
{vec3(-423.444, 327.058, 24.188), vec3(-423.444, 327.058, 26.188), "Gas/EV"},
{vec3(-313.5, 62.4, 32), vec3(-313.5, 62.4, 34), "Gas/EV"},
{vec3(-311, 60, 32), vec3(-311, 60, 34), "Gas/EV"},
},
["/levels/utah/info.json"] = {
{vec3(809.5, -158, 144.3), vec3(809.5, -158, 146.3), "Gas/EV"},
{vec3(812.5, -157.6, 144.3), vec3(812.5, -157.6, 146.3), "Gas/EV"},
{vec3(811.2, -150, 144.3), vec3(811.2, -150, 146.3), "Gas/EV"},
{vec3(808.2, -150.6, 144.3), vec3(808.2, -150.6, 146.3), "Gas/EV"},
},
["/levels/italy/info.json"] = {
{vec3(-972.806, 948.605, 392.601), vec3(-972.806, 948.605, 394.601), "EV"},
{vec3(-971.062, 950.279, 392.644), vec3(-971.062, 950.279, 394.644), "EV"},
{vec3(-969.27, 952.026, 392.662), vec3(-969.27, 952.026, 394.662), "EV"},
{vec3(-1105.25, 773.865, 378.202), vec3(-1105.25, 773.865, 380.202), "Gas"},
{vec3(-1105.36, 768.871, 378.202), vec3(-1105.36, 768.871, 380.202), "Gas"},
{vec3(-1101.64, 768.029, 378.203), vec3(-1101.64, 768.029, 380.203), "Gas"},
{vec3(-1101.21, 773.291, 378.201), vec3(-1101.21, 773.291, 380.201), "Gas"},
{vec3(1447.58, 1349.23, 147.498), vec3(1447.58, 1349.23, 149.498), "Gas"},
{vec3(1452.38, 1350.28, 147.529), vec3(1452.38, 1350.28, 149.529), "Gas"},
{vec3(1446.94, 1353.27, 147.56), vec3(1446.94, 1353.27, 149.56), "Gas"},
{vec3(1450.87, 1351.87, 148.181), vec3(1450.87, 1351.87, 150.181), "Gas"},
{vec3(-1611.84, 1523.47, 162.251), vec3(-1611.84, 1523.47, 164.251), "Gas"},
{vec3(-1614.28, 1519.66, 162.256), vec3(-1614.28, 1519.66, 164.256), "Gas"},
{vec3(-1617.71, 1521.93, 162.261), vec3(-1617.71, 1521.93, 164.261), "Gas"},
{vec3(-1615.34, 1525.46, 162.256), vec3(-1615.34, 1525.46, 164.256), "Gas"},
{vec3(-1626.79, 1527.72, 162.254), vec3(-1626.79, 1527.72, 164.254), "Gas"},
{vec3(-1624.43, 1531.36, 162.256), vec3(-1624.43, 1531.36, 164.256), "Gas"},
{vec3(-1623.26, 1525.68, 162.261), vec3(-1623.26, 1525.68, 164.261), "Gas"},
{vec3(-1621.03, 1529.18, 162.256), vec3(-1621.03, 1529.18, 164.256), "Gas"},
{vec3(-1758.49, 1324.84, 138.19), vec3(-1758.49, 1324.84, 140.19), "Gas"},
{vec3(-1758.03, 1328.25, 138.188), vec3(-1758.03, 1328.25, 140.188), "Gas"},
{vec3(1214.599,-810.765,145.173), vec3(1214.599,-810.765,147.173), "Gas"},
{vec3(1216.699,-807.445,145.245), vec3(1216.699,-807.445,147.245), "Gas"},
{vec3(1210.020,-807.812,145.234), vec3(1210.020,-807.812,147.234), "Gas"},
{vec3(1212.060,-804.469,145.291), vec3(1212.060,-804.469,147.291), "Gas"},
{vec3(1199.18,-797.823,145.786), vec3(1199.18,-797.823,147.786), "EV"},
{vec3(1202.29,-793.992,145.764), vec3(1202.29,-793.992,147.764), "EV"},
{vec3(1113.25, -686.448, 146.031), vec3(1113.25, -686.448, 147.531), "EV"},
{vec3(1113.96, 1309.27, 143.007), vec3(1113.96, 1309.27, 145.007), "EV"},
{vec3(1124.09, 1308.87, 143.007), vec3(1124.09, 1308.87, 145.007), "EV"},
{vec3(1156.11, 1305.27, 143.788), vec3(1156.11, 1305.27, 145.788), "EV"},
{vec3(1165.86, 1304.98, 143.981), vec3(1165.86, 1304.98, 145.981), "EV"},
}
}
local function distance (pos1, pos2, useZ)
@@ -82,21 +168,26 @@ local function onUpdate()
end
map = getMissionFilename()
for k = 1, #stations[map] do
--print("Using Map: "..tostring(stations[map][k][3]))
local color = 0
if stations[map][k][3] == "EV" then
color = ColorF(0.0,0.9,0.1,0.5)
color = ColorF(0.1,0.9,0.1,0.5)
elseif stations[map][k][3] == "Gas/EV" then
color = ColorF(0.1,0.8,1.0,0.5)
else
color = ColorF(0.9,0.1,0.1,0.5)
end
debugDrawer:drawCylinder(stations[map][k][1]:toPoint3F(), stations[map][k][2]:toPoint3F(), 1, color)
for i = 0, be:getObjectCount() -1 do -- For each vehicle
local veh = be:getObject(i) -- Get vehicle
if IsEntityInsideArea(veh:getPosition(), stations[map][k][1]) and stations[map][k][3] == fuelType then
-- we are inside one of the filling areas of the map
--ui_message("Press E To Refuel")
atStation = true
be:executeJS('fuelUIShowHide("true", "'..stations[map][k][3]..'")')
break
if IsEntityInsideArea(veh:getPosition(), stations[map][k][1]) then
if stations[map][k][3] == "Gas/EV" or stations[map][k][3] == fuelType then
-- we are inside one of the filling areas of the map
--ui_message("Press E To Refuel")
atStation = true
be:executeJS('fuelUIShowHide("true", "'..fuelType..'")')
break
end
end
end
end

View File

@@ -1,4 +1,4 @@
<div ng-controller="fuelstation" id="fuelstation" class="fuelstation" ng-style="{'width': '100%', 'height': '100%'}" ng-init="init()">
<div ng-controller="fuelstation" id="fuelstation" class="fuelstation" ng-style="{'width': '100%', 'height': '100%'}" ng-init="init()" style="display: none">
<style id="applicationStylesheet" type="text/css">
.Background {
position: absolute;