diff --git a/@epochhive/addons/custom_server/Compiles/Functions/GMS_fnc_findWorld.sqf b/@epochhive/addons/custom_server/Compiles/Functions/GMS_fnc_findWorld.sqf index 15df13d..791ea27 100644 --- a/@epochhive/addons/custom_server/Compiles/Functions/GMS_fnc_findWorld.sqf +++ b/@epochhive/addons/custom_server/Compiles/Functions/GMS_fnc_findWorld.sqf @@ -30,6 +30,43 @@ if (_modType isEqualTo "Epoch") then ]; }; }; // Add Central, East and West respawns/traders + case "stratis":{ + diag_log "Stratis-specific settings loaded"; + blck_mapCenter = [6322,7801,0]; + blck_mapRange = 4500; + if (blck_blacklistSpawns) then { + blck_locationBlackList = blck_locationBlackList + [[[4031,4222,0],1000],[[1719,5120,0],1000],[[1719,5121,0],1000]]; + diag_log "Spawn black list locations added for Stratis"; + }; + }; // Add Central, East and West respawns/traders + case "chernarus":{ + diag_log "Chernarus-specific settings loaded"; + blck_mapCenter = [7100, 7750, 0]; //centerPosition = {7100, 7750, 300}; + blck_mapRange = 5300; + if (blck_blacklistSpawns) then { + blck_locationBlackList = blck_locationBlackList + [[[4569.52, 4524.24, 0.201431],800],[[12077.8, 5121.92, 0.00144958],800],[[10688.6, 9428.98, 0.00144958],800]]; + diag_log "Spawn black list locations added for Chernarus"; + }; + }; + case "chernarus_summer":{blck_mapCenter = [7100, 7750, 0]; blck_mapRange = 6000;}; + case "bornholm":{ + //diag_log "Bornholm-specific settings loaded"; + blck_mapCenter = [11240, 11292, 0]; + blck_mapRange = 14400; + if (blck_blacklistSpawns) then { + blck_locationBlackList = blck_locationBlackList + [[[10058.346680,9015.847656,117.542267],800],[[13812.688477, 6877.921387,80.874428],800],[[13812.661133, 6877.968262,80.876938],800]]; + diag_log "Spawn black list locations added for Bornholm"; + }; + }; + case "esseker":{ + diag_log "Esseker-specific settings loaded"; + blck_mapCenter = [6144, 6144, 0]; //centerPosition = {7100, 7750, 300}; + blck_mapRange = 5300; + if (blck_blacklistSpawns) then { + blck_locationBlackList = blck_locationBlackList + [ [[5073.31, 8903.09, 0],800],[[4407.77, 6054.78, 0],800],[[8692.93, 3854.72, 0],800]]; // { } + diag_log "Spawn black list locations added for Esseker"; + }; + }; case "taviana":{blck_mapCenter = [10370, 11510, 0];blck_mapRange = 14400;}; case "namalsk":{blck_mapCenter = [4352, 7348, 0];blck_mapRange = 10000;}; case "napf": {blck_mapCenter = [10240,10240,0]; blck_mapRange = 14000}; // {_centerPos = [10240, 10240, 0];_isMountainous = true;_maxHeight = 50;}; @@ -39,8 +76,18 @@ if (_modType isEqualTo "Epoch") then blck_locationBlackList = blck_locationBlackList + [ [[24398.3, 13971.6,0],800],[[34751.5, 13431.9,0],800],[[19032.7, 33974.6, 0],800],[[4056.35, 19435.9, 0],800] ]; diag_log "Spawn black list locations added for Australia"; }; - }; // - default {blck_mapCenter = [ (_blck_worldSize/2),(_blck_worldSize/2),0],blck_mapRange = _blck_worldSize;}; + }; + case "panthera2":{blck_mapCenter = [4400, 4400, 0];blck_mapRange = 4400;}; + case "isladuala":{blck_mapCenter = [4400, 4400, 0];blck_mapRange = 4400;}; + case "sauerland":{blck_mapCenter = [12800, 12800, 0];blck_mapRange = 12800;}; + case "trinity":{blck_mapCenter = [6400, 6400, 0];blck_mapRange = 6400;}; + case "utes":{blck_mapCenter = [3500, 3500, 0];blck_mapRange = 3500;}; + case "zargabad":{blck_mapCenter = [4096, 4096, 0];blck_mapRange = 4096;}; + case "fallujah":{blck_mapCenter = [3500, 3500, 0];blck_mapRange = 3500;}; + case "tavi":{blck_mapCenter = [10370, 11510, 0];blck_mapRange = 14090;}; + case "lingor":{blck_mapCenter = [4400, 4400, 0];blck_mapRange = 4400;}; + case "takistan":{blck_mapCenter = [5500, 6500, 0];blck_mapRange = 5000;}; + default {_blck_WorldName = "default";blck_mapCenter = [6322,7801,0]; blck_mapRange = 12000}; }; }; @@ -74,8 +121,17 @@ if (_modType isEqualTo "Exile") then [[10800,10641,0],1000] // isthmus ];// {.51, 0, .8} }; - default {blck_mapCenter = [ (_blck_worldSize/2),(_blck_worldSize/2),0],blck_mapRange = _blck_worldSize;}; - + case "panthera2":{blck_mapCenter = [4400, 4400, 0];blck_mapRange = 4400;}; + case "isladuala":{blck_mapCenter = [4400, 4400, 0];blck_mapRange = 4400;}; + case "sauerland":{blck_mapCenter = [12800, 12800, 0];blck_mapRange = 12800;}; + case "trinity":{blck_mapCenter = [6400, 6400, 0];blck_mapRange = 6400;}; + case "utes":{blck_mapCenter = [3500, 3500, 0];blck_mapRange = 3500;}; + case "zargabad":{blck_mapCenter = [4096, 4096, 0];blck_mapRange = 4096;}; + case "fallujah":{blck_mapCenter = [3500, 3500, 0];blck_mapRange = 3500;}; + case "tavi":{blck_mapCenter = [10370, 11510, 0];blck_mapRange = 14090;}; + case "lingor":{blck_mapCenter = [4400, 4400, 0];blck_mapRange = 4400;}; + case "takistan":{blck_mapCenter = [5500, 6500, 0];blck_mapRange = 5000;}; + default {_blck_WorldName = "default";blck_mapCenter = [6322,7801,0]; blck_mapRange = 12000;}; }; }; diff --git a/MPMissions/Exile.Altis/debug/o-spawnMarker.sqf b/MPMissions/Exile.Altis/debug/o-spawnMarker.sqf deleted file mode 100644 index baa90ab..0000000 --- a/MPMissions/Exile.Altis/debug/o-spawnMarker.sqf +++ /dev/null @@ -1,85 +0,0 @@ -//////////////////////////////////////////// -// Create Mission Markers that are visible to JIP players -// 8/1/15 -// by Ghostrider-DbD- -////////////////////////////////////////// -// spawn a round marker of a size and color specified in passed parameters - -private["_blck_fn_configureRoundMarker"]; -_blck_fn_configureRoundMarker = { - private["_name","_pos","_color","_size","_MainMarker","_labelType"]; - //diag_log format["_blck_fn_configureRoundMarker: -: _this = %1", _this]; - _name = _this select 0; - _pos = _this select 1; - _color = _this select 2; - _text = _this select 3; - _size = _this select 4; - _labelType = _this select 5; - - //diag_log format["_blck_fn_configureRoundMarker: _pos = %1, _color = %2, _size = %3, _name = %4, label %5",_pos, _color, _size, _name, _text]; - // Do not show the marker if it is in the left upper corner - if ((_pos distance [0,0,0]) < 10) exitWith {}; - - _MainMarker = createMarker [_name, _pos]; - _MainMarker setMarkerColor _color; - _MainMarker setMarkerShape "ELLIPSE"; - _MainMarker setMarkerBrush "Grid"; - _MainMarker setMarkerSize _size; // - //diag_log format["_blck_fn_configureRoundMarker: -: _labelType = %1", _labelType]; - if (count toArray(_text) > 0) then - { - switch (_labelType) do { - case "arrow": - { - //diag_log "++++++++++++++--- marker label arrow detected"; - _name = "label" + _name; - _textPos = [(_pos select 0) + (count toArray (_text) * 12), (_pos select 1) - (_size select 0), 0]; - _MainMarker = createMarker [_name, _textPos]; - _MainMarker setMarkerShape "Icon"; - _MainMarker setMarkerType "HD_Arrow"; - _MainMarker setMarkerColor "ColorBlack"; - _MainMarker setMarkerText _text; - //_MainMarker setMarkerDir 37; - }; - case "center": - { - //diag_log "++++++++++++++--- marker label dot detected"; - _name = "label" + _name; - _MainMarker = createMarker [_name, _pos]; - _MainMarker setMarkerShape "Icon"; - _MainMarker setMarkerType "mil_dot"; - _MainMarker setMarkerColor "ColorBlack"; - _MainMarker setMarkerText _text; - }; - }; - }; -}; - -_blck_fn_configureIconMarker = { - private["_MainMarker"]; - params["_name","_pos",["_color","ColorBlack"],["_text",""],["_icon","mil_triangle"]]; - //diag_log format["_blck_fn_configureIconMarker: _name=%1; _pos=%2; _color=%3; _text=%4",_name,_pos,_color,_text]; - - _name = "label" + _name; - _MainMarker = createMarker [_name, _pos]; - _MainMarker setMarkerShape "Icon"; - _MainMarker setMarkerType _icon; - _MainMarker setMarkerColor _color; - _MainMarker setMarkerText _text; -}; - -// determine the type of marker and call the spawn routine with appropriate parameters -private["_mArray"]; -_mArray = _this select 0; -diag_log format["<<--->> spawnMarker.sqf _mArray = %1", _mArray]; -switch (_mArray select 0) do { - case "OrangeMarker": {[_mArray select 0, _mArray select 1, "ColorOrange", _mArray select 2, [275,275],_mArray select 3] call _blck_fn_configureRoundMarker;}; - case "GreenMarker": {[_mArray select 0, _mArray select 1, "ColorGreen",_mArray select 2, [250,250],_mArray select 3] call _blck_fn_configureRoundMarker;}; - case "RedMarker": {[_mArray select 0, _mArray select 1, "ColorRed",_mArray select 2, [225,225],_mArray select 3] call _blck_fn_configureRoundMarker;}; - case "BlueMarker": {[_mArray select 0, _mArray select 1, "ColorBlue",_mArray select 2, [200,200],_mArray select 3] call _blck_fn_configureRoundMarker;}; - case "HunterMarker": {[_mArray select 0, _mArray select 1, "ColorRed",_mArray select 2] call _blck_fn_configureIconMarker}; - case "ScoutsMarker": {[_mArray select 0, _mArray select 1, "ColorRed",_mArray select 2] call _blck_fn_configureIconMarker}; - case "HCMarker": {[_mArray select 1, _mArray select 2, "ColorGreen",_mArray select 3] call _blck_fn_configureIconMarker}; - case "UMSMarker": {[_mArray select 1, _mArray select 2, "ColorOrange",_mArray select 3] call _blck_fn_configureIconMarker}; - case "DebugMarker": {[_mArray select 1, _mArray select 2, "ColorGreen",_mArray select 3,"mil_box"] call _blck_fn_configureIconMarker}; -};