Field Rations - Basic CfgMagazines support #9008
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
veteran29
force-pushed
the
field-rations_cfgmags-basic-support
branch
from
9715cd1 to
629f2e6
Compare
Whoopsie.
In hindsight it's not necessary, this is not public function.
PabstMirror
reviewed
Sep 4, 2022
veteran29
added a commit
that referenced
this pull request
Sep 8, 2022
* Update vn_mine_tripwire_m16_02_ammo base class * Fix fnc_handlePunjiTrapDamage Hopefully once and for all * Remove placement actions from punji traps * Add Explosives compat for 1.2 content TODO testing * Add quoting to stringtable config usage * Prevent bike mine placement object from swinging all over the place * Add non attachable ACE_Triggers for big mines Bike mine looks kinda stupid when it's attached to a car... * Bike mine triggers * Cartridge mine triggers * Lighter mine triggers * Pot mine triggers * Jerrycan mine triggers * Mortar shell mine triggers * Grenade board mine triggers * Inheritance fixes * Update damage handler for new punji traps * Improve interaction points and dig distances * Dh10 mine triggers * Bump damage of vn_mine_cartridge_ammo * Add incendiary features to lighter and jerry can explosives WIP * SOG Compat - Added fuel tank volumes for SOG update 1.2 vehicles (#8978) * Added fuel tank volumes for SOG update 1.2 vehicles * Type 55A is similar in fuel capacity to the PTF Nasty, not the PBR * Add missing EOLs Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com> * Improve placement feedback of Whip punji * Add inheritance to custom wound handlers * Fix doorway punji position * Add spikes offset for affected units of doorway trap * Prevent spiderholes from being loaded into cargo * Add missing continue digging action to spiderholes * Fix spiderholes physics while being dug up via trenches system Depends on #8998 * Add missing params * Fix parenthesis * Add pDrive dummy files This is stupid. * Enable Melee weapons in the arsenal * Add Entrenching tool capabilities to Shovel and ETool Depends on #8999 * Add incendiary features to Molotov and M14 * Tweak chance of being set ablaze Now sums all hitpoints damage. * Add ACE_damageType to napalm and he bombs * Do not change cartridge mine damage and range if no ACE Medical * Simplify variable config values * Swap cartridge mine hit values Whoopsie. * Add overpressure configs to launchers * Fixed an issue preventing the M1919A6 CSW from being disassembled (#8970) * Remove disassembleTo from CSW weapons This config property is meant for tripods. * Add CSW config for MG42 * Simplify requiredAddons * Remove proxy weapons from most of the CSW, adjust loading times The animations are pretty important in case of SOGPF turrets, the ammo load times were adjusted accordingly so the total loading times is similar. * Add vn_pavn_30_can.p3d pDrive dummy * Fix missing MG42 mag icon * Add field_rations values to food props/mags Needs #9008 to be usable. * Add more field_rations values to food props/mags Send help. * More food configs * Even more food configs Fooooood. * More fooood Even more foooooood. * Fix food inheritance * Add SGM CSW compatibility * Various fixes for CSW Wrong tripods for opfor guns, missing translation * Improve TOW interaction position * Add dragging and interaction configs to recoilles rifles * Cleanup SGM CSW config * Add MK18 CSW config * Add H-12 MLRS CSW config * Add missing Mk18 stringtable * Add function header and logging to fnc_woundsHandlerIncendiary * Add missing weapons in CfgPatches array * Add entrenching tool config to backpacks * Fix Hammer and Fire axe melee weapons * Add missing CSW images Thanks @BaerMitUmlaut Co-authored-by: Samuel Deutsch <Quantx@users.noreply.github.com>
BrettMayson
pushed a commit
to BrettMayson/ACE3
that referenced
this pull request
Oct 10, 2022
* Add basic CfgMagazines support for field_rations * Update headers * Fix CBA context menu * Add backward compatiblity to fnc_consumeItem * Fix item refill not finishing Whoopsie. * Revert "Add backward compatiblity to fnc_consumeItem" In hindsight it's not necessary, this is not public function.
BrettMayson
pushed a commit
to BrettMayson/ACE3
that referenced
this pull request
Oct 10, 2022
* Update vn_mine_tripwire_m16_02_ammo base class * Fix fnc_handlePunjiTrapDamage Hopefully once and for all * Remove placement actions from punji traps * Add Explosives compat for 1.2 content TODO testing * Add quoting to stringtable config usage * Prevent bike mine placement object from swinging all over the place * Add non attachable ACE_Triggers for big mines Bike mine looks kinda stupid when it's attached to a car... * Bike mine triggers * Cartridge mine triggers * Lighter mine triggers * Pot mine triggers * Jerrycan mine triggers * Mortar shell mine triggers * Grenade board mine triggers * Inheritance fixes * Update damage handler for new punji traps * Improve interaction points and dig distances * Dh10 mine triggers * Bump damage of vn_mine_cartridge_ammo * Add incendiary features to lighter and jerry can explosives WIP * SOG Compat - Added fuel tank volumes for SOG update 1.2 vehicles (acemod#8978) * Added fuel tank volumes for SOG update 1.2 vehicles * Type 55A is similar in fuel capacity to the PTF Nasty, not the PBR * Add missing EOLs Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com> * Improve placement feedback of Whip punji * Add inheritance to custom wound handlers * Fix doorway punji position * Add spikes offset for affected units of doorway trap * Prevent spiderholes from being loaded into cargo * Add missing continue digging action to spiderholes * Fix spiderholes physics while being dug up via trenches system Depends on acemod#8998 * Add missing params * Fix parenthesis * Add pDrive dummy files This is stupid. * Enable Melee weapons in the arsenal * Add Entrenching tool capabilities to Shovel and ETool Depends on acemod#8999 * Add incendiary features to Molotov and M14 * Tweak chance of being set ablaze Now sums all hitpoints damage. * Add ACE_damageType to napalm and he bombs * Do not change cartridge mine damage and range if no ACE Medical * Simplify variable config values * Swap cartridge mine hit values Whoopsie. * Add overpressure configs to launchers * Fixed an issue preventing the M1919A6 CSW from being disassembled (acemod#8970) * Remove disassembleTo from CSW weapons This config property is meant for tripods. * Add CSW config for MG42 * Simplify requiredAddons * Remove proxy weapons from most of the CSW, adjust loading times The animations are pretty important in case of SOGPF turrets, the ammo load times were adjusted accordingly so the total loading times is similar. * Add vn_pavn_30_can.p3d pDrive dummy * Fix missing MG42 mag icon * Add field_rations values to food props/mags Needs acemod#9008 to be usable. * Add more field_rations values to food props/mags Send help. * More food configs * Even more food configs Fooooood. * More fooood Even more foooooood. * Fix food inheritance * Add SGM CSW compatibility * Various fixes for CSW Wrong tripods for opfor guns, missing translation * Improve TOW interaction position * Add dragging and interaction configs to recoilles rifles * Cleanup SGM CSW config * Add MK18 CSW config * Add H-12 MLRS CSW config * Add missing Mk18 stringtable * Add function header and logging to fnc_woundsHandlerIncendiary * Add missing weapons in CfgPatches array * Add entrenching tool config to backpacks * Fix Hammer and Fire axe melee weapons * Add missing CSW images Thanks @BaerMitUmlaut Co-authored-by: Samuel Deutsch <Quantx@users.noreply.github.com>
RusComBear
pushed a commit
to RusComBear/ACE3
that referenced
this pull request
Dec 29, 2023
* Add basic CfgMagazines support for field_rations * Update headers * Fix CBA context menu * Add backward compatiblity to fnc_consumeItem * Fix item refill not finishing Whoopsie. * Revert "Add backward compatiblity to fnc_consumeItem" In hindsight it's not necessary, this is not public function.
RusComBear
pushed a commit
to RusComBear/ACE3
that referenced
this pull request
Dec 29, 2023
* Update vn_mine_tripwire_m16_02_ammo base class * Fix fnc_handlePunjiTrapDamage Hopefully once and for all * Remove placement actions from punji traps * Add Explosives compat for 1.2 content TODO testing * Add quoting to stringtable config usage * Prevent bike mine placement object from swinging all over the place * Add non attachable ACE_Triggers for big mines Bike mine looks kinda stupid when it's attached to a car... * Bike mine triggers * Cartridge mine triggers * Lighter mine triggers * Pot mine triggers * Jerrycan mine triggers * Mortar shell mine triggers * Grenade board mine triggers * Inheritance fixes * Update damage handler for new punji traps * Improve interaction points and dig distances * Dh10 mine triggers * Bump damage of vn_mine_cartridge_ammo * Add incendiary features to lighter and jerry can explosives WIP * SOG Compat - Added fuel tank volumes for SOG update 1.2 vehicles (acemod#8978) * Added fuel tank volumes for SOG update 1.2 vehicles * Type 55A is similar in fuel capacity to the PTF Nasty, not the PBR * Add missing EOLs Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com> * Improve placement feedback of Whip punji * Add inheritance to custom wound handlers * Fix doorway punji position * Add spikes offset for affected units of doorway trap * Prevent spiderholes from being loaded into cargo * Add missing continue digging action to spiderholes * Fix spiderholes physics while being dug up via trenches system Depends on acemod#8998 * Add missing params * Fix parenthesis * Add pDrive dummy files This is stupid. * Enable Melee weapons in the arsenal * Add Entrenching tool capabilities to Shovel and ETool Depends on acemod#8999 * Add incendiary features to Molotov and M14 * Tweak chance of being set ablaze Now sums all hitpoints damage. * Add ACE_damageType to napalm and he bombs * Do not change cartridge mine damage and range if no ACE Medical * Simplify variable config values * Swap cartridge mine hit values Whoopsie. * Add overpressure configs to launchers * Fixed an issue preventing the M1919A6 CSW from being disassembled (acemod#8970) * Remove disassembleTo from CSW weapons This config property is meant for tripods. * Add CSW config for MG42 * Simplify requiredAddons * Remove proxy weapons from most of the CSW, adjust loading times The animations are pretty important in case of SOGPF turrets, the ammo load times were adjusted accordingly so the total loading times is similar. * Add vn_pavn_30_can.p3d pDrive dummy * Fix missing MG42 mag icon * Add field_rations values to food props/mags Needs acemod#9008 to be usable. * Add more field_rations values to food props/mags Send help. * More food configs * Even more food configs Fooooood. * More fooood Even more foooooood. * Fix food inheritance * Add SGM CSW compatibility * Various fixes for CSW Wrong tripods for opfor guns, missing translation * Improve TOW interaction position * Add dragging and interaction configs to recoilles rifles * Cleanup SGM CSW config * Add MK18 CSW config * Add H-12 MLRS CSW config * Add missing Mk18 stringtable * Add function header and logging to fnc_woundsHandlerIncendiary * Add missing weapons in CfgPatches array * Add entrenching tool config to backpacks * Fix Hammer and Fire axe melee weapons * Add missing CSW images Thanks @BaerMitUmlaut Co-authored-by: Samuel Deutsch <Quantx@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When merged this pull request will:
Adding this so I can use CfgMagazines SOG:PF food props with field rations. In the future, the system could be expanded with the feature of refilling/draining the magazine "rounds" (eg. SOG:PF food mags have 100 "rounds" each)