Skip to content

Commit ec5d528

Browse files
committed
FIX: Data in the VAB now includes transfer and research data pools
FIX: Some modules were pulling the old data which didn't include the new pools
1 parent ab0e236 commit ec5d528

File tree

6 files changed

+15
-6
lines changed

6 files changed

+15
-6
lines changed
-512 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

TestFlightCore/TestFlightCore/TestFlightCore.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1275,7 +1275,8 @@ public List<string> GetTestFlightInfo()
12751275
string partName = Alias;
12761276
infoStrings.Add("<b>Core</b>");
12771277
infoStrings.Add(indent + " <b>Active Part</b>: " + partName);
1278-
float flightData = TestFlightManagerScenario.Instance.GetFlightDataForPartName(partName);
1278+
// float flightData = TestFlightManagerScenario.Instance.GetFlightDataForPartName(partName);
1279+
var flightData = GetFlightData();
12791280
if (flightData < 0f)
12801281
flightData = 0f;
12811282
infoStrings.Add(indent + String.Format(" <b>Flight Data</b>: {0:f1}/{1:f1}", flightData, maxData));
@@ -1373,6 +1374,14 @@ public void UpdatePartConfig()
13731374
testFlightModules[i].enabled = enabled;
13741375
}
13751376

1377+
1378+
if (TestFlightManagerScenario.Instance.SettingsAlwaysMaxData)
1379+
InitializeFlightData(maxData);
1380+
else
1381+
{
1382+
InitializeFlightData(Mathf.Max(0, TestFlightManagerScenario.Instance.GetFlightDataForPartName(Alias)));
1383+
}
1384+
13761385
if (Events == null)
13771386
return;
13781387

TestFlightCore/TestFlightCore/TestFlightEditor.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,12 +312,12 @@ internal override void DrawWindow(int id)
312312
GUILayout.BeginVertical();
313313
GUILayout.Label(String.Format("Selected Part: {0}", selectedAlias), Styles.styleEditorTitle);
314314

315-
float flightData = TestFlightManagerScenario.Instance.GetFlightDataForPartName(selectedAlias);
316-
if (flightData < 0f)
317-
flightData = 0f;
318315
core = TestFlightUtil.GetCore(SelectedPart, selectedAlias);
319316
if (core != null)
320317
{
318+
float flightData = core.GetFlightData();
319+
if (flightData < 0f)
320+
flightData = 0f;
321321
core.InitializeFlightData(flightData);
322322
GUILayout.BeginHorizontal();
323323
double failureRate = core.GetBaseFailureRate();

TestFlightFailure_IgnitionFail.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ public override List<string> GetTestFlightInfo()
324324
return infoStrings;
325325
}
326326

327-
float flightData = TestFlightManagerScenario.Instance.GetFlightDataForPartName(Configuration);
327+
float flightData = core.GetFlightData();
328328
if (flightData < 0f)
329329
flightData = 0f;
330330

TestFlightReliability.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public override List<string> GetTestFlightInfo(float reliabilityAtTime)
5353
return infoStrings;
5454
}
5555

56-
float flightData = TestFlightManagerScenario.Instance.GetFlightDataForPartName(Configuration);
56+
float flightData = core.GetFlightData();
5757
if (flightData < 0f)
5858
flightData = 0f;
5959

0 commit comments

Comments
 (0)