diff --git a/Bureaucracy/Facilities/FacilityManager.cs b/Bureaucracy/Facilities/FacilityManager.cs index 544a919..e67ce29 100644 --- a/Bureaucracy/Facilities/FacilityManager.cs +++ b/Bureaucracy/Facilities/FacilityManager.cs @@ -145,14 +145,12 @@ public void StartUpgrade(UpgradeableFacility facility) if (facilityToUpgrade.IsPriority) { warningDialog = DrawWarningDialog(facilityToUpgrade); - } - else - { - Debug.Log("[Bureaucracy]: " + facility.id + " is already being upgraded. Prioritising"); - SetPriority(facilityToUpgrade, true); - ScreenMessages.PostScreenMessage("Upgrade of " + facilityToUpgrade.Name + " prioritised"); return; } + Debug.Log("[Bureaucracy]: " + facility.id + " is already being upgraded. Prioritising"); + SetPriority(facilityToUpgrade, true); + ScreenMessages.PostScreenMessage("Upgrade of " + facilityToUpgrade.Name + " prioritised"); + return; } facilityToUpgrade.StartUpgrade(facility); @@ -161,7 +159,7 @@ public void StartUpgrade(UpgradeableFacility facility) private PopupDialog DrawWarningDialog(BureaucracyFacility facility) { List dialogElements = new List(); - dialogElements.Add(new DialogGUILabel("Upgrade of "+facility.Name+" will be cancelled. "+(facility.Upgrade.RemainingInvestment-facility.Upgrade.OriginalCost+" will be lost. Are you sure?"))); + dialogElements.Add(new DialogGUILabel("Upgrade of "+facility.Name+" will be cancelled. "+(facility.Upgrade.OriginalCost-facility.Upgrade.RemainingInvestment+" will be lost. Are you sure?"))); dialogElements.Add(new DialogGUIButton("Yes", facility.CancelUpgrade, true)); dialogElements.Add(new DialogGUIButton("No", () => { }, true)); return PopupDialog.SpawnPopupDialog(new Vector2(0.5f, 0.5f), new Vector2(0.5f, 0.5f), new MultiOptionDialog("CancelUpgradeDialog", "", "Bureaucracy: Cancel Upgrade", UISkinManager.GetSkin("MainMenuSkin"), new Rect(0.5f, 0.5f, 210, 100), dialogElements.ToArray()), false, UISkinManager.GetSkin("MainMenuSkin")); diff --git a/GameData/Bureaucracy/Bureaucracy.version b/GameData/Bureaucracy/Bureaucracy.version index e4c78b7..aa954d3 100644 --- a/GameData/Bureaucracy/Bureaucracy.version +++ b/GameData/Bureaucracy/Bureaucracy.version @@ -11,7 +11,7 @@ { "MAJOR" : 1, "MINOR" : 1, - "PATCH" : 1, + "PATCH" : 2, "BUILD" : 0 }, "KSP_VERSION" : diff --git a/GameData/Bureaucracy/Changelog.cfg b/GameData/Bureaucracy/Changelog.cfg index 20b4909..326232a 100644 --- a/GameData/Bureaucracy/Changelog.cfg +++ b/GameData/Bureaucracy/Changelog.cfg @@ -3,6 +3,13 @@ KERBALCHANGELOG showChangelog = True modName = Bureaucracy + VERSION + { + version = 1.1.2 + change = Fixed issue where accidentally activating the Facilty Upgrade cancellation dialog would reset upgrade progress to 0. + change = Fixed Facility Upgrade dialog showing incorrect amount to be lost on cancellation. + } + VERSION { version = 1.1.1