From 3d0f9f8455dc00e27b1b1b7bcef1aed4201c6d07 Mon Sep 17 00:00:00 2001 From: AChesheireCat Date: Thu, 24 Oct 2024 15:39:58 -0400 Subject: [PATCH 01/10] Adds a faux KAC LAMG Adds a separate version of the vanilla Mk200 (Stoner 99 LMG) that's in 5.56 with lower recoil. --- addons/miscFixes/fauxLAMG/CfgWeapons.hpp | 32 +++++++++++++++++++ addons/miscFixes/fauxLAMG/config.cpp | 19 +++++++++++ .../miscFixes/fauxLAMG/script_component.hpp | 12 +++++++ 3 files changed, 63 insertions(+) create mode 100644 addons/miscFixes/fauxLAMG/CfgWeapons.hpp create mode 100644 addons/miscFixes/fauxLAMG/config.cpp create mode 100644 addons/miscFixes/fauxLAMG/script_component.hpp diff --git a/addons/miscFixes/fauxLAMG/CfgWeapons.hpp b/addons/miscFixes/fauxLAMG/CfgWeapons.hpp new file mode 100644 index 00000000..8804265e --- /dev/null +++ b/addons/miscFixes/fauxLAMG/CfgWeapons.hpp @@ -0,0 +1,32 @@ +class CfgWeapons { + class LMG_Mk200_F; + class GVAR(LAMG): LMG_Mk200_F { + author = "Potato"; + displayName = "KAC Light Assault Machine Gun"; + descriptionShort = "Light Machine Gun
Caliber: 5.56x45 mm"; + baseWeapon = QGVAR(LAMG); + recoil = "CUP_SAW_recoil"; + magazineWell[] = {"CBA_556x45_MINIMI"}; + magazines[] = { + "200Rnd_556x45_Box_F", + "200Rnd_556x45_Box_Red_F", + "200Rnd_556x45_Box_Tracer_F", + "200Rnd_556x45_Box_Tracer_Red_F", + + "CUP_200Rnd_TE4_Red_Tracer_556x45_M249", + "CUP_200Rnd_TE4_Yellow_Tracer_556x45_M249", + "CUP_200Rnd_TE4_Green_Tracer_556x45_M249", + "CUP_200Rnd_TE1_Red_Tracer_556x45_M249", + "CUP_200Rnd_TE4_Green_Tracer_556x45_M249_Pouch", + "CUP_200Rnd_TE4_Red_Tracer_556x45_M249_Pouch", + "CUP_200Rnd_TE4_Yellow_Tracer_556x45_M249_Pouch", + "CUP_200Rnd_TE1_Red_Tracer_556x45_M249_Pouch", + "CUP_100Rnd_TE4_Green_Tracer_556x45_M249", + "CUP_100Rnd_TE4_Red_Tracer_556x45_M249", + "CUP_100Rnd_TE4_Yellow_Tracer_556x45_M249", + "CUP_200Rnd_TE4_Green_Tracer_556x45_L110A1", + "CUP_200Rnd_TE4_Red_Tracer_556x45_L110A1", + "CUP_200Rnd_TE4_Yellow_Tracer_556x45_L110A1" + }; + }; +}; \ No newline at end of file diff --git a/addons/miscFixes/fauxLAMG/config.cpp b/addons/miscFixes/fauxLAMG/config.cpp new file mode 100644 index 00000000..a7aad5d1 --- /dev/null +++ b/addons/miscFixes/fauxLAMG/config.cpp @@ -0,0 +1,19 @@ +#include "script_component.hpp" + +class CfgPatches { + class ADDON { + weapons[] = { + QGVAR(LAMG) + }; + units[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {"potato_core", "CUP_Weapons_LoadOrder"}; + skipWhenMissingDependencies = 1; + author = "Potato"; + authors[] = {"AChesheireCat"}; + authorUrl = "https://github.com/BourbonWarfare/POTATO"; + VERSION_CONFIG; + }; +}; + +#include "CfgWeapons.hpp" \ No newline at end of file diff --git a/addons/miscFixes/fauxLAMG/script_component.hpp b/addons/miscFixes/fauxLAMG/script_component.hpp new file mode 100644 index 00000000..d83aae48 --- /dev/null +++ b/addons/miscFixes/fauxLAMG/script_component.hpp @@ -0,0 +1,12 @@ +#define COMPONENT fauxLAMG +#include "\z\potato\addons\core\script_mod.hpp" + +// #define DEBUG_MODE_FULL +// #define DISABLE_COMPILE_CACHE +// #define ENABLE_PERFORMANCE_COUNTERS + +#ifdef DEBUG_ENABLED_FAUXLAMG + #define DEBUG_MODE_FULL +#endif + +#include "\z\potato\addons\core\script_macros.hpp" \ No newline at end of file From 684c0b727bcc0c90d09f7e1a4dab2cf6f282cbd4 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Thu, 24 Oct 2024 20:48:59 -0500 Subject: [PATCH 02/10] just use magwell, add black variant --- addons/miscFixes/fauxLAMG/CfgWeapons.hpp | 33 +++++++++--------------- addons/miscFixes/fauxLAMG/config.cpp | 4 +-- 2 files changed, 14 insertions(+), 23 deletions(-) diff --git a/addons/miscFixes/fauxLAMG/CfgWeapons.hpp b/addons/miscFixes/fauxLAMG/CfgWeapons.hpp index 8804265e..394e2354 100644 --- a/addons/miscFixes/fauxLAMG/CfgWeapons.hpp +++ b/addons/miscFixes/fauxLAMG/CfgWeapons.hpp @@ -7,26 +7,17 @@ class CfgWeapons { baseWeapon = QGVAR(LAMG); recoil = "CUP_SAW_recoil"; magazineWell[] = {"CBA_556x45_MINIMI"}; - magazines[] = { - "200Rnd_556x45_Box_F", - "200Rnd_556x45_Box_Red_F", - "200Rnd_556x45_Box_Tracer_F", - "200Rnd_556x45_Box_Tracer_Red_F", - - "CUP_200Rnd_TE4_Red_Tracer_556x45_M249", - "CUP_200Rnd_TE4_Yellow_Tracer_556x45_M249", - "CUP_200Rnd_TE4_Green_Tracer_556x45_M249", - "CUP_200Rnd_TE1_Red_Tracer_556x45_M249", - "CUP_200Rnd_TE4_Green_Tracer_556x45_M249_Pouch", - "CUP_200Rnd_TE4_Red_Tracer_556x45_M249_Pouch", - "CUP_200Rnd_TE4_Yellow_Tracer_556x45_M249_Pouch", - "CUP_200Rnd_TE1_Red_Tracer_556x45_M249_Pouch", - "CUP_100Rnd_TE4_Green_Tracer_556x45_M249", - "CUP_100Rnd_TE4_Red_Tracer_556x45_M249", - "CUP_100Rnd_TE4_Yellow_Tracer_556x45_M249", - "CUP_200Rnd_TE4_Green_Tracer_556x45_L110A1", - "CUP_200Rnd_TE4_Red_Tracer_556x45_L110A1", - "CUP_200Rnd_TE4_Yellow_Tracer_556x45_L110A1" + magazines[] = {}; + }; + class GVAR(LAMG_black): GVAR(LAMG) { + author = "Potato"; + displayName = "KAC Light Assault Machine Gun (Black)"; + baseWeapon = QGVAR(LAMG_black); + picture = "\a3\Weapons_F_Enoch\Machineguns\M200\Data\UI\icon_LMG_Mk200_black_F_ca.paa"; + hiddenSelectionsTextures[] = { + "a3\Weapons_F_Enoch\Machineguns\M200\Data\1st_person_black_co.paa", + "a3\Weapons_F_Enoch\Machineguns\M200\Data\Body_black_co.paa", + "a3\Weapons_F_Enoch\Machineguns\M200\Data\grip_black_co.paa" }; }; -}; \ No newline at end of file +}; diff --git a/addons/miscFixes/fauxLAMG/config.cpp b/addons/miscFixes/fauxLAMG/config.cpp index a7aad5d1..e9d287a2 100644 --- a/addons/miscFixes/fauxLAMG/config.cpp +++ b/addons/miscFixes/fauxLAMG/config.cpp @@ -3,7 +3,7 @@ class CfgPatches { class ADDON { weapons[] = { - QGVAR(LAMG) + QGVAR(LAMG), QGVAR(LAMG_black) }; units[] = {}; requiredVersion = REQUIRED_VERSION; @@ -16,4 +16,4 @@ class CfgPatches { }; }; -#include "CfgWeapons.hpp" \ No newline at end of file +#include "CfgWeapons.hpp" From 31163bcfd0572f5af7f8040251bf3b7a5c783713 Mon Sep 17 00:00:00 2001 From: AChesheireCat Date: Fri, 25 Oct 2024 17:00:48 -0400 Subject: [PATCH 03/10] Adds default magazine for arsenal compat - Makes the CUP 100rnd TE4 magazines default for the weapon. --- addons/miscFixes/fauxLAMG/CfgWeapons.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/miscFixes/fauxLAMG/CfgWeapons.hpp b/addons/miscFixes/fauxLAMG/CfgWeapons.hpp index 394e2354..dc4dfaab 100644 --- a/addons/miscFixes/fauxLAMG/CfgWeapons.hpp +++ b/addons/miscFixes/fauxLAMG/CfgWeapons.hpp @@ -7,7 +7,7 @@ class CfgWeapons { baseWeapon = QGVAR(LAMG); recoil = "CUP_SAW_recoil"; magazineWell[] = {"CBA_556x45_MINIMI"}; - magazines[] = {}; + magazines[] = {"CUP_100Rnd_TE4_Red_Tracer_556x45_M249"}; }; class GVAR(LAMG_black): GVAR(LAMG) { author = "Potato"; From 32c12cee74ae1223bbcd76c093e445979f94cca3 Mon Sep 17 00:00:00 2001 From: lambdatiger Date: Wed, 6 Nov 2024 17:51:03 -0600 Subject: [PATCH 04/10] Added SDR sounds --- addons/miscFixes/fauxLAMG/CfgWeapons.hpp | 84 +++++++++++++++++++++++- 1 file changed, 83 insertions(+), 1 deletion(-) diff --git a/addons/miscFixes/fauxLAMG/CfgWeapons.hpp b/addons/miscFixes/fauxLAMG/CfgWeapons.hpp index dc4dfaab..12b80d70 100644 --- a/addons/miscFixes/fauxLAMG/CfgWeapons.hpp +++ b/addons/miscFixes/fauxLAMG/CfgWeapons.hpp @@ -1,6 +1,88 @@ +#define VOLUME_CLOSURE 0.501187 +#define VOLUME_SHOT 1 +#define VOLUME_TAIL 0.631 +#define VOLUME_TAIL_Interior 1 + +#define OVERRIDE_SOUND class BaseSoundModeType {\ + closure1[] = {"A3\Sounds_F\arsenal\weapons\Rifles\SDAR\closure_SDAR_01",VOLUME_CLOSURE,1,10};\ + closure2[] = {"A3\Sounds_F\arsenal\weapons\Rifles\SDAR\closure_SDAR_02",VOLUME_CLOSURE,1,10};\ + soundClosure[] = {"closure1",0.5,"closure2",0.5};\ +};\ +class StandardSound {\ + begin1[] = {"A3\Sounds_F\arsenal\weapons\Rifles\SDAR\SDAR_short_01",VOLUME_SHOT,1,1400};\ + begin2[] = {"A3\Sounds_F\arsenal\weapons\Rifles\SDAR\SDAR_short_02",VOLUME_SHOT,1,1400};\ + begin3[] = {"A3\Sounds_F\arsenal\weapons\Rifles\SDAR\SDAR_short_03",VOLUME_SHOT,1,1400};\ + closure1[] = {"A3\Sounds_F\arsenal\weapons\Rifles\SDAR\closure_SDAR_01",VOLUME_CLOSURE,1,10};\ + closure2[] = {"A3\Sounds_F\arsenal\weapons\Rifles\SDAR\closure_SDAR_02",VOLUME_CLOSURE,1,10};\ + soundBegin[] = {"begin1",0.33,"begin2",0.33,"begin3",0.34};\ + soundClosure[] = {"closure1",0.5,"closure2",0.5};\ + SoundSetShot[] = {"SDAR_Shot_SoundSet","SDAR_Tail_SoundSet","SDAR_InteriorTail_SoundSet"};\ + class SoundTails {\ + class TailForest {\ + frequency = 1;\ + sound[] = {"A3\Sounds_F\arsenal\weapons\Rifles\SDAR\SDAR_tail_forest",1,1,1400};\ + volume = "(1-interior/1.4)*forest";\ + };\ + class TailHouses {\ + frequency = 1;\ + sound[] = {"A3\Sounds_F\arsenal\weapons\Rifles\SDAR\SDAR_tail_houses",1,1,1400};\ + volume = "(1-interior/1.4)*houses";\ + };\ + class TailInterior {\ + frequency = 1;\ + sound[] = {"A3\Sounds_F\arsenal\weapons\Rifles\SDAR\SDAR_tail_interior",1.58489,1,1400};\ + volume = "interior";\ + };\ + class TailMeadows {\ + frequency = 1;\ + sound[] = {"A3\Sounds_F\arsenal\weapons\Rifles\SDAR\SDAR_tail_meadows",1,1,1400};\ + volume = "(1-interior/1.4)*(meadows/2 max sea/2)";\ + };\ + class TailTrees {\ + frequency = 1;\ + sound[] = {"A3\Sounds_F\arsenal\weapons\Rifles\SDAR\SDAR_tail_trees",1,1,1400};\ + volume = "(1-interior/1.4)*trees";\ + };\ + };\ +} + class CfgWeapons { - class LMG_Mk200_F; + class Rifle_Long_Base_F; + class LMG_Mk200_F: Rifle_Long_Base_F { + class ACE_Burst_far; + class close; + class far_optic1; + class far_optic2; + class manual; + class medium; + class short; + class Single; + }; class GVAR(LAMG): LMG_Mk200_F { + class ACE_Burst_far: ACE_Burst_far { + OVERRIDE_SOUND; + }; + class close: close { + OVERRIDE_SOUND; + }; + class far_optic1: far_optic1 { + OVERRIDE_SOUND; + }; + class far_optic2: far_optic2 { + OVERRIDE_SOUND; + }; + class manual: manual { + OVERRIDE_SOUND; + }; + class medium: medium { + OVERRIDE_SOUND; + }; + class short: short { + OVERRIDE_SOUND; + }; + class Single: Single { + OVERRIDE_SOUND; + }; author = "Potato"; displayName = "KAC Light Assault Machine Gun"; descriptionShort = "Light Machine Gun
Caliber: 5.56x45 mm"; From 995f46ad776ca761a4a455d1340a42964b2c9a7e Mon Sep 17 00:00:00 2001 From: AChesheireCat Date: Thu, 7 Nov 2024 17:11:13 -0500 Subject: [PATCH 05/10] Updated classnames to prep for rebasing Changed the classname from GVAR(LAMG) to a permanent "potato_lmg_LAMG" in order to prevent classname changes for when this gets rebased to the new customGear addon. --- addons/miscFixes/fauxLAMG/CfgWeapons.hpp | 4 ++-- addons/miscFixes/fauxLAMG/config.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/miscFixes/fauxLAMG/CfgWeapons.hpp b/addons/miscFixes/fauxLAMG/CfgWeapons.hpp index 12b80d70..6e8dab0a 100644 --- a/addons/miscFixes/fauxLAMG/CfgWeapons.hpp +++ b/addons/miscFixes/fauxLAMG/CfgWeapons.hpp @@ -58,7 +58,7 @@ class CfgWeapons { class short; class Single; }; - class GVAR(LAMG): LMG_Mk200_F { + class potato_lmg_LAMG: LMG_Mk200_F { class ACE_Burst_far: ACE_Burst_far { OVERRIDE_SOUND; }; @@ -91,7 +91,7 @@ class CfgWeapons { magazineWell[] = {"CBA_556x45_MINIMI"}; magazines[] = {"CUP_100Rnd_TE4_Red_Tracer_556x45_M249"}; }; - class GVAR(LAMG_black): GVAR(LAMG) { + class potato_lmg_LAMG_black: potato_lmg_LAMG { author = "Potato"; displayName = "KAC Light Assault Machine Gun (Black)"; baseWeapon = QGVAR(LAMG_black); diff --git a/addons/miscFixes/fauxLAMG/config.cpp b/addons/miscFixes/fauxLAMG/config.cpp index e9d287a2..a080775f 100644 --- a/addons/miscFixes/fauxLAMG/config.cpp +++ b/addons/miscFixes/fauxLAMG/config.cpp @@ -3,7 +3,8 @@ class CfgPatches { class ADDON { weapons[] = { - QGVAR(LAMG), QGVAR(LAMG_black) + "potato_lmg_LAMG", + "potato_lmg_LAMG_black" }; units[] = {}; requiredVersion = REQUIRED_VERSION; From 8ac4d568122513ca1d74783a7f06d7dbd1a10073 Mon Sep 17 00:00:00 2001 From: AChesheireCat Date: Tue, 12 Nov 2024 16:06:23 -0500 Subject: [PATCH 06/10] Adjusts VOLUME_TAIL to ease audio sharpness VOLUME_TAIL 0.631 -> 0.531 --- addons/miscFixes/fauxLAMG/CfgWeapons.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/miscFixes/fauxLAMG/CfgWeapons.hpp b/addons/miscFixes/fauxLAMG/CfgWeapons.hpp index 6e8dab0a..777d3336 100644 --- a/addons/miscFixes/fauxLAMG/CfgWeapons.hpp +++ b/addons/miscFixes/fauxLAMG/CfgWeapons.hpp @@ -1,6 +1,6 @@ #define VOLUME_CLOSURE 0.501187 #define VOLUME_SHOT 1 -#define VOLUME_TAIL 0.631 +#define VOLUME_TAIL 0.531 #define VOLUME_TAIL_Interior 1 #define OVERRIDE_SOUND class BaseSoundModeType {\ From 64d99ddca5e2b854523eea0c0a965936f1fa2aca Mon Sep 17 00:00:00 2001 From: AChesheireCat Date: Tue, 12 Nov 2024 17:24:52 -0500 Subject: [PATCH 07/10] Swap sounds to JSRS Swapped the sounds from the vanilla SDAR to the JSRS SDAR firing sound (sorry Lambda, I couldn't tweak it to something that I liked...) --- addons/miscFixes/fauxLAMG/CfgWeapons.hpp | 125 +++++++++++++---------- addons/miscFixes/fauxLAMG/config.cpp | 2 +- 2 files changed, 70 insertions(+), 57 deletions(-) diff --git a/addons/miscFixes/fauxLAMG/CfgWeapons.hpp b/addons/miscFixes/fauxLAMG/CfgWeapons.hpp index 777d3336..c836f601 100644 --- a/addons/miscFixes/fauxLAMG/CfgWeapons.hpp +++ b/addons/miscFixes/fauxLAMG/CfgWeapons.hpp @@ -1,51 +1,3 @@ -#define VOLUME_CLOSURE 0.501187 -#define VOLUME_SHOT 1 -#define VOLUME_TAIL 0.531 -#define VOLUME_TAIL_Interior 1 - -#define OVERRIDE_SOUND class BaseSoundModeType {\ - closure1[] = {"A3\Sounds_F\arsenal\weapons\Rifles\SDAR\closure_SDAR_01",VOLUME_CLOSURE,1,10};\ - closure2[] = {"A3\Sounds_F\arsenal\weapons\Rifles\SDAR\closure_SDAR_02",VOLUME_CLOSURE,1,10};\ - soundClosure[] = {"closure1",0.5,"closure2",0.5};\ -};\ -class StandardSound {\ - begin1[] = {"A3\Sounds_F\arsenal\weapons\Rifles\SDAR\SDAR_short_01",VOLUME_SHOT,1,1400};\ - begin2[] = {"A3\Sounds_F\arsenal\weapons\Rifles\SDAR\SDAR_short_02",VOLUME_SHOT,1,1400};\ - begin3[] = {"A3\Sounds_F\arsenal\weapons\Rifles\SDAR\SDAR_short_03",VOLUME_SHOT,1,1400};\ - closure1[] = {"A3\Sounds_F\arsenal\weapons\Rifles\SDAR\closure_SDAR_01",VOLUME_CLOSURE,1,10};\ - closure2[] = {"A3\Sounds_F\arsenal\weapons\Rifles\SDAR\closure_SDAR_02",VOLUME_CLOSURE,1,10};\ - soundBegin[] = {"begin1",0.33,"begin2",0.33,"begin3",0.34};\ - soundClosure[] = {"closure1",0.5,"closure2",0.5};\ - SoundSetShot[] = {"SDAR_Shot_SoundSet","SDAR_Tail_SoundSet","SDAR_InteriorTail_SoundSet"};\ - class SoundTails {\ - class TailForest {\ - frequency = 1;\ - sound[] = {"A3\Sounds_F\arsenal\weapons\Rifles\SDAR\SDAR_tail_forest",1,1,1400};\ - volume = "(1-interior/1.4)*forest";\ - };\ - class TailHouses {\ - frequency = 1;\ - sound[] = {"A3\Sounds_F\arsenal\weapons\Rifles\SDAR\SDAR_tail_houses",1,1,1400};\ - volume = "(1-interior/1.4)*houses";\ - };\ - class TailInterior {\ - frequency = 1;\ - sound[] = {"A3\Sounds_F\arsenal\weapons\Rifles\SDAR\SDAR_tail_interior",1.58489,1,1400};\ - volume = "interior";\ - };\ - class TailMeadows {\ - frequency = 1;\ - sound[] = {"A3\Sounds_F\arsenal\weapons\Rifles\SDAR\SDAR_tail_meadows",1,1,1400};\ - volume = "(1-interior/1.4)*(meadows/2 max sea/2)";\ - };\ - class TailTrees {\ - frequency = 1;\ - sound[] = {"A3\Sounds_F\arsenal\weapons\Rifles\SDAR\SDAR_tail_trees",1,1,1400};\ - volume = "(1-interior/1.4)*trees";\ - };\ - };\ -} - class CfgWeapons { class Rifle_Long_Base_F; class LMG_Mk200_F: Rifle_Long_Base_F { @@ -59,29 +11,90 @@ class CfgWeapons { class Single; }; class potato_lmg_LAMG: LMG_Mk200_F { + bullet1[] = {"\jsrs_soundmod_complete\JSRS_Soundmod_Soundfiles\weapons\shells\small\metal_1.ogg",2.0099,1,10}; + bullet2[] = {"\jsrs_soundmod_complete\JSRS_Soundmod_Soundfiles\weapons\shells\small\metal_2.ogg",2.0099,1,10}; + bullet3[] = {"\jsrs_soundmod_complete\JSRS_Soundmod_Soundfiles\weapons\shells\small\metal_3.ogg",2.0099,1,10}; + bullet4[] = {"\jsrs_soundmod_complete\JSRS_Soundmod_Soundfiles\weapons\shells\small\metal_4.ogg",2.0099,1,10}; + bullet5[] = {"\jsrs_soundmod_complete\JSRS_Soundmod_Soundfiles\weapons\shells\small\dirt_1.ogg",2.0099,1,10}; + bullet6[] = {"\jsrs_soundmod_complete\JSRS_Soundmod_Soundfiles\weapons\shells\small\dirt_2.ogg",2.0099,1,10}; + bullet7[] = {"\jsrs_soundmod_complete\JSRS_Soundmod_Soundfiles\weapons\shells\small\dirt_3.ogg",2.0099,1,10}; + bullet8[] = {"\jsrs_soundmod_complete\JSRS_Soundmod_Soundfiles\weapons\shells\small\dirt_4.ogg",2.0099,1,10}; + bullet9[] = {"\jsrs_soundmod_complete\JSRS_Soundmod_Soundfiles\weapons\shells\small\grass_1.ogg",2.0099,1,10}; + bullet10[] = {"\jsrs_soundmod_complete\JSRS_Soundmod_Soundfiles\weapons\shells\small\grass_2.ogg",2.0099,1,10}; + bullet11[] = {"\jsrs_soundmod_complete\JSRS_Soundmod_Soundfiles\weapons\shells\small\grass_3.ogg",2.0099,1,10}; + bullet12[] = {"\jsrs_soundmod_complete\JSRS_Soundmod_Soundfiles\weapons\shells\small\grass_4.ogg",2.0099,1,10}; + soundbullet[] = {"bullet1",0.08,"bullet2",0.084,"bullet3",0.084,"bullet4",0.084,"bullet5",0.093,"bullet6",0.093,"bullet7",0.074,"bullet8",0.074,"bullet9",0.084,"bullet10",0.085,"bullet11",0.083,"bullet12",0.083}; class ACE_Burst_far: ACE_Burst_far { - OVERRIDE_SOUND; + class BaseSoundModeType; + class StandardSound: BaseSoundModeType { + soundsetshot[] = {"jsrs_uwg_shot_soundset","jsrs_5x56mm_reverb_soundset"}; + }; + class SilencedSound: BaseSoundModeType { + soundsetshot[] = {"jsrs_uwg_shot_silenced_soundset","jsrs_5x56mm_sd_reverb_soundset"}; + }; }; class close: close { - OVERRIDE_SOUND; + class BaseSoundModeType; + class StandardSound: BaseSoundModeType { + soundsetshot[] = {"jsrs_uwg_shot_soundset","jsrs_5x56mm_reverb_soundset"}; + }; + class SilencedSound: BaseSoundModeType { + soundsetshot[] = {"jsrs_uwg_shot_silenced_soundset","jsrs_5x56mm_sd_reverb_soundset"}; + }; }; class far_optic1: far_optic1 { - OVERRIDE_SOUND; + class BaseSoundModeType; + class StandardSound: BaseSoundModeType { + soundsetshot[] = {"jsrs_uwg_shot_soundset","jsrs_5x56mm_reverb_soundset"}; + }; + class SilencedSound: BaseSoundModeType { + soundsetshot[] = {"jsrs_uwg_shot_silenced_soundset","jsrs_5x56mm_sd_reverb_soundset"}; + }; }; class far_optic2: far_optic2 { - OVERRIDE_SOUND; + class BaseSoundModeType; + class StandardSound: BaseSoundModeType { + soundsetshot[] = {"jsrs_uwg_shot_soundset","jsrs_5x56mm_reverb_soundset"}; + }; + class SilencedSound: BaseSoundModeType { + soundsetshot[] = {"jsrs_uwg_shot_silenced_soundset","jsrs_5x56mm_sd_reverb_soundset"}; + }; }; class manual: manual { - OVERRIDE_SOUND; + class BaseSoundModeType; + class StandardSound: BaseSoundModeType { + soundsetshot[] = {"jsrs_uwg_shot_soundset","jsrs_5x56mm_reverb_soundset"}; + }; + class SilencedSound: BaseSoundModeType { + soundsetshot[] = {"jsrs_uwg_shot_silenced_soundset","jsrs_5x56mm_sd_reverb_soundset"}; + }; }; class medium: medium { - OVERRIDE_SOUND; + class BaseSoundModeType; + class StandardSound: BaseSoundModeType { + soundsetshot[] = {"jsrs_uwg_shot_soundset","jsrs_5x56mm_reverb_soundset"}; + }; + class SilencedSound: BaseSoundModeType { + soundsetshot[] = {"jsrs_uwg_shot_silenced_soundset","jsrs_5x56mm_sd_reverb_soundset"}; + }; }; class short: short { - OVERRIDE_SOUND; + class BaseSoundModeType; + class StandardSound: BaseSoundModeType { + soundsetshot[] = {"jsrs_uwg_shot_soundset","jsrs_5x56mm_reverb_soundset"}; + }; + class SilencedSound: BaseSoundModeType { + soundsetshot[] = {"jsrs_uwg_shot_silenced_soundset","jsrs_5x56mm_sd_reverb_soundset"}; + }; }; class Single: Single { - OVERRIDE_SOUND; + class BaseSoundModeType; + class StandardSound: BaseSoundModeType { + soundsetshot[] = {"jsrs_uwg_shot_soundset","jsrs_5x56mm_reverb_soundset"}; + }; + class SilencedSound: BaseSoundModeType { + soundsetshot[] = {"jsrs_uwg_shot_silenced_soundset","jsrs_5x56mm_sd_reverb_soundset"}; + }; }; author = "Potato"; displayName = "KAC Light Assault Machine Gun"; diff --git a/addons/miscFixes/fauxLAMG/config.cpp b/addons/miscFixes/fauxLAMG/config.cpp index a080775f..fda66de4 100644 --- a/addons/miscFixes/fauxLAMG/config.cpp +++ b/addons/miscFixes/fauxLAMG/config.cpp @@ -8,7 +8,7 @@ class CfgPatches { }; units[] = {}; requiredVersion = REQUIRED_VERSION; - requiredAddons[] = {"potato_core", "CUP_Weapons_LoadOrder"}; + requiredAddons[] = { "potato_core", "CUP_Weapons_LoadOrder", "jsrs_soundmod_complete_edition", "jsrs_soundmod_complete_edition_soundFiles" }; skipWhenMissingDependencies = 1; author = "Potato"; authors[] = {"AChesheireCat"}; From 526683d7f8b5a8f64c85ed4a42fb871df536a614 Mon Sep 17 00:00:00 2001 From: AChesheireCat Date: Tue, 12 Nov 2024 22:13:48 -0500 Subject: [PATCH 08/10] Updated baseWeapon Following classname standardization --- addons/miscFixes/fauxLAMG/CfgWeapons.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/miscFixes/fauxLAMG/CfgWeapons.hpp b/addons/miscFixes/fauxLAMG/CfgWeapons.hpp index c836f601..59bc5339 100644 --- a/addons/miscFixes/fauxLAMG/CfgWeapons.hpp +++ b/addons/miscFixes/fauxLAMG/CfgWeapons.hpp @@ -99,7 +99,7 @@ class CfgWeapons { author = "Potato"; displayName = "KAC Light Assault Machine Gun"; descriptionShort = "Light Machine Gun
Caliber: 5.56x45 mm"; - baseWeapon = QGVAR(LAMG); + baseWeapon = "potato_lmg_LAMG"; recoil = "CUP_SAW_recoil"; magazineWell[] = {"CBA_556x45_MINIMI"}; magazines[] = {"CUP_100Rnd_TE4_Red_Tracer_556x45_M249"}; @@ -107,7 +107,7 @@ class CfgWeapons { class potato_lmg_LAMG_black: potato_lmg_LAMG { author = "Potato"; displayName = "KAC Light Assault Machine Gun (Black)"; - baseWeapon = QGVAR(LAMG_black); + baseWeapon = "potato_lmg_LAMG_black"; picture = "\a3\Weapons_F_Enoch\Machineguns\M200\Data\UI\icon_LMG_Mk200_black_F_ca.paa"; hiddenSelectionsTextures[] = { "a3\Weapons_F_Enoch\Machineguns\M200\Data\1st_person_black_co.paa", From 8b778b85025a95ef56ea836e05aca4e1abc0c55e Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Wed, 13 Nov 2024 16:54:44 -0600 Subject: [PATCH 09/10] refactor to customGear --- addons/customGear/CfgWeapons.hpp | 83 ------------------ addons/customGear/config.hpp | 5 +- addons/customGear/fauxC7/CfgWeapons.hpp | 84 +++++++++++++++++++ addons/customGear/fauxC7/config.cpp | 18 ++++ .../fauxLAMG/CfgWeapons.hpp | 0 .../fauxLAMG/config.cpp | 4 +- .../miscFixes/fauxLAMG/script_component.hpp | 12 --- 7 files changed, 107 insertions(+), 99 deletions(-) create mode 100644 addons/customGear/fauxC7/CfgWeapons.hpp create mode 100644 addons/customGear/fauxC7/config.cpp rename addons/{miscFixes => customGear}/fauxLAMG/CfgWeapons.hpp (100%) rename addons/{miscFixes => customGear}/fauxLAMG/config.cpp (83%) delete mode 100644 addons/miscFixes/fauxLAMG/script_component.hpp diff --git a/addons/customGear/CfgWeapons.hpp b/addons/customGear/CfgWeapons.hpp index 4434aad8..e04bee05 100644 --- a/addons/customGear/CfgWeapons.hpp +++ b/addons/customGear/CfgWeapons.hpp @@ -1,87 +1,4 @@ -class Mode_FullAuto; class CfgWeapons { - // Adds C7, C7GL, and C7A2, C7A2 - class CUP_arifle_M16A1E1; - class potato_fauxC7_c7: CUP_arifle_M16A1E1 { - author = "Potato"; - displayName = "C7"; - modes[] = {"Single","FullAuto","Burst_medium","single_medium_optics1","single_medium_optics2"}; - class FullAuto: Mode_FullAuto { - class BaseSoundModeType; - class StandardSound: BaseSoundModeType { - soundsetshot[] = {"jsrs_m16a4_shot_soundset","jsrs_5x56mm_reverb_soundset"}; - }; - class SilencedSound: BaseSoundModeType { - soundsetshot[] = {"jsrs_spar_shot_silenced_soundset","jsrs_5x56mm_sd_reverb_soundset"}; - }; - soundBurst = 0; - ffCount = 3; - dispersion = 0.0006; - reloadTime = 0.075; - minRange = 1; - minRangeProbab = 0.2; - midRange = 100; - midRangeProbab = 0.7; - maxRange = 300; - maxRangeProbab = 0.05; - }; - }; - class CUP_arifle_M16A1GL; - class potato_fauxC7_c7GL: CUP_arifle_M16A1GL { - author = "Potato"; - displayName = "C7 M203"; - }; - class CUP_arifle_M16A4_Base; - class potato_fauxC7_c7a2: CUP_arifle_M16A4_Base { - author = "Potato"; - displayName = "C7A2"; - modes[] = {"Single","FullAuto","Burst_medium","single_medium_optics1","single_medium_optics2"}; - class FullAuto: Mode_FullAuto { - class BaseSoundModeType; - class StandardSound: BaseSoundModeType { - soundsetshot[] = {"jsrs_m16a4_shot_soundset","jsrs_5x56mm_reverb_soundset"}; - }; - class SilencedSound: BaseSoundModeType { - soundsetshot[] = {"jsrs_spar_shot_silenced_soundset","jsrs_5x56mm_sd_reverb_soundset"}; - }; - soundBurst = 0; - ffCount = 3; - dispersion = 0.0006; - reloadTime = 0.075; - minRange = 1; - minRangeProbab = 0.2; - midRange = 100; - midRangeProbab = 0.7; - maxRange = 300; - maxRangeProbab = 0.05; - }; - }; - class CUP_arifle_M16A4_GL; - class potato_fauxC7_c7a2GL: CUP_arifle_M16A4_GL { - author = "Potato"; - displayName = "C7A2 M203"; - modes[] = {"Single","FullAuto","Burst_medium","single_medium_optics1","single_medium_optics2"}; - class FullAuto: Mode_FullAuto { - class BaseSoundModeType; - class StandardSound: BaseSoundModeType { - soundsetshot[] = {"jsrs_m16a4_shot_soundset","jsrs_5x56mm_reverb_soundset"}; - }; - class SilencedSound: BaseSoundModeType { - soundsetshot[] = {"jsrs_spar_shot_silenced_soundset","jsrs_5x56mm_sd_reverb_soundset"}; - }; - soundBurst = 0; - ffCount = 3; - dispersion = 0.0006; - reloadTime = 0.075; - minRange = 1; - minRangeProbab = 0.2; - midRange = 100; - midRangeProbab = 0.7; - maxRange = 300; - maxRangeProbab = 0.05; - }; - }; - // Adds MG5 in 7.62x51mm class MMG_01_tan_F; class potato_fauxMG5_MG5: MMG_01_tan_F { diff --git a/addons/customGear/config.hpp b/addons/customGear/config.hpp index f4395501..2cdd313d 100644 --- a/addons/customGear/config.hpp +++ b/addons/customGear/config.hpp @@ -3,15 +3,14 @@ class CfgPatches { class ADDON { units[] = {}; - weapons[] = { "potato_fauxC7_c7", "potato_fauxC7_c7GL", "potato_fauxC7_c7a2", "potato_fauxC7_c7a2GL", "potato_fauxMG5_MG5" }; - magazines[] = {}; + weapons[] = { "potato_fauxMG5_MG5" }; requiredVersion = REQUIRED_VERSION; requiredAddons[] = { "potato_core" }; author = "Potato"; - authors[] = {"PabstMirror", "AACO"}; authorUrl = "https://github.com/BourbonWarfare/POTATO"; VERSION_CONFIG; }; }; +#include "CfgWeapons.hpp" #include "CfgVehicles.hpp" \ No newline at end of file diff --git a/addons/customGear/fauxC7/CfgWeapons.hpp b/addons/customGear/fauxC7/CfgWeapons.hpp new file mode 100644 index 00000000..92d1ae82 --- /dev/null +++ b/addons/customGear/fauxC7/CfgWeapons.hpp @@ -0,0 +1,84 @@ +class Mode_FullAuto; +class CfgWeapons { + // Adds C7, C7GL, and C7A2, C7A2 + class CUP_arifle_M16A1E1; + class potato_fauxC7_c7: CUP_arifle_M16A1E1 { + author = "Potato"; + displayName = "C7"; + modes[] = {"Single","FullAuto","Burst_medium","single_medium_optics1","single_medium_optics2"}; + class FullAuto: Mode_FullAuto { + class BaseSoundModeType; + class StandardSound: BaseSoundModeType { + soundsetshot[] = {"jsrs_m16a4_shot_soundset","jsrs_5x56mm_reverb_soundset"}; + }; + class SilencedSound: BaseSoundModeType { + soundsetshot[] = {"jsrs_spar_shot_silenced_soundset","jsrs_5x56mm_sd_reverb_soundset"}; + }; + soundBurst = 0; + ffCount = 3; + dispersion = 0.0006; + reloadTime = 0.075; + minRange = 1; + minRangeProbab = 0.2; + midRange = 100; + midRangeProbab = 0.7; + maxRange = 300; + maxRangeProbab = 0.05; + }; + }; + class CUP_arifle_M16A1GL; + class potato_fauxC7_c7GL: CUP_arifle_M16A1GL { + author = "Potato"; + displayName = "C7 M203"; + }; + class CUP_arifle_M16A4_Base; + class potato_fauxC7_c7a2: CUP_arifle_M16A4_Base { + author = "Potato"; + displayName = "C7A2"; + modes[] = {"Single","FullAuto","Burst_medium","single_medium_optics1","single_medium_optics2"}; + class FullAuto: Mode_FullAuto { + class BaseSoundModeType; + class StandardSound: BaseSoundModeType { + soundsetshot[] = {"jsrs_m16a4_shot_soundset","jsrs_5x56mm_reverb_soundset"}; + }; + class SilencedSound: BaseSoundModeType { + soundsetshot[] = {"jsrs_spar_shot_silenced_soundset","jsrs_5x56mm_sd_reverb_soundset"}; + }; + soundBurst = 0; + ffCount = 3; + dispersion = 0.0006; + reloadTime = 0.075; + minRange = 1; + minRangeProbab = 0.2; + midRange = 100; + midRangeProbab = 0.7; + maxRange = 300; + maxRangeProbab = 0.05; + }; + }; + class CUP_arifle_M16A4_GL; + class potato_fauxC7_c7a2GL: CUP_arifle_M16A4_GL { + author = "Potato"; + displayName = "C7A2 M203"; + modes[] = {"Single","FullAuto","Burst_medium","single_medium_optics1","single_medium_optics2"}; + class FullAuto: Mode_FullAuto { + class BaseSoundModeType; + class StandardSound: BaseSoundModeType { + soundsetshot[] = {"jsrs_m16a4_shot_soundset","jsrs_5x56mm_reverb_soundset"}; + }; + class SilencedSound: BaseSoundModeType { + soundsetshot[] = {"jsrs_spar_shot_silenced_soundset","jsrs_5x56mm_sd_reverb_soundset"}; + }; + soundBurst = 0; + ffCount = 3; + dispersion = 0.0006; + reloadTime = 0.075; + minRange = 1; + minRangeProbab = 0.2; + midRange = 100; + midRangeProbab = 0.7; + maxRange = 300; + maxRangeProbab = 0.05; + }; + }; +}; diff --git a/addons/customGear/fauxC7/config.cpp b/addons/customGear/fauxC7/config.cpp new file mode 100644 index 00000000..35a68ce7 --- /dev/null +++ b/addons/customGear/fauxC7/config.cpp @@ -0,0 +1,18 @@ +#include "\z\potato\addons\customGear\script_component.hpp" +#undef COMPONENT +#define COMPONENT customGear_fauxC7 + + +class CfgPatches { + class ADDON { + weapons[] = { "potato_fauxC7_c7", "potato_fauxC7_c7GL", "potato_fauxC7_c7a2", "potato_fauxC7_c7a2GL" }; + units[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {"potato_core", "CUP_Weapons_LoadOrder", "jsrs_soundmod_cup_weapons"}; + skipWhenMissingDependencies = 1; + author = "Potato"; + authors[] = {"AChesheireCat"}; + authorUrl = "https://github.com/BourbonWarfare/POTATO"; + VERSION_CONFIG; + }; +}; diff --git a/addons/miscFixes/fauxLAMG/CfgWeapons.hpp b/addons/customGear/fauxLAMG/CfgWeapons.hpp similarity index 100% rename from addons/miscFixes/fauxLAMG/CfgWeapons.hpp rename to addons/customGear/fauxLAMG/CfgWeapons.hpp diff --git a/addons/miscFixes/fauxLAMG/config.cpp b/addons/customGear/fauxLAMG/config.cpp similarity index 83% rename from addons/miscFixes/fauxLAMG/config.cpp rename to addons/customGear/fauxLAMG/config.cpp index fda66de4..bf7b7fda 100644 --- a/addons/miscFixes/fauxLAMG/config.cpp +++ b/addons/customGear/fauxLAMG/config.cpp @@ -1,4 +1,6 @@ -#include "script_component.hpp" +#include "\z\potato\addons\customGear\script_component.hpp" +#undef COMPONENT +#define COMPONENT customGear_fauxLAMG class CfgPatches { class ADDON { diff --git a/addons/miscFixes/fauxLAMG/script_component.hpp b/addons/miscFixes/fauxLAMG/script_component.hpp deleted file mode 100644 index d83aae48..00000000 --- a/addons/miscFixes/fauxLAMG/script_component.hpp +++ /dev/null @@ -1,12 +0,0 @@ -#define COMPONENT fauxLAMG -#include "\z\potato\addons\core\script_mod.hpp" - -// #define DEBUG_MODE_FULL -// #define DISABLE_COMPILE_CACHE -// #define ENABLE_PERFORMANCE_COUNTERS - -#ifdef DEBUG_ENABLED_FAUXLAMG - #define DEBUG_MODE_FULL -#endif - -#include "\z\potato\addons\core\script_macros.hpp" \ No newline at end of file From fc275ca5efc49ab2517bfc036da0b928fcd7da59 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Wed, 13 Nov 2024 16:56:02 -0600 Subject: [PATCH 10/10] Update config.cpp --- addons/customGear/fauxC7/config.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/customGear/fauxC7/config.cpp b/addons/customGear/fauxC7/config.cpp index 35a68ce7..98fb02f8 100644 --- a/addons/customGear/fauxC7/config.cpp +++ b/addons/customGear/fauxC7/config.cpp @@ -16,3 +16,5 @@ class CfgPatches { VERSION_CONFIG; }; }; + +#include "CfgWeapons.hpp"