diff --git a/addons/attach/data/ace_IRStrobe.p3d b/addons/attach/data/ace_IRStrobe.p3d index 67f3d55f89..2be5cbd428 100644 Binary files a/addons/attach/data/ace_IRStrobe.p3d and b/addons/attach/data/ace_IRStrobe.p3d differ diff --git a/addons/dagr/data/DAGR.p3d b/addons/dagr/data/DAGR.p3d index afba9837f9..7ebff00dcd 100644 Binary files a/addons/dagr/data/DAGR.p3d and b/addons/dagr/data/DAGR.p3d differ diff --git a/addons/explosives/Data/ace_m57.p3d b/addons/explosives/Data/ace_m57.p3d index 3c7dd5ebb8..56cb44e937 100644 Binary files a/addons/explosives/Data/ace_m57.p3d and b/addons/explosives/Data/ace_m57.p3d differ diff --git a/addons/hearing/UI/earplug_co.paa b/addons/hearing/UI/earplug_co.paa deleted file mode 100644 index 94ba616adb..0000000000 Binary files a/addons/hearing/UI/earplug_co.paa and /dev/null differ diff --git a/addons/hearing/ace_earplugs.p3d b/addons/hearing/ace_earplugs.p3d deleted file mode 100644 index 5054aba858..0000000000 Binary files a/addons/hearing/ace_earplugs.p3d and /dev/null differ diff --git a/addons/hearing/data/ace_earplugs.p3d b/addons/hearing/data/ace_earplugs.p3d index 29c42266b6..2e66c383a5 100644 Binary files a/addons/hearing/data/ace_earplugs.p3d and b/addons/hearing/data/ace_earplugs.p3d differ diff --git a/addons/logistics_uavbattery/models/ace_battery.p3d b/addons/logistics_uavbattery/models/ace_battery.p3d index bf756d62cb..b505fc162d 100644 Binary files a/addons/logistics_uavbattery/models/ace_battery.p3d and b/addons/logistics_uavbattery/models/ace_battery.p3d differ diff --git a/addons/logistics_wirecutter/data/ace_wirecutter.p3d b/addons/logistics_wirecutter/data/ace_wirecutter.p3d index e4f6533fb6..94b3b7ae3e 100644 Binary files a/addons/logistics_wirecutter/data/ace_wirecutter.p3d and b/addons/logistics_wirecutter/data/ace_wirecutter.p3d differ diff --git a/addons/maptools/data/ace_MapTools.p3d b/addons/maptools/data/ace_MapTools.p3d index 2331f5adec..b44cb2b648 100644 Binary files a/addons/maptools/data/ace_MapTools.p3d and b/addons/maptools/data/ace_MapTools.p3d differ diff --git a/addons/medical/CfgWeapons.hpp b/addons/medical/CfgWeapons.hpp index df0fb4416d..36efb842d5 100644 --- a/addons/medical/CfgWeapons.hpp +++ b/addons/medical/CfgWeapons.hpp @@ -98,10 +98,13 @@ class CfgWeapons { mass = 1; }; }; + class ACE_plasmaIV: ACE_ItemCore { scope = 2; displayName = CSTRING(Plasma_IV); - model = QUOTE(PATHTOF(data\IVBag_plasma_1000ml.p3d)); + model = QUOTE(PATHTOF(data\IVBag_1000ml.p3d)); + hiddenSelections[] = {"camo"}; + hiddenSelectionsTextures[] = { QUOTE(PATHTOF(data\IVBag_plasma_1000ml_ca.paa)) }; picture = QUOTE(PATHTOF(ui\items\plasmaIV_x_ca.paa)); descriptionShort = CSTRING(Plasma_IV_Desc_Short); descriptionUse = CSTRING(Plasma_IV_Desc_Use); @@ -110,24 +113,28 @@ class CfgWeapons { }; }; class ACE_plasmaIV_500: ACE_plasmaIV { - displayName = CSTRING(Plasma_IV_500); + displayName = CSTRING(Plasma_500); model = QUOTE(PATHTOF(data\IVBag_plasma_500ml.p3d)); + hiddenSelectionsTextures[] = { QUOTE(PATHTOF(data\IVBag_plasma_500ml_ca.paa)) }; class ItemInfo: InventoryItem_Base_F { mass = 5; }; }; class ACE_plasmaIV_250: ACE_plasmaIV { - displayName = CSTRING(Plasma_IV_250); + displayName = CSTRING(Plasma_250); model = QUOTE(PATHTOF(data\IVBag_plasma_250ml.p3d)); + hiddenSelectionsTextures[] = { QUOTE(PATHTOF(data\IVBag_plasma_250ml_ca.paa)) }; class ItemInfo: InventoryItem_Base_F { mass = 2.5; }; }; class ACE_bloodIV: ACE_ItemCore { scope = 2; - model = QUOTE(PATHTOF(data\IVBag_blood_1000ml.p3d)); + model = QUOTE(PATHTOF(data\IVBag_1000ml.p3d)); displayName = CSTRING(Blood_IV); picture = QUOTE(PATHTOF(ui\items\bloodIV_x_ca.paa)); + hiddenSelections[] = {"camo"}; + hiddenSelectionsTextures[] = { QUOTE(PATHTOF(data\IVBag_blood_1000ml_ca.paa)) }; descriptionShort = CSTRING(Blood_IV_Desc_Short); descriptionUse = CSTRING(Blood_IV_Desc_Use); class ItemInfo: InventoryItem_Base_F { @@ -136,14 +143,16 @@ class CfgWeapons { }; class ACE_bloodIV_500: ACE_bloodIV { displayName = CSTRING(Blood_IV_500); - model = QUOTE(PATHTOF(data\IVBag_blood_500ml.p3d)); + model = QUOTE(PATHTOF(data\IVBag_500ml.p3d)); + hiddenSelectionsTextures[] = { QUOTE(PATHTOF(data\IVBag_blood_500ml_ca.paa)) }; class ItemInfo: InventoryItem_Base_F { mass = 5; }; }; class ACE_bloodIV_250: ACE_bloodIV { displayName = CSTRING(Blood_IV_250); - model = QUOTE(PATHTOF(data\IVBag_blood_250ml.p3d)); + model = QUOTE(PATHTOF(data\IVBag_250ml.p3d)); + hiddenSelectionsTextures[] = { QUOTE(PATHTOF(data\IVBag_blood_250ml_ca.paa)) }; class ItemInfo: InventoryItem_Base_F { mass = 2.5; }; @@ -151,7 +160,9 @@ class CfgWeapons { class ACE_salineIV: ACE_ItemCore { scope = 2; displayName = CSTRING(Saline_IV); - model = QUOTE(PATHTOF(data\IVBag_saline_1000ml.p3d)); + model = QUOTE(PATHTOF(data\IVBag_1000ml.p3d)); + hiddenSelections[] = {"camo"}; + hiddenSelectionsTextures[] = { QUOTE(PATHTOF(data\IVBag_saline_1000ml_ca.paa)) }; picture = QUOTE(PATHTOF(ui\items\salineIV_x_ca.paa)); descriptionShort = CSTRING(Saline_IV_Desc_Short); descriptionUse = CSTRING(Saline_IV_Desc_Use); @@ -161,14 +172,16 @@ class CfgWeapons { }; class ACE_salineIV_500: ACE_salineIV { displayName = CSTRING(Saline_IV_500); - model = QUOTE(PATHTOF(data\IVBag_saline_500ml.p3d)); + model = QUOTE(PATHTOF(data\IVBag_500ml.p3d)); + hiddenSelectionsTextures[] = { QUOTE(PATHTOF(data\IVBag_saline_500ml_ca.paa)) }; class ItemInfo: InventoryItem_Base_F { mass = 5; }; }; class ACE_salineIV_250: ACE_salineIV { displayName = CSTRING(Saline_IV_250); - model = QUOTE(PATHTOF(data\IVBag_saline_250ml.p3d)); + model = QUOTE(PATHTOF(data\IVBag_250ml.p3d)); + hiddenSelectionsTextures[] = { QUOTE(PATHTOF(data\IVBag_saline_250ml_ca.paa)) }; class ItemInfo: InventoryItem_Base_F { mass = 2.5; }; @@ -176,7 +189,7 @@ class CfgWeapons { class ACE_quikclot: ACE_ItemCore { scope = 2; displayName = CSTRING(QuikClot_Display); - model = QUOTE(PATHTOF(data\QuikClot.p3d)) + model = QUOTE(PATHTOF(data\QuikClot.p3d)) picture = QUOTE(PATHTOF(ui\items\quickclot_x_ca.paa)); descriptionShort = CSTRING(QuikClot_Desc_Short); descriptionUse = CSTRING(QuikClot_Desc_Use); diff --git a/addons/medical/data/IVBag_blood_1000ml.p3d b/addons/medical/data/IVBag_1000ml.p3d similarity index 98% rename from addons/medical/data/IVBag_blood_1000ml.p3d rename to addons/medical/data/IVBag_1000ml.p3d index 50ed1707cd..ea14e3e59a 100644 Binary files a/addons/medical/data/IVBag_blood_1000ml.p3d and b/addons/medical/data/IVBag_1000ml.p3d differ diff --git a/addons/medical/data/IVBag_blood_250ml.p3d b/addons/medical/data/IVBag_250ml.p3d similarity index 98% rename from addons/medical/data/IVBag_blood_250ml.p3d rename to addons/medical/data/IVBag_250ml.p3d index 45641a3f8e..e5b007fcc4 100644 Binary files a/addons/medical/data/IVBag_blood_250ml.p3d and b/addons/medical/data/IVBag_250ml.p3d differ diff --git a/addons/medical/data/IVBag_blood_500ml.p3d b/addons/medical/data/IVBag_500ml.p3d similarity index 98% rename from addons/medical/data/IVBag_blood_500ml.p3d rename to addons/medical/data/IVBag_500ml.p3d index ac700a6727..a6a00b8250 100644 Binary files a/addons/medical/data/IVBag_blood_500ml.p3d and b/addons/medical/data/IVBag_500ml.p3d differ diff --git a/addons/medical/data/IVBag_plasma_1000ml.p3d b/addons/medical/data/IVBag_plasma_1000ml.p3d deleted file mode 100644 index 95c4d49c89..0000000000 Binary files a/addons/medical/data/IVBag_plasma_1000ml.p3d and /dev/null differ diff --git a/addons/medical/data/IVBag_plasma_250ml.p3d b/addons/medical/data/IVBag_plasma_250ml.p3d deleted file mode 100644 index 6476b2477b..0000000000 Binary files a/addons/medical/data/IVBag_plasma_250ml.p3d and /dev/null differ diff --git a/addons/medical/data/IVBag_plasma_500ml.p3d b/addons/medical/data/IVBag_plasma_500ml.p3d deleted file mode 100644 index 6921baf19d..0000000000 Binary files a/addons/medical/data/IVBag_plasma_500ml.p3d and /dev/null differ diff --git a/addons/medical/data/IVBag_saline_1000ml.p3d b/addons/medical/data/IVBag_saline_1000ml.p3d deleted file mode 100644 index 7d9d543910..0000000000 Binary files a/addons/medical/data/IVBag_saline_1000ml.p3d and /dev/null differ diff --git a/addons/medical/data/IVBag_saline_250ml.p3d b/addons/medical/data/IVBag_saline_250ml.p3d deleted file mode 100644 index c395d058f5..0000000000 Binary files a/addons/medical/data/IVBag_saline_250ml.p3d and /dev/null differ diff --git a/addons/medical/data/IVBag_saline_500ml.p3d b/addons/medical/data/IVBag_saline_500ml.p3d deleted file mode 100644 index ac20b20d89..0000000000 Binary files a/addons/medical/data/IVBag_saline_500ml.p3d and /dev/null differ diff --git a/addons/medical/data/QuikClot.p3d b/addons/medical/data/QuikClot.p3d index 85ec2e9923..3bc2e0b4ca 100644 Binary files a/addons/medical/data/QuikClot.p3d and b/addons/medical/data/QuikClot.p3d differ diff --git a/addons/medical/data/model.cfg b/addons/medical/data/model.cfg new file mode 100644 index 0000000000..114fae7ada --- /dev/null +++ b/addons/medical/data/model.cfg @@ -0,0 +1,24 @@ +class CfgSkeletons { + class Default { + isDiscrete = 1; + skeletonInherit = ""; + skeletonBones[] = {}; + }; +}; + +class CfgModels { + class Default { + sectionsInherit=""; + sections[] = {""}; + skeletonName = ""; + }; + class IVBagBase: Default { + sectionsInherit = ""; + sections[] = {"camo"}; + skeletonName = ""; + }; + + class IVBag_250ml: IVBagBase {}; + class IVBag_500ml: IVBagBase {}; + class IVBag_1000ml: IVBagBase {}; +}; \ No newline at end of file