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

Merge PoisonedByTiberium and DamagedWithoutFoundations

Browse Source 
into DamagedByTerrain.
This commit is contained in:
Matthias Mailänder
2016-02-22 10:47:31 +01:00
parent c3de3a0a90
commit 8df4e9e04c
19 changed files with 168 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,7 +78,6 @@
<Compile Include="CncLoadScreen.cs" />
<Compile Include="Traits\AttackPopupTurreted.cs" />
<Compile Include="Traits\Buildings\ProductionAirdrop.cs" />
<Compile Include="Traits\PoisonedByTiberium.cs" />
<Compile Include="Traits\Render\WithGunboatBody.cs" />
<Compile Include="Traits\Render\WithCargo.cs" />
<Compile Include="Traits\Render\WithDeliveryAnimation.cs" />

59
OpenRA.Mods.Cnc/Traits/PoisonedByTiberium.cs
View File

@@ -1,59 +0,0 @@
#region Copyright & License Information
/*
* Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation, either version 3 of
* the License, or (at your option) any later version. For more
* information, see COPYING.
*/
#endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.GameRules;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.Cnc.Traits
{
class PoisonedByTiberiumInfo : UpgradableTraitInfo, IRulesetLoaded
{
[WeaponReference] public readonly string Weapon = "Tiberium";
public readonly HashSet<string> Resources = new HashSet<string> { "Tiberium", "BlueTiberium" };
public WeaponInfo WeaponInfo { get; private set; }
public override object Create(ActorInitializer init) { return new PoisonedByTiberium(init, this); }
public void RulesetLoaded(Ruleset rules, ActorInfo ai) { WeaponInfo = rules.Weapons[Weapon.ToLowerInvariant()]; }
}
class PoisonedByTiberium : UpgradableTrait<PoisonedByTiberiumInfo>, ITick, ISync
{
readonly ResourceLayer rl;
[Sync] int poisonTicks;
public PoisonedByTiberium(ActorInitializer init, PoisonedByTiberiumInfo info)
: base(info)
{
rl = init.Self.World.WorldActor.Trait<ResourceLayer>();
}
public void Tick(Actor self)
{
if (IsTraitDisabled || --poisonTicks > 0)
return;
// Prevents harming infantry in cargo.
if (!self.IsInWorld)
return;
var r = rl.GetResource(self.Location);
if (r == null || !Info.Resources.Contains(r.Info.Name))
return;
Info.WeaponInfo.Impact(Target.FromActor(self), self.World.WorldActor, Enumerable.Empty<int>());
poisonTicks = Info.WeaponInfo.ReloadDelay;
}
}
}