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

Release 2.0.0
post-kerbin-mining-corporation · Sep 5, 2024 · f0b4d60 · f0b4d60
2 parents 52aba0e + 810109c
commit f0b4d60
Show file tree

Hide file tree

Showing 120 changed files with 5,339 additions and 1,290 deletions.
diff --git a/.gitignore b/.gitignore
@@ -345,3 +345,4 @@ deploy/
 build_scripts/version.txt
 build_scripts/changelog.md
 GameData/NearFutureElectrical/Parts/@thumbs
+GameData/NearFutureElectrical/Legacy/Parts/@thumbs
diff --git a/.mod_data.yml b/.mod_data.yml
@@ -8,18 +8,22 @@ package:
     - changelog.txt
 dependencies:  # Configure dependencies
   ModuleManager:
-    version: 4.1.3
+    version: 4.2.3
     location: s3
   B9PartSwitch:
-    version: 2.18.0
+    version: 2.20.0
     location: s3
   CommunityResourcePack:
     version: 1.4.2
     location: s3
   DynamicBatteryStorage:
-    tag: 2.2.4
+    tag: 2.3.3
     location: github
     repository: post-kerbin-mining-corporation/DynamicBatteryStorage
+  SystemHeat:
+    tag: 0.7.4
+    location: github
+    repository: post-kerbin-mining-corporation/SystemHeat
 deploy:
   SpaceDock:
     enabled: true  # activate/deactivate this deployment script

