(svn r10965) [NewGRF_ports] -Feature: Helistation state machine added. NewGRF_ports
authorrichk
Wed, 22 Aug 2007 21:32:17 +0000
branchNewGRF_ports
changeset 6858 c51e5f508759
parent 6857 5012c47e576b
child 6859 357e64a5e14e
(svn r10965) [NewGRF_ports] -Feature: Helistation state machine added.
bin/data/airportsextended.grf
bin/data/sprites/airportsextended.nfo
Binary file bin/data/airportsextended.grf has changed
--- a/bin/data/sprites/airportsextended.nfo	Tue Aug 21 20:03:53 2007 +0000
+++ b/bin/data/sprites/airportsextended.nfo	Wed Aug 22 21:32:17 2007 +0000
@@ -137,7 +137,7 @@
 //Commuter Airport
 
 // 10 properties to change, 1 station to change, station id = 0
-  111 * 1182	 00 0D 0A 01 00
+  111 * 1182	 00 0D 0B 01 00
 // Class ID
 	08 "SMLL"
 // Sprite layout, of 22 sprites
@@ -508,6 +508,9 @@
 // Prop1F Helipad Groups
 		1F 01 02
 
+// Prop20 Port Subtype
+		20 07
+
 // Prop22 Catchment Area
 		22 04
 
@@ -2484,199 +2487,198 @@
 
 	// Helistation : Position 00
 	\w8 \w3 \w0 40 \wx0007 00  // HANGAR
-		06
-			40 00 00 08
-			25 00 00 01
-			26 00 00 01
-			27 00 00 01
-			51 00 00 01
+		07
+			40 48 00 00
+			25 48 00 01
+			26 48 00 01
+			27 48 00 01
+			51 48 00 01
 			00 00 00 00
+			7D 00 7E 48 42 7F 00 01
 
 	// Helistation : Position 01
-	\w8 \w22 \w0 00 \wx0000 48
+	\w8 \w24 \w0 00 \wx0000 48
 		03
 			40 00 00 00
 			51 00 00 03
-			00 00 00 04
+			00 00 48 04
 
 	// Helistation : Position 02
-	\w116 \w24 \w0 7F \wx0030 00  // FLYING
+	\w116 \w24 \w80 7F \wx00B0 00  // FLYING
 		03
 			7F 00 00 1C
-			54 00 00 0F
+			54 4D 00 0F
 			00 00 00 1C
 
 	// Helistation : Position 03
-	\w14 \w22 \w80 51 \wx0000 00  // HELITAKEOFF
+	\w14 \w24 \w80 51 \wx0000 00  // HELITAKEOFF
 		01
 			51 00 00 00
 
 	// Helistation : Position 04
-	\w24 \w22 \w0 00 \wx0000 42
+	\w24 \w24 \w0 00 \wx0000 42
 		03
-			40 48 00 01
-			51 00 00 01
+			40 48 42 01
+			51 48 42 01
 			00 00 00 05
 
 	// Helistation : Position 05
-	\w40 \w22 \w0 00 \wx0000 42
+	\w40 \w24 \w0 00 \wx0000 42
 		04
-			25 25 00 06
-			26 26 00 07
-			27 27 00 08
+			25 25 42 06
+			26 26 42 07
+			27 27 42 08
 			00 00 00 04
 
 	// Helistation : Position 06
 	\w40 \w8 \w0 25 \wx0003 25  // HELIPAD1
-		04
+		03
 			25 25 00 05
-			40 48 00 05
+			40 7E 42 48 7F 25 05
 			51 00 00 09
-			00 00 00 06
 
 	// Helistation : Position 07
 	\w56 \w8 \w0 26 \wx0003 26  // HELIPAD2
-		04
+		03
 			26 26 00 05
-			40 48 00 05
+			40 7E 42 48 7F 26 05
 			51 00 00 0A
-			00 00 00 07
 
 	// Helistation : Position 08
 	\w56 \w24 \w0 27 \wx0003 27  // HELIPAD3
-		04
+		03
 			27 27 00 05
-			40 48 00 05
+			40 7E 42 48 7F 26 05
 			51 00 00 0B
-			00 00 00 08
 
 	// Helistation : Position 09
-	\w40 \w8 \w0 00 \wx0001 25
+	\w40 \w8 \w0 00 \wx0003 00
 		01
-			00 25 00 0C
+			00 00 00 0C
 
 	// Helistation : Position 0A
-	\w56 \w8 \w0 00 \wx0001 26
+	\w56 \w8 \w0 00 \wx0003 00
 		01
-			00 26 00 0D
+			00 00 00 0D
 
 	// Helistation : Position 0B
-	\w56 \w24 \w0 00 \wx0001 27
+	\w56 \w24 \w0 00 \wx0003 00
 		01
-			00 27 00 0E
+			00 00 00 0E
 
 	// Helistation : Position 0C
-	\w32 \w8 \w80 51 \wx0000 00  // HELITAKEOFF
+	\w40 \w8 \w80 51 \wx0003 00  // HELITAKEOFF
 		01
-			51 00 00 00
+			00 00 00 00
 
 	// Helistation : Position 0D
-	\w48 \w8 \w80 51 \wx0000 00  // HELITAKEOFF
+	\w56 \w8 \w80 51 \wx0003 00  // HELITAKEOFF
 		01
-			51 00 00 00
+			00 00 00 00
 
 	// Helistation : Position 0E
-	\w48 \w24 \w80 51 \wx0000 00  // HELITAKEOFF
+	\w56 \w24 \w80 51 \wx0003 00  // HELITAKEOFF
 		01
-			51 00 00 00
+			00 00 00 00
 
 	// Helistation : Position 0F
-	\w84 \w24 \w0 54 \wx0030 4D  // HELILANDING
-		01
-			54 4D 00 10
+	\w84 \w24 \w80 54 \wx00B0 4D  // HELILANDING - landing approach
+		02
+			40 00 4D 17  //if need depot, go straight there
+			00 4D 00 10
 
 	// Helistation : Position 10
-	\w68 \w24 \w0 55 \wx0030 4D  // HELIENDLANDING
+	\w68 \w24 \w80 55 \wx00B0 4D  // HELIENDLANDING - pre-selection location
 		05
-			55 4D 00 10
-			25 00 00 11
-			26 00 00 12
-			27 00 00 13
-			40 00 00 17
+			25 25 00 11
+			26 26 00 12
+			27 27 00 13
+			40 48 00 17
+			7B 7F 00 4D 1D  //go back flying if cant land
 
 	// Helistation : Position 11
-	\w32 \w8 \w0 00 \wx0030 00
+	\w32 \w8 \w80 00 \wx00B0 00
 		01
-			00 00 00 14
+			00 00 4D 14
 
 	// Helistation : Position 12
-	\w48 \w8 \w0 00 \wx0030 00
+	\w48 \w8 \w80 00 \wx00B0 00
 		01
-			00 00 00 15
+			00 00 4D 15
 
 	// Helistation : Position 13
-	\w48 \w24 \w0 00 \wx0030 00
+	\w48 \w24 \w80 00 \wx00B0 00
 		01
-			00 00 00 16
+			00 00 4D 16
 
 	// Helistation : Position 14
-	\w40 \w8 \w0 00 \wx0000 00
+	\w40 \w8 \w80 00 \wx0040 00
 		03
 			25 25 00 06
 			40 00 00 17
 			00 00 00 06
 
 	// Helistation : Position 15
-	\w48 \w8 \w0 00 \wx0000 00
+	\w56 \w8 \w80 00 \wx0040 00
 		03
 			26 26 00 07
 			40 00 00 17
 			00 00 00 07
 
 	// Helistation : Position 16
-	\w48 \w24 \w0 00 \wx0000 00
+	\w56 \w24 \w80 00 \wx0040 00
 		03
 			27 27 00 08
 			40 00 00 17
 			00 00 00 08
 
 	// Helistation : Position 17
-	\w0 \w22 \w0 00 \wx0030 48
+	\w0 \w22 \w80 00 \wx00B0 48
 		01
 			00 48 00 18
 
 	// Helistation : Position 18
-	\w0 \w22 \w0 00 \wx0000 48
+	\w0 \w22 \w80 00 \wx0000 48
 		01
 			00 48 00 01
 
 	// Helistation : Position 19
-	\w148 \wxFFF8 \w0 00 \wx0030 00
+	\w148 \wxFFF8 \w80 00 \wx00B0 00
 		01
 			00 00 00 1A
 
 	// Helistation : Position 1A
-	\w148 \w8 \w0 00 \wx0030 00
+	\w148 \w8 \w80 00 \wx00B0 00
 		01
 			00 00 00 1B
 
 	// Helistation : Position 1B
-	\w132 \w24 \w0 00 \wx0030 00
+	\w132 \w24 \w80 00 \wx00B0 00
 		01
 			00 00 00 02
 
 	// Helistation : Position 1C
-	\w100 \w24 \w0 00 \wx0030 00
+	\w100 \w24 \w80 00 \wx00B0 00
 		01
 			00 00 00 1D
 
 	// Helistation : Position 1D
-	\w84 \w8 \w0 00 \wx0030 00
+	\w84 \w8 \w80 00 \wx00B0 00
 		01
 			00 00 00 1E
 
 	// Helistation : Position 1E
-	\w84 \wxFFF8 \w0 00 \wx0030 00
+	\w84 \wxFFF8 \w80 00 \wx00B0 00
 		01
 			00 00 00 1F
 
 	// Helistation : Position 1F
-	\w100 \wxFFE8 \w0 00 \wx0030 00
+	\w100 \wxFFE8 \w80 00 \wx00B0 00
 		01
 			00 00 00 20
 
 	// Helistation : Position 20
-	\w132 \wxFFE8 \w0 00 \wx0030 00
+	\w132 \wxFFE8 \w80 00 \wx00B0 00
 		01
 			00 00 00 19