Merge pull request #17 from rakkhin/development

Power generation from mixed mode reactors/minor power transmission fix
confusingbits · Aug 16, 2014 · 5220eca · 5220eca
2 parents 980800f + 5f7ebfc
commit 5220eca
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/InterstellarPlugin/FNGenerator.cs b/InterstellarPlugin/FNGenerator.cs
@@ -341,9 +341,6 @@ class FNGenerator : FNResourceSuppliableModule, FNUpgradeableModule{
                     double thermal_power_currently_needed = electrical_power_currently_needed / totalEff;
                     double thermaldt = Math.Max(Math.Min(maxThermalPower, thermal_power_currently_needed) * TimeWarp.fixedDeltaTime, 0.0);
                     input_power = consumeFNResource(thermaldt, FNResourceManager.FNRESOURCE_THERMALPOWER);
-                    if (input_power < thermaldt) {
-                        input_power += consumeFNResource(thermaldt-input_power, FNResourceManager.FNRESOURCE_CHARGED_PARTICLES);
-                    }
                     double wastedt = input_power * totalEff;
                     consumeFNResource(wastedt, FNResourceManager.FNRESOURCE_WASTEHEAT);
                     electricdt = input_power * totalEff;
@@ -352,13 +349,13 @@ class FNGenerator : FNResourceSuppliableModule, FNUpgradeableModule{
                 } else {
                     totalEff = 0.85;
                     double charged_power_currently_needed = electrical_power_currently_needed / totalEff;
-                    input_power = consumeFNResource(Math.Max(charged_power_currently_needed*TimeWarp.fixedDeltaTime,0), FNResourceManager.FNRESOURCE_CHARGED_PARTICLES);
+                    double chageddt = Math.Max(Math.Min(maxChargedPower, charged_power_currently_needed) * TimeWarp.fixedDeltaTime, 0.0);
+                    input_power = consumeFNResource(chageddt, FNResourceManager.FNRESOURCE_CHARGED_PARTICLES);
+                    double wastedt = input_power * totalEff;
+                    consumeFNResource(wastedt, FNResourceManager.FNRESOURCE_WASTEHEAT);
                     electricdt = input_power * totalEff;
                     electricdtps = Math.Max(electricdt / TimeWarp.fixedDeltaTime, 0.0);
-                    double wastedt = input_power * totalEff;
                     max_electricdtps = maxChargedPower * totalEff;
-                    consumeFNResource(wastedt, FNResourceManager.FNRESOURCE_WASTEHEAT);
-                    //supplyFNResource(wastedt, FNResourceManager.FNRESOURCE_WASTEHEAT);
                 }
 				outputPower = -(float)supplyFNResourceFixedMax (electricdtps * TimeWarp.fixedDeltaTime, max_electricdtps * TimeWarp.fixedDeltaTime, FNResourceManager.FNRESOURCE_MEGAJOULES) / TimeWarp.fixedDeltaTime;
 			} else {

diff --git a/InterstellarPlugin/FNReactor.cs b/InterstellarPlugin/FNReactor.cs
@@ -443,7 +443,7 @@ public virtual float getThermalPowerAtTemp(float temp)
 
         public float getThermalPower()
         {
-            return ThermalPower;
+            return ThermalPower * (1 - chargedParticleRatio);
         }
 
         public float getChargedPower()

diff --git a/InterstellarPlugin/MicrowavePowerTransmitter.cs b/InterstellarPlugin/MicrowavePowerTransmitter.cs
@@ -178,14 +178,23 @@ class MicrowavePowerTransmitter : FNResourceSuppliableModule {
             solar_power = 0;
             displayed_solar_power = 0;
             if (IsEnabled && !relay) {
+                float fusionReactorsRequirements = 0.0f;
+
+                try
+                {
+                    fusionReactorsRequirements = vessel.FindPartModulesImplementing<FNFusionReactor>().Where(r => r.isActive()).Sum(r => r.powerRequirements);
+                }
+                catch (ArgumentNullException)
+                {
+                    fusionReactorsRequirements = 0.0f;
+                }
+
                 foreach (FNGenerator generator in generators) {
                     if (generator.isActive()) {
                         FNThermalSource thermal_source = generator.getThermalSource();
                         if (thermal_source != null && !thermal_source.isVolatileSource()) {
-                            double output = generator.getMaxPowerOutput();
-                            if (thermal_source is FNFusionReactor) {
-                                output = output * 0.95;
-                            }
+                            double output = -generator.getCurrentPower();
+                            output -= fusionReactorsRequirements / (double)generators.Count(g => g.isActive());
                             output = output * transmitPower / 100.0;
                             double gpower = consumeFNResource(output * TimeWarp.fixedDeltaTime, FNResourceManager.FNRESOURCE_MEGAJOULES);
                             nuclear_power += gpower * 1000 / TimeWarp.fixedDeltaTime;