Skip to content

Commit 187c423

Browse files
authored
Various improvements (#158)
1 parent 2f49eff commit 187c423

File tree

5 files changed

+301
-100
lines changed

5 files changed

+301
-100
lines changed

Olympus.Stratis/functions/fn_rangeMachineGunTargetGroups.sqf

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,17 @@
1515

1616
#define TARGET_GROUP_1 rangeMachineGunTarget01, rangeMachineGunTarget02
1717
#define TARGET_GROUP_2 rangeMachineGunTarget03, rangeMachineGunTarget04
18-
#define TARGET_GROUP_3 rangeMachineGunTarget05, rangeMachineGunTarget06, rangeMachineGunTarget07, rangeMachineGunTarget08
19-
#define TARGET_GROUP_4 rangeMachineGunTarget09, rangeMachineGunTarget10, rangeMachineGunTarget11
20-
#define TARGET_GROUP_5 rangeMachineGunTarget12, rangeMachineGunTarget13, rangeMachineGunTarget14, rangeMachineGunTarget15
21-
#define TARGET_GROUP_6 rangeMachineGunTarget16, rangeMachineGunTarget17, rangeMachineGunTarget18, rangeMachineGunTarget19, rangeMachineGunTarget20, rangeMachineGunTarget21, rangeMachineGunTarget22, rangeMachineGunTarget23, rangeMachineGunTarget24
22-
#define TARGET_GROUP_7 rangeMachineGunTarget25, rangeMachineGunTarget26, rangeMachineGunTarget27, rangeMachineGunTarget28, rangeMachineGunTarget29, rangeMachineGunTarget30
23-
#define TARGET_GROUP_8 rangeMachineGunTarget31, rangeMachineGunTarget32, rangeMachineGunTarget33, rangeMachineGunTarget34, rangeMachineGunTarget35
24-
#define TARGET_GROUP_9 rangeMachineGunTarget36, rangeMachineGunTarget37, rangeMachineGunTarget38, rangeMachineGunTarget39, rangeMachineGunTarget40
18+
#define TARGET_GROUP_3 rangeMachineGunTarget12, rangeMachineGunTarget13, rangeMachineGunTarget14, rangeMachineGunTarget15
19+
#define TARGET_GROUP_4 rangeMachineGunTarget41, rangeMachineGunTarget42
20+
#define TARGET_GROUP_5 rangeMachineGunTarget09, rangeMachineGunTarget10, rangeMachineGunTarget11
21+
#define TARGET_GROUP_6 rangeMachineGunTarget05, rangeMachineGunTarget06, rangeMachineGunTarget07, rangeMachineGunTarget08
22+
#define TARGET_GROUP_7 rangeMachineGunTarget16, rangeMachineGunTarget17, rangeMachineGunTarget18, rangeMachineGunTarget19, rangeMachineGunTarget20, rangeMachineGunTarget21, rangeMachineGunTarget22, rangeMachineGunTarget23, rangeMachineGunTarget24
23+
#define TARGET_GROUP_8 rangeMachineGunTarget25, rangeMachineGunTarget26, rangeMachineGunTarget27, rangeMachineGunTarget28, rangeMachineGunTarget29, rangeMachineGunTarget30
24+
#define TARGET_GROUP_9 rangeMachineGunTarget31, rangeMachineGunTarget32, rangeMachineGunTarget33, rangeMachineGunTarget34, rangeMachineGunTarget35
25+
#define TARGET_GROUP_10 rangeMachineGunTarget36, rangeMachineGunTarget37, rangeMachineGunTarget38, rangeMachineGunTarget39, rangeMachineGunTarget40
2526

26-
#define ALL_TARGETS TARGET_GROUP_1, TARGET_GROUP_2, TARGET_GROUP_3, TARGET_GROUP_4, TARGET_GROUP_5, TARGET_GROUP_6, TARGET_GROUP_7, TARGET_GROUP_8, TARGET_GROUP_9
27-
#define ALL_TARGET_GROUPS [[ALL_TARGETS], [ALL_TARGETS], [TARGET_GROUP_1], [TARGET_GROUP_2], [TARGET_GROUP_3], [TARGET_GROUP_4], [TARGET_GROUP_5], [TARGET_GROUP_6], [TARGET_GROUP_7], [TARGET_GROUP_8], [TARGET_GROUP_9]]
27+
#define ALL_TARGETS TARGET_GROUP_1, TARGET_GROUP_2, TARGET_GROUP_3, TARGET_GROUP_4, TARGET_GROUP_5, TARGET_GROUP_6, TARGET_GROUP_7, TARGET_GROUP_8, TARGET_GROUP_9, TARGET_GROUP_10
28+
#define ALL_TARGET_GROUPS [[ALL_TARGETS], [ALL_TARGETS], [TARGET_GROUP_1], [TARGET_GROUP_2], [TARGET_GROUP_3], [TARGET_GROUP_4], [TARGET_GROUP_5], [TARGET_GROUP_6], [TARGET_GROUP_7], [TARGET_GROUP_8], [TARGET_GROUP_9], [TARGET_GROUP_10]]
2829

2930
// Default targets down
3031
{
@@ -62,8 +63,9 @@ params ["_controller"];
6263
[QGVAR(group3up), "Right 1", 0],
6364
[QGVAR(group4up), "Right 2", 0],
6465
[QGVAR(group5up), "Right 3", 0],
65-
[QGVAR(group6up), "Vehicles", 0],
66-
[QGVAR(group7up), "Beach", 0],
67-
[QGVAR(group8up), "Flanking Fire", 0],
68-
[QGVAR(group9up), "Enfilading Fire", 0]
66+
[QGVAR(group6up), "Right 4", 0],
67+
[QGVAR(group7up), "Vehicles", 0],
68+
[QGVAR(group8up), "Beach", 0],
69+
[QGVAR(group9up), "Flanking Fire", 0],
70+
[QGVAR(group10up), "Enfilading Fire", 0]
6971
];

Olympus.Stratis/functions/fn_vehicleSpawner.sqf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ private _groundVehicles = [
2222
"tacs_Arcadian_B_Black",
2323
"tacs_Arcadian_B_Green",
2424
"tacs_Arcadian_B_Tan",
25-
"B_LSV_01_unarmed_F",
25+
"tacs_Polaris_B_Black",
2626
"C_SUV_01_F",
2727
"C_Offroad_01_F",
2828
"C_Offroad_01_covered_F",

0 commit comments

Comments
 (0)