From 89a115466c133008548cacaef1070e56a20981b1 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 3 Sep 2015 14:33:56 +0200 Subject: [PATCH] Added ^SpriteActor and streamlined D2k defaults To reduce risk of BodyOrientation issues. --- mods/d2k/rules/arrakis.yaml | 10 ++-------- mods/d2k/rules/defaults.yaml | 29 +++++++++++------------------ mods/d2k/rules/misc.yaml | 2 -- mods/d2k/rules/structures.yaml | 4 +--- 4 files changed, 14 insertions(+), 31 deletions(-) diff --git a/mods/d2k/rules/arrakis.yaml b/mods/d2k/rules/arrakis.yaml index 8c68b70537..17e74a2fc5 100644 --- a/mods/d2k/rules/arrakis.yaml +++ b/mods/d2k/rules/arrakis.yaml @@ -1,8 +1,7 @@ spicebloom: + Inherits@1: ^SpriteActor HiddenUnderShroud: - RenderSprites: WithSpriteBody: - AutoSelectionSize: Building: Footprint: x Dimensions: 1,1 @@ -15,11 +14,10 @@ spicebloom: WithActiveAnimation: RadarColorFromTerrain: Terrain: Spice - BodyOrientation: - QuantizedFacings: 1 WithMakeAnimation: sandworm: + Inherits@1: ^SpriteActor Tooltip: Name: Sandworm Description: Attracted by vibrations in the sand.\nWill eat units whole and has a large appetite. @@ -39,8 +37,6 @@ sandworm: WithFacingSpriteBody: WithAttackOverlay: Sequence: sand - BodyOrientation: - QuantizeFacingsFromSequence: HiddenUnderFog: AppearsOnRadar: UseLocation: yes @@ -55,8 +51,6 @@ sandworm: AnnounceOnSeen: Notification: WormSign PingRadar: True - RenderSprites: - AutoSelectionSize: sietch: Inherits: ^Building diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml index d00a0e2d94..77d52e24db 100644 --- a/mods/d2k/rules/defaults.yaml +++ b/mods/d2k/rules/defaults.yaml @@ -3,11 +3,16 @@ UpdatesPlayerStatistics: CombatDebugOverlay: GivesExperience: - BodyOrientation: ScriptTriggers: UpgradeManager: Huntable: +^SpriteActor: + BodyOrientation: + QuantizeFacingsFromSequence: + AutoSelectionSize: + RenderSprites: + ^GainsExperience: GainsExperience: Upgrades: @@ -51,6 +56,7 @@ ^Vehicle: Inherits@1: ^ExistsInWorld Inherits@2: ^GainsExperience + Inherits@3: ^SpriteActor Mobile: Crushes: crate TerrainSpeeds: @@ -79,7 +85,6 @@ Guard: Voice: Guard Guardable: - QuantizeFacingsFromSequence: WithFacingSpriteBody: Demolishable: TemporaryOwnerManager: @@ -91,8 +96,6 @@ Image: pips Sequence: pickup-indicator Offset: -12, -12 - AutoSelectionSize: - RenderSprites: ^Tank: Inherits: ^Vehicle @@ -108,6 +111,7 @@ Dune: 70 ^Husk: + Inherits@1: ^SpriteActor Health: HP: 75 Armor: @@ -116,13 +120,9 @@ Type: CenterPosition Tooltip: Name: Wreck - BodyOrientation: AutoTargetIgnore: ScriptTriggers: - QuantizeFacingsFromSequence: WithFacingSpriteBody: - AutoSelectionSize: - RenderSprites: ^VehicleHusk: Inherits: ^Husk @@ -161,12 +161,12 @@ Interval: 2 Tooltip: Name: Destroyed Tower - BodyOrientation: ScriptTriggers: ^Infantry: Inherits@1: ^ExistsInWorld Inherits@2: ^GainsExperience + Inherits@3: ^SpriteActor Health: Radius: 96 Armor: @@ -192,7 +192,6 @@ TargetTypes: Ground, Infantry UpgradeTypes: parachute UpgradeMaxEnabledLevel: 0 - RenderSprites: QuantizeFacingsFromSequence: Sequence: stand WithInfantryBody: @@ -239,6 +238,7 @@ ^Plane: Inherits@1: ^ExistsInWorld + Inherits@2: ^SpriteActor AppearsOnRadar: UseLocation: yes HiddenUnderFog: @@ -249,14 +249,12 @@ DrawLineToTarget: Voiced: VoiceSet: GenericVoice - QuantizeFacingsFromSequence: WithFacingSpriteBody: - AutoSelectionSize: - RenderSprites: WithShadow: ^Building: Inherits@1: ^ExistsInWorld + Inherits@2: ^SpriteActor SelectionDecorations: Selectable: Priority: 2 @@ -274,10 +272,7 @@ SoundOnDamageTransition: DamagedSounds: EXPLSML1.WAV DestroyedSounds: EXPLHG1.WAV - QuantizeFacingsFromSequence: - RenderSprites: WithSpriteBody: - AutoSelectionSize: WithBuildingExplosion: RepairableBuilding: EmitInfantryOnSell: @@ -314,9 +309,7 @@ -WithCrumbleOverlay: -WithMakeAnimation: -WithSpriteBody: - RenderSprites: WithWallSpriteBody: - AutoSelectionSize: LineBuildNode: Types: turret MustBeDestroyed: diff --git a/mods/d2k/rules/misc.yaml b/mods/d2k/rules/misc.yaml index c47a6a6244..ab7842d2df 100644 --- a/mods/d2k/rules/misc.yaml +++ b/mods/d2k/rules/misc.yaml @@ -147,8 +147,6 @@ camera: RevealsShroud: Range: 8c0 Type: CenterPosition - BodyOrientation: - QuantizedFacings: 1 wormspawner: AlwaysVisible: diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index ee1901cdc0..176945a465 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -477,6 +477,7 @@ starport: ProvidesPrerequisite@buildingname: wall: + Inherits@1: ^SpriteActor HiddenUnderShroud: Buildable: Queue: Building @@ -511,14 +512,11 @@ wall: Types: wall Targetable: TargetTypes: Ground, Wall - RenderSprites: WithWallSpriteBody: - AutoSelectionSize: AutoTargetIgnore: Sellable: SellSounds: CHUNG.WAV Guardable: - BodyOrientation: ThrowsShrapnel: Weapons: shrapnel Pieces: 3, 7