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 3.4 Goggles and AB Ammo compat update #5607

Merged
merged 3 commits into from
Oct 11, 2017
Merged

RHS 3.4 Goggles and AB Ammo compat update #5607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ba119f
Oakley SI ballistic goggles
dedmen Oct 11, 2017
de6e0ec
Shemags and ess goggles
dedmen Oct 11, 2017
b023000
556x45 M855
dedmen Oct 11, 2017
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
24 changes: 18 additions & 6 deletions optionals/compat_rhs_usf3/CfgAmmo.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class CfgAmmo {
ACE_dragModel = 1;
ACE_muzzleVelocities[] = {900};
ACE_barrelLengths[] = {736.6};
};
};
class B_762x54_Ball;
class rhsusf_B_300winmag: B_762x54_Ball { // ACE_762x67_Ball_Mk248_Mod_1 (ballistics/CfgAmmo.hpp)
ACE_caliber = 7.823;
Expand All @@ -40,7 +40,19 @@ class CfgAmmo {
ACE_barrelLengths[] = {508.0, 609.6, 660.4};
};
class B_556x45_Ball;
class rhs_ammo_556x45_M855A1_Ball: B_556x45_Ball { // B_556x45_Ball (ballistics/CfgAmmo.hpp)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sometimes I wish diffing algo's were a little better.

Copy link
Contributor

Choose a reason for hiding this comment

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

You changed the line break.

Copy link
Member

Choose a reason for hiding this comment

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

It's supposed to be LF. Either it was CRLF or you changed it to it, either way .gitattributes apparently doesn't catch all configurations. :/

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Everything is CRLF in my file (o_o)/

Copy link
Contributor Author

Choose a reason for hiding this comment

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

btw .gitattributes doesn't say that it will convert to anything.
I see editorConfig says LF.. But the .editorconfig is using CRLF itself..
I guess that's just autocrlf doing stuff...

Copy link
Member

Choose a reason for hiding this comment

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

Yes that's autocrlf, Git will automatically convert to LF as by .gitattributes, you won't see those messages if you are using autocrlf because that's the point of autocrlf.

And yes, it obviously does say: * text=auto. The whole point is that it doesn't matter what your local files are using, they should always be LF on the server (GitHub), although we had an occasion in the past that it somehow slipped through, but it seemed to be because of editing directly on GitHub.

class rhs_ammo_556x45_M855_Ball: B_556x45_Ball { // B_556x45_Ball (ballistics/CfgAmmo.hpp)
ACE_caliber = 5.69;
ACE_bulletLength = 23.012;
ACE_bulletMass = 4.0176;
ACE_ammoTempMuzzleVelocityShifts[] = {-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75};
ACE_ballisticCoefficients[] = {0.151};
ACE_velocityBoundaries[] = {};
ACE_standardAtmosphere = "ASM";
ACE_dragModel = 7;
ACE_muzzleVelocities[] = {723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900};
ACE_barrelLengths[] = {210.82, 238.76, 269.24, 299.72, 330.2, 360.68, 391.16, 419.1, 449.58, 480.06, 508.0, 609.6};
};
class rhs_ammo_556x45_M855A1_Ball: B_556x45_Ball { // B_556x45_Ball (ballistics/CfgAmmo.hpp)
ACE_caliber = 5.69;
ACE_bulletLength = 23.012;
ACE_bulletMass = 4.0176;
Expand Down Expand Up @@ -154,8 +166,8 @@ class CfgAmmo {
ACE_dragModel = 1;
ACE_muzzleVelocities[] = {680};
ACE_barrelLengths[] = {180};
};
class rhs_ammo_45ACP_MHP: BulletBase { // B_45ACP_Ball (ballistics/CfgAmmo.hpp)
};
class rhs_ammo_45ACP_MHP: BulletBase { // B_45ACP_Ball (ballistics/CfgAmmo.hpp)
ACE_caliber = 11.481;
ACE_bulletLength = 17.272;
ACE_bulletMass = 14.904;
Expand Down Expand Up @@ -222,13 +234,13 @@ class CfgAmmo {
seekerMaxRange = 2500; // Range from the missile which the seeker can visually search

seekLastTargetPos = 1; // seek last target position [if seeker loses LOS of target, continue to last known pos]

// Attack profile type selection
defaultAttackProfile = "JAV_TOP";
attackProfiles[] = { "JAV_TOP", "JAV_DIR" };
};
};

class GrenadeHand;
class rhs_ammo_mk3a2: GrenadeHand {
ace_frag_enabled = 0;
Expand Down
46 changes: 46 additions & 0 deletions optionals/compat_rhs_usf3/CfgGlasses.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@

class CfgGlasses {
class G_Combat;
class rhs_ess_black: G_Combat {
ACE_Color[] = {0,0,0};
ACE_TintAmount = 16.0;
ACE_Overlay = "";
ACE_OverlayDirt = "A3\Ui_f\data\igui\rsctitles\HealthTextures\dust_upper_ca.paa";
ACE_OverlayCracked = QPATHTOEF(goggles,textures\HUD\Cracked.paa);
ACE_Resistance = 1;
ACE_Protection = 0;
ACE_DustPath = QPATHTOEF(goggles,textures\fx\dust\%1.paa);
};
class rhs_googles_black: G_Combat {
ACE_Color[] = {0,0,0};
ACE_TintAmount = 16.0;
Expand Down Expand Up @@ -41,4 +51,40 @@ class CfgGlasses {
ACE_Protection = 0;
ACE_DustPath = QPATHTOEF(goggles,textures\fx\dust\%1.paa);
};
class rhsusf_oakley_goggles_base: G_Combat {
ACE_Overlay = "";
ACE_OverlayDirt = "A3\Ui_f\data\igui\rsctitles\HealthTextures\dust_upper_ca.paa";
ACE_OverlayCracked = QPATHTOEF(goggles,textures\HUD\Cracked.paa);
ACE_Resistance = 1;
ACE_Protection = 0;
ACE_DustPath = QPATHTOEF(goggles,textures\fx\dust\%1.paa);
};
class rhsusf_oakley_goggles_blk: rhsusf_oakley_goggles_base {
ACE_Color[] = {0,0,0};
ACE_TintAmount = 16.0;
};
class rhsusf_oakley_goggles_clr: rhsusf_oakley_goggles_base {
ACE_Color[] = {0,0,0};
ACE_TintAmount = 0;
};
class rhsusf_oakley_goggles_ylw: rhsusf_oakley_goggles_base {
ACE_Color[] = {0,0,-1.5};
ACE_TintAmount = 8.0;
};
class rhsusf_shemagh_gogg_base: G_Combat {
ACE_Overlay = "";
ACE_OverlayDirt = "A3\Ui_f\data\igui\rsctitles\HealthTextures\dust_upper_ca.paa";
ACE_OverlayCracked = QPATHTOEF(goggles,textures\HUD\Cracked.paa);
ACE_Resistance = 1;
ACE_Protection = 0;
ACE_DustPath = QPATHTOEF(goggles,textures\fx\dust\%1.paa);
};
class rhsusf_shemagh2_gogg_base: G_Combat {
ACE_Overlay = "";
ACE_OverlayDirt = "A3\Ui_f\data\igui\rsctitles\HealthTextures\dust_upper_ca.paa";
ACE_OverlayCracked = QPATHTOEF(goggles,textures\HUD\Cracked.paa);
ACE_Resistance = 1;
ACE_Protection = 0;
ACE_DustPath = QPATHTOEF(goggles,textures\fx\dust\%1.paa);
};
};