Adds minibibs for bibless buildings in RA and C&C.

AUTHORS

@@ -41,6 +41,7 @@ Also thanks to:
     * Jeff Harris (jeff_1amstudios)
     * Jes
     * Joakim Lindberg (booom3)
+    * Kanar
     * Kenny Hoxworth (hoxworth)
     * Krishnakanth Mallik
     * Kyrre Soerensen (zypres)

CHANGELOG

@@ -79,6 +79,7 @@ NEW:
 		Increased the submarine detection range of Gunboat from 3 to 4.
 		Fixed Spies having an enemy color health bar when disguised as a friendly unit (occurred using the Team Health Colors setting).
 		Chrono Tanks can now be teleported in groups by holding SHIFT or ALT and issuing a move order.
+		Added Minibibs for bibless buildings.
 	Tiberian Dawn:
 		Chinook rotors now counter-rotate.
 		Commando can now plant C4 on bridges.
@@ -107,6 +108,7 @@ NEW:
 		Increased Obelisk of Light laser damage from 200 to 360.
 		Fixed Obelisk of Light charge animation and sound not playing.
 		Replaced or improved several mouse cursors.
+		Added Minibibs for bibless buildings.
 	Engine:
 		Converted Aircraft CruiseAltitude to world coordinates.
 		Converted Health Radius to world coordinates.

OpenRA.Mods.RA/Buildings/Bib.cs

@@ -19,6 +19,7 @@ namespace OpenRA.Mods.RA.Buildings
 	{
 		public readonly string Sequence = "bib";
 		public readonly string Palette = "terrain";
+		public readonly bool HasMinibib = false;
 
 		public object Create(ActorInitializer init) { return new Bib(init.self, this); }
 	}
@@ -42,7 +43,12 @@ namespace OpenRA.Mods.RA.Buildings
 			var centerOffset = FootprintUtils.CenterOffset(building);
 			var location = self.Location;
 			tiles = new List<AnimationWithOffset>();
