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

Merge pull request #10134 from abcdefg30/upgradeUpgrades

Browse Source 
Try to polish the upgrade rules
This commit is contained in:
Pavel Penev
2015-11-29 20:45:29 +02:00
parent abed25d293 a10ea0350e
commit f9efe94f62
15 changed files with 127 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1679,7 +1679,15 @@ namespace OpenRA.Mods.Common.UtilityCommands
var otherNodes = nodes;
var inherits = new Func<string, bool>(traitName => node.Value.Nodes.Where(n => n.Key.StartsWith("Inherits"))
.Any(inh => otherNodes.First(n => n.Key.StartsWith(inh.Value.Value)).Value.Nodes.Any(n => n.Key.StartsWith(traitName))));
.Any(inh =>
{
var otherNode = otherNodes.FirstOrDefault(n => n.Key.StartsWith(inh.Value.Value));
if (otherNode == null)
return false;
return otherNode.Value.Nodes.Any(n => n.Key.StartsWith(traitName));
}));
// For actors that have or inherit a TargetableUnit, disable the trait while parachuting
var tu = node.Value.Nodes.FirstOrDefault(n => n.Key.StartsWith("TargetableUnit"));
@@ -1842,6 +1850,12 @@ namespace OpenRA.Mods.Common.UtilityCommands
if (actor != null)
actor.Key = "Actor";
}
if (node.Key == "-SpawnViceroid")
node.Key = "-SpawnActorOnDeath";
if (node.Key == "-LeavesHusk")
node.Key = "-SpawnActorOnDeath";
}
if (engineVersion < 20150920)
@@ -1894,25 +1908,30 @@ namespace OpenRA.Mods.Common.UtilityCommands
// This will only do roughly the right thing and probably require the modder to do some manual cleanup
if (depth == 0)
{
var inftraits = node.Value.Nodes.FirstOrDefault(n =>
n.Key.StartsWith("WithInfantryBody")
|| n.Key.StartsWith("WithDisguisingInfantryBody"));
if (inftraits != null)
// Check if the upgrade rule ran already before
var qffs = node.Value.Nodes.FirstOrDefault(n => n.Key == "QuantizeFacingsFromSequence");
if (qffs == null)
{
node.Value.Nodes.Add(new MiniYamlNode("QuantizeFacingsFromSequence", null, new List<MiniYamlNode>
var inftraits = node.Value.Nodes.FirstOrDefault(n =>
n.Key.StartsWith("WithInfantryBody")
|| n.Key.StartsWith("WithDisguisingInfantryBody"));
if (inftraits != null)
{
new MiniYamlNode("Sequence", "stand"),
}));
}
node.Value.Nodes.Add(new MiniYamlNode("QuantizeFacingsFromSequence", null, new List<MiniYamlNode>
{
new MiniYamlNode("Sequence", "stand"),
}));
}
var other = node.Value.Nodes.FirstOrDefault(x =>
x.Key.StartsWith("RenderBuilding")
|| x.Key.StartsWith("RenderSimple")
|| x.Key.StartsWith("WithCrateBody")
|| x.Key.StartsWith("WithSpriteBody")
|| x.Key.StartsWith("WithFacingSpriteBody"));
if (other != null)
node.Value.Nodes.Add(new MiniYamlNode("QuantizeFacingsFromSequence", ""));
var other = node.Value.Nodes.FirstOrDefault(x =>
x.Key.StartsWith("RenderBuilding")
|| x.Key.StartsWith("RenderSimple")
|| x.Key.StartsWith("WithCrateBody")
|| x.Key.StartsWith("WithSpriteBody")
|| x.Key.StartsWith("WithFacingSpriteBody"));
if (other != null)
node.Value.Nodes.Add(new MiniYamlNode("QuantizeFacingsFromSequence", ""));
}
}
}
@@ -2109,7 +2128,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
// Add `WhileCloakedUpgrades: underwater` to Cloak trait if `CloakTypes: Underwater`
var cloak = node.Value.Nodes.FirstOrDefault(n => (n.Key == "Cloak" || n.Key.StartsWith("Cloak@"))
&& n.Value.Nodes.Any(p => p.Key == "CloakTypes" && p.Value.Value == "Underwater"));
if (cloak != null)
if (cloak != null && !cloak.Value.Nodes.Any(n => n.Key == "WhileCloakedUpgrades"))
cloak.Value.Nodes.Add(new MiniYamlNode("WhileCloakedUpgrades", "underwater"));
// Remove split traits if TargetableSubmarine was removed
@@ -2199,12 +2218,13 @@ namespace OpenRA.Mods.Common.UtilityCommands
// Make Range WDist for all traits with circular ranges.
if (engineVersion < 20150920 && depth == 2 && node.Key == "Range")
{
if (parentKey == "DetectCloaked"
if ((parentKey == "DetectCloaked"
|| parentKey == "JamsMissiles"
|| parentKey == "JamsRadar"
|| parentKey == "Guardable"
|| parentKey == "BaseProvider"
|| parentKey == "ProximityCapturable")
&& !node.Value.Value.Contains("c0"))
node.Value.Value = node.Value.Value + "c0";
}
@@ -2265,6 +2285,34 @@ namespace OpenRA.Mods.Common.UtilityCommands
node.Key = "Aircraft";
node.Value.Nodes.Add(new MiniYamlNode("CanHover", "True"));
}
var mplane = node.Value.Nodes.FirstOrDefault(n => n.Key == "-Plane");
if (mplane != null)
{
// Check if a Helicopter trait was renamed to Aircraft
// In that case, we don't want to straight negate it with -Aircraft again
if (node.Value.Nodes.Any(n => n.Key == "Aircraft" || n.Key == "Helicopter"))
{
Console.WriteLine("Warning: Removed '-Plane:', this can introduce side effects with inherited 'Aircraft' definitions.");
node.Value.Nodes.Remove(mplane);
}
else
mplane.Key = "-Aircraft";
}
var mheli = node.Value.Nodes.FirstOrDefault(n => n.Key == "-Helicopter");
if (mheli != null)
{
// Check if a Plane trait was renamed to Aircraft
// In that case, we don't want to straight negate it with -Aircraft again
if (node.Value.Nodes.Any(n => n.Key == "Aircraft" || n.Key == "Plane"))
{
Console.WriteLine("Warning: Removed '-Helicopter:', this can introduce side effects with inherited 'Aircraft' definitions.");
node.Value.Nodes.Remove(mheli);
}
else
mheli.Key = "-Aircraft";
}
}
if (engineVersion < 20151004)
@@ -2295,7 +2343,15 @@ namespace OpenRA.Mods.Common.UtilityCommands
{
var otherNodes = nodes;
var inherits = new Func<string, bool>(traitName => node.Value.Nodes.Where(n => n.Key.StartsWith("Inherits"))
.Any(inh => otherNodes.First(n => n.Key.StartsWith(inh.Value.Value)).Value.Nodes.Any(n => n.Key.StartsWith(traitName))));
.Any(inh =>
{
var otherNode = otherNodes.FirstOrDefault(n => n.Key.StartsWith(inh.Value.Value));
if (otherNode == null)
return false;
return otherNode.Value.Nodes.Any(n => n.Key.StartsWith(traitName));
}));
var target = node.Value.Nodes.FirstOrDefault(n => n.Key.StartsWith("-AutoTarget"));
if (target != null)
@@ -2351,7 +2407,8 @@ namespace OpenRA.Mods.Common.UtilityCommands
if (depth == 1 && node.Key == "AutoTarget")
{
var stance = node.Value.Nodes.FirstOrDefault(n => n.Key == "InitialStance");
if (stance != null)
var aiStance = node.Value.Nodes.FirstOrDefault(n => n.Key == "InitialStanceAI");
if (stance != null && aiStance == null)
node.Value.Nodes.Add(new MiniYamlNode("InitialStanceAI", stance.Value.Value));
}
}
@@ -2490,8 +2547,8 @@ namespace OpenRA.Mods.Common.UtilityCommands
oldNodeAtName = "_" + curNode.Key.Split('@')[1];
// Per Cell Damage Model
if (curNode.Value.Nodes.Where(n => n.Key.Contains("DamageModel") &&
n.Value.Value.Contains("PerCell")).Any())
if (curNode.Value.Nodes.Any(n => n.Key.Contains("DamageModel") &&
n.Value.Value.Contains("PerCell")))
{
warheadCounter++;
@@ -2526,14 +2583,15 @@ namespace OpenRA.Mods.Common.UtilityCommands
}
// HealthPercentage damage model
if (curNode.Value.Nodes.Where(n => n.Key.Contains("DamageModel") &&
n.Value.Value.Contains("HealthPercentage")).Any())
if (curNode.Value.Nodes.Any(n => n.Key.Contains("DamageModel") &&
n.Value.Value.Contains("HealthPercentage")))
{
warheadCounter++;
var newYaml = new List<MiniYamlNode>();
var temp = curNode.Value.Nodes.FirstOrDefault(n => n.Key == "Size"); // New HealthPercentage warhead allows 2 spreads, as opposed to 1 size
// New HealthPercentage warhead allows 2 spreads, as opposed to 1 size
var temp = curNode.Value.Nodes.FirstOrDefault(n => n.Key == "Size");
if (temp != null)
{
var newValue = temp.Value.Value.Split(',').First() + "c0";
@@ -2562,7 +2620,8 @@ namespace OpenRA.Mods.Common.UtilityCommands
}
// SpreadDamage
{ // Always occurs, since by definition all warheads were SpreadDamage warheads before
// Always occurs, since by definition all warheads were SpreadDamage warheads before
{
warheadCounter++;
var newYaml = new List<MiniYamlNode>();
@@ -2589,8 +2648,8 @@ namespace OpenRA.Mods.Common.UtilityCommands
}
// DestroyResource
if (curNode.Value.Nodes.Where(n => n.Key.Contains("DestroyResources") ||
n.Key.Contains("Ore")).Any())
if (curNode.Value.Nodes.Any(n => n.Key.Contains("DestroyResources") ||
n.Key.Contains("Ore")))
{
warheadCounter++;
@@ -2608,7 +2667,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
}
// CreateResource
if (curNode.Value.Nodes.Where(n => n.Key.Contains("AddsResourceType")).Any())
if (curNode.Value.Nodes.Any(n => n.Key.Contains("AddsResourceType")))
{
warheadCounter++;
@@ -2627,7 +2686,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
}
// LeaveSmudge
if (curNode.Value.Nodes.Where(n => n.Key.Contains("SmudgeType")).Any())
if (curNode.Value.Nodes.Any(n => n.Key.Contains("SmudgeType")))
{
warheadCounter++;
@@ -2646,8 +2705,8 @@ namespace OpenRA.Mods.Common.UtilityCommands
}
// CreateEffect - Explosion
if (curNode.Value.Nodes.Where(n => n.Key.Contains("Explosion") ||
n.Key.Contains("ImpactSound")).Any())
if (curNode.Value.Nodes.Any(n => n.Key.Contains("Explosion") ||
n.Key.Contains("ImpactSound")))
{
warheadCounter++;
@@ -2668,8 +2727,8 @@ namespace OpenRA.Mods.Common.UtilityCommands
}
// CreateEffect - Water Explosion
if (curNode.Value.Nodes.Where(n => n.Key.Contains("WaterExplosion") ||
n.Key.Contains("WaterImpactSound")).Any())
if (curNode.Value.Nodes.Any(n => n.Key.Contains("WaterExplosion") ||
n.Key.Contains("WaterImpactSound")))
{
warheadCounter++;

4
mods/cnc/chrome/editor.yaml
View File

@@ -6,7 +6,7 @@ Container@NEW_MAP_BG:
Height: 125
Children:
Label@TITLE:
Text:New Map
Text: New Map
Width: PARENT_RIGHT
Y: 0-25
Font: BigBold
@@ -73,7 +73,6 @@ Container@NEW_MAP_BG:
Font: Bold
Key: return
Background@SAVE_MAP_PANEL:
Logic: SaveMapLogic
X: (WINDOW_RIGHT - WIDTH)/2
@@ -407,3 +406,4 @@ Container@EDITOR_WORLD_ROOT:
Align: Left
Font: Bold
Contrast: true

5
mods/cnc/chrome/ingame-infoscripterror.yaml
View File

@@ -8,7 +8,7 @@ Container@SCRIPT_ERROR_PANEL:
Width: PARENT_RIGHT-30
Height: 20
Font: Bold
Align:Center
Align: Center
Text: The map script has encountered a fatal error
Label@DESCB:
X: 15
@@ -24,4 +24,5 @@ Container@SCRIPT_ERROR_PANEL:
Width: PARENT_RIGHT-30
Height: 20
Font: Regular
Text: Please send this file to the map author so that they can fix this issue.
Text: Please send this file to the map author so that they can fix this issue.

3
mods/cnc/chrome/ingame.yaml
View File

@@ -202,7 +202,7 @@ Container@OBSERVER_WIDGETS:
Logic: ObserverShroudSelectorLogic
X: WINDOW_RIGHT-WIDTH-5
Y: 260
Width:256
Width: 256
Height: 25
Font: Bold
Children:
@@ -467,6 +467,7 @@ Container@PLAYER_WIDGETS:
Y: 268
Width: 194
Height: 20
Background@FMVPLAYER:
Width: WINDOW_RIGHT
Height: WINDOW_BOTTOM

3
mods/cnc/chrome/lobby-kickdialogs.yaml
View File

@@ -45,6 +45,7 @@ Background@KICK_CLIENT_DIALOG:
Height: 25
Text: Cancel
Font: Bold
Background@KICK_SPECTATORS_DIALOG:
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
@@ -78,6 +79,7 @@ Background@KICK_SPECTATORS_DIALOG:
Height: 25
Text: Cancel
Font: Bold
Background@FORCE_START_DIALOG:
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
@@ -137,3 +139,4 @@ Background@FORCE_START_DIALOG:
Height: 25
Text: Cancel
Font: Bold

2
mods/cnc/chrome/missionbrowser.yaml
View File

@@ -148,6 +148,7 @@ Container@MISSIONBROWSER_PANEL:
Y: 1
Width: 640
Height: 375
Background@FULLSCREEN_PLAYER:
Width: WINDOW_RIGHT
Height: WINDOW_BOTTOM
@@ -159,3 +160,4 @@ Background@FULLSCREEN_PLAYER:
Y: 0
Width: WINDOW_RIGHT
Height: WINDOW_BOTTOM

6
mods/d2k/chrome/ingame-player.yaml
View File

@@ -17,8 +17,8 @@ Container@PLAYER_WIDGETS:
Container@PALETTE_FOREGROUND:
Children:
Image@ICON_TEMPLATE:
X:0-2
Y:0-2
X: 0-2
Y: 0-2
Width: 60
Height: 48
IgnoreMouseOver: true
@@ -95,7 +95,6 @@ Container@PLAYER_WIDGETS:
X: 0
Y: 0
ImageCollection: order-icons
Button@POWER_BUTTON:
Logic: PowerdownOrderButtonLogic
X: 133
@@ -393,3 +392,4 @@ Container@PLAYER_WIDGETS:
Y: 5
ImageCollection: scrollbar
ImageName: down_arrow

2
mods/d2k/chrome/missionbrowser.yaml
View File

@@ -152,6 +152,7 @@ Background@MISSIONBROWSER_PANEL:
Height: 480
AspectRatio: 1.2
DrawOverlay: False
Background@FULLSCREEN_PLAYER:
Width: WINDOW_RIGHT
Height: WINDOW_BOTTOM
@@ -163,3 +164,4 @@ Background@FULLSCREEN_PLAYER:
Y: 0
Width: WINDOW_RIGHT
Height: WINDOW_BOTTOM

3
mods/ra/chrome/confirmation-dialogs.yaml
View File

@@ -58,7 +58,7 @@ Background@CANCEL_PROMPT:
Height: 25
Text: Cancel
Font: Bold
Key: escape
Key: escape
Background@TEXT_INPUT_PROMPT:
X: (WINDOW_RIGHT - WIDTH)/2
@@ -99,3 +99,4 @@ Background@TEXT_INPUT_PROMPT:
Text: Cancel
Font: Bold
Key: escape

4
mods/ra/chrome/ingame-diplomacy.yaml
View File

@@ -81,7 +81,6 @@ Background@INGAME_DIPLOMACY_BG:
X: 307
Width: 100
Height: PARENT_BOTTOM
Button@CLOSE:
X: PARENT_RIGHT-145
Y: PARENT_BOTTOM - 45
@@ -89,4 +88,5 @@ Background@INGAME_DIPLOMACY_BG:
Height: 25
Text: Close
Key: escape
Font: Bold
Font: Bold

3
mods/ra/chrome/ingame-infobriefing.yaml
View File

@@ -1,5 +1,5 @@
Container@MAP_PANEL:
Height: PARENT_BOTTOM
Height: PARENT_BOTTOM
Width: PARENT_RIGHT
Logic: GameInfoBriefingLogic
Children:
@@ -29,4 +29,3 @@ Container@MAP_PANEL:
Y: 1
Width: PARENT_RIGHT - 32

5
mods/ra/chrome/ingame-infoscripterror.yaml
View File

@@ -8,7 +8,7 @@ Container@SCRIPT_ERROR_PANEL:
Width: PARENT_RIGHT-30
Height: 20
Font: Bold
Align:Center
Align: Center
Text: The map script has encountered a fatal error
Label@DESCB:
X: 15
@@ -24,4 +24,5 @@ Container@SCRIPT_ERROR_PANEL:
Width: PARENT_RIGHT-30
Height: 20
Font: Regular
Text: Please send this file to the map author so that they can fix this issue.
Text: Please send this file to the map author so that they can fix this issue.

5
mods/ra/chrome/ingame-player.yaml
View File

@@ -18,8 +18,8 @@ Container@PLAYER_WIDGETS:
Children:
Image@ICON_TEMPLATE:
Logic: AddFactionSuffixLogic
X:0-2
Y:0-2
X: 0-2
Y: 0-2
Width: 62
Height: 46
IgnoreMouseOver: true
@@ -381,3 +381,4 @@ Container@PLAYER_WIDGETS:
Y: 3
ImageCollection: scrollbar
ImageName: down_arrow

3
mods/ra/chrome/missionbrowser.yaml
View File

@@ -94,7 +94,6 @@ Background@MISSIONBROWSER_PANEL:
Width: 120
Height: 25
Font: Regular
Button@START_BRIEFING_VIDEO_BUTTON:
X: 20
Y: PARENT_BOTTOM - 45
@@ -150,6 +149,7 @@ Background@MISSIONBROWSER_PANEL:
Y: 1
Width: 640
Height: 375
Background@FULLSCREEN_PLAYER:
Width: WINDOW_RIGHT
Height: WINDOW_BOTTOM
@@ -161,3 +161,4 @@ Background@FULLSCREEN_PLAYER:
Y: 0
Width: WINDOW_RIGHT
Height: WINDOW_BOTTOM

5
mods/ts/chrome/ingame-player.yaml
View File

@@ -19,8 +19,8 @@ Container@PLAYER_WIDGETS:
Children:
Image@ICON_TEMPLATE:
Logic: AddFactionSuffixLogic
X:0-2
Y:0-2
X: 0-2
Y: 0-2
Width: 64
Height: 48
IgnoreMouseOver: true
@@ -390,3 +390,4 @@ Container@PLAYER_WIDGETS:
Background: scrolldown-buttons
TooltipText: Scroll down
TooltipContainer: TOOLTIP_CONTAINER