Skip to content

Commit

Permalink
Fix MHQ respawn breaking
Browse files Browse the repository at this point in the history
  • Loading branch information
@john681611
john681611 committed Feb 16, 2019
1 parent 7900612 commit 48766e5
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 16 deletions.
0 common/Server/MHQ_Marker.sqf → common/Server/mhq/marker.sqf
View file
File renamed without changes.
4 changes: 4 additions & 0 deletions common/Server/mhq/respawn.sqf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

(MHQs select (_this select 1)) set [1, (_this select 0)];
publicVariable "MHQs";
[[(_this select 0),["<img size='2' image='Server\Images\Teleport.paa' />Teleport","Client\teleport.sqf",nil,1.5,true,true,"","alive _target && speed _target < 3",10]],"addAction"] call BIS_fnc_MP;
4 changes: 3 additions & 1 deletion common/initServer.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@ getContent = compile preprocessFileLineNumbers 'Server\persistance\content\getCo
setContent = compile preprocessFileLineNumbers 'Server\persistance\content\setContent.sqf';
getSaveGame = compile preprocessFileLineNumbers 'Server\persistance\game\get_game.sqf';
setSaveGame = compile preprocessFileLineNumbers 'Server\persistance\game\set_game.sqf';
respawnMHQ = compile preprocessFileLineNumbers 'Server\mhq\respawn.sqf';

[] execVM "Server\persistance\game\keep_game.sqf";
[] execVM "Server\z_townmgr.sqf";
[] execVM "Server\MHQ_Marker.sqf";
[] execVM "Server\mhq\marker.sqf";
[] execVM "Server\VehicleMarker.sqf";
waitUntil {ztowninit==1};
[] execVM "Server\eos\zoneConfig.sqf";
Expand Down
6 changes: 2 additions & 4 deletions maps/.Altis/mission.sqm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2019,7 +2019,7 @@ class Mission
"STRING"
};
};
value="[[(_this select 0),[""<img size='2' image='Server\Images\Teleport.paa' />Teleport"",""Client\teleport.sqf"",nil,1.5,true,true,"""",""alive _target && speed _target < 3"",10]],""addAction""] call BIS_fnc_MP;C1_Flag attachTo [(_this select 0),[-0.6,-2.4,-2]];";
value="[(_this select 0),0] call respawnMHQ;C1_Flag attachTo [(_this select 0),[-0.6,-2.4,-2]];";
};
};
};
Expand Down Expand Up @@ -2224,7 +2224,7 @@ class Mission
"STRING"
};
};
value="[[(_this select 0),[""<img size='2' image='Server\Images\Teleport.paa' />Teleport"",""Client\teleport.sqf"",nil,1.5,true,true,"""",""alive _target && speed _target < 3"",10]],""addAction""] call BIS_fnc_MP;C2_Flag attachTo [(_this select 0 ),[-0.6,-1,-2]];[(_this select 0), [""Brown"",1], true ] call BIS_fnc_initVehicle; ";
value="[(_this select 0),1] call respawnMHQ;C2_Flag attachTo [(_this select 0 ),[-0.6,-1,-2]];[(_this select 0), [""Brown"",1], true ] call BIS_fnc_initVehicle; ";
};
};
};
Expand Down Expand Up @@ -8949,7 +8949,6 @@ class Mission
class Attributes
{
init="this allowdamage false;this setVariable [""R3F_LOG_disabled"", true];";
disableSimulation=1;
};
id=695;
type="Box_NATO_Uniforms_F";
Expand Down Expand Up @@ -9488,7 +9487,6 @@ class Mission
class Attributes
{
init="this allowdamage false;this setVariable [""R3F_LOG_disabled"", true];";
disableSimulation=1;
};
id=704;
type="Box_NATO_Uniforms_F";
Expand Down
6 changes: 2 additions & 4 deletions maps/.Malden/mission.sqm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1437,7 +1437,7 @@ class Mission
"STRING"
};
};
value="[[(_this select 0),[""<img size='2' image='Server\Images\Teleport.paa' />Teleport"",""Client\teleport.sqf"",nil,1.5,true,true,"""",""alive _target && speed _target < 3"",10]],""addAction""] call BIS_fnc_MP;C1_Flag attachTo [(_this select 0),[-0.6,-2.4,-2]];";
value="[(_this select 0),0] call respawnMHQ;C1_Flag attachTo [(_this select 0),[-0.6,-2.4,-2]];";
};
};
};
Expand Down Expand Up @@ -1642,7 +1642,7 @@ class Mission
"STRING"
};
};
value="[[(_this select 0),[""<img size='2' image='Server\Images\Teleport.paa' />Teleport"",""Client\teleport.sqf"",nil,1.5,true,true,"""",""alive _target && speed _target < 3"",10]],""addAction""] call BIS_fnc_MP;C2_Flag attachTo [(_this select 0 ),[-0.6,-1,-2]];[(_this select 0), [""Brown"",1], true ] call BIS_fnc_initVehicle; ";
value="[(_this select 0),1] call respawnMHQ;C2_Flag attachTo [(_this select 0 ),[-0.6,-1,-2]];[(_this select 0), [""Brown"",1], true ] call BIS_fnc_initVehicle; ";
};
};
};
Expand Down Expand Up @@ -4442,7 +4442,6 @@ class Mission
class Attributes
{
init="this allowdamage false;this setVariable [""R3F_LOG_disabled"", true];";
disableSimulation=1;
};
id=577;
type="Box_NATO_Uniforms_F";
Expand Down Expand Up @@ -9443,7 +9442,6 @@ class Mission
class Attributes
{
init="this allowdamage false;this setVariable [""R3F_LOG_disabled"", true];";
disableSimulation=1;
};
id=999;
type="Box_NATO_Uniforms_F";
Expand Down
8 changes: 3 additions & 5 deletions maps/.Tanoa/mission.sqm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1470,7 +1470,7 @@ class Mission
"STRING"
};
};
value="[[(_this select 0),[""<img size='2' image='Server\Images\Teleport.paa' />Teleport"",""Client\teleport.sqf"",nil,1.5,true,true,"""",""alive _target && speed _target < 3"",10]],""addAction""] call BIS_fnc_MP;C1_Flag attachTo [(_this select 0),[-0.6,-2.4,-2]];";
value="[(_this select 0),0] call respawnMHQ;C1_Flag attachTo [(_this select 0),[-0.6,-2.4,-2]];";
};
};
};
Expand Down Expand Up @@ -1675,7 +1675,7 @@ class Mission
"STRING"
};
};
value="[[(_this select 0),[""<img size='2' image='Server\Images\Teleport.paa' />Teleport"",""Client\teleport.sqf"",nil,1.5,true,true,"""",""alive _target && speed _target < 3"",10]],""addAction""] call BIS_fnc_MP;C2_Flag attachTo [(_this select 0 ),[-0.6,-1,-2]];[(_this select 0), [""Brown"",1], true ] call BIS_fnc_initVehicle; ";
value="[(_this select 0),1] call respawnMHQ;C2_Flag attachTo [(_this select 0 ),[-0.6,-1,-2]];[(_this select 0), [""Brown"",1], true ] call BIS_fnc_initVehicle; ";
};
};
};
Expand Down Expand Up @@ -8441,7 +8441,7 @@ class Mission
"STRING"
};
};
value="[[(_this select 0),[""<img size='2' image='Server\Images\Teleport.paa' />Teleport"",""Client\teleport.sqf"",nil,1.5,true,true,"""",""alive _target && speed _target < 3"",10]],""addAction""] call BIS_fnc_MP;C3_Flag attachTo [(_this select 0),[-0.6,-2.4,-2]];";
value="[(_this select 0),2] call respawnMHQ;C3_Flag attachTo [(_this select 0),[-0.6,-2.4,-2]];";
};
};
};
Expand Down Expand Up @@ -9985,7 +9985,6 @@ class Mission
class Attributes
{
init="this allowdamage false;this setVariable [""R3F_LOG_disabled"", true];";
disableSimulation=1;
};
id=864;
type="Box_NATO_Uniforms_F";
Expand Down Expand Up @@ -10503,7 +10502,6 @@ class Mission
class Attributes
{
init="this allowdamage false;this setVariable [""R3F_LOG_disabled"", true];";
disableSimulation=1;
};
id=873;
type="Box_NATO_Uniforms_F";
Expand Down
2 changes: 1 addition & 1 deletion maps/.WL_Rosche/mission.sqm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1250,7 +1250,7 @@ class Mission
"STRING"
};
};
value="[[(_this select 0),[""<img size='2' image='Server\Images\Teleport.paa' />Teleport"",""Client\teleport.sqf"",nil,1.5,true,true,"""",""alive _target && speed _target < 3"",10]],""addAction""] call BIS_fnc_MP;C1_Flag attachTo [(_this select 0),[-0.6,-2.4,-2]];";
value="[(_this select 0),0] call respawnMHQ;C1_Flag attachTo [(_this select 0),[-0.6,-2.4,-2]];";
};
};
};
Expand Down
2 changes: 1 addition & 1 deletion maps/RHS.WL_Rosche/mission.sqm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ class Mission
"STRING"
};
};
value="[[(_this select 0),[""<img size='2' image='Server\Images\Teleport.paa' />Teleport"",""Client\teleport.sqf"",nil,1.5,true,true,"""",""alive _target && speed _target < 3"",10]],""addAction""] call BIS_fnc_MP;C1_Flag attachTo [(_this select 0),[-0.6,-1.1-2]];";
value="[(_this select 0),0] call respawnMHQ;C1_Flag attachTo [(_this select 0),[-0.6,-1.1-2]];";
};
};
};
Expand Down

0 comments on commit 48766e5

Please sign in to comment.