Skip to content

Commit 4e762ba

Browse files
fritogotlayedfritogotlayed
committed
Merge pull request #40 from fritogotlayed/AutoSaveScript
Consolidated auto save logic to single script and called that in each location
2 parents f2ccc68 + b75431a commit 4e762ba

File tree

8 files changed

+43
-77
lines changed

8 files changed

+43
-77
lines changed

‎source/missions/missions/destroy/mission.sqf‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ _randompos = [(_missionpos select 0)+(random _radius)-(random _radius), (_missio
66
// CREATE NAME
77
_mission_name = MissionNameCase3;
88

9-
109
// CREATE MARKER (ICON)
1110
_markername = format["resc%1%2",round(_randompos select 0),round(_randompos select 1)]; // Define marker name
1211
_markerstr = createMarker [str(_markername), _randompos];
@@ -36,10 +35,7 @@ _taskhandle setSimpleTaskDescription ["We have detected a large amount of enemy
3635
_taskhandle setSimpleTaskDestination (getMarkerPos str(_markername));
3736

3837
if (!ismultiplayer) then {
39-
enableSaving true;
40-
sleep 0.1;
41-
saveGame;
42-
enableSaving false;
38+
execVM "utilities\autoSave.sqf";
4339
};
4440

4541
["TaskAssigned",["",_mission_name]] call bis_fnc_showNotification;

‎source/missions/missions/pilot/mission.sqf‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ str(_markername2) setMarkerSize [_radius, _radius];
2626
str(_markername2) setMarkerAlpha 0.5;
2727

2828
// CREATE PATROLS
29-
sleep 1;
30-
[_randompos, _radius] execvm "createoppatrol.sqf";
31-
[_randompos, _radius] execvm "createoppatrol.sqf";
32-
[_randompos, _radius] execvm "createoppatrol.sqf";
33-
[_randompos, _radius] execvm "createopteam.sqf";
34-
29+
sleep 1;
30+
[_randompos, _radius] execvm "createoppatrol.sqf";
31+
[_randompos, _radius] execvm "createoppatrol.sqf";
32+
[_randompos, _radius] execvm "createoppatrol.sqf";
33+
[_randompos, _radius] execvm "createopteam.sqf";
34+
3535
// CREATE WRECK
3636
_choppa = "Land_Wreck_Heli_Attack_01_F" createVehicle (_missionpos);
3737

@@ -46,10 +46,7 @@ _taskhandle setSimpleTaskDescription ["One of our AH-99 helicopters has been dow
4646
_taskhandle setSimpleTaskDestination (getMarkerPos str(_markername));
4747

4848
if (!ismultiplayer) then {
49-
enableSaving true;
50-
sleep 0.1;
51-
saveGame;
52-
enableSaving false;
49+
execVM "utilities\autoSave.sqf";
5350
};
5451

5552
["TaskAssigned",["",_mission_name]] call bis_fnc_showNotification;

‎source/missions/missions/rescue/mission.sqf‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ _randompos = [(_missionpos select 0)+(random _radius)-(random _radius), (_missio
66
// CREATE NAME
77
_mission_name = MissionNameCase0;
88

9-
109
// CREATE MARKER (ICON)
1110
_markername = format["resc%1%2",round(_randompos select 0),round(_randompos select 1)]; // Define marker name
1211
_markerstr = createMarker [str(_markername), _randompos];
@@ -34,12 +33,8 @@ _group = createGroup west;
3433
"b_soldier_tl_f" createUnit [[(_missionpos select 0)+(random 10),(_missionpos select 1)+(random 10)], _group,format["this setcaptive true; this switchMove ""acts_InjuredCoughRifle02""; %1 = this",_soldier1]];
3534
"B_Soldier_F" createUnit [[(_missionpos select 0),(_missionpos select 1)], _group,format["this setcaptive true; this switchMove ""acts_InjuredLookingRifle02""; %1 = this",_soldier2]];
3635
"B_Soldier_ar_F" createUnit [[(_missionpos select 0)+(random 5),(_missionpos select 1)+(random 5)], _group,format["this setcaptive true; this switchMove ""acts_InjuredLookingRifle03""; %1 = this",_soldier3]];
37-
3836
// END CREATE SOLDIERS
3937

40-
41-
42-
4338
// TASK AND NOTIFICATION
4439
_VARtaskgeneratedName = format ["rescue%1%2",round(_MissionPos select 0),round(_Missionpos select 1)]; // generate variable name for task
4540

@@ -48,10 +43,7 @@ _taskhandle setSimpleTaskDescription ["One of our patrols has been ambushed and
4843
_taskhandle setSimpleTaskDestination (getMarkerPos str(_markername));
4944

5045
if (!ismultiplayer) then {
51-
enableSaving true;
52-
sleep 0.1;
53-
saveGame;
54-
enableSaving false;
46+
execVM "utilities\autoSave.sqf";
5547
};
5648

5749
["TaskAssigned",["",_mission_name]] call bis_fnc_showNotification;
@@ -66,7 +58,7 @@ _trg setTriggerStatements["this",format["[""%1"",%2,%3,%4,%5,""%6"",this] execvm
6658
_trg setTriggerTimeout [10, 10, 10, true ];
6759

6860
// CREATE OPFOR PATROLS
69-
sleep 1;
70-
[_randompos, _radius] execvm "createoppatrol.sqf";
71-
[_randompos, _radius] execvm "createoppatrol.sqf";
61+
sleep 1;
62+
[_randompos, _radius] execvm "createoppatrol.sqf";
63+
[_randompos, _radius] execvm "createoppatrol.sqf";
7264

‎source/missions/missions/sabotage/mission.sqf‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ _randompos = [(_missionpos select 0)+(random _radius)-(random _radius), (_missio
66
// CREATE NAME
77
_mission_name = MissionNameCase5;
88

9-
109
// CREATE MARKER (ICON)
1110
_markername = format["sabot%1%2",round(_randompos select 0),round(_randompos select 1)]; // Define marker name
1211
_markerstr = createMarker [str(_markername), _randompos];
@@ -28,33 +27,25 @@ str(_markername2) setMarkerAlpha 0.3;
2827
_tower = createVehicle ["Land_dp_transformer_F", _MissionPos, [], 0, "NONE"];
2928
_tower addaction ["Sabotage", "missions\missions\sabotage\success.sqf",[_missionPos,_mission_name,_markername,_markername2]];
3029

31-
32-
3330
// TASK AND NOTIFICATION
3431
_VARtaskgeneratedName = format["tsksabot%1%2",round(_MissionPos select 0),round(_Missionpos select 1)]; // generate variable name for task
3532

36-
37-
3833
_taskhandle = player createSimpleTask ["taskSabot"];
3934
_taskhandle setSimpleTaskDescription ["The enemy is using a power supply somewhere in this area. We need you to find it and sabotage it. It will allow us to have a bit of better intel on our enemies.",_mission_name,""];
4035
_taskhandle setSimpleTaskDestination (getMarkerPos str(_markername));
4136

4237
if (!ismultiplayer) then {
43-
enableSaving true;
44-
sleep 0.1;
45-
saveGame;
46-
enableSaving false;
38+
execVM "utilities\autoSave.sqf";
4739
};
4840

4941
["TaskAssigned",["",_mission_name]] call bis_fnc_showNotification;
5042

5143
call compile format ["%1 = _taskhandle",_VARtaskgeneratedName]; // create variable using the generated name so we can access it with the action
5244

53-
5445
// CREATE OPFOR PATROLS
55-
sleep 1;
56-
[_randompos, _radius] execvm "createoppatrol.sqf";
57-
[_randompos, _radius] execvm "createoppatrol.sqf";
58-
[_missionpos, 15] execvm "createoppatrol.sqf"; // <-- around target
46+
sleep 1;
47+
[_randompos, _radius] execvm "createoppatrol.sqf";
48+
[_randompos, _radius] execvm "createoppatrol.sqf";
49+
[_missionpos, 15] execvm "createoppatrol.sqf"; // <-- around target
5950
sleep 10;
60-
[_missionpos, 15] execvm "createoppatrol.sqf"; // <-- around target
51+
[_missionpos, 15] execvm "createoppatrol.sqf"; // <-- around target

‎source/missions/missions/steal/mission.sqf‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,18 @@ _taskhandle setSimpleTaskDescription ["An enemy truck full of supplies has been
4949
_taskhandle setSimpleTaskDestination (getMarkerPos str(_markername));
5050

5151
if (!ismultiplayer) then {
52-
enableSaving true;
53-
sleep 0.1;
54-
saveGame;
55-
enableSaving false;
52+
execVM "utilities\autoSave.sqf";
5653
};
5754

5855
["TaskAssigned",["",_mission_name]] call bis_fnc_showNotification;
5956

6057
// CREATE PATROLS
61-
sleep 1;
62-
[_missionpos, 15] execvm "createoppatrol.sqf"; // <-- around target
63-
[_randompos, _radius] execvm "createoppatrol.sqf";
64-
[_randompos, _radius] execvm "createopteam.sqf";
65-
66-
_group = createGroup east;
58+
sleep 1;
59+
[_missionpos, 15] execvm "createoppatrol.sqf"; // <-- around target
60+
[_randompos, _radius] execvm "createoppatrol.sqf";
61+
[_randompos, _radius] execvm "createopteam.sqf";
62+
63+
_group = createGroup east;
6764
_unit = _group createUnit ["O_Soldier_SL_F", _missionpos, [], 0, "FORM"];
6865
_unit = _group createUnit ["O_Soldier_LAT_F", _missionpos, [], 0, "FORM"];
6966
_unit = _group createUnit ["O_soldier_F", _missionpos, [], 0, "FORM"];

‎source/missions/missions/target/mission.sqf‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ _randompos = [(_missionpos select 0)+(random _radius)-(random _radius), (_missio
66
// CREATE NAME
77
_mission_name = MissionNameCase2;
88

9-
109
// CREATE MARKER (ICON)
1110
_markername = format["target%1%2",round(_randompos select 0),round(_randompos select 1)]; // Define marker name
1211
_markerstr = createMarker [str(_markername), _randompos];
@@ -26,12 +25,12 @@ str(_markername2) setMarkerSize [_radius, _radius];
2625
str(_markername2) setMarkerAlpha 0.5;
2726

2827
// CREATE PATROLS
29-
sleep 1;
30-
[_missionpos, 15] execvm "createoppatrol.sqf"; // <-- around target
31-
[_randompos, _radius] execvm "createoppatrol.sqf";
32-
[_randompos, _radius] execvm "createoppatrol.sqf";
33-
[_randompos, _radius] execvm "createopteam.sqf";
34-
"O_MRAP_02_F" createVehicle ([(_missionpos select 0)+(random 10),(_missionpos select 1)+(random 10)]);
28+
sleep 1;
29+
[_missionpos, 15] execvm "createoppatrol.sqf"; // <-- around target
30+
[_randompos, _radius] execvm "createoppatrol.sqf";
31+
[_randompos, _radius] execvm "createoppatrol.sqf";
32+
[_randompos, _radius] execvm "createopteam.sqf";
33+
"O_MRAP_02_F" createVehicle ([(_missionpos select 0)+(random 10),(_missionpos select 1)+(random 10)]);
3534

3635
_group = createGroup east;
3736
_target = _group createUnit ["O_officer_F", _missionpos, [], 0, "FORM"];
@@ -44,10 +43,7 @@ _taskhandle setSimpleTaskDescription ["A high enemy target has been spotted some
4443
_taskhandle setSimpleTaskDestination (getMarkerPos str(_markername));
4544

4645
if (!ismultiplayer) then {
47-
enableSaving true;
48-
sleep 0.1;
49-
saveGame;
50-
enableSaving false;
46+
execVM "utilities\autoSave.sqf";
5147
};
5248

5349
["TaskAssigned",["",_mission_name]] call bis_fnc_showNotification;

‎source/missions/missions/underwater/mission.sqf‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ _randompos = [(_missionpos select 0)+(random _radius)-(random _radius), (_missio
66
// CREATE NAME
77
_mission_name = MissionNameCase5;
88

9-
109
// CREATE MARKER (ICON)
1110
_markername = format["sabot%1%2",round(_randompos select 0),round(_randompos select 1)]; // Define marker name
1211
_markerstr = createMarker [str(_markername), _randompos];
@@ -28,22 +27,15 @@ str(_markername2) setMarkerAlpha 0.3;
2827
_tower = createVehicle ["Land_dp_transformer_F", _MissionPos, [], 0, "NONE"];
2928
_tower addaction ["Sabotage", "missions\missions\sabotage\success.sqf",[_missionPos,_mission_name,_markername,_markername2]];
3029

31-
32-
3330
// TASK AND NOTIFICATION
3431
_VARtaskgeneratedName = format["tsksabot%1%2",round(_MissionPos select 0),round(_Missionpos select 1)]; // generate variable name for task
3532

36-
37-
3833
_taskhandle = player createSimpleTask ["taskSabot"];
3934
_taskhandle setSimpleTaskDescription ["The enemy is using a power supply somewhere in this area. We need you to find it and sabotage it. It will allow us to have a bit of better intel on our enemies.",_mission_name,""];
4035
_taskhandle setSimpleTaskDestination (getMarkerPos str(_markername));
4136

4237
if (!ismultiplayer) then {
43-
enableSaving true;
44-
sleep 0.1;
45-
saveGame;
46-
enableSaving false;
38+
execVM "utilities\autoSave.sqf";
4739
};
4840

4941
["TaskAssigned",["",_mission_name]] call bis_fnc_showNotification;
@@ -52,9 +44,9 @@ call compile format ["%1 = _taskhandle",_VARtaskgeneratedName]; // create variab
5244

5345

5446
// CREATE OPFOR PATROLS
55-
sleep 1;
56-
[_randompos, _radius] execvm "createoppatrol.sqf";
57-
[_randompos, _radius] execvm "createoppatrol.sqf";
58-
[_missionpos, 15] execvm "createoppatrol.sqf"; // <-- around target
47+
sleep 1;
48+
[_randompos, _radius] execvm "createoppatrol.sqf";
49+
[_randompos, _radius] execvm "createoppatrol.sqf";
50+
[_missionpos, 15] execvm "createoppatrol.sqf"; // <-- around target
5951
sleep 10;
60-
[_missionpos, 15] execvm "createoppatrol.sqf"; // <-- around target
52+
[_missionpos, 15] execvm "createoppatrol.sqf"; // <-- around target

‎source/utilities/autoSave.sqf‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// Super simple auto-save script.
2+
enableSaving true;
3+
sleep 0.1;
4+
saveGame;
5+
enableSaving false;

0 commit comments

Comments
 (0)