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

Fix Wanders to be usable on its own

Browse Source 
Allows unarmed actors like civilians or harmless critters to wander around when idle.

Additionally made it upgradable.
This commit is contained in:
reaperrr
2016-06-25 12:45:58 +02:00
parent c643a0abd6
commit 09e365bc4a
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.D2k/Activities/SwallowActor.cs
View File

@@ -149,7 +149,7 @@ namespace OpenRA.Mods.D2k.Activities
sandworm.IsAttacking = false;
// There is a chance that the worm would just go away after attacking
if (self.World.SharedRandom.Next(100) <= sandworm.Info.ChanceToDisappear)
if (self.World.SharedRandom.Next(100) <= sandworm.WormInfo.ChanceToDisappear)
{
self.CancelActivity();
self.World.AddFrameEndTask(w => self.Dispose());

10
OpenRA.Mods.D2k/Traits/Sandworm.cs
View File

@@ -35,7 +35,7 @@ namespace OpenRA.Mods.D2k.Traits
class Sandworm : Wanders, ITick, INotifyActorDisposing
{
public readonly SandwormInfo Info;
public readonly SandwormInfo WormInfo;
readonly WormManager manager;
readonly Mobile mobile;
@@ -50,7 +50,7 @@ namespace OpenRA.Mods.D2k.Traits
public Sandworm(Actor self, SandwormInfo info)
: base(self, info)
{
Info = info;
WormInfo = info;
mobile = self.Trait<Mobile>();
attackTrait = self.Trait<AttackBase>();
manager = self.World.WorldActor.Trait<WormManager>();
@@ -78,10 +78,10 @@ namespace OpenRA.Mods.D2k.Traits
void RescanForTargets(Actor self)
{
targetCountdown = Info.TargetRescanInterval;
targetCountdown = WormInfo.TargetRescanInterval;
// If close enough, we don't care about other actors.
var target = self.World.FindActorsInCircle(self.CenterPosition, Info.IgnoreNoiseAttackRange)
var target = self.World.FindActorsInCircle(self.CenterPosition, WormInfo.IgnoreNoiseAttackRange)
.FirstOrDefault(x => attackTrait.HasAnyValidWeapons(Target.FromActor(x)));
if (target != null)
{
@@ -98,7 +98,7 @@ namespace OpenRA.Mods.D2k.Traits
return mobile.CanEnterCell(a.Location, null, false);
};
var actorsInRange = self.World.FindActorsInCircle(self.CenterPosition, Info.MaxSearchRadius)
var actorsInRange = self.World.FindActorsInCircle(self.CenterPosition, WormInfo.MaxSearchRadius)
.Where(isValidTarget).SelectMany(a => a.TraitsImplementing<AttractsWorms>());
var noiseDirection = actorsInRange.Aggregate(WVec.Zero, (a, b) => a + b.AttractionAtPosition(self.CenterPosition));