From 1d197da5ace91a8f352ade4fd5bfe20ea64b5883 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 13 Sep 2015 19:39:38 +0200 Subject: [PATCH 1/2] Remove unused ornithopter definition --- mods/d2k/rules/aircraft.yaml | 56 ------------------------------------ 1 file changed, 56 deletions(-) diff --git a/mods/d2k/rules/aircraft.yaml b/mods/d2k/rules/aircraft.yaml index 2ffaa9ade9..8f9d322507 100644 --- a/mods/d2k/rules/aircraft.yaml +++ b/mods/d2k/rules/aircraft.yaml @@ -93,49 +93,6 @@ frigate: FlyAwayOnIdle: 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: @@ -162,19 +119,6 @@ ornithopter.bomber: 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: From 7aaa31774d602c3631b31f34961d58647e5a8e37 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 13 Sep 2015 19:41:41 +0200 Subject: [PATCH 2/2] Rename ornithopter.bomber to just ornithopter --- mods/d2k/rules/aircraft.yaml | 8 +++----- mods/d2k/rules/structures.yaml | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/mods/d2k/rules/aircraft.yaml b/mods/d2k/rules/aircraft.yaml index 8f9d322507..c3f63fd5d0 100644 --- a/mods/d2k/rules/aircraft.yaml +++ b/mods/d2k/rules/aircraft.yaml @@ -93,7 +93,7 @@ frigate: FlyAwayOnIdle: RejectsOrders: -ornithopter.bomber: +ornithopter: Inherits: ^Plane AttackBomber: Armament: @@ -114,12 +114,10 @@ ornithopter.bomber: Tooltip: Name: Ornithopter SpawnActorOnDeath: - Actor: ornithopter.bomber.husk + Actor: ornithopter.husk RejectsOrders: - RenderSprites: - Image: ornithopter -ornithopter.bomber.husk: +ornithopter.husk: Inherits: ^AircraftHusk Tooltip: Name: Ornithopter diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index 2d8bc89915..9059f8971f 100644 --- a/mods/d2k/rules/structures.yaml +++ b/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