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

Use CBA Misc Items (#5502)

Browse Source 
* Use CBA Misc Items

* Set required CBA to 3.4.1
This commit is contained in:
PabstMirror 2017-09-12 23:23:45 -05:00 committed by GitHub
parent e103805f00
commit 30a8d2db7b
27 changed files with 84 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/atragmx/CfgWeapons.hpp
View File

@ -1,7 +1,7 @@
class CfgWeapons { class CfgWeapons {
class ACE_ItemCore; class ACE_ItemCore;
class InventoryItem_Base_F; class CBA_MiscItem_ItemInfo;
class ACE_ATragMX: ACE_ItemCore { class ACE_ATragMX: ACE_ItemCore {
author = "Ruthberg"; author = "Ruthberg";
@ -13,7 +13,7 @@ class CfgWeapons {
icon = "iconObject_circle"; icon = "iconObject_circle";
mapSize = 0.034; mapSize = 0.034;
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 2; mass = 2;
}; };
}; };

4
addons/attach/CfgWeapons.hpp
View File

@ -1,6 +1,6 @@
class CfgWeapons { class CfgWeapons {
class ACE_ItemCore; class ACE_ItemCore;
class InventoryItem_Base_F; class CBA_MiscItem_ItemInfo;
class ACE_IR_Strobe_Item: ACE_ItemCore { class ACE_IR_Strobe_Item: ACE_ItemCore {
ACE_attachable = "ACE_IR_Strobe_Effect"; ACE_attachable = "ACE_IR_Strobe_Effect";
@ -11,7 +11,7 @@ class CfgWeapons {
model = QPATHTOF(data\ace_IRStrobe.p3d); model = QPATHTOF(data\ace_IRStrobe.p3d);
picture = QPATHTOF(UI\irstrobe_item.paa); picture = QPATHTOF(UI\irstrobe_item.paa);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1; mass = 1;
}; };
}; };

4
addons/captives/CfgWeapons.hpp
View File

@ -1,6 +1,6 @@
class CfgWeapons { class CfgWeapons {
class ACE_ItemCore; class ACE_ItemCore;
class InventoryItem_Base_F; class CBA_MiscItem_ItemInfo;
class ACE_CableTie: ACE_ItemCore { class ACE_CableTie: ACE_ItemCore {
displayName = CSTRING(CableTie); displayName = CSTRING(CableTie);
@ -8,7 +8,7 @@ class CfgWeapons {
model = QPATHTOF(models\ace_cabletie.p3d); model = QPATHTOF(models\ace_cabletie.p3d);
picture = QPATHTOF(UI\ace_cabletie_ca.paa); picture = QPATHTOF(UI\ace_cabletie_ca.paa);
scope = 2; scope = 2;
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1; mass = 1;
}; };
}; };

16
addons/chemlights/CfgWeapons.hpp
View File

@ -36,7 +36,7 @@ class CfgWeapons {
}; };
class ACE_ItemCore; class ACE_ItemCore;
class InventoryItem_Base_F; class CBA_MiscItem_ItemInfo;
class ACE_Chemlight_Shield: ACE_ItemCore { class ACE_Chemlight_Shield: ACE_ItemCore {
author = ECSTRING(common,ACETeam); author = ECSTRING(common,ACETeam);
@ -45,7 +45,7 @@ class CfgWeapons {
model = "\A3\weapons_F\ammo\mag_univ.p3d"; model = "\A3\weapons_F\ammo\mag_univ.p3d";
picture = QPATHTOF(UI\ace_chemlight_shield_x_ca.paa); picture = QPATHTOF(UI\ace_chemlight_shield_x_ca.paa);
scope = 2; scope = 2;
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1; mass = 1;
}; };
}; };
@ -58,7 +58,7 @@ class CfgWeapons {
model = "\A3\weapons_F\ammo\mag_univ.p3d"; model = "\A3\weapons_F\ammo\mag_univ.p3d";
picture = QPATHTOF(UI\ace_chemlight_shield_green_x_ca.paa); picture = QPATHTOF(UI\ace_chemlight_shield_green_x_ca.paa);
scope = 1; scope = 1;
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1; mass = 1;
class FlashLight { class FlashLight {
ACE_Flashlight_Colour = "green"; ACE_Flashlight_Colour = "green";
@ -73,7 +73,7 @@ class CfgWeapons {
displayName = CSTRING(Shield_Red_DisplayName); displayName = CSTRING(Shield_Red_DisplayName);
descriptionShort = CSTRING(Shield_Red_DescriptionShort); descriptionShort = CSTRING(Shield_Red_DescriptionShort);
picture = QPATHTOF(UI\ace_chemlight_shield_red_x_ca.paa); picture = QPATHTOF(UI\ace_chemlight_shield_red_x_ca.paa);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1; mass = 1;
class FlashLight { class FlashLight {
ACE_Flashlight_Colour = "red"; ACE_Flashlight_Colour = "red";
@ -88,7 +88,7 @@ class CfgWeapons {
displayName = CSTRING(Shield_Blue_DisplayName); displayName = CSTRING(Shield_Blue_DisplayName);
descriptionShort = CSTRING(Shield_Blue_DescriptionShort); descriptionShort = CSTRING(Shield_Blue_DescriptionShort);
picture = QPATHTOF(UI\ace_chemlight_shield_blue_x_ca.paa); picture = QPATHTOF(UI\ace_chemlight_shield_blue_x_ca.paa);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1; mass = 1;
class FlashLight { class FlashLight {
ACE_Flashlight_Colour = "blue"; ACE_Flashlight_Colour = "blue";
@ -103,7 +103,7 @@ class CfgWeapons {
displayName = CSTRING(Shield_Yellow_DisplayName); displayName = CSTRING(Shield_Yellow_DisplayName);
descriptionShort = CSTRING(Shield_Yellow_DescriptionShort); descriptionShort = CSTRING(Shield_Yellow_DescriptionShort);
picture = QPATHTOF(UI\ace_chemlight_shield_yellow_x_ca.paa); picture = QPATHTOF(UI\ace_chemlight_shield_yellow_x_ca.paa);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1; mass = 1;
class FlashLight { class FlashLight {
ACE_Flashlight_Colour = "yellow"; ACE_Flashlight_Colour = "yellow";
@ -118,7 +118,7 @@ class CfgWeapons {
displayName = CSTRING(Shield_Orange_DisplayName); displayName = CSTRING(Shield_Orange_DisplayName);
descriptionShort = CSTRING(Shield_Orange_DescriptionShort); descriptionShort = CSTRING(Shield_Orange_DescriptionShort);
picture = QPATHTOF(UI\ace_chemlight_shield_orange_x_ca.paa); picture = QPATHTOF(UI\ace_chemlight_shield_orange_x_ca.paa);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1; mass = 1;
class FlashLight { class FlashLight {
ACE_Flashlight_Colour = "orange"; ACE_Flashlight_Colour = "orange";
@ -133,7 +133,7 @@ class CfgWeapons {
displayName = CSTRING(Shield_White_DisplayName); displayName = CSTRING(Shield_White_DisplayName);
descriptionShort = CSTRING(Shield_White_DescriptionShort); descriptionShort = CSTRING(Shield_White_DescriptionShort);
picture = QPATHTOF(UI\ace_chemlight_shield_white_x_ca.paa); picture = QPATHTOF(UI\ace_chemlight_shield_white_x_ca.paa);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1; mass = 1;
class FlashLight { class FlashLight {
ACE_Flashlight_Colour = "white"; ACE_Flashlight_Colour = "white";

12
addons/common/CfgWeapons.hpp
View File

@ -1,11 +1,8 @@
class CfgWeapons { class CfgWeapons {
class ItemCore; class CBA_MiscItem;
class ACE_ItemCore: ItemCore { class CBA_MiscItem_ItemInfo;
type = 4096;//4; class ACE_ItemCore: CBA_MiscItem {};
detectRange = -1;
simulation = "ItemMineDetector";
};
class Rifle; class Rifle;
class Rifle_Base_F: Rifle { class Rifle_Base_F: Rifle {
@ -28,7 +25,6 @@ class CfgWeapons {
}; };
}; };
class InventoryItem_Base_F;
class ACE_Banana: ACE_ItemCore { class ACE_Banana: ACE_ItemCore {
author = CSTRING(ACETeam); author = CSTRING(ACETeam);
scope = 2; scope = 2;
@ -38,7 +34,7 @@ class CfgWeapons {
picture = QPATHTOF(data\icon_banana_ca.paa); picture = QPATHTOF(data\icon_banana_ca.paa);
icon = "iconObject_circle"; icon = "iconObject_circle";
mapSize = 0.034; mapSize = 0.034;
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1; mass = 1;
}; };
}; };

4
addons/dagr/CfgWeapons.hpp
View File

@ -1,7 +1,7 @@
class CfgWeapons { class CfgWeapons {
class ACE_ItemCore; class ACE_ItemCore;
class InventoryItem_Base_F; class CBA_MiscItem_ItemInfo;
class ACE_DAGR: ACE_ItemCore { class ACE_DAGR: ACE_ItemCore {
author[] = {$STR_ACE_Common_ACETeam, "Ruthberg"}; author[] = {$STR_ACE_Common_ACETeam, "Ruthberg"};
@ -12,7 +12,7 @@ class CfgWeapons {
picture = QPATHTOF(UI\DAGR_Icon.paa); picture = QPATHTOF(UI\DAGR_Icon.paa);
icon = "iconObject_circle"; icon = "iconObject_circle";
mapSize = 0.034; mapSize = 0.034;
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 10; mass = 10;
}; };
}; };

4
addons/disarming/CfgWeapons.hpp
View File

@ -1,13 +1,13 @@
class CfgWeapons { class CfgWeapons {
class ACE_ItemCore; class ACE_ItemCore;
class InventoryItem_Base_F; class CBA_MiscItem_ItemInfo;
class ACE_DebugPotato: ACE_ItemCore { class ACE_DebugPotato: ACE_ItemCore {
displayName = "ACE Potato (debug)"; displayName = "ACE Potato (debug)";
descriptionShort = "Glorious Potato<br/>If you see this in game it means someone fucked up"; descriptionShort = "Glorious Potato<br/>If you see this in game it means someone fucked up";
picture = QPATHTOF(UI\potato_ca.paa); picture = QPATHTOF(UI\potato_ca.paa);
scope = 1; scope = 1;
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1; mass = 1;
}; };
}; };

4
addons/dogtags/CfgWeapons.hpp
View File

@ -10,7 +10,7 @@
class CfgWeapons { class CfgWeapons {
class ACE_ItemCore; class ACE_ItemCore;
class InventoryItem_Base_F; class CBA_MiscItem_ItemInfo;
class ACE_dogtag: ACE_ItemCore { class ACE_dogtag: ACE_ItemCore {
author = ECSTRING(common,ACETeam); author = ECSTRING(common,ACETeam);
@ -18,7 +18,7 @@ class CfgWeapons {
displayName = CSTRING(itemName); displayName = CSTRING(itemName);
model = QUOTE(PATHTOF(data\ace_dogtag.p3d)); model = QUOTE(PATHTOF(data\ace_dogtag.p3d));
picture = QUOTE(PATHTOF(data\dogtagSingle.paa)); picture = QUOTE(PATHTOF(data\dogtagSingle.paa));
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 0; //too small to for 1 ? mass = 0; //too small to for 1 ?
}; };
}; };

4
addons/explosives/CfgWeapons.hpp
View File

@ -1,8 +1,8 @@
class CfgWeapons { class CfgWeapons {
class ACE_ItemCore; class ACE_ItemCore;
class InventoryItem_Base_f; class CBA_MiscItem_ItemInfo;
class ACE_ExplosiveItem: InventoryItem_Base_f { class ACE_ExplosiveItem: CBA_MiscItem_ItemInfo {
allowedSlots[] = {801,701,901}; allowedSlots[] = {801,701,901};
//type = 201; //type = 201;
}; };

8
addons/flashlights/CfgWeapons.hpp
View File

@ -1,7 +1,7 @@
class CfgWeapons { class CfgWeapons {
class ACE_ItemCore; class ACE_ItemCore;
class InventoryItem_Base_F; class CBA_MiscItem_ItemInfo;
class ACE_Flashlight_MX991: ACE_ItemCore { class ACE_Flashlight_MX991: ACE_ItemCore {
displayName = CSTRING(MX991_DisplayName); displayName = CSTRING(MX991_DisplayName);
@ -9,7 +9,7 @@ class CfgWeapons {
model = QPATHTOF(data\MX_991.p3d); model = QPATHTOF(data\MX_991.p3d);
picture = QPATHTOF(UI\mx991_ca.paa); picture = QPATHTOF(UI\mx991_ca.paa);
scope = 2; scope = 2;
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1; mass = 1;
class FlashLight { class FlashLight {
ACE_Flashlight_Colour = "red"; ACE_Flashlight_Colour = "red";
@ -26,7 +26,7 @@ class CfgWeapons {
model = QPATHTOF(data\KSF_1.p3d); model = QPATHTOF(data\KSF_1.p3d);
picture = QPATHTOF(UI\ksf1_ca.paa); picture = QPATHTOF(UI\ksf1_ca.paa);
scope = 2; scope = 2;
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1; mass = 1;
class FlashLight { class FlashLight {
ACE_Flashlight_Colour = "red"; ACE_Flashlight_Colour = "red";
@ -43,7 +43,7 @@ class CfgWeapons {
model = QPATHTOF(data\Maglight.p3d); model = QPATHTOF(data\Maglight.p3d);
picture = QPATHTOF(UI\xl50_ca.paa); picture = QPATHTOF(UI\xl50_ca.paa);
scope = 2; scope = 2;
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1; mass = 1;
class FlashLight { class FlashLight {
ACE_Flashlight_Colour = "white"; ACE_Flashlight_Colour = "white";

4
addons/hearing/CfgWeapons.hpp
View File

@ -1,6 +1,6 @@
class CfgWeapons { class CfgWeapons {
class ACE_ItemCore; class ACE_ItemCore;
class InventoryItem_Base_F; class CBA_MiscItem_ItemInfo;
class ACE_EarPlugs: ACE_ItemCore { class ACE_EarPlugs: ACE_ItemCore {
displayName = CSTRING(EarPlugs_Name); displayName = CSTRING(EarPlugs_Name);
@ -8,7 +8,7 @@ class CfgWeapons {
model = QPATHTOF(data\ace_earplugs.p3d); model = QPATHTOF(data\ace_earplugs.p3d);
picture = QPATHTOF(UI\ACE_earplugs_x_ca.paa); picture = QPATHTOF(UI\ACE_earplugs_x_ca.paa);
scope = 2; scope = 2;
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1; mass = 1;
}; };
}; };

4
addons/huntir/CfgWeapons.hpp
View File

@ -1,7 +1,7 @@
class CfgWeapons { class CfgWeapons {
class ACE_ItemCore; class ACE_ItemCore;
class InventoryItem_Base_F; class CBA_MiscItem_ItemInfo;
class ACE_HuntIR_monitor: ACE_ItemCore { class ACE_HuntIR_monitor: ACE_ItemCore {
scope = 2; scope = 2;
@ -10,7 +10,7 @@ class CfgWeapons {
descriptionShort = CSTRING(monitor_displayName); descriptionShort = CSTRING(monitor_displayName);
model = QPATHTOF(data\ace_huntir_monitor.p3d); model = QPATHTOF(data\ace_huntir_monitor.p3d);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 20; mass = 20;
}; };
}; };

4
addons/logistics_uavbattery/CfgWeapons.hpp
View File

@ -1,5 +1,5 @@
class CfgWeapons { class CfgWeapons {
class InventoryItem_Base_F; class CBA_MiscItem_ItemInfo;
class ACE_ItemCore; class ACE_ItemCore;
class ACE_UAVBattery: ACE_ItemCore { class ACE_UAVBattery: ACE_ItemCore {
@ -8,7 +8,7 @@ class CfgWeapons {
descriptionShort = CSTRING(Battery_Description); descriptionShort = CSTRING(Battery_Description);
model = QPATHTOF(data\ace_battery.p3d); model = QPATHTOF(data\ace_battery.p3d);
picture = QPATHTOF(ui\UAV_battery_ca.paa); picture = QPATHTOF(ui\UAV_battery_ca.paa);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 20; mass = 20;
}; };
}; };

4
addons/logistics_wirecutter/CfgWeapons.hpp
View File

@ -1,5 +1,5 @@
class CfgWeapons { class CfgWeapons {
class InventoryItem_Base_F; class CBA_MiscItem_ItemInfo;
class ACE_ItemCore; class ACE_ItemCore;
class ACE_wirecutter: ACE_ItemCore { class ACE_wirecutter: ACE_ItemCore {
@ -9,7 +9,7 @@ class CfgWeapons {
model = QPATHTOF(data\ace_wirecutter.p3d); model = QPATHTOF(data\ace_wirecutter.p3d);
picture = QPATHTOF(ui\item_wirecutter_ca.paa); picture = QPATHTOF(ui\item_wirecutter_ca.paa);
scope = 2; scope = 2;
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 25; mass = 25;
}; };
}; };

2
addons/main/script_mod.hpp
View File

@ -10,7 +10,7 @@
// MINIMAL required version for the Mod. Components can specify others.. // MINIMAL required version for the Mod. Components can specify others..
#define REQUIRED_VERSION 1.76 #define REQUIRED_VERSION 1.76
#define REQUIRED_CBA_VERSION {3,3,1} #define REQUIRED_CBA_VERSION {3,4,1}
#ifdef COMPONENT_BEAUTIFIED #ifdef COMPONENT_BEAUTIFIED
#define COMPONENT_NAME QUOTE(ACE3 - COMPONENT_BEAUTIFIED) #define COMPONENT_NAME QUOTE(ACE3 - COMPONENT_BEAUTIFIED)

4
addons/maptools/CfgWeapons.hpp
View File

@ -1,6 +1,6 @@
class CfgWeapons { class CfgWeapons {
class ACE_ItemCore; class ACE_ItemCore;
class InventoryItem_Base_F; class CBA_MiscItem_ItemInfo;
class ACE_MapTools: ACE_ItemCore { class ACE_MapTools: ACE_ItemCore {
displayName = CSTRING(Name); displayName = CSTRING(Name);
@ -8,7 +8,7 @@ class CfgWeapons {
model = QPATHTOF(data\ace_MapTools.p3d); model = QPATHTOF(data\ace_MapTools.p3d);
picture = QPATHTOF(UI\maptool_item.paa); picture = QPATHTOF(UI\maptool_item.paa);
scope = 2; scope = 2;
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1; mass = 1;
}; };
}; };

44
addons/medical/CfgWeapons.hpp
View File

@ -1,7 +1,7 @@
class CfgWeapons { class CfgWeapons {
class ItemCore; class ItemCore;
class InventoryItem_Base_F; class CBA_MiscItem_ItemInfo;
class InventoryFirstAidKitItem_Base_F; class InventoryFirstAidKitItem_Base_F;
class MedikitItem; class MedikitItem;
@ -27,7 +27,7 @@ class CfgWeapons {
displayName = CSTRING(Bandage_Basic_Display); displayName = CSTRING(Bandage_Basic_Display);
descriptionShort = CSTRING(Bandage_Basic_Desc_Short); descriptionShort = CSTRING(Bandage_Basic_Desc_Short);
descriptionUse = CSTRING(Bandage_Basic_Desc_Use); descriptionUse = CSTRING(Bandage_Basic_Desc_Use);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1; mass = 1;
}; };
}; };
@ -38,7 +38,7 @@ class CfgWeapons {
model = QPATHTOF(data\packingbandage.p3d); model = QPATHTOF(data\packingbandage.p3d);
descriptionShort = CSTRING(Packing_Bandage_Desc_Short); descriptionShort = CSTRING(Packing_Bandage_Desc_Short);
descriptionUse = CSTRING(Packing_Bandage_Desc_Use); descriptionUse = CSTRING(Packing_Bandage_Desc_Use);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1; mass = 1;
}; };
}; };
@ -49,7 +49,7 @@ class CfgWeapons {
model = "\A3\Structures_F_EPA\Items\Medical\Bandage_F.p3d"; model = "\A3\Structures_F_EPA\Items\Medical\Bandage_F.p3d";
descriptionShort = CSTRING(Bandage_Elastic_Desc_Short); descriptionShort = CSTRING(Bandage_Elastic_Desc_Short);
descriptionUse = CSTRING(Bandage_Elastic_Desc_Use); descriptionUse = CSTRING(Bandage_Elastic_Desc_Use);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1; mass = 1;
}; };
}; };
@ -60,7 +60,7 @@ class CfgWeapons {
model = QPATHTOF(data\tourniquet.p3d); model = QPATHTOF(data\tourniquet.p3d);
descriptionShort = CSTRING(Tourniquet_Desc_Short); descriptionShort = CSTRING(Tourniquet_Desc_Short);
descriptionUse = CSTRING(Tourniquet_Desc_Use); descriptionUse = CSTRING(Tourniquet_Desc_Use);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1; mass = 1;
}; };
}; };
@ -71,7 +71,7 @@ class CfgWeapons {
model = QPATHTOF(data\morphine.p3d); model = QPATHTOF(data\morphine.p3d);
descriptionShort = CSTRING(Morphine_Desc_Short); descriptionShort = CSTRING(Morphine_Desc_Short);
descriptionUse = CSTRING(Morphine_Desc_Use); descriptionUse = CSTRING(Morphine_Desc_Use);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1; mass = 1;
}; };
}; };
@ -82,7 +82,7 @@ class CfgWeapons {
model = QPATHTOF(data\adenosine.p3d); model = QPATHTOF(data\adenosine.p3d);
descriptionShort = CSTRING(adenosine_Desc_Short); descriptionShort = CSTRING(adenosine_Desc_Short);
descriptionUse = CSTRING(adenosine_Desc_Use); descriptionUse = CSTRING(adenosine_Desc_Use);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1; mass = 1;
}; };
}; };
@ -93,7 +93,7 @@ class CfgWeapons {
model = QPATHTOF(data\atropine.p3d); model = QPATHTOF(data\atropine.p3d);
descriptionShort = CSTRING(Atropine_Desc_Short); descriptionShort = CSTRING(Atropine_Desc_Short);
descriptionUse = CSTRING(Atropine_Desc_Use); descriptionUse = CSTRING(Atropine_Desc_Use);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1; mass = 1;
}; };
}; };
@ -104,7 +104,7 @@ class CfgWeapons {
model = QPATHTOF(data\epinephrine.p3d); model = QPATHTOF(data\epinephrine.p3d);
descriptionShort = CSTRING(Epinephrine_Desc_Short); descriptionShort = CSTRING(Epinephrine_Desc_Short);
descriptionUse = CSTRING(Epinephrine_Desc_Use); descriptionUse = CSTRING(Epinephrine_Desc_Use);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1; mass = 1;
}; };
}; };
@ -118,7 +118,7 @@ class CfgWeapons {
picture = QPATHTOF(ui\items\plasmaIV_x_ca.paa); picture = QPATHTOF(ui\items\plasmaIV_x_ca.paa);
descriptionShort = CSTRING(Plasma_IV_Desc_Short); descriptionShort = CSTRING(Plasma_IV_Desc_Short);
descriptionUse = CSTRING(Plasma_IV_Desc_Use); descriptionUse = CSTRING(Plasma_IV_Desc_Use);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 10; mass = 10;
}; };
}; };
@ -126,7 +126,7 @@ class CfgWeapons {
displayName = CSTRING(Plasma_IV_500); displayName = CSTRING(Plasma_IV_500);
model = QPATHTOF(data\IVBag_500ml.p3d); model = QPATHTOF(data\IVBag_500ml.p3d);
hiddenSelectionsTextures[] = { QPATHTOF(data\IVBag_plasma_500ml_ca.paa) }; hiddenSelectionsTextures[] = { QPATHTOF(data\IVBag_plasma_500ml_ca.paa) };
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 5; mass = 5;
}; };
}; };
@ -134,7 +134,7 @@ class CfgWeapons {
displayName = CSTRING(Plasma_IV_250); displayName = CSTRING(Plasma_IV_250);
model = QPATHTOF(data\IVBag_250ml.p3d); model = QPATHTOF(data\IVBag_250ml.p3d);
hiddenSelectionsTextures[] = { QPATHTOF(data\IVBag_plasma_250ml_ca.paa) }; hiddenSelectionsTextures[] = { QPATHTOF(data\IVBag_plasma_250ml_ca.paa) };
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 2.5; mass = 2.5;
}; };
}; };
@ -147,7 +147,7 @@ class CfgWeapons {
hiddenSelectionsTextures[] = { QPATHTOF(data\IVBag_blood_1000ml_ca.paa) }; hiddenSelectionsTextures[] = { QPATHTOF(data\IVBag_blood_1000ml_ca.paa) };
descriptionShort = CSTRING(Blood_IV_Desc_Short); descriptionShort = CSTRING(Blood_IV_Desc_Short);
descriptionUse = CSTRING(Blood_IV_Desc_Use); descriptionUse = CSTRING(Blood_IV_Desc_Use);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 10; mass = 10;
}; };
}; };
@ -155,7 +155,7 @@ class CfgWeapons {
displayName = CSTRING(Blood_IV_500); displayName = CSTRING(Blood_IV_500);
model = QPATHTOF(data\IVBag_500ml.p3d); model = QPATHTOF(data\IVBag_500ml.p3d);
hiddenSelectionsTextures[] = { QPATHTOF(data\IVBag_blood_500ml_ca.paa) }; hiddenSelectionsTextures[] = { QPATHTOF(data\IVBag_blood_500ml_ca.paa) };
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 5; mass = 5;
}; };
}; };
@ -163,7 +163,7 @@ class CfgWeapons {
displayName = CSTRING(Blood_IV_250); displayName = CSTRING(Blood_IV_250);
model = QPATHTOF(data\IVBag_250ml.p3d); model = QPATHTOF(data\IVBag_250ml.p3d);
hiddenSelectionsTextures[] = { QPATHTOF(data\IVBag_blood_250ml_ca.paa) }; hiddenSelectionsTextures[] = { QPATHTOF(data\IVBag_blood_250ml_ca.paa) };
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 2.5; mass = 2.5;
}; };
}; };
@ -176,7 +176,7 @@ class CfgWeapons {
picture = QPATHTOF(ui\items\salineIV_x_ca.paa); picture = QPATHTOF(ui\items\salineIV_x_ca.paa);
descriptionShort = CSTRING(Saline_IV_Desc_Short); descriptionShort = CSTRING(Saline_IV_Desc_Short);
descriptionUse = CSTRING(Saline_IV_Desc_Use); descriptionUse = CSTRING(Saline_IV_Desc_Use);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 10; mass = 10;
}; };
}; };
@ -184,7 +184,7 @@ class CfgWeapons {
displayName = CSTRING(Saline_IV_500); displayName = CSTRING(Saline_IV_500);
model = QPATHTOF(data\IVBag_500ml.p3d); model = QPATHTOF(data\IVBag_500ml.p3d);
hiddenSelectionsTextures[] = { QPATHTOF(data\IVBag_saline_500ml_ca.paa) }; hiddenSelectionsTextures[] = { QPATHTOF(data\IVBag_saline_500ml_ca.paa) };
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 5; mass = 5;
}; };
}; };
@ -192,7 +192,7 @@ class CfgWeapons {
displayName = CSTRING(Saline_IV_250); displayName = CSTRING(Saline_IV_250);
model = QPATHTOF(data\IVBag_250ml.p3d); model = QPATHTOF(data\IVBag_250ml.p3d);
hiddenSelectionsTextures[] = { QPATHTOF(data\IVBag_saline_250ml_ca.paa) }; hiddenSelectionsTextures[] = { QPATHTOF(data\IVBag_saline_250ml_ca.paa) };
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 2.5; mass = 2.5;
}; };
}; };
@ -203,7 +203,7 @@ class CfgWeapons {
picture = QPATHTOF(ui\items\quickclot_x_ca.paa); picture = QPATHTOF(ui\items\quickclot_x_ca.paa);
descriptionShort = CSTRING(QuikClot_Desc_Short); descriptionShort = CSTRING(QuikClot_Desc_Short);
descriptionUse = CSTRING(QuikClot_Desc_Use); descriptionUse = CSTRING(QuikClot_Desc_Use);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1; mass = 1;
}; };
}; };
@ -213,7 +213,7 @@ class CfgWeapons {
picture = QPATHTOF(ui\items\personal_aid_kit_x_ca.paa); picture = QPATHTOF(ui\items\personal_aid_kit_x_ca.paa);
descriptionShort = CSTRING(Aid_Kit_Desc_Short); descriptionShort = CSTRING(Aid_Kit_Desc_Short);
descriptionUse = CSTRING(Aid_Kit_Desc_Use); descriptionUse = CSTRING(Aid_Kit_Desc_Use);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 10; mass = 10;
}; };
}; };
@ -224,7 +224,7 @@ class CfgWeapons {
picture = QPATHTOF(ui\items\surgicalKit_x_ca.paa); picture = QPATHTOF(ui\items\surgicalKit_x_ca.paa);
descriptionShort = CSTRING(SurgicalKit_Desc_Short); descriptionShort = CSTRING(SurgicalKit_Desc_Short);
descriptionUse = CSTRING(SurgicalKit_Desc_Use); descriptionUse = CSTRING(SurgicalKit_Desc_Use);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 15; mass = 15;
}; };
}; };
@ -235,7 +235,7 @@ class CfgWeapons {
picture = QPATHTOF(ui\items\bodybag_x_ca.paa); picture = QPATHTOF(ui\items\bodybag_x_ca.paa);
descriptionShort = CSTRING(Bodybag_Desc_Short); descriptionShort = CSTRING(Bodybag_Desc_Short);
descriptionUse = CSTRING(Bodybag_Desc_Use); descriptionUse = CSTRING(Bodybag_Desc_Use);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 7; mass = 7;
}; };
}; };

