Merge pull request #9327 from Mailaender/bridge-render-sizes

Fixed bridge rendering glitches

OpenRA.Mods.Common/Traits/CustomSelectionSize.cs

@@ -13,9 +13,7 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.Common.Traits
 {
-	[Desc("Special case trait for unselectable actors that need to define targetable area bounds",
-	"for special cases like C4, engineer repair and tooltips.",
-	"Examples: bridge huts and crates.")]
+	[Desc("Special case trait for actors that need to define targetable area and screen map bounds manually.")]
 	public class CustomSelectionSizeInfo : ITraitInfo
 	{
 		[FieldLoader.Require]

OpenRA.Mods.Common/Traits/Render/AutoSelectionSize.cs

@@ -13,6 +13,7 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.Common.Traits
 {
+	[Desc("Automatically calculates the targetable area and screen map boundaries from the sprite size.")]
 	public class AutoSelectionSizeInfo : ITraitInfo, Requires<RenderSpritesInfo>
 	{
 		public object Create(ActorInitializer init) { return new AutoSelectionSize(this); }

mods/cnc/rules/civilian.yaml

@@ -314,6 +314,8 @@ BRIDGE1:
 	Building:
 		Footprint: ____ ____ ____ ____
 		Dimensions: 4,4
+	CustomSelectionSize:
+		CustomBounds: 96,96
 	FreeActor@north:
 		Actor: bridgehut
 		SpawnOffset: 2,0
@@ -329,6 +331,8 @@ BRIDGE2:
 	Building:
 		Footprint: _____ _____ _____ _____ _____
 		Dimensions: 5,5
+	CustomSelectionSize:
+		CustomBounds: 120,120
 	FreeActor@north:
 		Actor: bridgehut
 		SpawnOffset: 0,0
@@ -344,6 +348,8 @@ BRIDGE3:
 	Building:
 		Footprint: ______ ______ ______ ______ ______
 		Dimensions: 6,5
+	CustomSelectionSize:
+		CustomBounds: 144,120
 	FreeActor@north:
 		Actor: bridgehut
 		SpawnOffset: 3,0
@@ -359,6 +365,8 @@ BRIDGE4:
 	Building:
 		Footprint: ______ ______ ______ ______
 		Dimensions: 6,4
+	CustomSelectionSize:
+		CustomBounds: 144,96
 	FreeActor@north:
 		Actor: bridgehut
 		SpawnOffset: 1,0

mods/ra/rules/civilian.yaml

@@ -399,6 +399,8 @@ BRIDGE1:
 	Building:
 		Footprint: _____ _____ _____
 		Dimensions: 5,3
+	CustomSelectionSize:
+		CustomBounds: 120,72
 	FreeActor@north:
 		Actor: bridgehut
 		SpawnOffset: 2,-1
@@ -415,6 +417,8 @@ BRIDGE2:
 	Building:
 		Footprint: _____ _____
 		Dimensions: 5,2
+	CustomSelectionSize:
+		CustomBounds: 120,48
 	FreeActor@north:
 		Actor: bridgehut
 		SpawnOffset: 0,-1
@@ -431,6 +435,8 @@ SBRIDGE1:
 	Building:
 		Footprint: ___ ___
 		Dimensions: 3,2
+	CustomSelectionSize:
+		CustomBounds: 72,48
 	FreeActor@north:
 		Actor: bridgehut.small
 		SpawnOffset: 1,0
@@ -447,6 +453,8 @@ SBRIDGE2:
 	Building:
 		Footprint: __ __ __
 		Dimensions: 2,3
+	CustomSelectionSize:
+		CustomBounds: 48,72
 	FreeActor@west:
 		Actor: bridgehut.small
 		SpawnOffset: 0,1
@@ -460,9 +468,6 @@ SBRIDGE3:
 		Template: 523
 		DamagedTemplate: 524
 		DestroyedTemplate: 525
-	Building:
-		Footprint: ____ ____
-		Dimensions: 4,2
 	FreeActor@north:
 		Actor: bridgehut
 		SpawnOffset: 2,-1
@@ -476,9 +481,6 @@ SBRIDGE4:
 		Template: 527
 		DamagedTemplate: 528
 		DestroyedTemplate: 529
-	Building:
-		Footprint: ____ ____
-		Dimensions: 4,2
 	FreeActor@north:
 		Actor: bridgehut
 		SpawnOffset: 0,-1

mods/ra/rules/defaults.yaml

@@ -630,6 +630,8 @@
 	Building:
 		Footprint: ____ ____
 		Dimensions: 4,2
+	CustomSelectionSize:
+		CustomBounds: 96,48
 	Health:
 		HP: 1000
 	ProximityCaptor: