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

move Mobile et al into Mods/

Browse Source
This commit is contained in:
Bob
2010-10-22 11:31:13 +13:00
parent 6513bd5fe0
commit 0d9cf63dd2
34 changed files with 68 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Mods.RA/Activities/Attack.cs
View File

@@ -11,6 +11,7 @@
using OpenRA.Mods.RA.Render;
using OpenRA.Traits;
using OpenRA.Traits.Activities;
using OpenRA.Mods.RA.Move;
namespace OpenRA.Mods.RA.Activities
{

1
OpenRA.Mods.RA/Activities/DeliverOre.cs
View File

@@ -11,6 +11,7 @@
using System.Collections.Generic;
using OpenRA.Traits;
using OpenRA.Traits.Activities;
using OpenRA.Mods.RA.Move;
namespace OpenRA.Mods.RA.Activities
{

1
OpenRA.Mods.RA/Activities/Enter.cs
View File

@@ -13,6 +13,7 @@ using System.Collections.Generic;
using System.Linq;
using OpenRA.Traits;
using OpenRA.Traits.Activities;
using OpenRA.Mods.RA.Move;
namespace OpenRA.Mods.RA.Activities
{

1
OpenRA.Mods.RA/Activities/Follow.cs
View File

@@ -10,6 +10,7 @@
using OpenRA.Traits;
using OpenRA.Traits.Activities;
using OpenRA.Mods.RA.Move;
namespace OpenRA.Mods.RA.Activities
{

3
OpenRA.Mods.RA/Activities/Harvest.cs
View File

@@ -12,6 +12,7 @@ using System.Linq;
using OpenRA.Mods.RA.Render;
using OpenRA.Traits;
using OpenRA.Traits.Activities;
using OpenRA.Mods.RA.Move;
namespace OpenRA.Mods.RA.Activities
{
@@ -67,7 +68,7 @@ namespace OpenRA.Mods.RA.Activities
self.QueueActivity(mobile.MoveTo(
() =>
{
return self.World.PathFinder.FindPath(PathSearch.Search(self.World, mobileInfo, true)
return self.World.WorldActor.Trait<PathFinder>().FindPath(PathSearch.Search(self.World, mobileInfo, true)
.WithHeuristic(loc => (res.GetResource(loc) != null && harv.Resources.Contains( res.GetResource(loc).info.Name )) ? 0 : 1)
.FromPoint(self.Location));
}));

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

@@ -12,6 +12,7 @@ using System.Linq;
using OpenRA.FileFormats;
using OpenRA.Traits;
using OpenRA.Traits.Activities;
using OpenRA.Mods.RA.Move;
namespace OpenRA.Mods.RA.Activities
{

1
OpenRA.Mods.RA/Activities/Leap.cs
View File

@@ -11,6 +11,7 @@
using System.Linq;
using OpenRA.Mods.RA.Render;
using OpenRA.Traits;
using OpenRA.Mods.RA.Move;
namespace OpenRA.Mods.RA.Activities
{

3
OpenRA.Mods.RA/Activities/MoveAdjacentTo.cs
View File

@@ -13,6 +13,7 @@ using System.Collections.Generic;
using System.Linq;
using OpenRA.Traits;
using OpenRA.Traits.Activities;
using OpenRA.Mods.RA.Move;
namespace OpenRA.Mods.RA.Activities
{
@@ -45,7 +46,7 @@ namespace OpenRA.Mods.RA.Activities
ps1.heuristic = PathSearch.DefaultEstimator( mobile.toCell );
var ps2 = PathSearch.FromPoint( self.World, mobile.Info, mobile.toCell, target.Location, true );
var ret = self.World.PathFinder.FindBidiPath( ps1, ps2 );
var ret = self.World.WorldActor.Trait<PathFinder>().FindBidiPath( ps1, ps2 );
if( ret.Count > 0 )
ret.RemoveAt( 0 );
return Util.SequenceActivities( mobile.MoveTo( () => ret ), this );

1
OpenRA.Mods.RA/Activities/UnloadCargo.cs
View File

@@ -13,6 +13,7 @@ using OpenRA.Mods.RA.Render;
using OpenRA.Traits;
using OpenRA.Traits.Activities;
using System.Drawing;
using OpenRA.Mods.RA.Move;
namespace OpenRA.Mods.RA.Activities
{