Remove BibLayer and use sequences / RenderSprites instead.

OpenRA.Mods.RA/Buildings/Bib.cs

@@ -0,0 +1,68 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.Linq;
+using OpenRA.Graphics;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.RA.Buildings
+{
+	public class BibInfo : ITraitInfo, Requires<BuildingInfo>, Requires<RenderSpritesInfo>
+	{
+		public readonly string Sequence = "bib";
+		public readonly string Palette = "terrain";
+
+		public object Create(ActorInitializer init) { return new Bib(init.self, this); }
+	}
+
+	public class Bib : IRender
+	{
+		readonly BibInfo info;
+		readonly List<AnimationWithOffset> tiles;
+
+		public Bib(Actor self, BibInfo info)
+		{
+			this.info = info;
+
+			var rs = self.Trait<RenderSprites>();
+			var building = self.Info.Traits.Get<BuildingInfo>();
+			var width = building.Dimensions.X;
+			var bibOffset = building.Dimensions.Y - 1;
+			var centerOffset = FootprintUtils.CenterOffset(building);
+
+			tiles = new List<AnimationWithOffset>();
+			for (var i = 0; i < 2*width; i++)
+			{
+				var index = i;
+				var anim = new Animation(rs.GetImage(self));
+				anim.PlayFetchIndex(info.Sequence, () => index);
+				anim.IsDecoration = true;
+
+				// Z-order is one set to the top of the footprint
+				var offset = new CVec(i % width, i / width + bibOffset).ToWVec() - centerOffset;
+				tiles.Add(new AnimationWithOffset(anim, () => offset, null, -(offset.Y + centerOffset.Y + 512)));
+			}
+		}
+
+		bool paletteInitialized;
+		PaletteReference palette;
+		public virtual IEnumerable<IRenderable> Render(Actor self, WorldRenderer wr)
+		{
+			if (!paletteInitialized)
+			{
+				palette = wr.Palette(info.Palette);
+				paletteInitialized = true;
+			}
+
+			return tiles.SelectMany(t => t.Render(self, wr, palette, 1f));
+		}
+	}
+}

OpenRA.Mods.RA/Buildings/BibLayer.cs

