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.

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

Weapons Component Fixes #254

Merged
merged 3 commits into from
Jul 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 0 additions & 10 deletions addons/weapons/CfgAmmo.hpp

This file was deleted.

5 changes: 0 additions & 5 deletions addons/weapons/CfgMagazineWells.hpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
class CfgMagazineWells {
class CLASS(762x51_RFB) {
ADDON[] = {
QCLASS(20Rnd_762x51_RFB_Mag)
};
};
class CLASS(Cylinder_357) {
ADDON[] = {
QCLASS(6Rnd_357)
Expand Down
10 changes: 0 additions & 10 deletions addons/weapons/CfgMagazines.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,4 @@ class CfgMagazines {
descriptionShort = "6.5x39mm EPR Tracer Every 4";
displayName = "6.5mm 100Rnd Belt [TE4] (EPR)";
};

// Keltec RFB
class 20Rnd_556x45_UW_mag;
class CLASS(20Rnd_762x51_RFB_Mag): 20Rnd_556x45_UW_mag {
author = ECSTRING(main,Author);
scope = 2;
displayName = "7.62mm 20Rnd RFB Mag (M80)";
mass = 11;
ammo = QCLASS(762x51_dual);
};
};
37 changes: 37 additions & 0 deletions addons/weapons/CfgSoundShaders.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,41 @@ class CfgSoundShaders {
range = 50;
rangeCurve = "closeShotCurve";
};
class Mk200_midShot_SoundShader {
samples[] = {
{"\A3\Sounds_F\arsenal\weapons\Machineguns\Mk200\Mk200_midShot_01", 1},
{"\A3\Sounds_F\arsenal\weapons\Machineguns\Mk200\Mk200_midShot_02", 1},
{"\A3\Sounds_F\arsenal\weapons\Machineguns\Mk200\Mk200_midShot_03", 1}
};
volume = 0.4; // Default: 0.5
range = 2000;
rangeCurve[] = {{0, 0.2}, {50, 1}, {300, 0}, {2000, 0}};
};
class Mk200_distShot_SoundShader {
samples[] = {
{"\A3\Sounds_F\arsenal\weapons\Machineguns\Mk200\Mk200_distShot_01", 1},
{"\A3\Sounds_F\arsenal\weapons\Machineguns\Mk200\Mk200_distShot_02", 1},
{"\A3\Sounds_F\arsenal\weapons\Machineguns\Mk200\Mk200_distShot_03", 1}
};
volume = 0.45; // Default: 1
range = 2000;
rangeCurve[] = {{0,0}, {50,0}, {300,1}, {2000,1}};
};
class Mk200_tailDistant_SoundShader {
samples[] = {{"\A3\Sounds_F\arsenal\weapons\Machineguns\Mk200\Mk200_taildistant", 1}};
volume = 0.45; // Default: 1
range = 2000;
rangeCurve[] = {{0, 0}, {600, 0.69}, {2000, 1}};
limitation = 1;
};
class Mk200_silencerShot_SoundShader {
samples[] = {
{"A3\Sounds_F\arsenal\weapons\Machineguns\Mk200\Mk200_silencerShot_01", 1},
{"A3\Sounds_F\arsenal\weapons\Machineguns\Mk200\Mk200_silencerShot_02", 1},
{"A3\Sounds_F\arsenal\weapons\Machineguns\Mk200\Mk200_silencerShot_03", 1}
};
volume = 0.45; // Default: 1
range = 150;
rangeCurve = "closeShotCurve";
};
};
13 changes: 0 additions & 13 deletions addons/weapons/CfgWeapons.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -118,19 +118,6 @@ class CfgWeapons {
baseWeapon = QCLASS(LMG_LAMG);
};

// Keltec RFB
class arifle_SDAR_F;
class CLASS(RFB_762_F): arifle_SDAR_F {
author = ECSTRING(main,Author);
scope = 2;
scopeArsenal = 2;
baseWeapon = QCLASS(RFB_762_F);
displayName = "Keltec RFB";
descriptionShort = "Underwater Rifle";
magazines[] = {QCLASS(20Rnd_762x51_RFB_Mag)};
magazineWell[] = {QCLASS(762x51_RFB)};
};

// TAR-21 Black
class arifle_TRG21_F;
class CLASS(TAR21_Black): arifle_TRG21_F {
Expand Down
2 changes: 1 addition & 1 deletion addons/weapons/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ class CfgPatches {
QCLASS(GTAR21_EGLM_Black),
QCLASS(CTAR21_Black),
QCLASS(LMG_LAMG),
QCLASS(RFB_762_F),
QCLASS(Rhino_357),
QCLASS(Rhino_44)
};
Expand All @@ -35,4 +34,5 @@ class Mode_FullAuto;
#include "CfgMagazines.hpp"
#include "CfgMagazineWells.hpp"
#include "CfgRecoils.hpp"
#include "CfgSoundShaders.hpp"
#include "CfgWeapons.hpp"