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

RHS Compat Enhancement for Weapons and Grenades #3045

Merged
merged 2 commits into from
Dec 31, 2015
Merged

RHS Compat Enhancement for Weapons and Grenades #3045

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
e033c56
RHS weapons and Frag update
sargken Dec 17, 2015
543f13c
More Fixes
sargken Dec 20, 2015
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
92 changes: 72 additions & 20 deletions optionals/compat_rhs_afrf3/CfgAmmo.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@

class CfgAmmo
{
class CfgAmmo {
class BulletBase;
class B_556x45_Ball;
class rhs_B_545x39_Ball: B_556x45_Ball
{
class rhs_B_545x39_Ball: B_556x45_Ball {
ACE_caliber=5.588;
ACE_bulletLength=21.59;
ACE_bulletMass=3.42792;
Expand All @@ -16,8 +14,7 @@ class CfgAmmo
ACE_muzzleVelocities[]={780, 880, 920};
ACE_barrelLengths[]={254.0, 414.02, 508.0};
};
class rhs_B_545x39_Ball_Tracer_Green: rhs_B_545x39_Ball
{
class rhs_B_545x39_Ball_Tracer_Green: rhs_B_545x39_Ball {
ACE_caliber=5.588;
ACE_bulletLength=21.59;
ACE_bulletMass=3.22704;
Expand All @@ -30,8 +27,7 @@ class CfgAmmo
ACE_barrelLengths[]={254.0, 414.02, 508.0};
};
class B_762x51_Ball;
class rhs_B_762x54_Ball: B_762x51_Ball
{
class rhs_B_762x54_Ball: B_762x51_Ball {
ACE_caliber=7.925;
ACE_bulletLength=28.956;
ACE_bulletMass=9.8496;
Expand All @@ -43,8 +39,7 @@ class CfgAmmo
ACE_muzzleVelocities[]={700, 800, 820, 833};
ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4};
};
class rhs_B_762x54_Ball_Tracer_Green: B_762x51_Ball
{
class rhs_B_762x54_Ball_Tracer_Green: B_762x51_Ball {
ACE_caliber=7.925;
ACE_bulletLength=28.956;
ACE_bulletMass=9.6552;
Expand All @@ -56,8 +51,7 @@ class CfgAmmo
ACE_muzzleVelocities[]={680, 750, 798, 800};
ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4};
};
class rhs_B_762x54_7N1_Ball: rhs_B_762x54_Ball
{
class rhs_B_762x54_7N1_Ball: rhs_B_762x54_Ball {
ACE_caliber=7.925;
ACE_bulletLength=28.956;
ACE_bulletMass=9.8496;
Expand All @@ -69,8 +63,7 @@ class CfgAmmo
ACE_muzzleVelocities[]={700, 800, 820, 833};
ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4};
};
class rhs_B_762x39_Ball: B_762x51_Ball
{
class rhs_B_762x39_Ball: B_762x51_Ball {
ACE_caliber=7.823;
ACE_bulletLength=28.956;
ACE_bulletMass=7.9704;
Expand All @@ -82,8 +75,7 @@ class CfgAmmo
ACE_muzzleVelocities[]={650, 716, 750};
ACE_barrelLengths[]={254.0, 414.02, 508.0};
};
class rhs_B_762x39_Tracer: rhs_B_762x39_Ball
{
class rhs_B_762x39_Tracer: rhs_B_762x39_Ball {
ACE_caliber=7.823;
ACE_bulletLength=28.956;
ACE_bulletMass=7.5816;
Expand All @@ -96,8 +88,7 @@ class CfgAmmo
ACE_barrelLengths[]={254.0, 414.02, 508.0};
};
class B_9x21_Ball;
class rhs_B_9x19_7N21: B_9x21_Ball
{
class rhs_B_9x19_7N21: B_9x21_Ball {
ACE_caliber=9.017;
ACE_bulletLength=15.494;
ACE_bulletMass=5.19696;
Expand All @@ -109,8 +100,7 @@ class CfgAmmo
ACE_muzzleVelocities[]={445, 460, 480};
ACE_barrelLengths[]={101.6, 127.0, 228.6};
};
class rhs_B_9x18_57N181S: B_9x21_Ball
{
class rhs_B_9x18_57N181S: B_9x21_Ball {
ACE_caliber=9.271;
ACE_bulletLength=15.494;
ACE_bulletMass=6.00048;
Expand All @@ -126,4 +116,66 @@ class CfgAmmo
class rhs_ammo_127x108mm_x5: SubmunitionBase {
ACE_rearm_caliber=13;
};

class GrenadeHand;
class rhs_ammo_rgd5: GrenadeHand {
ace_frag_enabled = 1;
ace_frag_metal = 200;
ace_frag_charge = 110;
ace_frag_gurney_c = 2440;
ace_frag_gurney_k = "3/5";
ace_frag_classes[] = {"ACE_frag_small_HD"};
ace_frag_skip = 0;
ace_frag_force = 1;
};
class rhs_ammo_rgn_base: rhs_ammo_rgd5 {
ace_frag_enabled = 1;
ace_frag_metal = 193;
ace_frag_charge = 97;
ace_frag_gurney_c = 2800;
ace_frag_gurney_k = "3/5";
ace_frag_classes[] = {"ACE_frag_tiny_HD"};
ace_frag_skip = 0;
ace_frag_force = 1;
};
class rhs_ammo_rgn: rhs_ammo_rgn_base {
ace_frag_enabled = 0;
ace_frag_skip = 1;
ace_frag_force = 0;
};
class rhs_ammo_rgn_sub: rhs_ammo_rgn_base {};
class rhs_ammo_rgn_exp: rhs_ammo_rgn_base {};
class rhs_ammo_fakel: GrenadeHand {
ace_frag_enabled = 0;
ace_frag_skip = 1;
ace_frag_force = 0;
};
class rhs_ammo_fakels: rhs_ammo_fakel {};
class rhs_ammo_zarya2: rhs_ammo_fakels {};
class rhs_ammo_plamyam: rhs_ammo_fakels {};

class RocketBase;
class R_PG32V_F: RocketBase {};
class rhs_rpg26_rocket: R_PG32V_F {};
class rhs_rpg7v2_pg7vl: rhs_rpg26_rocket {};
class rhs_rpg7v2_og7v: rhs_rpg7v2_pg7vl {
ace_frag_enabled = 1;
ace_frag_metal = 400;
ace_frag_charge = 210;
ace_frag_gurney_c = 2800;
ace_frag_gurney_k = "3/5";
ace_frag_classes[] = {"ACE_frag_medium_HD"};
ace_frag_skip = 0;
ace_frag_force = 1;
};
class rhs_rpg7v2_tbg7v: rhs_rpg7v2_pg7vl {
ace_frag_enabled = 0;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why you disable here Fraging?

Same for rhs_rshg2_rocket

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TBG-7V is Thermobaric

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I got permission from this mod author to add this in.
https://forums.bistudio.com/topic/185587-ace3xrhs-fragmentation-configs/
its a carbon copy of the fragmentation portion.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#3045 (comment)
didnt know that thanks for the information

ace_frag_skip = 1;
ace_frag_force = 0;
};
class rhs_rshg2_rocket: rhs_rpg7v2_tbg7v {
ace_frag_enabled = 0;
ace_frag_skip = 1;
ace_frag_force = 0;
};
};
73 changes: 31 additions & 42 deletions optionals/compat_rhs_afrf3/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,61 +1,50 @@

class CfgWeapons
{
class CfgWeapons {
class hgun_Rook40_F;
class rhs_weap_pya: hgun_Rook40_F
{
ACE_barrelTwist=254.0;
ACE_barrelLength=111.76;
class rhs_weap_pya: hgun_Rook40_F {
ACE_barrelTwist = 254.0;
ACE_barrelLength = 111.76;
};
class Pistol_Base_F;
class rhs_weap_makarov_pmm: rhs_weap_pya
{
ACE_barrelTwist=240.03;
ACE_barrelLength=93.472;
class rhs_weap_makarov_pmm: rhs_weap_pya {
ACE_barrelTwist = 240.03;
ACE_barrelLength = 93.472;
};
class rhs_weap_ak74m_Base_F;
class rhs_weap_ak74m: rhs_weap_ak74m_Base_F
{
ACE_barrelTwist=199.898;
ACE_barrelLength=414.02;
class rhs_weap_ak74m: rhs_weap_ak74m_Base_F {
ACE_barrelTwist = 199.898;
ACE_barrelLength = 414.02;
};
class rhs_weap_akm: rhs_weap_ak74m
{
ACE_barrelTwist=199.898;
ACE_barrelLength=414.02;
class rhs_weap_akm: rhs_weap_ak74m {
ACE_barrelTwist = 199.898;
ACE_barrelLength = 414.02;
};
class rhs_weap_aks74;
class rhs_weap_aks74u: rhs_weap_aks74
{
ACE_barrelTwist=160.02;
ACE_barrelLength=210.82;
class rhs_weap_aks74u: rhs_weap_aks74 {
ACE_barrelTwist = 160.02;
ACE_barrelLength = 210.82;
};
class rhs_weap_svd: rhs_weap_ak74m
{
ACE_barrelTwist=238.76;
ACE_barrelLength=619.76;
class rhs_weap_svd: rhs_weap_ak74m {
ACE_barrelTwist = 238.76;
ACE_barrelLength = 619.76;
};
class rhs_weap_svdp;
class rhs_weap_svds: rhs_weap_svdp
{
ACE_barrelTwist=238.76;
ACE_barrelLength=563.88;
class rhs_weap_svds: rhs_weap_svdp {
ACE_barrelTwist = 238.76;
ACE_barrelLength = 563.88;
};
class rhs_pkp_base;
class rhs_weap_pkp: rhs_pkp_base
{
ACE_barrelTwist=240.03;
ACE_barrelLength=657.86;
class rhs_weap_pkp: rhs_pkp_base {
ACE_barrelTwist = 240.03;
ACE_barrelLength = 657.86;
};
class rhs_weap_pkm: rhs_weap_pkp
{
ACE_barrelTwist=240.03;
ACE_barrelLength=645.16;
class rhs_weap_pkm: rhs_weap_pkp {
ACE_barrelTwist = 240.03;
ACE_barrelLength = 645.16;
};
class rhs_weap_rpk74m: rhs_weap_pkp
{
ACE_barrelTwist=195.072;
ACE_barrelLength=589.28;
class rhs_weap_rpk74m: rhs_weap_pkp {
ACE_barrelTwist = 195.072;
ACE_barrelLength = 589.28;
};

class rhs_acc_sniper_base;
Expand Down
44 changes: 44 additions & 0 deletions optionals/compat_rhs_usf3/CfgAmmo.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,48 @@ class CfgAmmo
attackProfiles[] = { "JAV_TOP", "JAV_DIR" };
};
};

class GrenadeHand;
class rhs_ammo_mk3a2: GrenadeHand {
ace_frag_enabled = 0;
ace_frag_skip = 1;
ace_frag_force = 0;
};
class rhs_ammo_m84: GrenadeHand {
ace_frag_enabled = 0;
ace_frag_skip = 1;
ace_frag_force = 0;
};
class rhs_ammo_m7a3_cs: GrenadeHand {
ace_frag_enabled = 0;
ace_frag_skip = 1;
ace_frag_force = 0;
};
class rhs_ammo_m69: GrenadeHand {
ace_frag_enabled = 0;
ace_frag_skip = 1;
ace_frag_force = 0;
};
class rhs_ammo_m67: GrenadeHand {
ace_frag_enabled = 1;
ace_frag_metal = 213;
ace_frag_charge = 185;
ace_frag_gurney_c = 2700;
ace_frag_gurney_k = "3/5";
ace_frag_classes[] = {"ACE_frag_medium_HD"};
ace_frag_skip = 0;
ace_frag_force = 1;
};
class RocketBase;
class rhs_ammo_M136_rocket: RocketBase {};
class rhs_ammo_M136_hedp_rocket: rhs_ammo_M136_rocket {
ace_frag_enabled = 1;
ace_frag_metal = 330;
ace_frag_charge = 280;
ace_frag_gurney_c = 2800;
ace_frag_gurney_k = "3/5";
ace_frag_classes[] = {"ACE_frag_medium_HD"};
ace_frag_skip = 0;
ace_frag_force = 1;
};
};
Loading