4
addons/microdagr/CfgWeapons.hpp
View File

@ -1,6 +1,6 @@
class CfgWeapons { class CfgWeapons {
class ACE_ItemCore; class ACE_ItemCore;
class InventoryItem_Base_F; class CBA_MiscItem_ItemInfo;
class ACE_microDAGR: ACE_ItemCore { class ACE_microDAGR: ACE_ItemCore {
author = ECSTRING(common,ACETeam); author = ECSTRING(common,ACETeam);
@ -9,7 +9,7 @@ class CfgWeapons {
descriptionShort = CSTRING(itemDescription); descriptionShort = CSTRING(itemDescription);
model = QPATHTOF(data\MicroDAGR.p3d); model = QPATHTOF(data\MicroDAGR.p3d);
picture = QPATHTOF(images\microDAGR_item.paa); picture = QPATHTOF(images\microDAGR_item.paa);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 2; mass = 2;
}; };
}; };

4
addons/mk6mortar/CfgWeapons.hpp
View File

@ -1,6 +1,6 @@
class CfgWeapons { class CfgWeapons {
class ACE_ItemCore; class ACE_ItemCore;
class InventoryItem_Base_F; class CBA_MiscItem_ItemInfo;
class ACE_RangeTable_82mm: ACE_ItemCore { class ACE_RangeTable_82mm: ACE_ItemCore {
author = ECSTRING(common,ACETeam); author = ECSTRING(common,ACETeam);
@ -8,7 +8,7 @@ class CfgWeapons {
displayName = CSTRING(rangetable_name); displayName = CSTRING(rangetable_name);
descriptionShort = CSTRING(rangetable_description); descriptionShort = CSTRING(rangetable_description);
picture = QPATHTOF(UI\icon_rangeTable.paa); picture = QPATHTOF(UI\icon_rangeTable.paa);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 0.5; mass = 0.5;
}; };
}; };

3
addons/overheating/CfgWeapons.hpp
View File

@ -1,7 +1,4 @@
class CfgWeapons { class CfgWeapons {
class ACE_ItemCore;
class InventoryItem_Base_F;
class RifleCore; class RifleCore;
class Rifle: RifleCore { class Rifle: RifleCore {
//Mean Rounds Between Stoppages (this will be scaled based on the barrel temp) //Mean Rounds Between Stoppages (this will be scaled based on the barrel temp)

4
addons/rangecard/CfgWeapons.hpp
View File

@ -1,7 +1,7 @@
class CfgWeapons { class CfgWeapons {
class ACE_ItemCore; class ACE_ItemCore;
class InventoryItem_Base_F; class CBA_MiscItem_ItemInfo;
class ACE_RangeCard: ACE_ItemCore { class ACE_RangeCard: ACE_ItemCore {
author[] = {"Ruthberg"}; author[] = {"Ruthberg"};
@ -12,7 +12,7 @@ class CfgWeapons {
icon = "iconObject_circle"; icon = "iconObject_circle";
mapSize = 0.034; mapSize = 0.034;
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1; mass = 1;
}; };
}; };

6
addons/sandbag/CfgWeapons.hpp
View File

@ -1,7 +1,7 @@
class CfgWeapons { class CfgWeapons {
class ACE_ItemCore; class ACE_ItemCore;
class InventoryItem_Base_F; class CBA_MiscItem_ItemInfo;
class ACE_Sandbag_empty: ACE_ItemCore { class ACE_Sandbag_empty: ACE_ItemCore {
author = ECSTRING(common,ACETeam); author = ECSTRING(common,ACETeam);
@ -10,7 +10,7 @@ class CfgWeapons {
model = QPATHTOF(data\ace_sandbag_m.p3d); model = QPATHTOF(data\ace_sandbag_m.p3d);
picture = QPATHTOF(data\m_sandbag_ca.paa); picture = QPATHTOF(data\m_sandbag_ca.paa);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 8; mass = 8;
}; };
}; };
@ -22,7 +22,7 @@ class CfgWeapons {
model = QPATHTOF(data\ace_sandbag_build.p3d); model = QPATHTOF(data\ace_sandbag_build.p3d);
picture = QPATHTOF(data\m_sandbag_ca.paa); picture = QPATHTOF(data\m_sandbag_ca.paa);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 160; mass = 160;
}; };
}; };

4
addons/spottingscope/CfgWeapons.hpp
View File

@ -1,7 +1,7 @@
class CfgWeapons { class CfgWeapons {
class ACE_ItemCore; class ACE_ItemCore;
class InventoryItem_Base_F; class CBA_MiscItem_ItemInfo;
class ACE_SpottingScope: ACE_ItemCore { class ACE_SpottingScope: ACE_ItemCore {
scope = 2; scope = 2;
@ -10,7 +10,7 @@ class CfgWeapons {
picture = QPATHTOF(UI\w_spottingscope_ca.paa); picture = QPATHTOF(UI\w_spottingscope_ca.paa);
model = QPATHTOF(data\ace_spottingscope.p3d); model = QPATHTOF(data\ace_spottingscope.p3d);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 40; mass = 40;
}; };
}; };

4
addons/tagging/CfgWeapons.hpp
View File

@ -1,6 +1,6 @@
class CfgWeapons { class CfgWeapons {
class ACE_ItemCore; class ACE_ItemCore;
class InventoryItem_Base_F; class CBA_MiscItem_ItemInfo;
class ACE_SpraypaintBlack : ACE_ItemCore { class ACE_SpraypaintBlack : ACE_ItemCore {
author = "jokoho48"; author = "jokoho48";
@ -11,7 +11,7 @@ class CfgWeapons {
scope = 2; scope = 2;
hiddenSelections[] = {"camo"}; hiddenSelections[] = {"camo"};
hiddenSelectionsTextures[] = {QPATHTOF(data\spraycanBlack_co.paa)}; hiddenSelectionsTextures[] = {QPATHTOF(data\spraycanBlack_co.paa)};
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 10; mass = 10;
}; };
}; };

4
addons/trenches/CfgWeapons.hpp
View File

@ -1,5 +1,5 @@
class CfgWeapons { class CfgWeapons {
class InventoryItem_Base_F; class CBA_MiscItem_ItemInfo;
class ACE_ItemCore; class ACE_ItemCore;
class ACE_EntrenchingTool: ACE_ItemCore { class ACE_EntrenchingTool: ACE_ItemCore {
@ -9,7 +9,7 @@ class CfgWeapons {
model = QPATHTOEF(apl,ace_entrchtool.p3d); model = QPATHTOEF(apl,ace_entrchtool.p3d);
picture = QPATHTOF(ui\w_entrchtool_ca.paa); picture = QPATHTOF(ui\w_entrchtool_ca.paa);
scope = 2; scope = 2;
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 10; mass = 10;
}; };
}; };

4
addons/tripod/CfgWeapons.hpp
View File

@ -1,6 +1,6 @@
class CfgWeapons { class CfgWeapons {
class ACE_ItemCore; class ACE_ItemCore;
class InventoryItem_Base_F; class CBA_MiscItem_ItemInfo;
class ACE_Tripod: ACE_ItemCore { class ACE_Tripod: ACE_ItemCore {
author[] = {"Rocko", "Scubaman3D"}; author[] = {"Rocko", "Scubaman3D"};
@ -10,7 +10,7 @@ class CfgWeapons {
model = QPATHTOF(data\w_sniper_tripod.p3d); model = QPATHTOF(data\w_sniper_tripod.p3d);
picture = QPATHTOF(UI\w_sniper_tripod_ca.paa); picture = QPATHTOF(UI\w_sniper_tripod_ca.paa);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 40; mass = 40;
}; };
}; };

4
addons/vehiclelock/CfgWeapons.hpp
View File

@ -1,5 +1,5 @@
class CfgWeapons { class CfgWeapons {
class InventoryItem_Base_F; class CBA_MiscItem_ItemInfo;
class ACE_ItemCore; class ACE_ItemCore;
class ACE_key_master: ACE_ItemCore { class ACE_key_master: ACE_ItemCore {
@ -10,7 +10,7 @@ class CfgWeapons {
model = "\A3\weapons_F\ammo\mag_univ.p3d"; model = "\A3\weapons_F\ammo\mag_univ.p3d";
picture = QPATHTOF(ui\keyBlack.paa); picture = QPATHTOF(ui\keyBlack.paa);
scope = 2; scope = 2;
class ItemInfo: InventoryItem_Base_F { class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 0; mass = 0;
}; };
}; };