From 32bed06df5a38428c6c7fb50d4cb0467ad52e856 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Mon, 30 Mar 2015 17:43:31 +0200
Subject: [PATCH] Fix Orca Bomber and Banshee Fighter flight behavior and
 reloading

---
 mods/ts/rules/aircraft.yaml | 27 ++++++++++++++++-----------
 mods/ts/rules/defaults.yaml | 13 +++++++++++--
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/mods/ts/rules/aircraft.yaml b/mods/ts/rules/aircraft.yaml
index 8b00e87e04..04d0cd12da 100644
--- a/mods/ts/rules/aircraft.yaml
+++ b/mods/ts/rules/aircraft.yaml
@@ -99,7 +99,7 @@ ORCA:
 	Hovers:
 
 ORCAB:
-	Inherits: ^Helicopter
+	Inherits: ^Plane
 	Valued:
 		Cost: 1600
 	Tooltip:
@@ -110,10 +110,12 @@ ORCAB:
 		Prerequisites: ~gahpad, gatech
 	Selectable:
 		Bounds: 30,24
-	Helicopter:
+	Plane:
+		CruiseAltitude: 3072
+		MaximumPitch: 120
 		RearmBuildings: gahpad
-		ROT: 5
-		Speed: 112
+		ROT: 3
+		Speed: 96
 	Health:
 		HP: 260
 	Armor:
@@ -122,11 +124,13 @@ ORCAB:
 		Range: 2c0
 	Armament:
 		Weapon: Bomb
-	AttackHeli:
+	AttackPlane:
 		FacingTolerance: 20
 	AmmoPool:
-		Ammo: 2
+		Ammo: 10
 		PipCount: 2
+		ReloadCount: 5
+		ReloadTicks: 200
 		PipType: Ammo
 		PipTypeEmpty: AmmoEmpty
 	AutoTarget:
@@ -190,7 +194,7 @@ TRNSPORT:
 	Hovers:
 
 SCRIN:
-	Inherits: ^Helicopter
+	Inherits: ^Plane
 	Valued:
 		Cost: 1500
 	Tooltip:
@@ -202,7 +206,8 @@ SCRIN:
 	Selectable:
 		Bounds: 30,24
 		Voice: Scrin
-	Helicopter:
+	Plane:
+		MaximumPitch: 90
 		RearmBuildings: nahpad
 		ROT: 3
 		Speed: 168
@@ -214,11 +219,12 @@ SCRIN:
 		Range: 2c0
 	Armament:
 		Weapon: Proton
-	AttackHeli:
+	AttackPlane:
 		FacingTolerance: 20
 	AmmoPool:
-		Ammo: 3
+		Ammo: 15
 		PipCount: 3
+		ReloadCount: 5
 		PipType: Ammo
 		PipTypeEmpty: AmmoEmpty
 	AutoTarget:
@@ -264,4 +270,3 @@ APACHE:
 	RenderVoxels:
 	WithVoxelBody:
 	Hovers:
-
diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml
index b0e98a2e10..1b0cfdac4a 100644
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -438,8 +438,7 @@
 		RepairBuildings:
 		RearmBuildings:
 		LandWhenIdle: no
-	Buildable:
-		Queue: Aircraft
+		CruiseAltitude: 2048
 	HiddenUnderFog:
 	AttackMove:
 	GainsExperience:
@@ -472,6 +471,16 @@
 	UpgradeManager:
 	MustBeDestroyed:
 
+^Plane:	
+	Inherits: ^Helicopter
+	-Helicopter:
+	Plane:
+		RepairBuildings:
+		RearmBuildings: gahpad, nahpad
+		LandWhenIdle: no
+		CruiseAltitude: 2560
+	ReturnOnIdle:
+
 ^BlossomTree:
 	Tooltip:
 		Name: Blossom Tree