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

Merge pull request #10537 from pchote/move-util

Browse Source 
Move OpenRA.Traits.Util to Mods.Common
This commit is contained in:
abcdefg30
2016-01-21 17:13:03 +01:00
parent a8475d7fcd b0bd252343
commit 03ed54b3fb
47 changed files with 170 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.RA/Activities/LayMines.cs
View File

@@ -52,7 +52,7 @@ namespace OpenRA.Mods.RA.Activities
if (rearmTarget == null)
return new Wait(20);
return Util.SequenceActivities(
return ActivityUtils.SequenceActivities(
new MoveAdjacentTo(self, Target.FromActor(rearmTarget)),
movement.MoveTo(self.World.Map.CellContaining(rearmTarget.CenterPosition), rearmTarget),
new Rearm(self),
@@ -63,7 +63,7 @@ namespace OpenRA.Mods.RA.Activities
if (minelayer.Minefield.Contains(self.Location) && ShouldLayMine(self, self.Location))
{
LayMine(self);
return Util.SequenceActivities(new Wait(20), this); // A little wait after placing each mine, for show
return ActivityUtils.SequenceActivities(new Wait(20), this); // A little wait after placing each mine, for show
}
if (minelayer.Minefield.Length > 0)
@@ -73,7 +73,7 @@ namespace OpenRA.Mods.RA.Activities
{
var p = minelayer.Minefield.Random(self.World.SharedRandom);
if (ShouldLayMine(self, p))
return Util.SequenceActivities(movement.MoveTo(p, 0), this);
return ActivityUtils.SequenceActivities(movement.MoveTo(p, 0), this);
}
}

2
OpenRA.Mods.RA/Traits/SupportPowers/ParatroopersPower.cs
View File

@@ -70,7 +70,7 @@ namespace OpenRA.Mods.RA.Traits
var info = Info as ParatroopersPowerInfo;
if (randomize)
dropFacing = Util.QuantizeFacing(self.World.SharedRandom.Next(256), info.QuantizedFacings) * (256 / info.QuantizedFacings);
dropFacing = 256 * self.World.SharedRandom.Next(info.QuantizedFacings) / info.QuantizedFacings;
var altitude = self.World.Map.Rules.Actors[info.UnitType].TraitInfo<AircraftInfo>().CruiseAltitude.Length;
var dropRotation = WRot.FromFacing(dropFacing);