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

Merge pull request #7497 from Whigital/csw_mags_zeus

Browse Source 
CSW - Minor fixes for CSW + RHS Compats
This commit is contained in:
commy2 2020-02-22 21:33:00 +01:00 committed by GitHub
commit af777a40db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 53 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/csw/CfgMagazineGroups.hpp
View File

@ -83,4 +83,3 @@ class GVAR(groups) {
1Rnd_GAA_missiles = 1; 1Rnd_GAA_missiles = 1;
}; };
}; };

3
addons/csw/CfgMagazines.hpp
View File

@ -9,6 +9,7 @@ class CfgMagazines {
mass = 96; mass = 96;
ACE_isBelt = 1; ACE_isBelt = 1;
}; };
class 100Rnd_127x99_mag_Tracer_Red; class 100Rnd_127x99_mag_Tracer_Red;
class GVAR(100Rnd_127x99_mag_red): 100Rnd_127x99_mag_Tracer_Red { class GVAR(100Rnd_127x99_mag_red): 100Rnd_127x99_mag_Tracer_Red {
author = ECSTRING(common,ACETeam); author = ECSTRING(common,ACETeam);
@ -19,6 +20,7 @@ class CfgMagazines {
mass = 96; mass = 96;
ACE_isBelt = 1; ACE_isBelt = 1;
}; };
class 100Rnd_127x99_mag_Tracer_Green; class 100Rnd_127x99_mag_Tracer_Green;
class GVAR(100Rnd_127x99_mag_green): 100Rnd_127x99_mag_Tracer_Green { class GVAR(100Rnd_127x99_mag_green): 100Rnd_127x99_mag_Tracer_Green {
author = ECSTRING(common,ACETeam); author = ECSTRING(common,ACETeam);
@ -29,6 +31,7 @@ class CfgMagazines {
mass = 96; mass = 96;
ACE_isBelt = 1; ACE_isBelt = 1;
}; };
class 100Rnd_127x99_mag_Tracer_Yellow; class 100Rnd_127x99_mag_Tracer_Yellow;
class GVAR(100Rnd_127x99_mag_yellow): 100Rnd_127x99_mag_Tracer_Yellow { class GVAR(100Rnd_127x99_mag_yellow): 100Rnd_127x99_mag_Tracer_Yellow {
author = ECSTRING(common,ACETeam); author = ECSTRING(common,ACETeam);

23
addons/csw/CfgWeapons.hpp
View File

@ -4,7 +4,6 @@ class CfgWeapons {
class WeaponSlotsInfo; class WeaponSlotsInfo;
}; };
// Tripods: // Tripods:
class GVAR(m3CarryTripod): Launcher_Base_F { class GVAR(m3CarryTripod): Launcher_Base_F {
class ADDON { class ADDON {
@ -28,6 +27,7 @@ class CfgWeapons {
deploy = QGVAR(m3TripodLow); deploy = QGVAR(m3TripodLow);
}; };
displayName = CSTRING(m3TripodLowFolded_displayName); displayName = CSTRING(m3TripodLowFolded_displayName);
author = ECSTRING(common,ACETeam);
}; };
class GVAR(kordCarryTripod): Launcher_Base_F { class GVAR(kordCarryTripod): Launcher_Base_F {
@ -53,6 +53,7 @@ class CfgWeapons {
deploy = QGVAR(kordTripodLow); deploy = QGVAR(kordTripodLow);
}; };
displayName = CSTRING(kordTripodFoldedLow_displayName); displayName = CSTRING(kordTripodFoldedLow_displayName);
author = ECSTRING(common,ACETeam);
}; };
class GVAR(m220CarryTripod): Launcher_Base_F { class GVAR(m220CarryTripod): Launcher_Base_F {
@ -127,8 +128,6 @@ class CfgWeapons {
picture = QPATHTOF(UI\Tripod_Icon.paa); // todo picture = QPATHTOF(UI\Tripod_Icon.paa); // todo
}; };
// Weapons: // Weapons:
class GVAR(staticATCarry): Launcher_Base_F { class GVAR(staticATCarry): Launcher_Base_F {
class ADDON { class ADDON {
@ -151,23 +150,13 @@ class CfgWeapons {
}; };
class GVAR(staticAACarry): GVAR(staticATCarry) { class GVAR(staticAACarry): GVAR(staticATCarry) {
class ADDON { class ADDON: ADDON {
type = "weapon";
deployTime = 15;
pickupTime = 20;
class assembleTo { class assembleTo {
GVAR(m3Tripod) = "B_static_AA_F"; GVAR(m3Tripod) = "B_static_AA_F";
}; };
}; };
class WeaponSlotsInfo: WeaponSlotsInfo {
mass = 320;
};
displayName = CSTRING(StaticAABag_displayName); displayName = CSTRING(StaticAABag_displayName);
author = ECSTRING(common,ACETeam); author = ECSTRING(common,ACETeam);
scope = 2;
model = QPATHTOEF(apl,ACE_CSW_Bag.p3d);
modes[] = {};
picture = QPATHTOF(UI\StaticAT_Icon.paa);
}; };
class GVAR(staticHMGCarry): Launcher_Base_F { class GVAR(staticHMGCarry): Launcher_Base_F {
@ -212,7 +201,6 @@ class CfgWeapons {
picture = QPATHTOF(UI\StaticHGMG_Icon.paa); picture = QPATHTOF(UI\StaticHGMG_Icon.paa);
}; };
class GVAR(staticMortarCarry): Launcher_Base_F { class GVAR(staticMortarCarry): Launcher_Base_F {
class ADDON { class ADDON {
type = "weapon"; type = "weapon";
@ -230,7 +218,7 @@ class CfgWeapons {
scope = 2; scope = 2;
model = QPATHTOEF(apl,ACE_CSW_Bag.p3d); model = QPATHTOEF(apl,ACE_CSW_Bag.p3d);
modes[] = {}; modes[] = {};
picture = QPATHTOF(UI\StaticHGMG_Icon.paa); picture = QPATHTOF(UI\StaticMortarTube_Icon.paa);
}; };
// Proxy Weapons // Proxy Weapons
@ -247,7 +235,6 @@ class CfgWeapons {
magazineReloadTime = 0.5; magazineReloadTime = 0.5;
}; };
/* /*
class GVAR(staticAutoHMGCarry): Launcher_Base_F { class GVAR(staticAutoHMGCarry): Launcher_Base_F {
class ADDON { class ADDON {
@ -270,7 +257,6 @@ class CfgWeapons {
picture = QPATHTOF(UI\StaticHGMG_Icon.paa); picture = QPATHTOF(UI\StaticHGMG_Icon.paa);
}; };
class GVAR(staticAutoGMGCarry): Launcher_Base_F { class GVAR(staticAutoGMGCarry): Launcher_Base_F {
class GVAR(options) { class GVAR(options) {
assembleTo = QGVAR(staticAutoGMGWeapon); assembleTo = QGVAR(staticAutoGMGWeapon);
@ -291,4 +277,3 @@ class CfgWeapons {
*/ */
}; };

BIN
addons/csw/UI/StaticMortarTube_Icon.paa Normal file
View File

Binary file not shown.

1
addons/csw/config.cpp
View File

@ -21,4 +21,3 @@ class CfgPatches {
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
#include "CfgMagazines.hpp" #include "CfgMagazines.hpp"
#include "CfgMagazineGroups.hpp" #include "CfgMagazineGroups.hpp"

29
optionals/compat_rhs_afrf3/CfgWeapons.hpp
View File

@ -173,6 +173,11 @@ class CfgWeapons {
}; };
}; };
class WeaponSlotsInfo: WeaponSlotsInfo { class WeaponSlotsInfo: WeaponSlotsInfo {
// One WeaponSlot with a positive value for iconScale forces game to use icon overlay method.
// Required, because the inventory icon has no accessory variants.
class MuzzleSlot {
iconScale = 0.1;
};
mass = 670; // 2B14 Mortar Weight mass = 670; // 2B14 Mortar Weight
}; };
displayName = ECSTRING(CSW,2b14_tube); displayName = ECSTRING(CSW,2b14_tube);
@ -193,6 +198,9 @@ class CfgWeapons {
}; };
}; };
class WeaponSlotsInfo: WeaponSlotsInfo { class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot {
iconScale = 0.1;
};
mass = 550; mass = 550;
}; };
displayName = ECSTRING(CSW,nsv_gun); displayName = ECSTRING(CSW,nsv_gun);
@ -214,6 +222,9 @@ class CfgWeapons {
}; };
}; };
class WeaponSlotsInfo: WeaponSlotsInfo { class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot {
iconScale = 0.1;
};
mass = 550; mass = 550;
}; };
displayName = ECSTRING(CSW,kord_gun); displayName = ECSTRING(CSW,kord_gun);
@ -234,6 +245,9 @@ class CfgWeapons {
}; };
}; };
class WeaponSlotsInfo: WeaponSlotsInfo { class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot {
iconScale = 0.1;
};
mass = 400; // https://odin.tradoc.army.mil/mediawiki/index.php/AGS-17_Russian_30mm_Automatic_Grenade_Launcher mass = 400; // https://odin.tradoc.army.mil/mediawiki/index.php/AGS-17_Russian_30mm_Automatic_Grenade_Launcher
}; };
displayName = ECSTRING(CSW,ags30_gun); displayName = ECSTRING(CSW,ags30_gun);
@ -250,10 +264,13 @@ class CfgWeapons {
deployTime = 4; deployTime = 4;
pickupTime = 4; pickupTime = 4;
class assembleTo { class assembleTo {
EGVAR(csw,spg9Tripod) = "rhsgref_ins_SPG9"; EGVAR(csw,spg9Tripod) = "rhs_SPG9_INS";
}; };
}; };
class WeaponSlotsInfo: WeaponSlotsInfo { class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot {
iconScale = 0.1;
};
mass = 1000; mass = 1000;
}; };
displayName = ECSTRING(csw,spg9_tube); displayName = ECSTRING(csw,spg9_tube);
@ -263,13 +280,15 @@ class CfgWeapons {
modes[] = {}; modes[] = {};
picture = "\rhsafrf\addons\rhs_heavyweapons\data\ico\rhs_SPG9_INS_ca.paa"; picture = "\rhsafrf\addons\rhs_heavyweapons\data\ico\rhs_SPG9_INS_ca.paa";
}; };
class GVAR(spg9m_carry): GVAR(spg9_carry) { class GVAR(spg9m_carry): GVAR(spg9_carry) {
class ACE_CSW { class ACE_CSW: ACE_CSW {
class assembleTo { class assembleTo {
EGVAR(csw,spg9Tripod) = "rhs_SPG9M_MSV"; EGVAR(csw,spg9Tripod) = "rhs_SPG9M_MSV";
}; };
}; };
displayName = ECSTRING(csw,spg9m_tube); displayName = ECSTRING(csw,spg9m_tube);
author = ECSTRING(common,ACETeam);
}; };
class GVAR(metis_carry): Launcher_Base_F { class GVAR(metis_carry): Launcher_Base_F {
@ -280,6 +299,9 @@ class CfgWeapons {
deploy = "rhs_Metis_9k115_2_msv"; deploy = "rhs_Metis_9k115_2_msv";
}; };
class WeaponSlotsInfo: WeaponSlotsInfo { class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot {
iconScale = 0.1;
};
mass = 300; mass = 300;
}; };
displayName = ECSTRING(csw,metis_tube); displayName = ECSTRING(csw,metis_tube);
@ -298,6 +320,9 @@ class CfgWeapons {
deploy = "rhs_Kornet_9M133_2_msv"; deploy = "rhs_Kornet_9M133_2_msv";
}; };
class WeaponSlotsInfo: WeaponSlotsInfo { class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot {
iconScale = 0.1;
};
mass = 600; mass = 600;
}; };
displayName = ECSTRING(csw,kornet_launcher); displayName = ECSTRING(csw,kornet_launcher);

