Commit Graph

99 Commits

Author SHA1 Message Date
johnb432
8fc093de8f
Grenades - Code cleanup (#9979)
* Improved various aspects of grenades

* Update addons/grenades/functions/fnc_flashbangExplosionEH.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Update addons/grenades/functions/fnc_incendiary.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Update addons/grenades/functions/fnc_incendiary.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Update fnc_flashbangExplosionEH.sqf

* More cleanup

* Update fnc_incendiary.sqf

* Update fnc_incendiary.sqf

* Update fnc_flashbangThrownFuze.sqf

* Update fnc_flashbangThrownFuze.sqf

* Update addons/grenades/functions/fnc_nextMode.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Update addons/grenades/functions/fnc_flashbangExplosionEH.sqf

* Update addons/grenades/functions/fnc_incendiary.sqf

* Removed fix that is included in another PR

* Update fnc_incendiary.sqf

* Messed up merge conflict resolution

---------

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-06-18 01:05:01 -07:00
Grim
95b7951919
General - Use variable for checking if medical is enabled (#10063) 2024-06-18 00:07:38 +00:00
johnb432
421071027e
Common - Add wheel hitpoint function (#10075)
* Add wheel hitpoint function

* Moved cache to missionNamespace
2024-06-17 10:31:35 -07:00
johnb432
34362d48eb
Grenades - Fix incendiary grenades damaging invulnerable objects (#10068)
Disable damage from incendiaries when object is invulnerable
2024-06-13 09:49:31 -07:00
johnb432
9760095c42
Grenades - Fix how incendiary grenades do damage to vehicles (#9983)
* Allow incendiary grenades to damage multiple vehicles

Disable incendiaries damaging invulnerable vehicles

* Apply fire damage to vehicles even after grenade detonation

* Update fnc_damageEngineAndWheels.sqf

* Update fnc_incendiary.sqf

* Update fnc_damageEngineAndWheels.sqf

* british people don't exist

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-06-11 07:59:36 -07:00
johnb432
c44a1e7ea7
Cookoff - Mini-Rewrite (#9758)
* Cook-off improvements

* More changes

* Update fnc_getVehicleAmmo.sqf

* Better engine fire placement

* Update fnc_detonateAmmunition.sqf

* Update XEH_postInit.sqf

* Update fnc_getVehicleAmmo.sqf

* Update events-framework.md

* Various improvements

* Separate effect handling

* Tweaks

* Update XEH_postInit.sqf

* Prevent double ammo detonation

* Fixed objects not being able to cook-off again

* Added incendiary rounds as source of box cookoff

* Converted enable setting to bool

* Fixed brackets

* Update fnc_cookOff.sqf

* Update CfgEden.hpp

* Removed GVAR(enable), added GVAR(enableFire) back

* Update initSettings.inc.sqf

* Update events-framework.md

* Update addons/cookoff/functions/fnc_cookOffEffect.sqf

* Restructured, redid API events

* Fix effect for JIP, minor optimisations

* Removed `cbaSettings_settingChanged`

* Renamed variables, tweaked string table entries

* Update fire damage #9991

* Capitalize comments again

* Fix cookoff for very short durations and fix effect removal being too quick
2024-06-05 12:36:39 -07:00
johnb432
be9797d11d
Grenades - Add grenade rolling (#10005)
* Add grenade rolling

* Added some safeguards

* Use `setVectorDirAndUp` instead of rotation

* Don't allow players to roll grenades when in vehicles

* Grenades - Rolling only add PFEH when needed (#10015)

* Grenades - Rolling only add PFEH when needed

* Corrected minor typo, moved variable init in preInit, fixed bugs

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Don't switch modes if grenade can't be thrown

* Minor tweaks

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-05-27 02:19:52 -07:00
johnb432
67fe22a5a6
Grenades - Make flashbang detonation sound configurable via config (#9985)
* Added configurable flashbang detonation sound

Updated documentation by filling missing information in

* Update grenades-framework.md

* Update grenades-framework.md
2024-05-22 13:38:59 -07:00
johnb432
99d7e4d57b
Grenades - Add 3 more sounds to flashbang detonations (#9982)
* Add 3 more sounds to flashbang detonations

* Update addons/grenades/functions/fnc_flashbangThrownFuze.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-05-21 20:24:50 -05:00
johnb432
0f5b7c8762
Grenades - Fix unconscious AI being affected by flashbangs (#9978)
* Stop players being affected by AI flashbang code

* Stop affecting unconscious AI

* Update fnc_flashbangExplosionEH.sqf
2024-04-28 21:49:36 -05:00
johnb432
7c4f4cf8f8
Grenades - Fix flashbangs causing pain for invulnerable units (#9981)
Disable flashbang pain for invulnerable units
2024-04-28 09:07:15 -07:00
johnb432
8f46ffd8d5
General - Change count to forEach where appropriate (#9890)
count -> forEach

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-04-04 08:15:26 -03:00
Mike-MF
de106c3418
Grenades - Fix Flashbang in epilepsy mode (#9855)
Fix Flashbang in epilepsy mode
2024-03-17 04:47:24 -07:00
BrettMayson
1002dfe31b
Grenades - Flashbang events (#9796) 2024-02-12 14:01:24 -03:00
PabstMirror
a3aef6a066
General - Cleanup spaces in macros (#9769)
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2024-02-05 14:04:24 -03:00
johnb432
8ca5263f18
Common - Make FUNC(isModLoaded) case-insensitive (#9704)
* Update fnc_isModLoaded.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Update fnc_isModLoaded.sqf

---------

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-12-31 17:45:01 -08:00
Will/KJW
51e6134b71
Grenades - Improve flashbang sound (#9415) 2023-09-22 18:08:34 +02:00
jonpas
742626ff1a
General - Relative script_component.hpp includes (#9378)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-12 20:58:10 +02:00
GhostIsSpooky
f85ed213c5
Grenades - Add fire source to incendiary grenades (#8756)
* add fire source to incendiary grenade

* improvide fire source condition

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2022-03-08 21:52:07 -06:00
GhostIsSpooky
9ff5d34ce7
Common - Add cache to fnc_isModLoaded (#8794)
* add isModLoaded cache

* add missing brackets

* missed one

* Update fnc_handlePunjiTrapDamage.sqf

* Update fnc_isModLoaded.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-01-30 11:56:20 -06:00
Brett
3c1c081239
Grenades - Flashbang reaction fixes (#8485)
* flashbang reaction debounce

* fix skill reduction

* store flash strength

* Update addons/grenades/functions/fnc_flashbangExplosionEH.sqf

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>

* Update addons/grenades/functions/fnc_flashbangExplosionEH.sqf

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>

* Update addons/grenades/functions/fnc_flashbangExplosionEH.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-11-05 13:01:01 -05:00
PabstMirror
7bc6fdfa66
Cleanup - Trim all trailing whitespace (#8651) 2021-10-30 16:42:03 -05:00
BaerMitUmlaut
8d804cf76d
Common - Add epilepsy friendly mode (#8452)
* Add epilepsy friendly mode

* Disable LSD vehicles in epilepsy friendly mode
2021-10-05 12:29:22 -05:00
Neviothr
75f7ed7532
Utilize isNotEqualTo (#7929)
* Utilize isNotEqualTo

* undo changes to some files

* redo some changes, fix based on @Vdauphin 's comment

* fix validator issues

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-02-27 11:05:05 -06:00
PabstMirror
e8693c8db9
Various - Use configOf command for faster lookup (#8100)
* configOf

* replace some use of CBA_fnc_getObjectConfig
2021-02-18 12:58:08 -06:00
Cyruz143
8eccabbc0a
Grenades - Use fnc_addToInventory (#8016)
* Try and put converted item back in the same container

* Update addons/grenades/functions/fnc_addChangeFuseItemContextMenuOptions.sqf

Co-authored-by: Dystopian <sddex@ya.ru>

* Update addons/grenades/functions/fnc_addChangeFuseItemContextMenuOptions.sqf

Co-authored-by: Dystopian <sddex@ya.ru>

* Less hacky handling of container names

* Return value convention

Co-authored-by: Dystopian <sddex@ya.ru>
2020-12-21 00:15:46 +01:00
Cyruz143
b21535665b
Grenades - Add throwable explosive charges (#7860)
* First pass on adding throwable explosives

* Moved fnc call to postinit

* Disabled gits auto CRLF bs

* Changing fnc name and call

* Move names to string table

* Using vanilla icon and removing explosive depend

* More stringtable conversions

* Missing semi-colons causing RPT error

* Update addons/grenades/stringtable.xml

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Remove empty strings

* Update addons/grenades/stringtable.xml

Co-authored-by: Elgin675 <elgin675@hotmail.com>

* Add compatibility with "realistic names" modules, and add french translation

* Fix little mistake

* Update addons/grenades/stringtable.xml

Co-authored-by: Elgin675 <elgin675@hotmail.com>

* Add setting

* Change setting name, use ace_settingsInitialized

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Elgin675 <elgin675@hotmail.com>
2020-08-24 12:45:56 -05:00
Blutze
217ccce465
Grenades - use correct type for cookoff_enabled, check for AI and variable on vehicle (#7634)
* check for variable and ai, use correct type

* clean up negations

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2020-04-19 11:30:02 -05:00
BaerMitUmlaut
3bc727f960
Grenades - Make flashbang reaction more authentic (#6034) 2020-02-22 21:36:25 +01:00
PabstMirror
7a62e96945
Grenades - Don't flashbang spectators (#7029) 2019-06-03 09:44:17 -05:00
Oliver Blanthorn
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
Jo David
4ba5a3954e Remove Redundancy in flashbangExplosionEh (#6749) 2018-12-29 11:29:29 -06:00
Jo David
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
Dedmen Miller
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
commy2
66fc592dbe
destruction vs effect 2017-12-31 13:36:55 +01:00
commy2
ed97be0e06
radius vs area 2017-12-31 13:33:42 +01:00
JoramD
fcba14ef71 Tweaked affected area for objects 2017-12-24 12:06:18 +01:00
JoramD
f0eb7dd479 Tweaked effect size of AN-M14 2017-12-24 11:30:02 +01:00
SilentSpike
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
commy2
8822cb1b90 emulate frag grenade ai behaviour for incendiaries (#4534) 2016-10-11 19:04:08 +02:00
Glowbal
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
PabstMirror
32b7ef7b85 Skip incindinary effects if projectile is null 2016-09-17 13:09:03 -05:00
commy2
3cea9e727d fix a comment 2016-09-16 14:00:43 +02:00
commy2
d200eadb46 incendiary and cookoff improvements 2016-09-16 13:08:19 +02:00
PabstMirror
1a4ed7b7b4 Grenades - disable throw mode / keybind if advThrow (#4350) 2016-09-06 21:54:42 +02:00
commy2
5b3d424509 always destroy engine, effect only requires cookoff 2016-08-13 12:44:38 +02:00
commy2
d0d407a2c5 only do engine burning effect if cookoff is enabled 2016-08-13 12:39:52 +02:00
commy2
9a93dffc3b port A2 incendiary grenades 2016-08-13 11:49:36 +02:00
voiper
f28f90b624 Use isEqualTo. 2016-06-16 12:21:40 -07:00
voiper
3070b2ac6e Sounds are sourced from configs.
Used impactGroundSoft[] as shortcut.
2016-06-15 18:16:28 -07:00