Remove OLDLST campaign overrides.

2021-02-13 15:23:14 +00:00
parent 717b9ba1e6
commit f661d1ba48
25 changed files with 9 additions and 160 deletions
--- a/OpenRA.Mods.Cnc/Traits/Render/WithRoof.cs
+++ b/OpenRA.Mods.Cnc/Traits/Render/WithRoof.cs
@@ -1,37 +0,0 @@
-#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 OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits.Render;
-using OpenRA.Traits;
-
-namespace OpenRA.Mods.Cnc.Traits.Render
-{
-	[Desc("Provides an overlay for the Tiberian Dawn hover craft.")]
-	public class WithRoofInfo : TraitInfo, Requires<RenderSpritesInfo>
-	{
-		[SequenceReference]
-		public readonly string Sequence = "roof";
-
-		public override object Create(ActorInitializer init) { return new WithRoof(init.Self, this); }
-	}
-
-	public class WithRoof
-	{
-		public WithRoof(Actor self, WithRoofInfo info)
-		{
-			var rs = self.Trait<RenderSprites>();
-			var roof = new Animation(self.World, rs.GetImage(self), RenderSprites.MakeFacingFunc(self));
-			roof.Play(info.Sequence);
-			rs.Add(new AnimationWithOffset(roof, null, null, 1024));
-		}
-	}
-}
--- a/mods/cnc/bits/lstnew.shp
+++ b/mods/cnc/bits/lstnew.shp
--- a/mods/cnc/bits/lstnew2.shp
+++ b/mods/cnc/bits/lstnew2.shp
--- a/mods/cnc/bits/scripts/campaign-global.lua
+++ b/mods/cnc/bits/scripts/campaign-global.lua
@@ -40,7 +40,7 @@ InitObjectives = function(player)
 end

 ReinforceWithLandingCraft = function(player, units, transportStart, transportUnload, rallypoint)