5
optionals/compat_rhs_gref3/CfgWeapons.hpp
View File

@ -98,6 +98,11 @@ class CfgWeapons {
}; };
}; };
class WeaponSlotsInfo: WeaponSlotsInfo { class WeaponSlotsInfo: WeaponSlotsInfo {
// One WeaponSlot with a positive value for iconScale forces game to use icon overlay method.
// Required, because the inventory icon has no accessory variants.
class MuzzleSlot {
iconScale = 0.1;
};
mass = 740; mass = 740;
}; };
displayName = ECSTRING(csw,dshk_gun); displayName = ECSTRING(csw,dshk_gun);

15
optionals/compat_rhs_usf3/CfgWeapons.hpp
View File

@ -495,6 +495,11 @@ class CfgWeapons {
}; };
}; };
class WeaponSlotsInfo: WeaponSlotsInfo { class WeaponSlotsInfo: WeaponSlotsInfo {
// One WeaponSlot with a positive value for iconScale forces game to use icon overlay method.
// Required, because the inventory icon has no accessory variants.
class MuzzleSlot {
iconScale = 0.1;
};
mass = 620; // M252 Mortar Weight mass = 620; // M252 Mortar Weight
}; };
displayName = ECSTRING(CSW,m252_tube); displayName = ECSTRING(CSW,m252_tube);
@ -516,6 +521,9 @@ class CfgWeapons {
}; };
}; };
class WeaponSlotsInfo: WeaponSlotsInfo { class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot {
iconScale = 0.1;
};
mass = 840; mass = 840;
}; };
displayName = ECSTRING(CSW,m2_gun); displayName = ECSTRING(CSW,m2_gun);
@ -536,6 +544,9 @@ class CfgWeapons {
}; };
}; };
class WeaponSlotsInfo: WeaponSlotsInfo { class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot {
iconScale = 0.1;
};
mass = 770; mass = 770;
}; };
displayName = ECSTRING(CSW,mk19_gun); displayName = ECSTRING(CSW,mk19_gun);
@ -556,6 +567,9 @@ class CfgWeapons {
}; };
}; };
class WeaponSlotsInfo: WeaponSlotsInfo { class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot {
iconScale = 0.1;
};
mass = 500; mass = 500;
}; };
displayName = ECSTRING(CSW,tow_tube); displayName = ECSTRING(CSW,tow_tube);
@ -566,4 +580,3 @@ class CfgWeapons {
picture = "\rhsusf\addons\rhsusf_heavyweapons\data\Ico\RHS_TOW_TriPod_D_ca.paa"; picture = "\rhsusf\addons\rhsusf_heavyweapons\data\Ico\RHS_TOW_TriPod_D_ca.paa";
}; };
}; };