From 8a79d8dc6850a508991d03d847d33b3be8b5c5f5 Mon Sep 17 00:00:00 2001 From: john681611 Date: Wed, 17 Apr 2019 20:43:42 +0100 Subject: [PATCH] Create Save markers round MHQs --- common/Client/teleport.sqf | 2 +- common/Server/mhq/marker.sqf | 14 +++- maps/.Altis/config/basic.sqf | 2 +- maps/.Altis/mission.sqm | 73 +++++++++++++++++-- maps/.Malden/config/basic.sqf | 2 +- maps/.Malden/mission.sqm | 107 +++++++++++++++++++++++++-- maps/.Tanoa/config/basic.sqf | 2 +- maps/.Tanoa/mission.sqm | 109 ++++++++++++++++++++++++++-- maps/.WL_Rosche/config/basic.sqf | 2 +- maps/RHS.WL_Rosche/config/basic.sqf | 2 +- 10 files changed, 286 insertions(+), 29 deletions(-) diff --git a/common/Client/teleport.sqf b/common/Client/teleport.sqf index e0faceb..f9052e6 100644 --- a/common/Client/teleport.sqf +++ b/common/Client/teleport.sqf @@ -34,7 +34,7 @@ private ["_Location"]; } forEach Bases; { - _marker = _x select 2; + _marker = format["respawn_west_%1",_x select 2]; _displayName = getText (configFile >> "CfgVehicles" >>(typeOf (_x select 1)) >> "displayName"); _missionsData append [[getMarkerPos _marker,to_Base,_displayName,_displayName,"","",1,[getMarkerPos _marker]]]; } forEach MHQs; diff --git a/common/Server/mhq/marker.sqf b/common/Server/mhq/marker.sqf index 3df3778..7bf8a4f 100644 --- a/common/Server/mhq/marker.sqf +++ b/common/Server/mhq/marker.sqf @@ -1,7 +1,19 @@ + + call {while {true} do { { - (_x select 2) setMarkerPos getPos (_x select 1); + _pos = getPos (_x select 1); + _zoneMarker = format["%1_zone_marker",(_x select 2)]; + format["respawn_west_%1",(_x select 2)] setMarkerPos _pos; + _zoneMarker setMarkerPos _pos; + (missionNamespace getVariable format["%1_zone",(_x select 2)]) setPos _pos; + _overlap = _x call tooCloseMHQ; + if(_overlap) then { + _zoneMarker setMarkerAlpha 0; + } else { + _zoneMarker setMarkerAlpha 1; + }; sleep 1; } forEach MHQs } diff --git a/maps/.Altis/config/basic.sqf b/maps/.Altis/config/basic.sqf index e201463..9ef1578 100644 --- a/maps/.Altis/config/basic.sqf +++ b/maps/.Altis/config/basic.sqf @@ -2,7 +2,7 @@ blacklistLocations = [""]; //Both saveName = "Altis";//ENTER CUSTOM SERVER NAME HERE -MHQs =[[FLG, C1,"respawn_west_MHQ"],[FLG2,C2,"respawn_west_MHQ2"]]; //[base flag ,vehicle , marker, name] +MHQs =[[FLG, C1,"MHQ"],[FLG2,C2,"MHQ2"]]; //[base flag ,vehicle , marker, name] Bases =[['respawn_west', Main_Zone, "Main Base"], ['respawn_west_Hotel',Hotel_Zone, 'Hotel Base']]; //[marker, trigger, name] ///////////////////////////////////// publicVariable "MHQs"; diff --git a/maps/.Altis/mission.sqm b/maps/.Altis/mission.sqm index b19efad..037afec 100644 --- a/maps/.Altis/mission.sqm +++ b/maps/.Altis/mission.sqm @@ -8,7 +8,7 @@ class EditorData toggles=1; class ItemIDProvider { - nextID=738; + nextID=744; }; class MarkerIDProvider { @@ -334,9 +334,8 @@ class Mission { class Intel { - briefingName="Resistance"; + briefingName="Resistance"; resistanceWest=0; - resistanceEast=0; startWeather=0.099999994; startWind=0.099999994; startWaves=0.099999994; @@ -353,7 +352,7 @@ class Mission }; class Entities { - items=245; + items=249; class Item0 { dataType="Marker"; @@ -9024,7 +9023,7 @@ class Mission name="Tele_5"; text="Turdis"; type="flag_FIA"; - angle=162.82193; + angle=162.82191; id=696; atlOffset=2.8728638; }; @@ -12544,6 +12543,7 @@ class Mission }; id=734; type="B_Heli_Transport_03_F"; + atlOffset=0.00063896179; }; class Item243 { @@ -12765,7 +12765,68 @@ class Mission }; id=737; type="C_IDAP_Heli_Transport_02_F"; - atlOffset=1.9073486e-006; + }; + class Item245 + { + dataType="Trigger"; + position[]={13798.676,-116.64429,9372.7588}; + class Attributes + { + name="MHQ_zone"; + sizeA=100; + sizeB=100; + activationBy="ANY"; + isServerOnly=1; + }; + id=738; + type="EmptyDetector"; + atlOffset=5.8249969; + }; + class Item246 + { + dataType="Marker"; + position[]={13800.66,-86.858063,9371.9014}; + name="MHQ_zone_marker"; + markerType="ELLIPSE"; + type="ellipse"; + colorName="ColorWEST"; + fillName="Border"; + a=100; + b=100; + drawBorder=1; + id=739; + atlOffset=35.364151; + }; + class Item247 + { + dataType="Trigger"; + position[]={13795.452,-120.33463,9345.2852}; + class Attributes + { + name="MHQ3_zone"; + sizeA=100; + sizeB=100; + activationBy="ANY"; + isServerOnly=1; + }; + id=740; + type="EmptyDetector"; + atlOffset=5.8254776; + }; + class Item248 + { + dataType="Marker"; + position[]={13799.809,-93.641815,9347.2783}; + name="MHQ3_zone_marker"; + markerType="ELLIPSE"; + type="ellipse"; + colorName="ColorWEST"; + fillName="Border"; + a=100; + b=100; + drawBorder=1; + id=741; + atlOffset=32.462845; }; }; class Connections diff --git a/maps/.Malden/config/basic.sqf b/maps/.Malden/config/basic.sqf index 36e23ed..e8c3dce 100644 --- a/maps/.Malden/config/basic.sqf +++ b/maps/.Malden/config/basic.sqf @@ -2,7 +2,7 @@ blacklistLocations = ["Tuvanaka"]; //Both saveName = "Malden";//ENTER CUSTOM SERVER NAME HERE -MHQs =[[FLG, C1,"respawn_west_MHQ"],[FLG2,C2,"respawn_west_MHQ2"], [FLG2,C3,"respawn_west_MHQ3"]]; +MHQs =[[FLG, C1,"MHQ"],[FLG2,C2,"MHQ2"], [FLG2,C3,"MHQ3"]]; Bases =[['respawn_west', Main_Zone, "Main Base"],['respawn_west_camp', Hotel_Zone,'Lighthouse']]; //[marker, trigger, name] ///////////////////////////////////// publicVariable "MHQs"; diff --git a/maps/.Malden/mission.sqm b/maps/.Malden/mission.sqm index 6c02530..186b4f7 100644 --- a/maps/.Malden/mission.sqm +++ b/maps/.Malden/mission.sqm @@ -5,10 +5,10 @@ class EditorData angleGridStep=0.2617994; scaleGridStep=1; autoGroupingDist=10; - toggles=1; + toggles=129; class ItemIDProvider { - nextID=1029; + nextID=1035; }; class MarkerIDProvider { @@ -16,7 +16,7 @@ class EditorData }; class Camera { - pos[]={8015.3442,55.417038,9656.6807}; + pos[]={8012.1167,70.260002,9643.6318}; dir[]={0.15881722,-0.64395452,0.74840021}; up[]={0.13367648,0.76506323,0.62992859}; aside[]={0.97821772,-2.7343049e-008,-0.20758672}; @@ -331,7 +331,7 @@ class Mission }; class Entities { - items=137; + items=143; class Item0 { dataType="Marker"; @@ -415,8 +415,8 @@ class Mission dataType="Object"; class PositionInfo { - position[]={5165.5835,23.004448,1197.3656}; - angles[]={6.2799835,3.7364919,6.2448058}; + position[]={5165.4707,23.01737,1201.1525}; + angles[]={-0,3.7364919,6.2448058}; }; side="West"; flags=6; @@ -429,7 +429,6 @@ class Mission }; id=70; type="B_G_officer_F"; - atlOffset=3.8146973e-006; class CustomAttributes { class Attribute0 @@ -874,7 +873,6 @@ class Mission { }; id=69; - atlOffset=3.8146973e-006; }; class Item8 { @@ -9398,6 +9396,99 @@ class Mission nAttributes=2; }; }; + class Item137 + { + dataType="Trigger"; + position[]={5509.0698,-20.377302,1266.1062}; + class Attributes + { + name="MHQ_zone"; + sizeA=100; + sizeB=100; + activationBy="ANY"; + isServerOnly=1; + }; + id=1029; + type="EmptyDetector"; + atlOffset=5.8250008; + }; + class Item138 + { + dataType="Marker"; + position[]={5511.0542,8.7950191,1265.2494}; + name="MHQ_zone_marker"; + markerType="ELLIPSE"; + type="ellipse"; + colorName="ColorBlue"; + fillName="Border"; + a=100; + b=100; + drawBorder=1; + id=1030; + atlOffset=35.364296; + }; + class Item139 + { + dataType="Trigger"; + position[]={5505.8457,-18.658588,1238.6333}; + class Attributes + { + name="MHQ3_zone"; + sizeA=100; + sizeB=100; + activationBy="ANY"; + isServerOnly=1; + }; + id=1031; + type="EmptyDetector"; + atlOffset=5.8254757; + }; + class Item140 + { + dataType="Marker"; + position[]={5510.2017,7.3770943,1240.6259}; + name="MHQ3_zone_marker"; + markerType="ELLIPSE"; + type="ellipse"; + colorName="ColorBlue"; + fillName="Border"; + a=100; + b=100; + drawBorder=1; + id=1032; + atlOffset=32.462921; + }; + class Item141 + { + dataType="Trigger"; + position[]={5507.1875,-10.560163,1216.9573}; + class Attributes + { + name="MHQ2_zone"; + sizeA=100; + sizeB=100; + activationBy="ANY"; + isServerOnly=1; + }; + id=1033; + type="EmptyDetector"; + atlOffset=5.8245554; + }; + class Item142 + { + dataType="Marker"; + position[]={5509.1729,19.103399,1216.1002}; + name="MHQ2_zone_marker"; + markerType="ELLIPSE"; + type="ellipse"; + colorName="ColorBlue"; + fillName="Border"; + a=100; + b=100; + drawBorder=1; + id=1034; + atlOffset=35.364429; + }; }; class Connections { diff --git a/maps/.Tanoa/config/basic.sqf b/maps/.Tanoa/config/basic.sqf index 8b4c163..7721dc9 100644 --- a/maps/.Tanoa/config/basic.sqf +++ b/maps/.Tanoa/config/basic.sqf @@ -2,7 +2,7 @@ blacklistLocations = ["Tuvanaka"]; //Both saveName = "Tanoa";//ENTER CUSTOM SERVER NAME HERE -MHQs =[[FLG, C1,"respawn_west_MHQ"],[FLG2,C2,"respawn_west_MHQ2"], [FLG2,C3,"respawn_west_MHQ3"]]; +MHQs =[[FLG, C1,"MHQ"],[FLG2,C2,"MHQ2"], [FLG2,C3,"MHQ3"]]; Bases =[['respawn_west', Main_Zone, "Main Base"],['respawn_west_camp', Hotel_Zone,'Camp']]; //[marker, trigger, name] ///////////////////////////////////// publicVariable "MHQs"; diff --git a/maps/.Tanoa/mission.sqm b/maps/.Tanoa/mission.sqm index 5bb0586..95e5219 100644 --- a/maps/.Tanoa/mission.sqm +++ b/maps/.Tanoa/mission.sqm @@ -5,10 +5,10 @@ class EditorData angleGridStep=0.2617994; scaleGridStep=1; autoGroupingDist=10; - toggles=137; + toggles=9; class ItemIDProvider { - nextID=882; + nextID=888; }; class MarkerIDProvider { @@ -47,6 +47,7 @@ addons[]= "A3_Boat_F_Gamma_Boat_Civil_04", "A3_Structures_F_Heli_Ind_Cargo", "A3_Structures_F_Civ_Camping", + "cba_xeh", "A3_Structures_F_EPA_Civ_Constructions", "A3_Structures_F_Mil_Fortification", "A3_Structures_F_Exp_Military_Fortifications", @@ -341,9 +342,8 @@ class Mission { class Intel { - briefingName="Resistance"; + briefingName="Resistance"; resistanceWest=0; - resistanceEast=0; startWeather=0.099999994; startWind=0.099999994; startWaves=0.099999994; @@ -361,7 +361,7 @@ class Mission }; class Entities { - items=244; + items=250; class Item0 { dataType="Marker"; @@ -4313,7 +4313,7 @@ class Mission }; id=622; type="B_G_Boat_Transport_01_F"; - atlOffset=3.9971485; + atlOffset=3.9963419; }; class Item68 { @@ -4330,7 +4330,7 @@ class Mission }; id=623; type="B_G_Boat_Transport_01_F"; - atlOffset=3.9850163; + atlOffset=3.98421; }; class Item69 { @@ -10558,7 +10558,7 @@ class Mission name="Tele_5"; text="Turdis"; type="flag_FIA"; - angle=66.288422; + angle=66.288414; id=874; atlOffset=2.6074653; }; @@ -11013,6 +11013,99 @@ class Mission nAttributes=2; }; }; + class Item244 + { + dataType="Trigger"; + position[]={1162.6992,-14.519531,11831.47}; + class Attributes + { + name="MHQ_zone"; + sizeA=100; + sizeB=100; + activationBy="ANY"; + isServerOnly=1; + }; + id=882; + type="EmptyDetector"; + atlOffset=5.8250008; + }; + class Item245 + { + dataType="Marker"; + position[]={1164.6836,14.841463,11830.612}; + name="MHQ_zone_marker"; + markerType="ELLIPSE"; + type="ellipse"; + colorName="ColorWEST"; + fillName="Border"; + a=100; + b=100; + drawBorder=1; + id=883; + atlOffset=35.364155; + }; + class Item246 + { + dataType="Trigger"; + position[]={1159.4751,-16.016945,11803.996}; + class Attributes + { + name="MHQ3_zone"; + sizeA=100; + sizeB=100; + activationBy="ANY"; + isServerOnly=1; + }; + id=884; + type="EmptyDetector"; + atlOffset=5.8254757; + }; + class Item247 + { + dataType="Marker"; + position[]={1163.8315,10.876066,11805.989}; + name="MHQ3_zone_marker"; + markerType="ELLIPSE"; + type="ellipse"; + colorName="ColorWEST"; + fillName="Border"; + a=100; + b=100; + drawBorder=1; + id=885; + atlOffset=32.462841; + }; + class Item248 + { + dataType="Trigger"; + position[]={1160.8169,-16.119495,11782.32}; + class Attributes + { + name="MHQ2_zone"; + sizeA=100; + sizeB=100; + activationBy="ANY"; + isServerOnly=1; + }; + id=886; + type="EmptyDetector"; + atlOffset=5.8245564; + }; + class Item249 + { + dataType="Marker"; + position[]={1161.6689,13.170069,11782.597}; + name="MHQ2_zone_marker"; + markerType="ELLIPSE"; + type="ellipse"; + colorName="ColorWEST"; + fillName="Border"; + a=100; + b=100; + drawBorder=1; + id=887; + atlOffset=35.18718; + }; }; class Connections { diff --git a/maps/.WL_Rosche/config/basic.sqf b/maps/.WL_Rosche/config/basic.sqf index 3763829..d00542a 100644 --- a/maps/.WL_Rosche/config/basic.sqf +++ b/maps/.WL_Rosche/config/basic.sqf @@ -2,7 +2,7 @@ blacklistLocations = ["Tuvanaka"]; //Both saveName = "Rocsh";//ENTER CUSTOM SERVER NAME HERE -MHQs =[[FLG, C1,"respawn_west_MHQ"]]; //[base flag ,vehicle , marker, name] +MHQs =[[FLG, C1,"MHQ"]]; //[base flag ,vehicle , marker, name] Bases =[['respawn_west', Main_Zone, "Main Base"]]; //[marker, trigger, name] ///////////////////////////////////// publicVariable "MHQs"; diff --git a/maps/RHS.WL_Rosche/config/basic.sqf b/maps/RHS.WL_Rosche/config/basic.sqf index d3fc400..3e235ff 100644 --- a/maps/RHS.WL_Rosche/config/basic.sqf +++ b/maps/RHS.WL_Rosche/config/basic.sqf @@ -2,7 +2,7 @@ blacklistLocations = ["Tuvanaka"]; //Both saveName = "RocshRHS";//ENTER CUSTOM SERVER NAME HERE -MHQs =[[FLG, C1,"respawn_west_MHQ"]]; //[base flag ,vehicle , marker, name] +MHQs =[[FLG, C1,"MHQ"]]; //[base flag ,vehicle , marker, name] Bases =[['respawn_west', Main_Zone, "Main Base"]]; //[marker, trigger, name] ///////////////////////////////////// publicVariable "MHQs";