Weapon highlights + Weapon flesh pull

src/MadnessInteractiveReloaded/Assets/Sounds.cs

@@ -49,6 +49,7 @@ public static class Sounds
     /// Bad thing happened noise
     /// </summary>
     public static readonly Sound UiBad = new(Assets.Load<FixedAudioData>("sounds/ui/bad.wav").Value, spatialParams: null, track: AudioTracks.UserInterface);
+    public static readonly Sound FleshPull = new(Assets.Load<FixedAudioData>("sounds/fleshpull.wav").Value, spatialParams: null, track: AudioTracks.SoundEffects);
 
     public static readonly Sound DeathMusic = new(Assets.Load<StreamAudioData>("sounds/music/death.ogg").Value, false, spatialParams: null, track: AudioTracks.Music);
 

src/MadnessInteractiveReloaded/Character/Components/CharacterComponent.cs

@@ -334,6 +334,18 @@ public bool EquipWeapon(Scene scene, WeaponComponent weapon)
             scene.DetachComponent<ThrowableProjectileComponent>(weapon.Entity);
 
         weapon.IsAttachedToWall = false;
+        if (weapon.StuckInsideParams != null) // blood splat and sound if we are pulling a weapon from a body
+        {
+            if(scene.TryGetComponentFrom<BodyPartComponent>(weapon.StuckInsideParams.Value.Entity, out var bodypart))
+            {
+                TransformComponent transform = scene.GetComponentFrom<TransformComponent>(weapon.Entity);
+                Color bloodColor = bodypart.Character.Get(scene).Look.BloodColour;
+                Vector2 midPoint = Vector2.Lerp(transform.Position, scene.GetComponentFrom<TransformComponent>(weapon.StuckInsideParams.Value.Entity).Position, 0.5f);
+                Prefabs.CreateBloodSpurt(scene, midPoint, Utilities.RandomFloat(0, 360), bloodColor, 0.7f);
+                Prefabs.CreateBloodSplat(scene, midPoint, Utilities.RandomFloat(0, 360), bloodColor, Utilities.RandomFloat(150, 250));
+                scene.Game.AudioRenderer.PlayOnce(Sounds.FleshPull);
+            }
+        }
         weapon.StuckInsideParams = null;
         weapon.Wielder = new ComponentRef<CharacterComponent>(Entity);
         weapon.Timer = float.MaxValue;

src/MadnessInteractiveReloaded/Character/Systems/PlayerCharacterSystem.cs

@@ -131,6 +131,10 @@ public override void Update()
                     //     nearestWeapon.Stats.Name, 0.4f);
                 }
             }
+            else
+            {
+                player.LastWeaponHoveredOver = null;
+            }
 
             if (Input.IsKeyHeld(Key.LeftControl) && MathF.Abs(Input.MouseScrollDelta) > float.Epsilon)
             {

src/MadnessInteractiveReloaded/Shared/Settings.cs

@@ -41,6 +41,7 @@ public class GeneralSettings
     {
         public string Language = "en-GB";
         public float Screenshake = 1;
+        public bool WeaponHighlights = true;
     }
 
     public class VideoSettings

src/MadnessInteractiveReloaded/User interface/Systems/PlayerUISystem.cs

@@ -149,7 +149,7 @@ public override void Render()
                     break;
                 default:
                     break;
-            }
+            }        
         }
 
         //DrawLine(Textures.UserInterface.HatCategoryIcon.Value, weaponStr, ref c);
@@ -191,6 +191,28 @@ public override void Render()
             }
 
         }
+
+        // weapon highlights
+        // check if the highlights setting is on, if there is a weapon entity we are hovering over and if the weapon entity has a weapon component attached to it
+        if (UserData.Instances.Settings.General.WeaponHighlights && player.LastWeaponHoveredOver != null && Scene.TryGetComponentFrom(player.LastWeaponHoveredOver.Value, out WeaponComponent? nearestWeapon) && nearestWeapon != null)
+        {
+            Draw.ScreenSpace = false;
+            //TODO: when melee durability is added, edit this line to account for it
+            float normAmt = nearestWeapon.Data.WeaponType == WeaponType.Firearm ? (float)nearestWeapon.RemainingRounds / (float)nearestWeapon.Data.RoundsPerMagazine : 1f;
+            Draw.Colour = nearestWeapon.InfiniteAmmo ? Color.FromHsv(Time, 0.2f, 1) : Utilities.Lerp(Colors.Red, Colors.White, normAmt);
+            Draw.Colour.A = 0.75f;
+            Draw.Order = RenderOrders.Effects;
+            Draw.Material = Materials.BlackToWhiteOutline;
+            var tr = Scene.GetComponentFrom<TransformComponent>(player.LastWeaponHoveredOver.Value);
+            if (nearestWeapon.Texture != null)
+            {
+                Texture tex = nearestWeapon.Texture;
+                Draw.Texture = tex;
+                Draw.TransformMatrix = tr.LocalToWorldMatrix;
+
+                Draw.Quad(new Rect(Vector2.Zero, new Vector2(tex.Width, tex.Height)), 0f);
+            }
+        }
     }
 
     private static void DrawCounter(Vector2 p, int c, int max, HorizontalTextAlign alignment = HorizontalTextAlign.Left)

src/MadnessInteractiveReloaded/User interface/Systems/SettingsSceneSystem.cs

@@ -54,6 +54,11 @@ static SettingsSceneSystem()
                     Ui.Layout.FitContainer(1,1,false);
                      if (Ui.FloatSlider(ref settings.General.Screenshake, Direction.Horizontal, (0,2), 0.1f, "{0:P0}"))
                         settings.Apply();
+                }),
+                ("settings-weapon-highlights", () => {
+                    Ui.Layout.FitContainer(1, 1, false).AspectRatio(1, AspectRatioBehaviour.Shrink);
+                    if (Controls.Toggle.Start(ref settings.General.WeaponHighlights))
+                        settings.Apply();
                 })
             ]},
 

src/MadnessInteractiveReloaded/base/locale/en-GB.json

@@ -29,6 +29,7 @@
     "settings-sfx-volume": "Sound effects",
     "settings-ui-volume": "User interface",
     "settings-screenshake": "Screenshake",
+    "settings-weapon-highlights": "Highlight hovered weapon",
 
     "improbability-no-ability": "This disk grants no special abilities.",
     "disk-unlocked": "IMPROBABILITY DISK UNLOCKED",