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

Merge pull request #8703 from atlimit8/RequireInMiniYaml

Browse Source 
Require trait properties in MiniYaml
This commit is contained in:
abcdefg30
2015-07-13 15:50:06 +02:00
parent ea5ef1c500 429a9380e8
commit b4031c6e9b
54 changed files with 144 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Traits/Armament.cs
View File

@@ -28,8 +28,8 @@ namespace OpenRA.Mods.Common.Traits
{
public readonly string Name = "primary";
[WeaponReference]
[Desc("Has to be defined here and in weapons.yaml.")]
[WeaponReference, FieldLoader.Require]
[Desc("Has to be defined in weapons.yaml as well.")]
public readonly string Weapon = null;
[Desc("Which limited ammo pool (if present) should this armament be assigned to.")]

9
OpenRA.Mods.Common/Traits/Attack/AttackGarrisoned.cs
View File

@@ -27,14 +27,17 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Cargo can fire their weapons out of fire ports.")]
public class AttackGarrisonedInfo : AttackFollowInfo, Requires<CargoInfo>
{
[FieldLoader.Require]
[Desc("Fire port offsets in local coordinates.")]
public readonly WVec[] PortOffsets = { };
public readonly WVec[] PortOffsets = null;
[FieldLoader.Require]
[Desc("Fire port yaw angles.")]
public readonly WAngle[] PortYaws = { };
public readonly WAngle[] PortYaws = null;
[FieldLoader.Require]
[Desc("Fire port yaw cone angle.")]
public readonly WAngle[] PortCones = { };
public readonly WAngle[] PortCones = null;
public readonly string MuzzlePalette = "effect";

2
OpenRA.Mods.Common/Traits/Buildings/FreeActor.cs
View File

@@ -17,7 +17,7 @@ namespace OpenRA.Mods.Common.Traits
"If you want more than one unit to appear copy this section and assign IDs like FreeActor@2, ...")]
public class FreeActorInfo : ITraitInfo
{
[ActorReference]
[ActorReference, FieldLoader.Require]
[Desc("Name of the actor.")]
public readonly string Actor = null;

1
OpenRA.Mods.Common/Traits/Buildings/TargetableBuilding.cs
View File

@@ -16,6 +16,7 @@ namespace OpenRA.Mods.Common.Traits
{
public class TargetableBuildingInfo : ITraitInfo, ITargetableInfo, Requires<BuildingInfo>
{
[FieldLoader.Require]
public readonly string[] TargetTypes = { };
public string[] GetTargetTypes() { return TargetTypes; }

2
OpenRA.Mods.Common/Traits/Crates/ExplodeCrateAction.cs
View File

@@ -17,7 +17,7 @@ namespace OpenRA.Mods.Common.Traits
class ExplodeCrateActionInfo : CrateActionInfo
{
[Desc("The weapon to fire upon collection.")]
[WeaponReference] public string Weapon = null;
[WeaponReference, FieldLoader.Require] public string Weapon = null;
public override object Create(ActorInitializer init) { return new ExplodeCrateAction(init.Self, this); }
}

2
OpenRA.Mods.Common/Traits/Crates/GiveUnitCrateAction.cs
View File

@@ -19,7 +19,7 @@ namespace OpenRA.Mods.Common.Traits
class GiveUnitCrateActionInfo : CrateActionInfo
{
[Desc("The list of units to spawn.")]
[ActorReference]
[ActorReference, FieldLoader.Require]
public readonly string[] Units = { };
[Desc("Races that are allowed to trigger this action")]

2
OpenRA.Mods.Common/Traits/Crates/GrantUpgradeCrateAction.cs
View File

@@ -16,7 +16,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Grants an upgrade to the collector.")]
public class GrantUpgradeCrateActionInfo : CrateActionInfo
{
[UpgradeGrantedReference]
[UpgradeGrantedReference, FieldLoader.Require]
[Desc("The upgrades to apply.")]
public readonly string[] Upgrades = { };

2
OpenRA.Mods.Common/Traits/Crates/SupportPowerCrateAction.cs
View File

@@ -17,7 +17,7 @@ namespace OpenRA.Mods.Common.Traits
class SupportPowerCrateActionInfo : CrateActionInfo
{
[Desc("Which proxy actor, which grants the support power, to spawn.")]
[ActorReference] public readonly string Proxy = null;
[ActorReference, FieldLoader.Require] public readonly string Proxy = null;
public override object Create(ActorInitializer init) { return new SupportPowerCrateAction(init.Self, this); }
}

1
OpenRA.Mods.Common/Traits/CustomBuildTimeValue.cs
View File

@@ -15,6 +15,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Overrides the build time calculated by actor value.")]
public class CustomBuildTimeValueInfo : TraitInfo<CustomBuildTimeValue>
{
[FieldLoader.Require]
[Desc("Measured in ticks.")]
public readonly int Value = 0;
}

1
OpenRA.Mods.Common/Traits/CustomSelectionSize.cs
View File

@@ -18,6 +18,7 @@ namespace OpenRA.Mods.Common.Traits
"Examples: bridge huts and crates.")]
public class CustomSelectionSizeInfo : ITraitInfo
{
[FieldLoader.Require]
public readonly int[] CustomBounds = null;
public object Create(ActorInitializer init) { return new CustomSelectionSize(this); }

1
OpenRA.Mods.Common/Traits/CustomSellValue.cs
View File

@@ -15,6 +15,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Allow a non-standard sell/repair value to avoid buy-sell exploits.")]
public class CustomSellValueInfo : TraitInfo<CustomSellValue>
{
[FieldLoader.Require]
public readonly int Value = 0;
}

9
OpenRA.Mods.Common/Traits/GainsExperience.cs
View File

@@ -20,8 +20,8 @@ namespace OpenRA.Mods.Common.Traits
[Desc("This actor's experience increases when it has killed a GivesExperience actor.")]
public class GainsExperienceInfo : ITraitInfo, Requires<ValuedInfo>, Requires<UpgradeManagerInfo>
{
[FieldLoader.LoadUsing("LoadUpgrades")]
[Desc("Upgrades to grant at each level. (Required property)",
[FieldLoader.LoadUsing("LoadUpgrades", true)]
[Desc("Upgrades to grant at each level.",
"Key is the XP requirements for each level as a percentage of our own value.",
"Value is a list of the upgrade types to grant")]
public readonly Dictionary<int, string[]> Upgrades = null;
@@ -36,10 +36,7 @@ namespace OpenRA.Mods.Common.Traits
static object LoadUpgrades(MiniYaml y)
{
MiniYaml upgrades;
if (!y.ToDictionary().TryGetValue("Upgrades", out upgrades))
throw new YamlException("GainsExperience is missing Upgrades.");
MiniYaml upgrades = y.ToDictionary()["Upgrades"];
return upgrades.Nodes.ToDictionary(
kv => FieldLoader.GetValue<int>("(key)", kv.Key),

3
OpenRA.Mods.Common/Traits/GlobalUpgradable.cs
View File

@@ -16,10 +16,11 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Grants upgrades to the actor this is attached to when prerequisites are available.")]
public class GlobalUpgradableInfo : ITraitInfo, Requires<UpgradeManagerInfo>
{
[UpgradeGrantedReference]
[UpgradeGrantedReference, FieldLoader.Require]
[Desc("List of upgrades to apply.")]
public readonly string[] Upgrades = { };
[FieldLoader.Require]
[Desc("List of required prerequisites.")]
public readonly string[] Prerequisites = { };

3
OpenRA.Mods.Common/Traits/Infantry/TakeCover.cs
View File

@@ -24,8 +24,9 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Prone movement speed as a percentage of the normal speed.")]
public readonly int SpeedModifier = 50;
[FieldLoader.Require]
[Desc("Damage types that trigger prone state. Defined on the warheads.")]
public readonly string[] DamageTriggers = new string[0];
public readonly string[] DamageTriggers = null;
[FieldLoader.LoadUsing("LoadModifiers")]
[Desc("Damage modifiers for each damage type (defined on the warheads) while the unit is prone.")]

9
OpenRA.Mods.Common/Traits/Infantry/TerrainModifiesDamage.cs
View File

@@ -17,7 +17,7 @@ namespace OpenRA.Mods.Common.Traits
{
public class TerrainModifiesDamageInfo : ITraitInfo
{
[FieldLoader.LoadUsing("LoadPercents")]
[FieldLoader.LoadUsing("LoadPercents", true)]
[Desc("Damage percentage for specific terrain types. 120 = 120%, 80 = 80%, etc.")]
public readonly Dictionary<string, int> TerrainModifier = null;
@@ -28,12 +28,7 @@ namespace OpenRA.Mods.Common.Traits
static object LoadPercents(MiniYaml y)
{
MiniYaml percents;
if (!y.ToDictionary().TryGetValue("TerrainModifier", out percents))
return new Dictionary<string, int>();
return percents.Nodes.ToDictionary(
return y.ToDictionary()["TerrainModifier"].Nodes.ToDictionary(
kv => FieldLoader.GetValue<string>("(key)", kv.Key),
kv => FieldLoader.GetValue<int>("(value)", kv.Value.Value));
}

2
OpenRA.Mods.Common/Traits/Mobile.cs
View File

@@ -32,7 +32,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Unit is able to move.")]
public class MobileInfo : IMoveInfo, IOccupySpaceInfo, IFacingInfo, UsesInit<FacingInit>, UsesInit<LocationInit>, UsesInit<SubCellInit>
{
[FieldLoader.LoadUsing("LoadSpeeds")]
[FieldLoader.LoadUsing("LoadSpeeds", true)]
[Desc("Set Water: 0 for ground units and lower the value on rough terrain.")]
public readonly Dictionary<string, TerrainInfo> TerrainSpeeds;

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

@@ -20,6 +20,7 @@ namespace OpenRA.Mods.Common.Traits
"at the same time. Will only work together with the Production: trait.")]
public class ProductionQueueInfo : ITraitInfo
{
[FieldLoader.Require]
[Desc("What kind of production will be added (e.g. Building, Infantry, Vehicle, ...)")]
public readonly string Type = null;

1
OpenRA.Mods.Common/Traits/Plug.cs
View File

@@ -16,6 +16,7 @@ namespace OpenRA.Mods.Common.Traits
{
public class PlugInfo : TraitInfo<Plug>
{
[FieldLoader.Require]
[Desc("Plug type (matched against Upgrades in Pluggable)")]
public readonly string Type = null;
}

9
OpenRA.Mods.Common/Traits/Pluggable.cs
View File

@@ -19,18 +19,13 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Footprint cell offset where a plug can be placed.")]
public readonly CVec Offset = CVec.Zero;
[FieldLoader.LoadUsing("LoadUpgrades")]
[FieldLoader.LoadUsing("LoadUpgrades", true)]
[Desc("Upgrades to grant for each accepted plug type.")]
public readonly Dictionary<string, string[]> Upgrades = null;
static object LoadUpgrades(MiniYaml y)
{
MiniYaml upgrades;
if (!y.ToDictionary().TryGetValue("Upgrades", out upgrades))
return new Dictionary<string, string[]>();
return upgrades.Nodes.ToDictionary(
return y.ToDictionary()["Upgrades"].Nodes.ToDictionary(
kv => kv.Key,
kv => FieldLoader.GetValue<string[]>("(value)", kv.Value.Value));
}

1
OpenRA.Mods.Common/Traits/Production.cs
View File

@@ -21,6 +21,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("This unit has access to build queues.")]
public class ProductionInfo : ITraitInfo
{
[FieldLoader.Require]
[Desc("e.g. Infantry, Vehicles, Aircraft, Buildings")]
public readonly string[] Produces = { };

1
OpenRA.Mods.Common/Traits/ProximityCaptor.cs
View File

@@ -16,6 +16,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Actor can capture ProximityCapturable actors.")]
public class ProximityCaptorInfo : ITraitInfo
{
[FieldLoader.Require]
public readonly string[] Types = { };
public object Create(ActorInitializer init) { return new ProximityCaptor(this); }
}

1
OpenRA.Mods.Common/Traits/Render/TimedUpgradeBar.cs
View File

@@ -18,6 +18,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Visualizes the remaining time for an upgrade.")]
class TimedUpgradeBarInfo : ITraitInfo, Requires<UpgradeManagerInfo>
{
[FieldLoader.Require]
[Desc("Upgrade that this bar corresponds to")]
public readonly string Upgrade = null;

1
OpenRA.Mods.Common/Traits/Sound/AmbientSound.cs
View File

@@ -15,6 +15,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Plays a looping audio file at the actor position. Attach this to the `World` actor to cover the whole map.")]
class AmbientSoundInfo : ITraitInfo
{
[FieldLoader.Require]
public readonly string SoundFile = null;
public object Create(ActorInitializer init) { return new AmbientSound(init.Self, this); }

2
OpenRA.Mods.Common/Traits/StoresResources.cs
View File

@@ -18,9 +18,11 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Used for silos.")]
class StoresResourcesInfo : ITraitInfo
{
[FieldLoader.Require]
[Desc("Number of little squares used to display how filled unit is.")]
public readonly int PipCount = 0;
public readonly PipType PipColor = PipType.Yellow;
[FieldLoader.Require]
public readonly int Capacity = 0;
public object Create(ActorInitializer init) { return new StoresResources(init.Self, this); }
}

2
OpenRA.Mods.Common/Traits/SupportPowers/GrantUpgradePower.cs
View File

@@ -19,7 +19,7 @@ namespace OpenRA.Mods.Common.Traits
{
class GrantUpgradePowerInfo : SupportPowerInfo
{
[UpgradeGrantedReference]
[UpgradeGrantedReference, FieldLoader.Require]
[Desc("The upgrades to apply.")]
public readonly string[] Upgrades = { };

2
OpenRA.Mods.Common/Traits/SupportPowers/SpawnActorPower.cs
View File

@@ -12,12 +12,14 @@ using OpenRA.Effects;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Effects;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("Spawns an actor that stays for a limited amount of time.")]
public class SpawnActorPowerInfo : SupportPowerInfo
{
[ActorReference, FieldLoader.Require]
[Desc("Actor to spawn.")]
public readonly string Actor = null;

1
OpenRA.Mods.Common/Traits/ThrowsParticle.cs
View File

@@ -15,6 +15,7 @@ namespace OpenRA.Mods.Common.Traits
{
class ThrowsParticleInfo : ITraitInfo, Requires<WithSpriteBodyInfo>, Requires<IBodyOrientationInfo>
{
[FieldLoader.Require]
public readonly string Anim = null;
[Desc("Initial position relative to body")]

2
OpenRA.Mods.Common/Traits/ThrowsShrapnel.cs
View File

@@ -17,7 +17,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Throws particles when the actor is destroyed that do damage on impact.")]
public class ThrowsShrapnelInfo : ITraitInfo
{
[WeaponReference]
[WeaponReference, FieldLoader.Require]
public string[] Weapons = { };
public int[] Pieces = { 3, 10 };
public WDist[] Range = { WDist.FromCells(2), WDist.FromCells(5) };

2
OpenRA.Mods.Common/Traits/TransformOnPassenger.cs
View File

@@ -16,7 +16,7 @@ namespace OpenRA.Mods.Common.Traits
{
public class TransformOnPassengerInfo : ITraitInfo
{
[ActorReference] public readonly string[] PassengerTypes = { };
[ActorReference, FieldLoader.Require] public readonly string[] PassengerTypes = { };
[ActorReference] public readonly string OnEnter = null;
[ActorReference] public readonly string OnExit = null;
public readonly bool SkipMakeAnims = false;

2
OpenRA.Mods.Common/Traits/Transforms.cs
View File

@@ -18,7 +18,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Actor becomes a specified actor type when this trait is triggered.")]
public class TransformsInfo : ITraitInfo
{
[Desc("Actor to transform into."), ActorReference]
[Desc("Actor to transform into."), ActorReference, FieldLoader.Require]
public readonly string IntoActor = null;
[Desc("Offset to spawn the transformed actor relative to the current cell.")]

2
OpenRA.Mods.Common/Traits/Upgrades/DeployToUpgrade.cs
View File

@@ -18,7 +18,7 @@ namespace OpenRA.Mods.Common.Traits
{
public class DeployToUpgradeInfo : ITraitInfo, Requires<UpgradeManagerInfo>
{
[UpgradeGrantedReference]
[UpgradeGrantedReference, FieldLoader.Require]
[Desc("The upgrades to grant when deploying and revoke when undeploying.")]
public readonly string[] Upgrades = { };

2
OpenRA.Mods.Common/Traits/Upgrades/UpgradeActorsNear.cs
View File

@@ -18,7 +18,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Applies an upgrade to actors within a specified range.")]
public class UpgradeActorsNearInfo : ITraitInfo
{
[UpgradeGrantedReference]
[UpgradeGrantedReference, FieldLoader.Require]
[Desc("The upgrades to grant.")]
public readonly string[] Upgrades = { };

1
OpenRA.Mods.Common/Traits/Valued.cs
View File

@@ -15,6 +15,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("How much the unit is worth.")]
public class ValuedInfo : TraitInfo<Valued>
{
[FieldLoader.Require]
[Desc("Used in production, but also for bounties so remember to set it > 0 even for NPCs.")]
public readonly int Cost = 0;
}

1
OpenRA.Mods.Common/Traits/VeteranProductionIconOverlay.cs
View File

@@ -19,6 +19,7 @@ namespace OpenRA.Mods.Common.Traits
"The icon change occurs when LevelupWhenCreated.Prerequisites are met.")]
public class VeteranProductionIconOverlayInfo : ITraitInfo, Requires<TechTreeInfo>
{
[FieldLoader.Require]
[Desc("Image used for the overlay.")]
public readonly string Image = null;

1
OpenRA.Mods.Common/Traits/Voiced.cs
View File

@@ -18,6 +18,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("This actor has a voice.")]
public class VoicedInfo : ITraitInfo
{
[FieldLoader.Require]
[Desc("Which voice set to use.")]
[VoiceSetReference] public readonly string VoiceSet = null;

1
OpenRA.Mods.Common/Traits/World/PaletteFromCurrentTileset.cs
View File

@@ -18,6 +18,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Loads the palette specified in the tileset definition")]
class PaletteFromCurrentTilesetInfo : ITraitInfo
{
[FieldLoader.Require]
[Desc("internal palette name")]
public readonly string Name = null;
[Desc("Map listed indices to shadow. Ignores previous color.")]

2
OpenRA.Mods.Common/Traits/World/PaletteFromFile.cs
View File

@@ -17,10 +17,12 @@ namespace OpenRA.Mods.Common.Traits
{
class PaletteFromFileInfo : ITraitInfo
{
[FieldLoader.Require]
[Desc("internal palette name")]
public readonly string Name = null;
[Desc("If defined, load the palette only for this tileset.")]
public readonly string Tileset = null;
[FieldLoader.Require]
[Desc("filename to load")]
public readonly string Filename = null;
[Desc("Map listed indices to shadow. Ignores previous color.")]

2
OpenRA.Mods.Common/Traits/World/PaletteFromPaletteWithAlpha.cs
View File

@@ -19,9 +19,11 @@ namespace OpenRA.Mods.D2k.Traits
[Desc("Create a palette by applying alpha transparency to another palette.")]
class PaletteFromPaletteWithAlphaInfo : ITraitInfo
{
[FieldLoader.Require]
[Desc("Internal palette name")]
public readonly string Name = null;
[FieldLoader.Require]
[Desc("The name of the palette to base off.")]
public readonly string BasePalette = null;

2
OpenRA.Mods.Common/Traits/World/PaletteFromPlayerPaletteWithAlpha.cs
View File

@@ -19,9 +19,11 @@ namespace OpenRA.Mods.D2k.Traits
[Desc("Create player palettes by applying alpha transparency to another player palette.")]
class PaletteFromPlayerPaletteWithAlphaInfo : ITraitInfo
{
[FieldLoader.Require]
[Desc("The prefix for the resulting player palettes")]
public readonly string BaseName = null;
[FieldLoader.Require]
[Desc("The name of the player palette to base off.")]
public readonly string BasePalette = null;

1
OpenRA.Mods.Common/Traits/World/PaletteFromRGBA.cs
View File

@@ -18,6 +18,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Creates a single color palette without any base palette file.")]
class PaletteFromRGBAInfo : ITraitInfo
{
[FieldLoader.Require]
[Desc("internal palette name")]
public readonly string Name = null;
[Desc("If defined, load the palette only for this tileset.")]

1
OpenRA.Mods.Common/Traits/World/PlayerPaletteFromCurrentTileset.cs
View File

@@ -16,6 +16,7 @@ namespace OpenRA.Mods.Common.Traits
{
class PlayerPaletteFromCurrentTilesetInfo : ITraitInfo
{
[FieldLoader.Require]
[Desc("internal palette name")]
public readonly string Name = null;
[Desc("Map listed indices to shadow.")]