From 0c4e6910089a20c7153a21832c09143342e5b480 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Thu, 13 Aug 2015 23:39:27 +0200 Subject: [PATCH] Rename HuskActor to Actor --- .../UtilityCommands/UpgradeRules.cs | 10 ++++- OpenRA.Mods.RA/Traits/SpawnActorOnDeath.cs | 4 +- mods/cnc/rules/aircraft.yaml | 6 +-- mods/cnc/rules/civilian-desert.yaml | 36 +++++++++--------- mods/cnc/rules/civilian.yaml | 38 +++++++++---------- mods/cnc/rules/defaults.yaml | 2 +- mods/cnc/rules/tech.yaml | 6 +-- mods/cnc/rules/vehicles.yaml | 28 +++++++------- mods/d2k/rules/aircraft.yaml | 8 ++-- mods/d2k/rules/vehicles.yaml | 20 +++++----- mods/ra/maps/monster-tank-madness/map.yaml | 2 +- mods/ra/maps/soviet-01/map.yaml | 2 +- mods/ra/rules/aircraft.yaml | 16 ++++---- mods/ra/rules/civilian.yaml | 2 +- mods/ra/rules/vehicles.yaml | 18 ++++----- mods/ts/rules/defaults.yaml | 2 +- 16 files changed, 103 insertions(+), 97 deletions(-) diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs index 29f1f6ffc7..1d7f01ee82 100644 --- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs +++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs @@ -1698,9 +1698,9 @@ namespace OpenRA.Mods.Common.UtilityCommands // The default value of ViceroidActor was vice var actor = node.Value.Nodes.FirstOrDefault(n => n.Key == "ViceroidActor"); if (actor != null) - actor.Key = "HuskActor"; + actor.Key = "Actor"; else - node.Value.Nodes.Add(new MiniYamlNode("HuskActor", "vice")); + node.Value.Nodes.Add(new MiniYamlNode("Actor", "vice")); // The default value of Probability was 10 var probability = node.Value.Nodes.FirstOrDefault(n => n.Key == "Probability"); @@ -1729,7 +1729,13 @@ namespace OpenRA.Mods.Common.UtilityCommands } if (node.Key == "LeavesHusk") + { node.Key = "SpawnActorOnDeath"; + + var actor = node.Value.Nodes.FirstOrDefault(n => n.Key == "HuskActor"); + if (actor != null) + actor.Key = "Actor"; + } } if (engineVersion < 20150810) diff --git a/OpenRA.Mods.RA/Traits/SpawnActorOnDeath.cs b/OpenRA.Mods.RA/Traits/SpawnActorOnDeath.cs index 446466780d..89082c5f05 100644 --- a/OpenRA.Mods.RA/Traits/SpawnActorOnDeath.cs +++ b/OpenRA.Mods.RA/Traits/SpawnActorOnDeath.cs @@ -23,7 +23,7 @@ namespace OpenRA.Mods.RA.Traits { [ActorReference, FieldLoader.Require] [Desc("Actor to spawn on death.")] - public readonly string HuskActor = null; + public readonly string Actor = null; [Desc("Probability the actor spawns.")] public readonly int Probability = 100; @@ -125,7 +125,7 @@ namespace OpenRA.Mods.RA.Traits .Select(ihm => ihm.HuskActor(self)) .FirstOrDefault(a => a != null); - w.CreateActor(huskActor ?? info.HuskActor, td); + w.CreateActor(huskActor ?? info.Actor, td); }); } } diff --git a/mods/cnc/rules/aircraft.yaml b/mods/cnc/rules/aircraft.yaml index 27bd4bd84a..6fbaceae93 100644 --- a/mods/cnc/rules/aircraft.yaml +++ b/mods/cnc/rules/aircraft.yaml @@ -34,7 +34,7 @@ TRAN: MaxWeight: 10 PipCount: 10 SpawnActorOnDeath: - HuskActor: TRAN.Husk + Actor: TRAN.Husk Explodes: Weapon: HeliExplode EmptyWeapon: HeliExplode @@ -84,7 +84,7 @@ HELI: Offset: 0,0,85 WithMuzzleFlash: SpawnActorOnDeath: - HuskActor: HELI.Husk + Actor: HELI.Husk AutoTarget: Explodes: Weapon: HeliExplode @@ -129,7 +129,7 @@ ORCA: ReloadCount: 2 SelfReloadTicks: 100 SpawnActorOnDeath: - HuskActor: ORCA.Husk + Actor: ORCA.Husk AutoTarget: Explodes: Weapon: HeliExplode diff --git a/mods/cnc/rules/civilian-desert.yaml b/mods/cnc/rules/civilian-desert.yaml index 9e30ac48f9..5a5e95b2a4 100644 --- a/mods/cnc/rules/civilian-desert.yaml +++ b/mods/cnc/rules/civilian-desert.yaml @@ -4,7 +4,7 @@ V20: Footprint: xx xx Dimensions: 2,2 SpawnActorOnDeath: - HuskActor: V20.Husk + Actor: V20.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -22,7 +22,7 @@ V21: Footprint: xx xx Dimensions: 2,2 SpawnActorOnDeath: - HuskActor: V21.Husk + Actor: V21.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -40,7 +40,7 @@ V22: Footprint: xx Dimensions: 2,1 SpawnActorOnDeath: - HuskActor: V22.Husk + Actor: V22.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -55,7 +55,7 @@ V22.Husk: V23: Inherits: ^CivBuilding SpawnActorOnDeath: - HuskActor: V23.Husk + Actor: V23.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -70,7 +70,7 @@ V24: Footprint: xx xx Dimensions: 2,2 SpawnActorOnDeath: - HuskActor: V24.Husk + Actor: V24.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -90,7 +90,7 @@ V25: Tooltip: Name: Church SpawnActorOnDeath: - HuskActor: V25.Husk + Actor: V25.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -110,7 +110,7 @@ V26: Footprint: xx Dimensions: 2,1 SpawnActorOnDeath: - HuskActor: V26.Husk + Actor: V26.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -125,7 +125,7 @@ V26.Husk: V27: Inherits: ^CivBuilding SpawnActorOnDeath: - HuskActor: V27.Husk + Actor: V27.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -137,7 +137,7 @@ V27.Husk: V28: Inherits: ^CivBuilding SpawnActorOnDeath: - HuskActor: V28.Husk + Actor: V28.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -149,7 +149,7 @@ V28.Husk: V29: Inherits: ^CivBuilding SpawnActorOnDeath: - HuskActor: V29.Husk + Actor: V29.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -164,7 +164,7 @@ V30: Footprint: xx Dimensions: 2,1 SpawnActorOnDeath: - HuskActor: V30.Husk + Actor: V30.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -182,7 +182,7 @@ V31: Footprint: xx Dimensions: 2,1 SpawnActorOnDeath: - HuskActor: V31.Husk + Actor: V31.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -200,7 +200,7 @@ V32: Footprint: xx Dimensions: 2,1 SpawnActorOnDeath: - HuskActor: V32.Husk + Actor: V32.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -218,7 +218,7 @@ V33: Footprint: xx Dimensions: 2,1 SpawnActorOnDeath: - HuskActor: V33.Husk + Actor: V33.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -233,7 +233,7 @@ V33.Husk: V34: Inherits: ^CivBuilding SpawnActorOnDeath: - HuskActor: V34.Husk + Actor: V34.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -245,7 +245,7 @@ V34.Husk: V35: Inherits: ^CivBuilding SpawnActorOnDeath: - HuskActor: V35.Husk + Actor: V35.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -257,7 +257,7 @@ V35.Husk: V36: Inherits: ^CivBuilding SpawnActorOnDeath: - HuskActor: V36.Husk + Actor: V36.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -269,7 +269,7 @@ V36.Husk: V37: Inherits: ^CivBuilding SpawnActorOnDeath: - HuskActor: V37.Husk + Actor: V37.Husk Building: Footprint: __xx_ ___xx Dimensions: 5,2 diff --git a/mods/cnc/rules/civilian.yaml b/mods/cnc/rules/civilian.yaml index 311f23e5b8..fc02e60d23 100644 --- a/mods/cnc/rules/civilian.yaml +++ b/mods/cnc/rules/civilian.yaml @@ -6,7 +6,7 @@ V01: Tooltip: Name: Church SpawnActorOnDeath: - HuskActor: V01.Husk + Actor: V01.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -26,7 +26,7 @@ V02: Footprint: xx xx Dimensions: 2,2 SpawnActorOnDeath: - HuskActor: V02.Husk + Actor: V02.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -44,7 +44,7 @@ V03: Footprint: xx xx Dimensions: 2,2 SpawnActorOnDeath: - HuskActor: V03.Husk + Actor: V03.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -62,7 +62,7 @@ V04: Footprint: xx xx Dimensions: 2,2 SpawnActorOnDeath: - HuskActor: V04.Husk + Actor: V04.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -80,7 +80,7 @@ V05: Footprint: xx Dimensions: 2,1 SpawnActorOnDeath: - HuskActor: V05.Husk + Actor: V05.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -98,7 +98,7 @@ V06: Footprint: xx Dimensions: 2,1 SpawnActorOnDeath: - HuskActor: V06.Husk + Actor: V06.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -116,7 +116,7 @@ V07: Footprint: xx Dimensions: 2,1 SpawnActorOnDeath: - HuskActor: V07.Husk + Actor: V07.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -131,7 +131,7 @@ V07.Husk: V08: Inherits: ^CivBuilding SpawnActorOnDeath: - HuskActor: V08.Husk + Actor: V08.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -143,7 +143,7 @@ V08.Husk: V09: Inherits: ^CivBuilding SpawnActorOnDeath: - HuskActor: V09.Husk + Actor: V09.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -155,7 +155,7 @@ V09.Husk: V10: Inherits: ^CivBuilding SpawnActorOnDeath: - HuskActor: V10.Husk + Actor: V10.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -167,7 +167,7 @@ V10.Husk: V11: Inherits: ^CivBuilding SpawnActorOnDeath: - HuskActor: V11.Husk + Actor: V11.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -179,7 +179,7 @@ V11.Husk: V12: Inherits: ^CivField SpawnActorOnDeath: - HuskActor: V12.Husk + Actor: V12.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -191,7 +191,7 @@ V12.Husk: V13: Inherits: ^CivField SpawnActorOnDeath: - HuskActor: V13.Husk + Actor: V13.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -203,7 +203,7 @@ V13.Husk: V14: Inherits: ^CivField SpawnActorOnDeath: - HuskActor: V14.Husk + Actor: V14.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -215,7 +215,7 @@ V14.Husk: V15: Inherits: ^CivField SpawnActorOnDeath: - HuskActor: V15.Husk + Actor: V15.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -227,7 +227,7 @@ V15.Husk: V16: Inherits: ^CivField SpawnActorOnDeath: - HuskActor: V16.Husk + Actor: V16.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -239,7 +239,7 @@ V16.Husk: V17: Inherits: ^CivField SpawnActorOnDeath: - HuskActor: V17.Husk + Actor: V17.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -251,7 +251,7 @@ V17.Husk: V18: Inherits: ^CivField SpawnActorOnDeath: - HuskActor: V18.Husk + Actor: V18.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -266,7 +266,7 @@ ARCO: Footprint: xx Dimensions: 2,1 SpawnActorOnDeath: - HuskActor: ARCO.Husk + Actor: ARCO.Husk ARCO.Husk: Inherits: ^CivBuildingHusk diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 1f5acc7847..927685f762 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -192,7 +192,7 @@ ActorLostNotification: SpawnActorOnDeath: Probability: 10 - HuskActor: vice + Actor: vice OwnerType: InternalName InternalOwner: Creeps DeathType: TiberiumDeath diff --git a/mods/cnc/rules/tech.yaml b/mods/cnc/rules/tech.yaml index edd0af273d..dc99ad30da 100644 --- a/mods/cnc/rules/tech.yaml +++ b/mods/cnc/rules/tech.yaml @@ -7,7 +7,7 @@ V19: Tooltip: Name: Oil Derrick SpawnActorOnDeath: - HuskActor: V19.Husk + Actor: V19.Husk V19.Husk: Inherits: ^CivBuildingHusk @@ -38,7 +38,7 @@ HOSP: Tooltip: Name: Hospital SpawnActorOnDeath: - HuskActor: HOSP.Husk + Actor: HOSP.Husk Bib: HasMinibib: Yes ProvidesPrerequisite@buildingname: @@ -75,7 +75,7 @@ BIO: RallyPoint: Offset: -1,-1 SpawnActorOnDeath: - HuskActor: BIO.Husk + Actor: BIO.Husk ProvidesPrerequisite@buildingname: BIO.Husk: diff --git a/mods/cnc/rules/vehicles.yaml b/mods/cnc/rules/vehicles.yaml index a6aa0cdbfa..ea8f91d1ed 100644 --- a/mods/cnc/rules/vehicles.yaml +++ b/mods/cnc/rules/vehicles.yaml @@ -30,7 +30,7 @@ MCV: RequiredForShortGame: true BaseBuilding: SpawnActorOnDeath: - HuskActor: MCV.Husk + Actor: MCV.Husk -GainsExperience: -Cloak: SelectionDecorations: @@ -68,7 +68,7 @@ HARV: RevealsShroud: Range: 4c0 SpawnActorOnDeath: - HuskActor: HARV.Husk + Actor: HARV.Husk -GainsExperience: WithHarvestAnimation: WithDockingAnimation: @@ -121,7 +121,7 @@ APC: MaxWeight: 5 PipCount: 5 SpawnActorOnDeath: - HuskActor: APC.Husk + Actor: APC.Husk ARTY: Inherits: ^Tank @@ -152,7 +152,7 @@ ARTY: AutoTarget: InitialStance: Defend SpawnActorOnDeath: - HuskActor: ARTY.Husk + Actor: ARTY.Husk Explodes: Weapon: ArtilleryShell EmptyWeapon: UnitExplode @@ -191,7 +191,7 @@ FTNK: Weapon: FlametankExplode EmptyWeapon: FlametankExplode SpawnActorOnDeath: - HuskActor: FTNK.Husk + Actor: FTNK.Husk BGGY: Inherits: ^Vehicle @@ -225,7 +225,7 @@ BGGY: WithTurret: AutoTarget: SpawnActorOnDeath: - HuskActor: BGGY.Husk + Actor: BGGY.Husk BIKE: Inherits: ^Vehicle @@ -261,7 +261,7 @@ BIKE: AttackFrontal: AutoTarget: SpawnActorOnDeath: - HuskActor: BIKE.Husk + Actor: BIKE.Husk JEEP: Inherits: ^Vehicle @@ -295,7 +295,7 @@ JEEP: WithTurret: AutoTarget: SpawnActorOnDeath: - HuskActor: JEEP.Husk + Actor: JEEP.Husk LTNK: Inherits: ^Tank @@ -330,7 +330,7 @@ LTNK: WithTurret: AutoTarget: SpawnActorOnDeath: - HuskActor: LTNK.Husk + Actor: LTNK.Husk MTNK: Inherits: ^Tank @@ -364,7 +364,7 @@ MTNK: WithTurret: AutoTarget: SpawnActorOnDeath: - HuskActor: MTNK.Husk + Actor: MTNK.Husk SelectionDecorations: VisualBounds: 28,28 @@ -414,7 +414,7 @@ HTNK: HealIfBelow: 50% DamageCooldown: 200 SpawnActorOnDeath: - HuskActor: HTNK.Husk + Actor: HTNK.Husk SelectionDecorations: VisualBounds: 34,34,0,-3 @@ -452,7 +452,7 @@ MSAM: AimSequence: aim AutoTarget: SpawnActorOnDeath: - HuskActor: MSAM.Husk + Actor: MSAM.Husk MLRS: Inherits: ^Tank @@ -494,7 +494,7 @@ MLRS: InitialStance: Defend RenderRangeCircle: SpawnActorOnDeath: - HuskActor: MLRS.Husk + Actor: MLRS.Husk STNK: Inherits: ^Vehicle @@ -531,7 +531,7 @@ STNK: InitialStance: HoldFire TargetableUnit: SpawnActorOnDeath: - HuskActor: STNK.Husk + Actor: STNK.Husk -MustBeDestroyed: MHQ: diff --git a/mods/d2k/rules/aircraft.yaml b/mods/d2k/rules/aircraft.yaml index ce1a9b7668..32836168be 100644 --- a/mods/d2k/rules/aircraft.yaml +++ b/mods/d2k/rules/aircraft.yaml @@ -21,7 +21,7 @@ carryall.reinforce: LandAltitude: 100 LandWhenIdle: False SpawnActorOnDeath: - HuskActor: carryall.husk + Actor: carryall.husk Carryall: Automatic: False RenderSprites: @@ -59,7 +59,7 @@ carryall.infantry: Tooltip: Name: Carryall SpawnActorOnDeath: - HuskActor: carryall.infantry.husk + Actor: carryall.infantry.husk RejectsOrders: RenderSprites: Image: carryall @@ -117,7 +117,7 @@ orni: RepairBuildings: repair RearmBuildings: SpawnActorOnDeath: - HuskActor: orni.husk + Actor: orni.husk SelectionDecorations: Selectable: Bounds: 32,32 @@ -147,7 +147,7 @@ orni.bomber: Tooltip: Name: Ornithopter SpawnActorOnDeath: - HuskActor: orni.bomber.husk + Actor: orni.bomber.husk RejectsOrders: RenderSprites: Image: orni diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml index dc962f3a9c..cf33f68a2c 100644 --- a/mods/d2k/rules/vehicles.yaml +++ b/mods/d2k/rules/vehicles.yaml @@ -34,7 +34,7 @@ mcv: TransformSounds: BUILD1.WAV NoTransformNotification: CannotDeploy SpawnActorOnDeath: - HuskActor: mcv.husk + Actor: mcv.husk AttractsWorms: Intensity: 700 SelectionDecorations: @@ -76,7 +76,7 @@ harvester: Weapon: SpiceExplosion EmptyWeapon: UnitExplodeScale SpawnActorOnDeath: - HuskActor: Harvester.Husk + Actor: Harvester.Husk WithHarvestOverlay: Palette: effect50alpha WithDockingAnimation: @@ -194,7 +194,7 @@ siegetank: Selectable: Class: siegetank SpawnActorOnDeath: - HuskActor: siegetank.husk + Actor: siegetank.husk AttractsWorms: Intensity: 600 RenderSprites: @@ -233,7 +233,7 @@ missiletank: Selectable: Class: missiletank SpawnActorOnDeath: - HuskActor: missiletank.husk + Actor: missiletank.husk AttractsWorms: Intensity: 600 @@ -266,7 +266,7 @@ sonictank: Weapon: UnitExplodeSmall EmptyWeapon: UnitExplodeSmall SpawnActorOnDeath: - HuskActor: sonictank.husk + Actor: sonictank.husk AttractsWorms: Intensity: 600 @@ -303,7 +303,7 @@ devast: Weapon: UnitExplodeScale EmptyWeapon: UnitExplodeScale SpawnActorOnDeath: - HuskActor: devast.husk + Actor: devast.husk AttractsWorms: Intensity: 700 SelectionDecorations: @@ -391,7 +391,7 @@ deviatortank: Weapon: UnitExplodeSmall EmptyWeapon: UnitExplodeSmall SpawnActorOnDeath: - HuskActor: deviatortank.husk + Actor: deviatortank.husk AttractsWorms: Intensity: 600 @@ -443,7 +443,7 @@ combata: Armament: Weapon: 90mma SpawnActorOnDeath: - HuskActor: combata.husk + Actor: combata.husk combath: Inherits: ^combat @@ -459,7 +459,7 @@ combath: Health: HP: 440 SpawnActorOnDeath: - HuskActor: combath.husk + Actor: combath.husk combato: Inherits: ^combat @@ -472,5 +472,5 @@ combato: ROT: 8 Crushes: crate, infantry SpawnActorOnDeath: - HuskActor: combato.husk + Actor: combato.husk diff --git a/mods/ra/maps/monster-tank-madness/map.yaml b/mods/ra/maps/monster-tank-madness/map.yaml index 43e3704d9f..f82be63892 100644 --- a/mods/ra/maps/monster-tank-madness/map.yaml +++ b/mods/ra/maps/monster-tank-madness/map.yaml @@ -2213,7 +2213,7 @@ Rules: Weapon: MiniNuke EmptyWeapon: MiniNuke SpawnActorOnDeath: - HuskActor: 5TNK.Husk + Actor: 5TNK.Husk SelfHealing: Step: 1 Ticks: 1 diff --git a/mods/ra/maps/soviet-01/map.yaml b/mods/ra/maps/soviet-01/map.yaml index 29480b9b3b..f0231570c7 100644 --- a/mods/ra/maps/soviet-01/map.yaml +++ b/mods/ra/maps/soviet-01/map.yaml @@ -620,7 +620,7 @@ Rules: PanelName: MISSION_OBJECTIVES V01: SpawnActorOnDeath: - HuskActor: healcrate + Actor: healcrate HEALCRATE: Tooltip: GenericStancePrefix: false diff --git a/mods/ra/rules/aircraft.yaml b/mods/ra/rules/aircraft.yaml index b7104165bb..9469e53c21 100644 --- a/mods/ra/rules/aircraft.yaml +++ b/mods/ra/rules/aircraft.yaml @@ -24,7 +24,7 @@ BADR: Contrail@2: Offset: -432,-560,0 SpawnActorOnDeath: - HuskActor: BADR.Husk + Actor: BADR.Husk SmokeTrailWhenDamaged@0: Offset: -432,560,0 Interval: 2 @@ -62,7 +62,7 @@ BADR.Bomber: Contrail@2: Offset: -432,-560,0 SpawnActorOnDeath: - HuskActor: BADR.Husk + Actor: BADR.Husk SmokeTrailWhenDamaged@0: Offset: -432,560,0 Interval: 2 @@ -124,7 +124,7 @@ MIG: Contrail@2: Offset: -598,683,0 SpawnActorOnDeath: - HuskActor: MIG.Husk + Actor: MIG.Husk SmokeTrailWhenDamaged: Offset: -853,0,171 Interval: 2 @@ -184,7 +184,7 @@ YAK: Contrail: Offset: -853,0,0 SpawnActorOnDeath: - HuskActor: YAK.Husk + Actor: YAK.Husk SmokeTrailWhenDamaged: Offset: -853,0,0 Interval: 2 @@ -228,7 +228,7 @@ TRAN: MaxWeight: 8 PipCount: 8 SpawnActorOnDeath: - HuskActor: TRAN.Husk + Actor: TRAN.Husk HELI: Inherits: ^Helicopter @@ -272,7 +272,7 @@ HELI: SelectionDecorations: VisualBounds: 36,28,0,0 SpawnActorOnDeath: - HuskActor: HELI.Husk + Actor: HELI.Husk SmokeTrailWhenDamaged: Offset: -427,0,0 ProducibleWithLevel: @@ -325,7 +325,7 @@ HIND: VisualBounds: 38,32,0,0 WithMuzzleFlash: SpawnActorOnDeath: - HuskActor: HIND.Husk + Actor: HIND.Husk SmokeTrailWhenDamaged: Offset: -427,0,0 ProducibleWithLevel: @@ -353,7 +353,7 @@ U2: Contrail@2: Offset: -725,-683,0 SpawnActorOnDeath: - HuskActor: U2.Husk + Actor: U2.Husk SmokeTrailWhenDamaged: Offset: -1c43,0,0 Interval: 2 diff --git a/mods/ra/rules/civilian.yaml b/mods/ra/rules/civilian.yaml index 679d5cf4f6..07cecaec62 100644 --- a/mods/ra/rules/civilian.yaml +++ b/mods/ra/rules/civilian.yaml @@ -223,7 +223,7 @@ V19: Tooltip: Name: Oil Pump SpawnActorOnDeath: - HuskActor: V19.Husk + Actor: V19.Husk AutoTargetIgnore: V19.Husk: diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index 7039a37de3..e5c7946ab8 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -64,7 +64,7 @@ V2RL: WithTurret: AutoTarget: SpawnActorOnDeath: - HuskActor: 1TNK.Husk + Actor: 1TNK.Husk ProducibleWithLevel: Prerequisites: vehicles.upgraded @@ -101,7 +101,7 @@ V2RL: WithTurret: AutoTarget: SpawnActorOnDeath: - HuskActor: 2TNK.Husk + Actor: 2TNK.Husk SelectionDecorations: VisualBounds: 28,28 ProducibleWithLevel: @@ -140,7 +140,7 @@ V2RL: WithTurret: AutoTarget: SpawnActorOnDeath: - HuskActor: 3TNK.Husk + Actor: 3TNK.Husk SelectionDecorations: VisualBounds: 28,28 ProducibleWithLevel: @@ -188,7 +188,7 @@ V2RL: WithTurret: AutoTarget: SpawnActorOnDeath: - HuskActor: 4TNK.Husk + Actor: 4TNK.Husk SelfHealing: Step: 1 Ticks: 3 @@ -271,9 +271,9 @@ HARV: GpsDot: String: Harvester SpawnActorOnDeath: - HuskActor: HARV.EmptyHusk + Actor: HARV.EmptyHusk HarvesterHuskModifier: - FullHuskActor: HARV.FullHusk + FullActor: HARV.FullHusk FullnessThreshold: 50 Explodes: Weapon: OreExplosion @@ -314,7 +314,7 @@ MCV: RequiredForShortGame: true BaseBuilding: SpawnActorOnDeath: - HuskActor: MCV.Husk + Actor: MCV.Husk JEEP: Inherits: ^Vehicle @@ -479,7 +479,7 @@ TRUK: SupplyTruck: Payload: 500 SpawnActorOnDeath: - HuskActor: moneycrate + Actor: moneycrate MGG: Inherits: ^Vehicle @@ -507,7 +507,7 @@ MGG: Range: 6c0 RenderShroudCircle: SpawnActorOnDeath: - HuskActor: MGG.Husk + Actor: MGG.Husk MRJ: Inherits: ^Vehicle diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 4321134e72..7f97a3e73b 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -257,7 +257,7 @@ CrushSound: squish6.aud PoisonedByTiberium: SpawnActorOnDeath: - HuskActor: vissml + Actor: vissml Probability: 10 OwnerType: InternalName InternalOwner: Creeps