Skip to content

Commit

Permalink
Merge pull request #129 from ArmaOverthrow/dev
Browse files Browse the repository at this point in the history
0.7.3.6
  • Loading branch information
armazac authored May 1, 2017
2 parents fe73fc5 + a51a0e9 commit 7d5f914
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ OT_item_wrecks = ["Land_Wreck_HMMWV_F","Land_Wreck_Skodovka_F","Land_Wreck_Truck
OT_spawnTowns = ["Balavu","Katkoula","Savaka","Namuvaka","Katkoula","Lailai","Taga","Bua Bua","Blerick","Moddergat","Tobakoro"]; //Towns where new players will spawn
OT_spawnHouses = ["Land_Slum_01_F","Land_Slum_02_F","Land_House_Native_02_F"]; //Houses where new players will spawn

OT_NATOwait = 30; //Half the Average time between NATO orders
OT_NATOwait = 300; //Half the Average time between NATO orders
OT_CRIMwait = 500; //Half the Average time between crim changes

//Interactable items that spawn in your house
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,18 @@ while {(_count < _numVeh)} do {
}else{
_moveto = getpos(_bdg);
};
_wp = _group addWaypoint [_moveto,0];
if(!isNil "_moveto") then {
_wp = _group addWaypoint [_moveto,0];

_wp setWaypointType "MOVE";
_wp setWaypointSpeed "LIMITED";
_wp setWaypointBehaviour "SAFE";
_wp setWaypointCompletionRadius 60;
_wp setWaypointStatements ["true","[vehicle this] spawn OT_fnc_cleanup"];
_wp setWaypointType "MOVE";
_wp setWaypointSpeed "LIMITED";
_wp setWaypointBehaviour "SAFE";
_wp setWaypointCompletionRadius 60;
_wp setWaypointStatements ["true","[vehicle this] spawn OT_fnc_cleanup"];
}else{
_group spawn OT_fnc_cleanup;
_veh spawn OT_fnc_cleanup;
};
}else{
if(_town == (server getVariable "spawntown") and (random 100) > 75) then {
_veh setDamage [1,false]; //salvage wreck
Expand Down
30 changes: 13 additions & 17 deletions addons/overthrow_main/functions/fn_canPlace.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -19,29 +19,25 @@ if(_typecls != "Base") then {
};
};
};
if !(_canplace) then {
if(_pos distance OT_factoryPos < 250) then {
if("Factory" in (server getVariable ["GEURowned",[]])) then {
_isbase = true;
_canplace = true;
};
if(_pos distance OT_factoryPos < 250) then {
if("Factory" in (server getVariable ["GEURowned",[]])) then {
_isbase = true;
_canplace = true;
};
};
if !(_canplace) then {
_base = _pos call OT_fnc_nearestBase;
_base = _pos call OT_fnc_nearestBase;
if !(isNil "_base") then {
if((_base select 0) distance _pos < 100) then {
_isbase = true;
};
};
if(!_isbase) then {
_base = _pos call OT_fnc_nearestObjective;
if !(isNil "_base") then {
if((_base select 0) distance _pos < 100) then {
if(((_base select 1) in (server getvariable "NATOabandoned")) and ((_base select 0) distance _pos) < 100) then {
_isbase = true;
};
};
if(!_isbase) then {
_base = _pos call OT_fnc_nearestObjective;
if !(isNil "_base") then {
if(((_base select 1) in (server getvariable "NATOabandoned")) and ((_base select 0) distance _pos) < 100) then {
_isbase = true;
};
};
};
};
}else{
_base = _pos call OT_fnc_nearestBase;
Expand Down

0 comments on commit 7d5f914

Please sign in to comment.