Merge pull request #116 from ChrisAdderley/dev

Release 1.1.0
post-kerbin-mining-corporation · Nov 6, 2019 · 173442f · 173442f
2 parents b2e1dba + d49e27d
commit 173442f
Show file tree

Hide file tree

Showing 19 changed files with 104 additions and 116 deletions.
diff --git a/.mod_data.yml b/.mod_data.yml
@@ -8,16 +8,16 @@ package:
     - changelog.txt
 dependencies:  # Configure dependencies
   ModuleManager:
-    version: 4.0.2
+    version: 4.1.0
     location: s3
   B9PartSwitch:
-    version: 2.10.0
+    version: 2.12.1
     location: s3
   CommunityResourcePack:
     version: 1.0.0
     location: s3
   DynamicBatteryStorage:
-    tag: 2.0.6
+    tag: 2.1.0
     location: github
     repository: ChrisAdderley/DynamicBatteryStorage
 deploy:

diff --git a/Extras/DecayingRTGs/NFElectricalRTGPatch.cfg b/Extras/DecayingRTGs/NFElectricalRTGPatch.cfg
@@ -1,5 +1,5 @@
 // Patches RTGs
-@PART[rtg-0625]
+@PART[rtg-0625]:FOR[NearFutureElectrical]
 {
 	@cost *= 0.5
 	!MODULE[ModuleGenerator] {}
@@ -11,7 +11,7 @@
 		EasyMode = true
 	}
 }
-@PART[rtg]
+@PART[rtg]:FOR[NearFutureElectrical]
 {
 	@cost *= 0.5
 	!MODULE[ModuleGenerator] {}
@@ -23,7 +23,7 @@
 		EasyMode = true
 	}
 }
-@PART[RLA_mmrtg]
+@PART[RLA_mmrtg]:FOR[NearFutureElectrical]
 {
 	@cost *= 0.5
 	!MODULE[ModuleGenerator] {}
@@ -35,7 +35,7 @@
 		EasyMode = true
 	}
 }
-@PART[utility-pod-25]
+@PART[utility-pod-25]:FOR[NearFutureElectrical]
 {
 	@cost *= 0.25
 	!MODULE[ModuleGenerator] {}
@@ -48,7 +48,7 @@
 	}
 }
 //Ven's Stock Revamp
-@PART[rtgMini]
+@PART[rtgMini]:FOR[NearFutureElectrical]
 {
 	@cost *= 0.5
 	!MODULE[ModuleGenerator] {}
@@ -61,7 +61,7 @@
 	}
 }
 //Prakasa Aeroworks
-@PART[prakGenerator]
+@PART[prakGenerator]:FOR[NearFutureElectrical]
 {
 	@cost *= 0.5
 	!MODULE[ModuleGenerator] {}
@@ -73,7 +73,7 @@
 		EasyMode = true
 	}
 }
-@PART[prakGeneratorS1]
+@PART[prakGeneratorS1]:FOR[NearFutureElectrical]
 {
 	@cost *= 0.5
 	!MODULE[ModuleGenerator] {}
@@ -86,7 +86,7 @@
 	}
 }
 // SXT mod
-@PART[SXTDepolyRTGI]
+@PART[SXTDepolyRTGI]:FOR[NearFutureElectrical]
 {
 	@cost *= 0.5
 	!MODULE[ModuleGenerator] {}
@@ -98,7 +98,7 @@
 		EasyMode = true
 	}
 }
