diff --git a/Missionframework/scripts/client/markers/hostile_groups.sqf b/Missionframework/scripts/client/markers/hostile_groups.sqf index 61e653a8..babce00a 100644 --- a/Missionframework/scripts/client/markers/hostile_groups.sqf +++ b/Missionframework/scripts/client/markers/hostile_groups.sqf @@ -12,22 +12,30 @@ while {true} do { { if ((side _x == GRLIB_side_enemy) && (({!captive _x} count (units _x) ) > 0) && ([(getpos leader _x), GRLIB_side_friendly, GRLIB_radiotower_size] call F_getNearestTower != "")) then { _kp_markers_pos = getPosATL leader _x; - _kp_markers_posx = floor ((_kp_markers_pos select 0) / 100); - _kp_markers_posx = _kp_markers_posx - (_kp_markers_posx mod 5); - _kp_markers_posy = floor ((_kp_markers_pos select 1) / 100); - _kp_markers_posy = _kp_markers_posy -(_kp_markers_posy mod 5); + _kp_markers_posx = floor (_kp_markers_pos select 0); + _kp_markers_posx = _kp_markers_posx - (_kp_markers_posx mod 500); + _kp_markers_posy = floor (_kp_markers_pos select 1); + _kp_markers_posy = _kp_markers_posy - (_kp_markers_posy mod 500); + + // Chernarus Grid Fix + if (worldName == "Chernarus") then { + _kp_markers_posy = _kp_markers_posy - 140; + if ((_kp_markers_posy + 500) < (_kp_markers_pos select 1)) then { + _kp_markers_posy = _kp_markers_posy + 500; + }; + }; + _kp_markers_name = format["kp_marker_grid_%1_%2", _kp_markers_posx, _kp_markers_posy]; _kp_markers_color = format["Color%1", side _x]; - _kp_markers_count = (count (units _x)) - 1; if ((markerShape _kp_markers_name) isEqualTo "RECTANGLE") then { - _kp_markers_name setMarkerAlphaLocal ((markerAlpha _kp_markers_name) + (_kp_markers_count * _kp_markers_change)); + _kp_markers_name setMarkerAlphaLocal ((markerAlpha _kp_markers_name) + _kp_markers_change); } else { - createMarkerLocal[_kp_markers_name, [(_kp_markers_posx * 100) + 250, (_kp_markers_posy * 100) + 250, 0]]; + createMarkerLocal[_kp_markers_name, [_kp_markers_posx + 250, _kp_markers_posy + 250, 0]]; _kp_markers_name setMarkerShapeLocal "RECTANGLE"; _kp_markers_name setMarkerSizeLocal [250,250]; _kp_markers_name setMarkerColorLocal _kp_markers_color; - _kp_markers_name setMarkerAlphaLocal (_kp_markers_start + (_kp_markers_count * _kp_markers_change)); + _kp_markers_name setMarkerAlphaLocal (_kp_markers_start + _kp_markers_change); _kp_markers_array pushBack _kp_markers_name; }; }; diff --git a/README.md b/README.md index e7457675..9ed3eecd 100644 --- a/README.md +++ b/README.md @@ -136,7 +136,7 @@ class Missions * Added custom made Chimera Base for Tanoa. Thanks to jus61 for building it * Added X-Cam-Taunus missionfile * Added custom made Chimera Base for X-Cam-Taunus. Thanks to jus61 for building it -* Replaced old hostile markers (exclamation marks) with a unit count sensitive areal marking system +* Replaced old hostile markers (exclamation marks) with a unit count sensitive area marking system * Removed dependencies on Takistan missionfile * Tweaked the presets * custom.sqf is now default (vanilla is a kind of legacy now)