* Redoing this
* Revert "Redoing this"
This reverts commit 80ff709676.
* Do this properly
* Update fnc_handleKilled.sqf
* use setDead function directly
* Handle scripted camera
* redo #8387
I'm dumb.
* try this
* if construct outside of ctrlSetEventHandler
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
* tweak disableUserInput / handleKilled
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* move overheating cookoff into separate function
* move heatCoef and require mission restart for setting change
- move heatCoef to a more sensible place
- require mission restart for heatCoef setting change (it gets cached per ammo type)
* add exit to ammo temp loop if cookoffCoef is changed to 0 mid-mission
- add exit to ammo temp loop if cookoffCoef is changed to 0 mid-mission, this prevents an issue where all weapon cookoff regardless of temp, because required temp gets multiplied by cookoffCoef which has been set to 0.
* file end new line
* update header for ace_overheating_fnc_cookoffWeapon
* use ambientTemperature as floor for weapon and ammo temp
* add coolingCoef setting
* improve feature documentation
* add fnc_cookoffWeapon to XEH_PREP
* add type of jam to ace_weaponJammed local event
- add type of jam to ace_weaponJammed local event
- fix#8637
* fix misspelling
Co-authored-by: TyroneMF <TyroneMF@hotmail.com>
* clear all weapon heat on death
* Update addons/overheating/functions/fnc_updateTemperature.sqf
Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com>
* deprecate ace_overheating_fnc_getBarrelMass, cache weapon bolt and barrel mass values
- cache closed bolt value by moving config look up to ace_overheating_fnc_getWeaponData
- cache barrel mass value by moving calculation from ace_overheating_fnc_getBarrelMass to ace_overheating_fnc_getWeaponData
- deprecate ace_overheating_fnc_getBarrelMass to be a wrapper for ace_overheating_fnc_getWeaponData that only returns barrel mass
* add public functions to get and set weapon and ammo temperature
* add `canCoolWeaponWithItem` function, workaround for #8657
* Apply suggestions from code review
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* add coef setting for addition heat from suppressor
* Update fnc_overheat.sqf
* improve fnc_canCoolWeaponWithItem
* remove extra (
* Move canCoolWeaponWithItem action code to function
* Use hashmaps and reset on settings change
* Apply suggestions from code review
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: TyroneMF <TyroneMF@hotmail.com>
Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
* added check if burning in fullheal and then extinguish
* Add check if fire module is loaded as PabstMirror showed
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* General - Setting category cleanup
- Localize ACE Uncategorized
- Add subcategories for everything in Uncategorized
- Put colors in subCategory (alphabetically last)
- Add extra info on ViewDistance settings descriptions
- Move all settings to initSettings.sqf
* Update initSettings.sqf
* Added German Translation
Added German Translation
* Added German Translation
Added German Translation
* Added German Translation
Added German Translation
* Added German Translation
Added German Translation
* Added German Translation
Added German Translation
* Update addons/arsenal/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/ballistics/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/ballistics/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/cargo/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/cargo/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update stringtable.xml
* Update stringtable.xml
* Update stringtable.xml
* Update stringtable.xml
* Update stringtable.xml
* Update stringtable.xml
* Update stringtable.xml
* Update stringtable.xml
* Update stringtable.xml
* Update addons/common/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/common/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/common/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/ui/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/vehicle_damage/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/vehicle_damage/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/vehiclelock/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/common/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/cookoff/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/cookoff/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/explosives/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/explosives/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/field_rations/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/field_rations/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/field_rations/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/fire/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/field_rations/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/fortify/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/gforces/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/grenades/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/gunbag/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/hellfire/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/hellfire/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/interact_menu/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/interaction/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/magazinerepack/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/map_gestures/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/map_gestures/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/map_gestures/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/map_gestures/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/map_gestures/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/map_gestures/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/markers/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/markers/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/markers/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/markers/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/markers/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/medical_damage/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/medical_damage/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/medical_engine/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/medical_engine/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/medical_feedback/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update stringtable.xml
* Update addons/medical/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Apply suggestions from code review
Co-authored-by: Jo David <github@jonathandavid.de>
* Update stringtable.xml
* Update addons/explosives/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/gforces/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/medical/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/medical_engine/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
Co-authored-by: Jo David <github@jonathandavid.de>
* Add french translation of EnableSpeedIndicator keys
* Add french translation of EpilepsyFriendlyMode keys
* Add french translation (SpecterOS, SpecterOS 7.62, Burris XTR II, EOTech XPS3)
* Add french translation of the cargo renaming fonctionality (added in PR8023)
* Fix typo in 127x99_API_Mag_NameShort translations
* Add french translation of `LocationsBoostTraining_Description` key
* Add french translation of `interactWithTerrainObjects_Description` key
* Add french translation of `repackLoadedMagazines` keys
* Add french translation of `Rename group` self-interact fonctionality (added in PR8346)
* Add french translation of `Medical_Feedback_EnableHUDIndicators` keys
* Add french translation of Vehicle Towing fonctionality (Added in PR8380)
* Fix English and Japanese translation of length rope (18.3, 27.4 and 36.6 meters)
* Add french translation of customize Medical GUI colors settings (added in PR8350)
* Add french translation for additional progress bar information feature (added in PR8428)
* Add french translation in multiple modules.
* Fix French translation of `STR_ACE_Overheating_cookoffCoef_description` key.
* 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>
* Add jamming coef to change or disable jamming.
* change max to 5
* add setting for overheating effects distance, unjaming on barrel swap, increase rate of fire with heat
- add setting for overheating effects distance
- add unjaming on barrel swap, with setting
- add increase rate of fire with heat, with setting
- fix some formatting
* little tweaks
* add overheating cookoff feature
- add overheating cookoff feature
- add documentation
- bugfixes/improvements
* Update ace3-config-entries.md
* Update overheating-framework.md
* Update addons/overheating/XEH_postInit.sqf
Co-authored-by: jonpas <jonpas33@gmail.com>
* Update addons/overheating/XEH_postInit.sqf
Co-authored-by: jonpas <jonpas33@gmail.com>
* Update addons/overheating/functions/fnc_firedEH.sqf
Co-authored-by: jonpas <jonpas33@gmail.com>
* Update addons/overheating/stringtable.xml
Co-authored-by: jonpas <jonpas33@gmail.com>
* Update docs/wiki/feature/overheating.md
Co-authored-by: jonpas <jonpas33@gmail.com>
* Update addons/overheating/stringtable.xml
Co-authored-by: jonpas <jonpas33@gmail.com>
* Update addons/overheating/functions/fnc_jamWeapon.sqf
Co-authored-by: jonpas <jonpas33@gmail.com>
* Update addons/overheating/functions/fnc_jamWeapon.sqf
Co-authored-by: jonpas <jonpas33@gmail.com>
* remove extra underwater cooling, make cookoffCoef enable cookoff
- add coef setting for heat generation per shot
- merge cookoff setting into cookoff coef setting
- remove check for water that increased cooling
- change max rof increase from heat to 10%
- change ammo heating to a less linear formula
- change cookoffCoef to effect inginition tempurature instead of heat amount
- delay cookoff shot until any firing animation is done
- update strings based on feedback
* Update stringtable.xml
* add cookoff notification
* improvements from play testing
- move ammo heat loop into seperate function with a tighter loop
- factor rain into cooling calculation
- handle cooling while swimming
- merge cookoff take event handler into fnc_handleTakeEH
- fix case where cookoff could potentially come from underbarrel weapon muzzle
- only add TakeEH if required by enabled settings
- improve cookoff muzzle/mode handling
* fix missing semi that I swear I already fixed before pushing
* Update overheating-framework.md
* Update fnc_updateAmmoTemperature.sqf
* include wind speed in cooling calculation
* cool with X
- add ace interactions to allow cooling with water sources when Ace X is loaded
- add documentation for cooling
- move getting barrel mass to a function
* documentation formatting
* Add config array for weapon jam types, as not all weapon can get all types IRL.
* remove variable that's not required
* add some compat entries for RHS
* fix merge conflict
* fix a happy little accident
* move to CBA settings, minor styling.
* Update error message in fnc_jamWeapon.sqf
Co-authored-by: jonpas <jonpas33@gmail.com>
* Apply suggestions from code review
Co-authored-by: TyroneMF <TyroneMF@hotmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: TyroneMF <TyroneMF@hotmail.com>
* Merge ACEX - first attempt
Backwards compatibility with XGVAR set of macros used on all settings and config entries
Public API functions not taken into account yet, many other things probably still missed
* Resolve issues
* Switch to addSetting, backward compatible CfgPatches, missed XGVAR.
* Remove unnecessary backwards compat
* Convert ACEX Categorised settings to initSettings / Fix Intel items magazine
* Apply suggestions from code review
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Remove maintainers from merged ACEX components
* Cleanup unused module and faction classes
* Sitting - Add more object configs by @Dystopian
https://github.com/acemod/ACEX/pull/255
* Translations - Add Japanese by @classicarma
https://github.com/acemod/ACEX/pull/259
* Kill Tracker - Add killtracker.inc public include file by @Freddo3000"
https://github.com/acemod/ACEX/pull/251
* Add ACEX authors and sort authors file
* acex - final tweaks (#8513)
* acex - handle old funcs
* replace thirst/hunger setvars to acex naming
fix macro
Revert "fix macro"
This reverts commit d807e5e804c43916eaa42d34a89af94c6d9a48ad.
Revert "replace thirst/hunger setvars to acex naming"
This reverts commit bafc607884932d6e339daedc7c22e25dddbdd868.
x
Co-authored-by: TyroneMF <TyroneMF@hotmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Change speed limiter to utalize setCruiseControl
Kept setVelocity with a +2 to speed check to make vehicle slow down downhill and to slow it down when enabled.
* Update addons/vehicles/functions/fnc_speedLimiter.sqf
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
* Update addons/vehicles/functions/fnc_speedLimiter.sqf
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
* Update addons/vehicles/functions/fnc_speedLimiter.sqf
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Update addons/vehicles/functions/fnc_speedLimiter.sqf
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
