diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs index e485b3f50e..2a9b7ec315 100644 --- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs +++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs @@ -654,6 +654,16 @@ namespace OpenRA.Mods.Common.UtilityCommands } } + // Replaced BelowUnits with per sequence ZOffsets + if (engineVersion < 20141030) + { + if (depth == 0) + { + node.Value.Nodes.RemoveAll(n => n.Key == "BelowUnits"); + node.Value.Nodes.RemoveAll(n => n.Key == "-BelowUnits"); + } + } + UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1); } } diff --git a/OpenRA.Mods.RA/BelowUnits.cs b/OpenRA.Mods.RA/BelowUnits.cs deleted file mode 100644 index fd53eeee4c..0000000000 --- a/OpenRA.Mods.RA/BelowUnits.cs +++ /dev/null @@ -1,40 +0,0 @@ -#region Copyright & License Information -/* - * Copyright 2007-2014 The OpenRA Developers (see AUTHORS) - * This file is part of OpenRA, which is free software. It is made - * available to you under the terms of the GNU General Public License - * as published by the Free Software Foundation. For more information, - * see COPYING. - */ -#endregion - -using System.Collections.Generic; -using System.Linq; -using OpenRA.Graphics; -using OpenRA.Mods.RA.Buildings; -using OpenRA.Traits; - -namespace OpenRA.Mods.RA -{ - class BelowUnitsInfo : ITraitInfo - { - public object Create(ActorInitializer init) { return new BelowUnits(init.self); } - } - - class BelowUnits : IRenderModifier - { - int offset; - - public BelowUnits(Actor self) - { - // Offset effective position to the top of the northernmost occupied cell - var bi = self.Info.Traits.GetOrDefault(); - offset = ((bi != null) ? -FootprintUtils.CenterOffset(self.World, bi).Y : 0) - 512; - } - - public IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) - { - return r.Select(a => a.WithZOffset(a.ZOffset + offset)); - } - } -} diff --git a/OpenRA.Mods.RA/Bridge.cs b/OpenRA.Mods.RA/Bridge.cs index 7265ad8eb5..8cf362fc34 100644 --- a/OpenRA.Mods.RA/Bridge.cs +++ b/OpenRA.Mods.RA/Bridge.cs @@ -14,12 +14,13 @@ using System.Linq; using OpenRA.Effects; using OpenRA.GameRules; using OpenRA.Graphics; +using OpenRA.Mods.RA.Buildings; using OpenRA.Primitives; using OpenRA.Traits; namespace OpenRA.Mods.RA { - class BridgeInfo : ITraitInfo, Requires + class BridgeInfo : ITraitInfo, Requires, Requires { public readonly bool Long = false; @@ -71,6 +72,8 @@ namespace OpenRA.Mods.RA class Bridge : IRender, INotifyDamageStateChanged { + readonly Building building; + readonly Bridge[] neighbours = new Bridge[2]; readonly BridgeHut[] huts = new BridgeHut[2]; // Huts before this / first & after this / last public readonly Health Health; @@ -90,6 +93,7 @@ namespace OpenRA.Mods.RA Health.RemoveOnDeath = false; this.Info = info; this.Type = self.Info.Name; + building = self.Trait(); } public Bridge Neighbour(int direction) { return neighbours[direction]; } @@ -163,9 +167,11 @@ namespace OpenRA.Mods.RA IRenderable[] TemplateRenderables(WorldRenderer wr, PaletteReference palette, ushort template) { + var offset = FootprintUtils.CenterOffset(self.World, building.Info).Y + 1024; + return footprint.Select(c => (IRenderable)(new SpriteRenderable( wr.Theater.TileSprite(new TerrainTile(template, c.Value)), - wr.world.Map.CenterOfCell(c.Key), WVec.Zero, -512, palette, 1f, true))).ToArray(); + wr.world.Map.CenterOfCell(c.Key), WVec.Zero, -offset, palette, 1f, true))).ToArray(); } bool initialized; diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj index 17e184362b..a31b57daaa 100644 --- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj +++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj @@ -164,7 +164,6 @@ - diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index bbc3f3ccee..1335e130fa 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -490,7 +490,6 @@ Tooltip: Name: Field (Destroyed) GenericVisibility: None - BelowUnits: BodyOrientation: RenderBuilding: Palette: terrain @@ -612,7 +611,6 @@ CaptureThreshold: 1.0 TransformOnCapture: ForceHealthPercentage: 25 - BelowUnits: BodyOrientation: Tooltip: GenericName: Destroyed Vehicle @@ -627,7 +625,6 @@ Spins: True Moves: False Explosion: HeliCrash - -BelowUnits: -Capturable: -TransformOnCapture: -TargetableUnit: @@ -638,7 +635,6 @@ TargetableBuilding: RequiresForceFire: yes TargetTypes: Ground, Water - BelowUnits: Health: HP: 500 SoundOnDamageTransition: diff --git a/mods/cnc/rules/husks.yaml b/mods/cnc/rules/husks.yaml index f6ddd4ade9..ccd45b408e 100644 --- a/mods/cnc/rules/husks.yaml +++ b/mods/cnc/rules/husks.yaml @@ -4,7 +4,7 @@ MCV.Husk: Name: Mobile Construction Vehicle (Destroyed) Icon: mcvicnh RenderUnit: - Image: mcv + Image: mcv.destroyed TransformOnCapture: IntoActor: mcv @@ -14,7 +14,7 @@ HARV.Husk: Name: Harvester (Destroyed) Icon: harvicnh RenderUnit: - Image: harv + Image: harv.destroyed TransformOnCapture: IntoActor: harv @@ -24,7 +24,7 @@ APC.Husk: Name: APC (Destroyed) Icon: apcicnh RenderUnit: - Image: apc + Image: apc.destroyed TransformOnCapture: IntoActor: apc @@ -34,7 +34,7 @@ FTNK.Husk: Name: Flame Tank (Destroyed) Icon: ftnkicnh RenderUnit: - Image: ftnk + Image: ftnk.destroyed TransformOnCapture: IntoActor: ftnk @@ -44,7 +44,7 @@ ARTY.Husk: Name: Artillery (Destroyed) Icon: artyicnh RenderUnit: - Image: arty + Image: arty.destroyed TransformOnCapture: IntoActor: arty @@ -54,7 +54,7 @@ BGGY.Husk: Name: Nod Buggy (Destroyed) Icon: bggyicnh RenderUnit: - Image: bggy + Image: bggy.destroyed TransformOnCapture: IntoActor: bggy @@ -64,7 +64,7 @@ BIKE.Husk: Name: Recon Bike (Destroyed) Icon: bikeicnh RenderUnit: - Image: bike + Image: bike.destroyed TransformOnCapture: IntoActor: bike @@ -74,7 +74,7 @@ JEEP.Husk: Name: Hum-Vee (Destroyed) Icon: jeepicnh RenderUnit: - Image: jeep + Image: jeep.destroyed TransformOnCapture: IntoActor: jeep @@ -84,7 +84,7 @@ LTNK.Husk: Name: Light Tank (Destroyed) Icon: ltnkicnh RenderUnit: - Image: ltnk + Image: ltnk.destroyed ThrowsParticle@turret: Anim: turret TransformOnCapture: @@ -96,7 +96,7 @@ MTNK.Husk: Name: Medium Tank (Destroyed) Icon: mtnkicnh RenderUnit: - Image: mtnk + Image: mtnk.destroyed ThrowsParticle@turret: Anim: turret TransformOnCapture: @@ -108,7 +108,7 @@ HTNK.Husk: Name: Mammoth Tank (Destroyed) Icon: htnkicnh RenderUnit: - Image: htnk + Image: htnk.destroyed ThrowsParticle@turret: Anim: turret TransformOnCapture: @@ -120,7 +120,7 @@ MSAM.Husk: Name: Rocket Launcher (Destroyed) Icon: msamicnh RenderUnit: - Image: msam + Image: msam.destroyed ThrowsParticle@turret: Anim: turret TransformOnCapture: @@ -132,7 +132,7 @@ MLRS.Husk: Name: Mobile S.A.M. (Destroyed) Icon: mlrsicnh RenderUnit: - Image: mlrs + Image: mlrs.destroyed ThrowsParticle@turret: Anim: turret TransformOnCapture: @@ -144,7 +144,7 @@ STNK.Husk: Name: Stealth Tank (Destroyed) Icon: stnkicnh RenderUnit: - Image: stnk + Image: stnk.destroyed TransformOnCapture: IntoActor: stnk diff --git a/mods/cnc/sequences/decorations.yaml b/mods/cnc/sequences/decorations.yaml index 485de546f5..a8e6e1a3f8 100644 --- a/mods/cnc/sequences/decorations.yaml +++ b/mods/cnc/sequences/decorations.yaml @@ -395,72 +395,93 @@ v11.husk: v12: idle: Start: 0 + ZOffset: -512 damaged-idle: Start: 1 + ZOffset: -512 v12.husk: idle: v12 Start: 2 + ZOffset: -512 v13: idle: Start: 0 + ZOffset: -512 damaged-idle: Start: 1 + ZOffset: -512 v13.husk: idle: v13 Start: 2 + ZOffset: -512 v14: idle: Start: 0 + ZOffset: -512 damaged-idle: Start: 1 + ZOffset: -512 v14.husk: idle: v14 Start: 2 + ZOffset: -512 v15: idle: Start: 0 + ZOffset: -512 damaged-idle: Start: 1 + ZOffset: -512 v15.husk: idle: v15 Start: 2 + ZOffset: -512 v16: idle: Start: 0 + ZOffset: -512 damaged-idle: Start: 1 + ZOffset: -512 v16.husk: idle: v16 Start: 2 + ZOffset: -512 v17: idle: Start: 0 + ZOffset: -512 damaged-idle: Start: 1 + ZOffset: -512 v17.husk: idle: v17 Start: 2 + ZOffset: -512 v18: idle: Start: 0 + ZOffset: -512 damaged-idle: Start: 1 + ZOffset: -512 v18.husk: idle: v18 Start: 2 + ZOffset: -512 v19: idle: diff --git a/mods/cnc/sequences/vehicles.yaml b/mods/cnc/sequences/vehicles.yaml index 9de638b790..f641e6106c 100644 --- a/mods/cnc/sequences/vehicles.yaml +++ b/mods/cnc/sequences/vehicles.yaml @@ -5,6 +5,12 @@ mcv: icon: mcvicnh Start: 0 +mcv.destroyed: + idle: mcv + Start: 0 + Facings: 32 + ZOffset: -512 + harv: idle: Start: 0 @@ -23,6 +29,12 @@ harv: icon: harvicnh Start: 0 +harv.destroyed: + idle: harv + Start: 0 + Facings: 32 + ZOffset: -512 + bggy: idle: Start: 0 @@ -37,6 +49,16 @@ bggy: icon: bggyicnh Start: 0 +bggy.destroyed: + idle: bggy + Start: 0 + Facings: 32 + ZOffset: -512 + turret: bggy + Start: 32 + Facings: 32 + ZOffset: -512 + mtnk: idle: Start: 0 @@ -50,6 +72,16 @@ mtnk: icon: mtnkicnh Start: 0 +mtnk.destroyed: + idle: mtnk + Start: 0 + Facings: 32 + ZOffset: -512 + turret: mtnk + Start: 32 + Facings: 32 + ZOffset: -512 + ltnk: idle: Start: 0 @@ -63,6 +95,16 @@ ltnk: icon: ltnkicnh Start: 0 +ltnk.destroyed: + idle: ltnk + Start: 0 + Facings: 32 + ZOffset: -512 + turret: ltnk + Start: 32 + Facings: 32 + ZOffset: -512 + htnk: idle: Start: 0 @@ -76,6 +118,16 @@ htnk: icon: htnkicnh Start: 0 +htnk.destroyed: + idle: htnk + Start: 0 + Facings: 32 + ZOffset: -512 + turret: htnk + Start: 32 + Facings: 32 + ZOffset: -512 + jeep: idle: Start: 0 @@ -90,6 +142,16 @@ jeep: icon: jeepicnh Start: 0 +jeep.destroyed: + idle: jeep + Start: 0 + Facings: 32 + ZOffset: -512 + turret: jeep + Start: 32 + Facings: 32 + ZOffset: -512 + bike: idle: Start: 0 @@ -97,6 +159,12 @@ bike: icon: bikeicnh Start: 0 +bike.destroyed: + idle: bike + Start: 0 + Facings: 32 + ZOffset: -512 + ftnk: idle: Start: 0 @@ -136,6 +204,12 @@ ftnk: icon: ftnkicnh Start: 0 +ftnk.destroyed: + idle: ftnk + Start: 0 + Facings: 32 + ZOffset: -512 + mhq: idle: Start: 0 @@ -162,6 +236,16 @@ msam: icon: msamicnh Start: 0 +msam.destroyed: + idle: msam + Start: 0 + Facings: 32 + ZOffset: -512 + turret: msam + Start: 32 + Facings: 32 + ZOffset: -512 + mlrs: idle: Start: 0 @@ -178,6 +262,16 @@ mlrs: icon: mlrsicnh Start: 0 +mlrs.destroyed: + idle: mlrs + Start: 0 + Facings: 32 + ZOffset: -512 + turret: mlrs + Start: 32 + Facings: 32 + ZOffset: -512 + stnk: idle: Start: 0 @@ -185,6 +279,12 @@ stnk: icon: stnkicnh Start: 0 +stnk.destroyed: + idle: stnk + Start: 0 + Facings: 32 + ZOffset: -512 + arty: idle: Start: 0 @@ -195,6 +295,12 @@ arty: icon: artyicnh Start: 0 +arty.destroyed: + idle: arty + Start: 0 + Facings: 32 + ZOffset: -512 + apc: idle: Start: 0 @@ -213,4 +319,14 @@ apc: unload: Start: 32 icon: apcicnh - Start: 0 \ No newline at end of file + Start: 0 + +apc.destroyed: + idle: apc + Start: 0 + Facings: 32 + ZOffset: -512 + turret: apctur + Start: 0 + Facings: 32 + ZOffset: -512 \ No newline at end of file diff --git a/mods/d2k/rules/atreides.yaml b/mods/d2k/rules/atreides.yaml index 7f5eb8a055..d6b49db6cc 100644 --- a/mods/d2k/rules/atreides.yaml +++ b/mods/d2k/rules/atreides.yaml @@ -151,7 +151,7 @@ COMBATA: COMBATA.Husk: Inherits: ^COMBAT.Husk RenderUnit: - Image: COMBATA + Image: combata.destroyed TransformOnCapture: IntoActor: combata @@ -200,7 +200,7 @@ SONICTANK: SONICTANK.Husk: Inherits: ^Husk RenderUnit: - Image: SONICTANK + Image: sonictank.destroyed TransformOnCapture: IntoActor: sonictank diff --git a/mods/d2k/rules/harkonnen.yaml b/mods/d2k/rules/harkonnen.yaml index 6906becb2d..2b41aaf1ed 100644 --- a/mods/d2k/rules/harkonnen.yaml +++ b/mods/d2k/rules/harkonnen.yaml @@ -152,7 +152,7 @@ COMBATH: COMBATH.Husk: Inherits: ^COMBAT.Husk RenderUnit: - Image: COMBATH + Image: combath.destroyed TransformOnCapture: IntoActor: combath @@ -205,7 +205,7 @@ DEVAST.Husk: Health: HP: 125 RenderUnit: - Image: DEVAST + Image: devast.destroyed TransformOnCapture: IntoActor: devast diff --git a/mods/d2k/rules/ordos.yaml b/mods/d2k/rules/ordos.yaml index 3bc1100e55..afa6d68c95 100644 --- a/mods/d2k/rules/ordos.yaml +++ b/mods/d2k/rules/ordos.yaml @@ -135,7 +135,7 @@ COMBATO: COMBATO.Husk: Inherits: ^COMBAT.Husk RenderUnit: - Image: COMBATO + Image: combato.destroyed TransformOnCapture: IntoActor: combato @@ -268,7 +268,7 @@ DEVIATORTANK: DEVIATORTANK.Husk: Inherits: ^Husk RenderUnit: - Image: DEVIATORTANK + Image: deviatortank.destroyed TransformOnCapture: IntoActor: deviatortank diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml index 7ad8af58a5..25b1c9dc80 100644 --- a/mods/d2k/rules/vehicles.yaml +++ b/mods/d2k/rules/vehicles.yaml @@ -38,7 +38,7 @@ MCV.Husk: Tooltip: Name: Destroyed Mobile Construction Vehicle RenderUnit: - Image: DMCV + Image: dmcv.destroyed HARVESTER: Inherits: ^Vehicle @@ -88,7 +88,7 @@ HARVESTER.Husk: Tooltip: Name: Destroyed Spice Harvester RenderUnit: - Image: HARVESTER + Image: harvester.destroyed TransformOnCapture: IntoActor: harvester @@ -283,7 +283,7 @@ SIEGETANK.Husk: ThrowsParticle@turret: Anim: turret RenderUnit: - Image: SIEGETANK + Image: siegetank.destroyed TransformOnCapture: IntoActor: siegetank @@ -335,7 +335,7 @@ MISSILETANK: MISSILETANK.Husk: Inherits: ^Husk RenderUnit: - Image: MISSILETANK + Image: missiletank.destroyed TransformOnCapture: IntoActor: missiletank diff --git a/mods/d2k/sequences/vehicles.yaml b/mods/d2k/sequences/vehicles.yaml index 5f83c861da..cb6c6e5981 100644 --- a/mods/d2k/sequences/vehicles.yaml +++ b/mods/d2k/sequences/vehicles.yaml @@ -6,6 +6,12 @@ dmcv: Start: 4023 Offset: -30,-24 +dmcv.destroyed: + idle: DATA + Start: 1795 + Facings: -32 + ZOffset: -1023 + harvester: idle: DATA Start: 1699 @@ -26,6 +32,12 @@ harvester: Start: 4019 Offset: -30,-24 +harvester.destroyed: + idle: DATA + Start: 1699 + Facings: -32 + ZOffset: -1023 + trike: idle: DATA Start: 1635 @@ -68,6 +80,16 @@ siegetank: Start: 4026 Offset: -30,-24 +siegetank.destroyed: + idle: DATA + Start: 1763 + Facings: -32 + ZOffset: -512 + turret: DATA + Start: 1891 + Facings: -32 + ZOffset: -512 + missiletank: idle: DATA Start: 1603 @@ -76,6 +98,12 @@ missiletank: Start: 4024 Offset: -30,-24 +missiletank.destroyed: + idle: DATA + Start: 1603 + Facings: -32 + ZOffset: -512 + sonictank: idle: DATA Start: 1827 @@ -84,6 +112,12 @@ sonictank: Start: 4027 Offset: -30,-24 +sonictank.destroyed: + idle: DATA + Start: 1827 + Facings: -32 + ZOffset: -512 + combata: idle: DATA Start: 1731 @@ -100,6 +134,16 @@ combata: Start: 4020 Offset: -30,-24 +combata.destroyed: + idle: DATA + Start: 1731 + Facings: -32 + ZOffset: -512 + turret: DATA + Start: 1859 + Facings: -32 + ZOffset: -512 + combath: idle: DATA Start: 2051 @@ -116,6 +160,16 @@ combath: Start: 4021 Offset: -30,-24 +combath.destroyed: + idle: DATA + Start: 2051 + Facings: -32 + ZOffset: -512 + turret: DATA + Start: 2115 + Facings: -32 + ZOffset: -512 + devast: idle: DATA Start: 2083 @@ -129,6 +183,12 @@ devast: Start: 4028 Offset: -30,-24 +devast.destroyed: + idle: DATA + Start: 2083 + Facings: -32 + ZOffset: -512 + combato: idle: DATA Start: 2453 @@ -145,6 +205,16 @@ combato: Start: 4022 Offset: -30,-24 +combato.destroyed: + idle: DATA + Start: 2453 + Facings: -32 + ZOffset: -512 + turret: DATA + Start: 2485 + Facings: -32 + ZOffset: -512 + raider: idle: DATA Start: 2421 @@ -182,4 +252,10 @@ deviatortank: Facings: -32 icon: DATA Start: 4025 - Offset: -30,-24 \ No newline at end of file + Offset: -30,-24 + +deviatortank.destroyed: + idle: DATA + Start: 2389 + Facings: -32 + ZOffset: -512 \ No newline at end of file diff --git a/mods/ra/maps/bomber-john/map.yaml b/mods/ra/maps/bomber-john/map.yaml index 3434f0f84f..4d39f6a487 100644 --- a/mods/ra/maps/bomber-john/map.yaml +++ b/mods/ra/maps/bomber-john/map.yaml @@ -892,7 +892,6 @@ Rules: RenderBuilding: Image: miner HasMakeAnimation: false - BelowUnits: Tooltip: Name: Bomb Description: Bomb (Hotkey B) @@ -946,12 +945,15 @@ Sequences: idle: Start: 0 Length: 1 + ZOffset: -512 damaged-idle: Start: 1 Length: * + ZOffset: -512 damaged-build: Start: 1 Length: * + ZOffset: -512 icon: jmin Start: 0 mnlyr: diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 7f792b260e..3245fce760 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -552,7 +552,6 @@ Damage: 2 ProximityCaptor: Types: Husk - BelowUnits: BodyOrientation: Chronoshiftable: TargetableUnit: @@ -577,7 +576,6 @@ FallsToEarth: Spins: True Moves: False - -BelowUnits: -TargetableUnit: -Capturable: -TransformOnCapture: @@ -589,7 +587,6 @@ FallsToEarth: Spins: False Moves: True - -BelowUnits: -TargetableUnit: -Capturable: -TransformOnCapture: @@ -597,7 +594,6 @@ ^Bridge: Tooltip: Name: Bridge - BelowUnits: TargetableBuilding: TargetTypes: Ground, Water RequiresForceFire: true diff --git a/mods/ra/rules/husks.yaml b/mods/ra/rules/husks.yaml index b933402d3d..a3e69503a1 100644 --- a/mods/ra/rules/husks.yaml +++ b/mods/ra/rules/husks.yaml @@ -3,7 +3,7 @@ Tooltip: Name: Husk (Light Tank) RenderUnit: - Image: 1tnk + Image: 1tnk.destroyed ThrowsParticle@turret: Anim: turret TransformOnCapture: @@ -14,7 +14,7 @@ Tooltip: Name: Husk (Medium Tank) RenderUnit: - Image: 2tnk + Image: 2tnk.destroyed ThrowsParticle@turret: Anim: turret TransformOnCapture: @@ -25,7 +25,7 @@ Tooltip: Name: Husk (Heavy Tank) RenderUnit: - Image: 3tnk + Image: 3tnk.destroyed ThrowsParticle@turret: Anim: turret TransformOnCapture: @@ -36,7 +36,7 @@ Tooltip: Name: Husk (Mammoth Tank) RenderUnit: - Image: 4tnk + Image: 4tnk.destroyed ThrowsParticle@turret: Anim: turret TransformOnCapture: @@ -74,7 +74,7 @@ MGG.Husk: Tooltip: Name: Husk (Mobile Gap Generator) RenderUnit: - Image: mgg + Image: mgg.destroyed ThrowsParticle@spinner: Anim: spinner-idle Offset: -299,0,171 diff --git a/mods/ra/rules/misc.yaml b/mods/ra/rules/misc.yaml index cedf8220c1..b5feb7a833 100644 --- a/mods/ra/rules/misc.yaml +++ b/mods/ra/rules/misc.yaml @@ -11,7 +11,6 @@ MINP: Armor: Type: Light RenderSimple: - BelowUnits: Cloak: CloakSound: UncloakSound: @@ -40,7 +39,6 @@ MINV: Armor: Type: Light RenderSimple: - BelowUnits: Cloak: CloakSound: UncloakSound: @@ -240,7 +238,6 @@ MINE: AutoTargetIgnore: BodyOrientation: SeedsResource: - BelowUnits: RAILMINE: Tooltip: @@ -260,7 +257,6 @@ RAILMINE: BodyOrientation: SeedsResource: ResourceType: Gems - BelowUnits: QUEE: Tooltip: diff --git a/mods/ra/sequences/decorations.yaml b/mods/ra/sequences/decorations.yaml index a447ba86bd..adc6107e6c 100644 --- a/mods/ra/sequences/decorations.yaml +++ b/mods/ra/sequences/decorations.yaml @@ -308,38 +308,50 @@ v13: v14: idle: Start: 0 + ZOffset: -512 damaged-idle: Start: 1 + ZOffset: -512 v15: idle: Start: 0 + ZOffset: -512 damaged-idle: Start: 1 + ZOffset: -512 v16: idle: Start: 0 + ZOffset: -512 damaged-idle: Start: 1 + ZOffset: -512 v17: idle: Start: 0 + ZOffset: -512 damaged-idle: Start: 1 + ZOffset: -512 v18: idle: Start: 0 + ZOffset: -512 damaged-idle: Start: 1 + ZOffset: -512 rice: idle: Start: 0 + ZOffset: -512 damaged-idle: Start: 1 + ZOffset: -512 v19: idle: diff --git a/mods/ra/sequences/misc.yaml b/mods/ra/sequences/misc.yaml index 3e67f452c2..0e1e65d8a8 100644 --- a/mods/ra/sequences/misc.yaml +++ b/mods/ra/sequences/misc.yaml @@ -544,12 +544,14 @@ lar2: minp: idle: Start: 0 + ZOffset: -512 icon: jmin Start: 0 minv: idle: Start: 0 + ZOffset: -512 icon: jmin Start: 0 @@ -632,7 +634,9 @@ craters: mine: idle: Start: 0 + ZOffset: -512 railmine: idle: Start: 0 + ZOffset: -512 diff --git a/mods/ra/sequences/vehicles.yaml b/mods/ra/sequences/vehicles.yaml index 81f9fa7eac..9341dbc589 100644 --- a/mods/ra/sequences/vehicles.yaml +++ b/mods/ra/sequences/vehicles.yaml @@ -90,6 +90,16 @@ hhusk2: icon: 1tnkicon Start: 0 +1tnk.destroyed: + idle: 1tnk + Start: 0 + Facings: 32 + ZOffset: -512 + turret: 1tnk + Start: 32 + Facings: 32 + ZOffset: -512 + 2tnk: idle: Start: 0 @@ -103,6 +113,16 @@ hhusk2: icon: 2tnkicon Start: 0 +2tnk.destroyed: + idle: 2tnk + Start: 0 + Facings: 32 + ZOffset: -512 + turret: 2tnk + Start: 32 + Facings: 32 + ZOffset: -512 + 3tnk: idle: Start: 0 @@ -116,6 +136,16 @@ hhusk2: icon: 3tnkicon Start: 0 +3tnk.destroyed: + idle: 3tnk + Start: 0 + Facings: 32 + ZOffset: -512 + turret: 3tnk + Start: 32 + Facings: 32 + ZOffset: -512 + 4tnk: idle: Start: 0 @@ -129,6 +159,16 @@ hhusk2: icon: 4tnkicon Start: 0 +4tnk.destroyed: + idle: 4tnk + Start: 0 + Facings: 32 + ZOffset: -512 + turret: 4tnk + Start: 32 + Facings: 32 + ZOffset: -512 + v2rl: idle: Start: 0 @@ -218,6 +258,19 @@ mgg: icon: mggicon Start: 0 +mgg.destroyed: + idle: mgg + Start: 0 + Facings: 32 + ZOffset: -512 + spinner: mgg + Start: 32 + Length: 8 + ZOffset: -512 + spinner-idle: mgg + Start: 32 + Length: 1 + ttnk: idle: Start: 0 diff --git a/mods/ts/rules/structures.yaml b/mods/ts/rules/structures.yaml index 6ddca9317b..82dfe36028 100644 --- a/mods/ts/rules/structures.yaml +++ b/mods/ts/rules/structures.yaml @@ -833,7 +833,6 @@ GAHPAD: Production: Produces: Air PrimaryBuilding: - BelowUnits: Reservable: RepairsUnits: ProductionBar: @@ -869,7 +868,6 @@ NAHPAD: Production: Produces: Air PrimaryBuilding: - BelowUnits: Reservable: RepairsUnits: ProductionBar: diff --git a/mods/ts/sequences/structures.yaml b/mods/ts/sequences/structures.yaml index 934f60a5b0..ea4cbb68d0 100644 --- a/mods/ts/sequences/structures.yaml +++ b/mods/ts/sequences/structures.yaml @@ -1016,46 +1016,56 @@ gahpad: Start: 0 ShadowStart: 3 Offset: 0, -24 + ZOffset: -1c511 damaged-idle: gthpad Start: 1 ShadowStart: 4 Offset: 0, -24 + ZOffset: -1c511 critical-idle: gthpad Start: 2 ShadowStart: 5 Offset: 0, -24 + ZOffset: -1c511 idle-platform: gthpadbb Start: 0 ShadowStart: 3 Offset: 0, -24 + ZOffset: -1c511 damaged-idle-platform: gthpadbb Start: 1 ShadowStart: 4 Offset: 0, -24 + ZOffset: -1c511 critical-idle-platform: gthpadbb Start: 2 ShadowStart: 5 Offset: 0, -24 + ZOffset: -1c511 idle-lights: gthpad_a Start: 0 Length: 8 Tick: 200 Offset: 0, -36 + ZOffset: -1c511 damaged-idle-lights: gthpad_a Start: 8 Length: 8 Tick: 200 Offset: 0, -36 + ZOffset: -1c511 critical-idle-lights: gthpad_a Start: 16 Length: 8 Tick: 200 Offset: 0, -36 + ZOffset: -1c511 make: gthpadmk Start: 0 Length: 18 ShadowStart: 18 Offset: 0, -24 + ZOffset: -1c511 icon: heliicon Start: 0 @@ -1064,44 +1074,50 @@ nahpad: Start: 0 ShadowStart: 3 Offset: 0, -24 + ZOffset: -1c511 damaged-idle: nthpad Start: 1 ShadowStart: 4 Offset: 0, -24 + ZOffset: -1c511 critical-idle: nthpad Start: 2 ShadowStart: 5 Offset: 0, -24 + ZOffset: -1c511 idle-platform: nthpadbb Start: 0 ShadowStart: 3 Offset: 0, -24 + ZOffset: -1c511 damaged-idle-platform: nthpadbb Start: 1 ShadowStart: 4 Offset: 0, -24 + ZOffset: -1c511 critical-idle-platform: nthpadbb Start: 2 ShadowStart: 5 Offset: 0, -24 + ZOffset: -1c511 idle-lights: nthpad_a Start: 0 Length: 46 -# Offset: 2,-12 Offset: 0, -24 + ZOffset: -1c511 Tick: 120 damaged-idle-lights: nthpad_a Start: 46 Length: 46 -# Offset: 16,-16 Tick: 120 Offset: 0, -24 + ZOffset: -1c511 critical-idle-lights: nthpad_a Start: 46 Length: 46 -# Offset: 24,-24 Tick: 200 Offset: 0, -24 + ZOffset: -1c511 make: nthpadmk Start: 0 Length: 20