mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
7b13a75305
* 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
302 lines
9.8 KiB
C++
302 lines
9.8 KiB
C++
#define CREATE_CSW_PROXY(weapon) class ##weapon; class GVAR(weapon): ##weapon { magazineReloadTime = 0.5; }
|
|
|
|
class CfgWeapons {
|
|
|
|
class NVGoggles;
|
|
class rhs_1PN138: NVGoggles { // Monocular
|
|
modelOptics = "";
|
|
EGVAR(nightvision,border) = QPATHTOEF(nightvision,data\nvg_mask_4096.paa);
|
|
EGVAR(nightvision,bluRadius) = 0.13;
|
|
};
|
|
|
|
class hgun_Rook40_F;
|
|
class rhs_weap_pya: hgun_Rook40_F {
|
|
ACE_barrelTwist = 254.0;
|
|
ACE_barrelLength = 111.76;
|
|
};
|
|
class Pistol_Base_F;
|
|
class rhs_weap_makarov_pm: rhs_weap_pya {
|
|
ACE_barrelTwist = 240.03;
|
|
ACE_barrelLength = 93.472;
|
|
};
|
|
class rhs_weap_ak74m_Base_F;
|
|
class rhs_weap_ak74m: rhs_weap_ak74m_Base_F {
|
|
ACE_RailHeightAboveBore = -0.456233;
|
|
ACE_barrelTwist = 199.898;
|
|
ACE_barrelLength = 414.02;
|
|
};
|
|
class rhs_weap_akm: rhs_weap_ak74m {
|
|
ACE_RailHeightAboveBore = -0.456233;//from rhs_weap_akmn and rhs_weap_ak74m
|
|
ACE_barrelTwist = 199.898;
|
|
ACE_barrelLength = 414.02;
|
|
};
|
|
class rhs_weap_aks74;
|
|
class rhs_weap_aks74u: rhs_weap_aks74 {
|
|
ACE_RailHeightAboveBore = -0.30262;
|
|
ACE_barrelTwist = 160.02;
|
|
ACE_barrelLength = 210.82;
|
|
};
|
|
class rhs_weap_svd: rhs_weap_ak74m {
|
|
ACE_RailHeightAboveBore = -0.617396;
|
|
ACE_barrelTwist = 238.76;
|
|
ACE_barrelLength = 619.76;
|
|
};
|
|
class rhs_weap_svdp;
|
|
class rhs_weap_svdp_npz: rhs_weap_svdp {
|
|
ACE_RailHeightAboveBore = 4.3348;
|
|
};
|
|
class rhs_weap_svdp_wd: rhs_weap_svdp {
|
|
ACE_RailHeightAboveBore = -0.617396;
|
|
};
|
|
class rhs_weap_svdp_wd_npz: rhs_weap_svdp_wd {
|
|
ACE_RailHeightAboveBore = 4.3348;
|
|
};
|
|
class rhs_weap_svds: rhs_weap_svdp {
|
|
ACE_RailHeightAboveBore = -0.617396;
|
|
ACE_barrelTwist = 238.76;
|
|
ACE_barrelLength = 563.88;
|
|
};
|
|
class rhs_weap_svds_npz: rhs_weap_svds {
|
|
ACE_RailHeightAboveBore = 4.3348;
|
|
};
|
|
class rhs_pkp_base;
|
|
class rhs_weap_pkp: rhs_pkp_base {
|
|
ACE_barrelTwist = 240.03;
|
|
ACE_barrelLength = 657.86;
|
|
};
|
|
class rhs_weap_pkm: rhs_weap_pkp {
|
|
ACE_Overheating_allowSwapBarrel = 1;
|
|
ACE_barrelTwist = 240.03;
|
|
ACE_barrelLength = 645.16;
|
|
};
|
|
class rhs_weap_rpk74: rhs_weap_pkp {
|
|
ACE_barrelTwist = 195.072;
|
|
ACE_barrelLength = 589.28;
|
|
};
|
|
class rhs_weap_orsis_Base_F;
|
|
class rhs_weap_t5000: rhs_weap_orsis_Base_F { // http://en.orsis.com/production/catalog/19046/
|
|
ACE_barrelTwist = 254.0; // 1:10"
|
|
ACE_barrelLength = 698.5; // 27.5"
|
|
ACE_RailHeightAboveBore = 2.12198;
|
|
};
|
|
class rhs_acc_sniper_base;
|
|
class rhs_acc_pso1m2: rhs_acc_sniper_base {
|
|
ACE_ScopeHeightAboveRail = 4.41386;
|
|
ACE_ScopeAdjust_Vertical[] = {0, 0};
|
|
ACE_ScopeAdjust_Horizontal[] = {-10, 10};
|
|
ACE_ScopeAdjust_VerticalIncrement = 0.5;
|
|
ACE_ScopeAdjust_HorizontalIncrement = 0.5;
|
|
};
|
|
class rhs_acc_pso1m21: rhs_acc_sniper_base {
|
|
ACE_ScopeHeightAboveRail = 7.75566;
|
|
ACE_ScopeAdjust_Vertical[] = {0, 0};
|
|
ACE_ScopeAdjust_Horizontal[] = {-10, 10};
|
|
ACE_ScopeAdjust_VerticalIncrement = 0.5;
|
|
ACE_ScopeAdjust_HorizontalIncrement = 0.5;
|
|
};
|
|
class ItemCore;
|
|
class InventoryOpticsItem_Base_F;
|
|
class rhs_acc_dh520x56: ItemCore { // http://nightvision.ru/catalog/4/item/35
|
|
ACE_ScopeHeightAboveRail = 4.71476;
|
|
ACE_ScopeAdjust_Vertical[] = {0, 33};
|
|
ACE_ScopeAdjust_Horizontal[] = {-9, 9};
|
|
ACE_ScopeAdjust_VerticalIncrement = 0.1;
|
|
ACE_ScopeAdjust_HorizontalIncrement = 0.1;
|
|
class ItemInfo: InventoryOpticsItem_Base_F {
|
|
class OpticsModes {
|
|
class dedal_520 {
|
|
discreteDistance[] = {100};
|
|
discreteDistanceInitIndex = 0;
|
|
};
|
|
};
|
|
};
|
|
};
|
|
class Launcher;
|
|
class Launcher_Base_F: Launcher {
|
|
class WeaponSlotsInfo;
|
|
};
|
|
class rhs_weap_rpg7: Launcher_Base_F {
|
|
ace_reloadlaunchers_enabled = 1;
|
|
};
|
|
|
|
#define HEARING_PROTECTION_VICCREW EGVAR(hearing,protection) = 0.85; EGVAR(hearing,lowerVolume) = 0.6;
|
|
#define HEARING_PROTECTION_EARMUFF EGVAR(hearing,protection) = 0.75; EGVAR(hearing,lowerVolume) = 0.5;
|
|
#define HEARING_PROTECTION_PELTOR EGVAR(hearing,protection) = 0.75; EGVAR(hearing,lowerVolume) = 0;
|
|
class H_HelmetB;
|
|
class rhs_tsh4: H_HelmetB {
|
|
HEARING_PROTECTION_VICCREW
|
|
};
|
|
|
|
class rhs_zsh7a: H_HelmetB {
|
|
HEARING_PROTECTION_VICCREW
|
|
};
|
|
|
|
class rhs_gssh18: H_HelmetB {
|
|
HEARING_PROTECTION_EARMUFF
|
|
};
|
|
|
|
class rhs_weap_d81;
|
|
class rhs_weap_2a70: rhs_weap_d81 { // "Low pressure" 100mm cannon
|
|
ace_overpressure_range = 15;
|
|
ace_overpressure_damage = 0.5;
|
|
};
|
|
class cannon_120mm;
|
|
class rhs_weap_2a28_base: cannon_120mm { // "Low pressure"
|
|
ace_overpressure_range = 15;
|
|
ace_overpressure_damage = 0.5;
|
|
};
|
|
|
|
CREATE_CSW_PROXY(rhs_weap_2b14);
|
|
CREATE_CSW_PROXY(rhs_weap_nsvt_effects);
|
|
CREATE_CSW_PROXY(rhs_weap_KORD);
|
|
CREATE_CSW_PROXY(RHS_weap_AGS30);
|
|
CREATE_CSW_PROXY(rhs_weap_SPG9);
|
|
CREATE_CSW_PROXY(rhs_weap_9K133_launcher);
|
|
CREATE_CSW_PROXY(rhs_weap_9K115_2_launcher);
|
|
|
|
class GVAR(2b14_carry): Launcher_Base_F {
|
|
class ACE_CSW {
|
|
type = "weapon";
|
|
deployTime = 20;
|
|
pickupTime = 25;
|
|
class assembleTo {
|
|
EGVAR(csw,mortarBaseplate) = "rhs_2b14_82mm_msv";
|
|
};
|
|
};
|
|
class WeaponSlotsInfo: WeaponSlotsInfo {
|
|
mass = 670; // 2B14 Mortar Weight
|
|
};
|
|
displayName = CSTRING(2b14_tube);
|
|
author = ECSTRING(common,ACETeam);
|
|
scope = 2;
|
|
model = QPATHTOEF(apl,ACE_CSW_Bag.p3d);
|
|
modes[] = {};
|
|
picture = "\rhsafrf\addons\rhs_heavyweapons\data\ico\podnos_2b14_ca.paa";
|
|
};
|
|
|
|
class GVAR(nsv_carry): Launcher_Base_F {
|
|
class ACE_CSW {
|
|
type = "weapon";
|
|
deployTime = 4;
|
|
pickupTime = 4;
|
|
class assembleTo {
|
|
EGVAR(csw,kordTripodLow) = "RHS_NSV_TriPod_MSV";
|
|
};
|
|
};
|
|
class WeaponSlotsInfo: WeaponSlotsInfo {
|
|
mass = 550;
|
|
};
|
|
displayName = CSTRING(nsv_gun);
|
|
author = ECSTRING(common,ACETeam);
|
|
scope = 2;
|
|
model = QPATHTOEF(apl,ACE_CSW_Bag.p3d);
|
|
modes[] = {};
|
|
picture = "\rhsafrf\addons\rhs_heavyweapons\mg\bis_kord\kord_CA.paa";
|
|
};
|
|
|
|
class GVAR(kord_carry): Launcher_Base_F {
|
|
class ACE_CSW {
|
|
type = "weapon";
|
|
deployTime = 4;
|
|
pickupTime = 4;
|
|
class assembleTo {
|
|
EGVAR(csw,kordTripod) = "rhs_KORD_high_MSV";
|
|
EGVAR(csw,kordTripodLow) = "rhs_KORD_MSV";
|
|
};
|
|
};
|
|
class WeaponSlotsInfo: WeaponSlotsInfo {
|
|
mass = 550;
|
|
};
|
|
displayName = CSTRING(kord_gun);
|
|
author = ECSTRING(common,ACETeam);
|
|
scope = 2;
|
|
model = QPATHTOEF(apl,ACE_CSW_Bag.p3d);
|
|
modes[] = {};
|
|
picture = "\rhsafrf\addons\rhs_heavyweapons\data\ico\kord6u16sp_ca.paa";
|
|
};
|
|
|
|
class GVAR(ags30_carry): Launcher_Base_F {
|
|
class ACE_CSW {
|
|
type = "weapon";
|
|
deployTime = 4;
|
|
pickupTime = 4;
|
|
class assembleTo {
|
|
EGVAR(csw,sag30Tripod) = "RHS_AGS30_TriPod_MSV";
|
|
};
|
|
};
|
|
class WeaponSlotsInfo: WeaponSlotsInfo {
|
|
mass = 400; // https://odin.tradoc.army.mil/mediawiki/index.php/AGS-17_Russian_30mm_Automatic_Grenade_Launcher
|
|
};
|
|
displayName = CSTRING(ags30_gun);
|
|
author = ECSTRING(common,ACETeam);
|
|
scope = 2;
|
|
model = QPATHTOEF(apl,ACE_CSW_Bag.p3d);
|
|
modes[] = {};
|
|
picture = "\rhsafrf\addons\rhs_heavyweapons\data\ico\ags_static_CA.paa";
|
|
};
|
|
|
|
class GVAR(spg9_carry): Launcher_Base_F {
|
|
class ACE_CSW {
|
|
type = "weapon";
|
|
deployTime = 4;
|
|
pickupTime = 4;
|
|
class assembleTo {
|
|
EGVAR(csw,spg9Tripod) = "rhsgref_ins_SPG9";
|
|
};
|
|
};
|
|
class WeaponSlotsInfo: WeaponSlotsInfo {
|
|
mass = 1000;
|
|
};
|
|
displayName = CSTRING(spg9_tube);
|
|
author = ECSTRING(common,ACETeam);
|
|
scope = 2;
|
|
model = QPATHTOEF(apl,ACE_CSW_Bag.p3d);
|
|
modes[] = {};
|
|
picture = "\rhsafrf\addons\rhs_heavyweapons\data\ico\spg9_CA.paa";
|
|
};
|
|
class GVAR(spg9m_carry): GVAR(spg9_carry) {
|
|
class ACE_CSW {
|
|
class assembleTo {
|
|
EGVAR(csw,spg9Tripod) = "rhs_SPG9M_MSV";
|
|
};
|
|
};
|
|
displayName = CSTRING(spg9m_tube);
|
|
};
|
|
|
|
class GVAR(metis_carry): Launcher_Base_F {
|
|
class ACE_CSW {
|
|
type = "mount";
|
|
deployTime = 4;
|
|
pickupTime = 4;
|
|
deploy = "rhs_Metis_9k115_2_msv";
|
|
};
|
|
class WeaponSlotsInfo: WeaponSlotsInfo {
|
|
mass = 300;
|
|
};
|
|
displayName = CSTRING(metis_tube);
|
|
author = ECSTRING(common,ACETeam);
|
|
scope = 2;
|
|
model = QPATHTOEF(apl,ACE_CSW_Bag.p3d);
|
|
modes[] = {};
|
|
picture = "\rhsafrf\addons\rhs_heavyweapons\data\ico\metis_at13_CA.paa";
|
|
};
|
|
|
|
class GVAR(kornet_carry): Launcher_Base_F {
|
|
class ACE_CSW {
|
|
type = "mount";
|
|
deployTime = 4;
|
|
pickupTime = 4;
|
|
deploy = "rhs_Kornet_9M133_2_msv";
|
|
};
|
|
class WeaponSlotsInfo: WeaponSlotsInfo {
|
|
mass = 600;
|
|
};
|
|
displayName = CSTRING(kornet_launcher);
|
|
author = ECSTRING(common,ACETeam);
|
|
scope = 2;
|
|
model = QPATHTOEF(apl,ACE_CSW_Bag.p3d);
|
|
modes[] = {};
|
|
picture = "\rhsafrf\addons\rhs_heavyweapons\data\ico\metis_at13_CA.paa";
|
|
};
|
|
};
|