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

Building capture eva + wtf on silo capture

Browse Source
This commit is contained in:
Paul Chote
2010-07-23 22:28:46 +12:00
parent 31cb2081c6
commit 52c8c93b30
9 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.RA/Activities/CaptureBuilding.cs
View File

@@ -27,17 +27,16 @@ namespace OpenRA.Mods.RA.Activities
target.World.AddFrameEndTask(w =>
{
// momentarily remove from world so the ownership queries don't get confused
var oldOwner = target.Owner;
w.Remove(target);
target.Owner = self.Owner;
w.Add(target);
foreach (var t in target.traits.WithInterface<INotifyCapture>())
t.OnCapture(target, self);
t.OnCapture(target, self, oldOwner, self.Owner);
w.Remove(self);
});
// the engineer is sacrificed.
self.World.AddFrameEndTask(w => w.Remove(self));
return NextActivity;
}

1
OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
View File

@@ -211,6 +211,7 @@
<Compile Include="RadarColorFromTerrain.cs" />
<Compile Include="EngineerRepair.cs" />
<Compile Include="Activities\RepairBuilding.cs" />
<Compile Include="BuildingCaptureNotification.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">

2
OpenRA.Mods.RA/OreRefinery.cs
View File

@@ -103,7 +103,7 @@ namespace OpenRA.Mods.RA
self.traits.Get<IAcceptOreDockAction>().OnDock(self, harv, dockOrder);
}
public void OnCapture (Actor self, Actor captor)
public void OnCapture (Actor self, Actor captor, Player oldOwner, Player newOwner)
{
// Unlink any non-docked harvs
foreach (var harv in LinkedHarv)

2
OpenRA.Mods.RA/OreRefineryDockAction.cs
View File

@@ -46,7 +46,7 @@ namespace OpenRA.Mods.RA
}));
}
public void OnCapture (Actor self, Actor captor)
public void OnCapture (Actor self, Actor captor, Player oldOwner, Player newOwner)
{
if (dockedHarv == null)
return;

5
OpenRA.Mods.RA/StoresOre.cs
View File

@@ -23,9 +23,9 @@ namespace OpenRA.Mods.RA
class StoresOre : IPips, INotifyCapture, INotifyDamage, IExplodeModifier, IStoreOre
{
readonly PlayerResources Player;
readonly StoresOreInfo Info;
PlayerResources Player;
public StoresOre(Actor self, StoresOreInfo info)
{
Player = self.Owner.PlayerActor.traits.Get<PlayerResources>();
@@ -34,10 +34,11 @@ namespace OpenRA.Mods.RA
public int Capacity { get { return Info.Capacity; } }
public void OnCapture(Actor self, Actor captor)
public void OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner)
{
var ore = Stored(self);
Player.TakeOre(ore);
Player = newOwner.PlayerActor.traits.Get<PlayerResources>();
Player.GiveOre(ore);
}