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

Merge pull request #12396 from pchote/conditions-fix-carryalls

Browse Source 
Upgrades overhaul part2: GrantCondition and Carryall fixes.
This commit is contained in:
reaperrr
2016-12-03 16:51:49 +01:00
committed by GitHub
parent 848cf19ba8 fe8f2acd62
commit a8f3172c6b
11 changed files with 125 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Activities/PickupUnit.cs
View File

@@ -60,7 +60,7 @@ namespace OpenRA.Mods.Common.Activities
if (cargo != carryall.Carryable)
return NextActivity;
if (cargo.IsDead || IsCanceled)
if (cargo.IsDead || IsCanceled || carryable.IsTraitDisabled)
{
carryall.UnreserveCarryable(self);
return NextActivity;

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

@@ -774,6 +774,7 @@
<Compile Include="Traits\AutoCarryable.cs" />
<Compile Include="Traits\AutoCarryall.cs" />
<Compile Include="Traits\World\CliffBackImpassabilityLayer.cs" />
<Compile Include="Traits\Upgrades\GrantCondition.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="AfterBuild">

44
OpenRA.Mods.Common/Traits/Carryable.cs
View File

@@ -15,38 +15,41 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("Can be carried by actors with the `Carryall` trait.")]
public class CarryableInfo : ITraitInfo
public class CarryableInfo : UpgradableTraitInfo
{
[UpgradeGrantedReference]
[Desc("The upgrades to grant to self while waiting or being carried.")]
public readonly string[] CarryableUpgrades = { };
[Desc("The condition to grant to self while a carryall has been reserved.")]
public readonly string ReservedCondition = null;
[UpgradeGrantedReference]
[Desc("The condition to grant to self while being carried.")]
public readonly string CarriedCondition = null;
[Desc("Carryall attachment point relative to body.")]
public readonly WVec LocalOffset = WVec.Zero;
public virtual object Create(ActorInitializer init) { return new Carryable(init.Self, this); }
public override object Create(ActorInitializer init) { return new Carryable(init.Self, this); }
}
public class Carryable : INotifyCreated
public class Carryable : UpgradableTrait<CarryableInfo>
{
readonly CarryableInfo info;
UpgradeManager upgradeManager;
int reservedToken = UpgradeManager.InvalidConditionToken;
int carriedToken = UpgradeManager.InvalidConditionToken;
public Actor Carrier { get; private set; }
public bool Reserved { get { return state != State.Free; } }
public CPos? Destination { get; protected set; }
public bool WantsTransport { get { return Destination != null; } }
public bool WantsTransport { get { return Destination != null && !IsTraitDisabled; } }
protected enum State { Free, Reserved, Locked }
protected State state = State.Free;
protected bool attached;
public Carryable(Actor self, CarryableInfo info)
{
this.info = info;
}
: base(info) { }
void INotifyCreated.Created(Actor self)
protected override void Created(Actor self)
{
upgradeManager = self.Trait<UpgradeManager>();
}
@@ -57,8 +60,9 @@ namespace OpenRA.Mods.Common.Traits
return;
attached = true;
foreach (var u in info.CarryableUpgrades)
upgradeManager.GrantUpgrade(self, u, this);
if (carriedToken == UpgradeManager.InvalidConditionToken && !string.IsNullOrEmpty(Info.CarriedCondition))
carriedToken = upgradeManager.GrantCondition(self, Info.CarriedCondition);
}
// This gets called by carrier after we touched down
@@ -68,17 +72,22 @@ namespace OpenRA.Mods.Common.Traits
return;
attached = false;
foreach (var u in info.CarryableUpgrades)
upgradeManager.RevokeUpgrade(self, u, this);
if (carriedToken != UpgradeManager.InvalidConditionToken)
carriedToken = upgradeManager.RevokeCondition(self, carriedToken);
}
public virtual bool Reserve(Actor self, Actor carrier)
{
if (Reserved)
if (Reserved || IsTraitDisabled)
return false;
state = State.Reserved;
Carrier = carrier;
if (reservedToken == UpgradeManager.InvalidConditionToken && !string.IsNullOrEmpty(Info.ReservedCondition))
reservedToken = upgradeManager.GrantCondition(self, Info.ReservedCondition);
return true;
}
@@ -86,6 +95,9 @@ namespace OpenRA.Mods.Common.Traits
{
state = State.Free;
Carrier = null;
if (reservedToken != UpgradeManager.InvalidConditionToken)
reservedToken = upgradeManager.RevokeCondition(self, reservedToken);
}
// Prepare for transport pickup

5
OpenRA.Mods.Common/Traits/Carryall.cs
View File

@@ -283,11 +283,14 @@ namespace OpenRA.Mods.Common.Traits
{
if (!target.AppearsFriendlyTo(self))
return false;
var carryable = target.TraitOrDefault<Carryable>();
if (carryable == null)
if (carryable == null || carryable.IsTraitDisabled)
return false;
if (carryable.Reserved && carryable.Carrier != self)
return false;
return true;
}

56
OpenRA.Mods.Common/Traits/Upgrades/GrantCondition.cs Normal file
View File

