diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/MoveClassicFacingFudge.cs b/OpenRA.Mods.Common/UpdateRules/Rules/MoveClassicFacingFudge.cs new file mode 100644 index 0000000000..21ae9bf040 --- /dev/null +++ b/OpenRA.Mods.Common/UpdateRules/Rules/MoveClassicFacingFudge.cs @@ -0,0 +1,80 @@ +#region Copyright & License Information +/* + * Copyright 2007-2020 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, either version 3 of + * the License, or (at your option) any later version. For more + * information, see COPYING. + */ +#endregion + +using System.Collections.Generic; +using System.Linq; + +namespace OpenRA.Mods.Common.UpdateRules.Rules +{ + public class MoveClassicFacingFudge : UpdateRule + { + public override string Name { get { return "UseClassicFacingFudge functionality was moved to Cnc-specific sequence/coordinate code."; } } + public override string Description + { + get + { + return "UseClassicFacingFudge has been replaced with ClassicFacingBodyOrientation trait\n" + + "and Classic* variants of *Sequence loaders respectively, both located in Mods.Cnc."; + } + } + + readonly List locations = new List(); + + public override IEnumerable AfterUpdate(ModData modData) + { + if (locations.Any()) + yield return "UseClassicFacingFudge property on BodyOrientation was replaced with ClassicFacingBodyOrientation trait.\n" + + "UseClassicFacingFudge for sequences was renamed to UseClassicFacings and moved to\n" + + "Classic(TileSetSpecific)SpriteSequence loaders in Mods.Cnc.\n" + + "Update SpriteSequenceFormat: in mod.yaml accordingly.\n" + + "Make sure that actors implementing the following places don't use or inherit the standard BodyOrientation:\n" + + UpdateUtils.FormatMessageList(locations); + + locations.Clear(); + } + + public override IEnumerable UpdateActorNode(ModData modData, MiniYamlNode actorNode) + { + var modId = modData.Manifest.Id; + + foreach (var bo in actorNode.ChildrenMatching("BodyOrientation")) + { + var usesClassicFacings = false; + var facingFudgeNode = bo.LastChildMatching("UseClassicFacingFudge"); + if (facingFudgeNode != null) + { + usesClassicFacings = facingFudgeNode.NodeValue(); + bo.RemoveNode(facingFudgeNode); + } + + if (usesClassicFacings) + { + bo.RenameKey("ClassicFacingBodyOrientation"); + locations.Add("{0} ({1})".F(actorNode.Key, actorNode.Location.Filename)); + } + } + + yield break; + } + + public override IEnumerable UpdateSequenceNode(ModData modData, MiniYamlNode sequenceNode) + { + foreach (var sequence in sequenceNode.Value.Nodes) + { + var facingFudgeNode = sequence.LastChildMatching("UseClassicFacingFudge"); + if (facingFudgeNode != null) + facingFudgeNode.RenameKey("UseClassicFacings"); + } + + yield break; + } + } +} diff --git a/OpenRA.Mods.Common/UpdateRules/UpdatePath.cs b/OpenRA.Mods.Common/UpdateRules/UpdatePath.cs index 8768b95ab7..5d8198e7db 100644 --- a/OpenRA.Mods.Common/UpdateRules/UpdatePath.cs +++ b/OpenRA.Mods.Common/UpdateRules/UpdatePath.cs @@ -81,6 +81,7 @@ namespace OpenRA.Mods.Common.UpdateRules new AddPipDecorationTraits(), new ModernizeDecorationTraits(), new RenameInfiltrationNotifications(), + new MoveClassicFacingFudge(), }) }; diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml index 9b986c1de9..59ed129dd8 100644 --- a/mods/cnc/mod.yaml +++ b/mods/cnc/mod.yaml @@ -215,7 +215,7 @@ SoundFormats: Aud, Wav SpriteFormats: ShpTD, TmpTD, ShpTS, TmpRA -SpriteSequenceFormat: TilesetSpecificSpriteSequence +SpriteSequenceFormat: ClassicTilesetSpecificSpriteSequence TilesetExtensions: TEMPERAT: .tem WINTER: .win diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 60da10162f..fc6b8f7fb7 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -13,6 +13,11 @@ QuantizeFacingsFromSequence: RenderSprites: +^ClassicFacingSpriteActor: + ClassicFacingBodyOrientation: + QuantizeFacingsFromSequence: + RenderSprites: + ^1x1Shape: HitShape: UseTargetableCellsOffsets: true @@ -263,7 +268,7 @@ ^Vehicle: Inherits@1: ^ExistsInWorld - Inherits@3: ^SpriteActor + Inherits@3: ^ClassicFacingSpriteActor Inherits@selection: ^SelectableCombatUnit Huntable: OwnerLostAction: @@ -294,8 +299,6 @@ MustBeDestroyed: Voiced: VoiceSet: VehicleVoice - BodyOrientation: - UseClassicFacingFudge: True HitShape: MapEditorData: Categories: Vehicle @@ -310,7 +313,7 @@ ^Helicopter: Inherits@1: ^ExistsInWorld - Inherits@3: ^SpriteActor + Inherits@3: ^ClassicFacingSpriteActor Inherits@selection: ^SelectableCombatUnit Huntable: OwnerLostAction: @@ -357,8 +360,6 @@ MustBeDestroyed: Voiced: VoiceSet: VehicleVoice - BodyOrientation: - UseClassicFacingFudge: True HitShape: MapEditorData: Categories: Aircraft @@ -641,7 +642,7 @@ ^Plane: Inherits@1: ^ExistsInWorld - Inherits@2: ^SpriteActor + Inherits@2: ^ClassicFacingSpriteActor Huntable: OwnerLostAction: Action: Kill @@ -1030,7 +1031,7 @@ ValidOwnerNames: Neutral ^CommonHuskDefaults: - Inherits@1: ^SpriteActor + Inherits@1: ^ClassicFacingSpriteActor Interactable: Health: HP: 14000 @@ -1068,8 +1069,6 @@ Explodes: Weapon: UnitExplodeSmall EmptyWeapon: UnitExplodeSmall - BodyOrientation: - UseClassicFacingFudge: True ^LightHusk: Inherits: ^Husk @@ -1090,8 +1089,6 @@ Explosion: HeliCrash Tooltip: GenericName: Destroyed Helicopter - BodyOrientation: - UseClassicFacingFudge: True -MapEditorData: ^Bridge: diff --git a/mods/cnc/rules/ships.yaml b/mods/cnc/rules/ships.yaml index cb3aafaee8..1ed6bfa565 100644 --- a/mods/cnc/rules/ships.yaml +++ b/mods/cnc/rules/ships.yaml @@ -71,6 +71,8 @@ LST: Type: Heavy RevealsShroud: Range: 7c0 + -BodyOrientation: + ClassicFacingBodyOrientation: WithFacingSpriteBody: Selectable: Bounds: 48,48 diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml index 4598e70bd1..aab9b303ba 100644 --- a/mods/cnc/rules/structures.yaml +++ b/mods/cnc/rules/structures.yaml @@ -865,8 +865,8 @@ GUN: Range: 3c0 Power: Amount: -20 - BodyOrientation: - UseClassicFacingFudge: True + -BodyOrientation: + ClassicFacingBodyOrientation: SAM: Inherits: ^Defense @@ -915,8 +915,8 @@ SAM: -RenderDetectionCircle: Power: Amount: -20 - BodyOrientation: - UseClassicFacingFudge: True + -BodyOrientation: + ClassicFacingBodyOrientation: -ActorPreviewPlaceBuildingPreview: SequencePlaceBuildingPreview: Sequence: place diff --git a/mods/cnc/sequences/aircraft.yaml b/mods/cnc/sequences/aircraft.yaml index 7ef851a8a7..57ee201a43 100644 --- a/mods/cnc/sequences/aircraft.yaml +++ b/mods/cnc/sequences/aircraft.yaml @@ -1,13 +1,13 @@ c17: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True icon: c17icnh tran: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True rotor: lrotor Length: 4 rotor2: rrotor @@ -29,7 +29,7 @@ tran: heli: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True rotor: lrotor Length: 4 slow-rotor: lrotor @@ -44,7 +44,7 @@ heli: orca: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True move: Start: 32 Facings: 32 @@ -54,7 +54,7 @@ orca: a10: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True muzzle: minigun Length: 6 Facings: 8 diff --git a/mods/cnc/sequences/campaign.yaml b/mods/cnc/sequences/campaign.yaml index 2a159876de..cce5da3868 100644 --- a/mods/cnc/sequences/campaign.yaml +++ b/mods/cnc/sequences/campaign.yaml @@ -1,9 +1,9 @@ lst: idle: lstnew - UseClassicFacingFudge: True + UseClassicFacings: True Facings: 32 roof: lstnew2 - UseClassicFacingFudge: True + UseClassicFacings: True Facings: 32 icon: lsticnh.tem AddExtension: False diff --git a/mods/cnc/sequences/structures.yaml b/mods/cnc/sequences/structures.yaml index 2bf9ebd338..02a2d59672 100644 --- a/mods/cnc/sequences/structures.yaml +++ b/mods/cnc/sequences/structures.yaml @@ -437,19 +437,19 @@ wood: gun: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True recoil: Start: 32 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True damaged-idle: Start: 64 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True damaged-recoil: Start: 96 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True make: gunmake Length: * Tick: 80 @@ -476,7 +476,7 @@ sam: idle: Start: 17 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True closing: Start: 50 Length: 14 @@ -490,7 +490,7 @@ sam: damaged-idle: Start: 81 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True damaged-closing: Start: 114 Length: 14 diff --git a/mods/cnc/sequences/vehicles.yaml b/mods/cnc/sequences/vehicles.yaml index c8602cc9a8..ff5f21d848 100644 --- a/mods/cnc/sequences/vehicles.yaml +++ b/mods/cnc/sequences/vehicles.yaml @@ -1,20 +1,20 @@ mcv: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True icon: mcvicnh.tem AddExtension: False mcv.destroyed: idle: mcv Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -512 harv: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True harvest: Start: 32 Length: 4 @@ -30,17 +30,17 @@ harv: harv.destroyed: idle: harv Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -512 bggy: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True turret: Start: 32 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True muzzle: minigun Length: 6 Facings: 8 @@ -50,22 +50,22 @@ bggy: bggy.destroyed: idle: bggy Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -512 turret: bggy Start: 32 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -512 mtnk: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True turret: Start: 32 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True muzzle: gunfire2 Length: * icon: mtnkicnh.tem @@ -74,22 +74,22 @@ mtnk: mtnk.destroyed: idle: mtnk Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -512 turret: mtnk Start: 32 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -512 ltnk: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True turret: Start: 32 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True muzzle: gunfire2 Length: * icon: ltnkicnh.tem @@ -98,22 +98,22 @@ ltnk: ltnk.destroyed: idle: ltnk Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -512 turret: ltnk Start: 32 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -512 htnk: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True turret: Start: 32 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True muzzle: gunfire2 Length: * icon: htnkicnh.tem @@ -122,22 +122,22 @@ htnk: htnk.destroyed: idle: htnk Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -512 turret: htnk Start: 32 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -512 jeep: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True turret: Start: 32 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True muzzle: minigun Length: 6 Facings: 8 @@ -147,31 +147,31 @@ jeep: jeep.destroyed: idle: jeep Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -512 turret: jeep Start: 32 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -512 bike: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True icon: bikeicnh.tem AddExtension: False bike.destroyed: idle: bike Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -512 ftnk: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True muzzle: Combine: flame-n: @@ -206,13 +206,13 @@ ftnk: ftnk.destroyed: idle: ftnk Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -512 mhq: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True spinner: Start: 32 Length: 32 @@ -221,80 +221,80 @@ mhq: msam: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True turret: Start: 32 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True empty-aim: Start: 64 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True aim: Start: 64 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True icon: msamicnh.tem AddExtension: False msam.destroyed: idle: msam Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -512 turret: msam Start: 32 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -512 mlrs: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True turret: Start: 32 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True turret1: Start: 64 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True turret0: Start: 96 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True icon: mlrsicnh.tem AddExtension: False mlrs.destroyed: idle: mlrs Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -512 turret: mlrs Start: 32 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -512 stnk: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True icon: stnkicnh.tem AddExtension: False stnk.destroyed: idle: stnk Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -512 arty: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True muzzle: gunfire2 Length: * icon: artyicnh.tem @@ -303,13 +303,13 @@ arty: arty.destroyed: idle: arty Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -512 apc: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True turret: apctur Facings: 32 muzzle: apcmuz @@ -327,7 +327,7 @@ apc: apc.destroyed: idle: apc Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -512 turret: apctur Facings: 32 @@ -336,11 +336,11 @@ apc.destroyed: truck: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True icon: truckicon truck.destroyed: idle: truck Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -512 diff --git a/mods/ra/mod.yaml b/mods/ra/mod.yaml index 28c4e8d3d6..01077cad4d 100644 --- a/mods/ra/mod.yaml +++ b/mods/ra/mod.yaml @@ -217,7 +217,7 @@ SoundFormats: Aud, Wav SpriteFormats: ShpD2, ShpTD, TmpRA, TmpTD, ShpTS -SpriteSequenceFormat: TilesetSpecificSpriteSequence +SpriteSequenceFormat: ClassicTilesetSpecificSpriteSequence TilesetExtensions: TEMPERAT: .tem SNOW: .sno diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 84997cca72..21ed7995b4 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -12,6 +12,11 @@ QuantizeFacingsFromSequence: RenderSprites: +^ClassicFacingSpriteActor: + ClassicFacingBodyOrientation: + QuantizeFacingsFromSequence: + RenderSprites: + ^1x1Shape: HitShape: UseTargetableCellsOffsets: true @@ -227,7 +232,7 @@ ^Vehicle: Inherits@1: ^ExistsInWorld Inherits@2: ^IronCurtainable - Inherits@3: ^SpriteActor + Inherits@3: ^ClassicFacingSpriteActor Inherits@bounty: ^GlobalBounty Inherits@selection: ^SelectableCombatUnit Huntable: @@ -293,8 +298,6 @@ OpeningSequence: open Offset: 0,0,200 RequiresCondition: parachute - BodyOrientation: - UseClassicFacingFudge: True HitShape: MapEditorData: Categories: Vehicle @@ -612,8 +615,8 @@ String: Helicopter Hovers@CRUISING: RequiresCondition: cruising - BodyOrientation: - UseClassicFacingFudge: True + -BodyOrientation: + ClassicFacingBodyOrientation: ^BasicBuilding: Inherits@1: ^ExistsInWorld @@ -960,7 +963,6 @@ Categories: Decoration ^BasicHusk: - Inherits@1: ^SpriteActor Interactable: Health: HP: 28000 @@ -977,6 +979,7 @@ ^Husk: Inherits: ^BasicHusk + Inherits@2: ^ClassicFacingSpriteActor Husk: AllowedTerrain: Clear, Rough, Road, Ore, Gems, Beach Burns: @@ -1000,11 +1003,10 @@ Chronoshiftable: Tooltip: GenericName: Destroyed Vehicle - BodyOrientation: - UseClassicFacingFudge: True ^PlaneHusk: Inherits: ^BasicHusk + Inherits@2: ^SpriteActor WithShadow: Offset: 43, 128, 0 ZOffset: -129 @@ -1023,6 +1025,7 @@ ^HelicopterHusk: Inherits: ^BasicHusk + Inherits@2: ^ClassicFacingSpriteActor WithShadow: Offset: 43, 128, 0 ZOffset: -129 @@ -1034,8 +1037,6 @@ CanSlide: True FallsToEarth: Explosion: UnitExplodeHeli - BodyOrientation: - UseClassicFacingFudge: True -MapEditorData: RevealOnDeath: Duration: 60 diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index fe27a88d5e..cf4e7e72bc 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -601,8 +601,8 @@ AGUN: RangeCircleType: aa Power: Amount: -50 - BodyOrientation: - UseClassicFacingFudge: True + -BodyOrientation: + ClassicFacingBodyOrientation: DOME: Inherits: ^Building @@ -814,8 +814,8 @@ GUN: Amount: -40 DetectCloaked: Range: 6c0 - BodyOrientation: - UseClassicFacingFudge: True + -BodyOrientation: + ClassicFacingBodyOrientation: FTUR: Inherits: ^Defense @@ -914,8 +914,8 @@ SAM: RangeCircleType: aa Power: Amount: -40 - BodyOrientation: - UseClassicFacingFudge: True + -BodyOrientation: + ClassicFacingBodyOrientation: ATEK: Inherits: ^ScienceBuilding diff --git a/mods/ra/sequences/aircraft.yaml b/mods/ra/sequences/aircraft.yaml index 85268e36f2..508ef76077 100644 --- a/mods/ra/sequences/aircraft.yaml +++ b/mods/ra/sequences/aircraft.yaml @@ -14,7 +14,7 @@ yak: heli: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True rotor: lrotor Length: 4 slow-rotor: lrotor @@ -25,7 +25,7 @@ heli: hind: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True rotor: lrotorlg Length: 4 slow-rotor: lrotorlg @@ -39,7 +39,7 @@ hind: tran: idle: tran2 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True rotor: lrotor Length: 4 rotor2: rrotor @@ -74,7 +74,7 @@ badr: mh60: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True rotor: yrotorlg Length: 4 slow-rotor: yrotorlg diff --git a/mods/ra/sequences/structures.yaml b/mods/ra/sequences/structures.yaml index df3b0f708f..8305edb15f 100644 --- a/mods/ra/sequences/structures.yaml +++ b/mods/ra/sequences/structures.yaml @@ -380,21 +380,21 @@ fix: gun: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True recoil: Start: 32 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True make: gunmake Length: * damaged-idle: Start: 64 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True damaged-recoil: Start: 96 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True muzzle: gunfire2 Length: 5 bib: mbGUN @@ -406,12 +406,12 @@ gun: agun: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True Offset: 0,-13 recoil: Start: 32 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True Offset: 0,-13 make: agunmake Length: * @@ -419,12 +419,12 @@ agun: damaged-idle: Start: 64 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True Offset: 0,-13 damaged-recoil: Start: 96 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True Offset: 0,-13 muzzle: gunfire2 Start: 1 @@ -437,12 +437,12 @@ agun: sam: idle: sam2 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True Offset: -1,-2 damaged-idle: sam2 Start: 34 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True Offset: -1,-2 make: sammake Length: * diff --git a/mods/ra/sequences/vehicles.yaml b/mods/ra/sequences/vehicles.yaml index 91e7a01a74..a54cde642a 100644 --- a/mods/ra/sequences/vehicles.yaml +++ b/mods/ra/sequences/vehicles.yaml @@ -1,25 +1,25 @@ mcv: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True icon: mcvicon mcvhusk: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -1023 truk: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True icon: trukicon harv: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True harvest: Start: 32 Length: 8 @@ -42,23 +42,23 @@ harvhalf: hhusk: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -1023 hhusk2: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -1023 1tnk: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True turret: Start: 32 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True muzzle: gunfire2 Length: 2 icon: 1tnkicon @@ -66,22 +66,22 @@ hhusk2: 1tnk.destroyed: idle: 1tnk Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -512 turret: 1tnk Start: 32 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -512 2tnk: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True turret: Start: 32 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True muzzle: gunfire2 Length: 5 icon: 2tnkicon @@ -89,22 +89,22 @@ hhusk2: 2tnk.destroyed: idle: 2tnk Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -512 turret: 2tnk Start: 32 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -512 3tnk: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True turret: Start: 32 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True muzzle: gunfire2 Length: 5 icon: 3tnkicon @@ -112,22 +112,22 @@ hhusk2: 3tnk.destroyed: idle: 3tnk Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -512 turret: 3tnk Start: 32 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -512 4tnk: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True turret: Start: 32 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True muzzle: gunfire2 Length: 5 icon: 4tnkicon @@ -135,28 +135,28 @@ hhusk2: 4tnk.destroyed: idle: 4tnk Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -512 turret: 4tnk Start: 32 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -512 v2rl: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True empty-idle: Start: 32 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True icon: v2rlicon arty: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True muzzle: gunfire2 Length: 5 icon: artyicon @@ -164,11 +164,11 @@ arty: jeep: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True turret: Start: 32 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True muzzle: minigun Length: 6 Facings: 8 @@ -177,7 +177,7 @@ jeep: apc: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True muzzle: minigun Length: 6 Facings: 8 @@ -191,13 +191,13 @@ apc: mnly: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True icon: mnlyicon mrj: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True spinner: Start: 32 Length: 32 @@ -206,7 +206,7 @@ mrj: mgg: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True spinner: Start: 32 Length: 8 @@ -218,7 +218,7 @@ mgg: mgg.destroyed: idle: mgg Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True ZOffset: -512 spinner: mgg Start: 32 @@ -230,7 +230,7 @@ mgg.destroyed: ttnk: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True spinner: Start: 32 Length: 32 @@ -239,11 +239,11 @@ ttnk: ftrk: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True turret: Start: 32 Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True muzzle: gunfire2 Length: 2 icon: ftrkicon @@ -251,13 +251,13 @@ ftrk: dtrk: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True icon: dtrkicon ctnk: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True muzzle: gunfire2 Length: 5 icon: ctnkicon @@ -265,7 +265,7 @@ ctnk: qtnk: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True piston: Start: 32 Facings: 8 @@ -275,7 +275,7 @@ qtnk: stnk: idle: Facings: 32 - UseClassicFacingFudge: True + UseClassicFacings: True turret: Start: 38 Facings: 32