Commit Graph

459 Commits

Author SHA1 Message Date
82e59f0578 RHS Compats - Add [CSW] prefix to magazines (#8798)
* afrf csw prefix

* rhsusf magazines

* fix stringtable erros

* fix stringtables, second attempt

* missing STR_

* Add missing hyphen and capitalize F

Co-authored-by: Serg Vergun <1197314+severgun@users.noreply.github.com>
2022-01-30 11:55:46 -06:00
1ea81f09a5 Fix RHS LMGs being classed as closed bolt systems (#8793) 2022-01-25 19:33:05 -06:00
4d53d9ce44 Translation - Korean v2.0 (#8768)
* Add files via upload

* Add files via upload

* Delete stringtable.xml

* Delete advanced_ballistics directory

* Add files via upload

* Add files via upload

* Add files via upload

* Normalize line endings

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-01-12 14:41:09 -06:00
5332059738 SOG Compat - Remove Vanilla systems left in CfgVehicles (#8708)
* init commit

* review changes

* removed Land_vn_building_base import

* case sensitive includes

* changed to use script_component.hpp

* config style

* config style

* config style

* config style

* revert to define

* defines.hpp

* defines.hpp

Co-authored-by: commy2 <commy-2@gmx.de>
2021-12-18 17:14:15 -06:00
c6ed114758 Compats - Fix RHSUSF water Jerry Can having refuel actions (#8717) 2021-12-17 18:35:41 +01:00
efa1980990 Compats - Add SOG helmet hearing and dust protection (#8718) 2021-12-17 10:48:22 -06:00
8cea7f4007 RHS Compats - Fix various UBCs (#8688) 2021-11-28 02:11:39 +01:00
604f169ba5 Repair - Support all modded toolkits (#8595) 2021-11-11 12:41:25 +01:00
f8e06b49a2 SOG Compat - Add isDamageAllowed check to punji damage handler (#8670)
* SOG Compat - Exclude invulnerable units from punji damage handler

Title. Previously, even units with damage disabled would still have wounds added upon triggering punji traps.

* Implement lazy select

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

Co-authored-by: commy2 <commy-2@gmx.de>
2021-11-09 13:49:36 -06:00
7bc6fdfa66 Cleanup - Trim all trailing whitespace (#8651) 2021-10-30 16:42:03 -05:00
b36dac75bf RHS USAF Compat - Add RHS Jerrycan as usable Jerrycan (#8603)
* Add RHS Jerrycan as usable Jarrycan

* Make RHS Jerrycan cargo loadable

* Support both jerrycan camo's

* Add missing canLoad property

* Update optionals/compat_rhs_usf3/CfgVehicles.hpp

Co-authored-by: jonpas <jonpas33@gmail.com>
2021-10-25 18:18:40 -05:00
909a38bc59 SOG Compat - Barrel swapping for M60, PK and M63A (#8582) 2021-10-24 12:59:41 -05:00
f97359cf5f GM Compat - Credit and cleanup (#8579) 2021-10-22 21:02:05 +02:00
2252eab2f3 SOG Compat - Jam types and Open bolts (#8563)
* SOG Compat - Jam types and Open bolts

- Machineguns and SMGs fire from open bolts
- Fire and Dud Jam types for Grenade Launchers, Revolvers and Shotguns

* Update CfgWeapons.hpp

* Update pistols.hpp

* Update weapons.hpp
2021-10-19 15:26:00 -05:00
845b813672 GM Compat - Jam types and Open bolts (#8559)
* GM Compat - Jam Types and Open Bolts

- Belt-fed Machineguns and SMGs fire from open bolts
- Fire and Dud Jam types for Grenade Launchers and Flare Guns

* Update optionals/compat_gm/CfgWeapons.hpp

Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>

* Update optionals/compat_gm/CfgWeapons.hpp

Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>

* Update optionals/compat_gm/CfgWeapons.hpp

Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>

* Update optionals/compat_gm/CfgWeapons.hpp

Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>

* Update optionals/compat_gm/CfgWeapons.hpp

Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>

* Update optionals/compat_gm/CfgWeapons.hpp

Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>

* Update optionals/compat_gm/CfgWeapons.hpp

Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>

* Update CfgWeapons.hpp

Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>
2021-10-18 22:50:04 -05:00
ddbfc3090c Overheating - Fix invalid jamTypesAllowed arrays (#8560) 2021-10-18 19:05:40 -05:00
36b9f35ada Sog Compat - fix csw_m1919a6 string (#8557) 2021-10-18 12:50:15 -05:00
b12af1e0b5 General - Format config classes with consistent spacing (#8550) 2021-10-18 11:56:43 -05:00
e1185def3b GM Compat - Fix inheritance issues (#8546) 2021-10-17 22:15:27 +02:00
88eb4c6cd3 Add ACE support for SOG M63A (#8545)
The ammo for M63A Belt-fed version was not classified as a Belt
2021-10-17 15:01:21 -05:00
e6bc44225f R3F/RHS Compat - Add Ace vehicle damage incendiary (#8537)
* ace_vehicle_damage_incendiary

* ace_vehicle_damage_incendiary
2021-10-16 21:14:13 -05:00
93b7722716 General - Cleanup CfgPatches unit/weapon arrays (#8524)
* General - Cleanup CfgPatches unit/weapon arrays
add test tool
fix refuel pump
fix flashlight pistol transport type
fix iDAB reammo box

* Update config.cpp
2021-10-15 13:48:33 -05:00
916346ae59 General - Format config class defines to coding guidelines (+tool) (#8520)
* General - Format config class defines to coding guidelines (+tool)

* Update tools/config_style_checker.py

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

* Update tools/config_style_checker.py

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

Co-authored-by: jonpas <jonpas33@gmail.com>
2021-10-15 13:47:05 -05:00
72b63f4394 Various - use compile_script macro for new addons (#8516) 2021-10-15 12:53:44 -05:00
c9aa690a4d various - cleanup maintainers in readmes (#8517) 2021-10-15 12:25:42 -05:00
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
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
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
4f0fea8d67 Translations - Polish (#8497)
Add missing Polish translations
2021-10-11 00:27:06 +02:00
625721ac0b No Uniform Restrictions - Update for vanilla 1.98-2.06 (#8495) 2021-10-09 22:53:36 +02:00
536ab0568f Update of Japanese translation (#8492) 2021-10-08 09:05:06 -05:00
7b51e16adf use RHS loadorder for comapts (#8472) 2021-10-05 12:25:38 -05:00
54c9cf6c61 S.O.G. Prairie Fire Compatibility (#8284)
* Added initial compat

* Added G-Forces compatibility

* Added Reload compatibility

* Add fuel capacities to planes and helicopters

* Add fuel capacities to wheeled and tracked vehicles, added fuel cargo config

* Add fuel capacities to OH-6

* Removed custom fuel capacities from Mi-2 with external tanks

* Fix config errors

* Add CSW compatibility for static guns

* Add ACE arsenal to EMM main menu

* Add CBA versioning check for SOG:PF

* Add vn_emm to requiredAddons

required for main menu patching

* Fix arsenal not being added to main menu

* Fix styling of ACE Arsenal button

* Add CSW compat for mortars

* Disable dragging of large statics

* Disable frag for molotov

* Set damage type of melee ammo

* Add custom damage handling for punji traps

* Add ACE Explosives compat to M18 Claymores

* Improve digDistance of Claymore x3

* Add ACE Explosives compat to M14 and M16 mines

* Add Explosives compat for M16 Trip Wire mines

* Add Explosives compat for F1 Trip Wire mines

* Add Explosives compat for Arty Shell Trip wire mine

* Improve interaction points for explosives

* Add Explosives compat for Satchel charge and AT mine

* Add Explosives compat for Punji traps, improve comments

* Add Explosives compat to M112 Breaching charge

* Rename mines.hpp to explosives.hpp

* Allow digging spiderholes with entrenching tool

* Fix minor config errors

* Add CSW pictures, models and stringtable entries

* Add missing stringtable entries

* Add CSW weapon pictures and stringtable entries

* Handle punji trap damage with disabled medical

* Disable cookoff for bicycles

* Remove custom digging tools (needs deeper changes)

* Improve spiderhole digging translation

* Fill CfgPatches units and weapons arrays for Zeus

* Add witty comment

* Use lowercase for external component names

* Fix indentation

* Fix missing base class

* Remove accidentally added files

* pboProject fixes for S.O.G. Prairie Fire Compatibility (#8311)

* Change macros to work with pboproject

* Add placeholders for VN p3d files

* Add ending newlines

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

* Fix UBC

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

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2021-10-05 13:28:43 +02:00
efe09682cc Add SQFC support (#8235)
* sqfc

compile_script
cba 3.15.5 and update make.py

* \n

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

* Update make.py

Co-authored-by: jonpas <jonpas33@gmail.com>
2021-09-03 19:08:34 -05:00
01d6fdf97a Add TZ-8-255B1 to refuel vehicles (#8359) 2021-08-23 12:52:10 -05:00
cb3adc22c0 RHS ARF Compat - Add ammo URAL & Kamaz, wirecutter backpacks and crew helmet (#8308)
* RHS ARF Compat - Add ammo URAL & Kamaz

Add the RHS_Ural_Ammo_Base and rhs_kamaz5350_ammo_base into the config to allow them to be used for rearming.

* Add wire cutter backpacks

* Missed the inheritance

* Add new tank crew helmet
2021-07-24 00:23:23 -05:00
2513ef25de Add optionals to validation tools (#8290) 2021-06-29 13:21:08 -05:00
f96b410fa0 Translations - Spanish (#8229)
Complete to date spanish translation.
2021-04-26 11:48:02 -05:00
af4b9dffc3 RHS ARF Compat - Fix RPK74M wrong ammo bug (#8223)
* Fixed RPK74M wrong ammo bug

* Fix wrong deleted lines of code

* Edit rjs_weap_rpk74_base to rhs_weap_rpk_base

Co-authored-by: Dabako <github@dabakoworld.de>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-04-21 22:38:08 -05:00
6d20d62063 RHS USAF Compat - Nightforce NXS scopes updated (#8222) 2021-04-21 21:11:12 +02:00
46c7bff1de Particles - Fix macro (#8214)
* initial push

* Update script_component.hpp

* Update script_component.hpp

* Update script_component.hpp
2021-04-19 11:31:07 -05:00
75f7ed7532 Utilize isNotEqualTo (#7929)
* Utilize isNotEqualTo

* undo changes to some files

* redo some changes, fix based on @Vdauphin 's comment

* fix validator issues

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-02-27 11:05:05 -06:00
174df77564 R3F Compat - Update to the R3F weapons 3.7.1 (#8078) 2021-02-08 04:45:36 +01:00
718535ca3b RHS Compat - Add ACE_GForceCoef value for DF-15 uniforms (#8039)
* Add DF-15 GForceCoef Value

This adds missing ACE_GForceCoef value for DF-15 uniforms.

* DF-15 PR - cfgWeapons formating

DF-15 PR - cfgWeapons formating

* DF-15 PR - cfgWeapons formating II

Forgot to save it with braces and spaces around =

* Update CfgWeapons.hpp

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-12-30 19:43:00 -06:00
e384666455 Compat RHS USAF - Fix CH-47 ramp actions (#7918) 2020-09-29 19:04:25 +02:00
e9b2087faf mk11 mod 0 ec inheritance (#7874) 2020-08-24 19:34:43 -05:00
c51fd0fd8f RHS Compat - Fix RHS:GREF M21/G36 weapons (#7806)
* m21 / g36 cleanup

* remove m84

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-07-22 10:37:34 -05:00
a5fba9fe8e RHS Compat - Add RHS:SAF compat (#7793)
* initial skeleton

* mrud mines

* more mines

* explosives

* compat checking

* ballistics

* handgun

* ak api
2020-07-22 10:36:57 -05:00
2f5c602316 RHS Compats - Fix inheritance on some weapons (#7784) 2020-07-22 10:25:09 -05:00
0de67b69b2 Compat_rhs_usf3 - Improve RHS:USAF explosives compatibility (#7736)
* cleanup

* tripwire mines
2020-06-13 15:58:20 -05:00