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

Merge pull request #10532 from abcdefg30/polish

Browse Source 
Apply some general polish to the code/yaml
This commit is contained in:
Oliver Brakmann
2016-01-21 20:18:57 +01:00
parent 7ef640dfba 2437091760
commit a0f3c576e5
5 changed files with 70 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
OpenRA.Mods.Common/Traits/Player/ProductionQueue.cs
View File

@@ -249,66 +249,61 @@ namespace OpenRA.Mods.Common.Traits
switch (order.OrderString)
{
case "StartProduction":
var unit = rules.Actors[order.TargetString];
var bi = unit.TraitInfo<BuildableInfo>();
// Not built by this queue
if (!bi.Queue.Contains(Info.Type))
return;
var cost = unit.HasTraitInfo<ValuedInfo>() ? unit.TraitInfo<ValuedInfo>().Cost : 0;
var time = GetBuildTime(order.TargetString);
// You can't build that
if (BuildableItems().All(b => b.Name != order.TargetString))
return;
// Check if the player is trying to build more units that they are allowed
var fromLimit = int.MaxValue;
if (!developerMode.AllTech && bi.BuildLimit > 0)
{
var unit = rules.Actors[order.TargetString];
var bi = unit.TraitInfo<BuildableInfo>();
if (!bi.Queue.Contains(Info.Type))
return; /* Not built by this queue */
var inQueue = queue.Count(pi => pi.Item == order.TargetString);
var owned = self.Owner.World.ActorsHavingTrait<Buildable>().Count(a => a.Info.Name == order.TargetString && a.Owner == self.Owner);
fromLimit = bi.BuildLimit - (inQueue + owned);
var cost = unit.HasTraitInfo<ValuedInfo>() ? unit.TraitInfo<ValuedInfo>().Cost : 0;
var time = GetBuildTime(order.TargetString);
if (fromLimit <= 0)
return;
}
if (BuildableItems().All(b => b.Name != order.TargetString))
return; /* you can't build that!! */
// Check if the player is trying to build more units that they are allowed
var fromLimit = int.MaxValue;
if (!developerMode.AllTech && bi.BuildLimit > 0)
var amountToBuild = Math.Min(fromLimit, order.ExtraData);
for (var n = 0; n < amountToBuild; n++)
{
var hasPlayedSound = false;
BeginProduction(new ProductionItem(this, order.TargetString, cost, playerPower, () => self.World.AddFrameEndTask(_ =>
{
var inQueue = queue.Count(pi => pi.Item == order.TargetString);
var owned = self.Owner.World.ActorsHavingTrait<Buildable>().Count(a => a.Info.Name == order.TargetString && a.Owner == self.Owner);
fromLimit = bi.BuildLimit - (inQueue + owned);
var isBuilding = unit.HasTraitInfo<BuildingInfo>();
if (fromLimit <= 0)
return;
}
var amountToBuild = Math.Min(fromLimit, order.ExtraData);
for (var n = 0; n < amountToBuild; n++)
{
var hasPlayedSound = false;
BeginProduction(new ProductionItem(this, order.TargetString, cost, playerPower, () => self.World.AddFrameEndTask(_ =>
if (isBuilding && !hasPlayedSound)
hasPlayedSound = Game.Sound.PlayNotification(rules, self.Owner, "Speech", Info.ReadyAudio, self.Owner.Faction.InternalName);
else if (!isBuilding)
{
var isBuilding = unit.HasTraitInfo<BuildingInfo>();
if (isBuilding && !hasPlayedSound)
hasPlayedSound = Game.Sound.PlayNotification(rules, self.Owner, "Speech", Info.ReadyAudio, self.Owner.Faction.InternalName);
else if (!isBuilding)
{
if (BuildUnit(order.TargetString))
Game.Sound.PlayNotification(rules, self.Owner, "Speech", Info.ReadyAudio, self.Owner.Faction.InternalName);
else if (!hasPlayedSound && time > 0)
hasPlayedSound = Game.Sound.PlayNotification(rules, self.Owner, "Speech", Info.BlockedAudio, self.Owner.Faction.InternalName);
}
})));
}
break;
if (BuildUnit(order.TargetString))
Game.Sound.PlayNotification(rules, self.Owner, "Speech", Info.ReadyAudio, self.Owner.Faction.InternalName);
else if (!hasPlayedSound && time > 0)
hasPlayedSound = Game.Sound.PlayNotification(rules, self.Owner, "Speech", Info.BlockedAudio, self.Owner.Faction.InternalName);
}
})));
}
break;
case "PauseProduction":
{
if (queue.Count > 0 && queue[0].Item == order.TargetString)
queue[0].Pause(order.ExtraData != 0);
break;
}
if (queue.Count > 0 && queue[0].Item == order.TargetString)
queue[0].Pause(order.ExtraData != 0);
break;
case "CancelProduction":
{
CancelProduction(order.TargetString, order.ExtraData);
break;
}
CancelProduction(order.TargetString, order.ExtraData);
break;
}
}

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