@@ -1,154 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using OpenRA.FileFormats;
-using OpenRA.Graphics;
-using OpenRA.Traits;
-
-namespace OpenRA.Mods.RA.Buildings
-{
-	class BibLayerInfo : ITraitInfo
-	{
-		public object Create(ActorInitializer init) { return new BibLayer(init.self); }
-	}
-
-	struct CachedBib
-	{
-		public Dictionary<CPos, Sprite> Tiles;
-		public IEnumerable<CPos> Footprint;
-		public bool Visible;
-		public bool Immediate;
-	}
-
-	class BibLayer : IRenderOverlay, ITickRender
-	{
-		World world;
-		Dictionary<Actor, CachedBib> visible;
-		Dictionary<Actor, CachedBib> dirty;
-		Cache<string, Sprite[]> sprites;
-
-		public BibLayer(Actor self)
-		{
-			world = self.World;
-			visible = new Dictionary<Actor, CachedBib>();
-			dirty = new Dictionary<Actor, CachedBib>();
-			sprites = new Cache<string, Sprite[]>(x => Game.modData.SpriteLoader.LoadAllSprites(x));
-		}
-
-		public void Update(Actor a, CachedBib bib)
-		{
-			dirty[a] = bib;
-		}
-
-		public Sprite[] LoadSprites(string bibType)
-		{
-			return sprites[bibType];
-		}
-
-		public void TickRender(WorldRenderer wr, Actor self)
-		{
-			var remove = new List<Actor>();
-			foreach (var kv in dirty)
-			{
-				if (kv.Value.Immediate || kv.Value.Footprint.Any(c => !self.World.FogObscures(c)))
-				{
-					if (kv.Value.Visible)
-						visible[kv.Key] = kv.Value;
-					else
-						visible.Remove(kv.Key);
-
-					remove.Add(kv.Key);
-				}
-			}
-
-			foreach (var r in remove)
-				dirty.Remove(r);
-		}
-
-		public void Render(WorldRenderer wr)
-		{
-			var pal = wr.Palette("terrain");
-			var cliprect = Game.viewport.WorldBounds(world);
-
-			foreach (var bib in visible.Values)
-			{
-				foreach (var kv in bib.Tiles)
-				{
-					if (!cliprect.Contains(kv.Key.X, kv.Key.Y))
-						continue;
-
-					if (world.ShroudObscures(kv.Key))
-						continue;
-
-					kv.Value.DrawAt(wr.ScreenPxPosition(kv.Key.CenterPosition) - 0.5f * kv.Value.size, pal);
-				}
-			}
-		}
-	}
-
-	public class BibInfo : ITraitInfo, Requires<BuildingInfo>
-	{
-		public readonly string Sprite = "bib3";
-
-		public object Create(ActorInitializer init) { return new Bib(init.self, this); }
-	}
-
-	public class Bib : INotifyAddedToWorld, INotifyRemovedFromWorld
-	{
-		readonly BibInfo info;
-		readonly BibLayer bibLayer;
-		bool firstAdd;
-
-		public Bib(Actor self, BibInfo info)
-		{
-			this.info = info;
-			bibLayer = self.World.WorldActor.Trait<BibLayer>();
-			firstAdd = true;
-		}
-
-		void DoBib(Actor self, bool add)
-		{
-			var buildingInfo = self.Info.Traits.Get<BuildingInfo>();
-			var size = buildingInfo.Dimensions.X;
-			var bibOffset = buildingInfo.Dimensions.Y - 1;
-			var sprites = bibLayer.LoadSprites(info.Sprite);
-
-			if (sprites.Length != 2*size)
-				throw new InvalidOperationException("{0} is an invalid bib for a {1}-wide building".F(info.Sprite, size));
-
-			var immediate = !self.HasTrait<FrozenUnderFog>() ||
-				(firstAdd && self.Info.Traits.GetOrDefault<FrozenUnderFogInfo>().StartsRevealed);
-
-			var dirty = new CachedBib()
-			{
-				Footprint = FootprintUtils.Tiles(self),
-				Tiles = new Dictionary<CPos, Sprite>(),
-				Visible = add,
-				Immediate = immediate
-			};
-
-			for (var i = 0; i < 2 * size; i++)
-			{
-				var cell = self.Location + new CVec(i % size, i / size + bibOffset);
-				dirty.Tiles.Add(cell, sprites[i]);
-			}
-
-			firstAdd = false;
-			bibLayer.Update(self, dirty);
-		}
-
-		public void AddedToWorld(Actor self) { DoBib(self, true); }
-		public void RemovedFromWorld(Actor self) { DoBib(self, false); }
-	}
-}

OpenRA.Mods.RA/OpenRA.Mods.RA.csproj

@@ -154,7 +154,6 @@
     <Compile Include="BridgeLayer.cs" />
     <Compile Include="Buildable.cs" />
     <Compile Include="BuildingCaptureNotification.cs" />
-    <Compile Include="Buildings\BibLayer.cs" />
     <Compile Include="Buildings\Building.cs" />
     <Compile Include="Buildings\BuildingInfluence.cs" />
     <Compile Include="Buildings\CanPowerDown.cs" />
@@ -462,6 +461,7 @@
     <Compile Include="Effects\FrozenActorProxy.cs" />
     <Compile Include="Widgets\Logic\WorldTooltipLogic.cs" />
     <Compile Include="TeslaZapRenderable.cs" />
+    <Compile Include="Buildings\Bib.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">

mods/cnc/rules/structures.yaml

@@ -23,7 +23,6 @@ FACT:
 	RevealsShroud:
 		Range: 10
 	Bib:
-		Sprite: bib2
 	Production:
 		Produces: Building,Defense
 	Transforms:
@@ -73,7 +72,6 @@ NUKE:
 	RevealsShroud:
 		Range: 4
 	Bib:
-		Sprite: bib3
 
 NUK2:
 	Inherits: ^Building
@@ -98,7 +96,6 @@ NUK2:
 	RevealsShroud:
 		Range: 4
 	Bib:
-		Sprite: bib3
 
 PROC:
 	Inherits: ^Building
@@ -121,7 +118,6 @@ PROC:
 	RevealsShroud:
 		Range: 6
 	Bib:
-		Sprite: bib2
 	TiberiumRefinery:
 		DockOffset: 0,2
 		TickRate: 15
@@ -195,7 +191,6 @@ PYLE:
 	RevealsShroud:
 		Range: 5
 	Bib:
-		Sprite: bib3
 	RallyPoint:
 	Exit@1:
 		SpawnOffset: -10,2