-@PART[SXTDepolyRTGII]
+@PART[SXTDepolyRTGII]:FOR[NearFutureElectrical]
 {
 	@cost *= 0.5
 	!MODULE[ModuleGenerator] {}

diff --git a/GameData/NearFutureElectrical/Parts/Batteries/battery-375/battery-375.cfg b/GameData/NearFutureElectrical/Parts/Batteries/battery-375/battery-375.cfg
diff --git a/GameData/NearFutureElectrical/Parts/Batteries/battery-375/battery-375.dds b/GameData/NearFutureElectrical/Parts/Batteries/battery-375/battery-375.dds
diff --git a/GameData/NearFutureElectrical/Parts/Batteries/battery-375/battery-375.mu b/GameData/NearFutureElectrical/Parts/Batteries/battery-375/battery-375.mu
diff --git a/GameData/NearFutureElectrical/Parts/Batteries/battery-375/battery-light-e.dds b/GameData/NearFutureElectrical/Parts/Batteries/battery-375/battery-light-e.dds
diff --git a/GameData/NearFutureElectrical/Parts/Batteries/battery-375/battery-light.dds b/GameData/NearFutureElectrical/Parts/Batteries/battery-375/battery-light.dds
diff --git a/GameData/NearFutureElectrical/Patches/NFElectricalCommunityTechTree.cfg b/GameData/NearFutureElectrical/Patches/NFElectricalCommunityTechTree.cfg
@@ -1,52 +1,52 @@
-// Near Future Electrical CTT 
+// Near Future Electrical CTT
 // Reactors
-@PART[reactor-25-2]:NEEDS[CommunityTechTree]
+@PART[reactor-25-2]:NEEDS[CommunityTechTree]:FOR[NearFutureElectrical]
 {
 	@TechRequired = advNuclearPower
 }
-@PART[reactor-25]:NEEDS[CommunityTechTree]
+@PART[reactor-25]:NEEDS[CommunityTechTree]:FOR[NearFutureElectrical]
 {
 	@TechRequired = largeNuclearPower
 }
-@PART[reactor-125]:NEEDS[CommunityTechTree]
+@PART[reactor-125]:NEEDS[CommunityTechTree]:FOR[NearFutureElectrical]
 {
 	@TechRequired = advNuclearPower
 }
-@PART[reactor-0625]:NEEDS[CommunityTechTree]
+@PART[reactor-0625]:NEEDS[CommunityTechTree]:FOR[NearFutureElectrical]
 {
 	@TechRequired = nuclearPower
 }
-@PART[reactor-375]:NEEDS[CommunityTechTree]
+@PART[reactor-375]:NEEDS[CommunityTechTree]:FOR[NearFutureElectrical]
 {
 	@TechRequired = advNuclearPower
 }
-@PART[reactor-375-2]:NEEDS[CommunityTechTree]
+@PART[reactor-375-2]:NEEDS[CommunityTechTree]:FOR[NearFutureElectrical]
 {
 	@TechRequired = advNuclearPower
 }
 
 // RTG
-@PART[rtg-0625]:NEEDS[CommunityTechTree]
+@PART[rtg-0625]:NEEDS[CommunityTechTree]:FOR[NearFutureElectrical]
 {
 	@TechRequired = highTechElectricalSystems
 }
 
 // Utility
-@PART[nuclear-recycler-25]:NEEDS[CommunityTechTree]
+@PART[nuclear-recycler-25]:NEEDS[CommunityTechTree]:FOR[NearFutureElectrical]
 {
 	@TechRequired = nuclearFuelSystems
 }
 
 // Storage
-@PART[nuclearfuel-25]:NEEDS[CommunityTechTree]
+@PART[nuclearfuel-25]:NEEDS[CommunityTechTree]:FOR[NearFutureElectrical]
 {
 	@TechRequired = nuclearFuelSystems
 }
-@PART[nuclearfuel-125]:NEEDS[CommunityTechTree]
+@PART[nuclearfuel-125]:NEEDS[CommunityTechTree]:FOR[NearFutureElectrical]
 {
 	@TechRequired = nuclearFuelSystems
 }
-@PART[nuclearfuel-0625]:NEEDS[CommunityTechTree]
+@PART[nuclearfuel-0625]:NEEDS[CommunityTechTree]:FOR[NearFutureElectrical]
 {
 	@TechRequired = nuclearFuelSystems
 }
diff --git a/GameData/NearFutureElectrical/Patches/NFElectricalConnectedLivingSpacesPatch.cfg b/GameData/NearFutureElectrical/Patches/NFElectricalConnectedLivingSpacesPatch.cfg
@@ -1,21 +1,21 @@
 // Near Future Electrical CLS
-@PART[battery-25]:HAS[!MODULE[ModuleConnectedLivingSpace]]:NEEDS[ConnectedLivingSpace]
+@PART[battery-25]:HAS[!MODULE[ModuleConnectedLivingSpace]]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureElectrical]
 {
     MODULE
 	{
 		name = ModuleConnectedLivingSpace
 		passable = true
 	}
 }
-@PART[battery-375]:HAS[!MODULE[ModuleConnectedLivingSpace]]:NEEDS[ConnectedLivingSpace]
+@PART[battery-375]:HAS[!MODULE[ModuleConnectedLivingSpace]]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureElectrical]
 {
     MODULE
 	{
 		name = ModuleConnectedLivingSpace
 		passable = true
 	}
 }
