(aee208587) Option to configure multiple sprite variants for a LevelObject, implemented new ice/rock sprites

Barotrauma/BarotraumaShared/Source/Map/Levels/LevelObjects/LevelObject.cs

@@ -20,6 +20,8 @@ namespace Barotrauma
 
         public float Rotation;
 
+        private int spriteIndex;
+
         public LevelObjectPrefab ActivePrefab;
 
         public PhysicsBody PhysicsBody
@@ -40,6 +42,15 @@ namespace Barotrauma
             set { Triggers.ForEach(t => t.NeedsNetworkSyncing = false); }
         }
 
+        public Sprite Sprite
+        {
+            get { return spriteIndex < 0 || Prefab.Sprites.Count == 0 ? null : Prefab.Sprites[spriteIndex % Prefab.Sprites.Count]; }
+        }
+        public Sprite SpecularSprite
+        {
+            get { return spriteIndex < 0 || Prefab.SpecularSprites.Count == 0 ? null : Prefab.SpecularSprites[spriteIndex % Prefab.SpecularSprites.Count]; }
+        }
+
         public LevelObject(LevelObjectPrefab prefab, Vector3 position, float scale, float rotation = 0.0f)
         {
             Triggers = new List<LevelTrigger>();
@@ -49,6 +60,8 @@ namespace Barotrauma
             Scale = scale;
             Rotation = rotation;
 
+            spriteIndex = ActivePrefab.Sprites.Any() ? Rand.Int(ActivePrefab.Sprites.Count, Rand.RandSync.Server) : -1;
+
             if (prefab.PhysicsBodyElement != null)
             {
                 PhysicsBody = new PhysicsBody(prefab.PhysicsBodyElement, ConvertUnits.ToSimUnits(new Vector2(position.X, position.Y)), Scale);

Barotrauma/BarotraumaShared/Source/Map/Levels/LevelObjects/LevelObjectManager.cs

@@ -166,7 +166,7 @@ namespace Barotrauma
                 Vector2.Zero, Vector2.Zero, Vector2.Zero, Vector2.Zero
             };
 
-            Sprite sprite = newObject.Prefab.Sprite ?? newObject.Prefab.DeformableSprite?.Sprite;
+            Sprite sprite = newObject.Sprite ?? newObject.Prefab.DeformableSprite?.Sprite;
 
             //calculate the positions of the corners of the rotated sprite
             if (sprite != null)

Barotrauma/BarotraumaShared/Source/Map/Levels/LevelObjects/LevelObjectPrefab.cs

@@ -43,18 +43,18 @@ namespace Barotrauma
             SeaFloor = 4,
             MainPath = 8
         }
-        
-        public Sprite Sprite
-        {
-            get;
-            private set;
-        }
 
-        public Sprite SpecularSprite
+        public List<Sprite> Sprites
         {
             get;
             private set;
-        }
+        } = new List<Sprite>();
+
+        public List<Sprite> SpecularSprites
+        {
+            get;
+            private set;
+        } = new List<Sprite>();
 
         public DeformableSprite DeformableSprite
         {
@@ -319,7 +319,7 @@ namespace Barotrauma
             //use the maximum width of the sprite as the minimum surface width if no value is given
             if (element != null && !element.Attributes("minsurfacewidth").Any())
             {
-                if (Sprite != null) MinSurfaceWidth = Sprite.size.X * MaxSize;
+                if (Sprites.Any()) MinSurfaceWidth = Sprites[0].size.X * MaxSize;
                 if (DeformableSprite != null) MinSurfaceWidth = Math.Max(MinSurfaceWidth, DeformableSprite.Size.X * MaxSize);
             }
         }
@@ -331,10 +331,10 @@ namespace Barotrauma
                 switch (subElement.Name.ToString().ToLowerInvariant())
                 {
                     case "sprite":
-                        Sprite = new Sprite(subElement, lazyLoad: true);
+                        Sprites.Add( new Sprite(subElement, lazyLoad: true));
                         break;
                     case "specularsprite":
-                        SpecularSprite = new Sprite(subElement, lazyLoad: true);
+                        SpecularSprites.Add(new Sprite(subElement, lazyLoad: true));
                         break;
                     case "deformablesprite":
                         DeformableSprite = new DeformableSprite(subElement, lazyLoad: true);
@@ -358,9 +358,9 @@ namespace Barotrauma
                     case "overrideproperties":
                         var propertyOverride = new LevelObjectPrefab(subElement);
                         OverrideProperties[OverrideProperties.Count - 1] = propertyOverride;
-                        if (propertyOverride.Sprite == null && propertyOverride.DeformableSprite == null)
+                        if (!propertyOverride.Sprites.Any() && propertyOverride.DeformableSprite == null)
                         {
-                            propertyOverride.Sprite = Sprite;
+                            propertyOverride.Sprites = Sprites;
                             propertyOverride.DeformableSprite = DeformableSprite;
                         }
                         break;