@@ -0,0 +1,56 @@
#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 OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("Grants a condition while the trait is active.")]
class GrantConditionInfo : UpgradableTraitInfo
{
[FieldLoader.Require]
[UpgradeGrantedReference]
[Desc("Condition to grant.")]
public readonly string Condition = null;
public override object Create(ActorInitializer init) { return new GrantCondition(this); }
}
class GrantCondition : UpgradableTrait<GrantConditionInfo>
{
UpgradeManager manager;
int conditionToken = UpgradeManager.InvalidConditionToken;
public GrantCondition(GrantConditionInfo info)
: base(info) { }
protected override void Created(Actor self)
{
manager = self.Trait<UpgradeManager>();
base.Created(self);
}
protected override void TraitEnabled(Actor self)
{
if (conditionToken == UpgradeManager.InvalidConditionToken)
conditionToken = manager.GrantCondition(self, Info.Condition);
}
protected override void TraitDisabled(Actor self)
{
if (conditionToken == UpgradeManager.InvalidConditionToken)
return;
conditionToken = manager.RevokeCondition(self, conditionToken);
}
}
}

21
OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
View File

@@ -477,6 +477,27 @@ namespace OpenRA.Mods.Common.UtilityCommands
}
}
if (engineVersion < 20161119)
{
// Migrated carryalls over to new conditions system
var carryableUpgradesNode = node.Value.Nodes.FirstOrDefault(n => n.Key == "CarryableUpgrades");
if (carryableUpgradesNode != null)
{
var conditions = FieldLoader.GetValue<string[]>("", carryableUpgradesNode.Value.Value);
if (conditions.Length > 1)
Console.WriteLine("Unable to automatically migrate {0}:{1} CarryableUpgrades to CarriedCondition. This must be corrected manually",
parent.Key, node.Key);
else
carryableUpgradesNode.Key = "CarriedCondition";
}
if (node.Key == "WithDecorationCarryable")
{
node.Key = "WithDecoration@CARRYALL";
node.Value.Nodes.Add(new MiniYamlNode("RequiresCondition", "carryall-reserved"));
}
}
UpgradeActorRules(modData, engineVersion, ref node.Value.Nodes, node, depth + 1);
}

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

@@ -85,7 +85,6 @@
<Compile Include="Warheads\ChangeOwnerWarhead.cs" />
<Compile Include="UtilityCommands\D2kMapImporter.cs" />
<Compile Include="UtilityCommands\ImportD2kMapCommand.cs" />
<Compile Include="Traits\Render\WithDecorationCarryable.cs" />
<Compile Include="Traits\World\D2kEditorResourceLayer.cs" />
<Compile Include="Lint\CheckImportActors.cs" />
</ItemGroup>

39
OpenRA.Mods.D2k/Traits/Render/WithDecorationCarryable.cs
View File

@@ -1,39 +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 OpenRA.Mods.Common.Traits;
using OpenRA.Mods.Common.Traits.Render;
using OpenRA.Traits;
namespace OpenRA.Mods.D2k.Traits.Render
{
[Desc("Displays a sprite when the carryable actor is waiting for pickup.")]
public class WithDecorationCarryableInfo : WithDecorationInfo, Requires<CarryableInfo>
{
public override object Create(ActorInitializer init) { return new WithDecorationCarryable(init.Self, this); }
}
public class WithDecorationCarryable : WithDecoration
{
readonly Carryable carryable;
public WithDecorationCarryable(Actor self, WithDecorationCarryableInfo info)
: base(self, info)
{
carryable = self.Trait<Carryable>();
}
protected override bool ShouldRender(Actor self)
{
return carryable.Reserved && base.ShouldRender(self);
}
}
}

6
mods/d2k/rules/defaults.yaml
View File

@@ -159,11 +159,13 @@
Voiced:
VoiceSet: VehicleVoice
AutoCarryable:
CarryableUpgrades: notmobile
WithDecorationCarryable:
CarriedCondition: notmobile
ReservedCondition: carryall-reserved
WithDecoration@CARRYALL:
Image: pips
Sequence: pickup-indicator
Offset: -12, -12
RequiresCondition: carryall-reserved
^Tank:
Inherits: ^Vehicle

6
mods/ts/rules/nod-vehicles.yaml
View File

@@ -113,10 +113,12 @@ TTNK:
AllowedTerrainTypes: Clear, Road, DirtRoad, Rough
DeploySound: place2.aud
UndeploySound: clicky1.aud
GrantCondition@PREVIEWWORKAROUND:
Condition: real-actor
WithVoxelBody:
RequiresCondition: undeployed
WithSpriteBody@deployed:
RequiresCondition: !undeployed
RequiresCondition: !undeployed && real-actor
AttackFrontal:
Voice: Attack
RequiresCondition: undeployed
@@ -154,6 +156,8 @@ TTNK:
Type: Concrete
RequiresCondition: deployed
AutoTarget:
Carryable:
RequiresCondition: undeployed
ART2:
Inherits: ^VoxelTank

6
mods/ts/rules/shared-vehicles.yaml
View File

@@ -130,6 +130,8 @@ LPST:
RevealsShroud:
Range: 7c0
MaxHeightDelta: 3
GrantCondition@PREVIEWWORKAROUND:
Condition: real-actor
RenderSprites:
Image: lpst.gdi
FactionImages:
@@ -147,9 +149,11 @@ LPST:
Image: lpst
RequiresCondition: undeployed
WithSpriteBody@deployed:
RequiresCondition: !undeployed
RequiresCondition: !undeployed && real-actor
DetectCloaked:
RequiresCondition: deployed
Range: 18c0
RenderDetectionCircle:
TrailCount: 3
Carryable:
RequiresCondition: undeployed