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

Merge pull request #10746 from Phrohdoh/armament-yaml-excpt

Browse Source 
Add an explicit YamlException to ArmamentInfo
This commit is contained in:
Oliver Brakmann
2016-02-13 19:07:42 +01:00
parent 6007bca0a2 4f798ede3c
commit 7f5143bf46
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,7 +80,13 @@ namespace OpenRA.Mods.Common.Traits
public void RulesetLoaded(Ruleset rules, ActorInfo ai) public void RulesetLoaded(Ruleset rules, ActorInfo ai)
{ {
WeaponInfo = rules.Weapons[Weapon.ToLowerInvariant()]; WeaponInfo weaponInfo;
var weaponToLower = Weapon.ToLowerInvariant();
if (!rules.Weapons.TryGetValue(weaponToLower, out weaponInfo))
throw new YamlException("Weapons Ruleset does not contain an entry '{0}'".F(weaponToLower));
WeaponInfo = weaponInfo;
ModifiedRange = new WDist(Util.ApplyPercentageModifiers( ModifiedRange = new WDist(Util.ApplyPercentageModifiers(
WeaponInfo.Range.Length, WeaponInfo.Range.Length,
ai.TraitInfos<IRangeModifierInfo>().Select(m => m.GetRangeModifierDefault()))); ai.TraitInfos<IRangeModifierInfo>().Select(m => m.GetRangeModifierDefault())));