Skip to content

Commit d206fb1

Browse files
committed
bugfixes
1 parent 5a536d2 commit d206fb1

9 files changed

Lines changed: 26 additions & 3 deletions

File tree

addons/overthrow_main/functions/AI/fn_initVCOMAI.sqf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ VCOM_RainPercent = 3;
3737
//Should AI and players have an additional layer of suppression that decreases aiming when suppressed? Default = true;
3838
VCOM_Suppression = true;
3939
//How much should suppression impact both AI and player aiming? Default is 5. Normal ArmA is 1.
40-
VCOM_SuppressionVar = 5;
40+
VCOM_SuppressionVar = 2;
4141
//Should AI/players be impacted by adrenaline? This provides players and AI with a small speed boost to animations to assist with cover seeking and positioning for a short time. Default = true;
4242
VCOM_Adrenaline = true;
4343
//How much of a speed boost should players/AI recieve? Default = 1.35; (1 is ArmA's normal speed).

addons/overthrow_main/functions/actions/fn_fastTravel.sqf

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,17 @@ private _hasdrugs = false;
88

99
if(_hasdrugs) exitWith {"You cannot fast travel while carrying drugs" call OT_fnc_notifyMinor};
1010

11+
_exit = false;
1112
if((vehicle player) != player) then {
12-
if (driver (vehicle player) != player) exitWith {"You are not the driver of this vehicle" call OT_fnc_notifyMinor};
13-
if({!captive _x} count (crew vehicle player) != 0) exitWith {"There are wanted people in this vehicle" call OT_fnc_notifyMinor};
13+
{
14+
if(_x in OT_allDrugs) exitWith {_hasdrugs = true};
15+
}foreach(itemCargo vehicle player);
16+
17+
if(_hasdrugs) exitWith {"You cannot fast travel while carrying drugs" call OT_fnc_notifyMinor;_exit=true};
18+
if (driver (vehicle player) != player) exitWith {"You are not the driver of this vehicle" call OT_fnc_notifyMinor;_exit=true};
19+
if({!captive _x} count (crew vehicle player) != 0) exitWith {"There are wanted people in this vehicle" call OT_fnc_notifyMinor;_exit=true};
1420
};
21+
if(_exit) exitWith {};
1522

1623
if(((vehicle player) != player) and (vehicle player) isKindOf "Ship") exitWith {"You cannot fast travel in a boat" call OT_fnc_notifyMinor};
1724

