diff --git a/mods/ca/bits/harrieravionicsicon.shp b/mods/ca/bits/harrieravionicsicon.shp deleted file mode 100644 index 8994057f..00000000 Binary files a/mods/ca/bits/harrieravionicsicon.shp and /dev/null differ diff --git a/mods/ca/bits/harrierpayloadicon.shp b/mods/ca/bits/harrierpayloadicon.shp deleted file mode 100644 index edf60e0c..00000000 Binary files a/mods/ca/bits/harrierpayloadicon.shp and /dev/null differ diff --git a/mods/ca/rules/aircraft.yaml b/mods/ca/rules/aircraft.yaml index 5d93bb50..d7779931 100644 --- a/mods/ca/rules/aircraft.yaml +++ b/mods/ca/rules/aircraft.yaml @@ -2242,99 +2242,6 @@ ORCA.Torp: Position: BottomLeft RequiresSelection: true -ORCB: - Inherits: ^Helicopter - Inherits: ^TDAircraftSprite - Inherits: ^BiologicalPilot - Inherits: ^PrioAntiHeavy - RenderSprites: - Image: orcab - Buildable: - Queue: Aircraft - BuildAtProductionType: Helicopter - BuildPaletteOrder: 40 - Prerequisites: ~hpad.td, ~aircraft.eagle, gtek - IconPalette: chrome - Description: VTOL bomber armed with EMP bombs.\n Strong vs Buildings, Vehicles\n Weak vs Aircraft, Infantry - Valued: - Cost: 1600 - Tooltip: - Name: Orca Bomber - Health: - HP: 36000 - RevealsShroud: - Range: 10c0 - MinRange: 8c0 - Type: GroundPosition - RevealGeneratedShroud: False - RevealsShroud@GAPGEN: - Range: 8c0 - Type: GroundPosition - Armament: - Weapon: OrcaBomb - LocalOffset: 2,-256,-43, 2,256,-43 - PauseOnCondition: !ammo - AttackAircraft: - FacingTolerance: 80 - Voice: Attack - PersistentTargeting: false - OpportunityFire: false - PauseOnCondition: empdisable || being-warped - Aircraft: - CruiseAltitude: 2560 - AltitudeVelocity: 0c120 - TurnSpeed: 16 - Speed: 180 - RepulsionSpeed: 40 - MaximumPitch: 56 - TakeoffSounds: orcaup1.aud - LandingSounds: orcadwn1.aud - CanHover: False - CanSlide: False - Voice: Move - AutoTarget: - InitialStance: HoldFire - InitialStanceAI: HoldFire - AmmoPool: - Ammo: 8 - AmmoCondition: ammo - WithAmmoPipsDecoration: - PipCount: 4 - Position: BottomLeft - Margin: 4, 3 - RequiresSelection: true - SpawnActorOnDeath: - Actor: ORCB.Husk - RequiresCondition: ammo && !empdisable && !being-warped - SpawnActorOnDeath@Empty: - Actor: ORCB.Husk.empty - RequiresCondition: !ammo && !empdisable && !being-warped - SpawnActorOnDeath@EMP: - Actor: ORCB.Husk.EMP - RequiresCondition: ammo && empdisable && !being-warped - SpawnActorOnDeath@EmptyEMP: - Actor: ORCB.Husk.empty.EMP - RequiresCondition: !ammo && empdisable && !being-warped - LeavesTrails: - Offsets: -853,0,171 - MovingInterval: 2 - Image: smokey - StationaryInterval: 2 - SpawnAtLastPosition: False - TrailWhileStationary: True - Type: CenterPosition - RequiresCondition: enable-smoke - WithMoveAnimation: - MoveSequence: move - ProducibleWithLevel: - Prerequisites: aircraft.upgraded - Rearmable: - RearmActors: hpad.td, hpad - Voiced: - VoiceSet: OrcaVoice - GrantConditionOnDamageState@SmokeTrail: - Condition: enable-smoke - UAV: Inherits: ^NeutralPlane Inherits: ^RobotPilot @@ -2596,6 +2503,9 @@ HARR: Inherits: ^VoxelPlane RenderVoxels: Scale: 0.5 + Image: harr + RenderSprites: + Image: harr Contrail@1: Offset: -400,-443,0 Contrail@2: @@ -2650,6 +2560,8 @@ HARR: HARR.avionics: Inherits: HARR + WithProductionIconOverlay@Air: + Types: Air Buildable: Queue: Aircraft BuildAtProductionType: Helicopter @@ -2665,6 +2577,8 @@ HARR.avionics: HARR.payload: Inherits: HARR + WithProductionIconOverlay@Bullets: + Types: Bullets Buildable: Queue: Aircraft BuildAtProductionType: Helicopter @@ -2685,46 +2599,6 @@ HARR.payload: Margin: 4, 3 RequiresSelection: true -Raptor: - Inherits: ^VoxelJet - RenderVoxels: - Scale: 0.5 - Contrail@1: - Offset: -350,-550,-50 - Contrail@2: - Offset: -350,550,-50 - Inherits: ^BiologicalPilot - Inherits: ^PrioAntiHeavyAA - Inherits: ^FightingPlane - Inherits: ^PlaneScoutVision - Inherits: ^RearmableAircraft - Buildable: - Queue: Aircraft - BuildAtProductionType: Plane - BuildPaletteOrder: 50 - IconPalette: chrome - Prerequisites: ~afld.allies, ~aircraft.allies, ~commander_tree.raptor - Description: Fast Fighter Jet armed\nwith powerful Air-to-Air missiles.\n Strong vs Aircraft\n Weak vs Ground - Valued: - Cost: 2000 - Tooltip: - Name: F-22 Raptor - Health: - HP: 16000 - Armament: - Weapon: Nike.Raptor - LocalOffset: 0,213,-85, 0,-213,-85 - PauseOnCondition: !ammo || being-warped - AttackAircraft: - FacingTolerance: 512 - Aircraft: - Speed: 260 - AmmoPool: - Ammo: 6 - SpawnActorOnDeath: - Actor: raptor.Husk - RequiresCondition: !being-warped - HORN: Inherits: ^Plane Inherits: ^TDAircraftSprite diff --git a/mods/ca/rules/allies/commander-tree.yaml b/mods/ca/rules/allies/commander-tree.yaml index e69de29b..84fdcf74 100644 --- a/mods/ca/rules/allies/commander-tree.yaml +++ b/mods/ca/rules/allies/commander-tree.yaml @@ -0,0 +1,58 @@ +commander_tree.Harrier: + Inherits: ^default.commander_tree_item + RenderSprites: + Image: harr + Tooltip: + Name: Harrier + Buildable: + Queue: Commander_Tree + BuildPaletteOrder: 50 + ForceIconLocation: true + Prerequisites: prerequisite.has_points, techcenter, ~aircraft.allies, ~!aircraft.germany + Description: Enables to build the Harrier, a VTOL aircraft. \n Strong vs. groups of light armored ground units. + +commander_tree.Harrier.Avionics: + Inherits: ^default.commander_tree_item + WithProductionIconOverlay@Air: + Types: Air + RenderSprites: + Image: harr + Tooltip: + Name: Harrier Avionics Upgrade + Buildable: + Queue: Commander_Tree + BuildPaletteOrder: 51 + ForceIconLocation: true + Prerequisites: prerequisite.has_points, techcenter, commander_tree.harrier, ~!commander_tree.harrier.payload, ~aircraft.england + Description: Upgrades the Avionics of the Harrier, allowing it to hover when shooting \n + ProvidesPrerequisite@filler: + Prerequisite: filler.harrier + +commander_tree.Harrier.Payload: + Inherits: ^default.commander_tree_item + WithProductionIconOverlay@Bullets: + Types: Bullets + RenderSprites: + Image: harr + Tooltip: + Name: Harrier Payload Upgrade + Buildable: + Queue: Commander_Tree + BuildPaletteOrder: 51 + ForceIconLocation: true + Prerequisites: prerequisite.has_points, techcenter, commander_tree.harrier, ~!commander_tree.harrier.avionics, ~aircraft.allies, ~!aircraft.germany + Description: Increases the Payload of the Harrier \n + ProvidesPrerequisite@filler: + Prerequisite: filler.harrier + +hack.cameo_filler.28: + Inherits: ^default.cameo_filler + Buildable: + BuildPaletteOrder: 51 + Prerequisites: prerequisite.has_points, ~aircraft.france, techcenter, disabled + +hack.cameo_filler.29: + Inherits: ^default.cameo_filler + Buildable: + BuildPaletteOrder: 52 + Prerequisites: prerequisite.has_points, ~aircraft.england, techcenter, ~filler.harrier, disabled diff --git a/mods/ca/rules/commander-tree.yaml b/mods/ca/rules/commander-tree.yaml index e448f2f5..60157475 100644 --- a/mods/ca/rules/commander-tree.yaml +++ b/mods/ca/rules/commander-tree.yaml @@ -752,55 +752,6 @@ hack.cameo_filler.27: BuildPaletteOrder: 49 Prerequisites: prerequisite.has_points, ~aircraft.allies, ~filler.longbow, disabled -commander_tree.Harrier: - Inherits: ^default.commander_tree_item - Tooltip: - Name: Harrier - Buildable: - Queue: Commander_Tree - BuildPaletteOrder: 50 - ForceIconLocation: true - Prerequisites: prerequisite.has_points, techcenter, ~aircraft.allies, ~!aircraft.germany - Description: Enables to build the Harrier, a VTOL aircraft. \n Strong vs. groups of light armored ground units. - -commander_tree.Harrier.Avionics: - Inherits: ^default.commander_tree_item - Tooltip: - Name: Harrier Avionics Upgrade - Buildable: - Queue: Commander_Tree - BuildPaletteOrder: 51 - ForceIconLocation: true - Prerequisites: prerequisite.has_points, techcenter, commander_tree.harrier, ~!commander_tree.harrier.payload, ~aircraft.england - Description: Upgrades the Avionics of the Harrier, allowing it to hover when shooting \n - ProvidesPrerequisite@filler: - Prerequisite: filler.harrier - -commander_tree.Harrier.Payload: - Inherits: ^default.commander_tree_item - Tooltip: - Name: Harrier Payload Upgrade - Buildable: - Queue: Commander_Tree - BuildPaletteOrder: 51 - ForceIconLocation: true - Prerequisites: prerequisite.has_points, techcenter, commander_tree.harrier, ~!commander_tree.harrier.avionics, ~aircraft.allies, ~!aircraft.germany - Description: Increases the Payload of the Harrier \n - ProvidesPrerequisite@filler: - Prerequisite: filler.harrier - -hack.cameo_filler.28: - Inherits: ^default.cameo_filler - Buildable: - BuildPaletteOrder: 51 - Prerequisites: prerequisite.has_points, ~aircraft.france, techcenter, disabled - -hack.cameo_filler.29: - Inherits: ^default.cameo_filler - Buildable: - BuildPaletteOrder: 52 - Prerequisites: prerequisite.has_points, ~aircraft.england, techcenter, ~filler.harrier, disabled - #Soviet commander_tree.Mortar: diff --git a/mods/ca/sequences/aircraft.yaml b/mods/ca/sequences/aircraft.yaml index 1474027b..2bd4fef1 100644 --- a/mods/ca/sequences/aircraft.yaml +++ b/mods/ca/sequences/aircraft.yaml @@ -401,14 +401,6 @@ harr: idle: invisibleitem icon: harricon -harr.avionics: - Inherits: harr - icon: harrieravionicsicon - -harr.payload: - Inherits: harr - icon: harrierpayloadicon - raptor: Inherits: ^VehicleOverlays idle: invisibleitem