Commit Graph

363 Commits

Author SHA1 Message Date
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