Commit Graph

90 Commits

Author SHA1 Message Date
d7d6eb05e3 Merge branch 'master' into cookoff-tracer 2024-06-05 22:03:39 +02:00
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
06f47e600d Cookoff - Change cook-off fire damage (#9991)
Increase cookoff fire damage
2024-06-05 06:22:09 -07:00
87c876e663 Update fnc_handleDamageBox.sqf 2024-05-29 16:51:12 +02:00
be77ef233e Cookoff - Delay full vehicle destruction (#9061)
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-05-24 20:06:33 -03:00
51c7a0f9b8 Update fnc_handleDamageBox.sqf 2024-05-09 10:29:00 +02:00
24d49d106f Update fnc_handleDamageBox.sqf 2024-04-03 00:46:12 +02:00
9cd62fcc7f Update fnc_handleDamageBox.sqf 2024-04-03 00:38:46 +02:00
e06c6f7835 General - Replace toLower with toLowerANSI where applicable (#9790)
* General - Replace toLower with toLowerANSI where applicable

* whoops

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

* Update addons/repair/functions/fnc_setHitPointDamage.sqf

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

* Update addons/repair/dev/draw_showRepairInfo.sqf

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

* Update addons/tagging/XEH_preStart.sqf

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

* Update addons/vehicle_damage/functions/fnc_handleCookoff.sqf

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

* Update addons/tagging/XEH_preStart.sqf

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

* comparment -> compartment

* Update fnc_showHud.sqf

* Update fnc_registerObjects.sqf

* Update addons/common/functions/fnc_cbaSettings_settingChanged.sqf

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-03-07 22:08:13 +01:00
cc06b37f47 Removed GVAR(enable), added GVAR(enableFire) back 2024-02-14 10:03:03 +01:00
07b73c9a55 Update fnc_cookOff.sqf 2024-02-13 01:41:58 +01:00
bdb33d4dac Fixed brackets 2024-02-13 01:39:14 +01:00
2cdc40a958 Converted enable setting to bool 2024-02-13 01:34:58 +01:00
0663bd16c9 Added incendiary rounds as source of box cookoff 2024-02-11 11:20:01 +01:00
e541b337c5 Fixed objects not being able to cook-off again 2024-02-08 13:08:45 +01:00
0deada7a3d Prevent double ammo detonation 2024-02-07 17:58:59 +01:00
d277fa9f67 Tweaks 2024-02-06 10:32:13 +01:00
51aa46c81f Separate effect handling 2024-02-06 01:06:30 +01:00
a3aef6a066 General - Cleanup spaces in macros (#9769)
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2024-02-05 14:04:24 -03:00
ed4cea6c4a Various improvements 2024-02-05 17:31:27 +01:00
16ffa2f26c Update fnc_getVehicleAmmo.sqf 2024-02-04 14:38:18 +01:00
c927c0e05c Merged main 2024-02-04 10:52:44 +01:00
2a6fd19762 Cookoff - Improve ammo detonation sounds (#5327)
* initital commit

* use Define for SOS

* fix some issues that got introduced in 1.70

* Prepare config for sounds

* add New Sounds 

improve distanced volume values

* add LAxemann to Author

* add Object Pooling

improve Distances

* fix small mistake

* change pool clearing timing

* change pool wait time

* fix Cookoff sound cleanup

* change to Jonpas Method

change random Distance add

* improve sound Volume over Distance (asked by Bux)

improve mid sounds

* improve a calculation

* Use playSound3D locally

* Make sounds configurable by 3rd party mods

* Added comments, used macros

* Update CfgSounds.hpp

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-02-04 01:36:59 -08:00
26f73e1a98 Update fnc_detonateAmmunition.sqf 2024-02-03 23:48:44 +01:00
c0a951491b Better engine fire placement 2024-02-03 19:23:49 +01:00
e52990d52a Update fnc_getVehicleAmmo.sqf 2024-02-03 17:51:05 +01:00
d7dafa4d40 More changes 2024-02-03 17:48:54 +01:00
4f33c32ba9 Cook-off improvements 2024-01-27 09:14:10 +01:00
03c7c4e97f Cookoff - Minor improvement to Fire integration (#8751)
Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-14 20:53:33 +00:00
742626ff1a General - Relative script_component.hpp includes (#9378)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-12 20:58:10 +02:00
2709490efd Cookoff - Move canHaveFireJet logic into vehicle_damage (#9060)
* Moved ace_cookoff_canHaveFireJet config logic into vehicle_damage as a param passed into cookoff to improve modularity

* Use original arg order

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-08-23 12:37:17 -05:00
e47e18001f Docs - Update my display name everywhere (#9330)
* Update display name in team

* Update display name everywhere

* order

https://youtu.be/VYycQTm2HrM

---------

Co-authored-by: BrettMayson <brett@mayson.io>
2023-08-17 12:02:17 +02:00
ef23310aec Docs - Change name (again) (#9328) 2023-08-16 19:18:01 -04:00
eb53e7a2fe Tools - document_functions.py: handle header sub indexs for arguments (#9303)
* tools - handle header sub indexs for arguements

* convert remaining

* Update coding-guidelines.md
2023-08-08 22:51:20 -05:00
aa21ba50a9 Cookoff - Improve destroying vehicle post cookoff (#9029)
* Have vehicle explode when cookoff completes

* Adjust strings

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-06-25 01:06:26 -03:00
2092d4fd71 Cookoff - Remove flares from cookoff (#9146)
* Framework for removing flares

* Seperate fnc and strings etc

* Improvements from @mharis001

* Fix incorrect header fnc

* Clean-up return

* Remove setting
2023-03-18 14:24:27 -05:00
8e06f2ec6b Cookoff - Tweaked effects cleanup to add Deleted EH globally and trigger a local cleanup event (#9000) 2022-08-20 16:38:06 -05:00
36442d34cd Cookoff - Fix smoke effects not getting cleaned up (#8933)
* Cookoff: Added handling for cleaning up smoke effects when vehicle is deleted mid-cookoff

* Cookoff - Prevent effects cleanup Deleted EH from getting duplicated

* Cookoff - Added locality safety check to effects cleanup

* Cookoff -  Global effects cleanup is now triggered by the server to handle locality transfer
2022-07-15 15:59:49 +01:00
654e4c1b7d Cookoff - Add ability to disable fire jet effect in configs (#8953)
* Cookoff: Add ability to disable fire jet effect for vehicles it doesn't make sense on

* Cookoff: Fixed pressure jet sound playing when both jet and ring effects are disabled
2022-07-01 17:20:31 +01:00
d8af7b34b7 Cookoff - Fix ammo not being removed from turrets with additional FFV (#8928) 2022-06-06 13:50:53 +02:00
3f7530d89e Cookoff - Add setting to destroy vehicle after cooking off (#8734)
* Add setting to destroy vehicle after cooking off

* Update stringtable.xml

* Update stringtable.xml

* Update addons/cookoff/stringtable.xml

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

* Update addons/cookoff/stringtable.xml

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

* Update initSettings.sqf

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2022-05-31 15:50:55 +02:00
da1c5d3b21 Cookoff - Adds heating effect to cookoff (#8685)
* Adds heating effect to cookoff 

Makes tanks that cook-off actually heat up on IR.

* Adds cbaEvent 'setTIPars'

* Adds CBAEvent call in cookOff.sqf

* Spaces out line. Adds proper event heading.

* Moves TI event to cookOffEffect.sqf;

* Update addons/cookoff/functions/fnc_cookOffEffect.sqf

Co-authored-by: pterolatypus <pterolatypus@users.noreply.github.com>

* Changes global event for TI pars to local command

* Reverts file to before previous commits in PR.

* Update addons/cookoff/functions/fnc_cookOffEffect.sqf

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

* Update addons/cookoff/functions/fnc_cookOffEffect.sqf

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

* Update addons/cookoff/XEH_postInit.sqf

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

* ti params and add comments to formula

Co-authored-by: pterolatypus <pterolatypus@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2022-05-17 12:09:10 -05:00
38b4de9382 Cookoff - fix locality of fire_removeFireSource event (#8907) 2022-05-13 19:54:09 -05:00
df40f63b5f Cookoff - Fix invalid function name in example (#8808) 2022-02-01 13:54:01 -06:00
7958f1dd9b change name (#8805) 2022-01-30 11:54:30 -06:00
af86109c2b General - Utilize isNotEqualTo command (#8732)
* Utilize isNotEqualTo command

* fix pr validation
2021-12-18 17:15:32 -06:00
f75bfd4cef Cookoff - Limit maximum cook intensity/duration (#8648) 2021-11-11 12:43:41 +01:00
7bc6fdfa66 Cleanup - Trim all trailing whitespace (#8651) 2021-10-30 16:42:03 -05:00
58f43288ab Cookoff - Fix enable setting (#8649) 2021-10-29 17:20:02 -05:00
e7d08788c0 readd settings to enable for player vehicles (#8611) 2021-10-27 13:05:55 -05:00