Commit Graph

54 Commits

Author SHA1 Message Date
JonBons
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
JonBons
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
JonBons
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
Filip Maciejewski
d8af7b34b7
Cookoff - Fix ammo not being removed from turrets with additional FFV (#8928) 2022-06-06 13:50:53 +02:00
ZluskeN
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
LorenLuke
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
PabstMirror
38b4de9382
Cookoff - fix locality of fire_removeFireSource event (#8907) 2022-05-13 19:54:09 -05:00
Filip Maciejewski
df40f63b5f
Cookoff - Fix invalid function name in example (#8808) 2022-02-01 13:54:01 -06:00
Bailey Danyluk
7958f1dd9b
change name (#8805) 2022-01-30 11:54:30 -06:00
Serg Vergun
af86109c2b
General - Utilize isNotEqualTo command (#8732)
* Utilize isNotEqualTo command

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

* rename
2021-10-17 15:01:41 -05:00
Brandon Danyluk
c4156a6888
Add Vehicle Damage (ACE2 port) & Enhance Cook-Off (#7565)
* Initital port of ACE2 Vehicle Damage

* Add fire damage and burning people

* Migrate vehicle damge stuff from cookoff. Change cookoff function to enhance effect.

* Minor tweaks

* Add incendiary values to all applicable ammunition. Add engine fire/smoke if hit enough

* Handle car damage more elegantly.

* Added ability to create fire sources arbitrarily

* tweaks

* Add chance to detonate after cookoff

* disable compile cache

* Move blown-off turret config to vehicle damage. Add settings inititalized EH for initializing off settings

* tabs->spaces

* Various code improvements

* Change to count loop for deleting effects

* update addon requirements

* remove vanilla config requirements

* Add RHS compatability

* RHS compat. Various QOL fixes/changes

* Various tweaks to compats and code.

* High-Explosive damage tweak

* Change how penetration is calculated for parts

* Fix RHS compat

* Create setting for flare effect

* increase burning scream sounds

* swap out file name for snake_case

* move incendiary values out of vehicle damage. remove medical dependency

* vehicle_dammage - update all refs to snake

* sqf fixes

* fix fire string package caps

* fix pboprefix

* Default setting to on

* Add variables to enable/disable ring fire to avoid goofy looking vehicles. Enhance how particles are cleaned up. Remove advanced penetration simulation. Change how fire intensity is calculated. Add setting to "disable" vehicle after cookoff

* Fix bug where event handler wasn't giving the damage last.

* change to snake

* fix build errors

* Fix UBC

* Fix Order of Operations

* avoid O^2 events

* Make sure that no damage processing happens on dead units

* Change some if statements

* Keep track of player's death to stop various things

* add quotes to right middle wheen

* Add VD documentation

* fire docs

* Code quality fixes

* Clarify documentation

* define IDD

* switch global -> server

* Add newline between header and first code statement

* stop the dead from suffering

Its hard to tell when a unit is dead or in spectator, so check the config of the unit to determine it.

* Add settings to disable cook-off effects

* Delete effects if vehicle is deleted before cookoff occurs. Don't cookoff player ammo. Throw weapon better

* Move fire into own PR

* fix tabs and macro

* Shuffle crew indices so that a random person is first on the list to be injured each time

* fix effects not clearing

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-14 10:49:27 -05:00
Dystopian
98e74ab3d1
Cook off - Fix ammo box cook off when setting is Players only (#8066)
* Fix ammo box cook off when setting is Players only

* Update addons/cookoff/functions/fnc_handleDamage.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-02-27 11:50:09 -06: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
Björn Dahlgren
f460eca428 Cook Off - Adjust players only settings check (#7419) 2020-02-07 21:33:09 -06:00
Björn Dahlgren
941d46b334 Cook Off - Change Cook Off events to global and add to events docs 2020-01-08 00:25:52 +01:00
Dystopian
392a0770b3 Add destroyed boat ejecting (#6330)
* Add destroyed boat ejecting

* Delete EH global cleanup

* Add check explosiveness

* Optimize EH

* Move EH to function, remove config values

* Move code to cookoff

* Use macro for explosiveness

* Fix include
2019-12-16 16:29:33 -06:00
Cyruz143
5d07029db7 Cookoff - Allow enabling only on player crewed vehicles (#7147)
* Add setting for cookoff to only run for player crewed vehicles

* No point having per vehicle selection

* Merging mutliple settings in to one

* Fixing missing comma

* Using LSTRING for settings

* merging suggested fixes

* Moving enabled check to fnc

* Use existing strings for CBA options

* Reverting change to support legacy eden attribute settings

* Adding Pabsts fix for 3den attribute

* Update addons/cookoff/CfgEden.hpp

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-11-05 11:55:15 -06:00
Brandon Danyluk
709548c1ef Cookoff - Fix shell detonation (#6979)
* abc

* Revert "abc"

This reverts commit bcb4214bd9.

* Update to current commit

* ShotShell requires velocity to simulate itself, so always spawn it with velocity
2019-05-06 10:23:07 -05: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
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
PabstMirror
b86ef91d7a
Disable cookoff on RCWS turrets (#5605)
* Disable cookoff on RCWS turrets

* getNumber

* Change config name, add doc
2017-11-30 17:07:46 -06:00
Tim Beswick
e85c752ca6 Cook-off probability and cook-off tweaks (#5585)
* Added cookoff probability for vehicles. Tweaks to cookoff to stop total blocking of destruction in some cases.

* Changed var name to probability. Better method for getting config value.

* Fixed naming error

* Changed setting to be a global coefficient. Added some info to cookoff doc

* Reverted hitfuel check

* Reverted damage threshold for cook-off

* Tweaked probability calculation

* Update fnc_handleDamage.sqf
2017-11-30 16:54:47 -06:00
PabstMirror
750382ff67 Cookoff - Filter bad ammo, use new rearm config (#5618) 2017-10-14 15:12:32 +02:00
Dedmen Miller
81e02a7336 Refactor private ARRAY to private keyword (#5598)
* Everything

* Fixed missing ;

* Fix missing ; and double private

* Fixed cannot isNull on number

* Turn _temparture back to isNil

* Fix error from merge
2017-10-10 09:39:59 -05:00
jonpas
40d927d3fd Use selectRandomWeighted 1.76 command (#5482) 2017-09-08 16:18:07 +02:00
Joko
2aa0072104 Fix the issue that SFX variants are not global (#5335)
* Fix the issue that SFX variants are not global what means that different players can get different pressure Cookoff sounds

to prevent that i split up the sounds in 3 types and used a Weighted select to have the befor used values back

* add todo for 1.74

* inherit in CfgSFX from 1 class
2017-07-08 09:52:25 -05:00
Phyma
ffaa195fe5 Conform function headers to coding guidelines (#5255)
* Fixed headers to work with silentspike python script

* Fixed rest of the files

* Fixed ace-team
2017-06-08 15:31:51 +02:00
SilentSpike
ae69118fba Implement new cook off SFX (#5179)
* Implement new cook off SFX with variants
* Add hybrid V to authors
2017-06-02 22:20:36 +01:00
PabstMirror
8d43b899e6 Frag - Cleanup and Performance (#5010)
* Frag - Cleanup and Performance

* Add dots
2017-04-11 10:33:56 -05:00
commy2
81f3387dbb Merge pull request #4991 from acemod/fix-cookoff-2
also fix cooking off ammo boxes
2017-03-14 10:09:13 +01:00
commy2
2c4f286593 also fix cooking off ammo boxes 2017-03-14 10:08:06 +01:00
commy2
2334d501d0 Fix cookoff desynch, fix #4900
Randomness would be calculated on every machine, but only vehicle explosion and sound are done by the server. Smoke, light and fire sfx are done by each client.
2017-03-14 10:04:56 +01:00
PabstMirror
e9b5bde371 Add ace_setting for scaling cookoff effect length (#4842)
* Add getVar for scaling cookoff effect length

* Switch to ace_setting

* Add notes about merging settings
2017-01-23 12:13:02 -06:00
PabstMirror
bce0913019 Cookoff - add function to get ammo (#4779)
* Cookoff - add function to get ammo

Fix #4565 - Function adds virtual ammo for rearm vehicles
Remove FUNC(secondaryExplosions) - which duplicatd detonateAmunition
Tweak timeBetweenAmmoDetonation calculation to use all ammo, not just
the current mag
Allow GVAR(enableAmmoCookoff) effect to work with GVAR(enable)=false

* Fix header

* Cleanup getting ammo from turrets
2017-01-04 15:35:54 -06:00
BaerMitUmlaut
0a05401e74 Fix cookoff locality issues (#4799)
* Fix locality issue with box cookoff

* Add grenade fired EHs on hcs and dedis
2017-01-02 17:55:44 -06:00
SilentSpike
e399597678 Clean some cook off code
- Use unary `createVehicle` syntax
- Removed some parenthesis
- Simpify 3den property condition
2016-11-06 12:29:37 +00:00
SilentSpike
7de56ad9b5 Fix #4630
Not all explosives detonate on destruction, so their ammo config must be checked to see if they will.

ACE_Explosives adds a property to define the associated ammo which *will* detonate on destruction, which is used if present. Otherwise a generic small explosion happens.
2016-11-05 14:20:48 +00:00
Rebel
e84cdef817 Blocks AI getting back into the vehicle on cookoff (#4587)
* no message

* Header.

* Typo.

* Less code.

* New getPos syntax.

* leaveVehicle seems to work.

* Removed the second waypoint.

* Clear previous waypoints.

* Run away waypoint before others.

* Use arr select code

* Revert select. Use doMove.
2016-10-30 13:33:28 +01: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
commy2
05d30c5573 convert log macros to cba versions (#4282)
* convert log macros to cba versions

* Add changes to AB

* remove obsolete macro
2016-10-02 12:55:31 +02:00
PabstMirror
a5d106c116 Fix cookoff event calling (#4487) 2016-09-29 18:44:48 -05:00
commy2
2b4c5f9c49 auto add blown off turrets to curator 2016-09-18 11:31:28 +02:00
commy2
a487c5e89f offset for quad engine smoke, delete destroyed RepairItem s 2016-09-16 13:51:41 +02:00
commy2
d200eadb46 incendiary and cookoff improvements 2016-09-16 13:08:19 +02:00