Remove OLDLST campaign overrides.

phrohdoh · Feb 14, 2021 · f661d1b · f661d1b
1 parent 717b9ba
commit f661d1b
Show file tree

Hide file tree

Showing 25 changed files with 9 additions and 160 deletions.
diff --git a/OpenRA.Mods.Cnc/Traits/Render/WithRoof.cs b/OpenRA.Mods.Cnc/Traits/Render/WithRoof.cs
diff --git a/mods/cnc/bits/lstnew.shp b/mods/cnc/bits/lstnew.shp
diff --git a/mods/cnc/bits/lstnew2.shp b/mods/cnc/bits/lstnew2.shp
diff --git 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 }))

diff --git 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
diff --git 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:
diff --git a/mods/cnc/maps/cnc64gdi01/sequences.yaml b/mods/cnc/maps/cnc64gdi01/sequences.yaml
diff --git 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
diff --git 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

diff --git a/mods/cnc/maps/funpark01/sequences.yaml b/mods/cnc/maps/funpark01/sequences.yaml
diff --git 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
diff --git 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:
diff --git a/mods/cnc/maps/gdi01/sequences.yaml b/mods/cnc/maps/gdi01/sequences.yaml
diff --git 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
diff --git 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:
diff --git a/mods/cnc/maps/gdi02/sequences.yaml b/mods/cnc/maps/gdi02/sequences.yaml
diff --git 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
diff --git 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

diff --git a/mods/cnc/maps/gdi06/sequences.yaml b/mods/cnc/maps/gdi06/sequences.yaml
diff --git 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
diff --git 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:

diff --git a/mods/cnc/maps/gdi07/sequences.yaml b/mods/cnc/maps/gdi07/sequences.yaml
diff --git 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:

diff --git 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:
diff --git 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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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