Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cookoff - Fix shell detonation #6979

Merged
merged 13 commits into from
May 6, 2019
Merged

Cookoff - Fix shell detonation #6979

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
bcb4214
abc
Dec 7, 2017
91f876a
Revert "abc"
Dec 7, 2017
7fad1c3
Update to current commit
Dec 7, 2017
00ae4bb
Merge branch 'master' of https://github.com/acemod/ACE3
Feb 7, 2018
441c130
Merge branch 'master' of https://github.com/acemod/ACE3
Mar 19, 2018
839ce70
Merge branch 'master' of https://github.com/acemod/ACE3
TheCandianVendingMachine Jul 31, 2018
e00b012
Merge branch 'master' of https://github.com/acemod/ACE3
TheCandianVendingMachine Nov 30, 2018
bfeda0a
Merge branch 'master' of https://github.com/acemod/ACE3
TheCandianVendingMachine Dec 7, 2018
f77c95a
Merge branch 'master' of https://github.com/acemod/ACE3
TheCandianVendingMachine Jan 3, 2019
339388e
Merge branch 'master' of https://github.com/acemod/ACE3
TheCandianVendingMachine Jan 31, 2019
ac2b9d9
Merge branch 'master' of https://github.com/acemod/ACE3
TheCandianVendingMachine Mar 14, 2019
6a40ec3
Merge branch 'master' of https://github.com/acemod/ACE3
TheCandianVendingMachine Apr 1, 2019
74e1f1b
ShotShell requires velocity to simulate itself, so always spawn it wi…
TheCandianVendingMachine May 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/cookoff/functions/fnc_detonateAmmunition.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ if (_amountOfMagazines > 0) exitWith {
playSound3D [_sound, objNull, false, (getPosASL _vehicle), 2, 1, 1300];

if (random 1 < 0.15) then {
[_vehicle, _ammo, _speed, random 1 < 0.15] call _spawnProjectile;
[_vehicle, _ammo, _speed, true] call _spawnProjectile;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't need the _flyAway parameter in _spawnProjectile if we always set it to true.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For shotgrenade and a few others it is still randomized. See L97ff

};
};
if (toLower _simType == "shotgrenade") then {
Expand Down