From 48c6a94bda9f19909de4b7330a39e94a6e092d30 Mon Sep 17 00:00:00 2001 From: He-Man Date: Fri, 16 Jun 2017 15:22:00 +0200 Subject: [PATCH 1/4] Make ServicePointMarker configureable --- Sources/epoch_server/init/server_init.sqf | 41 ++++++++++++++++++----- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/Sources/epoch_server/init/server_init.sqf b/Sources/epoch_server/init/server_init.sqf index a51b1adf..da1878d2 100644 --- a/Sources/epoch_server/init/server_init.sqf +++ b/Sources/epoch_server/init/server_init.sqf @@ -224,15 +224,40 @@ if (_dateChanged) then { _config = 'CfgServicePoint' call EPOCH_returnConfig; _servicepoints = getArray (_config >> worldname >> 'ServicePoints'); { - _marker = createMarker [('ServicePointMarker'+(str _forEachIndex)), _x]; - _marker setmarkertype "mil_dot"; - _marker setmarkercolor 'ColorBlack'; - _marker setMarkerText ("Service Point"); - if !(surfaceiswater _x) then { - "Land_HelipadCircle_F" createvehicle _x; + _pos = _x; + _markertype = "mil_dot"; + _markercolor = "ColorBlack"; + _markertxt = "Service Point"; + if (count _x > 3) then { + _pos = _x select 0; + if ((_x select 3) isequaltype "") then { + _markertype = _x select 3; + }; + if (count _x > 4) then { + if ((_x select 4) isequaltype "") then { + _markercolor = _x select 4; + }; + }; + if (count _x > 5) then { + if ((_x select 5) isequaltype "") then { + _markertxt = _x select 5; + }; + }; }; -} forEach _servicepoints; - + if !(_markertype isequalto "") then { + _marker = createMarker [('ServicePointMarker'+(str _foreachindex)), _pos]; + _marker setmarkertype _markertype; + if !(_markercolor isequalto "") then { + _marker setmarkercolor _markercolor; + }; + if !(_markertxt isequalto "") then { + _marker setMarkerText _markertxt; + }; + if !(surfaceiswater _pos) then { + "Land_HelipadCircle_F" createvehicle _pos; + }; + }; +} forEach _ServicePoints; // set time multiplier setTimeMultiplier ([_serverSettingsConfig, "timeMultiplier", 1] call EPOCH_fnc_returnConfigEntry); From 987a09bc80c514d95e7a2d7d6da7989ef73928b3 Mon Sep 17 00:00:00 2001 From: He-Man Date: Fri, 16 Jun 2017 15:24:08 +0200 Subject: [PATCH 2/4] Make ServicePoints more configureable --- .../epoch_config/Configs/CfgServicePoint.hpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/Sources/epoch_config/Configs/CfgServicePoint.hpp b/Sources/epoch_config/Configs/CfgServicePoint.hpp index 9c1af975..a1403254 100644 --- a/Sources/epoch_config/Configs/CfgServicePoint.hpp +++ b/Sources/epoch_config/Configs/CfgServicePoint.hpp @@ -1,6 +1,25 @@ class CfgServicePoint { class Altis { ServicePoints[] = { // Array of coords for ServicePoints +/* {pos1}, + {pos1} + OR + { + pos, + dist, + {VehType_1,VehType_1,...}, + "Markername", + "Markertype" + }, + { + pos, + dist, + {VehType_1,VehType_1,...}, + "Markertype", + "MarkerColor", + "MarkerText" + } +*/ {13325,14477,0} }; }; From 64a8cb0f42ab1b351d1642cc0ea4b2aed9554431 Mon Sep 17 00:00:00 2001 From: He-Man Date: Fri, 16 Jun 2017 15:27:19 +0200 Subject: [PATCH 3/4] Make ServicePoints more configurable --- Sources/epoch_config/Configs/CfgServicePoint.hpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Sources/epoch_config/Configs/CfgServicePoint.hpp b/Sources/epoch_config/Configs/CfgServicePoint.hpp index a1403254..8310551d 100644 --- a/Sources/epoch_config/Configs/CfgServicePoint.hpp +++ b/Sources/epoch_config/Configs/CfgServicePoint.hpp @@ -20,7 +20,14 @@ class CfgServicePoint { "MarkerText" } */ - {13325,14477,0} + { // Central + {13325,14477,0}, // Pos + 40, // max distance + {"Landvehicle","Ship","Tank","AIR"}, // Vehicle Types for SP + "loc_BusStop", // Marker Type + "ColorWhite", // Marker Color + "Service Point Land / Ship / Air" // Marker Text + } }; }; class Tanoa { @@ -43,7 +50,7 @@ class CfgServicePoint { }; }; - ServicePointClasses[] = { // Array of Classnames, where also are ServicePoints + ServicePointClasses[] = { // Array of Classnames where also are ServicePoints (not separat configurable for Vehicle types / distance) // "Land_Pillar_Pier_F", // "Land_CarService_F", // "Land_fs_feed_F", From bc077339ab943c0b19cdc2926a843135d8140258 Mon Sep 17 00:00:00 2001 From: He-Man Date: Fri, 16 Jun 2017 15:30:09 +0200 Subject: [PATCH 4/4] Make ServicePoint more configurable --- .../epoch_config/Configs/CfgServicePoint.hpp | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/Sources/epoch_config/Configs/CfgServicePoint.hpp b/Sources/epoch_config/Configs/CfgServicePoint.hpp index 8310551d..be17ede4 100644 --- a/Sources/epoch_config/Configs/CfgServicePoint.hpp +++ b/Sources/epoch_config/Configs/CfgServicePoint.hpp @@ -1,23 +1,25 @@ class CfgServicePoint { class Altis { ServicePoints[] = { // Array of coords for ServicePoints -/* {pos1}, - {pos1} +/* + {pos1}, + {pos2} OR { - pos, - dist, + pos1, + dist1, {VehType_1,VehType_1,...}, - "Markername", - "Markertype" + "Markertype1", + "MarkerColor1", + "MarkerText1" }, { - pos, - dist, - {VehType_1,VehType_1,...}, - "Markertype", - "MarkerColor", - "MarkerText" + pos2, + dist2, + {VehType,VehType,...}, + "Markertype2", + "MarkerColor2", + "MarkerText2" } */ { // Central