Merge pull request #11950 from Mailaender/lowbridge-polish

Fixed building placement on Tiberian Sun low bridges

OpenRA.Mods.Common/Traits/Radar/RadarColorFromTerrain.cs

@@ -16,7 +16,7 @@ namespace OpenRA.Mods.Common.Traits.Radar
 {
 	public class RadarColorFromTerrainInfo : ITraitInfo
 	{
-		public readonly string Terrain;
+		[FieldLoader.Require] public readonly string Terrain;
 		public object Create(ActorInitializer init) { return new RadarColorFromTerrain(init.Self, Terrain); }
 	}
 

OpenRA.Mods.TS/Traits/Buildings/LowBridge.cs

@@ -20,7 +20,7 @@ namespace OpenRA.Mods.TS.Traits
 	[Desc("Bridge actor that can't be passed underneath.")]
 	class LowBridgeInfo : ITraitInfo, Requires<BuildingInfo>
 	{
-		public readonly string TerrainType = "Road";
+		public readonly string TerrainType = "Bridge";
 
 		public object Create(ActorInitializer init) { return new LowBridge(init.Self, this); }
 	}

mods/ts/rules/bridges.yaml

@@ -9,6 +9,7 @@ LOBRDG_A_D:
 	EditorOnlyTooltip:
 		Name: Dead Bridge
 	-LowBridge:
+	-AppearsOnRadar:
 
 LOBRDG_B:
 	Inherits: ^LowBridge_B
@@ -21,6 +22,7 @@ LOBRDG_B_D:
 	EditorOnlyTooltip:
 		Name: Dead Bridge
 	-LowBridge:
+	-AppearsOnRadar:
 
 LOBRDG_R_SE:
 	Inherits: ^LowBridge_B

mods/ts/rules/defaults.yaml

@@ -261,6 +261,7 @@
 		TerrainSpeeds:
 			Clear: 90
 			Road: 100
+			Bridge: 100
 			Rail: 90
 			DirtRoad: 100
 			Rough: 80
@@ -430,6 +431,7 @@
 		TerrainSpeeds:
 			Clear: 70
 			Road: 100
+			Bridge: 100
 			Rail: 50
 			DirtRoad: 90
 			Rough: 40
@@ -497,6 +499,7 @@
 		TerrainSpeeds:
 			Clear: 70
 			Road: 100
+			Bridge: 100
 			Rail: 100
 			DirtRoad: 90
 			Rough: 60
@@ -632,6 +635,7 @@
 		TerrainSpeeds:
 			Clear: 90
 			Road: 100
+			Bridge: 100
 			Rail: 80
 			DirtRoad: 90
 			Rough: 70
@@ -891,7 +895,7 @@
 	AutoSelectionSize:
 	AppearsOnRadar:
 	RadarColorFromTerrain:
-		Terrain: Road
+		Terrain: Bridge
 	BodyOrientation:
 		UseClassicPerspectiveFudge: false
 		QuantizedFacings: 1

mods/ts/rules/gdi-vehicles.yaml

@@ -62,6 +62,7 @@ HVR:
 		TerrainSpeeds:
 			Clear: 100
 			Road: 100
+			Bridge: 100
 			Rail: 100
 			DirtRoad: 100
 			Rough: 100

mods/ts/rules/shared-infantry.yaml

@@ -78,6 +78,7 @@ FLAMEGUY:
 		TerrainSpeeds:
 			Clear: 45
 			Road: 50
+			Bridge: 50
 			Rail: 45
 			DirtRoad: 50
 			Rough: 40

mods/ts/rules/shared-vehicles.yaml

@@ -67,6 +67,7 @@ HARV:
 			Clear: 90
 			Rough: 70
 			Road: 100
+			Bridge: 100
 			Beach: 70
 			Tiberium: 80
 			BlueTiberium: 80

mods/ts/tilesets/snow.yaml

@@ -18,6 +18,10 @@ Terrain:
 		Type: Road
 		Color: 2D2B28
 		TargetTypes: Ground
+	TerrainType@Bridge:
+		Type: Bridge
+		Color: 5A5C5A
+		TargetTypes: Ground
 	TerrainType@Rail:
 		Type: Rail
 		Color: 363739

mods/ts/tilesets/temperate.yaml

@@ -18,6 +18,10 @@ Terrain:
 		Type: Road
 		Color: 745537
 		TargetTypes: Ground
+	TerrainType@Bridge:
+		Type: Bridge
+		Color: 403C34
+		TargetTypes: Ground
 	TerrainType@Rail:
 		Type: Rail
 		Color: 745537