Commit Graph

461 Commits

Author SHA1 Message Date
GhostIsSpooky
70d637bcb6
fix stringtables (#8809) 2022-02-03 17:19:11 -06:00
GhostIsSpooky
9ff5d34ce7
Common - Add cache to fnc_isModLoaded (#8794)
* add isModLoaded cache

* add missing brackets

* missed one

* Update fnc_handlePunjiTrapDamage.sqf

* Update fnc_isModLoaded.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-01-30 11:56:20 -06:00
GhostIsSpooky
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
Whigital
1ea81f09a5
Fix RHS LMGs being classed as closed bolt systems (#8793) 2022-01-25 19:33:05 -06:00
jtj5283449
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
Ellis Nielsen
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
Whigital
c6ed114758
Compats - Fix RHSUSF water Jerry Can having refuel actions (#8717) 2021-12-17 18:35:41 +01:00
Whigital
efa1980990
Compats - Add SOG helmet hearing and dust protection (#8718) 2021-12-17 10:48:22 -06:00
PabstMirror
8cea7f4007
RHS Compats - Fix various UBCs (#8688) 2021-11-28 02:11:39 +01:00
Filip Maciejewski
604f169ba5
Repair - Support all modded toolkits (#8595) 2021-11-11 12:41:25 +01:00
Zman6258
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
PabstMirror
7bc6fdfa66
Cleanup - Trim all trailing whitespace (#8651) 2021-10-30 16:42:03 -05:00
Dedmen Miller
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
ZluskeN
909a38bc59
SOG Compat - Barrel swapping for M60, PK and M63A (#8582) 2021-10-24 12:59:41 -05:00
jonpas
f97359cf5f
GM Compat - Credit and cleanup (#8579) 2021-10-22 21:02:05 +02:00
ZluskeN
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
ZluskeN
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
mharis001
ddbfc3090c
Overheating - Fix invalid jamTypesAllowed arrays (#8560) 2021-10-18 19:05:40 -05:00
PabstMirror
36b9f35ada
Sog Compat - fix csw_m1919a6 string (#8557) 2021-10-18 12:50:15 -05:00
Björn Dahlgren
b12af1e0b5
General - Format config classes with consistent spacing (#8550) 2021-10-18 11:56:43 -05:00
Björn Dahlgren
e1185def3b
GM Compat - Fix inheritance issues (#8546) 2021-10-17 22:15:27 +02:00
ZluskeN
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
Laid3acK
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
PabstMirror
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
PabstMirror
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
PabstMirror
72b63f4394
Various - use compile_script macro for new addons (#8516) 2021-10-15 12:53:44 -05:00
PabstMirror
c9aa690a4d
various - cleanup maintainers in readmes (#8517) 2021-10-15 12:25:42 -05: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
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
Krzyciu
4f0fea8d67
Translations - Polish (#8497)
Add missing Polish translations
2021-10-11 00:27:06 +02:00
jonpas
625721ac0b
No Uniform Restrictions - Update for vanilla 1.98-2.06 (#8495) 2021-10-09 22:53:36 +02:00
classic
536ab0568f
Update of Japanese translation (#8492) 2021-10-08 09:05:06 -05:00
Dedmen Miller
7b51e16adf
use RHS loadorder for comapts (#8472) 2021-10-05 12:25:38 -05:00
BaerMitUmlaut
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
PabstMirror
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
Salluci
01d6fdf97a
Add TZ-8-255B1 to refuel vehicles (#8359) 2021-08-23 12:52:10 -05:00
DomT602
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
Björn Dahlgren
2513ef25de
Add optionals to validation tools (#8290) 2021-06-29 13:21:08 -05:00
Abogado
f96b410fa0
Translations - Spanish (#8229)
Complete to date spanish translation.
2021-04-26 11:48:02 -05:00
Dabako
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
Laid3acK
6d20d62063
RHS USAF Compat - Nightforce NXS scopes updated (#8222) 2021-04-21 21:11:12 +02:00
TyroneMF
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
Neviothr
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
Laid3acK
174df77564
R3F Compat - Update to the R3F weapons 3.7.1 (#8078) 2021-02-08 04:45:36 +01:00
YetheSamartaka
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
Whigital
e384666455
Compat RHS USAF - Fix CH-47 ramp actions (#7918) 2020-09-29 19:04:25 +02:00
Whigital
e9b2087faf
mk11 mod 0 ec inheritance (#7874) 2020-08-24 19:34:43 -05:00
Whigital
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
Whigital
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
PabstMirror
2f5c602316
RHS Compats - Fix inheritance on some weapons (#7784) 2020-07-22 10:25:09 -05:00
Whigital
0de67b69b2
Compat_rhs_usf3 - Improve RHS:USAF explosives compatibility (#7736)
* cleanup

* tripwire mines
2020-06-13 15:58:20 -05:00
Whigital
da7a7107ea
Compat_rhs_gref3 - Add RHS:GREF explosives compatibility (#7735)
* initial

* more mines

* mines mines mines

* last mine batch

* tnt
2020-06-13 15:58:00 -05:00
Whigital
8882434200
Compat_rhs_afrf3 - Add RHS:AFRF explosives compatibility (#7734)
* initial + tm62m

* more mines and explosives

* more mines

* add defuse positions

* additional dependency

Two of the mines (rhs_mag_mine_pfm1 & rhs_mag_mine_ptm1) are defined in rhs_c_airweapons

* remove redundant attributes
2020-06-13 15:57:28 -05:00
Lazejun
a5ba5abb42
RHS Compat ADD Missing (undefined) Weapons (#7702)
* Added Missing Values

* M240G Added

* Update CfgWeapons.hpp

* Update CfgWeapons.hpp

* Update CfgWeapons.hpp

* Update CfgWeapons.hpp

* Update CfgWeapons.hpp

* Revert "Merge remote-tracking branch 'upstream/master' into RHS-Compat-CFG-Weapon-fixes"

This reverts commit d14bcb64e4, reversing
changes made to dbaea26161.

* Revert "Revert "Merge remote-tracking branch 'upstream/master' into RHS-Compat-CFG-Weapon-fixes""

This reverts commit 65709b70f8.

* Update CfgWeapons.hpp

* Update CfgWeapons.hpp

* minor config style change

* minor config style

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-06-13 15:55:05 -05:00
Fyuran
eaa23cc84f
-fix to RHS USAF ACE Compatibility Mod Error - no entry 'bin\config.bin/CfgVehicles/RHS_CH47F/UserActions/OpenCargoDoor.displayName'. #7708 (#7711) 2020-06-05 20:01:59 -05:00
Joko
d32d8e8fb5
Fix inheritence issue for m14ebrri for RHS 0.5.1 (#7705) 2020-05-10 17:20:56 +02:00
classic
85f67ac883
Update Japanese translation (#7568) 2020-03-09 11:26:20 -05:00
Laid3acK
f9674b3ef9
realisticdispersion 2020-02-27 06:17:15 +01:00
Whigital
95c213fd2b Update GREF with WeaponSlot comment 2020-01-31 18:42:19 +01:00
Whigital
b4ac3301c8 Update AFRF with WeaponSlot comment and author property 2020-01-31 18:41:37 +01:00
Whigital
cf732c17fc Update USAF with WeaponSlot comment 2020-01-31 18:33:16 +01:00
Whigital
0b4a38de89 Remove GREF mag defs 2020-01-30 23:22:46 +01:00
Whigital
9aacdf3628 Remove AFRF mag defs 2020-01-30 23:22:36 +01:00
Whigital
bd90b1ae89 Remove USAF mag defs 2020-01-30 23:21:59 +01:00
Whigital
93173d43b2 Add magazines to carryable statics 2020-01-30 23:17:15 +01:00
Dedmen Miller
8f1bf259e3 Fixed: RHS Compatibility - Remove scope adjust from ACOG Scopes (#7375)
* Remove scope adjust from RHS ACOG Scopes

* Set RHS ACOG ScopeAdjust to zero

For ACE Arsenal stats
2020-01-09 14:42:54 -06:00
Keewayz
e908345eae Additions to Polish Translation (#7374)
* Addition to Polish translation

*added missing polish translation up to adv_ballistic, adv_fatigue, ballistics, common, cookoff, explosives, grenades, medical_statemachine, medical_treatment, rearm, spectator, switchunits, weather

* Next Addition to Polish translation

#some missing stuff

* Apply Code Review Suggestions

Co-Authored-By: Filip Maciejewski <veteran29q+github@gmail.com>

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2020-01-07 13:53:02 -06:00
Brandon Danyluk
fc13775786 Update CSW RHS compat for new Mk-19 ammo type (#7354)
* Update RHS compat for new Mk-19 ammo type

* Formatting fix
2020-01-02 21:57:30 -06:00
D3L7A01
14b1ca5b83 Italian Translations (#7346)
* Add some translation eng to ita

* Translation eng-ita completed

Translation completed from English to Italian finally completed, I hope there is no problem but I would like to communicate that during the translation I carelessly "translated" and placed two names in objects, I leave you the id
1. STR_ACE_Medical_Blood_EnabledFor_Description
2. STR_ACE_Tracers_100Rnd_580x42_Drum_yellow
I hope I haven't done any damage :)
PS: Thanks again for this wonderful mod
Good luck with all upcoming updates

* Some erros(?)

Some erros(?) Rows 3 to 5 are highlighted red I hope there is no problem XD

* fix tabs first

* re-add moved

* fix merge

* Update stringtable.xml

* fix STR_ACE_Medical_Blood_EnabledFor_Description

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-01-02 21:52:40 -06:00
TBakerBR
b2731d79d2 Portuguese Translations (#7347) 2020-01-02 03:53:52 +01:00
Brandon Danyluk
f2fff98ad0 Add AGM-114L Active Radar Homing Hellfire (#7337)
* Create AGM-114L

* If we lose LOS dont continue tracking magically Allow for datalinked targets to donate data to the missile.

* Update documentation

* RHS 2x hellfire compatability

* Make ARH more realistic by not allowing to switch targets after firing

* Fix filename. Change Hellfire attack profile to lead target. Switch to two LOS checks.

We check two Line's of Sight to ensure that we are 100% gone from the target. A raw LOS check will be blocked by bushes and light trees while the checkVisibility wont while on the otherhand smoke will block a visiblity check but not a raw LOS check. We get best of both worlds with this.
I changed the attack profile so that it will lead moving targets. This isnt needed with the laser version because the user will "lead" the target if needed, but with the radar scan we have velocity information so we might as well lead the target as much as possible

* Change function calls to FUNC macro. Slightly change radar logic. Up poll frequency to 7hz

Instead of the missile immediately going active when the shooter doesn't have radar, check if targets are in datalink. If they are, use the datalink to guide the missile instead of its internal radar.

* Add logic for missiles launched without target

If a missile is fired without a locked target, it will immediately go active and target the first thing its seeker picks up. This is an incredibly dangerous trait of active radar homing missiles and is so in this implementation. Be careful!

* Change from `exitWith` to basic `then`

Legacy code that never got changed. This is essentially what happened before

* Update CfgMagazineWells.hpp

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2019-12-30 12:29:08 -06:00
Dominik Butschek
331d47c04e Addition to Czech translation (#7319)
* czech translation up to exlosives

* The rest of czech translation

* restore some lost in merge

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2019-12-20 13:38:53 -06:00
Blutze
1e1253e38e RHS Compat - Change IHADSS hearing to crew, add pilot visors (#7312)
* change ihadss hearing to crew, add us visors

* add russian visors

* aceify colons in us file

* aceify colons in russian file
2019-12-19 10:20:20 -06:00
Laid3acK
f57fe99e9a RKSL compat - Updated with the last RKSL v3.01 (#7310) 2019-12-18 19:00:10 +01:00
mharis001
2b4d807acc Add stringtable validation tool (#7274)
* Add stringtable validation tool

* Add to CI
2019-11-18 12:48:40 -06:00
jonpas
2c5df0be77
Update No Uniform Restrictions for vanilla 1.92-1.96 (#7259) 2019-10-31 04:18:08 +01:00
Björn Dahlgren
81badb5853 Update RHS USF static weapon carry icons (#7221) 2019-10-04 19:02:11 -05:00
Björn Dahlgren
9b124cf4a2 Update RHS AFRF static weapon carry icons (#7220) 2019-10-04 19:01:59 -05:00
PabstMirror
9ffca544a6
Advanced Throwing - Call muzzle EH and fix RHS inheritance (Compat with RHS 0.4.9) (#6879)
* Advanced Throwing - Call muzzle EH and fix RHS inheritance

* UBC for rhs
2019-08-11 17:59:05 -05:00
PabstMirror
3e97d99893 Merge branch 'master' into cswSuperBranch
Conflicts:
	optionals/compat_rhs_usf3/CfgMagazines.hpp
	optionals/compat_rhs_usf3/config.cpp
2019-07-25 15:19:17 -05:00
Whigital
cf389fba76 [compat_rhs_usf3] ACE Explosives functionality for RHS USAF (#7099)
* Enable ACE Explosives functionality for RHS USAF explosives

* Update with requested changes

* Reorder requiredAddons as per suggestion
2019-07-12 10:04:12 -05:00
PabstMirror
8763184b6a
CSW/Dragon cleanup and rearm compat (#7068)
* Dragon work

cleanup
remove unused p3ds
add pos_gunner_dir/pos_gunner to static
add [csw] prefix to arsenal version
add sight interaction icons

* Update fnc_staticWeaponInit_unloadExtraMags.sqf

* ace_rearm compat

allows pulling carry mags out of rearm trucks

* Update fnc_ai_handleFired.sqf

* Re-add 3den attributes

* cleanup and move A2 staticweapon strings to ace_csw
2019-07-05 17:57:22 -05:00
Brandon Danyluk
7b13a75305 RHS CSW compatability (#7082)
* Initial Commit

* Got rid of unneeded translation values

* Updated Strings

* "Fixed" issue where when you deploy the tripid and weapon on slope it freaked out.

* Fixed locality issues. Added timers to relavent functions.

* Added weights to all magazines/tripod. Weights to weapons coming soon when I transfer them to the launcher slot

* Fixed bug regarding localized strings. Created new tripod model

* Added timers for deploying/picking up the tripod. Changed ammo-box model from custom to one already in ARMA. Changed gun-bag model for a more generic one. Created a texture for the tripod and gunbag

* Removed ability to disassemble weapons via the addAction. Added  ACE Action to get in due to a memory point issue. Changed from a static deploy/dismount time to one based in the weapon configs

* Created forward-compatability. Made it so I can define a base plate for any weapon if I ever want to expand from the generic M3 Tripod.

* Fixed bug where tripod wouldn't deploy with the correct times. Fixed bug where if you moved the tripod into the ground it would go flying.

* Added mortar compatability. Will probably shift whole mortar ammo loading to CSW one day

* Added icons to each relavent item

* Added README, possibly fixed bug where if you are in a weapon others cant load/unload ammo. Changed distance you can interact with weapons

* Added checks for when deploying the gun as well as unloading ammo to prevent duplication/deletion of items.

* Added documentation

* Added order to doc

* Explained why things are the way they are

* Remove temp files

* Removed redundant files

* Converted tabs->spaces. Added newlines at end of all files. Changed broken line in fnc_tripodDeploy.sqf.

* 100% newlines at end of file

* Added newlines to files that didnt get the change. Fixed README. Changed from GVAR(cswOptions) to GVAR(options). Changed from tabs to spaces in wiki

* Fixed issue with UAV assembling with enableWeaponDisassembling. Fixed bug where game would crash if you disassembled static weapon with more than 1 magazine

* Tabs->Spaces

* Added CSW options to base StaticWeapon class to allow for easier additions. Switched default mortar away from CSW system due to incompatabilities

* Lazy Evaluations and macros to describe how things work.

* Added newlines to script_component. Fix no-texture issue on tripod. "Fix" 20mm HE saying 40mm HE. Add custom icons to all weapons. Move "Check Ammo" to CSW menu

* abc

* Revert "abc"

This reverts commit bcb4214bd9.

* Update to current commit

* Revert changes to fortify.md

* Updated UI Icon to Crew Served Ammo branch UI

* Added Pabst's CrewServedAmmo to handle ammo loading/unloading instead of my solution

* Fixed bug where currentWeaponTurret returned a blank string when a player hasent entered hte weapon to select the current weapon

* Re-added ammo loading time

* Tabs->Spaces

* Newline at end of files

* Removed replaced functions

* Remove redundant strings. Move ammo handling to appropiate section

* Tabs->Spaces

* Update wiki

* Updated to fix crash with default weapons and disable CSW ability on default static weapons

* Added editor attributes to enable/disable CSW at edit time

* Change how ammo is removed from the CSW. Uses math instead of iteration

* Fix bug where assembled weapon did not get rid of default actions

* Added support for multiple types of ammo in one CSW

* Add tracer magazines for .50 cal

* Fix bug where you could load ammo even if the gun couldnt take any more

* Disable debug and enable compile cache

* Changed weapon deploy/pickup time. Removed custom Titan missiles. Using ACE Dragging now. Added progress bar check for pickupTripod. Updated documentation

* Removed check if CSW is full to unload ammo

* Fix bug where items would spawn underneath other items on wepaon dismount

* Change some things

* Configure base statics, improve returnAmmo

* Add mortar baseplate

* Remove explicit inheritance

* Fix bug where unloading ammo would duplicate it if you had room in your person.

* Tab->Space

* Player couldnt pickup tripod due to legacy code

* Fix GMG_01_base_F inheritce

* Port of ACE 2 tripod + ACE 2 CSW Bag

* Move ACE 2 Data to APL folder

* Adjust weights to make them more accurate to how ARMA uses it and the real life equivalents

* Fix bug where error was thrown on esc from picking up tripod. Tripod rotated 180

* Fix bug where if you called ace_common_claim the weapon could be set to be disassembled even though it may not be wanted via CSW

* Added ability to toggle ammo handling when weaponAssembly is disabled.

* Add Proxy Weapons for all Vanilla static weapons. These serve as a way to allow for realistic ammo reload times without having to modify base classes if you want feautres turned off. Adjusted reload and mount times to be more "realistic"

* Fix Shadow RPT Spam

* Update wiki

* Change order of setDir and setPos

* Change all setDir/setPos orientations. Remove redundant check. Ensure that weapon locked state reflects it with the "getIn" command. Add a way to pass in a specific classname for the weapon assemble type. Add a callback function onDisassemble if user wants to set the state of the new tripod using the old weapon as a reference

* Actually check for the carryWeaponClassname in the deployWeapon check

* Ai Compatiblity

* Add stringtable entries

* Formatting fixes

* Stringtables for settings, fix setMagazineTurretAmmo

* inherit ammo for mags, reorder stringtable

displays correct ammo and descriptionShort

* don't require ace_javelin

* Tweaks, cleanup, localzation, ace_reload changes

change weapon tag to [CSW]
tweak localization strings
minor cleanup
simplify some ace_reload funcs

* delete moved dev func

* Hopefully fix issue where to-be deleted tripod intersects with newly created weapon and vice versa. Remove PBOPREFIX newline

* cleanup/proxyWeapon/mk6 compat

* RHS compatability

* Modified all tripod p3ds to have [0,0,0] at the mount. Ported AGS-30, Kord, M220, and SPG-9 tripods to APL And added them to CSW. Changed RHS compats to use new ported tripods. Changed strings to reflect real names.

* Change from M224 Mortar Bag -> Mk6 Mortar bag

* Add named propert (Autocenter) to make P3D [0,0,0] the center of the object instead of engine calculated

* oh no tabs

* remove some more evil tabs

* fix changes lost in merge

* fix bad merge pt2

* Fix UBC
2019-07-04 17:56:49 -05:00
barman75
d684a8042e Russian translations (#7005)
* Russian translation is done

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Dystopian <sddex@ya.ru>

* Apply suggestions from code review

Co-Authored-By: Dystopian <sddex@ya.ru>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Dystopian <sddex@ya.ru>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Dystopian <sddex@ya.ru>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Dystopian <sddex@ya.ru>

* Update addons/arsenal/stringtable.xml

* Update addons/advanced_fatigue/stringtable.xml

* Update addons/advanced_fatigue/stringtable.xml

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Dystopian <sddex@ya.ru>

* Apply suggestions from code review

Co-Authored-By: Dystopian <sddex@ya.ru>

* next iteration, still WIP

Co-Authored-By: Dystopian <sddex@ya.ru>

* next iteration 2, still WIP, sorry

Co-Authored-By: Dystopian <sddex@ya.ru>

* re-translation in /captives and small fixes in /explosives

* Apply suggestions from code review

Co-Authored-By: Dystopian <sddex@ya.ru>

* Apply suggestions from code review

small fixes

Co-Authored-By: Dystopian <sddex@ya.ru>

* Apply suggestions from code review

Co-Authored-By: Dystopian <sddex@ya.ru>

* minor misspells corrections

Co-Authored-By: Dystopian <sddex@ya.ru>

* minor misspells corrections

Co-Authored-By: Dystopian <sddex@ya.ru>

* /arsenal and /captives resolve

Co-Authored-By: Dystopian <sddex@ya.ru>

* minor changes in /scopes, almost done

Co-Authored-By: Dystopian <sddex@ya.ru>

* Some strings shortened for menu

Co-Authored-By: Dystopian <sddex@ya.ru>
2019-06-03 09:59:13 -05:00
Laid3acK
4ea068535b Ballistics - BI P90 and RHS MP7 updated (#7025)
* rhs_mp7_ammo_46x30_airFriction

* rhs_mp7_mag_46x30_initSpeed

* rhs_mp7_weapon_46x30_BaseAngle

* rhs_mp7_ammo_46x30_airFriction

* bi_p90_ammo_570x28_airFriction

* bi_p90_weapon_570x28_initSpeed
2019-05-30 13:34:18 -05:00
xrufix
604721c769 Fixed incorrect Classnames in Tracer magazines (#7021) 2019-05-28 12:25:28 -05:00
PabstMirror
ece1031c4d
RHS Compat - Add 2 round hellfire to pylon options (#6893)
* RHS Compat - Add 2 rnd hellfire pylon

Close #5957

* change magwell name

* gvar->addon
2019-04-03 11:40:14 -05:00
Dystopian
db6dadb78f Fix config (#6905) 2019-04-01 09:45:36 -05:00
PabstMirror
a8c51cc571 RHS Compat - Update hearing configs values for helmets (#6891)
Close #6884
2019-03-25 10:07:31 +01:00
xrufix
129cc26438 Add magazines with different tracer colors for some vanilla weapons (#6658)
* Add magazines for some vanilla weapons with different tracer colors

* Removed obsolete comment

* unified naming of tracer magazines

* Add CfgMagazineWells

* Add 5.8mm mags

* Add Minimi boxes

* Added 5.56 Drum mags

* Add Katiba and 7.62x51 mags

* Remove magazine macro to make config easier to read and edit.

* Add pictures available in arma files

* Add magazines to vanilla magazinWells

* Fix wrong base class for Katiba tracer mags

* Removed duplicate strings

* delete blank lines in stringtable
2019-03-12 13:32:47 -05:00
Dedmen Miller
187b2f38ce Add rksl pm II 5-25x56 compat (#6845)
* Add rksl pm II 5-25x56 compat

* Combine into existing compat

* Update ace_ScopeAdjus values
2019-03-12 11:26:56 -05:00
jonpas
11f511d660
Update No Uniform Restrictions for Arma 3 v1.88 (#6829)
**When merged this pull request will:**
- Title
2019-02-22 23:24:59 +01:00
PabstMirror
afd957f1e7
HuntIR - Move magwell compat to huntIR config (#6813) 2019-02-13 12:39:10 -06:00
PabstMirror
d379c3f1b7
MissileGuidance - Allow using vanilla fire mode key (#6732)
* MissileGuidance - Allow using vanilla fire mode key

Fix #6595

* Javelin - Backwards compatiblity with CUP

* Add support to RHS compat

* comment
2019-01-30 22:11:01 -06:00
PabstMirror
25c10e8cf6
Ballistics/Realistic Names - Integrate P90 Compat (#6667)
* Ballistics/Realistic Names - Integrate P90 Compat

* Update CfgWeapons.hpp

* Remove old compat addon

* Update addons/realisticnames/stringtable.xml

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Update addons/realisticnames/CfgWeapons.hpp

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Update addons/ballistics/CfgWeapons.hpp

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Update addons/ballistics/CfgWeapons.hpp

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2018-12-03 12:03:49 -06:00
Dedmen Miller
b3e0135e32 Fix Armake problems (#6697)
* Armake model.cfg fix

* Spaces!

* Case sensitive filenames fix
2018-11-29 11:18:22 +01:00
PabstMirror
830536504d
RHS Compat - Fix config (#6696) 2018-11-18 23:51:26 -06:00
jonpas
5bfd64f066 Merge branch 'master' into armake 2018-11-18 20:23:50 +01:00
PabstMirror
6f97a4ad39
RHS Compats - Update allowSwapBarrels for some guns (#6675)
* RHS Compats - Update allowSwapBarrels for some guns

Close #6653

* Update comments
2018-11-17 10:11:47 -06:00