diff --git a/GameData/Interstellar/Parts/Electrical/AntimatterCollector/AntimatterCollector.cfg b/GameData/Interstellar/Parts/Electrical/AntimatterCollector/AntimatterCollector.cfg index 6f914c40..77093067 100644 --- a/GameData/Interstellar/Parts/Electrical/AntimatterCollector/AntimatterCollector.cfg +++ b/GameData/Interstellar/Parts/Electrical/AntimatterCollector/AntimatterCollector.cfg @@ -11,7 +11,7 @@ rescaleFactor = 2 node_stack_top = 0.0, 0.42856, 0.0, 0.0, 1.0, 0.0, 2 node_stack_bottom = 0.0, -0.4357, 0.0, 0.0, 1.0, 0.0, 2 -TechRequired = experimentalScience +TechRequired = interstellarTechAccelerator entryCost = 20000 cost = 100000 category = Utility diff --git a/GameData/Interstellar/Parts/Electrical/AntimatterReactor/AntimatterReactor.cfg b/GameData/Interstellar/Parts/Electrical/AntimatterReactor/AntimatterReactor.cfg index 6a2f3193..20cbd194 100644 --- a/GameData/Interstellar/Parts/Electrical/AntimatterReactor/AntimatterReactor.cfg +++ b/GameData/Interstellar/Parts/Electrical/AntimatterReactor/AntimatterReactor.cfg @@ -11,7 +11,7 @@ node_stack_top = 0.0, 1.2665, 0.0, 0.0, 1.0, 0.0, 2 node_stack_bottom = 0.0, -1.2665, 0.0, 0.0, 1.0, 0.0, 2 node_attach = 0.0, 0.0, 1.4, 0.0, 0.0, -1.0, 1 -TechRequired = experimentalRocketry +TechRequired = interstellarTechAntimatterPower entryCost = 16000 cost = 160000 category = Utility diff --git a/GameData/Interstellar/Parts/Electrical/DeployableRadiator/DeployableRadiator.cfg b/GameData/Interstellar/Parts/Electrical/DeployableRadiator/DeployableRadiator.cfg index 853d87d2..3b0f3464 100644 --- a/GameData/Interstellar/Parts/Electrical/DeployableRadiator/DeployableRadiator.cfg +++ b/GameData/Interstellar/Parts/Electrical/DeployableRadiator/DeployableRadiator.cfg @@ -19,7 +19,7 @@ entryCost = 40 cost = 400 category = Utility subcategory = 0 -title = Small Heat Radiator +title = Deployable Radiator manufacturer = Boltzkerman Co. description = Radiates heat into space via the Stefan-Boltzkerman law. // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision diff --git a/GameData/Interstellar/Parts/Electrical/FusionReactor/FusionReactor.cfg b/GameData/Interstellar/Parts/Electrical/FusionReactor/FusionReactor.cfg index 39cb8cff..93e0a8fd 100644 --- a/GameData/Interstellar/Parts/Electrical/FusionReactor/FusionReactor.cfg +++ b/GameData/Interstellar/Parts/Electrical/FusionReactor/FusionReactor.cfg @@ -17,7 +17,7 @@ node_stack_top = 0.0, 1.5, 0.0, 0.0, 1.0, 0.0, 2 node_stack_bottom = 0.0, -1.5, 0.0, 0.0, 1.0, 0.0, 2 node_attach = 1.25, 0.0, 0.0, 1.0, 0.0, 0.0, 1 -TechRequired = experimentalRocketry +TechRequired = interstellarTechFusionPower entryCost = 8000 cost = 80000 category = Utility diff --git a/GameData/Interstellar/Parts/Engines/Vista/Vista.cfg b/GameData/Interstellar/Parts/Engines/Vista/Vista.cfg index b4600ce3..ac8174ce 100644 --- a/GameData/Interstellar/Parts/Engines/Vista/Vista.cfg +++ b/GameData/Interstellar/Parts/Engines/Vista/Vista.cfg @@ -1,6 +1,6 @@ PART { -name = vista +name = Vista module = Part author = Fractal @@ -22,7 +22,7 @@ sound_rocket_hard = running sound_vent_soft = disengage sound_explosion_low = flameout -TechRequired = experimentalRocketry +TechRequired = interstellarTechFusionPower2 entryCost = 200 cost = 2000 category = Propulsion diff --git a/GameData/Interstellar/Parts/FuelTank/AntimatterTank/AntimatterTank.cfg b/GameData/Interstellar/Parts/FuelTank/AntimatterTank/AntimatterTank.cfg index 6def7f4b..a18ea1ac 100644 --- a/GameData/Interstellar/Parts/FuelTank/AntimatterTank/AntimatterTank.cfg +++ b/GameData/Interstellar/Parts/FuelTank/AntimatterTank/AntimatterTank.cfg @@ -10,7 +10,7 @@ rescaleFactor = 1.0 node_stack_top = 0.0, 0.7231, 0.0, 0.0, 1.0, 0.0, 2 node_stack_bottom = 0.0, -0.315, 0.0, 0.0, 1.0, 0.0, 2 -TechRequired = experimentalScience +TechRequired = interstellarTechAccelerator entryCost = 200 cost = 2000 category = Propulsion diff --git a/GameData/Interstellar/Parts/Utility/AtmosphericScoop/AtmosphericScoop.cfg b/GameData/Interstellar/Parts/Utility/AtmosphericScoop/AtmosphericScoop.cfg index dbf48d61..c451dbc7 100644 --- a/GameData/Interstellar/Parts/Utility/AtmosphericScoop/AtmosphericScoop.cfg +++ b/GameData/Interstellar/Parts/Utility/AtmosphericScoop/AtmosphericScoop.cfg @@ -1,7 +1,7 @@ PART { // --- general parameters --- - name = Atmospheric Scoop + name = AtmosphericScoop module = Part author = zzz diff --git a/GameData/Interstellar/Parts/Utility/DeployablePhasedArray/DeployablePhasedArray.cfg b/GameData/Interstellar/Parts/Utility/DeployablePhasedArray/DeployablePhasedArray.cfg index 4238b296..9d392cdb 100644 --- a/GameData/Interstellar/Parts/Utility/DeployablePhasedArray/DeployablePhasedArray.cfg +++ b/GameData/Interstellar/Parts/Utility/DeployablePhasedArray/DeployablePhasedArray.cfg @@ -1,6 +1,6 @@ PART { -name = phasedArray1 +name = DeployablePhasedArray module = Part author = Fractal diff --git a/GameData/Interstellar/Patches/KSPIEMMPatches.txt b/GameData/Interstellar/Patches/KSPIEMMPatches.txt new file mode 100644 index 00000000..536686c2 --- /dev/null +++ b/GameData/Interstellar/Patches/KSPIEMMPatches.txt @@ -0,0 +1,51 @@ +@PART[DeployableRadiator] +{ + title = Deployable Radiator +} + +@PART[Atmospheric Scoop] +{ + name = AtmosphericScoop +} + +@PART[vista] +{ + name = Vista + TechRequied = interstellarTechFusionPower2 +} + +@PART[FNDeuteriumCryostat] +{ + name = DeuteriumCryostat + !MODULE[ModuleElementRadioactiveDecay] +} + +@PART[RVDeutTrit] +{ + !MODULE[ModuleElementRadioactiveDecay] +} + +@PART[phasedArray1] +{ + name = DeployablePhasedArray +} + +@PART[FusionReactor] +{ +TechRequied = interstellarTechFusionPower +} + +@PART[AntimatterTank] +{ +TechRequied = interstellarTechAccelerator +} + +@PART[AntimatterCollector] +{ +TechRequied = interstellarTechAccelerator +} + +@PART[AntimatterReactor] +{ +TechRequied = interstellarTechAntimatterPower +} diff --git a/GameData/Interstellar/tree.cfg b/GameData/Interstellar/tree.cfg index 68e6421b..fcb597cd 100644 --- a/GameData/Interstellar/tree.cfg +++ b/GameData/Interstellar/tree.cfg @@ -1,6 +1,6 @@ VERSION { - id = 1 + id = 2 } NODE @@ -16,11 +16,7 @@ NODE hideIfEmpty = False parents = node6_nuclearPropulsion,node7_metaMaterials PARTS - { - name = FNFissionFusionCatReactor - name = FusionReactor250 - name = FusionReactor375 - + { } } NODE @@ -37,9 +33,6 @@ NODE parents = newnode_7144 PARTS { - name = FusionReactor0625 - name = FusionReactor125 - name = vista } } NODE @@ -56,10 +49,6 @@ NODE parents = node7_advScienceTech PARTS { - name = AntimatterCollector - name = AntimatterTank125 - name = AntimatterTank250 - name = AntimatterTank375 } } NODE @@ -76,9 +65,6 @@ NODE parents = node8_experimentalElectrics,newnode_9820,newnode_71440 PARTS { - name = AntimatterReactor125 - name = AntimatterReactor250 - name = AntimatterReactor375 } } NODE @@ -95,9 +81,6 @@ NODE parents = newnode_5951 PARTS { - name = WarpDrive - name = WarpDrive2 - name = WarpDrive3 } } NODE @@ -130,7 +113,6 @@ NODE parents = node7_advUnmanned PARTS { - name = computerCore } } NODE @@ -211,10 +193,6 @@ NODE parents = node7_specializedElectrics PARTS { - name = microwaveThermalEnergyReceiverL - name = microwaveThermalEnergyReceiverM - name = microwaveThermalEnergyReceiverS - name = phasedArray1 } } NODE @@ -263,11 +241,6 @@ NODE parents = node5_supersonicFlight PARTS { - name = noseConeAdapter - name = standardNoseCone - name = wingConnector - name = structuralPylon - name = structuralWing } } NODE @@ -284,13 +257,6 @@ NODE parents = node6_electronics,node6_fieldScience PARTS { - name = avionicsNoseCone - name = sensorGravimeter - name = scienceModule - name = FNGCMS - name = FNInlineRefinery - name = FNLCMS - name = FNRefinery } } NODE @@ -307,9 +273,6 @@ NODE parents = node6_unmannedTech,node6_largeElectrics PARTS { - name = probeCoreCube - name = probeStackLarge - name = probeStackSmall } } NODE @@ -326,10 +289,6 @@ NODE parents = node6_largeElectrics,node6_electronics PARTS { - name = batteryBankLarge - name = rtg - name = microwaveReceiver - name = microwaveTransmitter } } NODE @@ -346,7 +305,6 @@ NODE parents = node4_advConstruction PARTS { - name = GrapplingDevice } } NODE @@ -363,14 +321,6 @@ NODE parents = node6_highAltitudeFlight,node6_advAerodynamics PARTS { - name = AdvancedCanard - name = CanardController - name = RAPIER - name = toroidalAerospike - name = atmosphericScoop - name = atmosphericScoop2 - name = radial.atmospheric.scoop1 - name = radial.atmospheric.scoop2 } } NODE @@ -387,8 +337,6 @@ NODE parents = node6_fieldScience PARTS { - name = roverWheel3 - name = wheelMed } } NODE @@ -405,13 +353,6 @@ NODE parents = node5_actuators,node5_specializedConstruction PARTS { - name = trussPiece3x - name = dockingPort3 - name = stackPoint1 - name = stackQuadCoupler - name = stackSeparator - name = stackSeparatorBig - name = stackSeparatorMini } } NODE @@ -428,10 +369,6 @@ NODE parents = node5_specializedControl PARTS { - name = LaunchEscapeSystem - name = cupola - name = mk2LanderCabin - name = RCSTank1-2 } } NODE @@ -448,8 +385,6 @@ NODE parents = node5_precisionEngineering PARTS { - name = probeCoreHex - name = probeCoreOcto2 } } NODE @@ -466,13 +401,6 @@ NODE parents = node5_supersonicFlight,node4_advFlightControl PARTS { - name = turboFanEngine - name = smallHardpoint - name = ramAirIntake - name = ThermalTurbojet - name = ThermalTurbojet2 - name = warpAtmIntake - name = warpAtmIntake2 } } NODE @@ -489,14 +417,6 @@ NODE parents = node5_advElectrics PARTS { - name = commDish - name = sensorAccelerometer - name = FNDeuteriumCryostat - name = FNHeliumCryostat - name = FNIRTelescope - name = DTMagnetometer - name = sensorGammaRaySpectrometer - name = sensorGammaRaySpectrometer2 } } NODE @@ -513,15 +433,6 @@ NODE parents = node5_advElectrics PARTS { - name = batteryBank - name = largeSolarPanel - name = Brayton2 - name = Brayton3 - name = Brayton1 - name = tinyBrayton - name = radiator0 - name = radiator1 - name = radiator2 } } NODE @@ -538,12 +449,6 @@ NODE parents = node4_aerodynamicSystems PARTS { - name = deltaWing - name = mk2Fuselage - name = mk2SpacePlaneAdapter - name = nacelleBody - name = radialEngineBody - name = CircularIntake } } NODE @@ -560,15 +465,6 @@ NODE parents = node5_heavierRocketry,node6_largeControl PARTS { - name = Size3AdvancedEngine - name = size3Decoupler - name = Size3EngineCluster - name = Size3LargeTank - name = Size3MediumTank - name = Size3SmallTank - name = Size3to2Adapter - name = AluminiumHybrid1 - name = 375PureLiquidTank } } NODE @@ -585,15 +481,6 @@ NODE parents = node5_precisionEngineering,node5_advElectrics PARTS { - name = ionEngine - name = xenonTank - name = xenonTankRadial - name = FNSmallerAugmentedArcjet - name = FNSmallAugmentedArcjet - name = smallerMPD - name = smallMPD - name = MPD - name = BigXenonTank } } NODE @@ -610,22 +497,6 @@ NODE parents = node5_heavierRocketry,node5_specializedControl PARTS { - name = nuclearEngine - name = NuclearReactor375 - name = NuclearReactor250 - name = NuclearReactor0625 - name = NuclearReactor125 - name = FNPFissionReactor0625 - name = FNPFissionReactor125 - name = FNPFissionReactor250 - name = FNPFissionReactor375 - name = smallerThermalRocketNozzle - name = smallThermalRocketNozzle - name = ThermalRocketNozzle - name = bigThermalRocketNozzle - name = FNAntimatterBottle - name = HexCanDeutTritLarge - name = HexCanHe3Large } } NODE @@ -642,10 +513,6 @@ NODE parents = node5_advExploration,node5_advLanding PARTS { - name = seatExternalCmd - name = roverBody - name = roverWheel1 - name = roverWheel2 } } NODE @@ -662,14 +529,6 @@ NODE parents = node6_advMetalWorks PARTS { - name = structuralIBeam1 - name = structuralIBeam2 - name = structuralIBeam3 - name = structuralMiniNode - name = structuralPanel1 - name = structuralPanel2 - name = strutCube - name = strutOcto } } NODE @@ -686,10 +545,6 @@ NODE parents = node6_advMetalWorks,node6_advAerodynamics PARTS { - name = rocketNoseCone - name = mark3Cockpit - name = mk3Fuselage - name = mk3spacePlaneAdapter } } NODE @@ -706,13 +561,6 @@ NODE parents = node6_advMetalWorks,node6_largeControl PARTS { - name = adapterLargeSmallBi - name = adapterLargeSmallQuad - name = adapterLargeSmallTri - name = stationHub - name = dockingPortLarge - name = dockingPortLateral - name = SM-Solar-Sail } } NODE @@ -729,8 +577,6 @@ NODE parents = node4_landing PARTS { - name = landingLeg1-2 - name = parachuteDrogue } } NODE @@ -747,14 +593,6 @@ NODE parents = node3_generalConstruction,node3_flightControl PARTS { - name = StandardCtrlSrf - name = airplaneTail - name = smallCtrlSrf - name = sweptWing - name = tailfin - name = JetEngine - name = MK1Fuselage - name = airScoop } } NODE @@ -771,13 +609,6 @@ NODE parents = node4_advConstruction PARTS { - name = crewCabin - name = adapterSmallMiniShort - name = adapterSmallMiniTall - name = trussAdapter - name = dockingPort1 - name = dockingPort2 - name = stackBiCoupler } } NODE @@ -794,10 +625,6 @@ NODE parents = node4_heavyRocketry,node4_fuelSystems PARTS { - name = Size2LFB - name = liquidEngine1-2 - name = fuelTank3-2 - name = 25PureLiquidTank } } NODE @@ -814,12 +641,6 @@ NODE parents = node4_fuelSystems,node4_advConstruction PARTS { - name = asasmodule1-2 - name = landerCabinSmall - name = Mark1-2Pod - name = rcsTankRadialLong - name = linearRcs - name = parachuteLarge } } NODE @@ -836,17 +657,6 @@ NODE parents = node4_electrics PARTS { - name = ksp.r.largeBatteryPack - name = solarPanels1 - name = solarPanels2 - name = solarPanels3 - name = solarPanels4 - name = circradiatorKT - name = circradiatorKT2 - name = circradiatorKT3 - name = LargeFlatRadiator - name = RadialRadiatorzzz - name = RadialRadiatorzzz2 } } NODE @@ -863,13 +673,6 @@ NODE parents = node4_advFlightControl,node4_electrics PARTS { - name = microEngine - name = radialEngineMini - name = smallRadialEngine - name = miniFuelTank - name = rcsTankMini - name = toroidalFuelTank - name = stackDecouplerMini } } NODE @@ -886,9 +689,6 @@ NODE parents = node4_electrics,node4_spaceExploration PARTS { - name = sensorBarometer - name = telescopicLadder - name = telescopicLadderBay } } NODE @@ -905,11 +705,6 @@ NODE parents = node3_advRocketry,node3_generalConstruction PARTS { - name = liquidEngineMini - name = radialRCSTank - name = RCSFuelTank - name = fuelLine - name = RCSBlock } } NODE @@ -926,11 +721,6 @@ NODE parents = node3_advRocketry PARTS { - name = MassiveBooster - name = engineLargeSkipper - name = liquidEngine2-2 - name = fuelTank1-2 - name = fuelTank2-2 } } NODE @@ -947,8 +737,6 @@ NODE parents = node3_scienceTech PARTS { - name = miniLandingLeg - name = SmallGearBay } } NODE @@ -965,9 +753,6 @@ NODE parents = node3_scienceTech PARTS { - name = Large.Crewed.Lab - name = ladder1 - name = sensorThermometer } } NODE @@ -984,10 +769,6 @@ NODE parents = node3_flightControl,node3_scienceTech PARTS { - name = batteryBankMini - name = solarPanels5 - name = spotLight1 - name = spotLight2 } } NODE @@ -1004,10 +785,6 @@ NODE parents = node3_flightControl PARTS { - name = winglet3 - name = advSasModule - name = Mark2Cockpit - name = probeCoreOcto } } NODE @@ -1024,12 +801,6 @@ NODE parents = node3_generalConstruction PARTS { - name = fuelTank4-2 - name = Mk1FuselageStructural - name = decoupler1-2 - name = largeAdapter - name = largeAdapter2 - name = radialDecoupler1-2 } } NODE @@ -1046,10 +817,6 @@ NODE parents = node2_stability,node2_survivability PARTS { - name = R8winglet - name = Mark1Cockpit - name = probeCoreSphere - name = sasModule } } NODE @@ -1066,10 +833,6 @@ NODE parents = node2_generalRocketry,node2_stability PARTS { - name = strutConnector - name = launchClamp1 - name = radialDecoupler2 - name = stackTriCoupler } } NODE @@ -1086,9 +849,6 @@ NODE parents = node2_survivability PARTS { - name = batteryPack - name = science.module - name = mediumDishAntenna } } NODE @@ -1105,8 +865,6 @@ NODE parents = node2_generalRocketry PARTS { - name = radialLiquidEngine1-2 - name = fuelTank.long } } NODE @@ -1123,9 +881,6 @@ NODE parents = node1_basicRocketry PARTS { - name = noseCone - name = winglet - name = radialDecoupler } } NODE @@ -1142,10 +897,6 @@ NODE parents = node0_start PARTS { - name = fuelTank - name = fuelTankSmallFlat - name = GooExperiment - name = stackDecoupler } } NODE @@ -1162,9 +913,6 @@ NODE parents = node1_basicRocketry PARTS { - name = liquidEngine3 - name = landingLeg1 - name = parachuteRadial } } NODE @@ -1181,9 +929,6 @@ NODE parents = node1_basicRocketry PARTS { - name = liquidEngine2 - name = sepMotor1 - name = solidBooster1-1 } } NODE @@ -1200,21 +945,5 @@ NODE parents = PARTS { - name = mk1pod - name = liquidEngine - name = solidBooster - name = fuelTankSmall - name = trussPiece1x - name = longAntenna - name = parachuteSingle - name = FNAmmoniaTank - name = FNLiquidWaterTank - name = HexCanLithium - name = HexCanThoriumFl4 - name = HexCanUraniumFl6 - name = HexCanUraniumN - name = AntimatterDevTank125 - name = AntimatterDevTank250 - name = AntimatterDevTank375 } } diff --git a/InterstellarPlugin/PluginHelper.cs b/InterstellarPlugin/PluginHelper.cs index 57fa1d67..921fe9a7 100644 --- a/InterstellarPlugin/PluginHelper.cs +++ b/InterstellarPlugin/PluginHelper.cs @@ -433,6 +433,26 @@ public void Update() { } } + if (!prefab_available_part.Resources.Contains("Megajoules") && panel.chargeRate > 0) + { + ConfigNode node = new ConfigNode("RESOURCE"); + node.AddValue("name", "Megajoules"); + node.AddValue("maxAmount", panel.chargeRate); + node.AddValue("amount", 0); + PartResource pr = prefab_available_part.AddResource(node); + + if (available_part.resourceInfo != null && pr != null) + { + if (available_part.resourceInfo.Length == 0) + { + available_part.resourceInfo = pr.resourceName + ":" + pr.amount + " / " + pr.maxAmount; + } + else + { + available_part.resourceInfo = available_part.resourceInfo + "\n" + pr.resourceName + ":" + pr.amount + " / " + pr.maxAmount; + } + } + } } if(prefab_available_part.FindModulesImplementing().Count() > 0) { diff --git a/OpenResourceSystem/ORSPlanetaryResourceMapData.cs b/OpenResourceSystem/ORSPlanetaryResourceMapData.cs index 3ef666b7..d4c748bf 100644 --- a/OpenResourceSystem/ORSPlanetaryResourceMapData.cs +++ b/OpenResourceSystem/ORSPlanetaryResourceMapData.cs @@ -372,7 +372,7 @@ protected static bool lineOfSightToPosition(Vector3d a, CelestialBody referenceB return true; } - public static Dictionary getPlaneteryResourceMapData { get { return body_resource_maps; } } + public static Dictionary getPlanetaryResourceMapData { get { return body_resource_maps; } } diff --git a/OpenResourceSystem/ORSResourceScanner.cs b/OpenResourceSystem/ORSResourceScanner.cs index 6945ef33..ccfe169f 100644 --- a/OpenResourceSystem/ORSResourceScanner.cs +++ b/OpenResourceSystem/ORSResourceScanner.cs @@ -41,8 +41,8 @@ public override void OnUpdate() { ORSPlanetaryResourceMapData.updatePlanetaryResourceMap(); if (resourceInfo == null) - if (ORSPlanetaryResourceMapData.getPlaneteryResourceMapData.ContainsKey(resourceName)) - resourceInfo = ORSPlanetaryResourceMapData.getPlaneteryResourceMapData[resourceName]; + if (ORSPlanetaryResourceMapData.getPlanetaryResourceMapData.ContainsKey(resourceName)) + resourceInfo = ORSPlanetaryResourceMapData.getPlanetaryResourceMapData[resourceName]; Events["DisplayResource"].active = Events["DisplayResource"].guiActive = !ORSPlanetaryResourceMapData.resourceIsDisplayed(resourceName) && mapViewAvailable; Events["DisplayResource"].guiName = "Display " + resourceName + " hotspots"; Events["HideResource"].active = Events["HideResource"].guiActive = ORSPlanetaryResourceMapData.resourceIsDisplayed(resourceName) && mapViewAvailable;