Unstable 0.1500.6.0 (1984 edition)

Barotrauma/BarotraumaClient/ClientSource/Characters/Animation/Ragdoll.cs

@@ -284,7 +284,7 @@ namespace Barotrauma
             limb.LastImpactSoundTime = (float)Timing.TotalTime;
             if (!string.IsNullOrWhiteSpace(limb.HitSoundTag))
             {
-                bool inWater = limb.inWater;
+                bool inWater = limb.InWater;
                 if (character.CurrentHull != null &&
                     character.CurrentHull.Surface > character.CurrentHull.Rect.Y - character.CurrentHull.Rect.Height + 5.0f &&
                     limb.SimPosition.Y < ConvertUnits.ToSimUnits(character.CurrentHull.Rect.Y - character.CurrentHull.Rect.Height) + limb.body.GetMaxExtent())
@@ -348,16 +348,27 @@ namespace Barotrauma
             float increment = 0.001f;
             foreach (Character otherCharacter in Character.CharacterList)
             {
-                if (otherCharacter == character) continue;
+                if (otherCharacter == character) { continue; }
                 startDepth += increment;
             }
-            //make sure each limb has a distinct depth value 
-            List<Limb> depthSortedLimbs = Limbs.OrderBy(l => l.ActiveSprite == null ? 0.0f : l.ActiveSprite.Depth).ToList();
+            //make sure each limb has a distinct depth value
+            List<Limb> depthSortedLimbs = Limbs.OrderBy(l => l.DefaultSpriteDepth).ToList();
             foreach (Limb limb in Limbs)
             {
-                if (limb.ActiveSprite != null)
-                    limb.ActiveSprite.Depth = startDepth + depthSortedLimbs.IndexOf(limb) * 0.00001f;
+                if (limb.ActiveSprite == null) { continue; }
+                limb.ActiveSprite.Depth = startDepth + depthSortedLimbs.IndexOf(limb) * 0.00001f;
             }
+            foreach (Limb limb in Limbs)
+            {
+                if (limb.ActiveSprite == null) { continue; }
+                if (limb.Params.InheritLimbDepth == LimbType.None) { continue; }
+                var matchingLimb = GetLimb(limb.Params.InheritLimbDepth);
+                if (matchingLimb != null)
+                {
+                    limb.ActiveSprite.Depth = matchingLimb.ActiveSprite.Depth - 0.0000001f;
+                }
+            }
+
             depthSortedLimbs.Reverse();
             inversedLimbDrawOrder = depthSortedLimbs.ToArray();
         }
@@ -567,6 +578,11 @@ namespace Barotrauma
                 pos = ConvertUnits.ToDisplayUnits(humanoid.LeftHandIKPos);
                 if (humanoid.character.Submarine != null) { pos += humanoid.character.Submarine.Position; }
                 GUI.DrawRectangle(spriteBatch, new Rectangle((int)pos.X, (int)-pos.Y, 4, 4), GUI.Style.Green, true);
+
+                Vector2 aimPos = humanoid.AimSourceWorldPos;
+                aimPos.Y = -aimPos.Y;
+                GUI.DrawLine(spriteBatch, aimPos - Vector2.UnitY * 3, aimPos + Vector2.UnitY * 3, Color.Red);
+                GUI.DrawLine(spriteBatch, aimPos - Vector2.UnitX * 3, aimPos + Vector2.UnitX * 3, Color.Red);
             }
 
             if (character.MemState.Count > 1)

Barotrauma/BarotraumaClient/ClientSource/Characters/Character.cs

@@ -405,7 +405,7 @@ namespace Barotrauma
 
                 if (GameMain.NetworkMember.RespawnManager?.UseRespawnPrompt ?? false)
                 {
-                    CoroutineManager.InvokeAfter(() =>
+                    CoroutineManager.Invoke(() =>
                     {
                         if (controlled != null || (!(GameMain.GameSession?.IsRunning ?? false))) { return; }
                         var respawnPrompt = new GUIMessageBox(
@@ -1052,8 +1052,18 @@ namespace Barotrauma
                     Position + Vector2.UnitY * 150.0f,
                     Vector2.UnitY * 10.0f,
                     playSound: true,
-                    subId: Submarine?.ID ?? -1);;
+                    subId: Submarine?.ID ?? -1);
             }
         }
+
+        partial void OnTalentGiven(string talentIdentifier)
+        {
+            GUI.AddMessage(TextManager.Get("talentname." + talentIdentifier.ToString()),
+                GUI.Style.Yellow,
+                Position + Vector2.UnitY * 150.0f,
+                Vector2.UnitY * 10.0f,
+                playSound: true,
+                subId: Submarine?.ID ?? -1);
+        }
     }
 }

Barotrauma/BarotraumaClient/ClientSource/Characters/CharacterInfo.cs

@@ -680,7 +680,7 @@ namespace Barotrauma
                 createAttachmentSlider(info.MoustacheIndex, WearableType.Moustache);
                 createAttachmentSlider(info.FaceAttachmentIndex, WearableType.FaceAttachment);
 
-                void createColorSelector(string labelTag, IEnumerable<Color> options, Func<Color> getter,
+                void createColorSelector(string labelTag, IEnumerable<(Color Color, float Commonness)> options, Func<Color> getter,
                     Action<Color> setter)
                 {
                     var selectorItemRT = createItemRectTransform(labelTag, 0.4f);
@@ -714,7 +714,7 @@ namespace Barotrauma
                                     dropdown.ListBox.Content.RectTransform),
                                 style: "ListBoxElement")
                             {
-                                UserData = option,
+                                UserData = option.Color,
                                 CanBeFocused = true
                             };
                         var colorElement =
@@ -723,9 +723,9 @@ namespace Barotrauma
                                     scaleBasis: ScaleBasis.Smallest),
                                 style: null)
                             {
-                                Color = option,
-                                HoverColor = option,
-                                OutlineColor = Color.Lerp(Color.Black, option, 0.5f),
+                                Color = option.Color,
+                                HoverColor = option.Color,
+                                OutlineColor = Color.Lerp(Color.Black, option.Color, 0.5f),
                                 CanBeFocused = false
                             };
                     }
@@ -784,19 +784,9 @@ namespace Barotrauma
                 {
                     OnClicked = (button, o) =>
                     {
-                        var headPreset = info.Heads.Keys.GetRandom(Rand.RandSync.Unsynced);
-                        info.Head.gender = headPreset.Gender;
-                        info.Head.race = headPreset.Race;
-                        info.Head.HeadSpriteId = headPreset.ID;
-
-                        info.Head.HairIndex = Rand.Int(countAttachmentsOfType(WearableType.Hair), Rand.RandSync.Unsynced);
-                        info.Head.BeardIndex = Rand.Int(countAttachmentsOfType(WearableType.Beard), Rand.RandSync.Unsynced);
-                        info.Head.MoustacheIndex = Rand.Int(countAttachmentsOfType(WearableType.Moustache), Rand.RandSync.Unsynced);
-                        info.Head.FaceAttachmentIndex = Rand.Int(countAttachmentsOfType(WearableType.FaceAttachment), Rand.RandSync.Unsynced);
-
-                        info.Head.HairColor = info.HairColors.GetRandom(Rand.RandSync.Unsynced);
-                        info.Head.FacialHairColor = info.FacialHairColors.GetRandom(Rand.RandSync.Unsynced);
-                        info.Head.SkinColor = info.SkinColors.GetRandom(Rand.RandSync.Unsynced);
+                        info.Head = new HeadInfo();
+                        info.SetGenderAndRace(Rand.RandSync.Unsynced);
+                        info.SetColors();
                         
                         RecreateFrameContents();
                         info.RefreshHead();

Barotrauma/BarotraumaClient/ClientSource/Characters/Health/CharacterHealth.cs

@@ -998,10 +998,14 @@ namespace Barotrauma
             if (Character.Controlled?.SelectedCharacter == null && openHealthWindow == null)
             {
                 List<(Affliction affliction, string text)> statusIcons = new List<(Affliction affliction, string text)>();
-                if (Character.CurrentHull == null || Character.CurrentHull.LethalPressure > 5.0f)
+                if (Character.InPressure)
+                {
                     statusIcons.Add((pressureAffliction, TextManager.Get("PressureHUDWarning")));
+                }
                 if (Character.CurrentHull != null && Character.OxygenAvailable < LowOxygenThreshold && oxygenLowAffliction.Strength < oxygenLowAffliction.Prefab.ShowIconThreshold)
+                {
                     statusIcons.Add((oxygenLowAffliction, TextManager.Get("OxygenHUDWarning")));
+                }
                 
                 foreach (Affliction affliction in currentDisplayedAfflictions)
                 {

Barotrauma/BarotraumaClient/ClientSource/Characters/Limb.cs

@@ -109,6 +109,7 @@ namespace Barotrauma
         private float wetTimer;
         private float dripParticleTimer;
         private float deadTimer;
+        private Color? randomColor;
 
         /// <summary>
         /// Note that different limbs can share the same deformations.
@@ -166,6 +167,8 @@ namespace Barotrauma
             }
         }
 
+        public float DefaultSpriteDepth { get; private set; }
+
         public WearableSprite HuskSprite { get; private set; }
         public WearableSprite HerpesSprite { get; private set; }
 
@@ -309,12 +312,23 @@ namespace Barotrauma
                         Deformations.AddRange(deformations);
                         NonConditionalDeformations.AddRange(deformations);
                         break;
+                    case "randomcolor":
+                        randomColor = subElement.GetAttributeColorArray("colors", null)?.GetRandom();
+                        if (randomColor.HasValue)
+                        {
+                            Params.GetSprite().Color = randomColor.Value;
+                        }
+                        break;
                     case "lightsource":
                         LightSource = new LightSource(subElement, GetConditionalTarget())
                         {
                             ParentBody = body,
                             SpriteScale = Vector2.One * Scale * TextureScale
                         };
+                        if (randomColor.HasValue)
+                        {
+                            LightSource.Color = new Color(randomColor.Value.R, randomColor.Value.G, randomColor.Value.B, LightSource.Color.A);
+                        }
                         InitialLightSourceColor = LightSource.Color;
                         InitialLightSpriteAlpha = LightSource.OverrideLightSpriteAlpha;
                         break;
@@ -383,6 +397,7 @@ namespace Barotrauma
                     return deformations;
                 }
             }
+            DefaultSpriteDepth = ActiveSprite.Depth;
             LightSource?.CheckConditionals();
         }
 