@@ -235,7 +230,6 @@ HAND:
 	RevealsShroud:
 		Range: 5
 	Bib:
-		Sprite: bib3
 	RallyPoint:
 	Exit@1:
 		SpawnOffset: 12,24
@@ -272,7 +266,6 @@ AFLD:
 	RevealsShroud:
 		Range: 7
 	Bib:
-		Sprite: bib1
 	RallyPoint:
 		RallyPoint: 4,2
 	Exit@1:
@@ -311,7 +304,6 @@ WEAP:
 	RevealsShroud:
 		Range: 4
 	Bib:
-		Sprite: bib2
 	-RenderBuilding:
 	RenderBuildingWarFactory:
 	RallyPoint:
@@ -387,7 +379,6 @@ HQ:
 	RevealsShroud:
 		Range: 10
 	Bib:
-		Sprite: bib3
 	ProvidesRadar:
 	RenderDetectionCircle:
 	DetectCloaked:
@@ -451,7 +442,6 @@ EYE:
 	RevealsShroud:
 		Range: 10
 	Bib:
-		Sprite: bib3
 	ProvidesRadar:
 	RenderDetectionCircle:
 	DetectCloaked:
@@ -492,7 +482,6 @@ TMPL:
 	RevealsShroud:
 		Range: 6
 	Bib:
-		Sprite: bib2
 	NukePower:
 		Image: atomicnh
 		ChargeTime: 300

mods/cnc/rules/system.yaml

@@ -275,7 +275,6 @@ World:
 		Race: nod
 	ProductionQueueFromSelection:
 		ProductionTabsWidget: PRODUCTION_TABS
-	BibLayer:
 	DomainIndex:
 	ResourceLayer:
 	ResourceClaimLayer:

mods/cnc/sequences/structures.yaml

@@ -21,6 +21,9 @@ fact:
 		Start: 0
 		Length: *
 		Tick: 80
+	bib: bib2
+		Start: 0
+		Length: *
 
 nuke:
 	idle:
@@ -38,6 +41,9 @@ nuke:
 		Start: 0
 		Length: *
 		Tick: 80
+	bib: bib3
+		Start: 0
+		Length: *
 
 proc:
 	idle:
@@ -62,6 +68,9 @@ proc:
 		Start: 6
 		Length: 6
 		Offset: -32,-21
+	bib: bib2
+		Start: 0
+		Length: *
 
 silo:
 	idle:
@@ -76,6 +85,9 @@ silo:
 		Start: 0
 		Length: *
 		Tick: 80
+	bib: bib3
+		Start: 0
+		Length: *
 
 hand:
 	idle:
@@ -88,6 +100,9 @@ hand:
 		Start: 0
 		Length: *
 		Tick: 80
+	bib: bib3
+		Start: 0
+		Length: *
 
 pyle:
 	idle:
@@ -105,6 +120,9 @@ pyle:
 		Start: 0
 		Length: *
 		Tick: 80
+	bib: bib3
+		Start: 0
+		Length: *
 
 weap:
 	idle:
@@ -127,6 +145,9 @@ weap:
 		Start: 0
 		Length: *
 		Tick: 80
+	bib: bib2
+		Start: 0
+		Length: *
 
 afld:
 	idle:
@@ -154,6 +175,9 @@ afld:
 		Start: 0
 		Length: *
 		Tick: 80
+	bib: bib1
+		Start: 0
+		Length: *
 
 hq:
 	idle:
@@ -170,6 +194,9 @@ hq:
 		Start: 0
 		Length: *
 		Tick: 80
+	bib: bib3
+		Start: 0
+		Length: *
 
 nuk2:
 	idle:
@@ -186,6 +213,9 @@ nuk2:
 		Start: 0
 		Length: *
 		Tick: 80
+	bib: bib3
+		Start: 0
+		Length: *
 
 hpad:
 	idle:
@@ -249,6 +279,9 @@ eye:
 		Start: 0
 		Length: *
 		Tick: 80
+	bib: bib3
+		Start: 0
+		Length: *
 
 tmpl:
 	idle:
@@ -267,6 +300,9 @@ tmpl:
 		Start: 0
 		Length: *
 		Tick: 60
+	bib: bib2
+		Start: 0
+		Length: *
 
 obli:
 	idle:

mods/d2k/rules/structures.yaml

@@ -6,7 +6,6 @@
 		Dimensions: 3,2
 		Adjacent: 4
 	Bib:
-		Sprite: bib3x
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 1000
@@ -54,7 +53,6 @@
 		Footprint: xx xx
 		Dimensions: 2,2
 	Bib:
-		Sprite: bib2x
 	Health:
 		HP: 400
 	Armor:
@@ -83,7 +81,6 @@
 		Footprint: =x xx
 		Dimensions: 2,2
 	Bib:
-		Sprite: bib2x
 	Health:
 		HP: 800
 	Armor:
@@ -126,7 +123,6 @@
 		Footprint: xxx x==
 		Dimensions: 3,2
 	Bib:
-		Sprite: bib3x
 	Health:
 		HP: 900
 	Armor:
@@ -201,7 +197,6 @@
 		Footprint: xxx xx=
 		Dimensions: 3,2
 	Bib:
-		Sprite: bib3x
 	Health:
 		HP: 750
 	Armor:
@@ -240,7 +235,6 @@
 		Footprint: _x_ xxx =xx
 		Dimensions: 3,3
 	Bib:
-		Sprite: bib3x
 	Health:
 		HP: 1500
 	Armor:
@@ -281,7 +275,6 @@
 		Footprint: xxx xxx
 		Dimensions: 3,2
 	Bib:
-		Sprite: bib3x
 	Health:
 		HP: 1000
 	Armor:
@@ -312,7 +305,6 @@
 		Footprint: xxx x=x =x=
 		Dimensions: 3,3
 	Bib:
-		Sprite: bib3x
 	Health:
 		HP: 1000
 	Armor:
@@ -551,7 +543,6 @@ REPAIR:
 		Footprint: _x_ xxx xxx
 		Dimensions: 3,3
 	Bib:
-		Sprite: bib3x
 	Health:
 		HP: 1500
 	Armor:
@@ -593,7 +584,6 @@ RESEARCH:
 		Footprint: xxx xxx
 		Dimensions: 3,2
 	Bib:
-		Sprite: bib3x
 	Health:
 		HP: 1000
 	Armor:
@@ -622,7 +612,6 @@ RESEARCH:
 		Footprint: _x_ xxx =xx
 		Dimensions: 3,3
 	Bib:
-		Sprite: bib3x
 	Health:
 		HP: 2000
 	Armor:
@@ -670,8 +659,6 @@ PALACEC:
 	Building:
 		Footprint: xxx xxx
 		Dimensions: 3,2
-	Bib:
-		Sprite: bib3x
 	RenderBuilding:
 		HasMakeAnimation: false
 

mods/d2k/rules/system.yaml

@@ -354,7 +354,6 @@ World:
 	Country@Ordos:
 		Name: Ordos
 		Race: ordos
-	BibLayer:
 	DomainIndex:
 	ResourceLayer:
 	ResourceClaimLayer:

mods/d2k/sequences/structures.yaml

@@ -54,6 +54,9 @@ conyarda:
 		Length: *
 	damaged-idle:
 		Start: 1
+	bib: bib3x
+		Start: 0
+		Length: *
 	#build: cranea
 	#	Start: 0
 	#	Length: 14
@@ -101,6 +104,9 @@ starporta:
 	make: starportmake
 		Start: 0
 		Length: *
+	bib: bib3x
+		Start: 0
+		Length: *
 
 pwra:
 	idle:
@@ -112,6 +118,9 @@ pwra:
 		Length: *
 	damaged-idle:
 		Start: 6
+	bib: bib2x
+		Start: 0
+		Length: *
 
 barra:
 	idle:
@@ -121,6 +130,9 @@ barra:
 		Length: *
 	damaged-idle:
 		Start: 1
+	bib: bib2x
+		Start: 0
+		Length: *
 
 radara:
 	idle:
@@ -130,6 +142,9 @@ radara:
 		Length: *
 	damaged-idle:
 		Start: 1
+	bib: bib3x
+		Start: 0
+		Length: *
 
 refa:
 	idle:
@@ -150,6 +165,9 @@ refa:
 		Start: 1
 	damaged-idle-top:
 		Start: 2
+	bib: bib3x
+		Start: 0
+		Length: *
 
 siloa:
 	idle:
@@ -170,6 +188,9 @@ hightecha:
 		Length: *
 	damaged-idle:
 		Start: 1
+	bib: bib3x
+		Start: 0
+		Length: *
 
 research:
 	idle:
