Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use CBA Misc Items #5502

Merged
merged 2 commits into from
Sep 13, 2017
Merged

Use CBA Misc Items #5502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1eea499
Use CBA Misc Items
PabstMirror May 6, 2017
d088480
Set required CBA to 3.4.1
PabstMirror Sep 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions addons/atragmx/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

class CfgWeapons {
class ACE_ItemCore;
class InventoryItem_Base_F;
class CBA_MiscItem_ItemInfo;

class ACE_ATragMX: ACE_ItemCore {
author = "Ruthberg";
Expand All @@ -13,7 +13,7 @@ class CfgWeapons {
icon = "iconObject_circle";
mapSize = 0.034;

class ItemInfo: InventoryItem_Base_F {
class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 2;
};
};
Expand Down
6 changes: 3 additions & 3 deletions addons/attach/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
class CfgWeapons {
class ACE_ItemCore;
class InventoryItem_Base_F;
class CBA_MiscItem_ItemInfo;

class ACE_IR_Strobe_Item: ACE_ItemCore {
ACE_attachable = "ACE_IR_Strobe_Effect";
Expand All @@ -11,8 +11,8 @@ class CfgWeapons {
model = QPATHTOF(data\ace_IRStrobe.p3d);
picture = QPATHTOF(UI\irstrobe_item.paa);

class ItemInfo: InventoryItem_Base_F {
class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1;
};
};
};
};
4 changes: 2 additions & 2 deletions addons/captives/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
class CfgWeapons {
class ACE_ItemCore;
class InventoryItem_Base_F;
class CBA_MiscItem_ItemInfo;

class ACE_CableTie: ACE_ItemCore {
displayName = CSTRING(CableTie);
descriptionShort = CSTRING(CableTieDescription);
model = QPATHTOF(models\ace_cabletie.p3d);
picture = QPATHTOF(UI\ace_cabletie_ca.paa);
scope = 2;
class ItemInfo: InventoryItem_Base_F {
class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1;
};
};
Expand Down
16 changes: 8 additions & 8 deletions addons/chemlights/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class CfgWeapons {
};

class ACE_ItemCore;
class InventoryItem_Base_F;
class CBA_MiscItem_ItemInfo;

class ACE_Chemlight_Shield: ACE_ItemCore {
author = ECSTRING(common,ACETeam);
Expand All @@ -45,7 +45,7 @@ class CfgWeapons {
model = "\A3\weapons_F\ammo\mag_univ.p3d";
picture = QPATHTOF(UI\ace_chemlight_shield_x_ca.paa);
scope = 2;
class ItemInfo: InventoryItem_Base_F {
class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1;
};
};
Expand All @@ -58,7 +58,7 @@ class CfgWeapons {
model = "\A3\weapons_F\ammo\mag_univ.p3d";
picture = QPATHTOF(UI\ace_chemlight_shield_green_x_ca.paa);
scope = 1;
class ItemInfo: InventoryItem_Base_F {
class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1;
class FlashLight {
ACE_Flashlight_Colour = "green";
Expand All @@ -73,7 +73,7 @@ class CfgWeapons {
displayName = CSTRING(Shield_Red_DisplayName);
descriptionShort = CSTRING(Shield_Red_DescriptionShort);
picture = QPATHTOF(UI\ace_chemlight_shield_red_x_ca.paa);
class ItemInfo: InventoryItem_Base_F {
class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1;
class FlashLight {
ACE_Flashlight_Colour = "red";
Expand All @@ -88,7 +88,7 @@ class CfgWeapons {
displayName = CSTRING(Shield_Blue_DisplayName);
descriptionShort = CSTRING(Shield_Blue_DescriptionShort);
picture = QPATHTOF(UI\ace_chemlight_shield_blue_x_ca.paa);
class ItemInfo: InventoryItem_Base_F {
class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1;
class FlashLight {
ACE_Flashlight_Colour = "blue";
Expand All @@ -103,7 +103,7 @@ class CfgWeapons {
displayName = CSTRING(Shield_Yellow_DisplayName);
descriptionShort = CSTRING(Shield_Yellow_DescriptionShort);
picture = QPATHTOF(UI\ace_chemlight_shield_yellow_x_ca.paa);
class ItemInfo: InventoryItem_Base_F {
class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1;
class FlashLight {
ACE_Flashlight_Colour = "yellow";
Expand All @@ -118,7 +118,7 @@ class CfgWeapons {
displayName = CSTRING(Shield_Orange_DisplayName);
descriptionShort = CSTRING(Shield_Orange_DescriptionShort);
picture = QPATHTOF(UI\ace_chemlight_shield_orange_x_ca.paa);
class ItemInfo: InventoryItem_Base_F {
class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1;
class FlashLight {
ACE_Flashlight_Colour = "orange";
Expand All @@ -133,7 +133,7 @@ class CfgWeapons {
displayName = CSTRING(Shield_White_DisplayName);
descriptionShort = CSTRING(Shield_White_DescriptionShort);
picture = QPATHTOF(UI\ace_chemlight_shield_white_x_ca.paa);
class ItemInfo: InventoryItem_Base_F {
class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1;
class FlashLight {
ACE_Flashlight_Colour = "white";
Expand Down
12 changes: 4 additions & 8 deletions addons/common/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@

class CfgWeapons {
class ItemCore;
class ACE_ItemCore: ItemCore {
type = 4096;//4;
detectRange = -1;
simulation = "ItemMineDetector";
};
class CBA_MiscItem;
class CBA_MiscItem_ItemInfo;
class ACE_ItemCore: CBA_MiscItem {};

class Rifle;
class Rifle_Base_F: Rifle {
Expand All @@ -28,7 +25,6 @@ class CfgWeapons {
};
};

class InventoryItem_Base_F;
class ACE_Banana: ACE_ItemCore {
author = CSTRING(ACETeam);
scope = 2;
Expand All @@ -38,7 +34,7 @@ class CfgWeapons {
picture = QPATHTOF(data\icon_banana_ca.paa);
icon = "iconObject_circle";
mapSize = 0.034;
class ItemInfo: InventoryItem_Base_F {
class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1;
};
};
Expand Down
4 changes: 2 additions & 2 deletions addons/dagr/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

class CfgWeapons {
class ACE_ItemCore;
class InventoryItem_Base_F;
class CBA_MiscItem_ItemInfo;

class ACE_DAGR: ACE_ItemCore {
author[] = {$STR_ACE_Common_ACETeam, "Ruthberg"};
Expand All @@ -12,7 +12,7 @@ class CfgWeapons {
picture = QPATHTOF(UI\DAGR_Icon.paa);
icon = "iconObject_circle";
mapSize = 0.034;
class ItemInfo: InventoryItem_Base_F {
class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 10;
};
};
Expand Down
4 changes: 2 additions & 2 deletions addons/disarming/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
class CfgWeapons {
class ACE_ItemCore;
class InventoryItem_Base_F;
class CBA_MiscItem_ItemInfo;

class ACE_DebugPotato: ACE_ItemCore {
displayName = "ACE Potato (debug)";
descriptionShort = "Glorious Potato<br/>If you see this in game it means someone fucked up";
picture = QPATHTOF(UI\potato_ca.paa);
scope = 1;
class ItemInfo: InventoryItem_Base_F {
class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1;
};
};
Expand Down
4 changes: 2 additions & 2 deletions addons/dogtags/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@

class CfgWeapons {
class ACE_ItemCore;
class InventoryItem_Base_F;
class CBA_MiscItem_ItemInfo;

class ACE_dogtag: ACE_ItemCore {
author = ECSTRING(common,ACETeam);
scope = 0;
displayName = CSTRING(itemName);
model = QUOTE(PATHTOF(data\ace_dogtag.p3d));
picture = QUOTE(PATHTOF(data\dogtagSingle.paa));
class ItemInfo: InventoryItem_Base_F {
class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 0; //too small to for 1 ?
};
};
Expand Down
4 changes: 2 additions & 2 deletions addons/explosives/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class CfgWeapons {
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};
//type = 201;
};
Expand Down
10 changes: 5 additions & 5 deletions addons/flashlights/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
class CfgWeapons {

class ACE_ItemCore;
class InventoryItem_Base_F;
class CBA_MiscItem_ItemInfo;

class ACE_Flashlight_MX991: ACE_ItemCore {
displayName = CSTRING(MX991_DisplayName);
descriptionShort = CSTRING(MX991_Description);
model = QPATHTOF(data\MX_991.p3d);
picture = QPATHTOF(UI\mx991_ca.paa);
scope = 2;
class ItemInfo: InventoryItem_Base_F {
class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1;
class FlashLight {
ACE_Flashlight_Colour = "red";
Expand All @@ -26,7 +26,7 @@ class CfgWeapons {
model = QPATHTOF(data\KSF_1.p3d);
picture = QPATHTOF(UI\ksf1_ca.paa);
scope = 2;
class ItemInfo: InventoryItem_Base_F {
class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1;
class FlashLight {
ACE_Flashlight_Colour = "red";
Expand All @@ -43,7 +43,7 @@ class CfgWeapons {
model = QPATHTOF(data\Maglight.p3d);
picture = QPATHTOF(UI\xl50_ca.paa);
scope = 2;
class ItemInfo: InventoryItem_Base_F {
class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1;
class FlashLight {
ACE_Flashlight_Colour = "white";
Expand All @@ -53,4 +53,4 @@ class CfgWeapons {
};
};
};
};
};
4 changes: 2 additions & 2 deletions addons/hearing/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
class CfgWeapons {
class ACE_ItemCore;
class InventoryItem_Base_F;
class CBA_MiscItem_ItemInfo;

class ACE_EarPlugs: ACE_ItemCore {
displayName = CSTRING(EarPlugs_Name);
descriptionShort = CSTRING(EarPlugs_Description);
model = QPATHTOF(data\ace_earplugs.p3d);
picture = QPATHTOF(UI\ACE_earplugs_x_ca.paa);
scope = 2;
class ItemInfo: InventoryItem_Base_F {
class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1;
};
};
Expand Down
4 changes: 2 additions & 2 deletions addons/huntir/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

class CfgWeapons {
class ACE_ItemCore;
class InventoryItem_Base_F;
class CBA_MiscItem_ItemInfo;

class ACE_HuntIR_monitor: ACE_ItemCore {
scope = 2;
Expand All @@ -10,7 +10,7 @@ class CfgWeapons {
descriptionShort = CSTRING(monitor_displayName);
model = QPATHTOF(data\ace_huntir_monitor.p3d);

class ItemInfo: InventoryItem_Base_F {
class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 20;
};
};
Expand Down
4 changes: 2 additions & 2 deletions addons/logistics_uavbattery/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class CfgWeapons {
class InventoryItem_Base_F;
class CBA_MiscItem_ItemInfo;
class ACE_ItemCore;

class ACE_UAVBattery: ACE_ItemCore {
Expand All @@ -8,7 +8,7 @@ class CfgWeapons {
descriptionShort = CSTRING(Battery_Description);
model = QPATHTOF(data\ace_battery.p3d);
picture = QPATHTOF(ui\UAV_battery_ca.paa);
class ItemInfo: InventoryItem_Base_F {
class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 20;
};
};
Expand Down
4 changes: 2 additions & 2 deletions addons/logistics_wirecutter/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class CfgWeapons {
class InventoryItem_Base_F;
class CBA_MiscItem_ItemInfo;
class ACE_ItemCore;

class ACE_wirecutter: ACE_ItemCore {
Expand All @@ -9,7 +9,7 @@ class CfgWeapons {
model = QPATHTOF(data\ace_wirecutter.p3d);
picture = QPATHTOF(ui\item_wirecutter_ca.paa);
scope = 2;
class ItemInfo: InventoryItem_Base_F {
class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 25;
};
};
Expand Down
2 changes: 1 addition & 1 deletion addons/main/script_mod.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

// MINIMAL required version for the Mod. Components can specify others..
#define REQUIRED_VERSION 1.76
#define REQUIRED_CBA_VERSION {3,3,1}
#define REQUIRED_CBA_VERSION {3,4,1}

#ifdef COMPONENT_BEAUTIFIED
#define COMPONENT_NAME QUOTE(ACE3 - COMPONENT_BEAUTIFIED)
Expand Down
4 changes: 2 additions & 2 deletions addons/maptools/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
class CfgWeapons {
class ACE_ItemCore;
class InventoryItem_Base_F;
class CBA_MiscItem_ItemInfo;

class ACE_MapTools: ACE_ItemCore {
displayName = CSTRING(Name);
descriptionShort = CSTRING(Description);
model = QPATHTOF(data\ace_MapTools.p3d);
picture = QPATHTOF(UI\maptool_item.paa);
scope = 2;
class ItemInfo: InventoryItem_Base_F {
class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1;
};
};
Expand Down
Loading