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

SOG Compat - Added fuel tank volumes for SOG update 1.2 vehicles #8978

Merged
merged 3 commits into from
Aug 10, 2022

Conversation

Quantx
Copy link
Contributor

@Quantx Quantx commented Jul 24, 2022

Added fuel tank volumes for SOG update 1.2 vehicles

@veteran29 I saw you working on this and thought I'd help out

optionals/compat_sog/CfgVehicles/boats.hpp Outdated Show resolved Hide resolved
optionals/compat_sog/CfgVehicles/planes.hpp Outdated Show resolved Hide resolved
optionals/compat_sog/CfgVehicles/tracked.hpp Outdated Show resolved Hide resolved
@veteran29 veteran29 merged commit a0ba9bf into acemod:sog-1.2-update Aug 10, 2022
@veteran29
Copy link
Member

Thanks!

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
* 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
* 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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants