From fb6a8a2cddda89d2a135634c8f5c61c1691848d7 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Tue, 19 Jan 2010 13:56:01 +1300
Subject: [PATCH] short bridges

---
 merge-ra.yaml | 10 +++++++++-
 ra.yaml       | 22 ++++++++++++++++++++++
 templates.ini | 12 ++++++++++++
 tileSet.til   |  6 ++++++
 units.ini     | 16 +++++++++++++++-
 5 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/merge-ra.yaml b/merge-ra.yaml
index a5e511b71b..4c28e1dd42 100644
--- a/merge-ra.yaml
+++ b/merge-ra.yaml
@@ -31,4 +31,12 @@ MINV:
 
 BR3:
 	Bridge:
-		Long: yes
\ No newline at end of file
+		Long: yes
+		
+BRIDGE1:
+	Bridge:
+		UseAlternateNames: yes
+		
+BRIDGE2:
+	Bridge:
+		UseAlternateNames: yes
diff --git a/ra.yaml b/ra.yaml
index a27e127cbb..4005550a1a 100644
--- a/ra.yaml
+++ b/ra.yaml
@@ -94,6 +94,28 @@ BR3:
 		Dimensions: 4,2
 		HP: 1000
 
+BRIDGE1:
+	Bridge:
+		UseAlternateNames: yes
+	Category: Building
+	Selectable:
+	BelowUnits:
+	Building:
+		Footprint: _____ _____ _____
+		Dimensions: 5,3
+		HP: 1000
+
+BRIDGE2:
+	Bridge:
+		UseAlternateNames: yes
+	Category: Building
+	Selectable:
+	BelowUnits:
+	Building:
+		Footprint: _____ _____
+		Dimensions: 5,2
+		HP: 1000
+
 V2RL:
 	Inherits: ^Vehicle
 	Buildable:
diff --git a/templates.ini b/templates.ini
index 22b7a963d0..b3d10064a0 100644
--- a/templates.ini
+++ b/templates.ini
@@ -1533,6 +1533,8 @@ tiletype8=0
 Name=BRIDGE1
 width=5
 height=3
+bridge=bridge1
+hp=1
 tiletype1=3
 tiletype2=2
 tiletype3=2 
@@ -1548,6 +1550,8 @@ tiletype12=3
 Name=BRIDGE1D
 width=5
 height=3
+bridge=bridge1
+hp=0
 tiletype1=3
 tiletype2=3
 tiletype3=3
@@ -1563,6 +1567,8 @@ tiletype12=3
 Name=BRIDGE2
 width=5
 height=2
+bridge=bridge2
+hp=1
 tiletype0=3
 tiletype1=2
 tiletype2=2
@@ -1577,6 +1583,8 @@ tiletype9=3
 Name=BRIDGE2D
 width=5
 height=2
+bridge=bridge2
+hp=0
 tiletype0=3
 tiletype1=3
 tiletype2=3
@@ -2750,6 +2758,8 @@ tiletype0=0
 Name=BRIDGE1H
 width=5
 height=3
+bridge=bridge1
+hp=.5
 tiletype1=3
 tiletype2=6
 tiletype3=6
@@ -2765,6 +2775,8 @@ tiletype12=6
 Name=BRIDGE2H
 width=5
 height=2
+bridge=bridge2
+hp=.5
 tiletype0=3
 tiletype1=6
 tiletype2=6
diff --git a/tileSet.til b/tileSet.til
index 4dfd06827d..0506843ffc 100644
--- a/tileSet.til
+++ b/tileSet.til
@@ -208,6 +208,12 @@ bridge2d
 ; short bridge "\" (damaged)
 TS-
 1
+017b
+bridge2h
+
+; short bridge "\" (surround)
+TS-
+1
 017f
 bridge2x
 
diff --git a/units.ini b/units.ini
index 86cf02629d..f504743fdf 100644
--- a/units.ini
+++ b/units.ini
@@ -256,6 +256,8 @@ MINV
 BR1
 BR2
 BR3
+BRIDGE1
+BRIDGE2
 
 
 ; `Dimensions` is the size of a box that will include the whole building, excluding bib.
@@ -557,7 +559,19 @@ Dimensions=4,2
 Footprint=____ ____
 Selectable=yes		;; temp hack
 
-;; todo: short bridges
+[BRIDGE1]
+Traits=Bridge, BelowUnits, Building
+Strength=1000
+Dimensions=5,3
+Footprint=_____ _____ _____
+Selectable = yes
+
+[BRIDGE2]
+Traits=Bridge, BelowUnits, Building
+Strength=1000
+Dimensions=5,2
+Footprint=_____ _____
+Selectable = yes
 
 [InfantryTypes]
 DOG