Release v0.15.12.0

2021-10-27 18:50:57 +03:00
parent bf95e82d80
commit 234fb6bc06
450 changed files with 26042 additions and 10457 deletions
@@ -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;
        }