@@ -571,8 +586,8 @@ namespace Barotrauma
             {
                 foreach (ParticleEmitter emitter in character.DamageEmitters)
                 {
-                    if (inWater && emitter.Prefab.ParticlePrefab.DrawTarget == ParticlePrefab.DrawTargetType.Air) { continue; }
-                    if (!inWater && emitter.Prefab.ParticlePrefab.DrawTarget == ParticlePrefab.DrawTargetType.Water) { continue; }
+                    if (InWater && emitter.Prefab.ParticlePrefab.DrawTarget == ParticlePrefab.DrawTargetType.Air) { continue; }
+                    if (!InWater && emitter.Prefab.ParticlePrefab.DrawTarget == ParticlePrefab.DrawTargetType.Water) { continue; }
                     ParticlePrefab overrideParticle = null;
                     foreach (DamageModifier damageModifier in result.AppliedDamageModifiers)
                     {
@@ -593,8 +608,8 @@ namespace Barotrauma
 
                 foreach (ParticleEmitter emitter in character.BloodEmitters)
                 {
-                    if (inWater && emitter.Prefab.ParticlePrefab.DrawTarget == ParticlePrefab.DrawTargetType.Air) { continue; }
-                    if (!inWater && emitter.Prefab.ParticlePrefab.DrawTarget == ParticlePrefab.DrawTargetType.Water) { continue; }
+                    if (InWater && emitter.Prefab.ParticlePrefab.DrawTarget == ParticlePrefab.DrawTargetType.Air) { continue; }
+                    if (!InWater && emitter.Prefab.ParticlePrefab.DrawTarget == ParticlePrefab.DrawTargetType.Water) { continue; }
                     emitter.Emit(1.0f, WorldPosition, character.CurrentHull, sizeMultiplier: bloodParticleSize, amountMultiplier: bloodParticleAmount);
                 }
             }   
@@ -618,7 +633,7 @@ namespace Barotrauma
                 }
             }
 
-            if (inWater)
+            if (InWater)
             {
                 wetTimer = 1.0f;
             }

Barotrauma/BarotraumaClient/ClientSource/GUI/GUI.cs

@@ -2447,14 +2447,44 @@ namespace Barotrauma
         {
             if (messages.Any(msg => msg.Text == message)) { return; }
             messages.Add(new GUIMessage(message, color, lifeTime ?? MathHelper.Clamp(message.Length / 5.0f, 3.0f, 10.0f), font ?? LargeFont));
-            if (playSound) SoundPlayer.PlayUISound(GUISoundType.UIMessage);
+            if (playSound) { SoundPlayer.PlayUISound(GUISoundType.UIMessage); }
         }
 
         public static void AddMessage(string message, Color color, Vector2 pos, Vector2 velocity, float lifeTime = 3.0f, bool playSound = true, GUISoundType soundType = GUISoundType.UIMessage, int subId = -1)
         {
             Submarine sub = Submarine.Loaded.FirstOrDefault(s => s.ID == subId);
-            messages.Add(new GUIMessage(message, color, pos, velocity, lifeTime, Alignment.Center, LargeFont, sub: sub));
-            if (playSound) SoundPlayer.PlayUISound(soundType);
+
+            var newMessage = new GUIMessage(message, color, pos, velocity, lifeTime, Alignment.Center, LargeFont, sub: sub);
+            if (playSound) { SoundPlayer.PlayUISound(soundType); }
+            bool overlapFound = true;
+            int tries = 0;
+            while (overlapFound)
+            {
+                overlapFound = false;
+                foreach (var otherMessage in messages)
+                {
+                    float xDiff = otherMessage.Pos.X - newMessage.Pos.X;
+                    if (Math.Abs(xDiff) > (newMessage.Size.X + otherMessage.Size.X) / 2) { continue; }
+                    float yDiff = otherMessage.Pos.Y - newMessage.Pos.Y;
+                    if (Math.Abs(yDiff) > (newMessage.Size.Y + otherMessage.Size.Y) / 2) { continue; }
+                    Vector2 moveDir = -(new Vector2(xDiff, yDiff) + Rand.Vector(1.0f));
+                    if (moveDir.LengthSquared() > 0.0001f)
+                    {
+                        moveDir = Vector2.Normalize(moveDir);
+                    }
+                    else
+                    {
+                        moveDir = Rand.Vector(1.0f);
+                    }
+                    moveDir.Y = -Math.Abs(moveDir.Y);
+                    newMessage.Pos += moveDir * 20;
+                    overlapFound = true;
+                }
+                tries++;
+                if (tries > 20) { break; }
+            }
+
+            messages.Add(newMessage);
         }
 
         public static void ClearMessages()

Barotrauma/BarotraumaClient/ClientSource/GUI/GUIStyle.cs

@@ -41,13 +41,13 @@ namespace Barotrauma
         public SpriteSheet SavingIndicator { get; private set; }
 
         public UISprite UIGlow { get; private set; }
-        public UISprite TalentGlow { get; private set; }
 
         public UISprite PingCircle { get; private set; }
 
         public UISprite UIGlowCircular { get; private set; }
 
         public UISprite UIGlowSolidCircular { get; private set; }
+        public UISprite UIThermalGlow { get; private set; }
 
         public UISprite ButtonPulse { get; private set; }
 
@@ -91,8 +91,8 @@ namespace Barotrauma
         public Color TextColorDark { get; private set; } = Color.Black * 0.9f;
         public Color TextColorDim { get; private set; } = Color.White * 0.6f;
 
-        public Color ItemQualityColorPoor { get; private set; } = Color.Gray;
-        public Color ItemQualityColorNormal { get; private set; } = Color.White;
+        public Color ItemQualityColorPoor { get; private set; } = Color.DarkRed;
+        public Color ItemQualityColorNormal { get; private set; } = Color.Gray;
         public Color ItemQualityColorGood { get; private set; } = Color.LightGreen;
         public Color ItemQualityColorExcellent { get; private set; } = Color.LightBlue;
         public Color ItemQualityColorMasterwork { get; private set; } = Color.MediumPurple;
@@ -250,9 +250,6 @@ namespace Barotrauma
                     case "uiglow":
                         UIGlow = new UISprite(subElement);
                         break;
-                    case "talentglow":
-                        TalentGlow = new UISprite(subElement);
-                        break;
                     case "pingcircle":
                         PingCircle = new UISprite(subElement);
                         break;
@@ -268,6 +265,9 @@ namespace Barotrauma
                     case "uiglowsolidcircular":
                         UIGlowSolidCircular = new UISprite(subElement);
                         break;
+                    case "uithermalglow":
+                        UIThermalGlow = new UISprite(subElement);
+                        break;
                     case "endroundbuttonpulse":
                         ButtonPulse = new UISprite(subElement);
                         break;

Barotrauma/BarotraumaClient/ClientSource/GUI/TabMenu.cs

@@ -141,6 +141,10 @@ namespace Barotrauma
             {
                 int talentCount = selectedTalents.Count - controlled.Info.UnlockedTalents.Count;
                 talentResetButton.Enabled = talentApplyButton.Enabled = talentCount > 0;
+                if (talentApplyButton.Enabled && talentApplyButton.FlashTimer <= 0.0f)
+                {
+                    talentApplyButton.Flash(GUI.Style.Orange);
+                }
             }
 
             if (selectedTab != InfoFrameTab.Crew) return;
@@ -1184,7 +1188,7 @@ namespace Barotrauma
         private Color unselectableColor = new Color(100, 100, 100, 225);
         private Color pressedColor = new Color(60, 60, 60, 225);
 
-        private readonly List<(GUIButton button, GUIComponent icon, GUIImage glow)> talentButtons = new List<(GUIButton button, GUIComponent icon, GUIImage glow)>();
+        private readonly List<(GUIButton button, GUIComponent icon)> talentButtons = new List<(GUIButton button, GUIComponent icon)>();
         private readonly List<(string talentTree, int index, GUIImage icon, GUIFrame background, GUIFrame backgroundGlow)> talentCornerIcons = new List<(string talentTree, int index, GUIImage icon, GUIFrame background, GUIFrame backgroundGlow)>();
         private List<string> selectedTalents = new List<string>();
 
@@ -1453,9 +1457,7 @@ namespace Barotrauma
                                 };
                             }
 
-                            GUIImage iconGlow = new GUIImage(new RectTransform(Vector2.One, iconImage.RectTransform, anchor: Anchor.Center), sprite: GUI.Style.TalentGlow.Sprite, scaleToFit: true) { Visible = false };
-
-                            talentButtons.Add((talentButton, iconImage, iconGlow));
+                            talentButtons.Add((talentButton, iconImage));
                         }
 
                         talentCornerIcons.Add((subTree.Identifier, i, cornerIcon, talentBackground, talentBackgroundHighlight));
@@ -1567,20 +1569,20 @@ namespace Barotrauma
                 string talentIdentifier = talentButton.button.UserData as string;
                 bool unselectable = !TalentTree.IsViableTalentForCharacter(controlledCharacter, talentIdentifier, selectedTalents) || controlledCharacter.HasTalent(talentIdentifier);
                 Color newTalentColor = unselectable ? unselectableColor : unselectedColor;
-
-                talentButton.glow.Visible = false;
+                Color hoverColor = Color.White;
 
                 if (controlledCharacter.HasTalent(talentIdentifier))
                 {
-                    newTalentColor = new Color(140,225,140,255);
+                    newTalentColor = GUI.Style.Green;
                 }
                 else if (selectedTalents.Contains(talentIdentifier))
                 {
-                    newTalentColor = new Color(174,164,124,255);
-                    talentButton.glow.Visible = true;
+                    newTalentColor = GUI.Style.Orange;
+                    hoverColor = Color.Lerp(GUI.Style.Orange, Color.White, 0.7f);
                 }
 
                 talentButton.icon.Color = newTalentColor;
+                talentButton.icon.HoverColor = hoverColor;
             }
 
             CreateTalentSkillList(controlledCharacter, skillListBox);

Barotrauma/BarotraumaClient/ClientSource/GUI/UpgradeStore.cs

@@ -1045,10 +1045,10 @@ namespace Barotrauma
         public static GUIFrame CreateUpgradeFrame(UpgradePrefab prefab, UpgradeCategory category, CampaignMode campaign, RectTransform rectTransform, bool addBuyButton = true)
         {
             int price = prefab.Price.GetBuyprice(campaign.UpgradeManager.GetUpgradeLevel(prefab, category), campaign.Map?.CurrentLocation);
-            return CreateUpgradeEntry(rectTransform, prefab.Sprite, prefab.Name, prefab.Description, price, new CategoryData(category, prefab), addBuyButton);
+            return CreateUpgradeEntry(rectTransform, prefab.Sprite, prefab.Name, prefab.Description, price, new CategoryData(category, prefab), addBuyButton, upgradePrefab: prefab, currentLevel: campaign.UpgradeManager.GetUpgradeLevel(prefab, category));
         }
 
