Skip to content

Commit

Permalink
Update for 1.7.1
Browse files Browse the repository at this point in the history
  • Loading branch information
sswelm committed Mar 30, 2016
1 parent 876f18c commit bb25708
Show file tree
Hide file tree
Showing 22 changed files with 102 additions and 250 deletions.
1 change: 1 addition & 0 deletions FNPlugin/Extensions/OrbitExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public static void Perturb(this Orbit orbit, Vector3d deltaVV, double universalT
// Transpose deltaVV Y and Z to match orbit frame
Vector3d deltaVV_orbit = deltaVV.xzy;
Vector3d position = orbit.getRelativePositionAtUT(universalTime);

Orbit orbit2 = orbit.Clone();
orbit2.UpdateFromStateVectors(position, orbit.getOrbitalVelocityAtUT(universalTime) + deltaVV_orbit, orbit.referenceBody, universalTime);
if (!double.IsNaN(orbit2.inclination) && !double.IsNaN(orbit2.eccentricity) && !double.IsNaN(orbit2.semiMajorAxis) && orbit2.timeToAp > deltaTime)
Expand Down
4 changes: 2 additions & 2 deletions FNPlugin/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.7.0.0")]
[assembly: AssemblyFileVersion("1.7.0.0")]
[assembly: AssemblyVersion("1.7.1.0")]
[assembly: AssemblyFileVersion("1.7.1.0")]
8 changes: 4 additions & 4 deletions FNPlugin/Propulsion/InterstellarMagneticNozzleControllerFX.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace FNPlugin
class InterstellarMagneticNozzleControllerFX : FNResourceSuppliableModule
{
//Persistent False
[KSPField(isPersistant = false, guiActive = true, guiActiveEditor = true, guiUnits = "m")]
[KSPField(isPersistant = false, guiActive = false, guiActiveEditor = true, guiUnits = "m")]
public float radius;
[KSPField(isPersistant = false, guiActive = false, guiActiveEditor = true, guiUnits = " t")]
public float partMass;
Expand All @@ -26,13 +26,13 @@ class InterstellarMagneticNozzleControllerFX : FNResourceSuppliableModule
private float _max_charged_particles_power;
[KSPField(isPersistant = false, guiActive = false, guiActiveEditor = false, guiName = "Requested Particles", guiUnits = " MW")]
private float _charged_particles_requested;
[KSPField(isPersistant = false, guiActive = true, guiActiveEditor = false, guiName = "Recieved Particles", guiUnits = " MW")]
[KSPField(isPersistant = false, guiActive = false, guiActiveEditor = false, guiName = "Recieved Particles", guiUnits = " MW")]
private float _charged_particles_received;
[KSPField(isPersistant = false, guiActive = false, guiActiveEditor = false, guiName = "Requested Electricity", guiUnits = " MW")]
private float _requestedElectricPower;
[KSPField(isPersistant = false, guiActive = true, guiActiveEditor = false, guiName = "Recieved Electricity", guiUnits = " MW")]
[KSPField(isPersistant = false, guiActive = false, guiActiveEditor = false, guiName = "Recieved Electricity", guiUnits = " MW")]
private float _recievedElectricPower;
[KSPField(isPersistant = false, guiActive = true, guiActiveEditor = false, guiName = "Max Thrust", guiUnits = " kN")]
[KSPField(isPersistant = false, guiActive = false, guiActiveEditor = false, guiName = "Max Thrust", guiUnits = " kN")]
private float _engineMaxThrust;
[KSPField(isPersistant = false, guiActive = true, guiName = "Free")]
private double _hydrogenProduction;
Expand Down
6 changes: 4 additions & 2 deletions FNPlugin/Propulsion/ModuleEnginesWarp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ public class ModuleEnginesWarp : ModuleEnginesFX
[KSPField(guiActive = true, guiName = "Warp Throttle")]
protected string Throttle = "";

[KSPField(guiActive = true, guiName = "Demand")]
[KSPField(guiActive = false, guiName = "Demand")]
public double propellantUsed;

//[KSPField(guiActive = false, guiName = "Calc Flow")]
//public double calcualtedFlow;

[KSPField(guiActive = true, guiName = "Mass Flow")]
[KSPField(guiActive = false, guiName = "Mass Flow")]
public double requestedFlow;

// Numeric display values
Expand Down Expand Up @@ -138,8 +138,10 @@ public override void OnFixedUpdate()
Vector3d thrustV = this.part.transform.up; // Thrust direction
Vector3d deltaVV = deltaV * thrustV; // DeltaV vector
vessel.orbit.Perturb(deltaVV, UT, TimeWarp.fixedDeltaTime); // Update vessel orbit
//this.rigidbody.AddRelativeForce(deltaVV, ForceMode.Impulse);
}
// Otherwise, if throttle is turned on, and demand out is 0, show warning

else if (ThrottlePersistent > 0)
{
Debug.Log("Propellant depleted");
Expand Down
192 changes: 0 additions & 192 deletions FNPlugin/Propulsion/ModuleEnginesWarpvISTA.cs

This file was deleted.

1 change: 0 additions & 1 deletion FNPlugin/WarpPlugin.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@
<Compile Include="Propulsion\AlcubierreDrive.cs" />
<Compile Include="Propulsion\Contract\IEngineNoozle.cs" />
<Compile Include="Propulsion\ExtendedPropellant.cs" />
<Compile Include="Propulsion\ModuleEnginesWarpVista.cs" />
<Compile Include="Propulsion\ModuleEnginesWarp.cs" />
<Compile Include="Propulsion\FNModuleRCSFX.cs" />
<Compile Include="Propulsion\FNRCSSounds.cs" />
Expand Down
42 changes: 23 additions & 19 deletions GameData/WarpPlugin/ChangeLog.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
KSPI 1.7.0

- Added Magneto Inertial Fusion Rocket Engine (Artist nli2work)
- Added Tokamak Engine, which Conbines Fusuin Reactor with integrated Magnetic Noozle (Credids for SilverSilver for retexture)
- Added XI Fusion Reactor which combines a Magnetic Confinement Reactor with Direct Energy Converter
- Added Half Size Wrap Radiator (Artist PorcJet)
- Added 4 additional techlevel to Interstellar Radiators which are unlock by CTT heat management tech nodes
- Improve Compatibilty with Navigation tools like MechJeb and Better Burn prediction (Thanks to RxTen1)
- Increased Isp of open cycle Gas Core Reactor
- Thermal Nozzle with Isp higher than 3000s will function as a magnetic nozzle and therefore will not be effecive withing admospheres
- Science Lab now requires MegaWatt power to convert science data into reseach data
- Mass Energy Geenrator depends on Power output reactor and Technology
- Direct Energy Converter now requires High Tech Electric Systems to be unlocked
- Increased Volume Fusion Reactor, Incresed Mass and Reduced Initial Power Output
- Fusion Reactors now has up to 5 techlevels
- Merged Dumbo and Solid Core Reactor (NERVA) which now has 5 tech levels
- Reduced Initial Power Output Pebble Bed Reactor but added 2 additional tech levels
- Fusion Mode proton-Boron11 now required Exotic Fusion Tech
- Darkened Wrapped Radiators
KSPI 1.7.0 Released on 2016-03-28


Added Magneto Inertial Fusion Rocket Engine (Artist nli2work)
Added Tokamak Engine, which Combines Fusion Reactor with integrated Magnetic Nozzle (Credits for SilverSilver for re-texture)
Added XI Fusion Reactor which combines a Magnetic Confinement Reactor with Direct Energy Converter
Added Half Size Wrap Radiator (Artist PorkJet)
Added 4 additional tech-level to Interstellar Radiators which are unlock by CTT heat management tech nodes
Moved initial ViSTA engine to exotic fusion
Improve Compatibility with Navigation tools like MechJeb and Better Burn prediction (Thanks to RxTen1)
Increased Isp of open cycle Gas Core Reactor
Increased Maximum WArp speed to 1000 time speed of light
Thermal Nozzle with Isp higher than 3000s will function as a magnetic nozzle and therefore will not be effective withing atmospheres
Science Lab now requires Megawatt power to convert science data into research data
Mass Energy Generator depends on Power output reactor and Technology
Direct Energy Converter now requires High Tech Electric Systems to be unlocked
Increased Volume Fusion Reactor, Increased Mass and Reduced Initial Power Output
Fusion Reactors now has up to 5 tech-levels
Merged Dumbo and Solid Core Reactor (NERVA) which now has 5 tech levels
Reduced Initial Power Output Pebble Bed Reactor but added 2 additional tech levels
Fusion Mode proton-Boron11 now required Exotic Fusion Tech
Darkened Wrapped Radiators




Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ MODEL
scale = 1,1.5,1
}


node_stack_top = 0.0, 1.4625, 0.0, 0.0, 1.0, 0.0, 2
node_stack_bottom = 0.0, -1.4625, 0.0, 0.0, -1.0, 0.0, 2

Expand Down Expand Up @@ -44,10 +43,8 @@ MODULE
name = InterstellarFissionMSRGC
ReactorTemp = 29455
PowerOutput = 3000
PowerOutputExponent = 3.2
upgradedReactorTemp = 58910
upgradedPowerOutput = 4500
upgradedPowerOutputExponent = 3.2
originalName = Gas Core Reactor Mk1
upgradedName = Gas Core Reactor Mk2
upgradeTechReq = exoticNuclearPropulsion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ entryCost = 600000
cost = 542200 // 300000 + 280 * (865)
category = none
subcategory = 0
title = Open Cycle Gas Core Reactor
title = Open Cycle Gas Core Reactor (legacy)
manufacturer = Kerbin Electric Inc.
description = Nuclear gas-core-reactor rockets can provide much higher specific impulse than solid core nuclear rockets because their temperature limitations are in the nozzle and core wall structural temperatures, which are distanced from the hottest regions of the gas core. Consequently, nuclear gas core reactors can provide much higher temperatures to the propellant. Solid core nuclear thermal rockets can develop higher specific impulse than conventional chemical rockets due to the extreme power density of the reactor core, but their operating temperatures are limited by the maximum temperature of the solid core because the reactor's temperatures cannot rise above its components' lowest melting temperature. Due to the much higher temperatures achievable by the gaseous core design, it can deliver higher specific impulse and thrust than most other conventional nuclear designs. This translates into shorter mission transit times for future astronauts or larger payload fractions. Another important aspect to GCRs is the impact of the rocket acceleration on the containment of the fuel in the fuel bubble. A rocket acceleration of only 0.001 g (10 mm/s²) will cause buoyancy effects to decrease core containment by 35% if all other flow-rates are held constant from a zero g startup. Ultimately, the fuel-propellant flows will have to be throttled until the rocket approaches some sort of steady state

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PART
{
name = GasCoreReactorMk2
name = GasCoreReactorMk3
module = Part
author = Vap & Fractal

Expand Down
15 changes: 15 additions & 0 deletions GameData/WarpPlugin/Parts/Electrical/WarpDrive/WarpDrive.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,21 @@ RESOURCE
maxAmount = 50000
}
MODULE
{
name = ModuleReactionWheel
PitchTorque = 40
YawTorque = 40
RollTorque = 40
RESOURCE
{
name = ElectricCharge
rate = 4
}
}
MODULE
{
name = AlcubierreDrive
Expand Down
Loading

0 comments on commit bb25708

Please sign in to comment.