Commit Graph

71 Commits

Author SHA1 Message Date
3bc727f960 Grenades - Make flashbang reaction more authentic (#6034) 2020-02-22 21:36:25 +01:00
7a62e96945 Grenades - Don't flashbang spectators (#7029) 2019-06-03 09:44:17 -05:00
c012941af0 Add support for N-bangs (#6848)
* Add support for multi-bang flashbangs

It also adds some randomness to 1-bangs as a side effect,
but I don't think that's a big deal.

Also adds flashbang documentation to wiki.

* Increase rate at which flashbang attenuates

Apologies for the magic numbers. I just tested a few out
until I was happy with the result. The radius could probably
afford to be reduced a little further.

* use max deviation in config, fix wiki file name
2019-05-11 23:43:32 -05:00
4ba5a3954e Remove Redundancy in flashbangExplosionEh (#6749) 2018-12-29 11:29:29 -06:00
cf1910eb79 Changed: Remove ear ringing from flashbang explosions when wearing protective gear (e.g. ComTacs) (#6746)
* Remove ear ringing from flashbangs when wearing protective gear, reduce strength by damageCoefficent
2018-12-28 14:46:13 +01:00
e2ac18a05d [WIP] Fix script errors reporting wrong line numbers (#6407)
* advanced_ballistics

* advanced_fatigue

* advanced_throwing

* ai

* aircraft

* arsenal

* atragmx

* attach

* backpacks

* ballistics

* captives

* cargo

* chemlights

* common

* concertina_wire

* cookoff

* dagr

* disarming

* disposable

* dogtags

* dragging

* explosives

* fastroping

* fcs

* finger

* frag

* gestures

* gforces

* goggles

* grenades

* gunbag

* hearing

* hitreactions

* huntir

* interact_menu

* interaction

* inventory

* kestrel4500

* laser

* laserpointer

* logistics_uavbattery

* logistics_wirecutter

* magazinerepack

* map

* map_gestures

* maptools

* markers

* medical

* medical_ai

* medical_blood

* medical_menu

* microdagr

* minedetector

* missileguidance

* missionmodules

* mk6mortar

* modules

* movement

* nametags

* nightvision

* nlaw

* optics

* optionsmenu

* overheating

* overpressure

* parachute

* pylons

* quickmount

* rangecard

* rearm

* recoil

* refuel

* reload

* reloadlaunchers

* repair

* respawn

* safemode

* sandbag

* scopes

* slideshow

* spectator

* spottingscope

* switchunits

* tacticalladder

* tagging

* trenches

* tripod

* ui

* vector

* vehiclelock

* vehicles

* viewdistance

* weaponselect

* weather

* winddeflection

* yardage450

* zeus

* arsenal defines.hpp

* optionals

* DEBUG_MODE_FULL 1

* DEBUG_MODE_FULL 2

* Manual fixes

* Add SQF Validator check for #include after block comment

* explosives fnc_openTimerUI

* fix uniqueItems
2018-09-17 14:19:29 -05:00
66fc592dbe destruction vs effect 2017-12-31 13:36:55 +01:00
ed97be0e06 radius vs area 2017-12-31 13:33:42 +01:00
fcba14ef71 Tweaked affected area for objects 2017-12-24 12:06:18 +01:00
f0eb7dd479 Tweaked effect size of AN-M14 2017-12-24 11:30:02 +01:00
b1f5caacbb Improve cook off settings UX (#5351)
* Improve cookoff setting UX

- Adds second eden attribute to boxes/vehicles to toggle the ammunition
  cookoff itself
- Removes the cookoff toggle from boxes (they only care about ammunition
  cookoff)

* Fix attribute default values

* Update incendiary box ignition code
2017-12-06 13:13:10 -06:00
8822cb1b90 emulate frag grenade ai behaviour for incendiaries (#4534) 2016-10-11 19:04:08 +02:00
059980b1a5 Add ammo cookoff (#4376)
* Add Ammo cookoff

* Remove tabs

* Add initial ammo box cook-off

Does not include a fire effect, mostly just a proof of concept.

Should probably also add further potential cook-off conditons (if hit by tracer for example).

* Add burning effects to ammo box cook off

- Add burning effect while ammo box is cooking off
- Add setting to enable/disable ammo boxes cooking off
- Clear magazine cargo while box is burning

Currently the box will burn for 60 seconds hardcoded, this is to allow time for the ammunition to cook off (since boxes sink into the ground and dissapear when destroyed). Perhaps we can implement a way to burn until all ammo is expended.

* Improve ammo cookoff

* Integrate ammo cookoff with the incendiary grenade

* Disable ammo cook off underwater

* Optimize fnc_detonateAmmunition

I say optimize, the only real performance optimization is using `vectorMultiply`. The rest is readability optimization though!

* Improve ammo box cook off

- Remove unnecessary light source (fire particles provide lighting)
- Add randomness to cook off time
- Cook off begins with fire effect rather than smoke

* Add tracer induced ammo box cook off

Due to limitations in the way arma handles tracer rounds (there's no way to check if an individual projectile is a tracer), only magazines with a high enough tracer density (at least 1 in 4) can cause cook off this way. However this is deemed an acceptable approximation since the chance of this happening should be quite low anyway.

* Decrease amount of explosions from ammo cookoff

* Add is local check for remote event
2016-10-06 22:37:38 +02:00
32b7ef7b85 Skip incindinary effects if projectile is null 2016-09-17 13:09:03 -05:00
3cea9e727d fix a comment 2016-09-16 14:00:43 +02:00
d200eadb46 incendiary and cookoff improvements 2016-09-16 13:08:19 +02:00
1a4ed7b7b4 Grenades - disable throw mode / keybind if advThrow (#4350) 2016-09-06 21:54:42 +02:00
5b3d424509 always destroy engine, effect only requires cookoff 2016-08-13 12:44:38 +02:00
d0d407a2c5 only do engine burning effect if cookoff is enabled 2016-08-13 12:39:52 +02:00
9a93dffc3b port A2 incendiary grenades 2016-08-13 11:49:36 +02:00
f28f90b624 Use isEqualTo. 2016-06-16 12:21:40 -07:00
3070b2ac6e Sounds are sourced from configs.
Used impactGroundSoft[] as shortcut.
2016-06-15 18:16:28 -07:00
b45a17001c Merge remote-tracking branch 'origin/master' into grenadesounds 2016-06-12 14:54:14 -07:00
38b98802de Add grenade, chemlight, and handflare priming sounds.
Remove default clinking sounds.
2016-06-07 17:22:48 -07:00
26fbc36cab Merge branch 'master' into cbaEventSystem 2016-05-31 22:36:08 +02:00
b54d1985f1 QGVAR and fix gforces, goggles, grenades, hearing, interact_menu 2016-05-25 01:57:41 +02:00
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +01:00
108ff4f644 Replace ACE event system calls with CBA counterparts
Regex used:

\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent

E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event

E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
2016-05-22 16:47:39 +01:00
e7dbcd7b58 Replace delayed execution functions with new CBA counterparts 2016-05-22 15:29:01 +02:00
6fd8d8da04 Merge branch 'master' into changeHearingDefaults
Conflicts:
	addons/grenades/functions/fnc_flashbangExplosionEH.sqf
2016-02-20 16:59:00 -03:00
f2566afc73 Another 5m of effect 2016-02-19 15:22:24 -03:00
b420512139 Fix reduction based on looking away from the grenade 2016-02-19 12:34:50 -03:00
9e5f52d161 Make units heavily affected by the blast turn away from the light. 2016-02-19 12:33:49 -03:00
0f7853f6c6 Increase the maximum range for blinding effect to 25m, but with a high falloff. Close #1539 2016-02-19 12:18:22 -03:00
648a0259ec Improve flashbang effects. Make sure the light effect is rendered even if the grenade explodes further than 20m from the player. Increase the amount of hearing damage. 2016-02-19 12:02:29 -03:00
8fed9325c9 Fix flashbang 2016-02-16 13:02:25 -06:00
0b9695ce70 Apply the ufeh to ACE_Grenades 2016-02-06 17:20:30 -03:00
7fc84c60dd Flashbangs - pass pos instead of obj reference
Fix #3205
2016-02-03 17:53:24 -06:00
e56e18bff3 Code cleanup 1.54 2016-01-06 22:42:02 +01:00
43a168f0b9 Flashbangs - Make event radius match effect radius 2015-12-04 15:16:17 -06:00
069169cc72 Changed ACE_time back to time in comments where appropriate 2015-10-21 22:52:21 +02:00
cd839a0ddc remove superfluous brackets 2015-09-26 22:42:47 +02:00
6cc920dc34 Code Cleanup Grenades, fix dedicated server AI thrown flasbangs do nothing 2015-09-26 22:39:12 +02:00
defbdf1b1a fix that HC throw a issue if PPEffect was used/applyed 2015-09-09 17:05:48 +02:00
fbf00b9aa5 correct comment 2015-09-03 02:55:40 +02:00
83424cdcab header for fnc_flare 2015-09-02 00:03:16 +02:00
7ce606740c make flares work in mp 2015-09-01 23:56:25 +02:00
be56fd7d46 scripted approach to hand flares, fix #1079 2015-09-01 23:19:49 +02:00
7c276d9d25 Grenade Cleanup 2015-08-14 20:25:27 -05:00
7bf7066cfd Code cleanup of grenades module. 2015-08-13 22:36:58 +02:00