From d92e0f65bea216b23205e9920132dd11e4912be8 Mon Sep 17 00:00:00 2001 From: Grahame Date: Thu, 19 Oct 2017 11:23:14 -0400 Subject: [PATCH 1/5] Update EPOCH_fnc_createLocalMarkerSet.sqf Added EPOCH_ to the name of all local Epoch markers --- .../compile/functions/EPOCH_fnc_createLocalMarkerSet.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/epoch_code/compile/functions/EPOCH_fnc_createLocalMarkerSet.sqf b/Sources/epoch_code/compile/functions/EPOCH_fnc_createLocalMarkerSet.sqf index c3ce0a66..4fb457d0 100644 --- a/Sources/epoch_code/compile/functions/EPOCH_fnc_createLocalMarkerSet.sqf +++ b/Sources/epoch_code/compile/functions/EPOCH_fnc_createLocalMarkerSet.sqf @@ -58,7 +58,7 @@ if(isNil {Epoch_markerCounter})then{Epoch_markerCounter = 0}; { // double check all, use these defaults if not defined _x params [ - ["_mName",format["marker_%1", Epoch_markerCounter]], + ["_mName",format["EPOCH_marker_%1", Epoch_markerCounter]], ["_mShape","ICON"], ["_mType","hd_dot"], ["_mColor","ColorRed"], @@ -97,4 +97,4 @@ if(isNil {Epoch_markerCounter})then{Epoch_markerCounter = 0}; if(_mName isEqualTo (format["marker_%1", Epoch_markerCounter]))then{ Epoch_markerCounter = Epoch_markerCounter + 1; }; -}forEach _markerArray; \ No newline at end of file +}forEach _markerArray; From 83016ee0a7e34bf0e795788e7f2c0aa12d862ba3 Mon Sep 17 00:00:00 2001 From: Grahame Date: Thu, 19 Oct 2017 11:24:53 -0400 Subject: [PATCH 2/5] Update CfgMarkerSets.hpp Added EPOCH_ to the beginning of the PlayerMarker and DeathMarker markers --- Sources/epoch_config/Configs/CfgMarkerSets.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Sources/epoch_config/Configs/CfgMarkerSets.hpp b/Sources/epoch_config/Configs/CfgMarkerSets.hpp index c98e5849..03b163ed 100644 --- a/Sources/epoch_config/Configs/CfgMarkerSets.hpp +++ b/Sources/epoch_config/Configs/CfgMarkerSets.hpp @@ -13,17 +13,17 @@ class CfgMarkerSets brushes[] = {"Solid","SolidFull","Horizontal","Vertical","Grid","FDiagonal","BDiagonal","DiagGrid","Cross","Border","SolidBorder"}; class PlayerMarker { markerArray[] = { - {"PlayerMarker1","ICON","EpochActive_Hex","ColorBlue",1,{0.9,0.9}}, - {"PlayerMarker2","ICON","EpochBG_Hex","ColorWhite",0.3,{0.9,0.9}}, - {"PlayerMarker3","ICON","EpochGPS","ColorBlue",1,{0.8,0.8},0,"format['%1/%2',(format[mapGridPosition player]) select [0,3],(format[mapGridPosition player]) select [3,3]]"} + {"EPOCH_PlayerMarker1","ICON","EpochActive_Hex","ColorBlue",1,{0.9,0.9}}, + {"EPOCH_PlayerMarker2","ICON","EpochBG_Hex","ColorWhite",0.3,{0.9,0.9}}, + {"EPOCH_PlayerMarker3","ICON","EpochGPS","ColorBlue",1,{0.8,0.8},0,"format['%1/%2',(format[mapGridPosition player]) select [0,3],(format[mapGridPosition player]) select [3,3]]"} }; }; class DeathMarker { markerArray[] = { - {"DeathMarker1","ICON","EpochActive_Circle","ColorRed",1,{0.9,0.9}}, - {"DeathMarker2","ICON","EpochBG_Circle","ColorPink",0.3,{0.9,0.9}}, - {"DeathMarker3","ICON","EpochSkull","ColorRed",1,{0.8,0.8},0,"str(name player)"} + {"EPOCH_DeathMarker1","ICON","EpochActive_Circle","ColorRed",1,{0.9,0.9}}, + {"EPOCH_DeathMarker2","ICON","EpochBG_Circle","ColorPink",0.3,{0.9,0.9}}, + {"EPOCH_DeathMarker3","ICON","EpochSkull","ColorRed",1,{0.8,0.8},0,"str(name player)"} }; }; class EpochDebugBox { From 8f4420f88d8dff562908f878a475bc205636ce38 Mon Sep 17 00:00:00 2001 From: Grahame Date: Thu, 19 Oct 2017 11:27:30 -0400 Subject: [PATCH 3/5] Update Event1.sqf Only do the marker resizing of core Epoch mod markers since it causes issues with mission markers. Also shrank the sizes a bit after discussion with @xDrokz --- .../compile/setup/masterLoop/Event1.sqf | 73 ++++++++++--------- 1 file changed, 39 insertions(+), 34 deletions(-) diff --git a/Sources/epoch_code/compile/setup/masterLoop/Event1.sqf b/Sources/epoch_code/compile/setup/masterLoop/Event1.sqf index 2b9a29e2..fda39bd2 100644 --- a/Sources/epoch_code/compile/setup/masterLoop/Event1.sqf +++ b/Sources/epoch_code/compile/setup/masterLoop/Event1.sqf @@ -384,40 +384,45 @@ if(visibleMap)then{ if(isNil {EPOCH_lastMapScale})then{EPOCH_lastMapScale = 0}; for "_i" from 0 to ((count _zoomMarkers) - 1) do { _zoomMarker = _zoomMarkers select _i; - switch(true)do{ - case ( (_mapScale >= 0.95) && (_mapScale <= 1) ): { - _zoomMarker setMarkerSizeLocal [0.666,0.666]; - //_zoomMarker setMarkerAlphaLocal 0; - }; - case ( (_mapScale >= 0.75) && (_mapScale < 0.95) ): { - _zoomMarker setMarkerSizeLocal [0.8,0.8]; - }; - case ( (_mapScale >= 0.55) && (_mapScale < 0.75) ): { - _zoomMarker setMarkerSizeLocal [1,1]; - }; - case ( (_mapScale >= 0.5) && (_mapScale < 0.55) ): { - _zoomMarker setMarkerSizeLocal [1.1,1.1]; - }; - case ( (_mapScale >= 0.45) && (_mapScale < 0.5) ): { - _zoomMarker setMarkerSizeLocal [1.2,1.2]; - }; - case ( (_mapScale >= 0.35) && (_mapScale < 0.45) ): { - _zoomMarker setMarkerSizeLocal [1.4,1.4]; - }; - case ( (_mapScale >= 0.25) && (_mapScale < 0.35) ): { - _zoomMarker setMarkerSizeLocal [1.666,1.666]; - }; - case ( (_mapScale >= 0.15) && (_mapScale < 0.25) ): { - _zoomMarker setMarkerSizeLocal [1.8,1.8]; - }; - case ( (_mapScale >= 0.1) && (_mapScale < 0.15) ): { - _zoomMarker setMarkerSizeLocal [1.9,1.9]; - }; - case ( (_mapScale >= 0.0666) && (_mapScale < 0.1) ): { - _zoomMarker setMarkerSizeLocal [2.2,2.2]; - }; - case ( (_mapScale >= 0) && (_mapScale < 0.0666) ): { - _zoomMarker setMarkerSizeLocal [2.666,2.666]; + private "_markerString"; + _markerString = toArray _zoomMarker; + _markerString resize 6; + if (toString _markerString == "EPOCH_") then { + switch(true)do{ + case ( (_mapScale >= 0.95) && (_mapScale <= 1) ): { + _zoomMarker setMarkerSizeLocal [0.666,0.666]; + //_zoomMarker setMarkerAlphaLocal 0; + }; + case ( (_mapScale >= 0.75) && (_mapScale < 0.95) ): { + _zoomMarker setMarkerSizeLocal [0.8,0.8]; + }; + case ( (_mapScale >= 0.55) && (_mapScale < 0.75) ): { + _zoomMarker setMarkerSizeLocal [0.9,0.9]; + }; + case ( (_mapScale >= 0.5) && (_mapScale < 0.55) ): { + _zoomMarker setMarkerSizeLocal [1.0,1.0]; + }; + case ( (_mapScale >= 0.45) && (_mapScale < 0.5) ): { + _zoomMarker setMarkerSizeLocal [1.1,1.1]; + }; + case ( (_mapScale >= 0.35) && (_mapScale < 0.45) ): { + _zoomMarker setMarkerSizeLocal [1.2,1.2]; + }; + case ( (_mapScale >= 0.25) && (_mapScale < 0.35) ): { + _zoomMarker setMarkerSizeLocal [1.3,1.3]; + }; + case ( (_mapScale >= 0.15) && (_mapScale < 0.25) ): { + _zoomMarker setMarkerSizeLocal [1.4,1.4]; + }; + case ( (_mapScale >= 0.1) && (_mapScale < 0.15) ): { + _zoomMarker setMarkerSizeLocal [1.5,1.5]; + }; + case ( (_mapScale >= 0.0666) && (_mapScale < 0.1) ): { + _zoomMarker setMarkerSizeLocal [1.6,1.6]; + }; + case ( (_mapScale >= 0) && (_mapScale < 0.0666) ): { + _zoomMarker setMarkerSizeLocal [1.7,1.7]; + }; }; }; }; From 4d26f9c858f8b2dafa62cc0d340e10206a8f6e10 Mon Sep 17 00:00:00 2001 From: Grahame Date: Thu, 19 Oct 2017 11:28:45 -0400 Subject: [PATCH 4/5] Update EPOCH_server_createGlobalMarkerSet.sqf Prepended EPOCH_ to global marker names and removed the second underscore in the default setting for marker name --- .../epoch_server/EPOCH_server_createGlobalMarkerSet.sqf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Sources/epoch_server/compile/epoch_server/EPOCH_server_createGlobalMarkerSet.sqf b/Sources/epoch_server/compile/epoch_server/EPOCH_server_createGlobalMarkerSet.sqf index 08089bfe..58aa9f9e 100644 --- a/Sources/epoch_server/compile/epoch_server/EPOCH_server_createGlobalMarkerSet.sqf +++ b/Sources/epoch_server/compile/epoch_server/EPOCH_server_createGlobalMarkerSet.sqf @@ -53,7 +53,7 @@ _return = []; { // double check all, use these defaults if not defined _x params [ - ["_mName",format["globalMarker__%1", Epoch_markerCounterGlobal]], + ["_mName",format["EPOCH_globalMarker_%1", Epoch_markerCounterGlobal]], ["_mShape","ICON"], ["_mType","hd_dot"], ["_mColor","ColorBlack"], @@ -62,7 +62,7 @@ _return = []; ["_mDir",0], ["_mText",""] ]; - _mName = format["globalMarker_%1", Epoch_markerCounterGlobal]; + _mName = format["EPOCH_globalMarker_%1", Epoch_markerCounterGlobal]; _marker = createMarker [_mName, _mPos]; _return pushBack _mName; _mName setMarkerShape _mShape; @@ -88,4 +88,4 @@ _return = []; Epoch_markerCounterGlobal = Epoch_markerCounterGlobal + 1; }forEach _markerArray; -_return \ No newline at end of file +_return From 83363f693b87e06cff5318e5815d976c22e9d143 Mon Sep 17 00:00:00 2001 From: DirtySanchez Date: Thu, 19 Oct 2017 10:43:35 -0500 Subject: [PATCH 5/5] added same change below for the counter to raise --- .../compile/functions/EPOCH_fnc_createLocalMarkerSet.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/epoch_code/compile/functions/EPOCH_fnc_createLocalMarkerSet.sqf b/Sources/epoch_code/compile/functions/EPOCH_fnc_createLocalMarkerSet.sqf index 4fb457d0..e0f8908e 100644 --- a/Sources/epoch_code/compile/functions/EPOCH_fnc_createLocalMarkerSet.sqf +++ b/Sources/epoch_code/compile/functions/EPOCH_fnc_createLocalMarkerSet.sqf @@ -94,7 +94,7 @@ if(isNil {Epoch_markerCounter})then{Epoch_markerCounter = 0}; _mName setMarkerColorLocal _mColor }; - if(_mName isEqualTo (format["marker_%1", Epoch_markerCounter]))then{ + if(_mName isEqualTo (format["EPOCH_marker_%1", Epoch_markerCounter]))then{ Epoch_markerCounter = Epoch_markerCounter + 1; }; }forEach _markerArray;