From 000b4c30d1386dfcf620ed32182b7ca2203f085a Mon Sep 17 00:00:00 2001 From: John Vanderbeck Date: Sun, 17 May 2015 16:07:08 -0700 Subject: [PATCH] FIX: Parse leak values as en-US format --- GameData/TestFlight/Plugins/TestFlight.dll | Bin 40448 -> 40960 bytes GameData/TestFlight/Plugins/TestFlightAPI.dll | Bin 31744 -> 31744 bytes .../Plugins/TestFlightContracts.dll | Bin 8192 -> 8192 bytes .../TestFlight/Plugins/TestFlightCore.dll | Bin 108544 -> 108544 bytes TestFlightFailure_ResourceLeak.cs | 6 +++--- 5 files changed, 3 insertions(+), 3 deletions(-) diff --git a/GameData/TestFlight/Plugins/TestFlight.dll b/GameData/TestFlight/Plugins/TestFlight.dll index b814ff08b458eee6975d2d9b442fd083b8d51c29..a78d5189b5c8b3efc6fd747b1559bde2ed38970a 100755 GIT binary patch delta 7042 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 ebdzqnuyf01|AV9}@&1b<8Pa8b@EqyLSNRYX delta 7107 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 ON!Nt+@oQvVvHBlAeA9mb diff --git a/GameData/TestFlight/Plugins/TestFlightAPI.dll b/GameData/TestFlight/Plugins/TestFlightAPI.dll index 917757e02fa20e582d2ffaebf679da4cc96736c3..5898b727aeafa13e2abf5328292500efb53decc7 100755 GIT binary patch delta 68 zcmZqp!PxMFaf6aClXt;p72h?A0`n)b{1&{p%yH{^FA)*`t*x6Ma0G{Ua0L%#)sQ>@~ diff --git a/GameData/TestFlight/Plugins/TestFlightContracts.dll b/GameData/TestFlight/Plugins/TestFlightContracts.dll index d7f75fb34d7c9b563ad8187646db0401572502b2..a893b149d769bd3d48a63e1592f2907a33de1c09 100755 GIT binary patch delta 73 zcmV-P0Ji^tK!8B7b`1hdaFciqOacyXv&IdY2oS|M=vc|{uuH3Wo#u;@gkrOB790c$ fOmOcN00031OmMT78e#zlH~=>QGypiW{~G}W49FRQ delta 73 zcmV-P0Ji^tK!8B7b`1h~SCe=ROag8s;*790c$ fc~|ch00031c~`TR8e#zlG5|9GIRG=W{~G}WrqdTa diff --git a/GameData/TestFlight/Plugins/TestFlightCore.dll b/GameData/TestFlight/Plugins/TestFlightCore.dll index e7c86bb25d5c0a6dcec284417bd4fafdbf9a7855..b73cdee724da7285ca97d1512b82b863b0ed6d23 100755 GIT binary patch delta 92 zcmZp;z}5gnTNpnHi}(~UfB_efWCY^(qTU7D*+dxm$^>+`e3oBw`J>bH1JS0;SD%(| oSLtHRkl^wucrOZ4>r=3O+9Jj%Ms^DZa|ROzi|yYRGjg&3009>pm;e9( delta 92 zcmZp;z}5gnTNpnHi&Ta)fB_efWCY^(q7~uW*+dxm$^;nC&HKjXc-L{B74yD&$zz$@ nRk|26B)BTW-;09OR)%k%wumu`k==;Fn8A|4c>DLojGQb0%0C)X diff --git a/TestFlightFailure_ResourceLeak.cs b/TestFlightFailure_ResourceLeak.cs index 52a132bc..b9714de2 100644 --- a/TestFlightFailure_ResourceLeak.cs +++ b/TestFlightFailure_ResourceLeak.cs @@ -93,7 +93,7 @@ private float ParseValue(string rawValue) if (rawValue.EndsWith("%t")) { trimmedValue = rawValue.Substring(0, index); - if (!float.TryParse(trimmedValue, out parsedValue)) + if (!float.TryParse(trimmedValue, System.Globalization.NumberStyles.Any, System.Globalization.CultureInfo.CreateSpecificCulture("en-US"), out parsedValue)) parsedValue = 0f; // Calculate the % value based on the total capacity of the tank calculateFromAmount = this.part.Resources.Get(leakingResourceID).maxAmount; @@ -102,13 +102,13 @@ private float ParseValue(string rawValue) else if (rawValue.EndsWith("%c")) { trimmedValue = rawValue.Substring(0, index); - if (!float.TryParse(trimmedValue, out parsedValue)) + if (!float.TryParse(trimmedValue, System.Globalization.NumberStyles.Any, System.Globalization.CultureInfo.CreateSpecificCulture("en-US"), out parsedValue)) parsedValue = 0f; // Calculate the % value based on the current resource level of the tank calculateFromAmount = this.part.Resources.Get(leakingResourceID).amount; Log(String.Format("Calculating leak amount from current amount: {0:F2}", calculateFromAmount)); } - + Log(String.Format("Base value was parsed as: {0:F2}", parsedValue)); parsedValue = parsedValue * (float)calculateFromAmount; Log(String.Format("Calculated leak: {0:F2}", parsedValue)); }