diff --git a/mods/ra/rules/civilian.yaml b/mods/ra/rules/civilian.yaml index e49ce53d38..ff7d3c607c 100644 --- a/mods/ra/rules/civilian.yaml +++ b/mods/ra/rules/civilian.yaml @@ -232,10 +232,7 @@ V19.Husk: ExcludeTilesets: DESERT Tooltip: Name: Husk (Oil Pump) - AutoSelectionSize: RenderSprites: - BodyOrientation: - QuantizedFacings: 1 WithSpriteBody: WithIdleOverlay: StartSequence: fire-start diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 98159c7e57..60ab99ce8d 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -1,14 +1,17 @@ ^ExistsInWorld: AppearsOnRadar: - UpdatesPlayerStatistics: CombatDebugOverlay: - DrawLineToTarget: GivesExperience: - BodyOrientation: ScriptTriggers: UpgradeManager: Huntable: +^SpriteActor: + BodyOrientation: + QuantizeFacingsFromSequence: + AutoSelectionSize: + RenderSprites: + ^GainsExperience: GainsExperience: Upgrades: @@ -63,6 +66,9 @@ Inherits@1: ^ExistsInWorld Inherits@2: ^GainsExperience Inherits@3: ^IronCurtainable + Inherits@4: ^SpriteActor + DrawLineToTarget: + UpdatesPlayerStatistics: Mobile: Crushes: mine, crate TerrainSpeeds: @@ -123,10 +129,7 @@ Explodes: Weapon: UnitExplodeSmall EmptyWeapon: UnitExplodeSmall - QuantizeFacingsFromSequence: WithFacingSpriteBody: - AutoSelectionSize: - RenderSprites: WithParachute: UpgradeTypes: parachute UpgradeMinEnabledLevel: 1 @@ -159,6 +162,8 @@ ^Infantry: Inherits@1: ^ExistsInWorld Inherits@2: ^GainsExperience + Inherits@3: ^SpriteActor + DrawLineToTarget: Health: Radius: 128 HP: 25 @@ -187,7 +192,6 @@ UpgradeMaxEnabledLevel: 0 QuantizeFacingsFromSequence: Sequence: stand - RenderSprites: WithInfantryBody: WithDeathAnimation: DeathTypes: @@ -252,6 +256,7 @@ ^Soldier: Inherits: ^Infantry + UpdatesPlayerStatistics: MustBeDestroyed: AutoTarget: ProximityCaptor: @@ -292,6 +297,9 @@ Inherits@1: ^ExistsInWorld Inherits@2: ^GainsExperience Inherits@3: ^IronCurtainable + Inherits@4: ^SpriteActor + DrawLineToTarget: + UpdatesPlayerStatistics: Mobile: Crushes: crate TerrainSpeeds: @@ -325,15 +333,15 @@ ExcludeTilesets: INTERIOR Voiced: VoiceSet: VehicleVoice - QuantizeFacingsFromSequence: - AutoSelectionSize: - RenderSprites: WithFacingSpriteBody: ^Plane: Inherits@1: ^ExistsInWorld Inherits@2: ^GainsExperience Inherits@3: ^IronCurtainable + Inherits@4: ^SpriteActor + DrawLineToTarget: + UpdatesPlayerStatistics: AppearsOnRadar: UseLocation: true SelectionDecorations: @@ -368,10 +376,7 @@ Tooltip: GenericName: Plane WithShadow: - QuantizeFacingsFromSequence: - RenderSprites: WithFacingSpriteBody: - AutoSelectionSize: MustBeDestroyed: Voiced: VoiceSet: GenericVoice @@ -387,6 +392,7 @@ ^BasicBuilding: Inherits@1: ^ExistsInWorld Inherits@2: ^IronCurtainable + Inherits@3: ^SpriteActor SelectionDecorations: Selectable: Priority: 3 @@ -400,9 +406,6 @@ SoundOnDamageTransition: DamagedSounds: kaboom1.aud DestroyedSounds: kaboom22.aud - QuantizeFacingsFromSequence: - RenderSprites: - AutoSelectionSize: WithSpriteBody: WithBuildingExplosion: CaptureNotification: @@ -420,6 +423,7 @@ ^Building: Inherits: ^BasicBuilding + UpdatesPlayerStatistics: GivesBuildableArea: RepairableBuilding: EngineerRepairable: @@ -449,7 +453,8 @@ RenderRangeCircle: ^Wall: - AppearsOnRadar: + Inherits@1: ^ExistsInWorld + Inherits@2: ^SpriteActor Building: Dimensions: 1,1 Footprint: x @@ -472,18 +477,14 @@ RenderSprites: Palette: effect WithWallSpriteBody: - GivesExperience: AutoTargetIgnore: ProximityCaptor: Types: Wall Sellable: SellSounds: cashturn.aud Guardable: - BodyOrientation: - QuantizedFacings: 1 FrozenUnderFog: GpsRemoveFrozenActor: - ScriptTriggers: ^TechBuilding: Inherits: ^BasicBuilding @@ -546,12 +547,12 @@ ExcludeTilesets: INTERIOR ^Tree: + Inherits@1: ^SpriteActor Tooltip: Name: Tree RenderSprites: Palette: terrain WithSpriteBody: - AutoSelectionSize: Building: Footprint: x Dimensions: 1,1 @@ -565,8 +566,6 @@ Armor: Type: Wood AutoTargetIgnore: - BodyOrientation: - QuantizedFacings: 1 FrozenUnderFog: StartsRevealed: true ScriptTriggers: @@ -574,19 +573,16 @@ ExcludeTilesets: INTERIOR ^BasicHusk: + Inherits@1: ^SpriteActor Health: HP: 280 Armor: Type: Heavy HiddenUnderFog: Type: CenterPosition - QuantizeFacingsFromSequence: - BodyOrientation: AutoTargetIgnore: ScriptTriggers: - RenderSprites: WithFacingSpriteBody: - AutoSelectionSize: ^Husk: Inherits: ^BasicHusk @@ -643,17 +639,15 @@ Armor: Type: Concrete AutoTargetIgnore: - BodyOrientation: - QuantizedFacings: 1 ScriptTriggers: ^Rock: + Inherits@1: ^SpriteActor Tooltip: Name: Rock RenderSprites: Palette: terrain WithSpriteBody: - AutoSelectionSize: Building: Footprint: __ x_ Dimensions: 2,2 @@ -662,8 +656,6 @@ Terrain: Tree ProximityCaptor: Types: Tree - BodyOrientation: - QuantizedFacings: 1 FrozenUnderFog: StartsRevealed: true ScriptTriggers: @@ -678,6 +670,7 @@ RequireTilesets: DESERT ^Crate: + Inherits@1: ^SpriteActor HiddenUnderShroud: Tooltip: Name: Crate @@ -696,8 +689,6 @@ FallRate: 26 KilledOnImpassableTerrain: false Passenger: - CustomSelectionSize: - CustomBounds: 20,20 WithParachute: UpgradeTypes: parachute UpgradeMinEnabledLevel: 1 @@ -707,6 +698,4 @@ ShadowImage: parach-shadow ShadowSequence: idle UpgradeManager: - BodyOrientation: - QuantizedFacings: 1 diff --git a/mods/ra/rules/misc.yaml b/mods/ra/rules/misc.yaml index 29306efdf3..2c404a1c98 100644 --- a/mods/ra/rules/misc.yaml +++ b/mods/ra/rules/misc.yaml @@ -180,10 +180,10 @@ CAMERA: Type: CenterPosition ProximityCaptor: Types: Camera - BodyOrientation: - QuantizedFacings: 1 DetectCloaked: Range: 10 + BodyOrientation: + QuantizedFacings: 1 WithSpriteBody: RenderSpritesEditorOnly: Image: camera @@ -199,8 +199,6 @@ camera.paradrop: Type: CenterPosition ProximityCaptor: Types: Camera - BodyOrientation: - QuantizedFacings: 1 SONAR: AlwaysVisible: @@ -210,7 +208,6 @@ SONAR: HP: 1000 ProximityCaptor: Types: Sonar - BodyOrientation: DetectCloaked: Range: 10 CloakTypes: Underwater @@ -225,22 +222,22 @@ FLARE: Image: smokland WithSpriteBody: StartSequence: open + BodyOrientation: + QuantizedFacings: 1 HiddenUnderFog: Type: CenterPosition Tooltip: Name: Flare ShowOwnerRow: false - BodyOrientation: - QuantizedFacings: 1 MINE: + Inherits@1: ^SpriteActor HiddenUnderShroud: Tooltip: Name: Ore Mine RenderSprites: Palette: terrain WithSpriteBody: - AutoSelectionSize: Building: Footprint: x Dimensions: 1,1 @@ -248,18 +245,16 @@ MINE: RadarColorFromTerrain: Terrain: Ore AutoTargetIgnore: - BodyOrientation: - QuantizedFacings: 1 SeedsResource: GMINE: + Inherits@1: ^SpriteActor HiddenUnderShroud: Tooltip: Name: Gem Mine RenderSprites: Palette: player WithSpriteBody: - AutoSelectionSize: Building: Footprint: x Dimensions: 1,1 @@ -267,45 +262,39 @@ GMINE: RadarColorFromTerrain: Terrain: Gems AutoTargetIgnore: - BodyOrientation: - QuantizedFacings: 1 SeedsResource: ResourceType: Gems RAILMINE: + Inherits@1: ^SpriteActor HiddenUnderShroud: Tooltip: Name: Abandoned Mine RenderSprites: Palette: player WithSpriteBody: - AutoSelectionSize: Building: Footprint: xx Dimensions: 2,1 AutoTargetIgnore: - BodyOrientation: - QuantizedFacings: 1 EditorTilesetFilter: ExcludeTilesets: INTERIOR QUEE: + Inherits@1: ^SpriteActor HiddenUnderShroud: Tooltip: Name: Queen Ant Building: Footprint: xx Dimensions: 2,1 - RenderSprites: WithSpriteBody: - AutoSelectionSize: AppearsOnRadar: - BodyOrientation: - QuantizedFacings: 1 EditorTilesetFilter: RequireTilesets: INTERIOR LAR1: + Inherits@1: ^SpriteActor HiddenUnderShroud: Tooltip: Name: Ant Larva @@ -315,29 +304,14 @@ LAR1: RenderSprites: Palette: terrain WithSpriteBody: - AutoSelectionSize: AppearsOnRadar: - BodyOrientation: - QuantizedFacings: 1 EditorTilesetFilter: RequireTilesets: INTERIOR LAR2: - HiddenUnderShroud: + Inherits@1: LAR1 Tooltip: Name: Ant Larvae - Building: - Footprint: x - Dimensions: 1,1 - RenderSprites: - Palette: terrain - WithSpriteBody: - AutoSelectionSize: - AppearsOnRadar: - BodyOrientation: - QuantizedFacings: 1 - EditorTilesetFilter: - RequireTilesets: INTERIOR powerproxy.parabombs: AlwaysVisible: diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index 27c6662fbd..f773b1a77d 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -519,6 +519,7 @@ PBOX: HasMinibib: Yes Turreted: ROT: 255 + -QuantizeFacingsFromSequence: BodyOrientation: QuantizedFacings: 8 Cargo: @@ -562,6 +563,7 @@ HBOX: CloakDelay: 60 Turreted: ROT: 255 + -QuantizeFacingsFromSequence: BodyOrientation: QuantizedFacings: 8 Cargo: @@ -646,6 +648,7 @@ FTUR: Weapon: FireballLauncher LocalOffset: 512,0,0 AttackTurreted: + -QuantizeFacingsFromSequence: BodyOrientation: QuantizedFacings: 8 Power: