epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #9414 from atlimit8/TurretFacingsInit

Browse Source 
Support loading multiple turret facings
This commit is contained in:
Oliver Brakmann
2015-11-01 13:18:17 +01:00
parent 281cd95be4 54b03c92d8
commit 88c20a6654
7 changed files with 49 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Mods.RA/Traits/SpawnActorOnDeath.cs
View File

@@ -8,6 +8,7 @@
*/
#endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.Common.Warheads;
@@ -107,11 +108,14 @@ namespace OpenRA.Mods.RA.Traits
if (facing != null)
td.Add(new FacingInit(facing.Facing));
// TODO: This will only take the first turret if there are multiple
// This isn't a problem with the current units, but may be a problem for mods
var turreted = self.TraitsImplementing<Turreted>().FirstOrDefault();
if (turreted != null)
td.Add(new TurretFacingInit(turreted.TurretFacing));
var turreted = self.TraitsImplementing<Turreted>();
if (turreted.Any())
{
var turretFacings = new Dictionary<string, int>();
foreach (var t in turreted)
turretFacings.Add(t.Name, t.TurretFacing);
td.Add(new TurretFacingsInit(turretFacings));
}
// TODO: untie this and move to Mods.Common
var chronoshiftable = self.TraitOrDefault<Chronoshiftable>();