diff --git a/Extras/DecayingRTGs/NFElectricalRTGPatch.cfg b/Extras/DecayingRTGs/NFElectricalRTGPatch.cfg
@@ -1,125 +1,173 @@
 // Patches RTGs
 @PART[rtg-0625]:FOR[NearFutureElectrical]
 {
-	@cost *= 0.5
-	!MODULE[ModuleGenerator] {}
-    MODULE
-	{
-		name = ModuleRadioisotopeGenerator
-		BasePower = 3.0
-		HalfLife = 8.35
-		EasyMode = true
-	}
+  @cost *= 0.5
+  !MODULE[ModuleGenerator] {}
+  MODULE
+  {
+    name = ModuleRadioisotopeGenerator
+    BasePower = 3.0
+    HalfLife = 8.35
+    EasyMode = true
+  }
+}
+@PART[nfe-rtg-asrtg-1]:FOR[NearFutureElectrical]
+{
+  @cost *= 0.5
+  !MODULE[ModuleGenerator] {}
+  MODULE
+  {
+    name = ModuleRadioisotopeGenerator
+    BasePower = 2.0
+    HalfLife = 8.35
+    EasyMode = true
+  }
+}
+@PART[nfe-rtg-gphs-1]:FOR[NearFutureElectrical]
+{
+  @cost *= 0.5
+  !MODULE[ModuleGenerator] {}
+  MODULE
+  {
+    name = ModuleRadioisotopeGenerator
+    BasePower = 3.0
+    HalfLife = 8.35
+    EasyMode = true
+  }
+}
+@PART[nfe-rtg-mmrtg-1]:FOR[NearFutureElectrical]
+{
+  @cost *= 0.5
+  !MODULE[ModuleGenerator] {}
+  MODULE
+  {
+    name = ModuleRadioisotopeGenerator
+    BasePower = 2.0
+    HalfLife = 8.35
+    EasyMode = true
+  }
+}
+@PART[nfe-rtg-snap27-1]:FOR[NearFutureElectrical]
+{
+  @cost *= 0.5
+  !MODULE[ModuleGenerator] {}
+  MODULE
+  {
+    name = ModuleRadioisotopeGenerator
+    BasePower = 0.25
+    HalfLife = 8.35
+    EasyMode = true
+  }
 }
 @PART[rtg]:FOR[NearFutureElectrical]
 {
-	@cost *= 0.5
-	!MODULE[ModuleGenerator] {}
-    MODULE
-	{
-		name = ModuleRadioisotopeGenerator
-		BasePower = 0.75
-		HalfLife = 8.35
-		EasyMode = true
-	}
+  @cost *= 0.5
+  !MODULE[ModuleGenerator] {}
+  MODULE
+  {
+    name = ModuleRadioisotopeGenerator
+    BasePower = 0.75
+    HalfLife = 8.35
+    EasyMode = true
+  }
 }
 @PART[RLA_mmrtg]:FOR[NearFutureElectrical]
 {
-	@cost *= 0.5
-	!MODULE[ModuleGenerator] {}
-    MODULE
-	{
-		name = ModuleRadioisotopeGenerator
-		BasePower = 0.122
-		HalfLife = 8.35
-		EasyMode = true
-	}
+  @cost *= 0.5
+  !MODULE[ModuleGenerator] {}
+   ODULE
+  {
+    name = ModuleRadioisotopeGenerator
+    BasePower = 0.122
+    HalfLife = 8.35
+    EasyMode = true
+  }
 }
 @PART[utility-pod-25]:FOR[NearFutureElectrical]
 {
-	@cost *= 0.25
-	!MODULE[ModuleGenerator] {}
-    MODULE
-	{
-		name = ModuleRadioisotopeGenerator
-		BasePower = 0.45
-		HalfLife = 8.35
-		EasyMode = true
-	}
+  @cost *= 0.25
+  !MODULE[ModuleGenerator] {}
+  MODULE
+  {
+    name = ModuleRadioisotopeGenerator
+    BasePower = 0.45
+    HalfLife = 8.35
+    EasyMode = true
+  }
 }
 //Ven's Stock Revamp
 @PART[rtgMini]:FOR[NearFutureElectrical]
 {
-	@cost *= 0.5
-	!MODULE[ModuleGenerator] {}
-    MODULE
-	{
-		name = ModuleRadioisotopeGenerator
-		BasePower = 0.42
-		HalfLife = 8.35
-		EasyMode = true
-	}
+  @cost *= 0.5
+  !MODULE[ModuleGenerator] {}
+  MODULE
+  {
+    name = ModuleRadioisotopeGenerator
+    BasePower = 0.42
+    HalfLife = 8.35
+    EasyMode = true
+  }
 }
 //Prakasa Aeroworks
 @PART[prakGenerator]:FOR[NearFutureElectrical]
 {
-	@cost *= 0.5
-	!MODULE[ModuleGenerator] {}
-    MODULE
-	{
-		name = ModuleRadioisotopeGenerator
-		BasePower = 70
-		HalfLife = 8.35
-		EasyMode = true
-	}
+  @cost *= 0.5
+  !MODULE[ModuleGenerator] {}
+  MODULE
+  {
+    name = ModuleRadioisotopeGenerator
+    BasePower = 70
+    HalfLife = 8.35
+    EasyMode = true
+  }
 }
 @PART[prakGeneratorS1]:FOR[NearFutureElectrical]
 {
-	@cost *= 0.5
-	!MODULE[ModuleGenerator] {}
-    MODULE
-	{
-		name = ModuleRadioisotopeGenerator
-		BasePower = 10
-		HalfLife = 8.35
-		EasyMode = true
-	}
+  @cost *= 0.5
+  !MODULE[ModuleGenerator] {}
+  MODULE
+  {
+    name = ModuleRadioisotopeGenerator
+    BasePower = 10
+    HalfLife = 8.35
+    EasyMode = true
+  }
 }
 // SXT mod
 @PART[SXTDepolyRTGI]:FOR[NearFutureElectrical]
 {
-	@cost *= 0.5
-	!MODULE[ModuleGenerator] {}
-    MODULE
-	{
-		name = ModuleRadioisotopeGenerator
-		BasePower = 0.25
-		HalfLife = 8.35
-		EasyMode = true
-	}
+  @cost *= 0.5
+  !MODULE[ModuleGenerator] {}
+  MODULE
+  {
+    name = ModuleRadioisotopeGenerator
+    BasePower = 0.25
+    HalfLife = 8.35
+    EasyMode = true
+  }
 }
 @PART[SXTDepolyRTGII]:FOR[NearFutureElectrical]
 {
-	@cost *= 0.5
-	!MODULE[ModuleGenerator] {}
-    MODULE
-	{
-		name = ModuleRadioisotopeGenerator
-		BasePower = 0.25
-		HalfLife = 8.35
-		EasyMode = true
-	}
+  @cost *= 0.5
+  !MODULE[ModuleGenerator] {}
+  MODULE
+  {
+    name = ModuleRadioisotopeGenerator
+    BasePower = 0.25
+    HalfLife = 8.35
+    EasyMode = true
+  }
 }
 @PART[nuclearEngineKANDL]:NEEDS[NearFutureElectrical]:AFTER[AtomicAge]
 {
-	!RESOURCE[ElectricCharge]{}
-	!MODULE[ModuleGenerator] {}
-	!MODULE[ModuleAlternator]{}
-	MODULE
-	{
-		name = ModuleRadioisotopeGenerator
-		BasePower = 0.75
-		HalfLife = 8.35
-		EasyMode = true
-	}
+  !RESOURCE[ElectricCharge]{}
+  !MODULE[ModuleGenerator] {}
+  !MODULE[ModuleAlternator]{}
+  MODULE
+  {
+    name = ModuleRadioisotopeGenerator
+    BasePower = 0.75
+    HalfLife = 8.35
+    EasyMode = true
+  }
 }
