Merge pull request #126 from zer0Kerbal/1.12.1.0

1.12.1.0 (2017-04-09) - MFT fix
zer0Kerbal · Apr 12, 2022 · 14976aa · 14976aa
2 parents 9c824e9 + 247af62
commit 14976aa
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 11 deletions.
diff --git a/FuelTanksPlus.version b/FuelTanksPlus.version
@@ -13,14 +13,14 @@
 	{
 		"MAJOR" : 1,
 		"MINOR" : 12,
-		"PATCH" : 0,
+		"PATCH" : 1,
 		"BUILD" : 0
 	},
 	"KSP_VERSION" :
 	{
 		"MAJOR" : 1,
-		"MINOR" : 2,
-		"PATCH" : 2
+		"MINOR" : 3,
+		"PATCH" : 0
 	},
 	"KSP_VERSION_MIN" :
 	{

diff --git a/GameData/NecroBones/FuelTanksPlus/FuelTanksPlus-CHANGELOG.txt b/GameData/NecroBones/FuelTanksPlus/FuelTanksPlus-CHANGELOG.txt
@@ -1,3 +1,6 @@
+1.12.1 (2017-04-09) - MFT fix.
+ - Corrected some MM patch issues for ModularFuelTanks.
+
 1.12 (2017-04-07) - Tweaks & Fixes.
  - Corrected a typo that was preventing the B9PartSwitch patches from applying correctly on the radial tanks.
  - Slightly increased the performance of the 2m/3m stack decouplers, and increased their propellant maximums.

diff --git a/GameData/NecroBones/FuelTanksPlus/FuelTanksPlus.version b/GameData/NecroBones/FuelTanksPlus/FuelTanksPlus.version
@@ -13,14 +13,14 @@
 	{
 		"MAJOR" : 1,
 		"MINOR" : 12,
-		"PATCH" : 0,
+		"PATCH" : 1,
 		"BUILD" : 0
 	},
 	"KSP_VERSION" :
 	{
 		"MAJOR" : 1,
-		"MINOR" : 2,
-		"PATCH" : 2
+		"MINOR" : 3,
+		"PATCH" : 0
 	},
 	"KSP_VERSION_MIN" :
 	{

diff --git a/GameData/NecroBones/FuelTanksPlus/Patches/FuelTanksPlus_ModularFuelTanks.cfg b/GameData/NecroBones/FuelTanksPlus/Patches/FuelTanksPlus_ModularFuelTanks.cfg
@@ -1,8 +1,17 @@
 @PART[TPtank*|TPcone*|TPdome*]:FOR[FuelTanksPlus]:NEEDS[ModularFuelTanks]
 {
-	origLFO = #$RESOURCE[LiquidFuel]/maxAmount$
-	@origLFO += #$RESOURCE[Oxidizer]/maxAmount$
-
+	origLFO = 0
+}
+@PART:HAS[#origLFO[0],@RESOURCE[LiquidFuel]:HAS[#maxAmount[>0]]]:FOR[FuelTanksPlus]:NEEDS[ModularFuelTanks]
+{
+	@origLFO += #$RESOURCE[LiquidFuel]:HAS[#maxAmount[>0]]/maxAmount$
+}
+@PART:HAS[#origLFO[*],@RESOURCE[Oxidizer]:HAS[#maxAmount[>0]]]:FOR[FuelTanksPlus]:NEEDS[ModularFuelTanks]
+{
+	@origLFO += #$RESOURCE[Oxidizer]:HAS[#maxAmount[>0]]/maxAmount$
+}
+@PART:HAS[#origLFO[>-1]]:FOR[FuelTanksPlus]:NEEDS[ModularFuelTanks]
+{
 	MODULE
 	{
 		name = ModuleFuelTanks

diff --git a/json/ksp.json b/json/ksp.json
@@ -2,7 +2,7 @@
  "schemaVersion": 1,
  "label": "KSP",
  "labelColor": "black",
- "message": "1.2.2",
+ "message": "1.3.0",
  "color": "66ccff",
  "style": "plastic"
 }
diff --git a/json/mod.json b/json/mod.json
@@ -2,7 +2,7 @@
  "schemaVersion": 1,
  "label": "Fuel Tanks Plus",
  "labelColor": "BADA55",
- "message": "1.12.0.0",
+ "message": "1.12.1.0",
  "color": "darkgreen",
  "style": "plastic"
 }