-			for (var i = 0; i < 2*width; i++)
+
+			int rows = 2;
+			if (info.HasMinibib)
+				rows = 1;
+
+			for (var i = 0; i < rows * width; i++)
 			{
 				var index = i;
 				var anim = new Animation(rs.GetImage(self));

OpenRA.Mods.RA/Buildings/Building.cs

@@ -65,7 +65,8 @@ namespace OpenRA.Mods.RA.Buildings
 				return false;
 
 			var buildingMaxBounds = (CVec)Dimensions;
-			if (Rules.Info[buildingName].Traits.Contains<BibInfo>())
+			var buildingTraits = Rules.Info[buildingName].Traits;
+			if (buildingTraits.Contains<BibInfo>() && !(buildingTraits.Get<BibInfo>().HasMinibib))
 				buildingMaxBounds += new CVec(0, 1);
 
 			var scanStart = world.ClampToWorld(topLeft - new CVec(Adjacent, Adjacent));

OpenRA.Mods.RA/Buildings/FootprintUtils.cs

@@ -22,7 +22,8 @@ namespace OpenRA.Mods.RA.Buildings
 
 			var footprint = buildingInfo.Footprint.Where(x => !char.IsWhiteSpace(x));
 
-			if (Rules.Info[ name ].Traits.Contains<BibInfo>())
+			var buildingTraits = Rules.Info[name].Traits;
+			if (buildingTraits.Contains<BibInfo>() && !(buildingTraits.Get<BibInfo>().HasMinibib))
 			{
 				dim += new CVec(0, 1);
 				footprint = footprint.Concat(new char[dim.X]);

mods/cnc/rules/structures.yaml

@@ -151,6 +151,8 @@ SILO:
 		HP: 400
 	RevealsShroud:
 		Range: 4c0
+	Bib:
+		HasMinibib: Yes
 	RenderBuildingSilo:
 	StoresOre:
 		PipCount: 10
@@ -408,6 +410,8 @@ FIX:
 		HP: 400
 	RevealsShroud:
 		Range: 5c0
+	Bib:
+		HasMinibib: Yes
 	Reservable:
 	RepairsUnits:
 	RallyPoint:
@@ -517,6 +521,8 @@ GUN:
 		HP: 400
 	RevealsShroud:
 		Range: 6c0
+	Bib:
+		HasMinibib: Yes
 	Turreted:
 		ROT: 12
 		InitialFacing: 50
@@ -600,6 +606,8 @@ OBLI:
 		Type: Heavy
 	RevealsShroud:
 		Range: 7c0
+	Bib:
+		HasMinibib: Yes
 	RenderBuildingCharge:
 		ChargeAudio: obelpowr.aud
 	Armament:
@@ -638,6 +646,8 @@ GTWR:
 		HP: 400
 	RevealsShroud:
 		Range: 6c0
+	Bib:
+		HasMinibib: Yes
 	Armament:
 		Weapon: HighV
 		LocalOffset: 256,0,256
@@ -680,6 +690,8 @@ ATWR:
 		Type: Heavy
 	RevealsShroud:
 		Range: 7c0
+	Bib:
+		HasMinibib: Yes
 	Turreted:
 		ROT: 255
 		Offset: 128,128,-85

mods/cnc/rules/tech.yaml

@@ -33,6 +33,8 @@ HOSP:
 		Name: Hospital
 	LeavesHusk:
 		HuskActor: HOSP.Husk
+	Bib:
+		HasMinibib: Yes
 
 HOSP.Husk:
 	Inherits: ^CivBuildingHusk
@@ -41,6 +43,8 @@ HOSP.Husk:
 		Dimensions: 2,2
 	Tooltip:
 		Name: Hospital (Destroyed)
+	Bib:
+		HasMinibib: Yes
 
 BIO:
 	Inherits: ^TechBuilding
@@ -87,4 +91,6 @@ MISS:
 		Owner: None
 	Valued:
 		Cost: 2000
+	Bib:
+		HasMinibib: Yes
 

mods/cnc/sequences/structures.yaml

@@ -82,18 +82,23 @@ silo:
 	idle:
 		Start: 0
 		Length: 5
+		Offset: 0,-1
 	damaged-idle:
 		Start: 5
 		Length: 5
+		Offset: 0,-1
 	dead:
 		Start: 10
+		Offset: 0,-1
 	make: silomake
 		Start: 0
 		Length: *
 		Tick: 80
-	bib: bib3
+		Offset: 0,-1
+	bib: mb2x1
 		Start: 0
 		Length: *
+		Offset: 0,1
 	icon: siloicnh
 		Start: 0
 
@@ -286,6 +291,10 @@ fix:
 		Start: 0
 		Length: 14
 		Tick: 60
+	bib: mbFIX
+		Start: 0
+		Length: *
+		Offset: 0,-9
 	icon: fixicnh
 		Start: 0
 
@@ -352,6 +361,10 @@ obli:
 		Start: 0
 		Length: 13
 		Tick: 80
+	bib: mbOBLI
+		Start: 0
+		Length: *
+		Offset: -1,-3
 	icon: obliicnh
 		Start: 0
 
@@ -430,6 +443,10 @@ gun:
 	muzzle: gunfire2
 		Start: 0
 		Length: *
+	bib: mbGUN
+		Start: 0
+		Length: *
+		Offset: -1,-1
 	icon: gunicnh
 		Start: 0
 
@@ -488,23 +505,36 @@ gtwr:
 		Start: 0
 		Length: 6
 		Facings: 8
+	bib: mbGTWR
+		Start: 0
+		Length: *
+		Offset: 0,-2
 	icon: gtwricnh
 		Start: 0
 
 atwr:
 	idle:
 		Start: 0
+		Offset: 0,-1
 	damaged-idle:
 		Start: 1
+		Offset: 0,-1
 	dead:
 		Start: 2
+		Offset: 0,-1
 	make: atwrmake
 		Start: 0
 		Length: *
 		Tick: 80
+		Offset: 0,-1
 	muzzle: gunfire2
 		Start: 0
 		Length: *
+		Offset: 0,-1
+	bib: mbGTWR
+		Start: 0
+		Length: *
+		Offset: -3,0
 	icon: atwricnh
 		Start: 0
 
@@ -513,17 +543,28 @@ hosp:
 		Start: 0
 		Length: 4
 		Tick: 100
+		Offset: 0,-2
 	damaged-idle:
 		Start: 4
 		Length: 4
+		Offset: 0,-2
 	make: hospmake
 		Start: 0
 		Length: *
 		Tick: 80
+		Offset: 0,-2
+	bib: mb2x1
+		Start: 0
+		Length: *
+		Offset: 0,1
 
 hosp.husk:
 	idle: hosp
 		Start: 8
+	bib: mb2x1
+		Start: 0
+		Length: *
+		Offset: 0,1
 
 bio:
 	idle:
@@ -542,15 +583,26 @@ bio.husk:
 miss:
 	idle:
 		Start: 0
+		Offset: 0,-1
 	damaged-idle:
 		Start: 1
+		Offset: 0,-1
 	make: missmake
 		Start: 0
 		Length: *
 		Tick: 80
+		Offset: 0,-1
+	bib: mbMISS
+		Start: 0
+		Length: *
+		Offset: 0,1
 	icon: missicnh
 		Start: 0
 
 miss.husk:
 	idle: miss
 		Start: 2
+	bib: mbMISS
+		Start: 0
+		Length: *
+		Offset: 0,1

mods/ra/rules/structures.yaml

@@ -71,6 +71,8 @@ GAP:
 		Type: Wood
 	RevealsShroud:
 		Range: 6c0
+	Bib:
+		HasMinibib: Yes
 	CreatesShroud:
 		Range: 6c0
 	IronCurtainable:
@@ -219,6 +221,8 @@ IRON:
 		Type: Wood
 	RevealsShroud:
 		Range: 10c0
+	Bib:
+		HasMinibib: Yes
 	IronCurtainable:
 	IronCurtainPower:
 		Icon: invuln
@@ -260,6 +264,8 @@ PDOX:
 		Type: Wood
 	RevealsShroud:
 		Range: 10c0
+	Bib:
+		HasMinibib: Yes
 	IronCurtainable:
 	ChronoshiftPower:
 		Icon: chrono
@@ -303,6 +309,8 @@ TSLA:
 		Type: Heavy
 	RevealsShroud:
 		Range: 8c0
+	Bib:
+		HasMinibib: Yes
 	RenderBuildingCharge:
 		ChargeAudio: tslachg2.aud
 	Armament:
@@ -345,6 +353,8 @@ AGUN:
 		Type: Heavy
 	RevealsShroud:
 		Range: 6c0
+	Bib:
+		HasMinibib: Yes
 	Turreted:
 		ROT: 15
 		InitialFacing: 224
@@ -420,6 +430,8 @@ PBOX:
 		Type: Heavy
 	RevealsShroud:
 		Range: 6c0
+	Bib:
+		HasMinibib: Yes
 	IronCurtainable:
 	-AcceptsSupplies:
 	Turreted:
@@ -586,6 +598,8 @@ GUN:
 		Type: Heavy
 	RevealsShroud:
 		Range: 7c0
+	Bib:
+		HasMinibib: Yes
 	Turreted:
 		ROT: 12
 		InitialFacing: 50
@@ -625,6 +639,8 @@ FTUR:
 		Type: Heavy
 	RevealsShroud:
 		Range: 6c0
+	Bib:
+		HasMinibib: Yes
 	Turreted:
 		ROT: 255
 		Offset: 0,0,112
@@ -667,6 +683,8 @@ SAM:
 		Type: Heavy
 	RevealsShroud:
 		Range: 5c0
+	Bib:
+		HasMinibib: Yes
 	Turreted:
 		ROT: 30
 		InitialFacing: 0
@@ -862,6 +880,8 @@ SILO:
 		Type: Wood
 	RevealsShroud:
 		Range: 4c0
+	Bib:
+		HasMinibib: Yes
 	RenderBuildingSilo:
 	StoresOre:
 		PipCount: 5
@@ -1155,6 +1175,8 @@ FIX:
 		Type: Wood
 	RevealsShroud:
 		Range: 5c0
+	Bib:
+		HasMinibib: Yes
 	Reservable:
 	RallyPoint:
 	IronCurtainable:

mods/ra/sequences/structures.yaml

@@ -91,12 +91,18 @@ silo:
 	idle: silo2
 		Start: 0
 		Length: 9
+		Offset: 0,-1
 	damaged-idle: silo2
 		Start: 9
 		Length: 9
+		Offset: 0,-1
 	make: silomake
 		Start: 0
 		Length: *
+		Offset: 0,-1
+	bib: mbSILO
+		Start: 0
+		Length: *
 	icon: siloicon
 		Start: 0
 
@@ -329,21 +335,31 @@ syrd:
 fix:
 	idle:
 		Start: 0
+		Offset: 0,1
 		ZOffset: -1c511
 	damaged-idle:
 		Start: 7
+		Offset: 0,1
 		ZOffset: -1c511
 	active:
 		Start: 1
 		Length: 6
+		Offset: 0,1
 		ZOffset: -1c511
 	damaged-active:
 		Start: 8
 		Length: 6
+		Offset: 0,1
 		ZOffset: -1c511
 	make: fixmake
 		Start: 0
 		Length: *
+		Offset: 0,1
+	bib: mbFIX
+		Start: 0
+		Length: *
+		ZOffset: -1c511
+		Offset: 0,-4
 	icon: fixicon
 		Start: 0
 
@@ -366,6 +382,10 @@ gun:
 	muzzle: gunfire2
 		Start: 0
 		Length: 5
+	bib: mbGUN
+		Start: 0
+		Length: *
+		Offset: -1,-1
 	icon: gunicon
 		Start: 0
 
@@ -373,21 +393,30 @@ agun:
 	idle:
 		Start: 0
 		Facings: 32
+		Offset: 0,-1
 	recoil:
 		Start: 32
 		Facings: 32
+		Offset: 0,-1
 	make: agunmake
 		Start: 0
 		Length: *
+		Offset: 0,-1
 	damaged-idle:
 		Start: 64
 		Facings: 32
+		Offset: 0,-1
 	damaged-recoil:
 		Start: 96
 		Facings: 32
+		Offset: 0,-1
 	muzzle: gunfire2
 		Start: 1
 		Length: 4
+		Offset: 0,-1
+	bib: mbAGUN
+		Start: 0
+		Length: *
 	icon: agunicon
 		Start: 0
 
@@ -395,46 +424,68 @@ sam:
 	idle: sam2
 		Start: 0
 		Facings: 32
+		Offset: -2,-2
 	damaged-idle: sam2
 		Start: 34
 		Facings: 32
+		Offset: -2,-2
 	make: sammake
 		Start: 0
 		Length: *
+		Offset: -2,-2
 	muzzle: samfire
 		Start: 0
 		Length: 18
 		Facings: 8
+		Offset: -2,-2
+	bib: mbSAM
+		Start: 0
+		Length: *
+		Offset: 0,1
 	icon: samicon
 		Start: 0
 
 ftur:
 	idle:
 		Start: 0
+		Offset: 0,-2
 	damaged-idle:
 		Start: 1
+		Offset: 0,-2
 	make: fturmake
 		Start: 0
 		Length: *
+		Offset: 0,-2
+	bib: mbFTUR
+		Start: 0
+		Length: *
 	icon: fturicon
 		Start: 0
 
 tsla:
 	idle:
 		Start: 0
+		Offset: 0,-1
 	damaged-idle:
 		Start: 10
+		Offset: 0,-1
 	make: tslamake
 		Start: 0
 		Length: *
+		Offset: 0,-1
 	active:
 		Start: 1
 		Length: 9
 		Tick: 100
+		Offset: 0,-1
 	damaged-active:
 		Start: 11
 		Length: 9
 		Tick: 100
+		Offset: 0,-1
+	bib: mbTSLA
+		Start: 0
+		Length: *
 	icon: tslaicon
 		Start: 0
 
@@ -450,6 +501,10 @@ pbox:
 		Start: 0
 		Length: 6
 		Facings: 8
+	bib: mbPBOX
+		Start: 0
+		Length: *
+		Offset: 0,-2
 	icon: pboxicon
 		Start: 0
 
@@ -472,12 +527,18 @@ gap:
 	idle:
 		Start: 0
 		Length: 32
+		Offset: 0,-2
 	damaged-idle:
 		Start: 32
 		Length: 32
+		Offset: 0,-2
 	make: gapmake
 		Start: 0
 		Length: *
+		Offset: 0,-2
+	bib: mbGAP
+		Start: 0
+		Length: *
 	icon: gapicon
 		Start: 0
 
@@ -500,6 +561,10 @@ iron:
 		Start: 0
 		Length: *
 		Offset: 0,-12
+	bib: mbIRON
+		Start: 0
+		Length: *
+		Offset: 0,2
 	icon: ironicon
 		Start: 0
 
@@ -517,6 +582,10 @@ pdox:
 	make: pdoxmake
 		Start: 0
 		Length: *
+	bib: mbPDOX
+		Start: 0
+		Length: *
+		Offset: 0,-4
 	icon: pdoxicon
 		Start: 0