diff --git a/.../Parts/FissionReactors/reactor-0625-e.dds → .../Parts/FissionReactors/reactor-0625-e.dds b/.../Parts/FissionReactors/reactor-0625-e.dds → .../Parts/FissionReactors/reactor-0625-e.dds
diff --git a/.../Parts/FissionReactors/reactor-0625-n.dds → .../Parts/FissionReactors/reactor-0625-n.dds b/.../Parts/FissionReactors/reactor-0625-n.dds → .../Parts/FissionReactors/reactor-0625-n.dds
diff --git a/...al/Parts/FissionReactors/reactor-0625.cfg → ...cy/Parts/FissionReactors/reactor-0625.cfg b/...al/Parts/FissionReactors/reactor-0625.cfg → ...cy/Parts/FissionReactors/reactor-0625.cfg
@@ -11,15 +11,15 @@ PART
 	// --- asset parameters ---
 	MODEL
   {
-    model = NearFutureElectrical/Parts/FissionReactors/reactor-0625
+    model = NearFutureElectrical/Legacy/Parts/FissionReactors/reactor-0625
     position = 0.0, 0.0, 0.0
     scale = 1,1,1
     rotation = 0, 0, 0
   }
 	rescaleFactor = 1
 
 	TechRequired = experimentalElectrics
-	entryCost = 35500
+	entryCost = 0
 
 	// --- node definitions ---
 	// definition format is Position X, Position Y, Position Z, Up X, Up Y, Up Z
@@ -29,7 +29,8 @@ PART
 
 	// --- editor parameters ---
 	cost = 18595
-	category = Electrical
+	category = none
+  TechHidden = True
 	subcategory = 0
 	title = #LOC_NFElectrical_reactor-0625_title
 	manufacturer = #LOC_NFElectrical_manufacturer_kerbkastria_title

diff --git a/...al/Parts/FissionReactors/reactor-0625.dds → ...cy/Parts/FissionReactors/reactor-0625.dds b/...al/Parts/FissionReactors/reactor-0625.dds → ...cy/Parts/FissionReactors/reactor-0625.dds
diff --git a/...cal/Parts/FissionReactors/reactor-0625.mu → ...acy/Parts/FissionReactors/reactor-0625.mu b/...cal/Parts/FissionReactors/reactor-0625.mu → ...acy/Parts/FissionReactors/reactor-0625.mu
diff --git a/...l/Parts/FissionReactors/reactor-125-e.dds → ...y/Parts/FissionReactors/reactor-125-e.dds b/...l/Parts/FissionReactors/reactor-125-e.dds → ...y/Parts/FissionReactors/reactor-125-e.dds
diff --git a/...l/Parts/FissionReactors/reactor-125-n.dds → ...y/Parts/FissionReactors/reactor-125-n.dds b/...l/Parts/FissionReactors/reactor-125-n.dds → ...y/Parts/FissionReactors/reactor-125-n.dds
diff --git a/...cal/Parts/FissionReactors/reactor-125.cfg → ...acy/Parts/FissionReactors/reactor-125.cfg b/...cal/Parts/FissionReactors/reactor-125.cfg → ...acy/Parts/FissionReactors/reactor-125.cfg
@@ -11,15 +11,15 @@ PART
 	// --- asset parameters ---
 	MODEL
   {
-    model = NearFutureElectrical/Parts/FissionReactors/reactor-125
+    model = NearFutureElectrical/Legacy/Parts/FissionReactors/reactor-125
     position = 0.0, 0.0, 0.0
     scale = 1,1,1
     rotation = 0, 0, 0
   }
 	rescaleFactor = 1
 
 	TechRequired = nuclearPropulsion
