Unstable 0.1400.1.0

Barotrauma/BarotraumaClient/ClientSource/Map/Explosion.cs

@@ -77,9 +77,9 @@ namespace Barotrauma
 
             if (flash)
             {
-                float displayRange = flashRange.HasValue ? flashRange.Value : Attack.Range;
+                float displayRange = flashRange ?? Attack.Range;
                 if (displayRange < 0.1f) { return; }
-                var light = new LightSource(worldPosition, displayRange, Color.LightYellow, null);
+                var light = new LightSource(worldPosition, displayRange, flashColor, null);
                 CoroutineManager.StartCoroutine(DimLight(light));
             }
         }

Barotrauma/BarotraumaClient/ClientSource/Map/Hull.cs

@@ -629,9 +629,9 @@ namespace Barotrauma
                         PowerConsumptionTimer = message.ReadSingle()
                     };
                 }
-                else if (BallastFlora != null)
+                else
                 {
-                    BallastFlora.ClientRead(message, header);
+                    BallastFlora?.ClientRead(message, header);
                 }
                 return;
             }

Barotrauma/BarotraumaClient/ClientSource/Map/Levels/LevelObjects/LevelObject.cs

@@ -210,7 +210,7 @@ namespace Barotrauma
                     if (ParticleEmitterTriggers[i] != null && !ParticleEmitterTriggers[i].IsTriggered) { continue; }
                     Vector2 emitterPos = LocalToWorld(Prefab.EmitterPositions[i]);
                     ParticleEmitters[i].Emit(deltaTime, emitterPos, hullGuess: null,
-                        angle: ParticleEmitters[i].Prefab.CopyEntityAngle ? -CurrentRotation + MathHelper.PiOver2 : 0.0f);
+                        angle: ParticleEmitters[i].Prefab.Properties.CopyEntityAngle ? -CurrentRotation + MathHelper.PiOver2 : 0.0f);
                 }
             }
 
@@ -293,6 +293,12 @@ namespace Barotrauma
         public void ClientRead(IReadMessage msg)
         {
             if (Triggers == null) { return; }
+
+            if (Prefab.TakeLevelWallDamage)
+            {
+                float newHealth = msg.ReadRangedSingle(0.0f, Prefab.Health, 8);
+                AddDamage(Health - newHealth, 1.0f, null, isNetworkEvent: true);
+            }
             for (int i = 0; i < Triggers.Count; i++)
             {
                 if (!Triggers[i].UseNetworkSyncing) { continue; }

Barotrauma/BarotraumaClient/ClientSource/Map/Levels/LevelObjects/LevelObjectManager.cs

@@ -20,6 +20,8 @@ namespace Barotrauma
         const int MaxVisibleObjects = 500;
 
         private Rectangle currentGridIndices;
+
+        public bool ForceRefreshVisibleObjects;
         
         partial void UpdateProjSpecific(float deltaTime)
         {
@@ -60,6 +62,8 @@ namespace Barotrauma
                     if (objectGrid[x, y] == null) { continue; }
                     foreach (LevelObject obj in objectGrid[x, y])
                     {
+                        if (obj.Prefab.HideWhenBroken && obj.Health <= 0.0f) { continue; }
+
                         if (zoom < 0.05f)
                         {
                             //hide if the sprite is very small when zoomed this far out
@@ -154,9 +158,10 @@ namespace Barotrauma
             indices.Height = Math.Min(indices.Height, objectGrid.GetLength(1) - 1);
 
             float z = 0.0f;
-            if (currentGridIndices != indices && Timing.TotalTime > NextRefreshTime)
+            if (ForceRefreshVisibleObjects || (currentGridIndices != indices && Timing.TotalTime > NextRefreshTime))
             {
                 RefreshVisibleObjects(indices, cam.Zoom);
+                ForceRefreshVisibleObjects = false;
                 if (cam.Zoom < 0.1f)
                 {
                     //when zoomed very far out, refresh a little less often

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

@@ -361,6 +361,7 @@ namespace Barotrauma.Lights
 
             void DrawHalo(Character character)
             {
+                if (character == null || character.Removed) { return; }
                 Vector2 haloDrawPos = character.DrawPosition;
                 haloDrawPos.Y = -haloDrawPos.Y;
 
@@ -404,7 +405,7 @@ namespace Barotrauma.Lights
                 }
                 foreach (Item item in Item.ItemList)
                 {
-                    if (item.IsHighlighted && !highlightedEntities.Contains(item))
+                    if ((item.IsHighlighted || item.IconStyle != null) && !highlightedEntities.Contains(item))
                     {
                         highlightedEntities.Add(item);
                     }
@@ -425,7 +426,14 @@ namespace Barotrauma.Lights
             {
                 if (highlighted is Item item)
                 {
-                    item.Draw(spriteBatch, false, true);
+                    if (item.IconStyle != null && (item != Character.Controlled.FocusedItem || Character.Controlled.FocusedItem == null))
+                    {
+                        //wait until next pass
+                    }
+                    else
+                    {
+                        item.Draw(spriteBatch, false, true);
+                    }
                 }
                 else if (highlighted is Character character)
                 {
@@ -434,6 +442,22 @@ namespace Barotrauma.Lights
             }
             spriteBatch.End();
 
+            //draw items with iconstyles in the style's color
+            spriteBatch.Begin(SpriteSortMode.Immediate, BlendState.Additive, samplerState: SamplerState.LinearWrap, effect: SolidColorEffect, transformMatrix: spriteBatchTransform);
+            foreach (Entity highlighted in highlightedEntities)
+            {
+                if (highlighted is Item item)
+                {
+                    if (item.IconStyle != null && (item != Character.Controlled.FocusedItem || Character.Controlled.FocusedItem == null))
+                    {
+                        SolidColorEffect.Parameters["color"].SetValue(item.IconStyle.Color.ToVector4());
+                        SolidColorEffect.CurrentTechnique.Passes[0].Apply();
+                        item.Draw(spriteBatch, false, true);
+                    }
+                }
+            }
+            spriteBatch.End();
+
             //draw characters in black with a bit of blur, leaving the white edges visible
             float phase = (float)(Math.Sin(Timing.TotalTime * 3.0f) + 1.0f) / 2.0f; //phase oscillates between 0 and 1
             Vector4 overlayColor = Color.Black.ToVector4() * MathHelper.Lerp(0.5f, 0.9f, phase);

Barotrauma/BarotraumaClient/ClientSource/Map/Map/Map.cs

@@ -607,15 +607,18 @@ namespace Barotrauma
                             tooltip = (new Rectangle(typeChangeIconPos.ToPoint(), new Point(30)), location.LastTypeChangeMessage);
                         }
                     }
-                    if (location != CurrentLocation && CurrentLocation.AvailableMissions.Any(m => m.Locations.Contains(location)) && generationParams.MissionIcon != null)
+                    if (location != CurrentLocation && generationParams.MissionIcon != null)
                     {
-                        Vector2 missionIconPos = pos + new Vector2(1.35f, 0.35f) * generationParams.LocationIconSize * 0.5f * zoom;
-                        float missionIconScale = 18.0f / generationParams.MissionIcon.SourceRect.Width;
-                        generationParams.MissionIcon.Draw(spriteBatch, missionIconPos, generationParams.IndicatorColor, scale: missionIconScale * zoom);
-                        if (Vector2.Distance(PlayerInput.MousePosition, missionIconPos) < generationParams.MissionIcon.SourceRect.Width * zoom && IsPreferredTooltip(missionIconPos))
+                        if ((CurrentLocation == currentDisplayLocation && CurrentLocation.AvailableMissions.Any(m => m.Locations.Contains(location))) || location.AvailableMissions.Any(m => m.Prefab.Type == MissionType.GoTo))
                         {
-                            var availableMissions = CurrentLocation.AvailableMissions.Where(m => m.Locations.Contains(location));
-                            tooltip = (new Rectangle(missionIconPos.ToPoint(), new Point(30)), TextManager.Get("mission") + '\n'+ string.Join('\n', availableMissions.Select(m => "- " + m.Name)));
+                            Vector2 missionIconPos = pos + new Vector2(1.35f, 0.35f) * generationParams.LocationIconSize * 0.5f * zoom;
+                            float missionIconScale = 18.0f / generationParams.MissionIcon.SourceRect.Width;
+                            generationParams.MissionIcon.Draw(spriteBatch, missionIconPos, generationParams.IndicatorColor, scale: missionIconScale * zoom);
+                            if (Vector2.Distance(PlayerInput.MousePosition, missionIconPos) < generationParams.MissionIcon.SourceRect.Width * zoom && IsPreferredTooltip(missionIconPos))
+                            {
+                                var availableMissions = CurrentLocation.AvailableMissions.Where(m => m.Locations.Contains(location)).Concat(location.AvailableMissions.Where(m => m.Prefab.Type == MissionType.GoTo)).Distinct();
+                                tooltip = (new Rectangle(missionIconPos.ToPoint(), new Point(30)), TextManager.Get("mission") + '\n'+ string.Join('\n', availableMissions.Select(m => "- " + m.Name)));
+                            }
                         }
                     }
 

Barotrauma/BarotraumaClient/ClientSource/Map/Structure.cs

@@ -153,7 +153,7 @@ namespace Barotrauma
                 OnClicked = (button, data) =>
                 {
                     Sprite.ReloadXML();
-                    Sprite.ReloadTexture();
+                    Sprite.ReloadTexture(updateAllSprites: true);
                     return true;
                 }
             };