Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Overheating - Add cook off and rate of fire features and additional customization settings #8064

Merged
merged 35 commits into from
Oct 14, 2021

Conversation

Drofseh
Copy link
Contributor

@Drofseh Drofseh commented Jan 8, 2021

When merged this pull request will:

  • Add feature to cookoff ammunition from barrel heat, with settings.
  • Add feature to increase rate of fire with heat, with settings.
  • Add feature to unjam on barrel swap, with setting
  • Add setting for jamming coefficient to change or disable jamming chance
  • Add setting for particle effects and dispersion distance

Things I would like to add/improve before merge:

  • Documentation
  • Math for rate of fire increase.
    The numbers I'm using in the linear conversion feel good, but if someone has the math for heat transfer from the gun to the ammo that'd be better.
  • Cookoff from heat for closed bolt firearms
    I'd like to add this as a feature.
    It would need a gvar for each weapon to indicate if it's open or closed bolt. Any fancy math for the rate of fire increase could probably be reused.
    Info for both could be taken from this or other research.
    https://www.researchgate.net/publication/262880619_Experimental_investigation_of_a_cook-off_temperature_in_a_hot_barrel

…, 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
@Steve161st
Copy link

Steve161st commented Jan 8, 2021

Hi
Would you consider adding additional the ability to have additional overheating coefficients applied to the overall maths, defined in weapon configurations to allow mod makers to better reflect the item they are modelling?
E.g. piston operated weapons tend to heat up slightly slower than DI due to less gas being pushed back to the bolt area.
Or certain suppressors (e.g. OSS) that are heavier than standard suppressors but, due to putting less back pressure down the barrel, result in less overheating.
As an example: https://www.youtube.com/watch?v=bFZr6T2NgxE

This new coefficient would automatically be set to 1 if no value is found in the config. (As all existing mods won't have a value set.)

@Drofseh
Copy link
Contributor Author

Drofseh commented Jan 9, 2021

Would you consider adding additional the ability to have additional overheating coefficients applied to the overall maths, defined in weapon configurations to allow mod makers to better reflect the item they are modelling?

I'm not going to change the basic heating loop, I haven't looked at the math and I don't want to break it.

@FrostedVert
Copy link

I’m excited to see this being done. I burned the heck out of my hand, through Nomex gloves on a C6, and I’ve always wanted to feel FN MAGs and Minimis act the same way in Arma as they get hot.

- add overheating cookoff feature
- add documentation
- bugfixes/improvements
@Drofseh Drofseh changed the title [WIP] Overheating - Add rate of fire feature and additional customization settings Overheating - Add rate of fire feature and additional customization settings Jan 11, 2021
@Drofseh Drofseh changed the title Overheating - Add rate of fire feature and additional customization settings Overheating - Add cook off and rate of fire features and additional customization settings Jan 11, 2021
@Drofseh
Copy link
Contributor Author

Drofseh commented Jan 11, 2021

This is ready for review

@jonpas jonpas added kind/added feature kind/enhancement Release Notes: **IMPROVED:** labels Jan 11, 2021
@jonpas jonpas added this to the 3.14.0 milestone Jan 11, 2021
jonpas
jonpas previously requested changes Jan 11, 2021
addons/overheating/ACE_Settings.hpp Outdated Show resolved Hide resolved
addons/overheating/XEH_postInit.sqf Outdated Show resolved Hide resolved
addons/overheating/XEH_postInit.sqf Outdated Show resolved Hide resolved
addons/overheating/functions/fnc_calculateCooling.sqf Outdated Show resolved Hide resolved
addons/overheating/functions/fnc_firedEH.sqf Outdated Show resolved Hide resolved
addons/overheating/stringtable.xml Show resolved Hide resolved
addons/overheating/stringtable.xml Outdated Show resolved Hide resolved
addons/overheating/stringtable.xml Outdated Show resolved Hide resolved
addons/overheating/stringtable.xml Outdated Show resolved Hide resolved
docs/wiki/feature/overheating.md Outdated Show resolved Hide resolved
Drofseh and others added 8 commits January 10, 2021 23:50
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
@jonpas
Copy link
Member

jonpas commented Oct 6, 2021

In the future I would like to see a separate config entry for cooling weapons with items, instead of relying on ACEX Field Rations.

I might take that future request back if we move forward with #8415. :P

@PabstMirror merge?

@jonpas
Copy link
Member

jonpas commented Oct 12, 2021

Requires move to CBA Settings now.

@PabstMirror PabstMirror self-assigned this Oct 12, 2021
@jonpas jonpas removed the kind/enhancement Release Notes: **IMPROVED:** label Oct 12, 2021
@Drofseh
Copy link
Contributor Author

Drofseh commented Oct 13, 2021

Requires move to CBA Settings now.

Done.
I think I've also successfully marked all the ones that will require mission restart.
I doesn't looke like #8461 did that for any of the addons

Co-authored-by: jonpas <jonpas33@gmail.com>
jonpas added a commit to Theseus-Aegis/ACE3 that referenced this pull request Oct 13, 2021
Co-authored-by: TyroneMF <TyroneMF@hotmail.com>
@jonpas jonpas added kind/feature Release Notes: **ADDED:** and removed kind/added feature labels Oct 14, 2021
@PabstMirror PabstMirror merged commit f83c605 into acemod:master Oct 14, 2021
@Drofseh Drofseh deleted the hot-hot-hot branch October 15, 2021 04:15
AndreasBrostrom pushed a commit to AndreasBrostrom/ACE3 that referenced this pull request Dec 3, 2021
…ustomization settings (acemod#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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/feature Release Notes: **ADDED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants