Merge pull request #201 from post-kerbin-mining-corporation/dev

Release 1.4.2
post-kerbin-mining-corporation · Oct 18, 2024 · ad59fbb · ad59fbb
2 parents bb1766e + d5082d2
commit ad59fbb
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 16 deletions.
diff --git a/GameData/FarFutureTechnologies/FFTSettings.cfg b/GameData/FarFutureTechnologies/FFTSettings.cfg
@@ -2,8 +2,5 @@
 FFTSETTINGS
 {
 	// Emit debug messages for modules
-	debugModules = True
-
-	// The cost of Antimatter per unit in science
-	antimatterScienceCostPerUnit = 1000.0
+	debugModules = False
 }
diff --git a/GameData/FarFutureTechnologies/Localization/en-us.cfg b/GameData/FarFutureTechnologies/Localization/en-us.cfg
@@ -540,8 +540,8 @@ Localization
     // UI/FACTORY
     // -----------------------
     #LOC_FFT_AntimatterManager_PanelTitle = Antimatter Tanks
-    #LOC_FFT_AntimatterManager_ScienceText = <<1>> Science
-    #LOC_FFT_AntimatterManager_AntimatterText = <<1>> Antimatter
+    #LOC_FFT_AntimatterManager_ScienceText = -<<1>> Science
+    #LOC_FFT_AntimatterManager_AntimatterText = +<<1>> Antimatter
     #LOC_FFT_AntimatterManager_DescriptionText = <color=#3c688a><b><<1>></b></color> Science is required to create enough Antimatter to load the tanks. Proceed?
 
     // SETTINGS

diff --git a/GameData/FarFutureTechnologies/Plugins/FarFutureTechnologies.dll b/GameData/FarFutureTechnologies/Plugins/FarFutureTechnologies.dll
diff --git a/GameData/FarFutureTechnologies/Versioning/FarFutureTechnologies.version b/GameData/FarFutureTechnologies/Versioning/FarFutureTechnologies.version
@@ -6,7 +6,7 @@
     {
         "MAJOR":1,
         "MINOR":4,
-        "PATCH":1,
+        "PATCH":2,
         "BUILD":0
     },
     "KSP_VERSION":

diff --git a/Source/FarFutureTechnologies/Modules/ModuleAntimatterTank.cs b/Source/FarFutureTechnologies/Modules/ModuleAntimatterTank.cs
@@ -171,14 +171,12 @@ void OnDestroy()
     /// </summary>
     protected void OnVesselRollout(ShipConstruct node)
     {
-      if (HighLogic.CurrentGame.Mode == Game.Modes.SCIENCE_SANDBOX || HighLogic.CurrentGame.Mode == Game.Modes.CAREER && FarFutureTechnologiesSettings_Antimatter.AntimatterCostsScience)
+      if ((HighLogic.CurrentGame.Mode == Game.Modes.SCIENCE_SANDBOX || HighLogic.CurrentGame.Mode == Game.Modes.CAREER) && FarFutureTechnologiesSettings_Antimatter.AntimatterCostsScience)
       {
         if (FarFutureTechnologySettings.DebugModules)
           Utils.Log(String.Format("[ModuleAntimatterTank]: Doing rollout actions"));
-        double shipAM = 0d;
-        double shipMaxAM = 0d;
-        // Determine need for power
-        part.GetConnectedResourceTotals(PartResourceLibrary.Instance.GetDefinition(FuelName).id, ResourceFlowMode.NO_FLOW, out shipAM, out shipMaxAM, true);
+
+        part.GetConnectedResourceTotals(PartResourceLibrary.Instance.GetDefinition(FuelName).id, ResourceFlowMode.NO_FLOW, out double shipAM, out double shipMaxAM, true);
 
         double amToAdd = shipAM;
         // Clean out the AM

diff --git a/Source/FarFutureTechnologies/UI/AntimatterWindow.cs b/Source/FarFutureTechnologies/UI/AntimatterWindow.cs
@@ -67,8 +67,8 @@ public void AddTank( float amount)
       totalAntimatterLoad += amount;
       totalScienceCost = FarFutureTechnologiesSettings_Antimatter.AntimatterScienceCostPerUnit * totalAntimatterLoad;
 
-      scienceText.text = Localizer.Format("#LOC_FFT_AntimatterManager_ScienceText", totalScienceCost.ToString("+F0;-F0;0"));
-      antimatterText.text = Localizer.Format("#LOC_FFT_AntimatterManager_AntimatterText", totalAntimatterLoad.ToString("+0;-0;0"));
+      scienceText.text = Localizer.Format("#LOC_FFT_AntimatterManager_ScienceText", totalScienceCost.ToString("F2"));
+      antimatterText.text = Localizer.Format("#LOC_FFT_AntimatterManager_AntimatterText", totalAntimatterLoad.ToString("F2"));
       descriptionText.text = Localizer.Format("#LOC_FFT_AntimatterManager_DescriptionText", totalScienceCost.ToString());
     }
   }

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,9 @@
+1.4.2
+-----
+- Fixed Antimatter Costs Science setting only working in Career vs Science mode
+- Fixed an extra F in the Antimatter Loading window and tweaked the decimals displayed
+- Removed antimatter cost from settings config file in case it confuses people
+
 1.4.1
 -----
 - Updated Waterfall to 0.10.3

diff --git a/readme.txt b/readme.txt
@@ -1,5 +1,5 @@
 =============================
-FAR FUTURE TECHNOLOGIES 1.4.0
+FAR FUTURE TECHNOLOGIES 1.4.2
 =============================
 
 This is a pack containing far-future but likely possible spacecraft technologies. These might not be possible today, but the physics works out, and might be feasible within the next 100 years.
@@ -15,7 +15,7 @@ Required:
 - CryoTanks (1.6.6)
 - DynamicBatteryStorage (2.3.3)
 - SystemHeat (0.7.5)
-- Waterfall (0.10.2)
+- Waterfall (0.10.3)
 - SpaceDust (0.5.4)
 
 Recommended