@@ -183,6 +204,9 @@ research:
 		Start: 20
 		Length: 20
 		Tick: 80
+	bib: bib3x
+		Start: 0
+		Length: *
 
 palacea:
 	idle:
@@ -192,7 +216,9 @@ palacea:
 		Length: *
 	damaged-idle:
 		Start: 1
-
+	bib: bib3x
+		Start: 0
+		Length: *
 
 lighta:
 	idle:
@@ -213,6 +239,9 @@ lighta:
 		Start: 1
 	damaged-idle-top:
 		Start: 2
+	bib: bib3x
+		Start: 0
+		Length: *
 
 heavya:
 	idle:
@@ -233,6 +262,9 @@ heavya:
 		Start: 1
 	damaged-idle-top:
 		Start: 2
+	bib: bib3x
+		Start: 0
+		Length: *
 
 conyardh:
 	idle:
@@ -242,6 +274,9 @@ conyardh:
 		Length: *
 	damaged-idle:
 		Start: 1
+	bib: bib3x
+		Start: 0
+		Length: *
 
 starporth:
 	idle:
@@ -260,6 +295,9 @@ starporth:
 	make: starportmake
 		Start: 0
 		Length: *
+	bib: bib3x
+		Start: 0
+		Length: *
 
 pwrh:
 	idle:
@@ -271,6 +309,9 @@ pwrh:
 		Length: *
 	damaged-idle:
 		Start: 6
+	bib: bib2x
+		Start: 0
+		Length: *
 
 barrh:
 	idle:
@@ -280,6 +321,9 @@ barrh:
 		Length: *
 	damaged-idle:
 		Start: 1
+	bib: bib2x
+		Start: 0
+		Length: *
 
 radarh:
 	idle:
@@ -289,6 +333,9 @@ radarh:
 		Length: *
 	damaged-idle:
 		Start: 1
+	bib: bib3x
+		Start: 0
+		Length: *
 
 refh:
 	idle:
@@ -309,6 +356,9 @@ refh:
 		Start: 1
 	damaged-idle-top:
 		Start: 2
+	bib: bib3x
+		Start: 0
+		Length: *
 
 siloh:
 	idle:
@@ -329,6 +379,9 @@ hightechh:
 		Length: *
 	damaged-idle:
 		Start: 1
+	bib: bib3x
+		Start: 0
+		Length: *
 
 palaceh:
 	idle:
@@ -346,6 +399,9 @@ palaceh:
 		Start: 8
 		Length: 6
 		Tick: 160
+	bib: bib3x
+		Start: 0
+		Length: *
 
 lighth:
 	idle:
@@ -366,6 +422,9 @@ lighth:
 		Start: 1
 	damaged-idle-top:
 		Start: 2
+	bib: bib3x
+		Start: 0
+		Length: *
 
 heavyh:
 	idle:
@@ -386,6 +445,9 @@ heavyh:
 		Start: 1
 	damaged-idle-top:
 		Start: 2
+	bib: bib3x
+		Start: 0
+		Length: *
 
 conyardo:
 	idle:
@@ -395,6 +457,9 @@ conyardo:
 		Length: *
 	damaged-idle:
 		Start: 1
+	bib: bib3x
+		Start: 0
+		Length: *
 
 starporto:
 	idle:
@@ -413,6 +478,9 @@ starporto:
 	make: starportmake
 		Start: 0
 		Length: *
+	bib: bib3x
+		Start: 0
+		Length: *
 
 pwro:
 	idle:
@@ -424,6 +492,9 @@ pwro:
 		Length: *
 	damaged-idle:
 		Start: 6
+	bib: bib2x
+		Start: 0
+		Length: *
 
 barro:
 	idle:
@@ -433,6 +504,9 @@ barro:
 		Length: *
 	damaged-idle:
 		Start: 1
+	bib: bib2x
+		Start: 0
+		Length: *
 
 radaro:
 	idle:
@@ -442,6 +516,9 @@ radaro:
 		Length: *
 	damaged-idle:
 		Start: 1
+	bib: bib3x
+		Start: 0
+		Length: *
 
 refo:
 	idle:
@@ -462,6 +539,9 @@ refo:
 		Start: 1
 	damaged-idle-top:
 		Start: 2
+	bib: bib3x
+		Start: 0
+		Length: *
 
 siloo:
 	idle:
@@ -482,6 +562,9 @@ hightecho:
 		Length: *
 	damaged-idle:
 		Start: 1