-@PART[capacitor-25]:HAS[!MODULE[ModuleConnectedLivingSpace]]:NEEDS[ConnectedLivingSpace]
+@PART[capacitor-25]:HAS[!MODULE[ModuleConnectedLivingSpace]]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureElectrical]
 {
     MODULE
 	{

diff --git a/GameData/NearFutureElectrical/Patches/NFElectricalUSIReactors.cfg b/GameData/NearFutureElectrical/Patches/NFElectricalUSIReactors.cfg
@@ -1,7 +1,6 @@
 // Near Future Electrical USI Reactors compatibility
 // Changes USI reactors to behave like NFE reactors
-s
-@PART[USI_Nuke_625]
+@PART[USI_Nuke_625]:FOR[NearFutureElectrical]
 {
 	@cost = 12673
 	@entryCost = 25210
@@ -115,7 +114,7 @@ s
 	}
 }
 
-@PART[USI_Nuke_125_S]
+@PART[USI_Nuke_125_S]:FOR[NearFutureElectrical]
 {
 	@cost = 29704
 	@entryCost = 74900
@@ -228,7 +227,7 @@ s
 	}
 }
 
-@PART[USI_Nuke_125]
+@PART[USI_Nuke_125]:FOR[NearFutureElectrical]
 {
 	@cost = 54813
 	@entryCost = 149800
@@ -341,7 +340,7 @@ s
 	}
 }
 
-@PART[USI_Nuke_250]
+@PART[USI_Nuke_250]:FOR[NearFutureElectrical]
 {
 	@cost = 236236
 	@entryCost = 636400
@@ -453,7 +452,7 @@ s
 		maxAmount = 1000
 	}
 }
-@PART[USI_Nuke_375]
+@PART[USI_Nuke_375]:FOR[NearFutureElectrical]
 {
 	@cost = 901125
 	@entryCost = 1864000
@@ -567,7 +566,7 @@ s
 	}
 }
 
-@PART[FTT_Service_375_01]
+@PART[FTT_Service_375_01]:FOR[NearFutureElectrical]
 {
 	@cost = 793277
 	@entryCost = 1092400
@@ -692,7 +691,7 @@ s
 	}
 }
 
-@PART[FTT_Reactor_500_01]
+@PART[FTT_Reactor_500_01]:FOR[NearFutureElectrical]
 {
 	@cost = 1737217
 	@entryCost = 2562375
@@ -818,7 +817,7 @@ s
 	}
 }
 
-@PART[Duna_PDU]
+@PART[Duna_PDU]:FOR[NearFutureElectrical]
 {
 
 	@cost = 197684
@@ -923,7 +922,7 @@ s
 	}
 }
 
-@PART[Tundra_PDU]
+@PART[Tundra_PDU]:FOR[NearFutureElectrical]
 {
 
 	@cost = 309403

diff --git a/GameData/NearFutureElectrical/Patches/NFElectricalUSIResources.cfg b/GameData/NearFutureElectrical/Patches/NFElectricalUSIResources.cfg
@@ -1,7 +1,7 @@
 // Near Future Electrical USI compatibility
 // Changes NFE's production chain for nuclear resources to match USI's
 
-@PART[nuclear-recycler-25]:NEEDS[MKS]
+@PART[nuclear-recycler-25]:NEEDS[MKS]:FOR[NearFutureElectrical]
  {
    // MKS has a different way of producing EnrichedUranium, from Uraninite,
 	// so producing it from Ore isn't appropriate. We produce it with Uranite instead.
@@ -65,7 +65,7 @@
 	}
  }
 
- @PART[nuclearfuel-0625]:NEEDS[000_USITools]
+ @PART[nuclearfuel-0625]:NEEDS[000_USITools]:FOR[NearFutureElectrical]
  {
  	MODULE
  	{
@@ -77,7 +77,7 @@
  	}
  }
 
- @PART[nuclearfuel-125]:NEEDS[000_USITools]
+ @PART[nuclearfuel-125]:NEEDS[000_USITools]:FOR[NearFutureElectrical]
  {
  	MODULE
  	{
@@ -89,7 +89,7 @@
  	}
  }
 
- @PART[nuclearfuel-25]:NEEDS[000_USITools]
+ @PART[nuclearfuel-25]:NEEDS[000_USITools]:FOR[NearFutureElectrical]
  {
  	MODULE
  	{
@@ -102,7 +102,7 @@
  }
 
 
- @PART[C3_NukeFuelTank*|C3_DepletedFuelTank*]
+ @PART[C3_NukeFuelTank*|C3_DepletedFuelTank*]:FOR[NearFutureElectrical]
  {
  	MODULE
  	{

diff --git a/GameData/NearFutureElectrical/Plugins/NearFutureElectrical.dll b/GameData/NearFutureElectrical/Plugins/NearFutureElectrical.dll