@@ -1899,7 +1899,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
// Rename *CrateAction.ValidRaces
if (depth == 2 && node.Key == "ValidRaces"
&& (parentKey == "DuplicateUnitCrateAction" || parentKey == "GiveUnitCrateAction"))
&& (parentKey == "DuplicateUnitCrateAction" || parentKey == "GiveUnitCrateAction"))
node.Key = "ValidFactions";
}

12
OpenRA.Mods.Common/Widgets/ProductionPaletteWidget.cs
View File

@@ -418,17 +418,17 @@ namespace OpenRA.Mods.Common.Widgets
}
else if (first.Paused)
overlayFont.DrawTextWithContrast(HoldText,
icon.Pos + holdOffset,
Color.White, Color.Black, 1);
icon.Pos + holdOffset,
Color.White, Color.Black, 1);
else if (!waiting)
overlayFont.DrawTextWithContrast(WidgetUtils.FormatTime(first.RemainingTimeActual, World.Timestep),
icon.Pos + timeOffset,
Color.White, Color.Black, 1);
icon.Pos + timeOffset,
Color.White, Color.Black, 1);
if (total > 1 || waiting)
overlayFont.DrawTextWithContrast(total.ToString(),
icon.Pos + queuedOffset,
Color.White, Color.Black, 1);
icon.Pos + queuedOffset,
Color.White, Color.Black, 1);
}
}
}

4
mods/ra/sequences/misc.yaml
View File

@@ -88,11 +88,11 @@ v2:
ZOffset: 1023
rallypoint:
flag:flagfly
flag: flagfly
Length: *
Offset: 11,-5
ZOffset: 2535
circles:fpls
circles: fpls
Length: *
ZOffset: 2047

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

