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
@@ -11,7 +11,7 @@ namespace Barotrauma
    {
        private Dictionary<string, GUIComponentStyle> componentStyles;

-        private XElement configElement;
+        private readonly XElement configElement;

        private GraphicsDevice graphicsDevice;

@@ -25,6 +25,7 @@ namespace Barotrauma
        public ScalableFont SubHeadingFont { get; private set; }
        public ScalableFont DigitalFont { get; private set; }
        public ScalableFont HotkeyFont { get; private set; }
+        public ScalableFont MonospacedFont { get; private set; }

        public Dictionary<ScalableFont, bool> ForceFontUpperCase
        {
@@ -40,12 +41,20 @@ namespace Barotrauma
        public SpriteSheet SavingIndicator { get; private set; }

        public UISprite UIGlow { 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; }

        public SpriteSheet FocusIndicator { get; private set; }

+        public UISprite IconOverflowIndicator { get; private set; }
+
        /// <summary>
        /// General green color used for elements whose colors are set from code
        /// </summary>
@@ -82,6 +91,12 @@ 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.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;
+
        public Color ColorReputationVeryLow { get; private set; } = Color.Red;
        public Color ColorReputationLow { get; private set; } = Color.Orange;
        public Color ColorReputationNeutral { get; private set; } = Color.White * 0.8f;
@@ -235,6 +250,9 @@ namespace Barotrauma
                    case "uiglow":
                        UIGlow = new UISprite(subElement);
                        break;
+                    case "pingcircle":
+                        PingCircle = new UISprite(subElement);
+                        break;
                    case "radiation":
                        RadiationSprite = new UISprite(subElement);
                        break;
@@ -244,9 +262,18 @@ namespace Barotrauma
                    case "uiglowcircular":
                        UIGlowCircular = new UISprite(subElement);
                        break;
+                    case "uiglowsolidcircular":
+                        UIGlowSolidCircular = new UISprite(subElement);
+                        break;
+                    case "uithermalglow":
+                        UIThermalGlow = new UISprite(subElement);
+                        break;
                    case "endroundbuttonpulse":
                        ButtonPulse = new UISprite(subElement);
                        break;
+                    case "iconoverflowindicator":
+                        IconOverflowIndicator = new UISprite(subElement);
+                        break;
                    case "focusindicator":
                        FocusIndicator = new SpriteSheet(subElement);
                        break;
@@ -277,6 +304,10 @@ namespace Barotrauma
                        DigitalFont = LoadFont(subElement, graphicsDevice);
                        ForceFontUpperCase[DigitalFont] = subElement.GetAttributeBool("forceuppercase", false);
                        break;
+                    case "monospacedfont":
+                        MonospacedFont = LoadFont(subElement, graphicsDevice);
+                        ForceFontUpperCase[MonospacedFont] = subElement.GetAttributeBool("forceuppercase", false);
+                        break;
                    case "hotkeyfont":
                        HotkeyFont = LoadFont(subElement, graphicsDevice);
                        ForceFontUpperCase[HotkeyFont] = subElement.GetAttributeBool("forceuppercase", false);
@@ -446,7 +477,7 @@ namespace Barotrauma

        public void Apply(GUIComponent targetComponent, string styleName = "", GUIComponent parent = null)
        {
-            GUIComponentStyle componentStyle = null;  
+            GUIComponentStyle componentStyle = null;
            if (parent != null)
            {
                GUIComponentStyle parentStyle = parent.Style;
@@ -461,7 +492,7 @@ namespace Barotrauma
                        return;
                    }
                }
-                
+
                string childStyleName = string.IsNullOrEmpty(styleName) ? targetComponent.GetType().Name : styleName;
                parentStyle.ChildStyles.TryGetValue(childStyleName.ToLowerInvariant(), out componentStyle);
            }
@@ -477,8 +508,25 @@ namespace Barotrauma
                    return;
                }
            }
-            
-            targetComponent.ApplyStyle(componentStyle);            
+
+            targetComponent.ApplyStyle(componentStyle);
+        }
+
+        public Color GetQualityColor(int quality)
+        {
+            switch (quality)
+            {
+                case 1:
+                    return ItemQualityColorGood;
+                case 2:
+                    return ItemQualityColorExcellent;
+                case 3:
+                    return ItemQualityColorMasterwork;
+                case -1:
+                    return ItemQualityColorPoor;
+                default:
+                    return ItemQualityColorNormal;
+            }
        }
    }
 }