Commit Graph

14339 Commits

Author SHA1 Message Date
PabstMirror
500fc9a199 Prep 3.14.0 Build 61 2021-10-14 14:27:32 -05:00
PabstMirror
26d8b8d10a
Vehicle Damage - Cleanup strings (#8515)
* vd cleanup strings

* Update addons/vehicle_damage/initSettings.sqf

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

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2021-10-14 12:05:16 -05:00
ace3mod
d43cd8a458 [Docs] Update component dependencies
Automatically committed through CI.

[ci skip]
2021-10-14 17:50:02 +02:00
ace3mod
dbb35e3d85 [Docs] Update component dependencies
Automatically committed through CI.

[ci skip]
2021-10-14 17:49:52 +02:00
ace3mod
c97f0ed09c [Docs] Update component dependencies
Automatically committed through CI.

[ci skip]
2021-10-14 17:49:36 +02: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
Brandon Danyluk
caca92f71d
Add Fire component (#8245)
* merge fire

* Change required addons. Change getPos to getPosASL. Remove include

* Apply suggestions from code review

* Apply suggestions from code review

Co-authored-by: Kyle Mckay <kymckay.dev@gmail.com>

* Update addons/fire/stringtable.xml

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Kyle Mckay <kymckay.dev@gmail.com>
2021-10-14 10:49:10 -05:00
nomisum
7009404d39
Add Global Mobilization Compatibility (#7835)
* GM Compat

add GM Compat addon - it's #7835 without fastroping & refuel changes
* plus compat_gm moved into optionals
* plus a few whitespace fixes

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Fusselwurm <fusselwurm@gmail.com>

* add ACE CSW dep (see script_component.hpp)

* warn about missiong compat_gm if GM is loaded

* move medic tents to EGVAR(medical,facilities) array thing

* add pDumbs

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Fusselwurm <fusselwurm@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-14 10:48:54 -05:00
Drofseh
f83c605958
Overheating - Add cook off and rate of fire features and additional customization settings (#8064)
* 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>
2021-10-14 10:47:52 -05:00
ace3mod
b06d6fc0f8 [Docs] Update component dependencies
Automatically committed through CI.

[ci skip]
2021-10-14 17:47:21 +02:00
jonpas
6ca9d59443
Merge ACEX (#8415)
* 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>
2021-10-14 10:46:43 -05:00
mharis001
0fe54b895a
Medical - Clean up namespaces used by (de-)serializing functions (#8514) 2021-10-14 02:10:20 -04:00
Broström.A | Evul
0c85f5f339
Vehicles - Utilize setCruiseControl for speed limiter (#8273)
* 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>
2021-10-13 16:58:09 -05:00
GhostIsSpooky
471cc59320
Repair - Use callback functions directly (#8508) 2021-10-13 16:09:46 +02:00
Serg Vergun
24c1861a92
Change hemorrhage text colors (#8354)
From red to yellow-red grade.
2021-10-12 22:50:53 -05:00
GhostIsSpooky
095fe2b874
Repair - Add support for RHS optic hitpoints (#8347)
* Potential fix for #8304

Update fnc_addRepairActions to include hitpoints that influence turret view

* Support for the RHS Stryker hitpoints

This whole function is a nightmare but there's no better way to do this. Side effects may include unnecessary hitpoints being shown.

* Style pass

* whoops
2021-10-12 22:20:36 -05:00
GhostIsSpooky
07184dc763
FN Minimi SPW reload fix (#8353) 2021-10-12 17:46:39 -05:00
Jasper
257d9536cc
Cargo - Add ability to add custom name to cargo objects (#8023)
* First Push

Added the ability to edit cargo objects (crates/boxes only) names. Either via in-game action on the object it self or via 3den attributes.

Added a single function which spawns the UI to edit the name and also edits it. This is an scripted UI, it could be changed to a config version if wanted, but as I'm not good in UI coding I left it on this simple version mainly for testing.

Added 4 new stringtable entries, 2 for action and 2 for 3den attributes.

* Add extra stringtable

Forgot to add the UI to the stringtable.

* Update fnc_renameObject.sqf

fixing tabs

* Show custom name only behind

Added new function "getNameItem" that will get the items name.
Put the custom name behind the original name between brackets "[...]".

* Added "Hide Rename Action" setting

Also removed an unused _itemClass from postInit.

* Apply suggestions from code review

Co-authored-by: jonpas <jonpas33@gmail.com>

* Update AUTHORS.txt

Added my name

* Applied the sugesstions.

* Fixed function crash

* Moved to dialog.

* Removed unused comment/code

* Update renameMenu.hpp

Fixed tabs to spaces.

* Update renameMenu.hpp

* move rename to common

* Update addons/arsenal/ui/RscAttributes.hpp

* style and use addActionToObject

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-12 17:42:38 -05:00
GhostIsSpooky
005b2aef14
Arsenal - Stop deleting unique belt items (#8483)
* prevent belt items from being deleted

* fix wrong index

* fix gps not being selected

* & fix UAV terminals not being selected

* add comments, delete extra line

* use getUnitLoadout for assignedItems
2021-10-12 17:10:18 -05:00
PabstMirror
fa99cfaa09
General - Fix missing strings (#8506)
* fix missing strings

* Add API String

Co-Authored-By: GhostIsSpooky <69561145+Salluci@users.noreply.github.com>

* fix copy

Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com>
2021-10-12 16:10:07 -05:00
GhostIsSpooky
82f705b5a1
speed up fnc_getClaimObjects (#8459) 2021-10-12 16:09:56 -05:00
Drofseh
40ec4e9137
Update fnc_getNeedRearmMagazines.sqf (#8456) 2021-10-12 16:08:06 -05:00
GhostIsSpooky
e4be783f80
Repair - Add Locations Boost Training Setting (#8349)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-12 22:53:45 +02:00
Dystopian
0c58d8b20b
Interaction - Add interaction with terrain objects (#8103)
* Add interaction with terrain objects

* Optimize with new commands

* Handle z-position under ground

* Add warning for setting

* Add parentheses to condition

Co-authored-by: jonpas <jonpas33@gmail.com>

* Add comments

* Add parentheses to condition

Co-authored-by: jonpas <jonpas33@gmail.com>

* Add parentheses to condition

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

* Add replacement configs to dragging

This reverts commit afc5abe6cd.

* Fix validator error and optimize condition

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-12 14:36:33 -05:00
GhostIsSpooky
63d7419066
Ballistics - Cleanup & add missing magazine variants (#8410)
* change 7.62x67 to .300 WM

* initial commit

* stringtables, add LM suffix to .338 magazines, strings for 12.7x99 10Rnd mags

* use correct strings for .50 BMG 10rnd mags

* Remove 6.5C mags from inappropriate side boxes

* remove duplicate stringtable entrys

* add MX 6.5C color variants, add MSBS 6.5C mags, move 6.5C to marksman rifles only, add new mags to boxes, switch DMR_03 to sr25 magwell

* Fix UBC

* fix stupid

* add space before 'mm' in strings

* add missing 762x51 10Rnd mags

* Revert "add space before 'mm' in strings"

This reverts commit fca5fa9f14.

* redo add space before mm in strings
2021-10-12 13:08:13 -05:00
GhostIsSpooky
bbe4b488e0
Magazine Repack - Add setting & hint for repacking loaded magazines (#8475)
* add setting to repack equipped magazines

* derp

* derpderp

* always show hint, remove setting
2021-10-12 12:54:50 -05:00
Seb
88e774c30d
Interaction - Rename group self-interact (#8346)
* Group renaming self interact

* UI base

* Custom UI solution (looks terrible)

* Improve GUI, optimise functions

* Add exitWith return value to fnc_renameGroup

* tabs to spaces

* Small tweaks

* newlines

pre-empting newline gestapo

* input prompt caps

* Implement suggestions

* Remove already inherited value

* Per-side group name handling

* Add same group case sensitive changes.

* Suggestions

- Use ace_common_fnc_displayTextStructured
- Formatting
- Phrasing of strings

* replace spawn with CBA_fnc_execNextFrame

* Update addons/interaction/initSettings.sqf

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

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-12 12:53:35 -05:00
10Dozen
3d9315529d
Medical Feedback - Add indication of Fractures and applied CATs/Splints (#8321)
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-10-12 14:16:30 +02:00
ace3mod
341f4c3aef [Docs] Update component dependencies
Automatically committed through CI.

[ci skip]
2021-10-12 11:33:43 +02:00
Brandon Danyluk
ca7fbe742c
Add Vehicle Towing (#8380)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-12 11:33:05 +02:00
Dystopian
65b9cf3754
Map - Use getLightingAt (more light sources illuminate map) (#8343)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-12 10:31:46 +02:00
Serg Vergun
f7b07c362d
Medical GUI - Add ability to customize Medical GUI colors (#8350)
* Add ability to customize colors of injuries

Added CBA settings entries.
Updated default values.
Added English and Russian locales.

* copypaste cleanup

* move comments and make code more maintainable

* Apply suggestions from code review

Newline at end of files

Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>

Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>
2021-10-12 10:11:55 +02:00
GhostIsSpooky
374a5b632f
Medical - Refactor Clear Trauma Setting (#8345)
* Refactor Clear Trauma

Add in setting for clearing trauma after stitching a wound, make clearing trauma after bandage clear trauma of individual wounds as they're bandaged instead of all at once when fully bandaged.

* Make git diff slightly prettier.

* Update fnc_bandageLocal.sqf

* Style pass

* once more for the diff

* fix stupid

* Ddd trauma/visuals on bandage reopening
2021-10-12 10:08:10 +02:00
Walthzer
fad7f84625
Explosives - Add exclusion from dynamic defuse action (#8171)
* Add GVAR(noDefusalAction)

* add changes

* Prep functions

* Update addons/explosives/functions/fnc_excludeMine.sqf

Uhm, strange. Its clearly allMines, yet Allmines didn't only build it also worked properly. Undocumented variable?

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

* Update addons/explosives/functions/fnc_stopExcludingMine.sqf

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

* Header Fixes

Fix information in the function headers

Co-authored-by: jonpas <jonpas33@gmail.com>

* Remove Individual Functions

* Compacter Functions

* Event

* remove tab (facepalm)

* Jonpass' Review Fixes

Co-authored-by: jonpas <jonpas33@gmail.com>

* Fix exitWith mistake

* Refractor of allowDefuse

Co-authored-by: jonpas <jonpas33@gmail.com>

* Update addons/explosives/functions/fnc_allowDefuse.sqf

Co-authored-by: jonpas <jonpas33@gmail.com>

* Update Documentation

* Rephrase documentation

* Another rephrase

* Relabel Locality

* Update addons/explosives/functions/fnc_allowDefuse.sqf

Co-authored-by: BaerMitUmlaut <BaerMitUmlaut@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-11 15:49:27 -05:00
GhostIsSpooky
998f86f034
General - Move to CBA Settings (#8461)
* first pass

* second pass

* third pass

* final pass

* missing commas

* newlines

* switch to cba eventhandler

* newlines, formatting

* laser - movedToSQF

* add logging to ace_common_fnc_cbaSettings_loadFromConfig

* Update initSettings.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-11 15:48:30 -05:00
Vdauphin
ec12ee2137
Disarming - Add quantity to ace_disarming_dropItems event (#8232)
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-10-11 22:08:02 +02:00
Whigital
81b4c276f5
Common - Fix arithmeticGetResult hash values extraction (#8503) 2021-10-11 13:57:15 -05:00
Serg Vergun
af66a9881c
Interaction Menu - Add triage colors to icons at passengers list (#8366) 2021-10-11 11:51:05 +02:00
Steve Zhao
0b2b4d7397
Medical - Improve keybind to open med menu for vehicle occupant under cursor (#8160)
* add lineIntersectsSurfaces to med menu key

* fix _target = nil if no intersections

* only look through player and player vehicle

* Update addons/medical_gui/XEH_postInit.sqf

Co-authored-by: commy2 <commy-2@gmx.de>

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: commy2 <commy-2@gmx.de>
2021-10-11 10:29:09 +02:00
GhostIsSpooky
1c921674a9
Fixed jerry can madness (#8348)
Fixed refueling vehicles with high input rates when using fuel sources with low fuel capacity.
2021-10-11 00:47:54 -05:00
Serg Vergun
128ddf2591
Nametags - Add setting to disable effect of ambient brightness on view distance (#8325)
* Add setting to disable effect of ambient brightness on view dist

* Add periods and Title Case for English localization

* Apply suggested code. Make it more readable

Co-authored-by: jonpas <jonpas33@gmail.com>

* fix spelling

* fix mistype

* one more mistype

* Implement suggestions

Settings parameter as slider.
English and Russian localization.

* Update addons/nametags/functions/fnc_getCachedFlags.sqf

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

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2021-10-11 00:35:21 -05:00
GhostIsSpooky
0d34ac2838
add string for black P99 (#8501) 2021-10-10 18:03:41 -05:00
GhostIsSpooky
e92ea53385
Medical - Return tourniquets after PAK (#8419) 2021-10-11 00:34:28 +02:00
Krzyciu
4f0fea8d67
Translations - Polish (#8497)
Add missing Polish translations
2021-10-11 00:27:06 +02:00
GhostIsSpooky
baff363915
Realistic Weights - Add Apex / Contact / Anti-Tank Weapons (#8357)
* Add Apex / Contact / Tanks Weapons

* Inheritance fix

* Fix UBCs

* Weight for the RPK
2021-10-10 12:54:12 -05:00
GhostIsSpooky
e3986f4528
Small Arms - Fix FNX-45 magazine round count (#8352)
* Change FNX-45 magazine round count

* Style pass
2021-10-10 12:02:26 -05:00
GhostIsSpooky
97deef5617
General - Use engine hashmaps (#8468)
Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>
2021-10-10 18:55:14 +02:00
GhostIsSpooky
9479c29b42
Repair - Fix claimed object abuse (#8460) 2021-10-10 18:50:10 +02:00
GhostIsSpooky
1b318433a2
Common - Add settings for additional progress bar information (#8428)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-10 18:49:41 +02:00
BaerMitUmlaut
6128b8ef06
Common - Only switch side if necessary on person loading (#6334)
Co-authored-by: Serg Vergun <1197314+severgun@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-10-10 16:26:36 +02:00