@@ -77,9 +77,21 @@
UpgradeTypes: notmobile
UpgradeMaxEnabledLevel: 0
^Cloakable:
Cloak@CLOAKGENERATOR:
UpgradeTypes: cloakgenerator
UpgradeMinEnabledLevel: 1
InitialDelay: 0
CloakDelay: 90
IsPlayerPalette: true
CloakSound: cloak5.aud
UncloakSound: cloak5.aud
UncloakOn: Attack, Unload, Infiltrate, Demolish, Damage
^BasicBuilding:
Inherits@1: ^ExistsInWorld
Inherits@2: ^SpriteActor
Inherits@3: ^Cloakable
SelectionDecorations:
Palette: pips
Selectable:
@@ -105,15 +117,6 @@
Guardable:
Range: 3c0
Demolishable:
Cloak@CLOAKGENERATOR:
UpgradeTypes: cloakgenerator
UpgradeMinEnabledLevel: 1
InitialDelay: 0
CloakDelay: 90
IsPlayerPalette: true
CloakSound: cloak5.aud
UncloakSound: cloak5.aud
UncloakOn: Attack, Unload, Infiltrate, Demolish, Damage
^Building:
Inherits@1: ^BasicBuilding
@@ -184,6 +187,7 @@
^Wall:
Inherits@1: ^SpriteActor
Inherits@2: ^Cloakable
CombatDebugOverlay:
HiddenUnderShroud:
AppearsOnRadar:
@@ -213,15 +217,6 @@
Demolishable:
ScriptTriggers:
UpgradeManager:
Cloak@CLOAKGENERATOR:
UpgradeTypes: cloakgenerator
UpgradeMinEnabledLevel: 1
InitialDelay: 0
CloakDelay: 90
IsPlayerPalette: true
CloakSound: cloak5.aud
UncloakSound: cloak5.aud
UncloakOn: Attack, Unload, Infiltrate, Demolish, Damage
Health:
Shape: Circle
Radius: 363
@@ -238,6 +233,7 @@
Inherits@1: ^GainsExperience
Inherits@2: ^ExistsInWorld
Inherits@3: ^SpriteActor
Inherits@4: ^Cloakable
DrawLineToTarget:
Health:
HP: 50
@@ -319,15 +315,6 @@
DeathSounds@ZAPPED:
Voice: Zapped
DeathTypes: EnergyDeath
Cloak@CLOAKGENERATOR:
UpgradeTypes: cloakgenerator
UpgradeMinEnabledLevel: 1
InitialDelay: 0
CloakDelay: 90
IsPlayerPalette: true
CloakSound: cloak5.aud
UncloakSound: cloak5.aud
UncloakOn: Attack, Unload, Infiltrate, Demolish, Damage
^Soldier:
Inherits: ^Infantry
@@ -379,6 +366,7 @@
Inherits@1: ^GainsExperience
Inherits@2: ^ExistsInWorld
Inherits@3: ^EmpDisableMobile
Inherits@4: ^Cloakable
DrawLineToTarget:
Mobile:
Crushes: crate
@@ -423,15 +411,6 @@
Explodes:
Weapon: UnitExplodeSmall
EmptyWeapon: UnitExplodeSmall
Cloak@CLOAKGENERATOR:
UpgradeTypes: cloakgenerator
UpgradeMinEnabledLevel: 1
InitialDelay: 0
CloakDelay: 90
IsPlayerPalette: true
CloakSound: cloak5.aud
UncloakSound: cloak5.aud
UncloakOn: Attack, Unload, Infiltrate, Demolish, Damage
MustBeDestroyed:
RenderSprites:
ThrowsShrapnel:
@@ -474,6 +453,7 @@
^Aircraft:
Inherits@1: ^GainsExperience
Inherits@2: ^ExistsInWorld
Inherits@3: ^Cloakable
DrawLineToTarget:
AppearsOnRadar:
UseLocation: yes
@@ -512,15 +492,6 @@
MustBeDestroyed:
RenderVoxels:
WithVoxelBody:
Cloak@CLOAKGENERATOR:
UpgradeTypes: cloakgenerator
UpgradeMinEnabledLevel: 1
InitialDelay: 0
CloakDelay: 90
IsPlayerPalette: true
CloakSound: cloak5.aud
UncloakSound: cloak5.aud
UncloakOn: Attack, Unload, Infiltrate, Demolish, Damage
^Helicopter:
Inherits: ^Aircraft
@@ -715,6 +686,7 @@
^Train:
Inherits@1: ^EmpDisableMobile
Inherits@2: ^ExistsInWorld
Inherits@3: ^Cloakable
RenderVoxels:
RenderSprites:
WithVoxelBody:
@@ -753,15 +725,6 @@
Explodes:
Weapon: UnitExplodeSmall
EmptyWeapon: UnitExplodeSmall
Cloak@CLOAKGENERATOR:
UpgradeTypes: cloakgenerator
UpgradeMinEnabledLevel: 1
InitialDelay: 0
CloakDelay: 90
IsPlayerPalette: true
CloakSound: cloak5.aud
UncloakSound: cloak5.aud
UncloakOn: Attack, Unload, Infiltrate, Demolish, Damage
ThrowsShrapnel:
Weapons: SmallDebris
Pieces: 3, 7