-	local transport = Actor.Create("oldlst", true, { Owner = player, Facing = Angle.North, Location = transportStart })
+	local transport = Actor.Create("lst", true, { Owner = player, Facing = Angle.North, Location = transportStart })
 	local subcell = 0
 	Utils.Do(units, function(a)
 		transport.LoadPassenger(Actor.Create(a, false, { Owner = transport.Owner, Facing = transport.Facing, Location = transportUnload, SubCell = subcell }))
--- a/mods/cnc/maps/cnc64gdi01/map.yaml
+++ b/mods/cnc/maps/cnc64gdi01/map.yaml
@@ -714,5 +714,3 @@ Actors:
 		Location: 26,14

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
-
-Sequences: sequences.yaml
--- a/mods/cnc/maps/cnc64gdi01/rules.yaml
+++ b/mods/cnc/maps/cnc64gdi01/rules.yaml
@@ -36,12 +36,3 @@ TRAN:
 RMBO:
 	Buildable:
 		Prerequisites: ~disabled
-
-OLDLST:
-	Inherits: LST
-	-WithRoof:
-	-Selectable:
-	RejectsOrders:
-	Cargo:
-		Types: disabled
-	Interactable:
--- a/mods/cnc/maps/cnc64gdi01/sequences.yaml
+++ b/mods/cnc/maps/cnc64gdi01/sequences.yaml
@@ -1,7 +0,0 @@
-oldlst:
-	idle: lst
-		Start: 0
-		Facings: 1
-		ZOffset: -1024
-	icon: lsticnh.tem
-		AddExtension: False
--- a/mods/cnc/maps/funpark01/map.yaml
+++ b/mods/cnc/maps/funpark01/map.yaml
@@ -412,6 +412,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Sequences: sequences.yaml
-
 Weapons: weapons.yaml
--- a/mods/cnc/maps/funpark01/rules.yaml
+++ b/mods/cnc/maps/funpark01/rules.yaml
@@ -38,15 +38,6 @@ Player:
 ^CivBuilding:
 	AnnounceOnSeen:

-OLDLST:
-	Inherits: LST
-	-WithRoof:
-	-Selectable:
-	RejectsOrders:
-	Cargo:
-		Types: disabled
-	Interactable:
-
 TREX:
 	Health:
 		HP: 75000
--- a/mods/cnc/maps/funpark01/sequences.yaml
+++ b/mods/cnc/maps/funpark01/sequences.yaml
@@ -1,7 +0,0 @@
-oldlst:
-	idle: lst
-		Start: 0
-		Facings: 1
-		ZOffset: -1024
-	icon: lsticnh.tem
-		AddExtension: False
--- a/mods/cnc/maps/gdi01/map.yaml
+++ b/mods/cnc/maps/gdi01/map.yaml
@@ -235,6 +235,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Sequences: sequences.yaml
-
 Weapons: weapons.yaml
--- a/mods/cnc/maps/gdi01/rules.yaml
+++ b/mods/cnc/maps/gdi01/rules.yaml
@@ -109,12 +109,3 @@ BOAT:
 		InitialStance: AttackAnything
 	RejectsOrders:
 		Except: Attack
-
-OLDLST:
-	Inherits: LST
-	-WithRoof:
-	-Selectable:
-	RejectsOrders:
-	Cargo:
-		Types: disabled
-	Interactable:
--- a/mods/cnc/maps/gdi01/sequences.yaml
+++ b/mods/cnc/maps/gdi01/sequences.yaml
@@ -1,7 +0,0 @@
-oldlst:
-	idle: lst
-		Start: 0
-		Facings: 1
-		ZOffset: -1024
-	icon: lsticnh.tem
-		AddExtension: False
--- a/mods/cnc/maps/gdi02/map.yaml
+++ b/mods/cnc/maps/gdi02/map.yaml
@@ -625,5 +625,3 @@ Actors:
 		Owner: Neutral

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
-
-Sequences: sequences.yaml
--- a/mods/cnc/maps/gdi02/rules.yaml
+++ b/mods/cnc/maps/gdi02/rules.yaml
@@ -111,12 +111,3 @@ OBLI:
 SAM:
 	Buildable:
 		Prerequisites: ~disabled
-
-OLDLST:
-	Inherits: LST
-	-WithRoof:
-	-Selectable:
-	RejectsOrders:
-	Cargo:
-		Types: disabled
-	Interactable:
--- a/mods/cnc/maps/gdi02/sequences.yaml
+++ b/mods/cnc/maps/gdi02/sequences.yaml
@@ -1,7 +0,0 @@
-oldlst:
-	idle: lst
-		Start: 0
-		Facings: 1
-		ZOffset: -1024
-	icon: lsticnh.tem
-		AddExtension: False
--- a/mods/cnc/maps/gdi06/map.yaml
+++ b/mods/cnc/maps/gdi06/map.yaml
@@ -1019,6 +1019,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Sequences: sequences.yaml
-
 Music: music.yaml
--- a/mods/cnc/maps/gdi06/rules.yaml
+++ b/mods/cnc/maps/gdi06/rules.yaml
@@ -57,15 +57,6 @@ FLARE:
 	RevealsShroud:
 		Range: 5c0

-OLDLST:
-	Inherits: LST
-	-WithRoof:
-	-Selectable:
-	RejectsOrders:
-	Cargo:
-		Types: disabled
-	Interactable:
-
 SAM:
 	SpawnActorOnDeath:
 		Actor: e1
--- a/mods/cnc/maps/gdi06/sequences.yaml
+++ b/mods/cnc/maps/gdi06/sequences.yaml
@@ -1,7 +0,0 @@
-oldlst:
-	idle: lst
-		Start: 0
-		Facings: 1
-		ZOffset: -1024
-	icon: lsticnh.tem
-		AddExtension: False
--- a/mods/cnc/maps/gdi07/map.yaml
+++ b/mods/cnc/maps/gdi07/map.yaml
@@ -1028,5 +1028,3 @@ Actors:
 		Location: 14,46

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
-
-Sequences: sequences.yaml
--- a/mods/cnc/maps/gdi07/rules.yaml
+++ b/mods/cnc/maps/gdi07/rules.yaml
@@ -108,15 +108,6 @@ MLRS:
 	Buildable:
 		Prerequisites: ~disabled

-OLDLST:
-	Inherits: LST
-	-WithRoof:
-	-Selectable:
-	RejectsOrders:
-	Cargo:
-		Types: disabled
-	Interactable:
-
 HQ:
 	Tooltip:
 	-AirstrikePower:
--- a/mods/cnc/maps/gdi07/sequences.yaml
+++ b/mods/cnc/maps/gdi07/sequences.yaml
@@ -1,7 +0,0 @@
-oldlst:
-	idle: lst
-		Start: 0
-		Facings: 1
-		ZOffset: -1024
-	icon: lsticnh.tem
-		AddExtension: False
--- a/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -636,7 +636,6 @@
 ^Ship:
 	Inherits@1: ^ExistsInWorld
 	Inherits@3: ^SpriteActor
-	Inherits@selection: ^SelectableCombatUnit
 	Inherits@handicaps: ^PlayerHandicaps
 	Huntable:
 	OwnerLostAction:
--- a/mods/cnc/rules/ships.yaml
+++ b/mods/cnc/rules/ships.yaml
@@ -1,5 +1,6 @@
 BOAT:
 	Inherits: ^Ship
+	Inherits@SELECTABLE: ^SelectableCombatUnit
 	Inherits@EXPERIENCE: ^GainsExperience
 	Inherits@AUTOTARGET: ^AutoTargetAll
 	Valued:
@@ -55,10 +56,6 @@ LST:
 		Cost: 300
 	Tooltip:
 		Name: Landing Craft
-	Buildable:
-		Queue: Vehicle.GDI
-		BuildPaletteOrder: 1000
-		Prerequisites: ~disabled
 	Mobile:
 		Locomotor: lcraft
 		InitialFacing: 0
@@ -74,14 +71,14 @@ LST:
 	-BodyOrientation:
 	ClassicFacingBodyOrientation:
 	WithFacingSpriteBody:
-	Selectable:
+	Interactable:
 		Bounds: 48,48
-	WithRoof:
 	WithCargo:
 		DisplayTypes: Infantry, Vehicle
 		LocalOffset: 390,-256,0, 390,256,0, 0,0,0, -390,-256,0, -390,256,0
 	Cargo:
-		Types: Infantry, Vehicle
+		Types: disabled
 		MaxWeight: 5
 		PassengerFacing: 0
 		LoadingCondition: notmobile
+	RejectsOrders:
--- a/mods/cnc/sequences/campaign.yaml
+++ b/mods/cnc/sequences/campaign.yaml
@@ -1,10 +1,8 @@
 lst:
-	idle: lstnew
-		UseClassicFacings: True
-		Facings: 32
-	roof: lstnew2
-		UseClassicFacings: True
-		Facings: 32
+	idle: lst
+		Start: 0
+		Facings: 1
+		ZOffset: -1024
 	icon: lsticnh.tem
 		AddExtension: False