From 2e603004c49dfa0096a49a21d815e7cd20559bef Mon Sep 17 00:00:00 2001 From: biotronic Date: Fri, 15 Aug 2014 11:41:58 +0000 Subject: [PATCH] Fixed double update of Part fields --- Gamedata/TweakScale/plugins/Scale.dll | Bin 54784 -> 54784 bytes ScaleExponents.cs | 14 ++++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Gamedata/TweakScale/plugins/Scale.dll b/Gamedata/TweakScale/plugins/Scale.dll index c4e5009f079f0ab0c7a48e00e462896b6e04cd46..406f6204b2d509f87a2b69dcd1d96014dba00c9e 100644 GIT binary patch delta 4679 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 D@e~gU diff --git a/ScaleExponents.cs b/ScaleExponents.cs index 9a62434b..798ec7a6 100644 --- a/ScaleExponents.cs +++ b/ScaleExponents.cs @@ -85,6 +85,16 @@ private ScaleExponents(ConfigNode node, ScaleExponents source = null) { _id = ""; } + + if (IsExponentBlock(node)) + { + if (string.IsNullOrEmpty(_id)) + { + _id = "Part"; + _name = "Part"; + } + } + _exponents = new Dictionary>(); _children = new Dictionary(); @@ -295,10 +305,6 @@ private void UpdateEnumerable(IEnumerable obj, IEnumerable baseObj, ScalingFacto public static void UpdateObject(Part part, Part basePart, Dictionary exps, ScalingFactor factor) { - if (exps.ContainsKey("")) - { - exps[""].UpdateFields(part, basePart, factor); - } if (exps.ContainsKey("Part")) { exps["Part"].UpdateFields(part, basePart, factor);