Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
68ed19911a
ACE3/addons/csw/XEH_PREP.hpp

37 lines
831 B
C++
Raw Normal View History

Adds Crew Served Static Weapons (#5652) * 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 bcb4214bd99bba3fec692efa4dca950323da582d. * 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
2019-06-08 04:47:39 +00:00
TRACE_1("",QUOTE(ADDON));
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 22:57:22 +00:00
PREP(aceRearmGetCarryMagazines);
Adds Crew Served Static Weapons (#5652) * 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 bcb4214bd99bba3fec692efa4dca950323da582d. * 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
2019-06-08 04:47:39 +00:00
PREP(ai_handleFired);
CSW - Add reloading from nearSupplies (#8776) * allow players to reload from nearSupplies * limit reloading to friendly sides * add handling for ai getting inside empty weapon * configOf for lookup * add getin handler, hammer out remaining bugs * configOf lookup * improve friendly/object filter * more configOf lookups * Capitalize settings, add ammo storage setting * remove systemChat Co-authored-by: PabstMirror <pabstmirror@gmail.com> * fix TRACE Co-authored-by: PabstMirror <pabstmirror@gmail.com> Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-03-07 18:29:19 +00:00
PREP(ai_handleGetIn);
PREP(ai_reload);
Adds Crew Served Static Weapons (#5652) * 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 bcb4214bd99bba3fec692efa4dca950323da582d. * 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
2019-06-08 04:47:39 +00:00
PREP(assemble_canDeployTripod);
PREP(assemble_canDeployWeapon);
PREP(assemble_canPickupTripod);
PREP(assemble_canPickupWeapon);
PREP(assemble_deployTripod);
PREP(assemble_deployWeapon);
PREP(assemble_deployWeaponModifier);
PREP(assemble_pickupTripod);
PREP(assemble_pickupWeapon);
PREP(canGetIn);
PREP(getIn);
PREP(proxyWeapon);
PREP(reload_actionsLoad);
PREP(reload_actionsUnload);
PREP(reload_canLoadMagazine);
PREP(reload_canUnloadMagazine);
PREP(reload_getLoadableMagazines);
PREP(reload_getVehicleMagazine);
PREP(reload_handleAddTurretMag);
PREP(reload_handleRemoveTurretMag);
PREP(reload_handleReturnAmmo);
PREP(reload_loadMagazine);
PREP(staticWeaponInit);
PREP(staticWeaponInit_unloadExtraMags);
Reference in New Issue Copy Permalink