+	bib: bib3x
+		Start: 0
+		Length: *
 
 palaceo:
 	idle:
@@ -491,7 +574,9 @@ palaceo:
 		Length: *
 	damaged-idle:
 		Start: 1
-
+	bib: bib3x
+		Start: 0
+		Length: *
 
 lighto:
 	idle:
@@ -512,6 +597,9 @@ lighto:
 		Start: 1
 	damaged-idle-top:
 		Start: 2
+	bib: bib3x
+		Start: 0
+		Length: *
 
 heavyo:
 	idle:
@@ -532,12 +620,18 @@ heavyo:
 		Start: 1
 	damaged-idle-top:
 		Start: 2
+	bib: bib3x
+		Start: 0
+		Length: *
 
 palacec:
 	idle:
 		Start: 0
 	damaged-idle:
 		Start: 1
+	bib: bib3x
+		Start: 0
+		Length: *
 
 starportc:
 	idle:
@@ -556,6 +650,9 @@ starportc:
 	make: starportmake
 		Start: 0
 		Length: *
+	bib: bib3x
+		Start: 0
+		Length: *
 
 heavyc:
 	idle:
@@ -576,3 +673,6 @@ heavyc:
 		Start: 1
 	damaged-idle-top:
 		Start: 2
+	bib: bib3x
+		Start: 0
+		Length: *

mods/ra/maps/Fort-Lonestar/map.yaml

@@ -521,7 +521,6 @@ Rules:
 		Armor:
 			Type: Wood
 		Bib:
-			Sprite: bib3
 		RevealsShroud:
 			Range: 3
 		Capturable:

mods/ra/rules/civilian.yaml

@@ -69,7 +69,6 @@ FCOM:
 	RevealsShroud:
 		Range: 10
 	Bib:
-		Sprite: bib3
 
 HOSP:
 	Inherits: ^TechBuilding
@@ -301,7 +300,6 @@ MISS:
 	Tooltip:
 		Name: Technology Center
 	Bib:
-		Sprite: bib2
 
 BIO:
 	Inherits: ^TechBuilding
@@ -321,7 +319,6 @@ OILB:
 	Health:
 		HP: 1000
 	Bib:
-		Sprite: bib3
 	RevealsShroud:
 		Range: 3
 	Capturable:

mods/ra/rules/structures.yaml

@@ -378,7 +378,6 @@ DOME:
 	RevealsShroud:
 		Range: 10
 	Bib:
-		Sprite: bib3
 	ProvidesRadar:
 	IronCurtainable:
 	Infiltratable:
@@ -853,7 +852,6 @@ ATEK:
 	RevealsShroud:
 		Range: 10
 	Bib:
-		Sprite: bib3
 	IronCurtainable:
 	GpsPower:
 		Image: gpssicon
@@ -890,7 +888,6 @@ WEAP:
 	RevealsShroud:
 		Range: 4
 	Bib:
-		Sprite: bib2
 	-RenderBuilding:
 	RenderBuildingWarFactory:
 	RallyPoint:
@@ -920,7 +917,6 @@ FACT:
 	RevealsShroud:
 		Range: 5
 	Bib:
-		Sprite: bib2
 	Production:
 		Produces: Building,Defense
 	IronCurtainable: 
@@ -964,7 +960,6 @@ PROC:
 	RevealsShroud:
 		Range: 6
 	Bib:
-		Sprite: bib2
 	OreRefinery:
 	StoresOre:
 		PipCount: 17
@@ -1040,7 +1035,6 @@ HPAD:
 	RevealsShroud:
 		Range: 5
 	Bib:
-		Sprite: bib3
 	Exit@1:
 		SpawnOffset: 0,-6
 		ExitCell: 0,0
@@ -1126,7 +1120,6 @@ POWR:
 	RevealsShroud:
 		Range: 4
 	Bib:
-		Sprite: bib3
 	IronCurtainable:
 	DeadBuildingState:
 
@@ -1156,7 +1149,6 @@ APWR:
 	RevealsShroud:
 		Range: 4
 	Bib:
-		Sprite: bib2
 	IronCurtainable:
 	DeadBuildingState:
 
@@ -1186,7 +1178,6 @@ STEK:
 	RevealsShroud:
 		Range: 4
 	Bib:
-		Sprite: bib2
 	IronCurtainable:
 
 BARR:
@@ -1213,7 +1204,6 @@ BARR:
 	RevealsShroud:
 		Range: 5
 	Bib:
-		Sprite: bib3
 	RallyPoint:
 	Exit@1:
 		SpawnOffset: -4,19
@@ -1251,7 +1241,6 @@ TENT:
 	RevealsShroud:
 		Range: 5
 	Bib:
-		Sprite: bib3
 	RallyPoint:
 	Exit@1:
 		SpawnOffset: -1,19
@@ -1333,7 +1322,6 @@ FACF:
 	RevealsShroud:
 		Range: 4
 	Bib:
-		Sprite: bib2
 	RenderBuilding:
 		Image: FACT
 	Fake:
@@ -1363,7 +1351,6 @@ WEAF:
 	RevealsShroud:
 		Range: 4
 	Bib:
-		Sprite: bib2
 	-RenderBuilding:
 	RenderBuildingWarFactory:
 		Image: WEAP
@@ -1456,7 +1443,6 @@ DOMF:
 	RevealsShroud:
 		Range: 4
 	Bib:
-		Sprite: bib3
 	RenderBuilding:
 		Image: DOME
 	Fake:

mods/ra/rules/system.yaml

@@ -610,7 +610,6 @@ World:
 	Country@1:
 		Name: Soviet
 		Race: soviet
-	BibLayer:
 	DomainIndex:
 	ResourceLayer:
 	ResourceClaimLayer:

mods/ra/sequences/structures.yaml

@@ -6,6 +6,9 @@ fcom:
 	make: fcommake
 		Start: 0
 		Length: *
+	bib: bib3
+		Start: 0
+		Length: *
 
 hosp:
 	idle:
@@ -35,7 +38,9 @@ oilb:
 		Length: *
 	make:
 		Start: 0
-
+	bib: bib3
+		Start: 0
+		Length: *
 fact:
 	idle:
 		Start: 0
@@ -52,6 +57,9 @@ fact:
 		Length: 25
 	dead: factdead
 		Start: 0
+	bib: bib2
+		Start: 0
+		Length: *
 
 proc:
 	idle:
@@ -63,6 +71,9 @@ proc:
 		Length: *
 	dead: procdead
 		Start: 0
+	bib: bib2
+		Start: 0
+		Length: *
 
 silo:
 	idle: silo2
@@ -85,6 +96,9 @@ powr:
 		Length: *
 	dead: powrdead
 		Start: 0
+	bib: bib3
+		Start: 0
+		Length: *
 
 apwr:
 	idle:
@@ -96,6 +110,9 @@ apwr:
 		Length: *
 	dead: apwrdead
 		Start: 0
+	bib: bib2
+		Start: 0
+		Length: *
 
 barr:
 	idle:
@@ -107,6 +124,9 @@ barr:
 	make: barrmake
 		Start: 0
 		Length: *
+	bib: bib3
+		Start: 0
+		Length: *
 
 tent:
 	idle:
@@ -118,6 +138,9 @@ tent:
 	make: tentmake
 		Start: 0
 		Length: *
+	bib: bib3
+		Start: 0
+		Length: *
 
 kenn:
 	idle:
@@ -136,6 +159,9 @@ dome:
 	make: domemake
 		Start: 0
 		Length: *
+	bib: bib3
+		Start: 0
+		Length: *
 
 atek:
 	idle:
@@ -149,6 +175,9 @@ atek:
 		Start: 0
 		Length: *
 		Offset: -4,0
+	bib: bib3
+		Start: 0
+		Length: *
 
 stek:
 	idle:
@@ -158,6 +187,9 @@ stek:
 	make: stekmake
 		Start: 0
 		Length: *
+	bib: bib2
+		Start: 0
+		Length: *
 
 weap:
 	idle:
@@ -177,6 +209,9 @@ weap:
 		Start: 0
 	damaged-idle-top: weap2
 		Start: 4
+	bib: bib2
+		Start: 0
+		Length: *
 
 hpad:
 	idle:
@@ -196,6 +231,9 @@ hpad:
 	make: hpadmake
 		Start: 0
 		Length: *
+	bib: bib3
+		Start: 0
+		Length: *
 
 afld:
 	idle: afldidle
@@ -436,6 +474,9 @@ miss:
 	make: missmake
 		Start: 0
 		Length: *
+	bib: bib2
+		Start: 0
+		Length: *
 
 brik:
 	idle: