Merge pull request #9337 from reaperrr/d2k-orni

Removes unused ornithopter definition and renames ornithopter.bomber

mods/d2k/rules/aircraft.yaml

@@ -94,49 +94,6 @@ frigate:
 	RejectsOrders:
 
 ornithopter:
-	Inherits: ^Plane
-	Valued:
-		Cost: 1000
-	Tooltip:
-		Name: Ornithopter
-		Description: Helicopter Gunship with Chainguns.\n  Strong vs Infantry, Light Vehicles.\n  Weak vs Tanks
-	Health:
-		HP: 150
-	Armor:
-		Type: Light
-	RevealsShroud:
-		Range: 10c0
-		Type: CenterPosition
-	Armament:
-		Weapon: M_HMG
-		LocalOffset: 85,-213,-85
-	AttackHeli:
-		FacingTolerance: 20
-	Helicopter:
-		LandWhenIdle: false
-		InitialFacing: 20
-		ROT: 6
-		Speed: 280
-		RepairBuildings: repair_pad
-		RearmBuildings:
-		AirborneUpgrades: airborne
-	SpawnActorOnDeath:
-		Actor: ornithopter.husk
-	SelectionDecorations:
-	Selectable:
-		Bounds: 32,32
-	Targetable@GROUND:
-		TargetTypes: Ground, Vehicle
-		UpgradeTypes: airborne
-		UpgradeMaxEnabledLevel: 0
-	Targetable@AIRBORNE:
-		TargetTypes: Air
-		UpgradeTypes: airborne
-		UpgradeMinEnabledLevel: 1
-	Voiced:
-		VoiceSet: GenericVoice
-
-ornithopter.bomber:
 	Inherits: ^Plane
 	AttackBomber:
 	Armament:
@@ -157,25 +114,10 @@ ornithopter.bomber:
 	Tooltip:
 		Name: Ornithopter
 	SpawnActorOnDeath:
-		Actor: ornithopter.bomber.husk
+		Actor: ornithopter.husk
 	RejectsOrders:
-	RenderSprites:
-		Image: ornithopter
 
 ornithopter.husk:
-	Inherits: ^AircraftHusk
-	Tooltip:
-		Name: Ornithopter
-	Helicopter:
-		ROT: 6
-		Speed: 280
-		RepairBuildings:
-		RearmBuildings:
-		AirborneUpgrades: airborne
-	RenderSprites:
-		Image: ornithopter
-
-ornithopter.bomber.husk:
 	Inherits: ^AircraftHusk
 	Tooltip:
 		Name: Ornithopter

mods/d2k/rules/structures.yaml

@@ -692,8 +692,8 @@ high_tech_factory:
 		Prerequisites: ~techlevel.superweapons, upgrade.hightech
 		ChargeTime: 180
 		SquadSize: 3
-		LongDesc: Ornithopters hit the target with parabombs
-		UnitType: ornithopter.bomber
+		LongDesc: Ornithopters hit the target with bombs
+		UnitType: ornithopter
 		SelectTargetSound:
 		DisplayBeacon: True
 		CameraActor: camera