Skip to content

Commit 2d980b0

Browse files
committed
Fix for garrison saves
1 parent 01dd3cc commit 2d980b0

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

addons/overthrow_main/functions/AI/orders/fn_orderLoot.sqf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ format["Looting nearby bodies into the %1",(typeof _target) call OT_fnc_vehicleG
7070
_unit doMove getpos _deadguy;
7171
[_unit,1] call OT_fnc_experience;
7272

73-
waitUntil {sleep 1; (!alive _unit) or (isNull _t) or (_unit distance _deadguy < 10) or (_timeOut < time)};
73+
waitUntil {sleep 1; (!alive _unit) or (isNull _t) or (_unit distance _deadguy < 12) or (_timeOut < time)};
7474
if((!alive _unit) or (_timeOut < time)) exitWith {};
7575

7676
[_deadguy,_unit] call OT_fnc_takeStuff;
7777
sleep 2;
78-
hideBody _deadguy;
78+
deleteVehicle _deadguy;
7979
if(primaryWeapon _unit == "") then {
8080
_weapon = objNull;
8181
{
@@ -86,7 +86,7 @@ format["Looting nearby bodies into the %1",(typeof _target) call OT_fnc_vehicleG
8686
}foreach(_unit nearentities ["WeaponHolderSimulated",10]);
8787
if !(isNull _weapon) then {
8888
_unit doMove getpos _weapon;
89-
waitUntil {sleep 1; (!alive _unit) or (_unit distance _weapon < 10) or (_timeOut < time)};
89+
waitUntil {sleep 1; (!alive _unit) or (_unit distance _weapon < 12) or (_timeOut < time)};
9090
if(alive _unit and (_timeOut > time)) then {
9191
_s = (weaponsItems _weapon) select 0;
9292

@@ -105,7 +105,7 @@ format["Looting nearby bodies into the %1",(typeof _target) call OT_fnc_vehicleG
105105
if(!alive _unit) exitWith {};
106106
_timeout = time + 120;
107107
_unit doMove getpos _t;
108-
waitUntil {sleep 1; (!alive _unit) or (isNull _t) or (_unit distance _t < 10) or (_timeOut < time)};
108+
waitUntil {sleep 1; (!alive _unit) or (isNull _t) or (_unit distance _t < 12) or (_timeOut < time)};
109109
if((!alive _unit) or (_timeOut < time)) exitWith {};
110110

111111
if !([_unit,_t] call OT_fnc_dumpStuff) exitWith {

addons/overthrow_main/functions/save/fn_loadGame.sqf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ sleep 0.2;
254254
_garrison = server getVariable [format["resgarrison%1",_code],[]];
255255
if(count _garrison > 0) then {
256256
_group = creategroup resistance;
257-
spawner setVariable [format["resgarrison",_code],_group,true];
257+
spawner setVariable [format["resgarrison%1",_code],_group,true];
258258
{
259259
_x params ["_cls","_loadout"];
260260

@@ -275,7 +275,7 @@ sleep 0.2;
275275
_garrison = server getVariable [format["resgarrison%1",_code],[]];
276276
if(count _garrison > 0) then {
277277
_group = creategroup resistance;
278-
spawner setVariable [format["resgarrison",_code],_group,true];
278+
spawner setVariable [format["resgarrison%1",_code],_group,true];
279279
{
280280
_x params ["_cls","_loadout"];
281281
if(_cls != "HMG" and _cls != "GMG") then {

addons/overthrow_main/script_version.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
#define MAJOR 0
2020
#define MINOR 7
2121
#define PATCHLVL 5
22-
#define BUILD 2
22+
#define BUILD 3

0 commit comments

Comments
 (0)