Reverse ra bridge metadata

OpenRA.FileFormats/Map/TileSet.cs

@@ -44,12 +44,10 @@ namespace OpenRA.FileFormats
 		public ushort Id;
 		public string Image;
 		public int2 Size;
-		public string Bridge;
-		public float HP;
 		public bool PickAny;
 		public Dictionary<byte, string> Tiles = new Dictionary<byte, string>();
 		
-		static List<string> fields = new List<string>() {"Id", "Image", "Size", "Bridge", "HP", "PickAny"};
+		static List<string> fields = new List<string>() {"Id", "Image", "Size", "PickAny"};
 
 		public TileTemplate(Dictionary<string,MiniYaml> my)
 		{

OpenRA.Mods.RA/Bridge.cs

@@ -32,6 +32,16 @@ namespace OpenRA.Mods.RA
 	class BridgeInfo : ITraitInfo
 	{
 		public readonly bool Long = false;
+		
+		public readonly string Template = null;
+		public readonly string DamagedTemplate = null;
+		public readonly string DestroyedTemplate = null;
+		
+		// For long bridges
+		public readonly string DestroyedPlusNorthTemplate = null;
+		public readonly string DestroyedPlusSouthTemplate = null;
+		public readonly string DestroyedPlusBothTemplate = null;
+
 		public readonly bool UseAlternateNames = false;
 		public readonly int[] NorthOffset = null;
 		public readonly int[] SouthOffset = null;

mods/ra/civilian.yaml

@@ -393,6 +393,9 @@ MISS:
 
 BR1:
 	Bridge:
+		Template: 235
+		DamagedTemplate: 236
+		DestroyedTemplate: 237
 		SouthOffset: 0,2
 	Category: Building
 	Selectable:
@@ -404,6 +407,9 @@ BR1:
 
 BR2:
 	Bridge:
+		Template: 238
+		DamagedTemplate: 239
+		DestroyedTemplate: 240
 		NorthOffset: 3,0
 	Category: Building
 	Selectable:
@@ -416,6 +422,12 @@ BR2:
 BR3:
 	Bridge:
 		Long: yes
+		Template: 241
+		DamagedTemplate: 242
+		DestroyedTemplate: 243
+		DestroyedPlusNorthTemplate: 245
+		DestroyedPlusSouthTemplate: 244
+		DestroyedPlusBothTemplate: 246
 		NorthOffset: 2,0
 		SouthOffset: 0,1
 	Category: Building
@@ -428,6 +440,9 @@ BR3:
 
 BRIDGE1:
 	Bridge:
+		Template: 131
+		DamagedTemplate: 378
+		DestroyedTemplate: 132
 		UseAlternateNames: yes
 	Category: Building
 	Selectable:
@@ -439,6 +454,9 @@ BRIDGE1:
 
 BRIDGE2:
 	Bridge:
+		Template: 133
+		DamagedTemplate: 379
+		DestroyedTemplate: 134
 		UseAlternateNames: yes
 	Category: Building
 	Selectable:

mods/ra/tileSet.til

@@ -1,353 +0,0 @@
-; clear ground
-TSI
-1
-ff
-clear1
-
-; clear ground
-TSI
-1
-ffff
-clear1
-
-; sandy shorelines
-TS-
-56
-0003
-sh{0:00}
-
-; plain water
-TS-
-2
-0001
-w{0}
-
-; cliffs
-TS-
-38
-0087
-s{0:00}
-
-; rocky coast
-TS-
-38
-003b
-wc{0:00}
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; ROADS
-
-; roads
-TS-
-43
-00ad
-d{0:00}
-
-; road
-TS-
-1
-00e3
-d44
-
-; road
-TS-
-1
-00e4
-d45
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; RIVERS
-
-; river emerging from cliff
-TS-
-4
-00e7
-rc{0:00}
-
-; rivers
-TS-
-13
-0070
-rv{0:00}
-
-; river
-TS-
-1
-00e5
-rv14
-
-; river
-TS-
-1
-00e6
-rv15
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; BRIDGES
-
-; long bridge (north end)
-TS-
-1
-00eb
-br1a
-
-; long bridge (north end, damaged)
-TS-
-1
-00ec
-br1b
-
-; long bridge (north end, broken)
-TS-
-1
-00ed
-br1c
-
-; long bridge (south end)
-TS-
-1
-00ee
-br2a
-
-; long bridge (south end, damaged)
-TS-
-1
-00ef
-br2b
-
-; long bridge (south end, broken)
-TS-
-1
-00f0
-br2c
-
-; long bridge (middle)
-TS-
-1
-00f1
-br3a
-
-; long bridge (middle, damaged)
-TS-
-1
-00f2
-br3b
-
-; long bridge (middle, broken)
-TS-
-1
-00f3
-br3c
-
-; long bridge (middle, broken, south end missing)
-TS-
-1
-00f4
-br3d
-
-; long bridge (middle, broken, north end missing)
-TS-
-1
-00f5
-br3e
-
-; long bridge (water / totally broken)
-TS-
-1
-00f6
-br3f
-
-; long bridge (north surround)
-TS-
-1
-017c
-br1x
-
-; long bridge (south surround)
-TS-
-1
-017d
-br2x
-
-; short bridge "/"
-TS-
-1
-0083
-bridge1
-
-; short bridge "/" (destroyed)
-TS-
-1
-0084
-bridge1d
-
-; short bridge "/" (damaged)
-TS-
-1
-017a
-bridge1h
-
-; short bridge "/" (surround)
-TS-
-1
-017e
-bridge1x
-
-; short bridge "\"
-TS-
-1
-0085
-bridge2
-
-; short bridge "\" (destroyed)
-TS-
-1
-0086
-bridge2d
-
-; short bridge "\" (damaged)
-TS-
-1
-017b
-bridge2h
-
-; short bridge "\" (surround)
-TS-
-1
-017f
-bridge2x
-
-; fyords
-TS-
-6
-00f7
-f{0:00}
-
-; short fyord
-TS-
-2
-0081
-ford{0}
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; WATERFALLS
-
-; waterfall (E-W)
-TS-
-1
-007d
-falls1
-
-; waterfall (E-W, into sea)
-TS-
-1
-007e
-falls1a
-
-; waterfall (N-S)
-TS-
-1
-007f
-falls2
-
-; waterfall (N-S, into sea)
-TS-
-1
-0080
-falls2a
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; DEBRIS / ROCKS
-
-; random rock chunks (impassable)
-TS-
-3
-0061
-b{0}
-
-; random rock chunks (passable)
-TS-
-11
-00d8
-rf{0:00}
-
-; random debris
-TS-
-4
-0067
-p{0:00}
-
-; random debris
-TS-
-1
-006b
-p07
-
-; random debris
-TS-
-1
-006c
-p08
-
-; random debris
-TS-
-1
-006d
-p13
-
-; random debris
-TS-
-1
-006e
-p14
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; INTERIOR
-
-; walls
---I
-49
-0149
-wall{0:0000}
-
-; black floor
---I
-7
-010c
-flor{0:0000}
-
-; walls with stuff, random tiles
---I
-16
-0180
-xtra{0:0000}
-
-; black/yellow stripe
---I
-11
-013e
-strp{0:0000}
-
-; red stripe
---I
-15
-00fd
-arro{0:0000}
-
-; white floor
---I
-5
-0113
-gflr{0:0000}
-
-; white floor with black/yellow stripe
---I
-11
-0118
-gstr{0:0000}
-
-; bogus
-TS-
-1
-fffe
-bogus

mods/ra/tileset-sno.yaml

@@ -2293,8 +2293,6 @@ Templates:
 		Id: 235
 		Image: br1a
 		Size: 4,3
-		Bridge: br1
-		Strength: 1
 		Tiles:
 			1: Rock
 			2: Road
@@ -2309,8 +2307,6 @@ Templates:
 		Id: 236
 		Image: br1b
 		Size: 4,3
-		Bridge: br1
-		Strength: 0.5
 		Tiles:
 			1: Rock
 			2: Rough
@@ -2325,7 +2321,6 @@ Templates:
 		Id: 237
 		Image: br1c
 		Size: 4,3
-		Bridge: br1
 		Tiles:
 			1: Rock
 			2: Rock
@@ -2340,8 +2335,6 @@ Templates:
 		Id: 238
 		Image: br2a
 		Size: 5,3
-		Bridge: br2
-		Strength: 1
 		Tiles:
 			1: Rock
 			2: Road
@@ -2357,8 +2350,6 @@ Templates:
 		Id: 239
 		Image: br2b
 		Size: 5,3
-		Bridge: br2
-		Strength: 0.5
 		Tiles:
 			1: Rock
 			2: Rough
@@ -2374,7 +2365,6 @@ Templates:
 		Id: 240
 		Image: br2c
 		Size: 5,3
-		Bridge: br2
 		Tiles:
 			1: Water
 			2: Water
@@ -2390,8 +2380,6 @@ Templates:
 		Id: 241
 		Image: br3a
 		Size: 4,2
-		Bridge: br3
-		Strength: 1
 		Tiles:
 			0: Rock
 			1: Road
@@ -2402,8 +2390,6 @@ Templates:
 		Id: 242
 		Image: br3b
 		Size: 4,2
-		Bridge: br3
-		Strength: 0.5
 		Tiles:
 			0: Rock
 			1: Road
@@ -2414,7 +2400,6 @@ Templates:
 		Id: 243
 		Image: br3c
 		Size: 4,2
-		Bridge: br3
 		Tiles:
 			0: Rock
 			1: Rock
@@ -2425,7 +2410,6 @@ Templates:
 		Id: 244
 		Image: br3d
 		Size: 4,2
-		Bridge: br3
 		Tiles:
 			0: River
 			1: Rock
@@ -2436,7 +2420,6 @@ Templates:
 		Id: 245
 		Image: br3e
 		Size: 4,2
-		Bridge: br3
 		Tiles:
 			0: Water
 			1: Water
@@ -2447,7 +2430,6 @@ Templates:
 		Id: 246
 		Image: br3f
 		Size: 4,2
-		Bridge: br3
 		Tiles:
 			0: Water
 			1: Water
@@ -2475,8 +2457,6 @@ Templates:
 		Id: 131
 		Image: bridge1
 		Size: 5,3
-		Bridge: bridge1
-		Strength: 1
 		Tiles:
 			1: Rock
 			2: Road
@@ -2492,7 +2472,6 @@ Templates:
 		Id: 132
 		Image: bridge1d
 		Size: 5,3
-		Bridge: bridge1
 		Tiles:
 			1: Rock
 			2: Rock
@@ -2508,8 +2487,6 @@ Templates:
 		Id: 378
 		Image: bridge1h
 		Size: 5,3
-		Bridge: bridge1
-		Strength: 0.5
 		Tiles:
 			1: Rock
 			2: Rough
@@ -2538,8 +2515,6 @@ Templates:
 		Id: 133
 		Image: bridge2
 		Size: 5,2
-		Bridge: bridge2
-		Strength: 1
 		Tiles:
 			0: Rock
 			1: Road
@@ -2554,7 +2529,6 @@ Templates:
 		Id: 134
 		Image: bridge2d
 		Size: 5,2
-		Bridge: bridge2
 		Tiles:
 			0: Rock
 			1: Rock
@@ -2569,8 +2543,6 @@ Templates:
 		Id: 379
 		Image: bridge2h
 		Size: 5,2
-		Bridge: bridge2
-		Strength: 0.5
 		Tiles:
 			0: Rock
 			1: Rough

mods/ra/tileset-tem.yaml

@@ -2293,8 +2293,6 @@ Templates:
 		Id: 235
 		Image: br1a
 		Size: 4,3
-		Bridge: br1
-		Strength: 1
 		Tiles:
 			1: Rock
 			2: Road
@@ -2309,8 +2307,6 @@ Templates:
 		Id: 236
 		Image: br1b
 		Size: 4,3
-		Bridge: br1
-		Strength: 0.5
 		Tiles:
 			1: Rock
 			2: Rough
@@ -2325,7 +2321,6 @@ Templates:
 		Id: 237
 		Image: br1c
 		Size: 4,3
-		Bridge: br1
 		Tiles:
 			1: Rock
 			2: Rock
@@ -2340,8 +2335,6 @@ Templates:
 		Id: 238
 		Image: br2a
 		Size: 5,3
-		Bridge: br2
-		Strength: 1
 		Tiles:
 			1: Rock
 			2: Road
@@ -2357,8 +2350,6 @@ Templates:
 		Id: 239
 		Image: br2b
 		Size: 5,3
-		Bridge: br2
-		Strength: 0.5
 		Tiles:
 			1: Rock
 			2: Rough
@@ -2374,7 +2365,6 @@ Templates:
 		Id: 240
 		Image: br2c
 		Size: 5,3
-		Bridge: br2
 		Tiles:
 			1: Water
 			2: Water
@@ -2390,8 +2380,6 @@ Templates:
 		Id: 241
 		Image: br3a
 		Size: 4,2
-		Bridge: br3
-		Strength: 1
 		Tiles:
 			0: Rock
 			1: Road
@@ -2402,8 +2390,6 @@ Templates:
 		Id: 242
 		Image: br3b
 		Size: 4,2
-		Bridge: br3
-		Strength: 0.5
 		Tiles:
 			0: Rock
 			1: Road
@@ -2414,7 +2400,6 @@ Templates:
 		Id: 243
 		Image: br3c
 		Size: 4,2
-		Bridge: br3
 		Tiles:
 			0: Rock
 			1: Rock
@@ -2425,7 +2410,6 @@ Templates:
 		Id: 244
 		Image: br3d
 		Size: 4,2
-		Bridge: br3
 		Tiles:
 			0: River
 			1: Rock
@@ -2436,7 +2420,6 @@ Templates:
 		Id: 245
 		Image: br3e
 		Size: 4,2
-		Bridge: br3
 		Tiles:
 			0: Water
 			1: Water
@@ -2447,7 +2430,6 @@ Templates:
 		Id: 246
 		Image: br3f
 		Size: 4,2
-		Bridge: br3
 		Tiles:
 			0: Water
 			1: Water
@@ -2475,8 +2457,6 @@ Templates:
 		Id: 131
 		Image: bridge1
 		Size: 5,3
-		Bridge: bridge1
-		Strength: 1
 		Tiles:
 			1: Rock
 			2: Road
@@ -2492,7 +2472,6 @@ Templates:
 		Id: 132
 		Image: bridge1d
 		Size: 5,3
-		Bridge: bridge1
 		Tiles:
 			1: Rock
 			2: Rock
@@ -2508,8 +2487,6 @@ Templates:
 		Id: 378
 		Image: bridge1h
 		Size: 5,3
-		Bridge: bridge1
-		Strength: 0.5
 		Tiles:
 			1: Rock
 			2: Rough
@@ -2538,8 +2515,6 @@ Templates:
 		Id: 133
 		Image: bridge2
 		Size: 5,2
-		Bridge: bridge2
-		Strength: 1
 		Tiles:
 			0: Rock
 			1: Road
@@ -2554,7 +2529,6 @@ Templates:
 		Id: 134
 		Image: bridge2d
 		Size: 5,2
-		Bridge: bridge2
 		Tiles:
 			0: Rock
 			1: Rock
@@ -2569,8 +2543,6 @@ Templates:
 		Id: 379
 		Image: bridge2h
 		Size: 5,2
-		Bridge: bridge2
-		Strength: 0.5
 		Tiles:
 			0: Rock
 			1: Rough