From fe92ee0d02dd92ec09ff7e01d522c0b7d96c0be4 Mon Sep 17 00:00:00 2001 From: AirwavesMan Date: Thu, 18 Jun 2020 21:29:32 +0200 Subject: [PATCH] Update weights --- .../R3F_Weight/Magazines/Ammo/VehicleAmmo.hpp | 649 +++++++++++++++++- .../R3F_Weight/Magazines/Buildings/Fences.hpp | 112 +++ .../Magazines/Buildings/Storage.hpp | 34 +- .../R3F_Weight/Magazines/Items/Explosives.hpp | 40 ++ .../R3F_Realism/R3F_Weight/R3F_CfgWeight.hpp | 1 + .../R3F_Realism/R3F_Weight/Weapons/Tools.hpp | 28 + 6 files changed, 842 insertions(+), 22 deletions(-) create mode 100644 SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Buildings/Fences.hpp diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Ammo/VehicleAmmo.hpp b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Ammo/VehicleAmmo.hpp index c3eb7b3bf..296e8bcd5 100644 --- a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Ammo/VehicleAmmo.hpp +++ b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Ammo/VehicleAmmo.hpp @@ -1,74 +1,695 @@ +class SmokeLauncherMag +{ + weight = 2.0; +}; +class FlareLauncherMag +{ + weight = 2.0; +}; class 29Rnd_30mm_AGS30 { weight = 16; }; +class 29Rnd_30mm_AGS30_heli +{ + weight = 16; +}; +class 400Rnd_30mm_AGS17 +{ + weight = 50; +}; class 48Rnd_40mm_MK19 { weight = 25; }; - class 2000Rnd_762x51_M134 { weight = 50; }; - class 4000Rnd_762x51_M134 { weight = 100; }; - class 100Rnd_127x99_M2 { weight = 30; }; - +class 250Rnd_127x99_M3P +{ + weight = 70; +}; class 50Rnd_127x107_DSHKM { weight = 15; }; - class 150Rnd_127x107_DSHKM { weight = 45; }; - class 50Rnd_127x108_KORD { weight = 15; }; - class 150Rnd_127x108_KORD { weight = 45; }; - class pook_1300Rnd_762x51_M60 { weight = 40; }; - class pook_250Rnd_762x51 { weight = 8; }; - class 6Rnd_Grenade_Camel { weight = 6; }; - class pook_12Rnd_Grenade_Camel { weight = 12; }; - class 3Rnd_GyroGrenade { weight = 3; }; - class 500Rnd_TwinVickers { weight = 10; -}; \ No newline at end of file +}; +class 200Rnd_762x51_M240 +{ + weight = 5; +}; +class 2000Rnd_762x51_L94A1 +{ + weight = 20; +}; +class 32Rnd_40mm_GMG +{ + weight = 10; +}; +class 6Rnd_HE_M203_heli +{ + weight = 3; +}; +class 460Rnd_762x51_M240_ACR +{ + weight = 6; +}; +class 220Rnd_25mm_GAU22 +{ + weight = 5; +}; +class 22Rnd_125mmSABOT_IMI +{ + weight = 3; +}; +class 15Rnd_125mmHE_T72CZ +{ + weight = 2.5; +}; +class 1470Rnd_127x108_YakB +{ + weight = 70; +}; +class 500Rnd_145x115_KPVT +{ + weight = 25; +}; +class 750Rnd_M197_AH1 +{ + weight = 40; +}; +class 2100Rnd_20mm_M168 +{ + weight = 110; +}; +class 2000Rnd_23mm_AZP85 +{ + weight = 100; +}; +class 40Rnd_23mm_AZP85 +{ + weight = 5; +}; +class 1000Rnd_23mm_2A14_HE +{ + weight = 6; +}; +class 1000Rnd_23mm_2A14_AP +{ + weight = 6; +}; +class 520Rnd_23mm_GSh23L +{ + weight = 26; +}; +class 300Rnd_25mm_GAU12 +{ + weight = 22; +}; +class 210Rnd_25mm_M242_HEI +{ + weight = 20; +}; +class 210Rnd_25mm_M242_APDS +{ + weight = 20; +}; +class 230Rnd_30mmHE_2A42 +{ + weight = 21; +}; +class 250Rnd_30mmHE_2A72 +{ + weight = 25; +}; +class 250Rnd_30mmAP_2A72 +{ + weight = 25; +}; +class 250Rnd_30mmHE_2A42 +{ + weight = 25; +}; +class 250Rnd_30mmAP_2A42 +{ + weight = 25; +}; +class 230Rnd_30mmAP_2A42 +{ + weight = 21; +}; +class 150Rnd_30mmHE_2A42 +{ + weight = 15; +}; +class 150Rnd_30mmAP_2A42 +{ + weight = 15; +}; + +class 1904Rnd_30mmAA_2A38M +{ + weight = 90; +}; +class 1350Rnd_30mmAP_A10 +{ + weight = 60; +}; +class 180Rnd_30mm_GSh301 +{ + weight = 5; +}; +class 750Rnd_30mm_GSh301 +{ +weight = 75; +}; +class 30Rnd_105mmHE_M119 +{ + weight = 4; +}; +class 20Rnd_120mmHE_M1A2 +{ + weight = 4; +}; +class 20Rnd_120mmSABOT_M1A2 +{ + weight = 13; +}; +class 30Rnd_122mmHE_D30 +{ + weight = 5; +}; +class 22Rnd_125mmHE_T72 +{ + weight = 5; +}; +class 22Rnd_100mm_HE_2A70 +{ + weight = 4; +}; +class 23Rnd_125mmSABOT_T72 +{ + weight = 5; +}; +class 33Rnd_85mmHE +{ + weight = 3.5; +}; +class 10Rnd_85mmAP +{ + weight = 2; +}; +class 8Rnd_AT5_BMP2 +{ + weight = 8; +}; +class 5Rnd_AT5_BRDM2 +{ + weight = 5; +}; +class 8Rnd_AT10_BMP3 +{ + weight = 8; +}; +class 5Rnd_AT11_T90 +{ + weight = 5; +}; +class BAF_L109A1_HE +{ + weight = 6; +}; +class 6RND_105mm_APDS +{ + weight = 6; +}; +class 12RND_105mm_HESH +{ + weight = 12; +}; +class 60Rnd_CMFlareMagazine +{ + weight = 12; +}; +class 120Rnd_CMFlareMagazine +{ + weight = 24; +}; +class 240Rnd_CMFlareMagazine +{ + weight = 48; +}; +class 60Rnd_CMFlare_Chaff_Magazine +{ + weight = 12; +}; +class 120Rnd_CMFlare_Chaff_Magazine +{ + weight = 24; +}; +class 240Rnd_CMFlare_Chaff_Magazine +{ + weight = 48; +}; +class 30Rnd_122mmWP_D30 +{ + weight = 8; +}; +class 30Rnd_122mmSADARM_D30 +{ + weight = 8; +}; +class 30Rnd_122mmLASER_D30 +{ + weight = 8; +}; +class 30Rnd_122mmSMOKE_D30 +{ + weight = 8; +}; +class 30Rnd_122mmILLUM_D30 +{ + weight = 8; +}; +class 30Rnd_105mmWP_M119 +{ + weight = 8; +}; +class 30Rnd_105mmSADARM_M119 +{ + weight = 8; +}; +class 30Rnd_105mmLASER_M119 +{ + weight = 8; +}; +class 30Rnd_105mmSMOKE_M119 +{ + weight = 8; +}; +class 30Rnd_105mmILLUM_M119 +{ + weight = 8; +}; +class 100Rnd_127x99_L2A1 +{ + weight = 5; +}; +class 150Rnd_23mm_GSh23L +{ + weight = 5; +}; +class 14Rnd_FFAR +{ + weight = 2; +}; +class 12Rnd_FFAR +{ + weight = 2; +}; +class 8Rnd_Stinger +{ + weight = 8; +}; +class 2Rnd_Stinger +{ + weight = 2; +}; +class 1200Rnd_762x51_M240 +{ + weight = 60; +}; +class 1500Rnd_762x54_PKT +{ + weight = 75; +}; +class 2000Rnd_762x54_PKT +{ + weight = 50; +}; +class 200Rnd_762x54_PKT +{ + weight = 5; +}; +class 250Rnd_762x54_PKT_T90 +{ + weight = 5.4; +}; +class 4Rnd_AT9_Mi24P +{ + weight = 4; +}; +class 4Rnd_AT6_Mi24V +{ + weight = 4; +}; +class 4Rnd_AT2_Mi24D +{ + weight = 4; +}; +class 6Rnd_AT13 +{ + weight = 6; +}; +class 6Rnd_TOW_HMMWV +{ + weight = 6; +}; +class 2Rnd_TOW +{ + weight = 2; +}; +class 6Rnd_TOW2 +{ + weight = 6; +}; +class 2Rnd_TOW2 +{ + weight = 2; +}; +class 8Rnd_Hellfire +{ + weight = 8; +}; +class 12Rnd_Vikhr_KA50 +{ + weight = 12; +}; +class 4Rnd_Sidewinder_AV8B +{ + weight = 4; +}; +class 2Rnd_Sidewinder_F35 +{ + weight = 2; +}; +class 2Rnd_Sidewinder_AH1Z +{ + weight = 2; +}; +class 28Rnd_FFAR +{ + weight = 6; +}; +class 38Rnd_FFAR +{ + weight = 8; +}; +class 40Rnd_80mm +{ + weight = 8; +}; +class 80Rnd_80mm +{ + weight = 16; +}; +class 40Rnd_GRAD +{ + weight = 5; +}; +class 12Rnd_MLRS +{ + weight = 12; +}; +class 40Rnd_S8T +{ + weight = 7; +}; +class 80Rnd_S8T +{ + weight = 14; +}; +class 64Rnd_57mm +{ + weight = 9; +}; +class 128Rnd_57mm +{ + weight = 12; +}; +class 192Rnd_57mm +{ + weight = 14; +}; +class 6Rnd_GBU12_AV8B +{ + weight = 6; +}; +class 2Rnd_GBU12 +{ + weight = 2; +}; +class 4Rnd_GBU12 +{ + weight = 4; +}; +class 2Rnd_FAB_250 +{ + weight = 2; +}; +class 4Rnd_FAB_250 +{ + weight = 4; +}; +class 6Rnd_Mk82 +{ + weight = 6; +}; +class 3Rnd_Mk82 +{ + weight = 3; +}; +class 4Rnd_R73 +{ + weight = 4; +}; +class 2Rnd_R73 +{ + weight = 2; +}; +class 4Rnd_Ch29 +{ + weight = 4; +}; +class 6Rnd_Ch29 +{ + weight = 6; +}; +class 2Rnd_Maverick_A10 +{ + weight = 2; +}; +class 8Rnd_9M311 +{ + weight = 8; +}; +class 1200Rnd_30x113mm_M789_HEDP +{ + weight = 50; +}; +class 8Rnd_Sidewinder_AH64 +{ + weight = 8; +}; +class 200Rnd_762x54_GPMG +{ + weight = 8; +}; +class 12Rnd_CRV7 +{ + weight = 12; +}; +class 38Rnd_CRV7 +{ + weight = 38; +}; +class 6Rnd_CRV7_HEPD +{ + weight = 6; +}; +class 6Rnd_CRV7_FAT +{ + weight = 6; +}; +class 1200Rnd_20mm_M621 +{ + weight = 70; +}; +class 21Rnd_100mmHEAT_D10 +{ + weight = 21; +}; +class 4Rnd_Hellfire +{ + weight = 4; +}; +class 4Rnd_Stinger +{ + weight = 4; +}; +class 24Rnd_120mmHE_M120 +{ + weight = 24; +}; +class 24Rnd_120mmHE_M120_02 +{ + weight = 24; +}; +class 8Rnd_81mmHE_M252 +{ + weight = 8; +}; +class 8Rnd_81mmWP_M252 +{ + weight = 8; +}; +class 8Rnd_81mmILLUM_M252 +{ + weight = 8; +}; +class 8Rnd_82mmHE_2B14 +{ + weight = 8; +}; +class 8Rnd_82mmWP_2B14 +{ + weight = 8; +}; +class 8Rnd_82mmILLUM_2B14 +{ + weight = 8; +}; +class 14Rnd_57mm +{ + weight = 14; +}; +class 1Rnd_Bolide +{ + weight = 1; +}; +class 210Rnd_20mm_ZPL_20 +{ + weight = 4; +}; +class 8Rnd_AT9_Mi24V +{ + weight = 8; +}; +class 4Rnd_Maverick_L159 +{ + weight = 4; +}; +class 140Rnd_30mm_ATKMK44_HE_ACR +{ + weight = 10; +}; +class 60Rnd_30mm_ATKMK44_AP_ACR +{ + weight = 4; +}; +class 2Rnd_Spike_ACR +{ + weight = 2; +}; +class 40Rnd_GRAD_ACR +{ + weight = 4; +}; +class 2Rnd_Mk82 +{ + weight = 2; +}; +class 4Rnd_Mk82 +{ + weight = 4; +}; +class 2Rnd_GBU12_AV8B +{ + weight = 2; +}; +class 4Rnd_GBU12_AV8B +{ + weight = 4; +}; +class 400Rnd_20mm_M621 +{ + weight = 6; +}; +class 8Rnd_Ch29 +{ + weight = 8; +}; +class PG15V +{ + weight = 2; +}; +class 40rnd_PG15V +{ + weight = 20; +}; +class AT3 +{ + weight = 2; +}; +class 4rnd_AT3 +{ + weight = 8; +}; +class 1Rnd_AT3 +{ + weight = 2; +}; +class IR_Strobe_Marker +{ + weight = 1; +}; +class IRStrobe +{ + weight = 2; +}; + diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Buildings/Fences.hpp b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Buildings/Fences.hpp new file mode 100644 index 000000000..2d1d47bca --- /dev/null +++ b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Buildings/Fences.hpp @@ -0,0 +1,112 @@ +class woodfence_foundation_kit +{ + weight = 2; +}; +class woodfence_frame_kit +{ + weight = 4; +}; +class woodfence_quaterpanel_kit +{ + weight = 6; +}; +class woodfence_halfpanel_kit +{ + weight = 8; +}; +class woodfence_thirdpanel_kit +{ + weight = 10; +}; +class woodfence_1_kit +{ + weight = 14; +}; +class woodfence_2_kit +{ + weight = 18; +}; +class woodfence_3_kit +{ + weight = 22; +}; +class woodfence_4_kit +{ + weight = 26; +}; +class woodfence_5_kit +{ + weight = 30; +}; +class woodfence_6_kit +{ + weight = 40; +}; +class woodfence_7_kit +{ + weight = 50; +}; +class metalfence_foundation_kit +{ + weight = 5; +}; +class metalfence_frame_kit +{ + weight = 10; +}; +class metalfence_halfpanel_kit +{ + weight = 15; +}; +class metalfence_thirdpanel_kit +{ + weight = 20; +}; +class metalfence_1_kit +{ + weight = 25; +}; +class metalfence_2_kit +{ + weight = 30; +}; +class metalfence_3_kit +{ + weight = 40; +}; +class metalfence_4_kit +{ + weight = 60; +}; +class metalfence_5_kit +{ + weight = 80; +}; +class metalfence_6_kit +{ + weight = 120; +}; +class metalfence_7_kit +{ + weight = 160; +}; +class woodfence_gate_foundation_kit +{ + weight = 10; +}; +class woodfence_gate_1_kit +{ + weight = 20; +}; +class woodfence_gate_2_kit +{ + weight = 30; +}; +class woodfence_gate_3_kit +{ + weight = 40; +}; +class woodfence_gate_4_kit +{ + weight = 60; +}; \ No newline at end of file diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Buildings/Storage.hpp b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Buildings/Storage.hpp index 2f5477d1f..92a25cb93 100644 --- a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Buildings/Storage.hpp +++ b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Buildings/Storage.hpp @@ -2,38 +2,56 @@ class outhouse_kit { weight = 50; }; - class wooden_shed_kit { weight = 75; }; - +class wooden_shed_kit2 +{ + weight = 150; +}; class wood_shack_kit { weight = 50; }; - +class wood_shack_kit2 +{ + weight = 100; +}; class storage_shed_kit { weight = 100; }; - +class storage_shed_kit2 +{ + weight = 200; +}; class ItemGunRackKit { weight = 20; }; - +class ItemGunRackKit2 +{ + weight = 40; +}; class ItemWoodCrateKit { weight = 20; }; - +class ItemWoodCrateKit2 +{ + weight = 40; +}; class ItemVault { weight = 50; }; - class ItemLockbox { weight = 15; -}; \ No newline at end of file +}; +class StashSmall_kit +{ + weight = 2; +}; + diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Items/Explosives.hpp b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Items/Explosives.hpp index b1143f17f..61c79ee54 100644 --- a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Items/Explosives.hpp +++ b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Items/Explosives.hpp @@ -26,4 +26,44 @@ class ItemC4Charge class ItemCarBomb { weight = 0.8; +}; + +class PMC_ied_v1 +{ + weight = 6; +}; + +class PMC_ied_v2 +{ + weight = 6; +}; + +class PMC_ied_v3 +{ + weight = 6; +}; + +class PMC_ied_v4 +{ + weight = 6; +}; + +class BAF_ied_v1 +{ + weight = 6; +}; + +class BAF_ied_v2 +{ + weight = 6; +}; + +class BAF_ied_v3 +{ + weight = 6; +}; + +class BAF_ied_v4 +{ + weight = 6; }; \ No newline at end of file diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/R3F_CfgWeight.hpp b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/R3F_CfgWeight.hpp index 374096344..b8b03dc59 100644 --- a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/R3F_CfgWeight.hpp +++ b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/R3F_CfgWeight.hpp @@ -28,6 +28,7 @@ class CfgWeight #include "Magazines\Buildings\BearTrap.hpp" #include "Magazines\Buildings\Camonets.hpp" #include "Magazines\Buildings\ModularBuilding.hpp" + #include "Magazines\Buildings\Fences.hpp" #include "Magazines\Buildings\Sandbag.hpp" #include "Magazines\Buildings\Storage.hpp" #include "Magazines\Buildings\Tent.hpp" diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Tools.hpp b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Tools.hpp index ed10532ab..1ea1f5c61 100644 --- a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Tools.hpp +++ b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Tools.hpp @@ -18,6 +18,26 @@ class ChainsawR { weight = 4.5; }; +class ChainSawBroken +{ + weight = 4.5; +}; +class ChainSawBBroken +{ + weight = 4.5; +}; +class ChainSawGBroken +{ + weight = 4.5; +}; +class ChainSawPBroken +{ + weight = 4.5; +}; +class ChainSawRBroken +{ + weight = 4.5; +}; class Binocular { weight = 1; @@ -26,6 +46,14 @@ class Binocular_Vector { weight = 1; }; +class BinocularBroken +{ + weight = 1; +}; +class Binocular_VectorBroken +{ + weight = 1; +}; class NVGoggles { weight = 1;