Commit Graph

120 Commits

Author SHA1 Message Date
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
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
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
PabstMirror
a8c51cc571 RHS Compat - Update hearing configs values for helmets (#6891)
Close #6884
2019-03-25 10:07:31 +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
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
Dedmen Miller
e2ac18a05d [WIP] Fix script errors reporting wrong line numbers (#6407)
* advanced_ballistics

* advanced_fatigue

* advanced_throwing

* ai

* aircraft

* arsenal

* atragmx

* attach

* backpacks

* ballistics

* captives

* cargo

* chemlights

* common

* concertina_wire

* cookoff

* dagr

* disarming

* disposable

* dogtags

* dragging

* explosives

* fastroping

* fcs

* finger

* frag

* gestures

* gforces

* goggles

* grenades

* gunbag

* hearing

* hitreactions

* huntir

* interact_menu

* interaction

* inventory

* kestrel4500

* laser

* laserpointer

* logistics_uavbattery

* logistics_wirecutter

* magazinerepack

* map

* map_gestures

* maptools

* markers

* medical

* medical_ai

* medical_blood

* medical_menu

* microdagr

* minedetector

* missileguidance

* missionmodules

* mk6mortar

* modules

* movement

* nametags

* nightvision

* nlaw

* optics

* optionsmenu

* overheating

* overpressure

* parachute

* pylons

* quickmount

* rangecard

* rearm

* recoil

* refuel

* reload

* reloadlaunchers

* repair

* respawn

* safemode

* sandbag

* scopes

* slideshow

* spectator

* spottingscope

* switchunits

* tacticalladder

* tagging

* trenches

* tripod

* ui

* vector

* vehiclelock

* vehicles

* viewdistance

* weaponselect

* weather

* winddeflection

* yardage450

* zeus

* arsenal defines.hpp

* optionals

* DEBUG_MODE_FULL 1

* DEBUG_MODE_FULL 2

* Manual fixes

* Add SQF Validator check for #include after block comment

* explosives fnc_openTimerUI

* fix uniqueItems
2018-09-17 14:19:29 -05:00
PabstMirror
75f8a35d3d
RHS Compat - Simplify HuntIR mag config (#6580)
* RHS Compat - Simplify HuntIR mag config

* x
2018-09-17 13:22:18 -05:00
PabstMirror
429ecb6171
RHS Compats - Update bases classes for RHS 4.6 (#6529)
* RHS Compats - Update bases classes for 4.6

* Update CfgMagazines.hpp

* Update CfgWeapons.hpp
2018-09-13 00:29:30 -05:00
Dystopian
364f84d382 Fix RHS static turrets interaction point (#6567) 2018-09-12 16:12:05 -05:00
shukari
8a81e3b675 Geforce, RHS Geforce adjustments and MH6M can now fastrope (#6439) 2018-07-19 22:54:06 -05:00
PabstMirror
a828ebe591
Repair - Disable repair on ERA/Slat armor hitpoints (#6283)
* Repair - Disable repair on ERA/Slat armor

Disable "miscRepair" action for all era and slat armor hitpoints.
Can still be repaired via "Full Repair"

* Minor perf improvment

* Add hitpoint names for 1.82 comTurret/gun

* Fix russian translations
2018-04-19 12:31:00 -05:00
PabstMirror
10a3a29ea0
Drop FCS from aircraft (#6265) 2018-04-13 23:08:39 -05:00
PabstMirror
4b42eb4385
ST Nightvision Effects (#4694)
* Merge ST Nightvision

* Cleanup

* Header cleanup

* Add ace setting for fog

* Cleanup debug

* Manual merge refuel changes

* Add new setting for effect scaling

* Cleanup

* Use ace_common_fnc_getZoom

* Fix compat inheritance changes

* Fix stringtable

* Add category

* Tidy function headers

* Replace global event with remote event
2017-12-06 13:15:33 -06:00
ulteq
d6164cbc50 Advanced Ballistics - Muzzle variation: Compatibility update 2017-11-23 14:36:36 +01:00
PabstMirror
70c25aacaf cargo - use getInteractionDistance to get better distance (#5697) 2017-11-10 15:28:12 +01:00
armyinf0703
f30727e566 fixes shemagh having overlay despite no goggles (#5665)
RHS Compatibility - fixes shemagh having overlay despite no goggles
2017-10-24 13:39:45 -05:00
Dedmen Miller
a614744e31 AB compat rail/scope height update (#5650)
* Compat rail/scope height update

* fix
2017-10-23 15:02:48 +02:00
Dystopian
f6fd0095f7 Add compat for RHS 0.4.3 new vehicles (#5619) 2017-10-14 11:56:12 -05:00
Dedmen Miller
b51adcec3e RHS 3.4 Goggles and AB Ammo compat update (#5607)
* Oakley SI ballistic goggles

* Shemags and ess goggles

* 556x45 M855
2017-10-11 14:05:17 -05:00
Whigital
39abfc78db [compat_rhs_usaf] Reload Launchers and Overpressure (#5589)
* Add ace_reloadlaunchers capability and ace_overpressure config to Mk
153 SMAW launcher
* Add ace_reloadlaunchers capability and ace_overpressure config to M3
MWAAS launcher
2017-10-10 10:27:49 -05:00
Willard
51b1cd6023 Missile guidance for RHS hellfire and DAGR (#5444)
* rhs hellfire missileguidance

* tabs to spaces

* added support for -N and -M launcher, removed ir/radar locking

* added missing macro

* Switch to using pylon system
2017-10-06 15:31:48 -05:00
PabstMirror
760665f65f Leave ACE_FCS off by default (#5580) 2017-10-03 11:57:07 -05:00
PabstMirror
ef25aaff02 Fix UBC for RHS 4.3 (#5574) 2017-10-01 12:31:01 -05:00
Dystopian
559a498e6d Add fast mouse actions to refuel, add refuel eden attributes (#5418)
* Add fast mouse actions to refuel

* nobody seen that

* Add interaction condition and refuel on ladder

* Add car hit, fix change weapon on uncon

* Replace objNull with nil in setVar, unify var names

* Delete *ConnectNozzle functions

* Delete reset* functions

* Add public function and eden attributes

* Remove static actions from RHS compat

* Remove statusEffect_set on respawn

* Fix dual menu, add deprecating message

* Optimize fnc_takeNozzle

* Cleanup
2017-09-10 14:43:03 -05:00
PabstMirror
e7ebbd5750 Customized map lighting for vehicle interiors (#5401)
* Customized map lighting for vehicle interiors

* Tabs for cases

* Add wiki for new configs

* V
2017-08-22 13:13:03 -05:00
PabstMirror
ace3964655 compats - Fix config name for resupply vics (#5300) 2017-06-22 16:47:06 +02:00
PabstMirror
f35f80ee82 Rearm - Pylon Support and Dynamically Add Supply Actions (#5183)
* Dynamic Add

* Support 1.70 Pylon Loadouts

* Properly handle old compat pbos - Update RHS Compat

* Re-add documentation

* cleanup headers (note from other pr)

* Cleanup

* Fix var spelling
2017-06-08 11:47:52 -05:00
magicsh0tz
cd852477c8 CH53 Fastroping and other fixes (#4713)
* CH53 Fastroping and Fixes

Added fastrope points for CH53.

The getOut EH is required to keep the doors open when a unit exits the
vehicle and it uses the vehicle animation "doorHandler_R" or
"doorHandler_L" as a placeholder to determine if the doors are
open(1)/close(0).
eg. In UH1Y (Unarmed), when the right door is opened using the
useraction, "doorRB" and "doorHandler_R" will be set to 1.

* Changed TAB to 4 spaces

* Moved bracket to follow guidelines
2017-05-29 12:55:53 -05:00
PabstMirror
772ca1313e RHS CH-47 - use animationSourcePhase (#5201) 2017-05-26 08:54:12 -05:00
PabstMirror
9ba3b5aa6a Update helmet hearing protection for RHS-US (#5146)
* Update helmet hearing protection for RHS-US

* Hearing - Add standardized helmet protection macros

* Tweak peltor vol
2017-05-16 21:40:07 -05:00
PabstMirror
f69148bdc0 Disable rearm,refuel on dead vehicles (#5158) 2017-05-13 17:36:53 -05:00
PabstMirror
4cdc323fdf Fix Javelin for AI for RHS (#5096) 2017-04-22 11:18:15 -05:00
PabstMirror
7bb3798217 Fix RHS mp7 UBC (#5085) 2017-04-16 09:09:50 -05:00
J3aLeiNe
9763defd10 AB : compats RHS 4.2 updated (#4879)
* Update CfgWeapons.hpp

* Update CfgWeapons.hpp

* Update CfgWeapons.hpp

* Update CfgAmmo.hpp

* Update CfgWeapons.hpp

* Update CfgWeapons.hpp

* Update CfgWeapons.hpp

* Update CfgWeapons.hpp

* Update CfgWeapons.hpp

* Update CfgWeapons.hpp
2017-02-11 14:24:54 -06:00
PabstMirror
ac0292d738 Fix RHS m113 compat (#4881) 2017-02-10 12:49:55 -06:00
PabstMirror
39181fdea5 Simplify huntIR configs using += (#4521)
* Add huntIR magazine to GL_3GL_F via sub config

* Cleanup RHS 40mm huntIR GL config

* Add huntir to standalone m320 - #4199
2017-01-09 12:11:31 -06:00
bux578
f544d82472 add optionals meta.cpp files (#4763) 2016-12-15 10:55:44 -06:00
jonpas
1ecd674ac6 Exclude uniforms with inherited modelSides (#4720) 2016-12-12 19:36:53 +01:00
PabstMirror
962903f201 Unify javelin guidance for RHS ammo (#4737) 2016-12-01 11:01:24 -06:00
magicsh0tz
ed0fd5f6f6 Switched to CBA_fnc_waitAndExecute (#4709)
* Switched to CBA_fnc_waitAndExecute

* Switched to CBA_fnc_waitAndExecute
2016-11-25 19:18:04 +01:00
PabstMirror
e67c9512ba Remove unneeded functions 2016-11-16 17:53:04 -06:00
PabstMirror
da85fc1be5 Add RHS MELB fastrope, add 3d debuging of mem points
Close #4683
Config from @Whigital
2016-11-16 17:42:11 -06:00
PabstMirror
5bf8b642f7 Add cargo configs for some planes (#4650) 2016-11-10 12:05:08 -06:00
PabstMirror
97c02c306b Disable FCS on RHS helicopters (#4509)
* Disable FCS on RHS helicopters - Close #4495

* Cleanup
2016-10-05 13:03:52 -05:00
PabstMirror
6ad15e02c7 Fix spotting rifle loudness (#4488) 2016-09-30 15:10:20 -05:00
Glowbal
b489750d5b Minor optimizations using private, params, and isEqualType (#4323)
* Optimizations with private, params, and isEqualType

* Fixed tab being used instead of space

* Fixed tabs inserted by notepad++

* More usage of new private syntax and params

- changed a few checks for an array being empty to `_arr isEqualTo []`
rather than `count _arr == 0`
- added more uses of `private` on the same line as the variable is
declared
- added more uses of params to assign variables passed as parameters
- removed unnecessary parentheses
- removed several unnecessary variable declarations with private array
syntax

* clean up and formatting
2016-09-04 16:44:22 +02:00
J3aLeiNe
7220d0ee5d compat RHS US : Change for default ACE_12.7x99 (#4184)
* Change for default ACE_12.7x99

 - rhsusf_ammo_127x99_M33_Ball = B_127x99_Ball from addons/ballistics/CfgAmmo.hpp

 - rhsusf_ammo_127x99_mk211 = ACE_127x99_API from addons/ballistics/CfgAmmo.hpp

* Default ACE3 12.7x99 and recheck bullets values

 - 7.62 M993 : fix Ballistic Coefficient and Mass according with ballistics/CfgAmmo.hpp
 - 7.62 M993 : add a muzzle velocity according with the Mk11 Mod0 barrel length (609.6mm) and the M14 EBR-R1 barrel length (558.8mm) (empiric, not perfect but better than nothing)
 - recheck all bullets values

* Accurate M249s' barrel length

* Little add and fix for Atragmx "GunList" (#1)

- add 12.7x99 API
 - fix .408 "Mass" according with the ballistics/CfgAmmo.hpp
 - fix .300WM MK248 Mod0 "Mass" according with the ballistics/CfgAmmo.hpp
 - Typo Mod0, Mod1 for a better reading on the Atrag's panel
 - fix .308 M80 "Mass" according with the ballistics/CfgAmmo.hpp
 - add .308 Mk316
2016-09-03 22:00:15 +02:00