-        public static GUIFrame CreateUpgradeEntry(RectTransform parent, Sprite sprite, string title, string body, int price, object? userData, bool addBuyButton = true, bool addProgressBar = true, string buttonStyle = "UpgradeBuyButton")
+        public static GUIFrame CreateUpgradeEntry(RectTransform parent, Sprite sprite, string title, string body, int price, object? userData, bool addBuyButton = true, bool addProgressBar = true, string buttonStyle = "UpgradeBuyButton", UpgradePrefab upgradePrefab = null, int currentLevel = 0)
         {
             float progressBarHeight = 0.25f;
 
@@ -1089,7 +1089,7 @@ namespace Barotrauma
                 //negative price = refund
                 if (price < 0) { formattedPrice = "+" + formattedPrice; }
                 buyButtonLayout = new GUILayoutGroup(rectT(0.2f, 1, prefabLayout), childAnchor: Anchor.TopCenter) { UserData = "buybutton" };
-                var priceText = new GUITextBlock(rectT(1, 0.4f, buyButtonLayout), formattedPrice, textAlignment: Alignment.Center);
+                var priceText = new GUITextBlock(rectT(1, 0.2f, buyButtonLayout), formattedPrice, textAlignment: Alignment.Center);
                 if (price < 0)
                 {
                     priceText.TextColor = GUI.Style.Green;
@@ -1099,6 +1099,11 @@ namespace Barotrauma
                     priceText.Text = string.Empty;
                 }
                 new GUIButton(rectT(0.7f, 0.5f, buyButtonLayout), string.Empty, style: buttonStyle) { Enabled = false };
+                if (upgradePrefab != null)
+                {
+                    var increaseText = new GUITextBlock(rectT(1, 0.2f, buyButtonLayout), "", textAlignment: Alignment.Center);
+                    UpdateUpgradePercentageText(increaseText, upgradePrefab, currentLevel);
+                }
             }
 
             description.CalculateHeightFromText();
@@ -1127,6 +1132,19 @@ namespace Barotrauma
             return prefabFrame;
         }
 
+        private static void UpdateUpgradePercentageText(GUITextBlock text, UpgradePrefab upgradePrefab, int currentLevel)
+        {
+            float nextIncrease = upgradePrefab.IncreaseOnTooltip * (Math.Min(currentLevel + 1, upgradePrefab.MaxLevel));
+            if (nextIncrease != 0f)
+            {
+                text.Text = $"{Math.Round(nextIncrease, 1)} %";
+                if (currentLevel == upgradePrefab.MaxLevel)
+                {
+                    text.TextColor = Color.Gray;
+                }
+            }
+        }
+
         private void CreateUpgradeEntry(UpgradePrefab prefab, UpgradeCategory category, GUIComponent parent, List<Item>? itemsOnSubmarine)
         {
             if (Campaign is null) { return; }
@@ -1541,7 +1559,9 @@ namespace Barotrauma
 
             if (prefabFrame.FindChild("buybutton", true) is { } buttonParent)
             {
-                GUITextBlock priceLabel = buttonParent.GetChild<GUITextBlock>();
+                List<GUITextBlock> textBlocks = buttonParent.GetAllChildren<GUITextBlock>().ToList();
+
+                GUITextBlock priceLabel = textBlocks[0];
                 int price = prefab.Price.GetBuyprice(campaign.UpgradeManager.GetUpgradeLevel(prefab, category), campaign.Map?.CurrentLocation);
 
                 if (priceLabel != null && !WaitForServerUpdate)
@@ -1562,6 +1582,11 @@ namespace Barotrauma
                         button.Enabled = false;
                     }
                 }
+                GUITextBlock increaseLabel = textBlocks[1];
+                if (increaseLabel != null && !WaitForServerUpdate)
+                {
+                    UpdateUpgradePercentageText(increaseLabel, prefab, currentLevel);
+                }
             }
         }
 

Barotrauma/BarotraumaClient/ClientSource/Items/Components/EntitySpawnerComponent.cs

@@ -0,0 +1,61 @@
+using System;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+
+namespace Barotrauma.Items.Components
+{
+    internal partial class EntitySpawnerComponent
+    {
+        public Vector2 DrawSize => Vector2.Zero;
+
+        public void Draw(SpriteBatch spriteBatch, bool editing, float itemDepth = -1)
+        {
+            if (!editing) { return; }
+
+            switch (SpawnAreaShape)
+            {
+                case AreaShape.Rectangle:
+                {
+                    RectangleF rect = GetAreaRectangle(SpawnAreaBounds, SpawnAreaOffset, draw: true);
+                    GUI.DrawRectangle(spriteBatch, rect.Location, rect.Size, GUI.Style.Red, isFilled: false, 0f, 4f);
+
+                    if (MaximumAmountRangePadding > 0f)
+                    {
+                        rect.Inflate(MaximumAmountRangePadding, MaximumAmountRangePadding);
+                        GUI.DrawRectangle(spriteBatch, rect.Location, rect.Size, GUI.Style.Red, isFilled: false, 0f, 2f);
+                    }
+                    break;
+                }
+                case AreaShape.Circle:
+                    Vector2 center = item.WorldPosition;
+                    center.Y = -center.Y;
+                    center += SpawnAreaOffset;
+                    spriteBatch.DrawCircle(center, SpawnAreaRadius, 32, GUI.Style.Red, thickness: 4f);
+
+                    if (MaximumAmountRangePadding > 0f)
+                    {
+                        spriteBatch.DrawCircle(center, SpawnAreaRadius + MaximumAmountRangePadding, 32, GUI.Style.Red, thickness: 2f);
+                    }
+                    break;
+            }
+
+            if (!OnlySpawnWhenCrewInRange) { return; }
+
+            switch (CrewAreaShape)
+            {
+                case AreaShape.Rectangle:
+                {
+                    RectangleF rect = GetAreaRectangle(CrewAreaBounds, CrewAreaOffset, draw: true);
+                    GUI.DrawRectangle(spriteBatch, rect.Location, rect.Size, GUI.Style.Green, isFilled: false, 0f, 4f);
+                    break;
+                }
+                case AreaShape.Circle:
+                    Vector2 center = item.WorldPosition;
+                    center.Y = -center.Y;
+                    center += CrewAreaOffset;
+                    spriteBatch.DrawCircle(center, CrewAreaRadius, 32, GUI.Style.Green);
+                    break;
+            }
+        }
+    }
+}

Barotrauma/BarotraumaClient/ClientSource/Items/Components/ItemContainer.cs

@@ -342,7 +342,7 @@ namespace Barotrauma.Items.Components
                     new Vector2(currentItemPos.X, -currentItemPos.Y),
                     isWiringMode ? containedItem.GetSpriteColor() * 0.15f : containedItem.GetSpriteColor(),
                     origin,
-                    -(containedItem.body == null ? 0.0f : containedItem.body.DrawRotation + MathHelper.ToRadians(-item.Rotation)),
+                    -(containedItem.body == null ? 0.0f : containedItem.body.DrawRotation ),
                     containedItem.Scale,
                     spriteEffects,
                     depth: containedSpriteDepth);

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/MiniMap.cs

@@ -78,7 +78,6 @@ namespace Barotrauma.Items.Components
         None,
         HullStatus,
         ElectricalView,
-        HullCondition,
         ItemFinder
     }
 
@@ -238,7 +237,6 @@ namespace Barotrauma.Items.Components
             {
                 true when EnableHullStatus     => MiniMapMode.HullStatus,
                 true when EnableElectricalView => MiniMapMode.ElectricalView,
-                true when EnableHullCondition  => MiniMapMode.HullCondition,
                 true when EnableItemFinder     => MiniMapMode.ItemFinder,
                 _                              => MiniMapMode.None
             };
@@ -263,8 +261,7 @@ namespace Barotrauma.Items.Components
             modeSwitchButtons = ImmutableArray.Create
             (
                 new GUIButton(new RectTransform(new Vector2(0.25f, 1.0f), buttonLayout.RectTransform), string.Empty, style: "StatusMonitorButton.HullStatus") { UserData = MiniMapMode.HullStatus, Enabled = EnableHullStatus, ToolTip = TextManager.Get("StatusMonitorButton.HullStatus.Tooltip") },
-                new GUIButton(new RectTransform(new Vector2(0.25f, 1.0f), buttonLayout.RectTransform), string.Empty, style: "StatusMonitorButton.ElectricalView") { UserData = MiniMapMode.ElectricalView, Enabled = EnableHullCondition, ToolTip = TextManager.Get("StatusMonitorButton.ElectricalView.Tooltip") },
-                new GUIButton(new RectTransform(new Vector2(0.25f, 1.0f), buttonLayout.RectTransform), string.Empty, style: "StatusMonitorButton.HullCondition") { UserData = MiniMapMode.HullCondition, Enabled = EnableHullCondition, ToolTip = TextManager.Get("StatusMonitorButton.HullCondition.Tooltip") },
+                new GUIButton(new RectTransform(new Vector2(0.25f, 1.0f), buttonLayout.RectTransform), string.Empty, style: "StatusMonitorButton.ElectricalView") { UserData = MiniMapMode.ElectricalView, Enabled = EnableElectricalView, ToolTip = TextManager.Get("StatusMonitorButton.ElectricalView.Tooltip") },
                 new GUIButton(new RectTransform(new Vector2(0.25f, 1.0f), buttonLayout.RectTransform), string.Empty, style: "StatusMonitorButton.ItemFinder") { UserData = MiniMapMode.ItemFinder, Enabled = EnableItemFinder, ToolTip = TextManager.Get("StatusMonitorButton.ItemFinder.Tooltip") }
             );
 
@@ -390,9 +387,9 @@ namespace Barotrauma.Items.Components
                 c.Children.ForEach(c2 => c2.CanBeFocused = false);
             });
 
-            submarineBack.RectTransform.MaxSize = 
+            submarineBack.RectTransform.MaxSize =
                 submarineFront.RectTransform.MaxSize =
-                submarineContainer.RectTransform.MaxSize = 
+                submarineContainer.RectTransform.MaxSize =
                 new Point(int.MaxValue, paddedContainer.Rect.Height - bottomFrame.Rect.Height - buttonLayout.Rect.Height);
         }
 
@@ -493,7 +490,7 @@ namespace Barotrauma.Items.Components
             displayedSubs.Add(item.Submarine);
             displayedSubs.AddRange(item.Submarine.DockedTo);
 
-            subEntities = MapEntity.mapEntityList.Where(me => me.Submarine == item.Submarine && !me.HiddenInGame).OrderByDescending(w => w.SpriteDepth).ToList();
+            subEntities = MapEntity.mapEntityList.Where(me => (item.Submarine is { } sub && sub.IsEntityFoundOnThisSub(me, includingConnectedSubs: true, allowDifferentType: false)) && !me.HiddenInGame).OrderByDescending(w => w.SpriteDepth).ToList();
 
             BakeSubmarine(item.Submarine, parentRect);
             elementSize = GuiFrame.Rect.Size;
