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

Rename AttackMove *ScanConditions.

Browse Source
This commit is contained in:
Paul Chote
2019-05-09 22:44:34 +00:00
committed by reaperrr
parent 0e1374f0eb
commit 6248326b29
10 changed files with 62 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Activities/Move/AttackMoveActivity.cs
View File

@@ -43,10 +43,10 @@ namespace OpenRA.Mods.Common.Activities
if (conditionManager == null || attackMove == null)
return;
if (!isAssaultMove && !string.IsNullOrEmpty(attackMove.Info.AttackMoveScanCondition))
token = conditionManager.GrantCondition(self, attackMove.Info.AttackMoveScanCondition);
else if (isAssaultMove && !string.IsNullOrEmpty(attackMove.Info.AssaultMoveScanCondition))
token = conditionManager.GrantCondition(self, attackMove.Info.AssaultMoveScanCondition);
if (!isAssaultMove && !string.IsNullOrEmpty(attackMove.Info.AttackMoveCondition))
token = conditionManager.GrantCondition(self, attackMove.Info.AttackMoveCondition);
else if (isAssaultMove && !string.IsNullOrEmpty(attackMove.Info.AssaultMoveCondition))
token = conditionManager.GrantCondition(self, attackMove.Info.AssaultMoveCondition);
}
public override Activity Tick(Actor self)

8
OpenRA.Mods.Common/Traits/AttackMove.cs
View File

@@ -25,12 +25,12 @@ namespace OpenRA.Mods.Common.Traits
[VoiceReference] public readonly string Voice = "Action";
[GrantedConditionReference]
[Desc("The condition to grant to self while scanning for targets during an attack-move.")]
public readonly string AttackMoveScanCondition = null;
[Desc("The condition to grant to self while an attack-move is active.")]
public readonly string AttackMoveCondition = null;
[GrantedConditionReference]
[Desc("The condition to grant to self while scanning for targets during an assault-move.")]
public readonly string AssaultMoveScanCondition = null;
[Desc("The condition to grant to self while an assault-move is active.")]
public readonly string AssaultMoveCondition = null;
[Desc("Can the actor be ordered to move in to shroud?")]
public readonly bool MoveIntoShroud = true;

43
OpenRA.Mods.Common/UpdateRules/Rules/20190314/RenameAttackMoveConditions.cs Normal file
View File

@@ -0,0 +1,43 @@
#region Copyright & License Information
/*
* Copyright 2007-2019 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;
namespace OpenRA.Mods.Common.UpdateRules.Rules
{
public class RenameAttackMoveConditions : UpdateRule
{
public override string Name { get { return "Rename AttackMove *ScanConditions"; } }
public override string Description
{
get
{
return "AttackMove's AttackMoveScanCondition and AssaultMoveScanCondition\n" +
"now remain active while attacking, and are have been renamed to\n" +
"AttackMoveCondition and AssaultMoveCondition to reflect this.\n";
}
}
public override IEnumerable<string> UpdateActorNode(ModData modData, MiniYamlNode actorNode)
{
foreach (var at in actorNode.ChildrenMatching("AttackMove"))
{
foreach (var node in at.ChildrenMatching("AttackMoveScanCondition"))
node.RenameKey("AttackMoveCondition");
foreach (var node in at.ChildrenMatching("AssaultMoveScanCondition"))
node.RenameKey("AssaultMoveCondition");
}
yield break;
}
}
}

1
OpenRA.Mods.Common/UpdateRules/UpdatePath.cs
View File

@@ -125,6 +125,7 @@ namespace OpenRA.Mods.Common.UpdateRules
new ReplaceSpecialMoveConsiderations(),
new RefactorHarvesterIdle(),
new SplitHarvesterSpriteBody(),
new RenameAttackMoveConditions(),
})
};

4
mods/cnc/rules/defaults.yaml
View File

@@ -199,7 +199,7 @@
AutoTargetPriority@ATTACKANYTHING:
RequiresCondition: stance-attackanything || assault-move
AttackMove:
AssaultMoveScanCondition: assault-move
AssaultMoveCondition: assault-move
^AutoTargetAir:
AutoTarget:
@@ -226,7 +226,7 @@
AutoTargetPriority@ATTACKANYTHING:
RequiresCondition: stance-attackanything || assault-move
AttackMove:
AssaultMoveScanCondition: assault-move
AssaultMoveCondition: assault-move
^AcceptsCloakCrate:
Cloak:

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

@@ -140,7 +140,7 @@
AutoTargetPriority@ATTACKANYTHING:
RequiresCondition: stance-attackanything || assault-move
AttackMove:
AssaultMoveScanCondition: assault-move
AssaultMoveCondition: assault-move
^AutoTargetAll:
AutoTarget:
@@ -161,7 +161,7 @@
AutoTargetPriority@ATTACKANYTHING:
RequiresCondition: stance-attackanything || assault-move
AttackMove:
AssaultMoveScanCondition: assault-move
AssaultMoveCondition: assault-move
^Vehicle:
Inherits@1: ^ExistsInWorld

2
mods/ra/rules/campaign-rules.yaml
View File

@@ -41,7 +41,7 @@ E7.noautotarget:
-AutoTargetPriority@DEFAULT:
-AutoTargetPriority@ATTACKANYTHING:
AttackMove:
-AssaultMoveScanCondition:
-AssaultMoveCondition:
RenderSprites:
Image: E7

4
mods/ra/rules/defaults.yaml
View File

@@ -195,7 +195,7 @@
AutoTargetPriority@ATTACKANYTHING:
RequiresCondition: stance-attackanything || assault-move
AttackMove:
AssaultMoveScanCondition: assault-move
AssaultMoveCondition: assault-move
^AutoTargetAir:
AutoTarget:
@@ -222,7 +222,7 @@
AutoTargetPriority@ATTACKANYTHING:
RequiresCondition: stance-attackanything || assault-move
AttackMove:
AssaultMoveScanCondition: assault-move
AssaultMoveCondition: assault-move
^GlobalBounty:
GrantConditionOnPrerequisite@GLOBALBOUNTY:

2
mods/ra/rules/infantry.yaml
View File

@@ -32,7 +32,7 @@ DOG:
Armament:
Weapon: DogJaw
ReloadingCondition: attack-cooldown
-AttackFrontal:
-AttackFrontal:
AttackLeap:
Voice: Attack
PauseOnCondition: attacking || attack-cooldown

4
mods/ts/rules/defaults.yaml
View File

@@ -150,7 +150,7 @@
AutoTargetPriority@ATTACKANYTHING:
RequiresCondition: stance-attackanything || assault-move
AttackMove:
AssaultMoveScanCondition: assault-move
AssaultMoveCondition: assault-move
^AutoTargetAir:
AutoTarget:
@@ -177,7 +177,7 @@
AutoTargetPriority@ATTACKANYTHING:
RequiresCondition: stance-attackanything || assault-move
AttackMove:
AssaultMoveScanCondition: assault-move
AssaultMoveCondition: assault-move
^2x1Shape:
HitShape: