HLC_WP_FAL

========== - Initial changes for proof-of-concept implementation of sound-rework
toadie2k · Nov 27, 2019 · daa7a73 · daa7a73
1 parent eb95275
commit daa7a73
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 17 deletions.
diff --git a/hlc_WP_FAL/cfgSoundshaders.hpp b/hlc_WP_FAL/cfgSoundshaders.hpp
@@ -8,17 +8,19 @@ class CfgSoundShaders
 		samples[] = {
 			{ "hlc_WP_FAL\snd\soundshaders\generic\fal_first", 1 } };
         range = 25;
-        volume = 0.87;
+        volume = 0.375;
         rangeCurve[] = {
 			{ 0, 1 },
 			{ 25, 0 } };
 	};
 	class FAL_closeShot_SoundShader
 	{
-		samples[] = {
-			{ "hlc_WP_FAL\snd\soundshaders\FAL\FAL_close", 1 }
-		};
-		volume = 0.7;
+        samples[] = {
+            { "hlc_core\sound\weapon\FNFAL\Close_1", 1 },
+            { "hlc_core\sound\weapon\FNFAL\Close_2", 1 },
+            { "hlc_core\sound\weapon\FNFAL\Close_3", 1 },
+            { "hlc_core\sound\weapon\FNFAL\Close_4", 1 } };
+        volume = 1.4;
 		range = 100;
 		rangeCurve = "closeShotCurve";
 	};
@@ -263,10 +265,12 @@ class CfgSoundShaders
 	};
 	class FAL2_closeShot_SoundShader
 	{
-		samples[] = {
-			{ "hlc_WP_FAL\snd\soundshaders\FAL\FAL2_close", 1 }
-		};
-		volume = 0.7;
+        samples[] = {
+            { "hlc_core\sound\weapon\FNFAL\Close_1", 1 },
+            { "hlc_core\sound\weapon\FNFAL\Close_2", 1 },
+            { "hlc_core\sound\weapon\FNFAL\Close_3", 1 },
+            { "hlc_core\sound\weapon\FNFAL\Close_4", 1 } };
+        volume = 1.4;
 		range = 100;
 		rangeCurve = "closeShotCurve";
 	};
@@ -435,10 +439,12 @@ class CfgSoundShaders
     };
 	class OSW_closeShot_SoundShader
 	{
-		samples[] = {
-			{ "hlc_WP_FAL\snd\soundshaders\OSW\OSW_close", 1 }
-		};
-		volume = 0.65;
+        samples[] = {
+            { "hlc_core\sound\weapon\FNFAL\Close_1", 1 },
+            { "hlc_core\sound\weapon\FNFAL\Close_2", 1 },
+            { "hlc_core\sound\weapon\FNFAL\Close_3", 1 },
+            { "hlc_core\sound\weapon\FNFAL\Close_4", 1 } };
+        volume = 1.4;
 		range = 100;
 		rangeCurve = "closeShotCurve";
 	};

diff --git a/hlc_WP_FAL/config.cpp b/hlc_WP_FAL/config.cpp
@@ -498,11 +498,20 @@ class CfgWeapons {
 
     class UGL_F;
     class hlc_rifle_osw_GL : hlc_rifle_falosw {
-        class WeaponSlotsInfo : WeaponSlotsInfo {
+        class WeaponSlotsInfo  {
             mass = 130; 
-            class UnderBarrelSlot {};
-            class GripodSlot {};
-            class Charmslot : nia_charms_slot {};
+            class MuzzleSlot : asdg_MuzzleSlot_762 {
+                iconPosition[] = { 0.0, 0.45 };
+                iconScale = 0.2;
+            };
+            class CowsSlot : asdg_OpticRail1913 {
+                iconPosition[] = { 0.5, 0.35 };
+                iconScale = 0.2;
+            };
+            class PointerSlot : asdg_FrontSideRail {
+                iconPosition[] = { 0.2, 0.45 };
+                iconScale = 0.25;
+            };
         };
 		inertia = 0.77;
         __DEXTERITY(4.8 + 1.36, 0);

diff --git a/hlc_WP_FAL/mesh/SLR/l1A1_1.p3d b/hlc_WP_FAL/mesh/SLR/l1A1_1.p3d
diff --git a/hlc_WP_FAL/snd/soundshaders/OSW/OSW_Mid.wss b/hlc_WP_FAL/snd/soundshaders/OSW/OSW_Mid.wss
diff --git a/hlc_WP_FAL/snd/soundshaders/fal/FAL2_Mid.wss b/hlc_WP_FAL/snd/soundshaders/fal/FAL2_Mid.wss
diff --git a/hlc_WP_FAL/snd/soundshaders/fal/FAL_Mid.wss b/hlc_WP_FAL/snd/soundshaders/fal/FAL_Mid.wss
diff --git a/hlc_WP_FAL/snd/soundshaders/generic/fal_first.wss b/hlc_WP_FAL/snd/soundshaders/generic/fal_first.wss