@@ -598,7 +595,6 @@ namespace Barotrauma.Items.Components
 
             if (currentMode == MiniMapMode.HullStatus && !EnableHullStatus ||
                 currentMode == MiniMapMode.ElectricalView && !EnableElectricalView ||
-                currentMode == MiniMapMode.HullCondition && !EnableHullCondition ||
                 currentMode == MiniMapMode.ItemFinder && !EnableItemFinder)
             {
                 SetDefaultMode();
@@ -606,8 +602,7 @@ namespace Barotrauma.Items.Components
 
             modeSwitchButtons[0].Enabled = EnableHullStatus;
             modeSwitchButtons[1].Enabled = EnableElectricalView;
-            modeSwitchButtons[2].Enabled = EnableHullCondition;
-            modeSwitchButtons[3].Enabled = EnableItemFinder;
+            modeSwitchButtons[2].Enabled = EnableItemFinder;
         }
 
         private void UpdateIDCards(Submarine sub)
@@ -642,14 +637,14 @@ namespace Barotrauma.Items.Components
                 return;
             }
 
-            if (currentMode == MiniMapMode.HullStatus || currentMode == MiniMapMode.HullCondition)
+            if (currentMode == MiniMapMode.HullStatus)
             {
                 Rectangle prevScissorRect = spriteBatch.GraphicsDevice.ScissorRectangle;
                 spriteBatch.End();
                 spriteBatch.Begin(SpriteSortMode.Deferred, samplerState: GUI.SamplerState, rasterizerState: GameMain.ScissorTestEnable);
                 spriteBatch.GraphicsDevice.ScissorRectangle = submarineContainer.Rect;
 
-                if (currentMode == MiniMapMode.HullCondition && item.Submarine != null)
+                if (item.Submarine != null)
                 {
                     var sprite = GUI.Style.UIGlowSolidCircular?.Sprite;
                     float alpha = (MathF.Sin(blipState / maxBlipState * MathHelper.TwoPi) + 1.5f) * 0.5f;
@@ -849,7 +844,6 @@ namespace Barotrauma.Items.Components
             switch (currentMode)
             {
                 case MiniMapMode.HullStatus:
-                case MiniMapMode.HullCondition:
                     UpdateHullStatus();
                     miniMapFrame.Visible = true;
                     reportFrame.Visible = true;
@@ -992,8 +986,8 @@ namespace Barotrauma.Items.Components
                 {
                     if (!hullStatusComponents.ContainsKey(linkedHull)) { continue; }
 
-                    isHoveringOver |= 
-                        canHoverOverHull && 
+                    isHoveringOver |=
+                        canHoverOverHull &&
                         (hullStatusComponents[linkedHull].RectComponent == GUI.MouseOn || (draggingReport && hullStatusComponents[linkedHull].RectComponent.MouseRect.Contains(PlayerInput.MousePosition)));
                     if (isHoveringOver) { break; }
                 }
@@ -1089,7 +1083,7 @@ namespace Barotrauma.Items.Components
             }
             else
             {
-                bool hullsVisible = currentMode == MiniMapMode.HullStatus || currentMode == MiniMapMode.HullCondition;
+                bool hullsVisible = currentMode == MiniMapMode.HullStatus;
 
                 foreach (var (entity, component) in hullStatusComponents)
                 {
@@ -1202,7 +1196,7 @@ namespace Barotrauma.Items.Components
                 GameMain.GameScreen.BlueprintEffect.Parameters["width"].SetValue((float)texture.Width);
                 GameMain.GameScreen.BlueprintEffect.Parameters["height"].SetValue((float)texture.Height);
 
-                Color blueprintBlue = BlueprintBlue * currentMode switch { MiniMapMode.HullStatus => 0.1f, MiniMapMode.HullCondition => 0.1f, MiniMapMode.ElectricalView => 0.1f, _ => 0.5f };
+                Color blueprintBlue = BlueprintBlue * currentMode switch { MiniMapMode.HullStatus => 0.1f, MiniMapMode.ElectricalView => 0.1f, _ => 0.5f };
 
                 Vector2 origin = new Vector2(texture.Width / 2f, texture.Height / 2f);
                 float scale = currentMode == MiniMapMode.HullStatus ? 1.0f : Zoom;

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Sonar.cs

@@ -132,7 +132,15 @@ namespace Barotrauma.Items.Components
 
         private bool isConnectedToSteering;
 
-        private static string caveLabel, ruinLabel;
+        private static string caveLabel;
+
+
+        [Serialize(false, false)]
+        public bool RightLayout
+        {
+            get;
+            set;
+        }
 
         private bool AllowUsingMineralScanner =>
             HasMineralScanner && !isConnectedToSteering;
@@ -316,7 +324,7 @@ namespace Barotrauma.Items.Components
                 "", warningColor, GUI.LargeFont, Alignment.Center);
 
             // Setup layout for nav terminal
-            if (isConnectedToSteering)
+            if (isConnectedToSteering || RightLayout)
             {
                 controlContainer.RectTransform.RelativeOffset = controlBoxOffset;
                 controlContainer.RectTransform.SetPosition(Anchor.TopRight);

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Rope.cs

@@ -83,7 +83,7 @@ namespace Barotrauma.Items.Components
 
         public void Draw(SpriteBatch spriteBatch, bool editing, float itemDepth = -1)
         {
-            if (target == null) { return; }
+            if (target == null || target.Removed) { return; }
 
             Vector2 startPos = GetSourcePos();
             startPos.Y = -startPos.Y;
@@ -103,7 +103,7 @@ namespace Barotrauma.Items.Components
                 {
                     Vector2 barrelPos = FarseerPhysics.ConvertUnits.ToDisplayUnits(weapon.TransformedBarrelPos);
                     barrelPos.Y = -barrelPos.Y;
-                    startPos += barrelPos * item.Scale;
+                    startPos += barrelPos;
                 }
             }
             Vector2 endPos = new Vector2(target.DrawPosition.X, target.DrawPosition.Y);

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Signal/ButtonTerminal.cs

@@ -1,6 +1,7 @@
 using Barotrauma.Extensions;
 using Barotrauma.Networking;
 using Microsoft.Xna.Framework;
+using System;
 using System.Linq;
 using System.Xml.Linq;
 
@@ -58,13 +59,13 @@ namespace Barotrauma.Items.Components
             };
 
             float x = 1.0f / (1 + RequiredSignalCount);
-            float y = (x * paddedFrame.Rect.Width) / paddedFrame.Rect.Height;
+            float y = Math.Min((x * paddedFrame.Rect.Width) / paddedFrame.Rect.Height, 0.5f);
             Vector2 relativeSize = new Vector2(x, y);
 
             var containerSection = new GUIFrame(new RectTransform(new Vector2(x, 1.0f), paddedFrame.RectTransform), style: null);
             var containerSlot = new GUIFrame(new RectTransform(new Vector2(1.0f, y), containerSection.RectTransform, anchor: Anchor.Center), style: null);
             containerHolder = new GUIFrame(new RectTransform(new Vector2(1f, 1.2f), containerSlot.RectTransform, Anchor.BottomCenter), style: null);
-            containerIndicator = new GUIImage(new RectTransform(new Vector2(0.5f, 0.5f * y), containerSection.RectTransform, anchor: Anchor.Center) { RelativeOffset = new Vector2(0.0f, 0.05f + 0.5f * y) },
+            containerIndicator = new GUIImage(new RectTransform(new Vector2(0.5f, 0.5f * (1.0f - y)), containerSection.RectTransform, anchor: Anchor.BottomCenter),
                 style: "IndicatorLightRed", scaleToFit: true);
 
             for (int i = 0; i < RequiredSignalCount; i++)

Barotrauma/BarotraumaClient/ClientSource/Items/Components/StatusHUD.cs

@@ -40,7 +40,7 @@ namespace Barotrauma.Items.Components
         }
 
         [Serialize(false, false)]
-        public bool SeeThroughWalls
+        public bool ThermalGoggles
         {
             get;
             private set;
@@ -76,6 +76,8 @@ namespace Barotrauma.Items.Components
 
         private bool isEquippable;
 
+        private float thermalEffectState;
+
         public IEnumerable<Character> VisibleCharacters
         {
             get 
@@ -108,7 +110,10 @@ namespace Barotrauma.Items.Components
             {
                 refEntity = item;
             }
-            
+
+            thermalEffectState += deltaTime;
+            thermalEffectState %= 10000.0f;
+
             if (updateTimer > 0.0f)
             {
                 updateTimer -= deltaTime;
@@ -125,7 +130,7 @@ namespace Barotrauma.Items.Components
                 if (dist < Range * Range)
                 {
                     Vector2 diff = c.WorldPosition - refEntity.WorldPosition;
-                    if (SeeThroughWalls || Submarine.CheckVisibility(refEntity.SimPosition, refEntity.SimPosition + ConvertUnits.ToSimUnits(diff)) == null)
+                    if (Submarine.CheckVisibility(refEntity.SimPosition, refEntity.SimPosition + ConvertUnits.ToSimUnits(diff)) == null)
                     {
                         visibleCharacters.Add(c);
                     }
@@ -180,21 +185,38 @@ namespace Barotrauma.Items.Components
                 }
             }
 
-            if (SeeThroughWalls)
+            if (ThermalGoggles)
             {
                 spriteBatch.End();
-                GameMain.LightManager.SolidColorEffect.Parameters["color"].SetValue(Color.Red.ToVector4() * (0.35f + (float)Math.Sin(Timing.TotalTime * 1.6f) * 0.05f));
+                GameMain.LightManager.SolidColorEffect.Parameters["color"].SetValue(Color.Red.ToVector4() * (0.3f + MathF.Sin(thermalEffectState) * 0.05f));
                 GameMain.LightManager.SolidColorEffect.CurrentTechnique = GameMain.LightManager.SolidColorEffect.Techniques["SolidColorBlur"];
-                GameMain.LightManager.SolidColorEffect.Parameters["blurDistance"].SetValue(0.03f + (float)Math.Sin(Timing.TotalTime) * 0.01f);
+                GameMain.LightManager.SolidColorEffect.Parameters["blurDistance"].SetValue(0.01f + MathF.Sin(thermalEffectState) * 0.005f);
                 GameMain.LightManager.SolidColorEffect.CurrentTechnique.Passes[0].Apply();
                 spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.Additive, transformMatrix: Screen.Selected.Cam.Transform, effect: GameMain.LightManager.SolidColorEffect);
 
-                foreach (Character c in visibleCharacters)
+                Entity refEntity = equipper;
+                if (!isEquippable || refEntity == null)
                 {
-                    if (c == character || !c.Enabled || c.Removed) { continue; }
+                    refEntity = item;
+                }
+
+                foreach (Character c in Character.CharacterList)
+                {
+                    if (c == character || !c.Enabled || c.Removed || c.Params.HideInThermalGoggles) { continue; }
+                    if (!ShowDeadCharacters && c.IsDead) { continue; }
+
+                    float dist = Vector2.DistanceSquared(refEntity.WorldPosition, c.WorldPosition);
+                    if (dist > Range * Range) { continue; }
+
+                    Sprite pingCircle = GUI.Style.UIThermalGlow.Sprite;
                     foreach (Limb limb in c.AnimController.Limbs)
                     {
-                        limb.Draw(spriteBatch, Screen.Selected.Cam, disableDeformations: true);
+                        if (limb.Mass < 1.0f) { continue; }
+                        float noise1 = PerlinNoise.GetPerlin((thermalEffectState + limb.Params.ID + c.ID) * 0.01f, (thermalEffectState + limb.Params.ID + c.ID) * 0.02f);
+                        float noise2 = PerlinNoise.GetPerlin((thermalEffectState + limb.Params.ID + c.ID) * 0.01f, (thermalEffectState + limb.Params.ID + c.ID) * 0.008f);
+                        Vector2 spriteScale = ConvertUnits.ToDisplayUnits(limb.body.GetSize()) / pingCircle.size * (noise1 * 0.5f + 2f);
+                        Vector2 drawPos = new Vector2(limb.body.DrawPosition.X + (noise1 - 0.5f) * 100, -limb.body.DrawPosition.Y + (noise2 - 0.5f) * 100);
+                        pingCircle.Draw(spriteBatch, drawPos, 0.0f, scale: Math.Max(spriteScale.X, spriteScale.Y));
                     }
                 }
 

Barotrauma/BarotraumaClient/ClientSource/Items/Inventory.cs

@@ -317,7 +317,7 @@ namespace Barotrauma
                     string colorStr = XMLExtensions.ColorToString(!item.AllowStealing ? GUI.Style.Red : Color.White);
 
                     toolTip = $"‖color:{colorStr}‖{name}‖color:end‖";
-                    if (item.Quality > 0)
+                    if (item.GetComponent<Quality>() != null)
                     {
                         // substring by to get rid of the empty space at start, text file should be adjusted
                         toolTip += $"\n{TextManager.GetWithVariable("itemname.quality" + item.Quality, "[itemname]", "", fallBackTag: "itemname.quality3")?.Substring(1)}";
@@ -1567,7 +1567,7 @@ namespace Barotrauma
                             if (containedItem != null && itemContainer.Inventory.Capacity == 1)
                             {
                                 int maxStackSize = Math.Min(containedItem.Prefab.MaxStackSize, itemContainer.GetMaxStackSize(0));
-                                if (maxStackSize > 1)
+                                if (maxStackSize > 1 || containedItem.Prefab.HideConditionBar)
                                 {
                                     containedState = itemContainer.Inventory.slots[0].ItemCount / (float)maxStackSize;
                                 }

Barotrauma/BarotraumaClient/ClientSource/Items/Item.cs

@@ -721,6 +721,7 @@ namespace Barotrauma
                 new GUIButton(new RectTransform(new Vector2(0.23f, 1.0f), buttonContainer.RectTransform), TextManager.Get("MirrorEntityX"), style: "GUIButtonSmall")
                 {
                     ToolTip = TextManager.Get("MirrorEntityXToolTip"),
+                    Enabled = Prefab.CanFlipX,
                     OnClicked = (button, data) =>
                     {
                         foreach (MapEntity me in SelectedList)
@@ -734,6 +735,7 @@ namespace Barotrauma
                 new GUIButton(new RectTransform(new Vector2(0.23f, 1.0f), buttonContainer.RectTransform), TextManager.Get("MirrorEntityY"), style: "GUIButtonSmall")
                 {
                     ToolTip = TextManager.Get("MirrorEntityYToolTip"),
+                    Enabled = Prefab.CanFlipY,
                     OnClicked = (button, data) =>
                     {
                         foreach (MapEntity me in SelectedList)
@@ -1212,8 +1214,8 @@ namespace Barotrauma
             }
 
             if (Character.Controlled != null && Character.Controlled.SelectedConstruction != this && GetComponent<RemoteController>() == null)
-            { 
-                if (Character.Controlled.SelectedConstruction?.GetComponent<RemoteController>()?.TargetItem != this && 
+            {
+                if (Character.Controlled.SelectedConstruction?.GetComponent<RemoteController>()?.TargetItem != this &&
                     !Character.Controlled.HeldItems.Any(it => it.GetComponent<RemoteController>()?.TargetItem == this))
                 {
                     return;

Barotrauma/BarotraumaClient/ClientSource/Map/Lights/LightManager.cs

@@ -126,8 +126,8 @@ namespace Barotrauma.Lights
             }
 
             LosTexture?.Dispose();
-            LosTexture = new RenderTarget2D(graphics, 
-                (int)(GameMain.GraphicsWidth * GameMain.Config.LightMapScale), 
+            LosTexture = new RenderTarget2D(graphics,
+                (int)(GameMain.GraphicsWidth * GameMain.Config.LightMapScale),
                 (int)(GameMain.GraphicsHeight * GameMain.Config.LightMapScale), false, SurfaceFormat.Color, DepthFormat.None);
         }
 
@@ -183,7 +183,7 @@ namespace Barotrauma.Lights
             activeLights.Clear();
             foreach (LightSource light in lights)
             {
-                if (!light.Enabled) { continue; }    
+                if (!light.Enabled) { continue; }
                 if ((light.Color.A < 1 || light.Range < 1.0f) && !light.LightSourceParams.OverrideLightSpriteAlpha.HasValue) { continue; }
                 if (light.ParentBody != null)
                 {
@@ -197,7 +197,9 @@ namespace Barotrauma.Lights
                     float spriteRange = Math.Max(
                         light.LightSprite.size.X * light.SpriteScale.X * (0.5f + Math.Abs(light.LightSprite.RelativeOrigin.X - 0.5f)),
                         light.LightSprite.size.Y * light.SpriteScale.Y * (0.5f + Math.Abs(light.LightSprite.RelativeOrigin.Y - 0.5f)));
-                    range = Math.Max(spriteRange, range);
+
+                    float targetSize = Math.Max(light.LightTextureTargetSize.X, light.LightTextureTargetSize.Y);
+                    range = Math.Max(Math.Max(spriteRange, targetSize), range);
                 }
                 if (!MathUtils.CircleIntersectsRectangle(light.WorldPosition, range, viewRect)) { continue; }
                 activeLights.Add(light);
@@ -247,7 +249,7 @@ namespace Barotrauma.Lights
             }*/
 
             spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.Opaque, transformMatrix: spriteBatchTransform);
-            Dictionary<Hull, Rectangle> visibleHulls = GetVisibleHulls(cam);                
+            Dictionary<Hull, Rectangle> visibleHulls = GetVisibleHulls(cam);
             foreach (KeyValuePair<Hull, Rectangle> hull in visibleHulls)
             {
                 GUI.DrawRectangle(spriteBatch,
@@ -264,12 +266,12 @@ namespace Barotrauma.Lights
             spriteBatch.End();
 
             graphics.BlendState = BlendState.Additive;
-            
+
 
             //draw the focused item and character to highlight them,
             //and light sprites (done before drawing the actual light volumes so we can make characters obstruct the highlights and sprites)
             //---------------------------------------------------------------------------------------------------
-            spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.Additive, transformMatrix: spriteBatchTransform);            
+            spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.Additive, transformMatrix: spriteBatchTransform);
             foreach (LightSource light in activeLights)
             {
                 //don't draw limb lights at this point, they need to be drawn after lights have been obstructed by characters
@@ -294,8 +296,8 @@ namespace Barotrauma.Lights
             {
                 if (character.CurrentHull == null || !character.Enabled || !character.IsVisible) { continue; }
                 if (Character.Controlled?.FocusedCharacter == character) { continue; }
-                Color lightColor = character.CurrentHull.AmbientLight == Color.TransparentBlack ? 
-                    Color.Black : 
+                Color lightColor = character.CurrentHull.AmbientLight == Color.TransparentBlack ?
+                    Color.Black :
                     character.CurrentHull.AmbientLight.Multiply(character.CurrentHull.AmbientLight.A / 255.0f).Opaque();
                 foreach (Limb limb in character.AnimController.Limbs)
                 {
@@ -304,7 +306,7 @@ namespace Barotrauma.Lights
                 }
             }
             spriteBatch.End();
-            
+
             DeformableSprite.Effect.CurrentTechnique = DeformableSprite.Effect.Techniques["DeformShaderSolidVertexColor"];
             DeformableSprite.Effect.CurrentTechnique.Passes[0].Apply();
             spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.NonPremultiplied, transformMatrix: spriteBatchTransform);
@@ -312,8 +314,8 @@ namespace Barotrauma.Lights
             {
                 if (character.CurrentHull == null || !character.Enabled || !character.IsVisible) { continue; }
                 if (Character.Controlled?.FocusedCharacter == character) { continue; }
-                Color lightColor = character.CurrentHull.AmbientLight == Color.TransparentBlack ? 
-                    Color.Black : 
+                Color lightColor = character.CurrentHull.AmbientLight == Color.TransparentBlack ?
+                    Color.Black :
                     character.CurrentHull.AmbientLight.Multiply(character.CurrentHull.AmbientLight.A / 255.0f).Opaque();
                 foreach (Limb limb in character.AnimController.Limbs)
                 {
@@ -343,9 +345,9 @@ namespace Barotrauma.Lights
             }
 
             lightEffect.World = transform;
-            
+
             GameMain.ParticleManager.Draw(spriteBatch, false, null, Particles.ParticleBlendState.Additive);
-    
+
             if (Character.Controlled != null)
             {
                 DrawHalo(Character.Controlled);
@@ -412,7 +414,7 @@ namespace Barotrauma.Lights
                 }
             }
             if (highlightedEntities.Count == 0) { return false; }
-            
+
             //draw characters in light blue first
             graphics.SetRenderTarget(HighlightMap);
             SolidColorEffect.CurrentTechnique = SolidColorEffect.Techniques["SolidColor"];
@@ -484,9 +486,9 @@ namespace Barotrauma.Lights
 
             //raster pattern on top of everything
             spriteBatch.Begin(blendState: BlendState.NonPremultiplied, samplerState: SamplerState.LinearWrap);
-            spriteBatch.Draw(highlightRaster, 
-                new Rectangle(0, 0, HighlightMap.Width, HighlightMap.Height), 
-                new Rectangle(0, 0, (int)(HighlightMap.Width / currLightMapScale * 0.5f), (int)(HighlightMap.Height / currLightMapScale * 0.5f)), 
+            spriteBatch.Draw(highlightRaster,
+                new Rectangle(0, 0, HighlightMap.Width, HighlightMap.Height),
+                new Rectangle(0, 0, (int)(HighlightMap.Width / currLightMapScale * 0.5f), (int)(HighlightMap.Height / currLightMapScale * 0.5f)),
                 Color.White * 0.5f);
             spriteBatch.End();
 
@@ -542,7 +544,7 @@ namespace Barotrauma.Lights
             {
                 graphics.Clear(Color.White);
             }
-            
+
 
             //--------------------------------------
 
@@ -595,9 +597,9 @@ namespace Barotrauma.Lights
                     }
                 }
             }
-            graphics.SetRenderTarget(null);            
+            graphics.SetRenderTarget(null);
         }
-        
+
         public void ClearLights()
         {
             lights.Clear();

Barotrauma/BarotraumaClient/ClientSource/Map/Lights/LightSource.cs

@@ -104,13 +104,13 @@ namespace Barotrauma.Lights
                 blinkFrequency = MathHelper.Clamp(value, 0.0f, 60.0f);
             }
         }
-        
+
         public float TextureRange
         {
             get;
             private set;
         }
-        
+
         public Sprite OverrideLightTexture
         {
             get;
@@ -137,7 +137,7 @@ namespace Barotrauma.Lights
         public LightSourceParams(XElement element)
         {
             Deserialize(element);
-            
+
             foreach (XElement subElement in element.Elements())
             {
                 switch (subElement.Name.ToString().ToLowerInvariant())
@@ -206,9 +206,9 @@ namespace Barotrauma.Lights
         private short[] indices;
 
         private List<ConvexHullList> hullsInRange;
-        
+
         public Texture2D texture;
-        
+
         public SpriteEffects LightSpriteEffect;
 
         public Submarine ParentSub;
@@ -224,7 +224,7 @@ namespace Barotrauma.Lights
         private float prevCalculatedRange;
         private Vector2 prevCalculatedPosition;
 
-        //do we need to recheck which convex hulls are within range 
+        //do we need to recheck which convex hulls are within range
         //(e.g. position or range of the lightsource has changed)
         public bool NeedsHullCheck = true;
         //do we need to recalculate the vertices of the light volume
@@ -278,7 +278,7 @@ namespace Barotrauma.Lights
                     translateVertices = position - prevCalculatedPosition;
                     return;
                 }
-                
+
                 NeedsHullCheck = true;
                 NeedsRecalculation = true;
             }
@@ -360,7 +360,7 @@ namespace Barotrauma.Lights
             get;
             private set;
         }
-        
+
         public float Range
         {
             get { return lightSourceParams.Range; }
@@ -369,13 +369,29 @@ namespace Barotrauma.Lights
 
                 lightSourceParams.Range = value;
                 if (Math.Abs(prevCalculatedRange - lightSourceParams.Range) < 10.0f) return;
-                
+
                 NeedsHullCheck = true;
                 NeedsRecalculation = true;
                 prevCalculatedRange = lightSourceParams.Range;
             }
         }
 
+        private Vector2 lightTextureTargetSize;
+
+        public Vector2 LightTextureTargetSize
+        {
+            get => lightTextureTargetSize;
+            set
+            {
+                NeedsRecalculation = true;
+                NeedsHullCheck = true;
+                lightTextureTargetSize = value;
+            }
+        }
+
+        public Vector2 LightTextureOffset { get; set; }
+        public Vector2 LightTextureScale { get; set; } = Vector2.One;
+
         public float TextureRange
         {
             get
@@ -386,7 +402,7 @@ namespace Barotrauma.Lights
 
         /// <summary>
         /// Background lights are drawn behind submarines and they don't cast shadows.
-        /// </summary>        
+        /// </summary>
         public bool IsBackground
         {
             get;
@@ -462,7 +478,7 @@ namespace Barotrauma.Lights
             this.ParentSub = submarine;
             this.position = position;
             lightSourceParams = new LightSourceParams(range, color);
-            CastShadows = true;            
+            CastShadows = true;
             texture = LightTexture;
             diffToSub = new Dictionary<Submarine, Vector2>();
             if (addLight) { GameMain.LightManager.AddLight(this); }
@@ -494,7 +510,7 @@ namespace Barotrauma.Lights
             }
             CurrentBrightness = brightness;
         }
-        
+
         /// <summary>
         /// Update the contents of ConvexHullList and check if we need to recalculate vertices
         /// </summary>
@@ -509,7 +525,7 @@ namespace Barotrauma.Lights
         }
 
         /// <summary>
-        /// Recheck which convex hulls are in range (if needed), 
+        /// Recheck which convex hulls are in range (if needed),
         /// and check if we need to recalculate vertices due to changes in the convex hulls
         /// </summary>
         private void CheckHullsInRange()
@@ -561,20 +577,20 @@ namespace Barotrauma.Lights
                             chList.List.Clear();
                             continue;
                         }
-                        
+
                         RefreshConvexHullList(chList, lightPos, sub);
                     }
                 }
-                else 
+                else
                 {
                     //light is inside, convexhull outside
                     if (sub == null) continue;
-                
+
                     //light and convexhull are both inside the same sub
                     if (sub == ParentSub)
                     {
                         if (NeedsHullCheck)
-                        {                            
+                        {
                             RefreshConvexHullList(chList, lightPos, sub);
                         }
                     }
@@ -582,7 +598,7 @@ namespace Barotrauma.Lights
                     else
                     {
                         if (sub.DockedTo.Contains(ParentSub) && !NeedsHullCheck) continue;
-                        
+
                         lightPos -= (sub.Position - ParentSub.Position);
 
                         Rectangle subBorders = sub.Borders;
@@ -642,7 +658,7 @@ namespace Barotrauma.Lights
             foreach (ConvexHull hull in hulls)
             {
                 hull.RefreshWorldPositions();
-                hull.GetVisibleSegments(drawPos, visibleSegments, ignoreEdges: false);                
+                hull.GetVisibleSegments(drawPos, visibleSegments, ignoreEdges: false);
             }
 
             //add a square-shaped boundary to make sure we've got something to construct the triangles from
@@ -829,13 +845,13 @@ namespace Barotrauma.Lights
                 if (intersection2.index < 0) return null;
                 Segment seg1 = visibleSegments[intersection1.index];
                 Segment seg2 = visibleSegments[intersection2.index];
-                
+
                 bool isPoint1 = MathUtils.LineToPointDistanceSquared(seg1.Start.WorldPos, seg1.End.WorldPos, p.WorldPos) < 25.0f;
                 bool isPoint2 = MathUtils.LineToPointDistanceSquared(seg2.Start.WorldPos, seg2.End.WorldPos, p.WorldPos) < 25.0f;
 
                 if (isPoint1 && isPoint2)
                 {
-                    //hit at the current segmentpoint -> place the segmentpoint into the list 
+                    //hit at the current segmentpoint -> place the segmentpoint into the list
                     output.Add(p.WorldPos);
 
                     foreach (ConvexHullList hullList in hullsInRange)
@@ -938,7 +954,7 @@ namespace Barotrauma.Lights
                     segment = i;
                 }
             }
-            
+
             return (segment, closestIntersection == null ? rayEnd : (Vector2)closestIntersection);
         }
 
@@ -968,8 +984,8 @@ namespace Barotrauma.Lights
                 overrideTextureDims = new Vector2(OverrideLightTexture.SourceRect.Width, OverrideLightTexture.SourceRect.Height);
 
                 Vector2 origin = OverrideLightTextureOrigin;
-                if (LightSpriteEffect == SpriteEffects.FlipHorizontally) 
-                { 
+                if (LightSpriteEffect == SpriteEffects.FlipHorizontally)
+                {
                     origin.X = OverrideLightTexture.SourceRect.Width - origin.X;
                     cosAngle = -cosAngle;
                     sinAngle = -sinAngle;
@@ -981,7 +997,7 @@ namespace Barotrauma.Lights
             // Add a vertex for the center of the mesh
             vertices[0] = new VertexPositionColorTexture(new Vector3(position.X, position.Y, 0),
                 Color.White, GetUV(new Vector2(0.5f, 0.5f) + uvOffset, LightSpriteEffect));
-            
+
             //hacky fix to exc excessively large light volumes (they used to be up to 4x the range of the light if there was nothing to block the rays).
             //might want to tweak the raycast logic in a way that this isn't necessary
             /*float boundRadius = Range * 1.1f / (1.0f - Math.Max(Math.Abs(uvOffset.X), Math.Abs(uvOffset.Y)));
@@ -999,7 +1015,7 @@ namespace Barotrauma.Lights
             for (int i = 0; i < rayCastHits.Count; i++)
             {
                 Vector2 vertex = rayCastHits[i];
-                
+
                 //we'll use the previous and next vertices to calculate the normals
                 //of the two segments this vertex belongs to
                 //so we can add new vertices based on these normals
@@ -1007,7 +1023,7 @@ namespace Barotrauma.Lights
                 Vector2 nextVertex = rayCastHits[i < rayCastHits.Count - 1 ? i + 1 : 0];
 
                 Vector2 rawDiff = vertex - drawPos;
-                
+
                 //calculate normal of first segment
                 Vector2 nDiff1 = vertex - nextVertex;
                 float tx = nDiff1.X; nDiff1.X = -nDiff1.Y; nDiff1.Y = tx;
@@ -1015,7 +1031,7 @@ namespace Barotrauma.Lights
                 //if the normal is pointing towards the light origin
                 //rather than away from it, invert it
                 if (Vector2.DistanceSquared(nDiff1, rawDiff) > Vector2.DistanceSquared(-nDiff1, rawDiff)) nDiff1 = -nDiff1;
-                
+
                 //calculate normal of second segment
                 Vector2 nDiff2 = prevVertex - vertex;
                 tx = nDiff2.X; nDiff2.X = -nDiff2.Y; nDiff2.Y = tx;
@@ -1112,13 +1128,13 @@ namespace Barotrauma.Lights
 
             static Vector2 GetUV(Vector2 vert, SpriteEffects effects)
             {
-                if (effects == SpriteEffects.FlipHorizontally) 
-                { 
-                    vert.X = 1.0f - vert.X; 
+                if (effects == SpriteEffects.FlipHorizontally)
+                {
+                    vert.X = 1.0f - vert.X;
                 }
-                else if (effects == SpriteEffects.FlipVertically) 
-                { 
-                    vert.Y = 1.0f - vert.Y; 
+                else if (effects == SpriteEffects.FlipVertically)
+                {
+                    vert.Y = 1.0f - vert.Y;
                 }
                 else if (effects == (SpriteEffects.FlipHorizontally | SpriteEffects.FlipVertically))
                 {
@@ -1228,10 +1244,19 @@ namespace Barotrauma.Lights
                 }
                 drawPos.Y = -drawPos.Y;
 
-                LightSprite.Draw(
-                    spriteBatch, drawPos,
-                    new Color(Color, (lightSourceParams.OverrideLightSpriteAlpha ?? Color.A / 255.0f) * CurrentBrightness),
-                    origin, -Rotation + MathHelper.ToRadians(LightSourceParams.Rotation), SpriteScale, LightSpriteEffect);
+                Color color = new Color(Color, (lightSourceParams.OverrideLightSpriteAlpha ?? Color.A / 255.0f) * CurrentBrightness);
+
+                if (LightTextureTargetSize != Vector2.Zero)
+                {
+                    LightSprite.DrawTiled(spriteBatch, drawPos, LightTextureTargetSize, color, startOffset: LightTextureOffset, textureScale: LightTextureScale);
+                }
+                else
+                {
+                    LightSprite.Draw(
+                        spriteBatch, drawPos,
+                        color,
+                        origin, -Rotation + MathHelper.ToRadians(LightSourceParams.Rotation), SpriteScale, LightSpriteEffect);
+                }
             }
 
             if (GameMain.DebugDraw && Screen.Selected.Cam.Zoom > 0.1f)
@@ -1255,7 +1280,7 @@ namespace Barotrauma.Lights
                     GUI.DrawLine(spriteBatch, drawPos - Vector2.One * Range, drawPos + Vector2.One * Range, Color);
                     GUI.DrawLine(spriteBatch, drawPos - new Vector2(1.0f, -1.0f) * Range, drawPos + new Vector2(1.0f, -1.0f) * Range, Color);
                 }
-            }   
+            }
         }
 
         public void CheckConditionals()
@@ -1280,10 +1305,10 @@ namespace Barotrauma.Lights
             if (!CastShadows)
             {
                 Texture2D currentTexture = texture ?? LightTexture;
-                if (OverrideLightTexture != null) { currentTexture = OverrideLightTexture.Texture; }           
+                if (OverrideLightTexture != null) { currentTexture = OverrideLightTexture.Texture; }
 
-                Vector2 center = OverrideLightTexture == null ? 
-                    new Vector2(currentTexture.Width / 2, currentTexture.Height / 2) : 
+                Vector2 center = OverrideLightTexture == null ?
+                    new Vector2(currentTexture.Width / 2, currentTexture.Height / 2) :
                     OverrideLightTexture.Origin;
                 float scale = Range / (currentTexture.Width / 2.0f);
 
@@ -1317,8 +1342,8 @@ namespace Barotrauma.Lights
 
             Vector2 offset = ParentSub == null ? Vector2.Zero : ParentSub.DrawPosition;
             lightEffect.World =
-                Matrix.CreateTranslation(-new Vector3(position, 0.0f)) * 
-                Matrix.CreateRotationZ(rotateVertices) * 
+                Matrix.CreateTranslation(-new Vector3(position, 0.0f)) *
+                Matrix.CreateRotationZ(rotateVertices - MathHelper.ToRadians(LightSourceParams.Rotation)) *
                 Matrix.CreateTranslation(new Vector3(position + offset + translateVertices, 0.0f)) *
                 transform;
 

Barotrauma/BarotraumaClient/ClientSource/Map/MapEntity.cs

@@ -6,6 +6,7 @@ using Microsoft.Xna.Framework.Input;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Barotrauma.Lights;
 
 namespace Barotrauma
 {
@@ -17,7 +18,7 @@ namespace Barotrauma
         private static Vector2 startMovingPos = Vector2.Zero;
 
         private static float keyDelay;
-        
+
         public static Vector2 StartMovingPos => startMovingPos;
 
         public event Action<Rectangle> Resized;
@@ -97,13 +98,13 @@ namespace Barotrauma
         /// </summary>
         public float GetDrawDepth(float baseDepth, Sprite sprite)
         {
-            float depth = baseDepth            
+            float depth = baseDepth
                 //take texture into account to get entities with (roughly) the same base depth and texture to render consecutively to minimize texture swaps
                 + (sprite?.Texture?.SortingKey ?? 0) % 100 * 0.00001f
                 + ID % 100 * 0.000001f;
             return Math.Min(depth, 1.0f);
         }
-        
+
         /// <summary>
         /// Update the selection logic in submarine editor
         /// </summary>
@@ -218,7 +219,7 @@ namespace Barotrauma
                         }
                     }
                 }
-            }            
+            }
 
             Vector2 position = cam.ScreenToWorld(PlayerInput.MousePosition);
             MapEntity highLightedEntity = null;
@@ -284,13 +285,13 @@ namespace Barotrauma
                     //mouse released -> move the entities to the new position of the mouse
 
                     Vector2 moveAmount = position - startMovingPos;
-                                        
+
                     if (!isShiftDown)
                     {
                         moveAmount.X = (float)(moveAmount.X > 0.0f ? Math.Floor(moveAmount.X / Submarine.GridSize.X) : Math.Ceiling(moveAmount.X / Submarine.GridSize.X)) * Submarine.GridSize.X;
                         moveAmount.Y = (float)(moveAmount.Y > 0.0f ? Math.Floor(moveAmount.Y / Submarine.GridSize.Y) : Math.Ceiling(moveAmount.Y / Submarine.GridSize.Y)) * Submarine.GridSize.Y;
                     }
-                    
+
                     if (Math.Abs(moveAmount.X) >= Submarine.GridSize.X || Math.Abs(moveAmount.Y) >= Submarine.GridSize.Y || isShiftDown)
                     {
                         if (!isShiftDown) { moveAmount = Submarine.VectorToWorldGrid(moveAmount); }
@@ -321,10 +322,10 @@ namespace Barotrauma
                                     else
                                     {
                                         SoundPlayer.PlayUISound(GUISoundType.PickItemFail);
-                                    }                                 
+                                    }
                                 }
                             }
-                            
+
                             SubEditorScreen.StoreCommand(new TransformCommand(new List<MapEntity>(SelectedList),SelectedList.Select(entity => entity.Rect).ToList(), oldRects, false));
                             if (deposited.Any() && deposited.Any(entity => entity is Item))
                             {
@@ -457,8 +458,8 @@ namespace Barotrauma
             {
                 if (PlayerInput.PrimaryMouseButtonHeld() &&
                     PlayerInput.KeyUp(Keys.Space) &&
-                    PlayerInput.KeyUp(Keys.LeftAlt) && 
-                    PlayerInput.KeyUp(Keys.RightAlt) && 
+                    PlayerInput.KeyUp(Keys.LeftAlt) &&
+                    PlayerInput.KeyUp(Keys.RightAlt) &&
                     (highlightedListBox == null || (GUI.MouseOn != highlightedListBox && !highlightedListBox.IsParentOf(GUI.MouseOn))))
                 {
                     //if clicking a selected entity, start moving it
@@ -486,7 +487,7 @@ namespace Barotrauma
 
                 int xKeysDown = (left + right);
                 int yKeysDown = (up + down);
-                
+
                 if (xKeysDown != 0 || yKeysDown != 0) { keyDelay += (float) Timing.Step; } else { keyDelay = 0; }
 
 
@@ -516,7 +517,7 @@ namespace Barotrauma
             bool isShiftDown = PlayerInput.IsShiftDown();
 
             if (!isShiftDown) return null;
-            
+
             foreach (MapEntity e in mapEntityList)
             {
                 if (!e.SelectableInEditor ||!(e is Item potentialContainer)) { continue; }
@@ -666,7 +667,7 @@ namespace Barotrauma
         {
             if (SelectedList.Contains(entity)) { return; }
             SelectedList.Add(entity);
-            HandleDoorGapLinks(entity, 
+            HandleDoorGapLinks(entity,
                 onGapFound: (door, gap) =>
                 {
                     door.RefreshLinkedGap();
@@ -674,8 +675,8 @@ namespace Barotrauma
                     {
                         SelectedList.Add(gap);
                     }
-                }, 
-                onDoorFound: (door, gap) => 
+                },
+                onDoorFound: (door, gap) =>
                 {
                     if (!SelectedList.Contains(door.Item))
                     {
@@ -719,7 +720,7 @@ namespace Barotrauma
                 onGapFound: (door, gap) => SelectedList.Remove(gap),
                 onDoorFound: (door, gap) => SelectedList.Remove(door.Item));
         }
-        
+
         static partial void UpdateAllProjSpecific(float deltaTime)
         {
             var entitiesToRender = Submarine.VisibleEntities ?? mapEntityList;
@@ -752,7 +753,7 @@ namespace Barotrauma
                 moveAmount.Y = -moveAmount.Y;
 
                 bool isShiftDown = PlayerInput.IsShiftDown();
-                
+
                 if (!isShiftDown)
                 {
                     moveAmount.X = (float)(moveAmount.X > 0.0f ? Math.Floor(moveAmount.X / Submarine.GridSize.X) : Math.Ceiling(moveAmount.X / Submarine.GridSize.X)) * Submarine.GridSize.X;
@@ -765,21 +766,21 @@ namespace Barotrauma
                     foreach (MapEntity e in SelectedList)
                     {
                         SpriteEffects spriteEffects = SpriteEffects.None;
-                        switch (e) 
+                        switch (e)
                         {
-                            case Item item: 
+                            case Item item:
                             {
                                 if (item.FlippedX && item.Prefab.CanSpriteFlipX) spriteEffects ^= SpriteEffects.FlipHorizontally;
                                 if (item.flippedY && item.Prefab.CanSpriteFlipY) spriteEffects ^= SpriteEffects.FlipVertically;
                                 break;
                             }
-                            case Structure structure: 
+                            case Structure structure:
                             {
                                 if (structure.FlippedX && structure.Prefab.CanSpriteFlipX) spriteEffects ^= SpriteEffects.FlipHorizontally;
                                 if (structure.flippedY && structure.Prefab.CanSpriteFlipY) spriteEffects ^= SpriteEffects.FlipVertically;
                                 break;
                             }
-                            case WayPoint wayPoint: 
+                            case WayPoint wayPoint:
                             {
                                 Vector2 drawPos = e.WorldPosition;
                                 drawPos.Y = -drawPos.Y;
@@ -816,7 +817,7 @@ namespace Barotrauma
 
                 posY = -posY;
 
-                Vector2[] corners = 
+                Vector2[] corners =
                 {
                     new Vector2(posX, posY),
                     new Vector2(posX + sizeX, posY),
@@ -882,7 +883,7 @@ namespace Barotrauma
                 {
                     MapEntity firstSelected = SelectedList.First();
 
-                    float minX = firstSelected.WorldRect.X, 
+                    float minX = firstSelected.WorldRect.X,
                           maxX = firstSelected.WorldRect.Right;
 
                     foreach (MapEntity entity in SelectedList)
@@ -907,7 +908,7 @@ namespace Barotrauma
 
                     foreach (MapEntity entity in SelectedList)
                     {
-                        
+
                         minY = Math.Min(minY, entity.WorldRect.Y - entity.WorldRect.Height);
                         maxY = Math.Max(maxY, entity.WorldRect.Y);
                     }
@@ -947,21 +948,21 @@ namespace Barotrauma
         }
 
         /// <summary>
-        /// Copy the selected entities to the "clipboard" (copiedList) 
+        /// Copy the selected entities to the "clipboard" (copiedList)
         /// </summary>
         public static void Copy(List<MapEntity> entities)
         {
             if (entities.Count == 0) { return; }
             CopyEntities(entities);
         }
-        
+
         /// <summary>
          /// Copy the entities to the "clipboard" (copiedList) and delete them
          /// </summary>
         public static void Cut(List<MapEntity> entities)
         {
             if (entities.Count == 0) { return; }
-            
+
             CopyEntities(entities);
 
             SubEditorScreen.StoreCommand(new AddOrDeleteCommand(new List<MapEntity>(entities), true));
@@ -1057,7 +1058,7 @@ namespace Barotrauma
 
                 editingHUD.RectTransform.Resize(
                     new Point(
-                        editingHUD.RectTransform.NonScaledSize.X, 
+                        editingHUD.RectTransform.NonScaledSize.X,
                         MathHelper.Clamp(contentHeight + padding * 2, 50, maxHeight)), resizeChildren: false);
                 listBox.RectTransform.Resize(new Point(listBox.RectTransform.NonScaledSize.X, editingHUD.RectTransform.NonScaledSize.Y - padding * 2), resizeChildren: false);
             }
@@ -1097,7 +1098,7 @@ namespace Barotrauma
                 {
                     prevRect = new Rectangle(Rect.Location, Rect.Size);
                 }
-                
+
                 Vector2 placePosition = new Vector2(rect.X, rect.Y);
                 Vector2 placeSize = new Vector2(rect.Width, rect.Height);
 
@@ -1148,6 +1149,15 @@ namespace Barotrauma
                         var oldData = new List<Rectangle> { prevRect.Value };
                         SubEditorScreen.StoreCommand(new TransformCommand(new List<MapEntity> { this }, newData, oldData, true));
                     }
+
+                    if (this is Structure structure)
+                    {
+                        foreach (LightSource light in structure.Lights)
+                        {
+                            light.LightTextureTargetSize = Rect.Size.ToVector2();
+                            light.Position = rect.Location.ToVector2();
+                        }
+                    }
                     prevRect = null;
                 }
             }

Barotrauma/BarotraumaClient/ClientSource/Map/Structure.cs

@@ -14,12 +14,14 @@ namespace Barotrauma
 {
     partial class Structure : MapEntity, IDamageable, IServerSerializable
     {
-        public static bool ShowWalls = true, ShowStructures = true;        
+        public static bool ShowWalls = true, ShowStructures = true;
 
         private List<ConvexHull> convexHulls;
 
         private readonly Dictionary<DecorativeSprite, DecorativeSprite.State> spriteAnimState = new Dictionary<DecorativeSprite, DecorativeSprite.State>();
 
+        public readonly List<LightSource> Lights = new List<LightSource>();
+
         public override bool SelectableInEditor
         {
             get
@@ -41,7 +43,7 @@ namespace Barotrauma
         {
             get;
             set;
-        }        
+        }
 
         partial void InitProjSpecific()
         {
@@ -88,7 +90,23 @@ namespace Barotrauma
             if (editingHUD == null || editingHUD.UserData as Structure != this)
             {
                 editingHUD = CreateEditingHUD(Screen.Selected != GameMain.SubEditorScreen);
-            }            
+            }
+        }
+
+        private void SetLightTextureOffset()
+        {
+            Vector2 textOffset = textureOffset;
+            if (FlippedX) { textOffset.X = -textOffset.X; }
+            if (FlippedY) { textOffset.Y = -textOffset.Y; }
+
+            foreach (LightSource light in Lights)
+            {
+                Vector2 bgOffset = new Vector2(
+                    MathUtils.PositiveModulo((int)-textOffset.X, light.texture.Width),
+                    MathUtils.PositiveModulo((int)-textOffset.Y, light.texture.Height));
+
+                light.LightTextureOffset = bgOffset;
+            }
         }
 
         public GUIComponent CreateEditingHUD(bool inGame = false)
@@ -175,12 +193,12 @@ namespace Barotrauma
             buttonContainer.RectTransform.IsFixedSize = true;
             GUITextBlock.AutoScaleAndNormalize(buttonContainer.Children.Where(c => c is GUIButton).Select(b => ((GUIButton)b).TextBlock));
             editor.AddCustomContent(buttonContainer, editor.ContentCount);
-            
+
             PositionEditingHUD();
 
             return editingHUD;
         }
-        
+
         partial void OnImpactProjSpecific(Fixture f1, Fixture f2, Contact contact)
         {
             if (!Prefab.Platform && Prefab.StairDirection == Direction.None)
@@ -261,19 +279,21 @@ namespace Barotrauma
             else if (HiddenInGame) { return; }
 
             Color color = IsIncludedInSelection && editing ? GUI.Style.Blue : IsHighlighted ? GUI.Style.Orange * Math.Max(spriteColor.A / (float) byte.MaxValue, 0.1f) : spriteColor;
-            
+
             if (IsSelected && editing)
             {
                 //color = Color.Lerp(color, Color.Gold, 0.5f);
                 color = spriteColor;
 
+
+
                 Vector2 rectSize = rect.Size.ToVector2();
                 if (BodyWidth > 0.0f) { rectSize.X = BodyWidth; }
                 if (BodyHeight > 0.0f) { rectSize.Y = BodyHeight; }
 
                 Vector2 bodyPos = WorldPosition + BodyOffset;
 
-                GUI.DrawRectangle(spriteBatch, new Vector2(bodyPos.X, -bodyPos.Y), rectSize.X, rectSize.Y, BodyRotation, Color.White, 
+                GUI.DrawRectangle(spriteBatch, new Vector2(bodyPos.X, -bodyPos.Y), rectSize.X, rectSize.Y, BodyRotation, Color.White,
                     thickness: Math.Max(1, (int)(2 / Screen.Selected.Cam.Zoom)));
             }
 
@@ -305,14 +325,14 @@ namespace Barotrauma
                             }
                             else
                             {
-                                dropShadowOffset = IsHorizontal ? 
-                                    new Vector2(0.0f, Math.Sign(Submarine.HiddenSubPosition.Y - Position.Y) * 10.0f) : 
+                                dropShadowOffset = IsHorizontal ?
+                                    new Vector2(0.0f, Math.Sign(Submarine.HiddenSubPosition.Y - Position.Y) * 10.0f) :
                                     new Vector2(Math.Sign(Submarine.HiddenSubPosition.X - Position.X) * 10.0f, 0.0f);
                             }
                         }
                         dropShadowOffset.Y = -dropShadowOffset.Y;
                     }
-                    
+
                     SpriteEffects oldEffects = Prefab.BackgroundSprite.effects;
                     Prefab.BackgroundSprite.effects ^= SpriteEffects;
 
@@ -372,13 +392,13 @@ namespace Barotrauma
                     if (!HasDamage && i == 0)
                     {
                         drawSection = new Rectangle(
-                            drawSection.X, 
-                            drawSection.Y, 
+                            drawSection.X,
+                            drawSection.Y,
                             Sections[Sections.Length -1 ].rect.Right - drawSection.X,
                             drawSection.Y - (Sections[Sections.Length - 1].rect.Y - Sections[Sections.Length - 1].rect.Height));
                         i = Sections.Length;
                     }
-                    
+
                     Vector2 sectionOffset = new Vector2(
                         Math.Abs(rect.Location.X - drawSection.Location.X),
                         Math.Abs(rect.Location.Y - drawSection.Location.Y));
@@ -496,7 +516,7 @@ namespace Barotrauma
             }
             else
             {
-                if (!conditional.Matches(this)) { return false; }                
+                if (!conditional.Matches(this)) { return false; }
             }
             return true;
         }

Barotrauma/BarotraumaClient/ClientSource/Networking/Primitives/Peers/SteamP2PClientPeer.cs

@@ -288,7 +288,7 @@ namespace Barotrauma.Networking
             heartbeatTimer = 5.0;
 
 #if DEBUG
-            CoroutineManager.InvokeAfter(() =>
+            CoroutineManager.Invoke(() =>
             {
                 if (GameMain.Client == null) { return; }
                 if (Rand.Range(0.0f, 1.0f) < GameMain.Client.SimulatedLoss && sendType != Steamworks.P2PSend.Reliable) { return; }

Barotrauma/BarotraumaClient/ClientSource/Screens/SubEditorScreen.cs

@@ -1538,7 +1538,7 @@ namespace Barotrauma
                     var existingFiles = ContentPackage.GetFilesOfType(GameMain.VanillaContent.ToEnumerable(), contentType);
                     if (contentType == ContentType.OutpostModule)
                     {
-                        existingFiles = existingFiles.Where(f => f.Path.Contains("Ruin") == Submarine.MainSub.Info.OutpostModuleInfo.ModuleFlags.Contains("ruin"));                        
+                        existingFiles = existingFiles.Where(f => f.Path.Contains("Ruin") == Submarine.MainSub.Info.OutpostModuleInfo.ModuleFlags.Contains("ruin"));
                     }
 #else
                     var existingFiles = ContentPackage.GetFilesOfType(GameMain.Config.AllEnabledPackages.Where(c => c != GameMain.VanillaContent), contentType);
@@ -3272,7 +3272,7 @@ namespace Barotrauma
                     oldProperties[color].Add(sEntity);
                 }
 
-                List<ISerializableEntity> affected = entities.Select(t => t.Entity).Where(se => se is MapEntity { Removed: false }).ToList();
+                List<ISerializableEntity> affected = entities.Select(t => t.Entity).Where(se => se is MapEntity { Removed: false } || se is ItemComponent).ToList();
                 StoreCommand(new PropertyCommand(affected, property.Name, newColor, oldProperties));
 
                 if (MapEntity.EditingHUD != null && (MapEntity.EditingHUD.UserData == entity || (!(entity is ItemComponent ic) || MapEntity.EditingHUD.UserData == ic.Item)))