diff --git a/OpenRA.Mods.Cnc/Missions/Gdi01Script.cs b/OpenRA.Mods.Cnc/Missions/Gdi01Script.cs index af4941bbba..09a714cf0f 100644 --- a/OpenRA.Mods.Cnc/Missions/Gdi01Script.cs +++ b/OpenRA.Mods.Cnc/Missions/Gdi01Script.cs @@ -203,9 +203,9 @@ namespace OpenRA.Mods.Cnc }); } })); - a.QueueActivity(new Wait(25)); - a.QueueActivity(new Move(startPos)); - a.QueueActivity(new RemoveSelf()); + //a.QueueActivity(new Wait(25)); + //a.QueueActivity(new Move(startPos)); + //a.QueueActivity(new RemoveSelf()); }); } } diff --git a/OpenRA.Mods.Cnc/RenderCargo.cs b/OpenRA.Mods.Cnc/RenderCargo.cs index dfb92b40f2..f85e3ce968 100644 --- a/OpenRA.Mods.Cnc/RenderCargo.cs +++ b/OpenRA.Mods.Cnc/RenderCargo.cs @@ -24,17 +24,23 @@ namespace OpenRA.Mods.Cnc public class RenderCargo : IRenderModifier { Cargo cargo; + IFacing facing; public RenderCargo(Actor self) { cargo = self.Trait(); + if (self.HasTrait()) + facing = self.Trait(); } public IEnumerable ModifyRender(Actor self, IEnumerable r) { foreach (var c in cargo.Passengers) + { c.Trait().SetPxPosition( c, self.Trait().PxPosition ); - + if (facing != null && c.HasTrait()) + c.Trait().Facing = facing.Facing; + } return r.Concat(cargo.Passengers.SelectMany(a => a.Render())); } } diff --git a/mods/cnc/bits/lstnew.shp b/mods/cnc/bits/lstnew.shp new file mode 100755 index 0000000000..745c7ae0e0 Binary files /dev/null and b/mods/cnc/bits/lstnew.shp differ diff --git a/mods/cnc/bits/lstnew2.shp b/mods/cnc/bits/lstnew2.shp new file mode 100755 index 0000000000..aad71ebdf7 Binary files /dev/null and b/mods/cnc/bits/lstnew2.shp differ diff --git a/mods/cnc/maps/gdi01/map.yaml b/mods/cnc/maps/gdi01/map.yaml index 87fde0a243..402d374954 100644 --- a/mods/cnc/maps/gdi01/map.yaml +++ b/mods/cnc/maps/gdi01/map.yaml @@ -1,4 +1,4 @@ -Selectable: false +Selectable: true MapFormat: 3 diff --git a/mods/cnc/rules/vehicles.yaml b/mods/cnc/rules/vehicles.yaml index e0084a64ef..abd3058b66 100644 --- a/mods/cnc/rules/vehicles.yaml +++ b/mods/cnc/rules/vehicles.yaml @@ -627,14 +627,14 @@ LST: Mobile: Crushes: crate TerrainSpeeds: - Clear: 100% - Rough: 100% - Road: 100% - Water: 100% - Tiberium: 100% - BlueTiberium: 100% - Beach: 100% - River: 100% + Clear: 100 + Rough: 100 + Road: 100 + Water: 100 + Tiberium: 100 + BlueTiberium: 100 + Beach: 100 + River: 100 InitialFacing:0 ROT: 4 Speed: 10 @@ -647,7 +647,7 @@ LST: RenderUnit: BelowUnits: RenderCargo: - -Selectable: +# -Selectable: Cargo: Types: Infantry, Vehicle Passengers: 5 diff --git a/mods/cnc/sequences/vehicles.yaml b/mods/cnc/sequences/vehicles.yaml index c16133b58d..73066f504a 100644 --- a/mods/cnc/sequences/vehicles.yaml +++ b/mods/cnc/sequences/vehicles.yaml @@ -181,11 +181,15 @@ apc: Start: 32 lst: - idle: + idle: lstnew Start: 0 - unload: + Facings: 32 + unload: lstnew Start: 0 - + Facings: 32 + roof: lstnew2 + Start: 0 + Facings: 32 boat: left: Start: 0