From b3e0135e320181b8d1013cb671239d10b2514677 Mon Sep 17 00:00:00 2001 From: Dedmen Miller Date: Thu, 29 Nov 2018 11:18:22 +0100 Subject: [PATCH] Fix Armake problems (#6697) * Armake model.cfg fix * Spaces! * Case sensitive filenames fix --- .../data/{Jezek_kov.rvmat => jezek_kov.rvmat} | 0 addons/apl/model.cfg | 8 + ...{ace_IRStrobe.rvmat => ace_irstrobe.rvmat} | 0 ...ce_IRStrobe_co.paa => ace_irstrobe_co.paa} | Bin addons/concertina_wire/data/model.cfg | 569 +++++++++--------- .../data/{DAGR_NOHQ.paa => DAGR_nohq.paa} | Bin addons/dagr/data/{DAGR.rvmat => dagr.rvmat} | 0 addons/dagr/data/{DAGR_CO.paa => dagr_co.paa} | Bin addons/dogtags/data/model.cfg | 2 +- ...esAnchorBar.rvmat => friesanchorbar.rvmat} | 0 .../{friesGantry.rvmat => friesgantry.rvmat} | 0 addons/fastroping/data/model.cfg | 1 + .../data/{KSF_1.rvmat => ksf_1.rvmat} | 0 .../data/{KSF_1_co.paa => ksf_1_co.paa} | Bin .../data/{Maglite.rvmat => maglite.rvmat} | 0 .../data/{Maglite_co.paa => maglite_co.paa} | Bin .../data/{MX_991.rvmat => mx_991.rvmat} | 0 .../data/{MX_991_co.paa => mx_991_co.paa} | Bin .../{Kestrel4500.rvmat => kestrel4500.rvmat} | 0 ...{Kestrel4500_co.paa => kestrel4500_co.paa} | Bin .../{bodybagItem.rvmat => bodybagitem.rvmat} | 0 ...{bodybagItem_co.paa => bodybagitem_co.paa} | Bin .../medical/data/{IVBag.rvmat => ivbag.rvmat} | 0 ...000ml_ca.paa => ivbag_blood_1000ml_ca.paa} | Bin ..._250ml_ca.paa => ivbag_blood_250ml_ca.paa} | Bin ..._500ml_ca.paa => ivbag_blood_500ml_ca.paa} | Bin addons/medical/data/model.cfg | 41 +- .../data/{QuikClot.rvmat => quikclot.rvmat} | 0 .../data/{QuikClot_CO.paa => quikclot_co.paa} | Bin .../{QuikClot_NOHQ.paa => quikclot_nohq.paa} | Bin .../data/{MicroDAGR.rvmat => microdagr.rvmat} | 0 .../{MicroDAGR_co.paa => microdagr_co.paa} | Bin addons/repair/data/model.cfg | 14 +- ...railObjects_co.paa => trailobjects_co.paa} | Bin ...s_steel.rvmat => trailobjects_steel.rvmat} | 0 ....rvmat => trailobjects_steel_damage.rvmat} | 0 ...vmat => trailobjects_steel_destruct.rvmat} | 0 ...cts_tyre.rvmat => trailobjects_tyre.rvmat} | 0 ...e.rvmat => trailobjects_tyre_damage.rvmat} | 0 addons/sandbag/data/model.cfg | 5 +- addons/spottingscope/data/model.cfg | 2 + addons/tripod/data/model.cfg | 2 + .../data/{Bushnell.rvmat => bushnell.rvmat} | 0 .../data_f/penetration/metal_plate_thin.rvmat | Bin 0 -> 310 bytes ...l.rvmat => slx_greentracer_material.rvmat} | 0 ...ial.rvmat => slx_redtracer_material.rvmat} | 0 ...l.rvmat => slx_whitetracer_material.rvmat} | 0 ....rvmat => slx_yellowtracer_material.rvmat} | 0 optionals/tracers/model.cfg | 25 +- 49 files changed, 355 insertions(+), 314 deletions(-) rename addons/apl/data/{Jezek_kov.rvmat => jezek_kov.rvmat} (100%) rename addons/attach/data/{ace_IRStrobe.rvmat => ace_irstrobe.rvmat} (100%) rename addons/attach/data/{ace_IRStrobe_co.paa => ace_irstrobe_co.paa} (100%) rename addons/dagr/data/{DAGR_NOHQ.paa => DAGR_nohq.paa} (100%) rename addons/dagr/data/{DAGR.rvmat => dagr.rvmat} (100%) rename addons/dagr/data/{DAGR_CO.paa => dagr_co.paa} (100%) rename addons/fastroping/data/{friesAnchorBar.rvmat => friesanchorbar.rvmat} (100%) rename addons/fastroping/data/{friesGantry.rvmat => friesgantry.rvmat} (100%) rename addons/flashlights/data/{KSF_1.rvmat => ksf_1.rvmat} (100%) rename addons/flashlights/data/{KSF_1_co.paa => ksf_1_co.paa} (100%) rename addons/flashlights/data/{Maglite.rvmat => maglite.rvmat} (100%) rename addons/flashlights/data/{Maglite_co.paa => maglite_co.paa} (100%) rename addons/flashlights/data/{MX_991.rvmat => mx_991.rvmat} (100%) rename addons/flashlights/data/{MX_991_co.paa => mx_991_co.paa} (100%) rename addons/kestrel4500/data/{Kestrel4500.rvmat => kestrel4500.rvmat} (100%) rename addons/kestrel4500/data/{Kestrel4500_co.paa => kestrel4500_co.paa} (100%) rename addons/medical/data/{bodybagItem.rvmat => bodybagitem.rvmat} (100%) rename addons/medical/data/{bodybagItem_co.paa => bodybagitem_co.paa} (100%) rename addons/medical/data/{IVBag.rvmat => ivbag.rvmat} (100%) rename addons/medical/data/{IVBag_blood_1000ml_ca.paa => ivbag_blood_1000ml_ca.paa} (100%) rename addons/medical/data/{IVBag_blood_250ml_ca.paa => ivbag_blood_250ml_ca.paa} (100%) rename addons/medical/data/{IVBag_blood_500ml_ca.paa => ivbag_blood_500ml_ca.paa} (100%) rename addons/medical/data/{QuikClot.rvmat => quikclot.rvmat} (100%) rename addons/medical/data/{QuikClot_CO.paa => quikclot_co.paa} (100%) rename addons/medical/data/{QuikClot_NOHQ.paa => quikclot_nohq.paa} (100%) rename addons/microdagr/data/{MicroDAGR.rvmat => microdagr.rvmat} (100%) rename addons/microdagr/data/{MicroDAGR_co.paa => microdagr_co.paa} (100%) rename addons/repair/data/{trailObjects_co.paa => trailobjects_co.paa} (100%) rename addons/repair/data/{trailObjects_steel.rvmat => trailobjects_steel.rvmat} (100%) rename addons/repair/data/{trailObjects_steel_damage.rvmat => trailobjects_steel_damage.rvmat} (100%) rename addons/repair/data/{trailObjects_steel_destruct.rvmat => trailobjects_steel_destruct.rvmat} (100%) rename addons/repair/data/{trailObjects_tyre.rvmat => trailobjects_tyre.rvmat} (100%) rename addons/repair/data/{trailObjects_tyre_damage.rvmat => trailobjects_tyre_damage.rvmat} (100%) rename addons/yardage450/data/{Bushnell.rvmat => bushnell.rvmat} (100%) create mode 100644 include/a3/data_f/penetration/metal_plate_thin.rvmat rename optionals/tracers/data/{SLX_GreenTracer_Material.rvmat => slx_greentracer_material.rvmat} (100%) rename optionals/tracers/data/{SLX_RedTracer_Material.rvmat => slx_redtracer_material.rvmat} (100%) rename optionals/tracers/data/{SLX_WhiteTracer_Material.rvmat => slx_whitetracer_material.rvmat} (100%) rename optionals/tracers/data/{SLX_YellowTracer_Material.rvmat => slx_yellowtracer_material.rvmat} (100%) diff --git a/addons/apl/data/Jezek_kov.rvmat b/addons/apl/data/jezek_kov.rvmat similarity index 100% rename from addons/apl/data/Jezek_kov.rvmat rename to addons/apl/data/jezek_kov.rvmat diff --git a/addons/apl/model.cfg b/addons/apl/model.cfg index 67bc593a78..7ed0ad7378 100644 --- a/addons/apl/model.cfg +++ b/addons/apl/model.cfg @@ -17,4 +17,12 @@ class CfgModels { sections[] = {"camo"}; skeletonName = ""; }; + class ace_entrchtool: Default {}; + class ace_envelope_big: Default {}; + class ace_envelope_big4: Default {}; + class ace_envelope_big4_nogeo: Default {}; + class ace_envelope_small: Default {}; + class ace_envelope_small4: Default {}; + class ace_envelope_small4_nogeo: Default {}; + class LWTS_optic: Default {}; }; \ No newline at end of file diff --git a/addons/attach/data/ace_IRStrobe.rvmat b/addons/attach/data/ace_irstrobe.rvmat similarity index 100% rename from addons/attach/data/ace_IRStrobe.rvmat rename to addons/attach/data/ace_irstrobe.rvmat diff --git a/addons/attach/data/ace_IRStrobe_co.paa b/addons/attach/data/ace_irstrobe_co.paa similarity index 100% rename from addons/attach/data/ace_IRStrobe_co.paa rename to addons/attach/data/ace_irstrobe_co.paa diff --git a/addons/concertina_wire/data/model.cfg b/addons/concertina_wire/data/model.cfg index 20845cfacb..b8e9fe75c9 100644 --- a/addons/concertina_wire/data/model.cfg +++ b/addons/concertina_wire/data/model.cfg @@ -1,290 +1,291 @@ class CfgSkeletons { - class Default { - isDiscrete = 1; - skeletonInherit = ""; - skeletonBones[] = {}; - }; - class ACE_SB_Skeleton: Default {}; - class ACE_ConcertinaSkeleton { - isDiscrete = 0; - skeletonInherit = ""; - skeletonBones[] = { - "1","", - "2","1", - "3","2", - "4","3", - "5","4", - "6","5", - "7","6", - "8","7", - "9","8", - "10","9", - "11","10", - "12","11", - "13","12", - "14","13", - "15","14", - "16","15", - "17","16", - "18","17", - "fix1","", - "fix2","", - "fix3","", - "fix4","" - }; - }; - class ace_tacticalladder_skeleton: Default { - isDiscrete = 0; - skeletonInherit = ""; - skeletonBones[] = { - "base","", - "1","base", - "2","1", - "3","2", - "4","3", - "5","4", - "6","5", - "7","6", - "8","7", - "9","8", - "10","9", - "11","10", - "step","11" - }; - }; + class Default { + isDiscrete = 1; + skeletonInherit = ""; + skeletonBones[] = {}; + }; + class ACE_SB_Skeleton: Default {}; + class ACE_ConcertinaSkeleton { + isDiscrete = 0; + skeletonInherit = ""; + skeletonBones[] = { + "1","", + "2","1", + "3","2", + "4","3", + "5","4", + "6","5", + "7","6", + "8","7", + "9","8", + "10","9", + "11","10", + "12","11", + "13","12", + "14","13", + "15","14", + "16","15", + "17","16", + "18","17", + "fix1","", + "fix2","", + "fix3","", + "fix4","" + }; + }; + class ace_tacticalladder_skeleton: Default { + isDiscrete = 0; + skeletonInherit = ""; + skeletonBones[] = { + "base","", + "1","base", + "2","1", + "3","2", + "4","3", + "5","4", + "6","5", + "7","6", + "8","7", + "9","8", + "10","9", + "11","10", + "step","11" + }; + }; }; class CfgModels { - class Default { - sectionsInherit=""; - sections[] = {""}; - skeletonName = ""; - }; - class ace_sandbag_build { - sectionsInherit = "Default"; - sections[] = {"zbytek"}; - skeletonName = "ACE_SB_Skeleton"; - }; - class ACE_ConcertinaWire { - skeletonName = "ACE_ConcertinaSkeleton"; - sections[] = {}; - sectionsInherit = ""; - class Animations { - class fix1 { - type="hide"; - source="user"; - selection="fix1"; - minValue = 0; - maxValue = 1; - minPhase = 0; - maxPhase = 1; - hideValue = 1; - }; - class fix2: fix1 { - selection="fix2"; - }; - class fix3: fix1 { - selection="fix3"; - }; - class fix4: fix1 { - selection="fix4"; - }; - class rotate { - type = "rotation"; - source = ""; - sourceAddress = "loop"; - selection = "1"; - axis = "rotate_axis"; - minValue = 0; - maxValue = 360; + class Default { + sectionsInherit=""; + sections[] = {""}; + skeletonName = ""; + }; + class ace_sandbag_build { + sectionsInherit = "Default"; + sections[] = {"zbytek"}; + skeletonName = "ACE_SB_Skeleton"; + }; + class ACE_ConcertinaWire { + skeletonName = "ACE_ConcertinaSkeleton"; + sections[] = {}; + sectionsInherit = ""; + class Animations { + class fix1 { + type="hide"; + source="user"; + selection="fix1"; + minValue = 0; + maxValue = 1; + minPhase = 0; + maxPhase = 1; + hideValue = 1; + }; + class fix2: fix1 { + selection="fix2"; + }; + class fix3: fix1 { + selection="fix3"; + }; + class fix4: fix1 { + selection="fix4"; + }; + class rotate { + type = "rotation"; + source = ""; + sourceAddress = "loop"; + selection = "1"; + axis = "rotate_axis"; + minValue = 0; + maxValue = 360; - angle0="rad -360"; - angle1="rad +360"; - }; - class wire_2 { - type = "translation"; - source = ""; - selection = "2"; - axis = "2_axis"; - animPeriod = 0; - minValue = 0; - maxValue = 1; - minPhase = 0; - maxPhase = 1; - offset0 = 0; - offset1 = -1; - }; - class wire_3: wire_2 { - selection = "3"; axis = "3_axis"; - }; - class wire_4: wire_2 { - selection = "4"; axis = "4_axis"; - }; - class wire_5: wire_2 { - selection = "5"; axis = "5_axis"; - }; - class wire_6: wire_2 { - selection = "6"; axis = "6_axis"; - }; - class wire_7: wire_2 { - selection = "7"; axis = "7_axis"; - }; - class wire_8: wire_2 { - selection = "8"; axis = "8_axis"; - }; - class wire_9: wire_2 { - selection = "9"; axis = "9_axis"; - }; - class wire_10: wire_2 { - selection = "10"; axis = "10_axis"; - }; - class wire_11: wire_2 { - selection = "11"; axis = "11_axis"; - }; - class wire_12: wire_2 { - selection = "12"; axis = "12_axis"; - }; - class wire_13: wire_2 { - selection = "13"; axis = "13_axis"; - }; - class wire_14: wire_2 { - selection = "14"; axis = "14_axis"; - }; - class wire_15: wire_2 { - selection = "15"; axis = "15_axis"; - }; - class wire_16: wire_2 { - selection = "16"; axis = "16_axis"; - }; - class wire_17: wire_2 { - selection = "17"; axis = "17_axis"; - }; - class wire_18: wire_2 { - selection = "18"; axis = "18_axis"; - }; - class wire_2_1: wire_2 { - selection = "2";axis = "2_axis";offset1 = -1; - }; - class wire_3_1: wire_2_1 { - selection = "3"; axis = "3_axis"; - }; - class wire_4_1: wire_2_1 { - selection = "4"; axis = "4_axis"; - }; - class wire_5_1: wire_2_1 { - selection = "5"; axis = "5_axis"; - }; - class wire_6_1: wire_2_1 { - selection = "6"; axis = "6_axis"; - }; - class wire_7_1: wire_2_1 { - selection = "7"; axis = "7_axis"; - }; - class wire_8_1: wire_2_1 { - selection = "8"; axis = "8_axis"; - }; - class wire_9_1: wire_2_1 { - selection = "9"; axis = "9_axis"; - }; - class wire_10_1: wire_2_1 { - selection = "10"; axis = "10_axis"; - }; - class wire_11_1: wire_2_1 { - selection = "11"; axis = "11_axis"; - }; - class wire_12_1: wire_2_1 { - selection = "12"; axis = "12_axis"; - }; - class wire_13_1: wire_2_1 { - selection = "13"; axis = "13_axis"; - }; - class wire_14_1: wire_2_1 { - selection = "14"; axis = "14_axis"; - }; - class wire_15_1: wire_2_1 { - selection = "15"; axis = "15_axis"; - }; - class wire_16_1: wire_2_1 { - selection = "16"; axis = "16_axis"; - }; - class wire_17_1: wire_2_1 { - selection = "17"; axis = "17_axis"; - }; - class wire_18_1: wire_2_1 { - selection = "18"; axis = "18_axis"; - }; - }; - }; - class ACE_ConcertinaWireNoGeo: ACE_ConcertinaWire {}; - class ace_tacticalladder { - skeletonName = "ace_tacticalladder_skeleton"; - sections[] = { "roadway" }; - sectionsInherit = ""; - class Animations { - class rotate { - type = "rotation"; - source = ""; - sourceAddress = "clamp"; - selection = "base"; - axis = "axis_rotate"; - minValue = 0; - maxValue = 90; - angle0="rad 0"; - angle1="rad +90"; - }; - class extract_1 { - type = "translation"; - source = ""; - selection = "1"; - axis = "axis_1"; - animPeriod = 0; - minValue = 0; - maxValue = 1; - minPhase = 0; - maxPhase = 1; - offset0 = 0; - offset1 = 0.82; - }; - class extract_2: extract_1 { - selection = "2"; - axis = "axis_2"; - }; - class extract_3: extract_1 { - selection = "3"; - axis = "axis_3"; - }; - class extract_4: extract_1 { - selection = "4"; - axis = "axis_4"; - }; - class extract_5: extract_1 { - selection = "5"; - axis = "axis_5"; - }; - class extract_6: extract_1 { - selection = "6"; - axis = "axis_6"; - }; - class extract_7: extract_1 { - selection = "7"; - axis = "axis_7"; - }; - class extract_8: extract_1 { - selection = "8"; - axis = "axis_8"; - }; - class extract_9: extract_1 { - selection = "9"; - axis = "axis_9"; - }; - class extract_10: extract_1 { - selection = "10"; - axis = "axis_10"; - }; - class extract_11: extract_1 { - selection = "11"; - axis = "axis_11"; - }; - }; - }; + angle0="rad -360"; + angle1="rad +360"; + }; + class wire_2 { + type = "translation"; + source = ""; + selection = "2"; + axis = "2_axis"; + animPeriod = 0; + minValue = 0; + maxValue = 1; + minPhase = 0; + maxPhase = 1; + offset0 = 0; + offset1 = -1; + }; + class wire_3: wire_2 { + selection = "3"; axis = "3_axis"; + }; + class wire_4: wire_2 { + selection = "4"; axis = "4_axis"; + }; + class wire_5: wire_2 { + selection = "5"; axis = "5_axis"; + }; + class wire_6: wire_2 { + selection = "6"; axis = "6_axis"; + }; + class wire_7: wire_2 { + selection = "7"; axis = "7_axis"; + }; + class wire_8: wire_2 { + selection = "8"; axis = "8_axis"; + }; + class wire_9: wire_2 { + selection = "9"; axis = "9_axis"; + }; + class wire_10: wire_2 { + selection = "10"; axis = "10_axis"; + }; + class wire_11: wire_2 { + selection = "11"; axis = "11_axis"; + }; + class wire_12: wire_2 { + selection = "12"; axis = "12_axis"; + }; + class wire_13: wire_2 { + selection = "13"; axis = "13_axis"; + }; + class wire_14: wire_2 { + selection = "14"; axis = "14_axis"; + }; + class wire_15: wire_2 { + selection = "15"; axis = "15_axis"; + }; + class wire_16: wire_2 { + selection = "16"; axis = "16_axis"; + }; + class wire_17: wire_2 { + selection = "17"; axis = "17_axis"; + }; + class wire_18: wire_2 { + selection = "18"; axis = "18_axis"; + }; + class wire_2_1: wire_2 { + selection = "2";axis = "2_axis";offset1 = -1; + }; + class wire_3_1: wire_2_1 { + selection = "3"; axis = "3_axis"; + }; + class wire_4_1: wire_2_1 { + selection = "4"; axis = "4_axis"; + }; + class wire_5_1: wire_2_1 { + selection = "5"; axis = "5_axis"; + }; + class wire_6_1: wire_2_1 { + selection = "6"; axis = "6_axis"; + }; + class wire_7_1: wire_2_1 { + selection = "7"; axis = "7_axis"; + }; + class wire_8_1: wire_2_1 { + selection = "8"; axis = "8_axis"; + }; + class wire_9_1: wire_2_1 { + selection = "9"; axis = "9_axis"; + }; + class wire_10_1: wire_2_1 { + selection = "10"; axis = "10_axis"; + }; + class wire_11_1: wire_2_1 { + selection = "11"; axis = "11_axis"; + }; + class wire_12_1: wire_2_1 { + selection = "12"; axis = "12_axis"; + }; + class wire_13_1: wire_2_1 { + selection = "13"; axis = "13_axis"; + }; + class wire_14_1: wire_2_1 { + selection = "14"; axis = "14_axis"; + }; + class wire_15_1: wire_2_1 { + selection = "15"; axis = "15_axis"; + }; + class wire_16_1: wire_2_1 { + selection = "16"; axis = "16_axis"; + }; + class wire_17_1: wire_2_1 { + selection = "17"; axis = "17_axis"; + }; + class wire_18_1: wire_2_1 { + selection = "18"; axis = "18_axis"; + }; + }; + }; + class ACE_ConcertinaWireCoil: Default {}; + class ACE_ConcertinaWireNoGeo: ACE_ConcertinaWire {}; + class ace_tacticalladder { + skeletonName = "ace_tacticalladder_skeleton"; + sections[] = { "roadway" }; + sectionsInherit = ""; + class Animations { + class rotate { + type = "rotation"; + source = ""; + sourceAddress = "clamp"; + selection = "base"; + axis = "axis_rotate"; + minValue = 0; + maxValue = 90; + angle0="rad 0"; + angle1="rad +90"; + }; + class extract_1 { + type = "translation"; + source = ""; + selection = "1"; + axis = "axis_1"; + animPeriod = 0; + minValue = 0; + maxValue = 1; + minPhase = 0; + maxPhase = 1; + offset0 = 0; + offset1 = 0.82; + }; + class extract_2: extract_1 { + selection = "2"; + axis = "axis_2"; + }; + class extract_3: extract_1 { + selection = "3"; + axis = "axis_3"; + }; + class extract_4: extract_1 { + selection = "4"; + axis = "axis_4"; + }; + class extract_5: extract_1 { + selection = "5"; + axis = "axis_5"; + }; + class extract_6: extract_1 { + selection = "6"; + axis = "axis_6"; + }; + class extract_7: extract_1 { + selection = "7"; + axis = "axis_7"; + }; + class extract_8: extract_1 { + selection = "8"; + axis = "axis_8"; + }; + class extract_9: extract_1 { + selection = "9"; + axis = "axis_9"; + }; + class extract_10: extract_1 { + selection = "10"; + axis = "axis_10"; + }; + class extract_11: extract_1 { + selection = "11"; + axis = "axis_11"; + }; + }; + }; }; diff --git a/addons/dagr/data/DAGR_NOHQ.paa b/addons/dagr/data/DAGR_nohq.paa similarity index 100% rename from addons/dagr/data/DAGR_NOHQ.paa rename to addons/dagr/data/DAGR_nohq.paa diff --git a/addons/dagr/data/DAGR.rvmat b/addons/dagr/data/dagr.rvmat similarity index 100% rename from addons/dagr/data/DAGR.rvmat rename to addons/dagr/data/dagr.rvmat diff --git a/addons/dagr/data/DAGR_CO.paa b/addons/dagr/data/dagr_co.paa similarity index 100% rename from addons/dagr/data/DAGR_CO.paa rename to addons/dagr/data/dagr_co.paa diff --git a/addons/dogtags/data/model.cfg b/addons/dogtags/data/model.cfg index cb919c9950..5c7a30c9fd 100644 --- a/addons/dogtags/data/model.cfg +++ b/addons/dogtags/data/model.cfg @@ -10,7 +10,7 @@ class CfgModels { class Default { sectionsInherit = ""; sections[] = {""}; - skeletonName = "Default"; + skeletonName = ""; }; class ace_dogtag: Default {}; }; diff --git a/addons/fastroping/data/friesAnchorBar.rvmat b/addons/fastroping/data/friesanchorbar.rvmat similarity index 100% rename from addons/fastroping/data/friesAnchorBar.rvmat rename to addons/fastroping/data/friesanchorbar.rvmat diff --git a/addons/fastroping/data/friesGantry.rvmat b/addons/fastroping/data/friesgantry.rvmat similarity index 100% rename from addons/fastroping/data/friesGantry.rvmat rename to addons/fastroping/data/friesgantry.rvmat diff --git a/addons/fastroping/data/model.cfg b/addons/fastroping/data/model.cfg index 3291e7a509..34ff31ae7d 100644 --- a/addons/fastroping/data/model.cfg +++ b/addons/fastroping/data/model.cfg @@ -110,4 +110,5 @@ class CfgModels { }; }; }; + class helper: Default {}; }; diff --git a/addons/flashlights/data/KSF_1.rvmat b/addons/flashlights/data/ksf_1.rvmat similarity index 100% rename from addons/flashlights/data/KSF_1.rvmat rename to addons/flashlights/data/ksf_1.rvmat diff --git a/addons/flashlights/data/KSF_1_co.paa b/addons/flashlights/data/ksf_1_co.paa similarity index 100% rename from addons/flashlights/data/KSF_1_co.paa rename to addons/flashlights/data/ksf_1_co.paa diff --git a/addons/flashlights/data/Maglite.rvmat b/addons/flashlights/data/maglite.rvmat similarity index 100% rename from addons/flashlights/data/Maglite.rvmat rename to addons/flashlights/data/maglite.rvmat diff --git a/addons/flashlights/data/Maglite_co.paa b/addons/flashlights/data/maglite_co.paa similarity index 100% rename from addons/flashlights/data/Maglite_co.paa rename to addons/flashlights/data/maglite_co.paa diff --git a/addons/flashlights/data/MX_991.rvmat b/addons/flashlights/data/mx_991.rvmat similarity index 100% rename from addons/flashlights/data/MX_991.rvmat rename to addons/flashlights/data/mx_991.rvmat diff --git a/addons/flashlights/data/MX_991_co.paa b/addons/flashlights/data/mx_991_co.paa similarity index 100% rename from addons/flashlights/data/MX_991_co.paa rename to addons/flashlights/data/mx_991_co.paa diff --git a/addons/kestrel4500/data/Kestrel4500.rvmat b/addons/kestrel4500/data/kestrel4500.rvmat similarity index 100% rename from addons/kestrel4500/data/Kestrel4500.rvmat rename to addons/kestrel4500/data/kestrel4500.rvmat diff --git a/addons/kestrel4500/data/Kestrel4500_co.paa b/addons/kestrel4500/data/kestrel4500_co.paa similarity index 100% rename from addons/kestrel4500/data/Kestrel4500_co.paa rename to addons/kestrel4500/data/kestrel4500_co.paa diff --git a/addons/medical/data/bodybagItem.rvmat b/addons/medical/data/bodybagitem.rvmat similarity index 100% rename from addons/medical/data/bodybagItem.rvmat rename to addons/medical/data/bodybagitem.rvmat diff --git a/addons/medical/data/bodybagItem_co.paa b/addons/medical/data/bodybagitem_co.paa similarity index 100% rename from addons/medical/data/bodybagItem_co.paa rename to addons/medical/data/bodybagitem_co.paa diff --git a/addons/medical/data/IVBag.rvmat b/addons/medical/data/ivbag.rvmat similarity index 100% rename from addons/medical/data/IVBag.rvmat rename to addons/medical/data/ivbag.rvmat diff --git a/addons/medical/data/IVBag_blood_1000ml_ca.paa b/addons/medical/data/ivbag_blood_1000ml_ca.paa similarity index 100% rename from addons/medical/data/IVBag_blood_1000ml_ca.paa rename to addons/medical/data/ivbag_blood_1000ml_ca.paa diff --git a/addons/medical/data/IVBag_blood_250ml_ca.paa b/addons/medical/data/ivbag_blood_250ml_ca.paa similarity index 100% rename from addons/medical/data/IVBag_blood_250ml_ca.paa rename to addons/medical/data/ivbag_blood_250ml_ca.paa diff --git a/addons/medical/data/IVBag_blood_500ml_ca.paa b/addons/medical/data/ivbag_blood_500ml_ca.paa similarity index 100% rename from addons/medical/data/IVBag_blood_500ml_ca.paa rename to addons/medical/data/ivbag_blood_500ml_ca.paa diff --git a/addons/medical/data/model.cfg b/addons/medical/data/model.cfg index e6b373cb38..58f288c3b9 100644 --- a/addons/medical/data/model.cfg +++ b/addons/medical/data/model.cfg @@ -21,14 +21,6 @@ class CfgModels { skeletonName = ""; }; - class IVBagBase: Default { - sectionsInherit = ""; - sections[] = {"camo"}; - skeletonName = ""; - }; - class IVBag_250ml: IVBagBase {}; - class IVBag_500ml: IVBagBase {}; - class IVBag_1000ml: IVBagBase {}; class ace_medcrate: Default { skeletonName = "ACE_Medcrate_Skeleton"; @@ -49,4 +41,37 @@ class CfgModels { }; }; }; + + class adenosine: Default {}; + class atropine: Default {}; + class bandage: Default {}; + class bodybagItem: Default {}; + class epinephrine: Default {}; + + class IVBagBase: Default { + sectionsInherit = ""; + sections[] = {"camo"}; + skeletonName = ""; + }; + class IVBag_250ml: IVBagBase {}; + class IVBag_500ml: IVBagBase {}; + class IVBag_1000ml: IVBagBase {}; + + class littergeneric: Default {}; + class littergeneric_adenosine: Default {}; + class littergeneric_atropine: Default {}; + class littergeneric_bandages1: Default {}; + class littergeneric_bandages2: Default {}; + class littergeneric_bandages3: Default {}; + class littergeneric_clean: Default {}; + class littergeneric_epinephrine: Default {}; + class littergeneric_gloves: Default {}; + class littergeneric_morphine: Default {}; + class littergeneric_packingbandage: Default {}; + class littergeneric_Quikclot: Default {}; + class morphine: Default {}; + class packingbandage: Default {}; + class QuikClot: Default {}; + class surgical_kit: Default {}; + class tourniquet: Default {}; }; diff --git a/addons/medical/data/QuikClot.rvmat b/addons/medical/data/quikclot.rvmat similarity index 100% rename from addons/medical/data/QuikClot.rvmat rename to addons/medical/data/quikclot.rvmat diff --git a/addons/medical/data/QuikClot_CO.paa b/addons/medical/data/quikclot_co.paa similarity index 100% rename from addons/medical/data/QuikClot_CO.paa rename to addons/medical/data/quikclot_co.paa diff --git a/addons/medical/data/QuikClot_NOHQ.paa b/addons/medical/data/quikclot_nohq.paa similarity index 100% rename from addons/medical/data/QuikClot_NOHQ.paa rename to addons/medical/data/quikclot_nohq.paa diff --git a/addons/microdagr/data/MicroDAGR.rvmat b/addons/microdagr/data/microdagr.rvmat similarity index 100% rename from addons/microdagr/data/MicroDAGR.rvmat rename to addons/microdagr/data/microdagr.rvmat diff --git a/addons/microdagr/data/MicroDAGR_co.paa b/addons/microdagr/data/microdagr_co.paa similarity index 100% rename from addons/microdagr/data/MicroDAGR_co.paa rename to addons/microdagr/data/microdagr_co.paa diff --git a/addons/repair/data/model.cfg b/addons/repair/data/model.cfg index 5be2ddde24..38ccf5e4a3 100644 --- a/addons/repair/data/model.cfg +++ b/addons/repair/data/model.cfg @@ -4,14 +4,6 @@ class CfgSkeletons { skeletonInherit = ""; skeletonBones[] = {}; }; - - class ace_wheel: Default { - skeletonBones[] = {}; - }; - - class ace_track: Default { - skeletonBones[] = {}; - }; }; class CfgModels { @@ -22,7 +14,7 @@ class CfgModels { }; class ace_wheel: Default { - skeletonName = "ace_wheel"; + skeletonName = ""; sectionsInherit = ""; sections[] = { "mat_tyre", @@ -31,10 +23,12 @@ class CfgModels { }; class ace_track: Default { - skeletonName = "ace_track"; + skeletonName = ""; sectionsInherit = ""; sections[] = { "mat_track" }; }; + + class material_dummy: Default {}; }; diff --git a/addons/repair/data/trailObjects_co.paa b/addons/repair/data/trailobjects_co.paa similarity index 100% rename from addons/repair/data/trailObjects_co.paa rename to addons/repair/data/trailobjects_co.paa diff --git a/addons/repair/data/trailObjects_steel.rvmat b/addons/repair/data/trailobjects_steel.rvmat similarity index 100% rename from addons/repair/data/trailObjects_steel.rvmat rename to addons/repair/data/trailobjects_steel.rvmat diff --git a/addons/repair/data/trailObjects_steel_damage.rvmat b/addons/repair/data/trailobjects_steel_damage.rvmat similarity index 100% rename from addons/repair/data/trailObjects_steel_damage.rvmat rename to addons/repair/data/trailobjects_steel_damage.rvmat diff --git a/addons/repair/data/trailObjects_steel_destruct.rvmat b/addons/repair/data/trailobjects_steel_destruct.rvmat similarity index 100% rename from addons/repair/data/trailObjects_steel_destruct.rvmat rename to addons/repair/data/trailobjects_steel_destruct.rvmat diff --git a/addons/repair/data/trailObjects_tyre.rvmat b/addons/repair/data/trailobjects_tyre.rvmat similarity index 100% rename from addons/repair/data/trailObjects_tyre.rvmat rename to addons/repair/data/trailobjects_tyre.rvmat diff --git a/addons/repair/data/trailObjects_tyre_damage.rvmat b/addons/repair/data/trailobjects_tyre_damage.rvmat similarity index 100% rename from addons/repair/data/trailObjects_tyre_damage.rvmat rename to addons/repair/data/trailobjects_tyre_damage.rvmat diff --git a/addons/sandbag/data/model.cfg b/addons/sandbag/data/model.cfg index 064073b314..92055d87be 100644 --- a/addons/sandbag/data/model.cfg +++ b/addons/sandbag/data/model.cfg @@ -4,7 +4,6 @@ class CfgSkeletons { skeletonInherit = ""; skeletonBones[] = {}; }; - class ACE_SB_Skeleton: Default {}; }; class CfgModels { @@ -16,6 +15,8 @@ class CfgModels { class ace_sandbag_build { sectionsInherit = "Default"; sections[] = {"zbytek"}; - skeletonName = "ACE_SB_Skeleton"; + skeletonName = ""; }; + class ace_sandbag_m: Default {}; + class ace_sandbag_nogeo: Default {}; }; diff --git a/addons/spottingscope/data/model.cfg b/addons/spottingscope/data/model.cfg index 86d50db6ca..bfabf87b2d 100644 --- a/addons/spottingscope/data/model.cfg +++ b/addons/spottingscope/data/model.cfg @@ -86,4 +86,6 @@ class CfgModels { skeletonName = "ace_spottingscope_skeleton"; sectionsInherit = "Default"; }; + + class material_dummy: Default {}; }; diff --git a/addons/tripod/data/model.cfg b/addons/tripod/data/model.cfg index 3770ac0f82..517f9c50f1 100644 --- a/addons/tripod/data/model.cfg +++ b/addons/tripod/data/model.cfg @@ -65,4 +65,6 @@ class CfgModels { }; }; }; + + class w_sniper_tripod: Default {}; }; diff --git a/addons/yardage450/data/Bushnell.rvmat b/addons/yardage450/data/bushnell.rvmat similarity index 100% rename from addons/yardage450/data/Bushnell.rvmat rename to addons/yardage450/data/bushnell.rvmat diff --git a/include/a3/data_f/penetration/metal_plate_thin.rvmat b/include/a3/data_f/penetration/metal_plate_thin.rvmat new file mode 100644 index 0000000000000000000000000000000000000000..6027df8d27030a8c6d7f850cbcf39fce89904b82 GIT binary patch literal 310 zcmZ`#%L>9k49pe}diOg#*bgX*Ac9Ci@Kh+V&0=65lHICDzsN7qe{zfHK{Sv#%w&ck zAXq}0VcMxmFj5dY(b&++X%Dl!YB6H1tCAc=!N}fKmLi(^XfRS859}s;?oE)P-7~oe z1C{4_p&s{jp~kmmk&>@P*0R=Jpg*ei(onm2-(-EQZy;+q@F_)nD}DDY9I5FH%5PbH n^wOV6ptmR}`9fxUz?NjSfQ=W6Ceb^RNS6;k$H2|&L&^07u3bmm literal 0 HcmV?d00001 diff --git a/optionals/tracers/data/SLX_GreenTracer_Material.rvmat b/optionals/tracers/data/slx_greentracer_material.rvmat similarity index 100% rename from optionals/tracers/data/SLX_GreenTracer_Material.rvmat rename to optionals/tracers/data/slx_greentracer_material.rvmat diff --git a/optionals/tracers/data/SLX_RedTracer_Material.rvmat b/optionals/tracers/data/slx_redtracer_material.rvmat similarity index 100% rename from optionals/tracers/data/SLX_RedTracer_Material.rvmat rename to optionals/tracers/data/slx_redtracer_material.rvmat diff --git a/optionals/tracers/data/SLX_WhiteTracer_Material.rvmat b/optionals/tracers/data/slx_whitetracer_material.rvmat similarity index 100% rename from optionals/tracers/data/SLX_WhiteTracer_Material.rvmat rename to optionals/tracers/data/slx_whitetracer_material.rvmat diff --git a/optionals/tracers/data/SLX_YellowTracer_Material.rvmat b/optionals/tracers/data/slx_yellowtracer_material.rvmat similarity index 100% rename from optionals/tracers/data/SLX_YellowTracer_Material.rvmat rename to optionals/tracers/data/slx_yellowtracer_material.rvmat diff --git a/optionals/tracers/model.cfg b/optionals/tracers/model.cfg index 296d783338..089b4a417e 100644 --- a/optionals/tracers/model.cfg +++ b/optionals/tracers/model.cfg @@ -27,18 +27,25 @@ class CfgModels { class ACE_Tracer_Default: ACE_Tracer { // BWC skeletonName = "ACE_Tracer_Skeleton_Default"; }; - // Bullet tracers - class ace_TracerRed2: ACE_Tracer_Default {}; - class ace_TracerGreen2: ACE_Tracer_Default {}; - class ace_TracerYellow2: ACE_Tracer_Default {}; - - // Bullet tracers, alternative - class tracer_green_2: ACE_Tracer {}; - class tracer_red_2: ACE_Tracer {}; - class tracer_yellow_2: ACE_Tracer {}; + + class ace_40mm_tracer_red: Default {}; + // Shell Tracers class ace_shell_tracer_green: ACE_Tracer {}; class ace_shell_tracer_red: ACE_Tracer {}; + class ace_shell_tracer_white: ACE_Tracer {}; class ace_shell_tracer_yellow: ACE_Tracer {}; + + // Bullet tracers + class ace_TracerGreen2: ACE_Tracer_Default {}; + class ace_TracerRed2: ACE_Tracer_Default {}; + class ace_TracerWhite2: ACE_Tracer_Default {}; + class ace_TracerYellow2: ACE_Tracer_Default {}; + + + // Bullet tracers, alternative + class tracer_green_2: ACE_Tracer {}; + class tracer_red_2: ACE_Tracer {}; + class tracer_yellow_2: ACE_Tracer {}; };