addons/overthrow_main/functions/factions/NATO/fn_NATOGroundForces.sqf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,23 @@ if !(isNil "_delay") then {sleep _delay};
33
private _squadtype = OT_NATO_GroundForces call BIS_fnc_SelectRandom;
44
private _spawnpos = [_frompos,[50,75]] call SHK_pos;
55
private _group1 = [_spawnpos, WEST, (configFile >> "CfgGroups" >> "West" >> OT_faction_NATO >> "Infantry" >> _squadtype)] call BIS_fnc_spawnGroup;
6+
_group1 deleteGroupWhenEmpty true;
67
private _group2 = "";
78
private _tgroup = false;
89
if !(_byair) then {
910
sleep 0.2;
1011
_squadtype = OT_NATO_GroundForces call BIS_fnc_SelectRandom;
1112
_spawnpos = [_frompos,[50,75]] call SHK_pos;
1213
_group2 = [_spawnpos, WEST, (configFile >> "CfgGroups" >> "West" >> OT_faction_NATO >> "Infantry" >> _squadtype)] call BIS_fnc_spawnGroup;
14+
_group2 deleteGroupWhenEmpty true;
1315
};
1416
sleep 0.5;
1517
private _allunits = [];
1618
private _veh = false;
1719
if(_frompos distance _attackpos > 600) then {
1820
//Transport
1921
_tgroup = creategroup blufor;
22+
_tgroup deleteGroupWhenEmpty true;
2023
_vehtype = OT_NATO_Vehicle_Transport call BIS_fnc_selectRandom;
2124
if(_byair) then {
2225
_vehtype = OT_NATO_Vehicle_AirTransport call BIS_fnc_selectRandom;

addons/overthrow_main/functions/factions/fn_factionNATO.sqf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,7 @@ while {sleep 10;true} do {
311311
if(count _targets > 0) then {
312312
_targets = [_targets,[],{random 100},"ASCEND"] call BIS_fnc_sortBy;
313313
_group = createGroup blufor;
314+
_group deleteGroupWhenEmpty true;
314315
_p = [_pos,0,0,false,[0,0],[100,OT_NATO_Vehicles_ReconDrone]] call SHK_pos;
315316
_drone = createVehicle [OT_NATO_Vehicles_ReconDrone, _p, [], 0,""];
316317

@@ -525,6 +526,7 @@ while {sleep 10;true} do {
525526
_spend = _spend - 150;
526527
_resources = _resources - 150;
527528
_group = creategroup blufor;
529+
_group deleteGroupWhenEmpty true;
528530
_count = 0;
529531
while {_count < 4} do {
530532
_start = [[[_pos,50]]] call BIS_fnc_randomPos;

addons/overthrow_main/functions/virtualization/spawners/fn_spawnCivilians.sqf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ private _numidents = count _idents;
5858
while {_count < _numCiv} do {
5959
_groupcount = 0;
6060
_group = createGroup civilian;
61+
_group deleteGroupWhenEmpty true;
6162
_group setBehaviour "SAFE";
6263
_groups pushback _group;
6364

@@ -98,7 +99,9 @@ private _gangs = OT_civilians getVariable [format["gangs%1",_town],[]];
9899
_gangid = _x;
99100
_gang = OT_civilians getVariable [format["gang%1",_gangid],[]];
100101
_members = _gang select 0;
102+
101103
if !(isNil "_members") then {
104+
_vest = "";
102105
if(count _gang > 3) then {
103106
_vest = _gang select 3;
104107
}else{

addons/overthrow_main/functions/virtualization/spawners/fn_spawnGendarmerie.sqf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ _pergroup = 4;
2222
while {_count < _numNATO} do {
2323
_groupcount = 0;
2424
_group = createGroup west;
25+
_group deleteGroupWhenEmpty true;
2526
_groups pushBack _group;
2627

2728
_home = _town call OT_fnc_getRandomRoadPosition;

addons/overthrow_main/functions/virtualization/spawners/fn_spawnNATOObjective.sqf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ if(isNil "_numNATO") then {
1515
_count = 0;
1616
if(_name in OT_allComms) then {
1717
_group = createGroup blufor;
18+
_group deleteGroupWhenEmpty true;
1819
_groups pushBack _group;
1920

2021
_start = [[[_posTown,50]]] call BIS_fnc_randomPos;
@@ -79,6 +80,7 @@ if(_name in OT_allComms) then {
7980
//Garrison any buildings
8081
if(_numNATO > 0) then {
8182
_garrisongroup = creategroup blufor;
83+
_garrisongroup deleteGroupWhenEmpty true;
8284
_groups pushback _garrisongroup;
8385
private _buildings = nearestObjects [_posTown, OT_garrisonBuildings, 250];
8486
{
@@ -149,6 +151,7 @@ _groupcount = 0;
149151
while {_count < _numNATO} do {
150152
_start = [[[_posTown,200]]] call BIS_fnc_randomPos;
151153
_group = createGroup blufor;
154+
_group deleteGroupWhenEmpty true;
152155
_groups pushBack _group;
153156
_groupcount = 1;
154157

addons/overthrow_main/missions/fugitive.sqf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ _difficulty = 1.8;
3939

4040
//Spawn the dude
4141
_group = creategroup opfor;
42+
_group deleteGroupWhenEmpty true;
4243
_start = [[[_destination,40]]] call BIS_fnc_randomPos;
4344
_civ = _group createUnit [OT_civType_gunDealer, _start, [],0, "NONE"];
4445
_civ setVariable ["notalk",true,true]; //Tells Overthrow this guy cannot be recruited etc
@@ -62,6 +63,7 @@ _difficulty = 1.8;
6263
_numGoons = round(random 4);
6364
_count = 0;
6465
_bgroup = creategroup opfor;
66+
_bgroup deleteGroupWhenEmpty true;
6567
while {(_count < _numGoons)} do {
6668
_start = [[[_destination,5]]] call BIS_fnc_randomPos;
6769

addons/overthrow_main/missions/informant.sqf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ if(random(100)>99) then {_difficulty = _difficulty + 1}; //random chance of a bi
3636

3737
//Spawn the dude
3838
_group = creategroup blufor;
39+
_group deleteGroupWhenEmpty true;
3940
_start = [[[_destination,5]]] call BIS_fnc_randomPos;
4041
_civ = _group createUnit [OT_civType_gunDealer, _start, [],0, "NONE"];
4142
_civ setVariable ["notalk",true,true]; //Tells Overthrow this guy cannot be recruited etc
@@ -63,6 +64,7 @@ if(random(100)>99) then {_difficulty = _difficulty + 1}; //random chance of a bi
6364
_numGoons = round(random 4) + 2;
6465
_count = 0;
6566
_bgroup = creategroup blufor;
67+
_bgroup deleteGroupWhenEmpty true;
6668
while {(_count < _numGoons)} do {
6769
_start = [[[_destination,40]]] call BIS_fnc_randomPos;
6870

0 commit comments

Comments
 (0)