diff --git a/addons/protection/FixHelmets.hpp b/addons/protection/FixHelmets.hpp index 6c3d6a9e2f..eb2c515e50 100644 --- a/addons/protection/FixHelmets.hpp +++ b/addons/protection/FixHelmets.hpp @@ -7,224 +7,224 @@ /*class InventoryItem_Base_F; class HeadgearItem: InventoryItem_Base_F { - armor = 0; - passThrough = 1; + armor = 0; + passThrough = 1; }; class H_HelmetB: ItemCore { - class ItemInfo: HeadgearItem { - //mass = 40; - armor = 4; - passThrough = 0.5; - }; + class ItemInfo: HeadgearItem { + //mass = 40; + armor = 4; + passThrough = 0.5; + }; }; class H_HelmetB_camo: H_HelmetB { - class ItemInfo: HeadgearItem { - //mass = 40; - armor = 4; - passThrough = 0.5; - }; + class ItemInfo: HeadgearItem { + //mass = 40; + armor = 4; + passThrough = 0.5; + }; }; class H_HelmetB_light: H_HelmetB { - class ItemInfo: ItemInfo { - //mass = 30; - armor = 3; - passThrough = 0.5; - }; + class ItemInfo: ItemInfo { + //mass = 30; + armor = 3; + passThrough = 0.5; + }; }; class H_Booniehat_khk: H_HelmetB { - class ItemInfo: ItemInfo { - //mass = 10; - armor = 0; - passThrough = 1; - }; + class ItemInfo: ItemInfo { + //mass = 10; + armor = 0; + passThrough = 1; + }; }; class H_HelmetB_plain_mcamo: H_HelmetB {}; class H_HelmetSpecB: H_HelmetB_plain_mcamo { - class ItemInfo: ItemInfo { - //mass = 50; - armor = 5; - passThrough = 0.5; - }; + class ItemInfo: ItemInfo { + //mass = 50; + armor = 5; + passThrough = 0.5; + }; }; class H_HelmetIA: H_HelmetB { - class ItemInfo: ItemInfo { - //mass = 40; - armor = 4; - passThrough = 0.5; - }; + class ItemInfo: ItemInfo { + //mass = 40; + armor = 4; + passThrough = 0.5; + }; }; class H_Cap_red: H_HelmetB { - class ItemInfo: ItemInfo { - //mass = 4; - armor = 0; - passThrough = 1; - }; + class ItemInfo: ItemInfo { + //mass = 4; + armor = 0; + passThrough = 1; + }; }; class H_Cap_headphones: H_HelmetB { - class ItemInfo: ItemInfo { - //mass = 8; - armor = 0; - passThrough = 1; - }; + class ItemInfo: ItemInfo { + //mass = 8; + armor = 0; + passThrough = 1; + }; }; class H_HelmetCrew_B: H_HelmetB { - class ItemInfo: ItemInfo { - //mass = 40; - armor = 4; - passThrough = 0.5; - }; + class ItemInfo: ItemInfo { + //mass = 40; + armor = 4; + passThrough = 0.5; + }; }; class H_PilotHelmetFighter_B: H_HelmetB { - class ItemInfo: ItemInfo { - //mass = 50; - armor = 5; - passThrough = 0.5; - }; + class ItemInfo: ItemInfo { + //mass = 50; + armor = 5; + passThrough = 0.5; + }; }; class H_PilotHelmetHeli_B: H_HelmetB { - class ItemInfo: ItemInfo { - //mass = 30; - armor = 3; - passThrough = 0.5; - }; + class ItemInfo: ItemInfo { + //mass = 30; + armor = 3; + passThrough = 0.5; + }; }; class H_CrewHelmetHeli_B: H_HelmetB { - class ItemInfo: ItemInfo { - //mass = 30; - armor = 3; - passThrough = 0.5; - }; + class ItemInfo: ItemInfo { + //mass = 30; + armor = 3; + passThrough = 0.5; + }; }; class H_HelmetO_ocamo: H_HelmetB { - class ItemInfo: ItemInfo { - //mass = 50; - armor = 5; - passThrough = 0.5; - }; + class ItemInfo: ItemInfo { + //mass = 50; + armor = 5; + passThrough = 0.5; + }; }; class H_HelmetLeaderO_ocamo: H_HelmetO_ocamo { - class ItemInfo: ItemInfo { - //mass = 60; - armor = 6; - passThrough = 0.5; - }; + class ItemInfo: ItemInfo { + //mass = 60; + armor = 6; + passThrough = 0.5; + }; }; class H_MilCap_ocamo: H_HelmetB { - class ItemInfo: ItemInfo { - //mass = 6; - armor = 0; - passThrough = 1; - }; + class ItemInfo: ItemInfo { + //mass = 6; + armor = 0; + passThrough = 1; + }; }; class H_BandMask_blk: H_HelmetB { - class ItemInfo: ItemInfo { - //mass = 8; - armor = 0; - passThrough = 1; - }; + class ItemInfo: ItemInfo { + //mass = 8; + armor = 0; + passThrough = 1; + }; }; class H_HelmetSpecO_ocamo: H_HelmetO_ocamo { - class ItemInfo: ItemInfo { - //mass = 40; - armor = 4; - passThrough = 0.5; - }; + class ItemInfo: ItemInfo { + //mass = 40; + armor = 4; + passThrough = 0.5; + }; }; class H_Bandanna_surfer: H_HelmetB { - class ItemInfo: ItemInfo { - //mass = 8; - armor = 0; - passThrough = 1; - }; + class ItemInfo: ItemInfo { + //mass = 8; + armor = 0; + passThrough = 1; + }; }; class H_Shemag_khk: H_HelmetB { - class ItemInfo: ItemInfo { - //mass = 6; - armor = 0; - passThrough = 1; - }; + class ItemInfo: ItemInfo { + //mass = 6; + armor = 0; + passThrough = 1; + }; }; class H_ShemagOpen_khk: H_HelmetB { - class ItemInfo: ItemInfo { - //mass = 6; - armor = 0; - passThrough = 1; - }; + class ItemInfo: ItemInfo { + //mass = 6; + armor = 0; + passThrough = 1; + }; }; class H_Beret_blk: H_HelmetB { - class ItemInfo: ItemInfo { - //mass = 6; - armor = 0; - passThrough = 1; - }; + class ItemInfo: ItemInfo { + //mass = 6; + armor = 0; + passThrough = 1; + }; }; class H_Beret_02: H_Beret_blk { - class ItemInfo: ItemInfo { - //mass = 6; - armor = 0; - passThrough = 1; - }; + class ItemInfo: ItemInfo { + //mass = 6; + armor = 0; + passThrough = 1; + }; }; class H_Watchcap_blk: H_HelmetB { - class ItemInfo: ItemInfo { - //mass = 6; - armor = 0; - passThrough = 1; - }; + class ItemInfo: ItemInfo { + //mass = 6; + armor = 0; + passThrough = 1; + }; }; class H_TurbanO_blk: H_HelmetB { - class ItemInfo: ItemInfo { - //mass = 8; - armor = 0; - passThrough = 1; - }; + class ItemInfo: ItemInfo { + //mass = 8; + armor = 0; + passThrough = 1; + }; }; class H_StrawHat: H_HelmetB { - class ItemInfo: ItemInfo { - //mass = 6; - armor = 0; - passThrough = 1; - }; + class ItemInfo: ItemInfo { + //mass = 6; + armor = 0; + passThrough = 1; + }; }; class H_Hat_blue: H_HelmetB { - class ItemInfo: ItemInfo { - //mass = 6; - armor = 0; - passThrough = 1; - }; + class ItemInfo: ItemInfo { + //mass = 6; + armor = 0; + passThrough = 1; + }; }; class H_RacingHelmet_1_F: H_HelmetB_camo { - class ItemInfo: ItemInfo { - //mass = 50; - armor = 5; - passThrough = 0.5; - }; + class ItemInfo: ItemInfo { + //mass = 50; + armor = 5; + passThrough = 0.5; + }; };*/ diff --git a/addons/protection/FixUniforms.hpp b/addons/protection/FixUniforms.hpp index add1524c8a..24c02b79aa 100644 --- a/addons/protection/FixUniforms.hpp +++ b/addons/protection/FixUniforms.hpp @@ -1,62 +1,62 @@ class Man; class CAManBase: Man { - class HitPoints { - class HitHead { - /*armor = 1; - passThrough = 1; - radius = 0.1; - explosionShielding = 0.5; - minimalHit = 0;*/ + class HitPoints { + class HitHead { + /*armor = 1; + passThrough = 1; + radius = 0.1; + explosionShielding = 0.5; + minimalHit = 0;*/ + }; + + class HitBody { + /*armor = 1; + passThrough = 1; + radius = 0.15; + explosionShielding = 10; + minimalHit = 0;*/ + }; + + class HitHands { + /*armor = 1; + passThrough = 1; + radius = 0.08; + explosionShielding = 1; + minimalHit = 0;*/ + }; + + class HitLegs { + /*armor = 1; + passThrough = 1; + radius = 0.1; + explosionShielding = 1; + minimalHit = 0;*/ + }; }; - class HitBody { - /*armor = 1; - passThrough = 1; - radius = 0.15; - explosionShielding = 10; - minimalHit = 0;*/ - }; - - class HitHands { - /*armor = 1; - passThrough = 1; - radius = 0.08; - explosionShielding = 1; - minimalHit = 0;*/ - }; - - class HitLegs { - /*armor = 1; - passThrough = 1; - radius = 0.1; - explosionShielding = 1; - minimalHit = 0;*/ - }; - }; - - /*armor = 2; - armorStructural = 5;*/ + /*armor = 2; + armorStructural = 5;*/ }; class Civilian: CAManBase { - /*class HitPoints: HitPoints { - class HitHead: HitHead { - armor = 1; - }; + /*class HitPoints: HitPoints { + class HitHead: HitHead { + armor = 1; + }; - class HitBody: HitBody { - armor = 2; - }; + class HitBody: HitBody { + armor = 2; + }; - class HitHands: HitHands { - armor = 2; - }; + class HitHands: HitHands { + armor = 2; + }; - class HitLegs: HitLegs { - armor = 2; - }; - };*/ + class HitLegs: HitLegs { + armor = 2; + }; + };*/ }; /*class Civilian_F: Civilian {}; @@ -67,503 +67,503 @@ class SoldierEB: CAManBase {}; class SoldierGB: CAManBase {}; class B_Soldier_base_F: SoldierWB { - /*class HitPoints: HitPoints { - class HitHead: HitHead { - armor = 1; + /*class HitPoints: HitPoints { + class HitHead: HitHead { + armor = 1; + }; + + class HitBody: HitBody { + armor = 2; + }; + + class HitHands: HitHands { + armor = 2; + }; + + class HitLegs: HitLegs { + armor = 2; + }; }; - class HitBody: HitBody { - armor = 2; - }; - - class HitHands: HitHands { - armor = 2; - }; - - class HitLegs: HitLegs { - armor = 2; - }; - }; - - armor = 2; - armorStructural = 5;*/ + armor = 2; + armorStructural = 5;*/ }; class B_Soldier_02_f: B_Soldier_base_F { // t-shirt - /*class HitPoints: HitPoints { - class HitHead: HitHead { - armor = 1; - }; + /*class HitPoints: HitPoints { + class HitHead: HitHead { + armor = 1; + }; - class HitBody: HitBody { - armor = 1; - }; + class HitBody: HitBody { + armor = 1; + }; - class HitHands: HitHands { - armor = 1; - }; + class HitHands: HitHands { + armor = 1; + }; - class HitLegs: HitLegs { - armor = 2; - }; - };*/ + class HitLegs: HitLegs { + armor = 2; + }; + };*/ - armorStructural = 5; //7; + armorStructural = 5; //7; }; class B_Soldier_03_f: B_Soldier_base_F { // sleeves - /*class HitPoints: HitPoints { - class HitHead: HitHead { - armor = 1; - }; + /*class HitPoints: HitPoints { + class HitHead: HitHead { + armor = 1; + }; - class HitBody: HitBody { - armor = 2; - }; + class HitBody: HitBody { + armor = 2; + }; - class HitHands: HitHands { - armor = 1; - }; + class HitHands: HitHands { + armor = 1; + }; - class HitLegs: HitLegs { - armor = 2; - }; - };*/ + class HitLegs: HitLegs { + armor = 2; + }; + };*/ - armorStructural = 5; //7; + armorStructural = 5; //7; }; class B_Soldier_04_f: B_Soldier_base_F { // heli pilot - class HitPoints: HitPoints { - class HitHead: HitHead { - /*armor = 1; - passThrough = 1; - explosionShielding = 0.5;*/ - }; + class HitPoints: HitPoints { + class HitHead: HitHead { + /*armor = 1; + passThrough = 1; + explosionShielding = 0.5;*/ + }; - class HitBody: HitBody { - /*armor = 2;*/ - passThrough = 1; //0.5; - /*explosionShielding = 2.4;*/ - }; + class HitBody: HitBody { + /*armor = 2;*/ + passThrough = 1; //0.5; + /*explosionShielding = 2.4;*/ + }; - class HitHands: HitHands { - armor = 2; //8; - passThrough = 1; //0.5; - /*explosionShielding = 1.2;*/ - }; + class HitHands: HitHands { + armor = 2; //8; + passThrough = 1; //0.5; + /*explosionShielding = 1.2;*/ + }; - class HitLegs: HitLegs { - armor = 2; //8; - passThrough = 1; //0.5; - /*explosionShielding = 1.2;*/ + class HitLegs: HitLegs { + armor = 2; //8; + passThrough = 1; //0.5; + /*explosionShielding = 1.2;*/ + }; }; - }; }; class B_Soldier_05_f: B_Soldier_base_F { // cas pilot - armorStructural = 5; //3; + armorStructural = 5; //3; - class HitPoints: HitPoints { - class HitHead: HitHead { - /*armor = 1; - passThrough = 1; - explosionShielding = 0.5;*/ - }; + class HitPoints: HitPoints { + class HitHead: HitHead { + /*armor = 1; + passThrough = 1; + explosionShielding = 0.5;*/ + }; - class HitBody: HitBody { - armor = 3; //2; - passThrough = 1; //0.5; - /*explosionShielding = 2.4;*/ - }; + class HitBody: HitBody { + armor = 3; //2; + passThrough = 1; //0.5; + /*explosionShielding = 2.4;*/ + }; - class HitHands: HitHands { - armor = 3; //8; - /*passThrough = 1; - explosionShielding = 1.2;*/ - }; + class HitHands: HitHands { + armor = 3; //8; + /*passThrough = 1; + explosionShielding = 1.2;*/ + }; - class HitLegs: HitLegs { - armor = 3; //8; - /*passThrough = 1; - explosionShielding = 1.2;*/ + class HitLegs: HitLegs { + armor = 3; //8; + /*passThrough = 1; + explosionShielding = 1.2;*/ + }; }; - }; }; class B_Soldier_diver_base_F: B_Soldier_base_F { - /*class HitPoints: HitPoints { - class HitHead: HitHead { - armor = 2; - }; + /*class HitPoints: HitPoints { + class HitHead: HitHead { + armor = 2; + }; - class HitBody: HitBody { - armor = 2; - }; + class HitBody: HitBody { + armor = 2; + }; - class HitHands: HitHands { - armor = 2; - }; + class HitHands: HitHands { + armor = 2; + }; - class HitLegs: HitLegs { - armor = 2; - }; - };*/ + class HitLegs: HitLegs { + armor = 2; + }; + };*/ }; // these appear to be broken, remnants from A2? /*class C_man_p_fugitive_F: C_man_1 { - class HitPoints: HitPoints { - class HitBody: HitBody { - armor = "0.3*10"; - }; + class HitPoints: HitPoints { + class HitBody: HitBody { + armor = "0.3*10"; + }; - class HitLegs: HitLegs { - armor = "0.3*5"; + class HitLegs: HitLegs { + armor = "0.3*5"; + }; }; - }; }; class C_man_w_worker_F: C_man_1 { - class HitPoints: HitPoints { - class HitBody: HitBody { - armor = "0.6*10"; - }; + class HitPoints: HitPoints { + class HitBody: HitBody { + armor = "0.6*10"; + }; - class HitHands: HitHands { - armor = "0.5*5"; - }; + class HitHands: HitHands { + armor = "0.5*5"; + }; - class HitLegs: HitLegs { - armor = "0.5*5"; + class HitLegs: HitLegs { + armor = "0.5*5"; + }; }; - }; }; class C_man_hunter_1_F: C_man_1 { - class HitPoints: HitPoints { - class HitBody: HitBody { - armor = "0.6*10"; - }; + class HitPoints: HitPoints { + class HitBody: HitBody { + armor = "0.6*10"; + }; - class HitHands: HitHands { - armor = "0.5*5"; - }; + class HitHands: HitHands { + armor = "0.5*5"; + }; - class HitLegs: HitLegs { - armor = "0.5*5"; + class HitLegs: HitLegs { + armor = "0.5*5"; + }; }; - }; }; class C_man_p_shorts_1_F: C_man_1 { - class HitPoints: HitPoints { - class HitLegs: HitLegs { - armor = "0.3*5"; + class HitPoints: HitPoints { + class HitLegs: HitLegs { + armor = "0.3*5"; + }; }; - }; }; class C_man_pilot_F: C_man_1 { - class HitPoints: HitPoints { - class HitBody: HitBody { - armor = "0.6*10"; - }; + class HitPoints: HitPoints { + class HitBody: HitBody { + armor = "0.6*10"; + }; - class HitHands: HitHands { - armor = "0.5*5"; - }; + class HitHands: HitHands { + armor = "0.5*5"; + }; - class HitLegs: HitLegs { - armor = "0.5*5"; + class HitLegs: HitLegs { + armor = "0.5*5"; + }; }; - }; };*/ class I_Soldier_base_F: SoldierGB { - /*class HitPoints: HitPoints { - class HitHead: HitHead { - armor = 1; - }; + /*class HitPoints: HitPoints { + class HitHead: HitHead { + armor = 1; + }; - class HitBody: HitBody { - armor = 2; - }; + class HitBody: HitBody { + armor = 2; + }; - class HitHands: HitHands { - armor = 2; - }; + class HitHands: HitHands { + armor = 2; + }; - class HitLegs: HitLegs { - armor = 2; - }; - };*/ + class HitLegs: HitLegs { + armor = 2; + }; + };*/ - /*armor = 2;*/ - armorStructural = 5; //7; + /*armor = 2;*/ + armorStructural = 5; //7; }; class I_Soldier_02_F: I_Soldier_base_F { // sleeves - /*class HitPoints: HitPoints { - class HitHead: HitHead { - armor = 1; - }; + /*class HitPoints: HitPoints { + class HitHead: HitHead { + armor = 1; + }; - class HitBody: HitBody { - armor = 2; - }; + class HitBody: HitBody { + armor = 2; + }; - class HitHands: HitHands { - armor = 1; - }; + class HitHands: HitHands { + armor = 1; + }; - class HitLegs: HitLegs { - armor = 2; - }; - };*/ + class HitLegs: HitLegs { + armor = 2; + }; + };*/ }; class I_Soldier_03_F: I_Soldier_base_F { // heli pilot - /*armorStructural = 5;*/ + /*armorStructural = 5;*/ - class HitPoints: HitPoints { - class HitHead: HitHead { - /*armor = 1; - passThrough = 1; - explosionShielding = 0.5;*/ - }; + class HitPoints: HitPoints { + class HitHead: HitHead { + /*armor = 1; + passThrough = 1; + explosionShielding = 0.5;*/ + }; - class HitBody: HitBody { - /*armor = 2;*/ - passThrough = 1; //0.5; - /*explosionShielding = 2.4;*/ - }; + class HitBody: HitBody { + /*armor = 2;*/ + passThrough = 1; //0.5; + /*explosionShielding = 2.4;*/ + }; - class HitHands: HitHands { - armor = 2; //8; - passThrough = 1; //0.5; - /*explosionShielding = 1.2;*/ - }; + class HitHands: HitHands { + armor = 2; //8; + passThrough = 1; //0.5; + /*explosionShielding = 1.2;*/ + }; - class HitLegs: HitLegs { - armor = 2; //8; - passThrough = 1; //0.5; - /*explosionShielding = 1.2;*/ + class HitLegs: HitLegs { + armor = 2; //8; + passThrough = 1; //0.5; + /*explosionShielding = 1.2;*/ + }; }; - }; }; class I_Soldier_04_F: I_Soldier_base_F { // cas pilot - armorStructural = 5; //3; + armorStructural = 5; //3; - class HitPoints: HitPoints { - class HitHead: HitHead { - /*armor = 1; - passThrough = 1; - explosionShielding = 0.5;*/ - }; + class HitPoints: HitPoints { + class HitHead: HitHead { + /*armor = 1; + passThrough = 1; + explosionShielding = 0.5;*/ + }; - class HitBody: HitBody { - armor = 3; //2; - passThrough = 1; //0.5; - /*explosionShielding = 2.4;*/ - }; + class HitBody: HitBody { + armor = 3; //2; + passThrough = 1; //0.5; + /*explosionShielding = 2.4;*/ + }; - class HitHands: HitHands { - armor = 3; //8; - /*passThrough = 1; - explosionShielding = 1.2;*/ - }; + class HitHands: HitHands { + armor = 3; //8; + /*passThrough = 1; + explosionShielding = 1.2;*/ + }; - class HitLegs: HitLegs { - armor = 3; //8; - /*passThrough = 1; - explosionShielding = 1.2;*/ + class HitLegs: HitLegs { + armor = 3; //8; + /*passThrough = 1; + explosionShielding = 1.2;*/ + }; }; - }; }; class I_Soldier_diver_base_F: I_Soldier_base_F { - /*class HitPoints: HitPoints { - class HitHead: HitHead { - armor = 2; - }; + /*class HitPoints: HitPoints { + class HitHead: HitHead { + armor = 2; + }; - class HitBody: HitBody { - armor = 2; - }; + class HitBody: HitBody { + armor = 2; + }; - class HitHands: HitHands { - armor = 2; - }; + class HitHands: HitHands { + armor = 2; + }; - class HitLegs: HitLegs { - armor = 2; - }; - };*/ + class HitLegs: HitLegs { + armor = 2; + }; + };*/ }; class O_Soldier_base_F: SoldierEB { - class HitPoints: HitPoints { - class HitHead: HitHead { - /*armor = 1; - passThrough = 1; - explosionShielding = 0.5;*/ + class HitPoints: HitPoints { + class HitHead: HitHead { + /*armor = 1; + passThrough = 1; + explosionShielding = 0.5;*/ + }; + + class HitBody: HitBody { + armor = 4; //6; + passThrough = 0.85; //0.5; + /*explosionShielding = 1.5;*/ + }; + + class HitHands: HitHands { + armor = 4; //8; + passThrough = 0.85; //0.5; + /*explosionShielding = 0.8;*/ + }; + + class HitLegs: HitLegs { + armor = 4; //8; + passThrough = 0.85; //0.5; + /*explosionShielding = 0.8;*/ + }; }; - class HitBody: HitBody { - armor = 4; //6; - passThrough = 0.85; //0.5; - /*explosionShielding = 1.5;*/ - }; - - class HitHands: HitHands { - armor = 4; //8; - passThrough = 0.85; //0.5; - /*explosionShielding = 0.8;*/ - }; - - class HitLegs: HitLegs { - armor = 4; //8; - passThrough = 0.85; //0.5; - /*explosionShielding = 0.8;*/ - }; - }; - - /*armor = 2; - armorStructural = 5;*/ + /*armor = 2; + armorStructural = 5;*/ }; class O_officer_F: O_Soldier_base_F { - class HitPoints: HitPoints { - class HitHead: HitHead { - /*armor = 1; - passThrough = 1; - explosionShielding = 0.5;*/ - }; + class HitPoints: HitPoints { + class HitHead: HitHead { + /*armor = 1; + passThrough = 1; + explosionShielding = 0.5;*/ + }; - class HitBody: HitBody { - /*armor = 2; - passThrough = 1; - explosionShielding = 10;*/ - }; + class HitBody: HitBody { + /*armor = 2; + passThrough = 1; + explosionShielding = 10;*/ + }; - class HitHands: HitHands { - /*armor = 2; - passThrough = 1; - explosionShielding = 1;*/ - }; + class HitHands: HitHands { + /*armor = 2; + passThrough = 1; + explosionShielding = 1;*/ + }; - class HitLegs: HitLegs { - armor = 2; //8; - passThrough = 1; //0.5; - /*explosionShielding = 1;*/ + class HitLegs: HitLegs { + armor = 2; //8; + passThrough = 1; //0.5; + /*explosionShielding = 1;*/ + }; }; - }; }; class O_Soldier_02_F: O_Soldier_base_F { // crew ? - armorStructural = 5; //3; + armorStructural = 5; //3; - class HitPoints: HitPoints { - class HitHead: HitHead { - /*armor = 1; - passThrough = 1; - explosionShielding = 0.5;*/ - }; + class HitPoints: HitPoints { + class HitHead: HitHead { + /*armor = 1; + passThrough = 1; + explosionShielding = 0.5;*/ + }; - class HitBody: HitBody { - armor = 4; //6; - passThrough = 0.85; //0.5; - /*explosionShielding = 1.5;*/ - }; + class HitBody: HitBody { + armor = 4; //6; + passThrough = 0.85; //0.5; + /*explosionShielding = 1.5;*/ + }; - class HitHands: HitHands { - armor = 4; //8; - passThrough = 0.85; //1; - /*explosionShielding = 0.8;*/ - }; + class HitHands: HitHands { + armor = 4; //8; + passThrough = 0.85; //1; + /*explosionShielding = 0.8;*/ + }; - class HitLegs: HitLegs { - armor = 4; //8; - passThrough = 0.85; //1; - /*explosionShielding = 0.8;*/ + class HitLegs: HitLegs { + armor = 4; //8; + passThrough = 0.85; //1; + /*explosionShielding = 0.8;*/ + }; }; - }; }; class O_Soldier_diver_base_F: O_Soldier_base_F { - /*class HitPoints: HitPoints { - class HitHead: HitHead { - armor = 2; - }; + /*class HitPoints: HitPoints { + class HitHead: HitHead { + armor = 2; + }; - class HitBody: HitBody { - armor = 2; - }; + class HitBody: HitBody { + armor = 2; + }; - class HitHands: HitHands { - armor = 2; - }; + class HitHands: HitHands { + armor = 2; + }; - class HitLegs: HitLegs { - armor = 2; - }; - };*/ + class HitLegs: HitLegs { + armor = 2; + }; + };*/ }; class O_Soldier_VR_F: O_Soldier_base_F { - /*class HitPoints: HitPoints { - class HitHead: HitHead { - armor = 1; - passThrough = 1; - explosionShielding = 0.5; - }; + /*class HitPoints: HitPoints { + class HitHead: HitHead { + armor = 1; + passThrough = 1; + explosionShielding = 0.5; + }; - class HitBody: HitBody { - armor = 2; - passThrough = 1; - explosionShielding = 10; - }; + class HitBody: HitBody { + armor = 2; + passThrough = 1; + explosionShielding = 10; + }; - class HitHands: HitHands { - armor = 2; - passThrough = 1; - explosionShielding = 1; - }; + class HitHands: HitHands { + armor = 2; + passThrough = 1; + explosionShielding = 1; + }; - class HitLegs: HitLegs { - armor = 2; - passThrough = 1; - explosionShielding = 1; - }; - };*/ + class HitLegs: HitLegs { + armor = 2; + passThrough = 1; + explosionShielding = 1; + }; + };*/ }; class O_Protagonist_VR_F: O_Soldier_base_F { - /*class HitPoints: HitPoints { - class HitHead: HitHead { - armor = 1; - passThrough = 1; - explosionShielding = 0.5; - }; + /*class HitPoints: HitPoints { + class HitHead: HitHead { + armor = 1; + passThrough = 1; + explosionShielding = 0.5; + }; - class HitBody: HitBody { - armor = 2; - passThrough = 1; - explosionShielding = 10; - }; + class HitBody: HitBody { + armor = 2; + passThrough = 1; + explosionShielding = 10; + }; - class HitHands: HitHands { - armor = 2; - passThrough = 1; - explosionShielding = 1; - }; + class HitHands: HitHands { + armor = 2; + passThrough = 1; + explosionShielding = 1; + }; - class HitLegs: HitLegs { - armor = 2; - passThrough = 1; - explosionShielding = 1; - }; - };*/ + class HitLegs: HitLegs { + armor = 2; + passThrough = 1; + explosionShielding = 1; + }; + };*/ }; diff --git a/addons/protection/FixVests.hpp b/addons/protection/FixVests.hpp index 77354ca930..f3d1ad2b3d 100644 --- a/addons/protection/FixVests.hpp +++ b/addons/protection/FixVests.hpp @@ -3,296 +3,296 @@ class ItemCore; class VestItem; class Vest_Camo_Base: ItemCore { - class ItemInfo: VestItem { - /*containerClass = "Supply0"; - mass = 0; - armor = 0; - passThrough = 1;*/ - }; + class ItemInfo: VestItem { + /*containerClass = "Supply0"; + mass = 0; + armor = 0; + passThrough = 1;*/ + }; }; class Vest_NoCamo_Base: ItemCore { - class ItemInfo: VestItem { - /*containerClass = "Supply0"; - mass = 0; - armor = 0; - passThrough = 1;*/ - }; + class ItemInfo: VestItem { + /*containerClass = "Supply0"; + mass = 0; + armor = 0; + passThrough = 1;*/ + }; }; // belts class V_Rangemaster_belt: Vest_NoCamo_Base { - class ItemInfo: ItemInfo { - /*containerClass = "Supply40"; - mass = 10; - armor = 0; - passThrough = 1;*/ - }; + class ItemInfo: ItemInfo { + /*containerClass = "Supply40"; + mass = 10; + armor = 0; + passThrough = 1;*/ + }; }; // bandolliers class V_BandollierB_khk: Vest_Camo_Base { - class ItemInfo: ItemInfo { - /*containerClass = "Supply80"; - mass = 15; - armor = 0;*/ - passThrough = 0.85; //1; - }; + class ItemInfo: ItemInfo { + /*containerClass = "Supply80"; + mass = 15; + armor = 0;*/ + passThrough = 0.85; //1; + }; }; /*class V_BandollierB_cbr: V_BandollierB_khk { - class ItemInfo: ItemInfo {}; + class ItemInfo: ItemInfo {}; }; class V_BandollierB_rgr: V_BandollierB_khk { - class ItemInfo: ItemInfo {}; + class ItemInfo: ItemInfo {}; }; class V_BandollierB_blk: V_BandollierB_khk { - class ItemInfo: ItemInfo {}; + class ItemInfo: ItemInfo {}; }; class V_BandollierB_oli: V_BandollierB_khk { - class ItemInfo: ItemInfo {}; + class ItemInfo: ItemInfo {}; };*/ // plate carriers class V_PlateCarrier1_rgr: Vest_NoCamo_Base { // lite - class ItemInfo: ItemInfo { - /*containerClass = "Supply140"; - mass = 80;*/ - armor = 8; //20; - passThrough = 0.75; //0.5; - }; + class ItemInfo: ItemInfo { + /*containerClass = "Supply140"; + mass = 80;*/ + armor = 8; //20; + passThrough = 0.75; //0.5; + }; }; class V_PlateCarrier2_rgr: V_PlateCarrier1_rgr { // heavy - class ItemInfo: ItemInfo { - /*containerClass = "Supply140"; - mass = 100;*/ - armor = 12; //30; - passThrough = 0.75; //0.5; - }; + class ItemInfo: ItemInfo { + /*containerClass = "Supply140"; + mass = 100;*/ + armor = 12; //30; + passThrough = 0.75; //0.5; + }; }; class V_PlateCarrier3_rgr: Vest_NoCamo_Base { // heavy (us) - class ItemInfo: ItemInfo { - /*containerClass = "Supply140"; - mass = 100;*/ - armor = 12; //30; - passThrough = 0.75; //0.5; - }; + class ItemInfo: ItemInfo { + /*containerClass = "Supply140"; + mass = 100;*/ + armor = 12; //30; + passThrough = 0.75; //0.5; + }; }; class V_PlateCarrierGL_rgr: Vest_NoCamo_Base { // lite (gl) - class ItemInfo: ItemInfo { - containerClass = "Supply160"; //"Supply140"; - /*mass = 100;*/ - armor = 8; //100; - passThrough = 0.75; //0.7; - }; + class ItemInfo: ItemInfo { + containerClass = "Supply160"; //"Supply140"; + /*mass = 100;*/ + armor = 8; //100; + passThrough = 0.75; //0.7; + }; }; class V_PlateCarrier1_blk: Vest_Camo_Base { // heavy (black) - class ItemInfo: ItemInfo { - /*containerClass = "Supply140";*/ - mass = 100; //80; - armor = 12; //20; - passThrough = 0.75; //0.5; - }; + class ItemInfo: ItemInfo { + /*containerClass = "Supply140";*/ + mass = 100; //80; + armor = 12; //20; + passThrough = 0.75; //0.5; + }; }; class V_PlateCarrierSpec_rgr: Vest_NoCamo_Base { // lite (special) - class ItemInfo: ItemInfo { - /*containerClass = "Supply100"; - mass = 120;*/ - armor = 16; //40; - passThrough = 0.75; //0.1; - }; + class ItemInfo: ItemInfo { + /*containerClass = "Supply100"; + mass = 120;*/ + armor = 16; //40; + passThrough = 0.75; //0.1; + }; }; // chestrigs /*class V_Chestrig_khk: Vest_Camo_Base { - class ItemInfo: ItemInfo { - containerClass = "Supply140"; - mass = 20; - armor = 0; - passThrough = 1; - }; + class ItemInfo: ItemInfo { + containerClass = "Supply140"; + mass = 20; + armor = 0; + passThrough = 1; + }; }; class V_Chestrig_rgr: V_Chestrig_khk {}; class V_Chestrig_blk: V_Chestrig_khk {}; class V_Chestrig_oli: Vest_Camo_Base { - class ItemInfo: ItemInfo { - containerClass = "Supply140"; - mass = 20; - armor = 0; - passThrough = 1; - }; + class ItemInfo: ItemInfo { + containerClass = "Supply140"; + mass = 20; + armor = 0; + passThrough = 1; + }; };*/ // tactical vests class V_TacVest_khk: Vest_Camo_Base { - class ItemInfo: ItemInfo { - /*containerClass = "Supply100"; - mass = 40;*/ - armor = 8; //20; - /*passThrough = 1;*/ - }; + class ItemInfo: ItemInfo { + /*containerClass = "Supply100"; + mass = 40;*/ + armor = 8; //20; + /*passThrough = 1;*/ + }; }; class V_TacVest_brn: V_TacVest_khk {}; class V_TacVest_oli: V_TacVest_khk {}; class V_TacVest_blk: V_TacVest_khk {}; class V_TacVest_camo: Vest_Camo_Base { - class ItemInfo: ItemInfo { - /*containerClass = "Supply100"; - mass = 40;*/ - armor = 8; //20; - /*passThrough = 1;*/ - }; + class ItemInfo: ItemInfo { + /*containerClass = "Supply100"; + mass = 40;*/ + armor = 8; //20; + /*passThrough = 1;*/ + }; }; class V_TacVest_blk_POLICE: Vest_Camo_Base { - class ItemInfo: ItemInfo { - /*containerClass = "Supply100";*/ - mass = 40; //60; - armor = 8; //100; - passThrough = 1; //0.7; - }; + class ItemInfo: ItemInfo { + /*containerClass = "Supply100";*/ + mass = 40; //60; + armor = 8; //100; + passThrough = 1; //0.7; + }; }; class V_TacVestIR_blk: Vest_NoCamo_Base { // raven vest - class ItemInfo: VestItem { - /*containerClass = "Supply100"; - mass = 50;*/ - armor = 8; //20; - passThrough = 0.85; //0.5; - }; + class ItemInfo: VestItem { + /*containerClass = "Supply100"; + mass = 50;*/ + armor = 8; //20; + passThrough = 0.85; //0.5; + }; }; class V_TacVestCamo_khk: Vest_Camo_Base { - class ItemInfo: VestItem { - /*containerClass = "Supply100"; - mass = 40;*/ - armor = 8; //20; - /*passThrough = 1;*/ - }; + class ItemInfo: VestItem { + /*containerClass = "Supply100"; + mass = 40;*/ + armor = 8; //20; + /*passThrough = 1;*/ + }; }; // harnesses class V_HarnessO_brn: Vest_NoCamo_Base { - class ItemInfo: ItemInfo { - /*containerClass = "Supply160"; - mass = 30; - armor = 0;*/ - passThrough = 0.85; //0.5; - }; + class ItemInfo: ItemInfo { + /*containerClass = "Supply160"; + mass = 30; + armor = 0;*/ + passThrough = 0.85; //0.5; + }; }; class V_HarnessOGL_brn: Vest_NoCamo_Base { // gl - class ItemInfo: ItemInfo { - /*containerClass = "Supply120"; - mass = 20; - armor = 0;*/ - passThrough = 0.85; //0.5; - }; + class ItemInfo: ItemInfo { + /*containerClass = "Supply120"; + mass = 20; + armor = 0;*/ + passThrough = 0.85; //0.5; + }; }; class V_HarnessO_gry: V_HarnessO_brn { - class ItemInfo: ItemInfo { - /*containerClass = "Supply160"; - mass = 30; - armor = 0;*/ - passThrough = 0.85; //0.5; - }; + class ItemInfo: ItemInfo { + /*containerClass = "Supply160"; + mass = 30; + armor = 0;*/ + passThrough = 0.85; //0.5; + }; }; class V_HarnessOGL_gry: V_HarnessO_gry { // gl - class ItemInfo: ItemInfo { - /*containerClass = "Supply120"; - mass = 20; - armor = 0;*/ - passThrough = 0.85; //0.5; - }; + class ItemInfo: ItemInfo { + /*containerClass = "Supply120"; + mass = 20; + armor = 0;*/ + passThrough = 0.85; //0.5; + }; }; class V_HarnessOSpec_brn: V_HarnessO_brn { - class ItemInfo: VestItem { - /*containerClass = "Supply160"; - mass = 30; - armor = 0;*/ - passThrough = 0.85; //0.5; - }; + class ItemInfo: VestItem { + /*containerClass = "Supply160"; + mass = 30; + armor = 0;*/ + passThrough = 0.85; //0.5; + }; }; class V_HarnessOSpec_gry: V_HarnessO_gry { - class ItemInfo: ItemInfo { - /*containerClass = "Supply160"; - mass = 30; - armor = 0;*/ - passThrough = 0.85; //0.5; - }; + class ItemInfo: ItemInfo { + /*containerClass = "Supply160"; + mass = 30; + armor = 0;*/ + passThrough = 0.85; //0.5; + }; }; // indep plate carriers class V_PlateCarrierIA1_dgtl: Vest_NoCamo_Base { // lite - class ItemInfo: VestItem { - /*containerClass = "Supply120"; - mass = 60;*/ - armor = 8; //20; - passThrough = 0.75; //0.5; - }; + class ItemInfo: VestItem { + /*containerClass = "Supply120"; + mass = 60;*/ + armor = 8; //20; + passThrough = 0.75; //0.5; + }; }; class V_PlateCarrierIA2_dgtl: V_PlateCarrierIA1_dgtl { // heavy - class ItemInfo: VestItem { - /*containerClass = "Supply120"; - mass = 80;*/ - armor = 12; //30; - passThrough = 0.75; //0.5; - }; + class ItemInfo: VestItem { + /*containerClass = "Supply120"; + mass = 80;*/ + armor = 12; //30; + passThrough = 0.75; //0.5; + }; }; class V_PlateCarrierIAGL_dgtl: V_PlateCarrierIA2_dgtl { // heavy (gl) - class ItemInfo: VestItem { - containerClass = "Supply140"; //"Supply120"; - mass = 100; //80; - armor = 12; //100; - passThrough = 0.75; //0.7; - }; + class ItemInfo: VestItem { + containerClass = "Supply140"; //"Supply120"; + mass = 100; //80; + armor = 12; //100; + passThrough = 0.75; //0.7; + }; }; // rebreather /*class V_RebreatherB: Vest_Camo_Base { - class ItemInfo: ItemInfo { - containerClass = "Supply0"; - mass = 80; - armor = 20; - passThrough = 1; - }; + class ItemInfo: ItemInfo { + containerClass = "Supply0"; + mass = 80; + armor = 20; + passThrough = 1; + }; }; class V_RebreatherIR: V_RebreatherB {}; class V_RebreatherIA: V_RebreatherB {};*/ // more plate carriers class V_PlateCarrier_Kerry: V_PlateCarrier1_rgr { // lighter - class ItemInfo: ItemInfo { - /*containerClass = "Supply140"; - mass = 80;*/ - armor = 8; //30; - passThrough = 0.75; //0.5; - }; + class ItemInfo: ItemInfo { + /*containerClass = "Supply140"; + mass = 80;*/ + armor = 8; //30; + passThrough = 0.75; //0.5; + }; }; class V_PlateCarrierL_CTRG: V_PlateCarrier1_rgr { // lite - class ItemInfo: ItemInfo { - /*containerClass = "Supply140"; - mass = 80;*/ - armor = 8; //20; - passThrough = 0.75; //0.5; - }; + class ItemInfo: ItemInfo { + /*containerClass = "Supply140"; + mass = 80;*/ + armor = 8; //20; + passThrough = 0.75; //0.5; + }; }; class V_PlateCarrierH_CTRG: V_PlateCarrier2_rgr { // heavy - class ItemInfo: ItemInfo { - /*containerClass = "Supply140"; - mass = 100;*/ - armor = 12; //30; - passThrough = 0.75; //0.5; - }; + class ItemInfo: ItemInfo { + /*containerClass = "Supply140"; + mass = 100;*/ + armor = 12; //30; + passThrough = 0.75; //0.5; + }; }; // another tactical vest class V_I_G_resistanceLeader_F: V_TacVest_camo { - class ItemInfo: ItemInfo {}; + class ItemInfo: ItemInfo {}; }; // press vest class V_Press_F: Vest_Camo_Base { - class ItemInfo: ItemInfo { - /*containerClass = "Supply40"; - mass = 20;*/ - armor = 8; //0; ? - /*passThrough = 1;*/ - }; + class ItemInfo: ItemInfo { + /*containerClass = "Supply40"; + mass = 20;*/ + armor = 8; //0; ? + /*passThrough = 1;*/ + }; }; // marksman dlc