-	entryCost = 275000
+	entryCost = 2750000
 
 	// --- node definitions ---
 	// definition format is Position X, Position Y, Position Z, Up X, Up Y, Up Z
@@ -28,7 +28,8 @@ PART
 
 	// --- editor parameters ---
 	cost = 100601
-	category = Electrical
+	category = none
+  TechHidden = True
 	subcategory = 0
 	title = #LOC_NFElectrical_reactor-125_title
 	manufacturer = #LOC_NFElectrical_manufacturer_postkerbin_title

diff --git a/...cal/Parts/FissionReactors/reactor-125.dds → ...acy/Parts/FissionReactors/reactor-125.dds b/...cal/Parts/FissionReactors/reactor-125.dds → ...acy/Parts/FissionReactors/reactor-125.dds
diff --git a/...ical/Parts/FissionReactors/reactor-125.mu → ...gacy/Parts/FissionReactors/reactor-125.mu b/...ical/Parts/FissionReactors/reactor-125.mu → ...gacy/Parts/FissionReactors/reactor-125.mu
diff --git a/.../Parts/FissionReactors/reactor-25-2-e.dds → .../Parts/FissionReactors/reactor-25-2-e.dds b/.../Parts/FissionReactors/reactor-25-2-e.dds → .../Parts/FissionReactors/reactor-25-2-e.dds
diff --git a/.../Parts/FissionReactors/reactor-25-2-n.dds → .../Parts/FissionReactors/reactor-25-2-n.dds b/.../Parts/FissionReactors/reactor-25-2-n.dds → .../Parts/FissionReactors/reactor-25-2-n.dds
diff --git a/.../Parts/FissionReactors/reactor-25-2-s.dds → .../Parts/FissionReactors/reactor-25-2-s.dds b/.../Parts/FissionReactors/reactor-25-2-s.dds → .../Parts/FissionReactors/reactor-25-2-s.dds
diff --git a/...al/Parts/FissionReactors/reactor-25-2.cfg → ...cy/Parts/FissionReactors/reactor-25-2.cfg b/...al/Parts/FissionReactors/reactor-25-2.cfg → ...cy/Parts/FissionReactors/reactor-25-2.cfg
@@ -11,15 +11,15 @@ PART
 	// --- asset parameters ---
 	MODEL
   {
-    model = NearFutureElectrical/Parts/FissionReactors/reactor-25-2
+    model = NearFutureElectrical/Legacy/Parts/FissionReactors/reactor-25-2
     position = 0.0, 0.0, 0.0
     scale = 1,1,1
     rotation = 0, 0, 0
   }
 	rescaleFactor = 1
 
 	TechRequired = veryHeavyRocketry
-	entryCost = 1950000
+	entryCost = 0
 
 	// --- node definitions ---
 	// definition format is Position X, Position Y, Position Z, Up X, Up Y, Up Z
@@ -28,7 +28,8 @@ PART
 
 	// --- editor parameters ---
 	cost = 658720
-	category = Electrical
+	category = none
+  TechHidden = True
 	subcategory = 0
 	title = #LOC_NFElectrical_reactor-25-2_title
 	manufacturer = #LOC_NFElectrical_manufacturer_postkerbin_title

diff --git a/...al/Parts/FissionReactors/reactor-25-2.dds → ...cy/Parts/FissionReactors/reactor-25-2.dds b/...al/Parts/FissionReactors/reactor-25-2.dds → ...cy/Parts/FissionReactors/reactor-25-2.dds
diff --git a/...cal/Parts/FissionReactors/reactor-25-2.mu → ...acy/Parts/FissionReactors/reactor-25-2.mu b/...cal/Parts/FissionReactors/reactor-25-2.mu → ...acy/Parts/FissionReactors/reactor-25-2.mu
diff --git a/...al/Parts/FissionReactors/reactor-25-e.dds → ...cy/Parts/FissionReactors/reactor-25-e.dds b/...al/Parts/FissionReactors/reactor-25-e.dds → ...cy/Parts/FissionReactors/reactor-25-e.dds
diff --git a/...al/Parts/FissionReactors/reactor-25-n.dds → ...cy/Parts/FissionReactors/reactor-25-n.dds b/...al/Parts/FissionReactors/reactor-25-n.dds → ...cy/Parts/FissionReactors/reactor-25-n.dds