Merge branch 'pregmod-master' into 'pregmod-master'

Pregmod v1021-303

See merge request pregmodfan/fc-pregmod!1366

devNotes/VersionChangeLog-Premod+LoliMod.txt

@@ -4,6 +4,9 @@
 
 1/28/18
 
+	302
+	-anon's corp tweaks
+
 	301
 	-fixed missing span in JFC
 

src/uncategorized/corporationDevelopments.tw

@@ -43,10 +43,18 @@ Your corporation was valued at <<print cashFormat($corpValue)>> and made a profi
 <</if>>
 <<set $corpPeopleEnslaved += _addedSlaves, $slaveAssets += 500 * _addedSlaves>>
 in total, the corporation has enslaved <<print commaNum($corpPeopleEnslaved)>> people.
-<<if ($trainingAssets > $slaveAssets * 0.2) && ($surgicalAssets > $slaveAssets * 0.2) && ($drugAssets > $slaveAssets * 0.2)>>
+<<set _trainingWeight = 0.6, _surgicalWeight = 0.2, _drugWeight = 0.2>>
+<<if $surgicalUpgradeCosmetics == "none" && $surgicalUpgradeImplants == "none" && $surgicalUpgradeGenitalia == "none">>
+	<<set _surgicalWeight = 0, _trainingWeight += 0.2>>
+<</if>>
+<<if $drugUpgradeHormones == "none" && $drugUpgradeInjectionOne == "none" && $drugUpgradeInjectionTwo == "none">>
+	<<set _drugWeight = 0.1, _trainingWeight += 0.1>>
+<</if>>
+<<set _improvementAssetsTotal = ($trainingAssets * _trainingWeight) + ($surgicalAssets * _surgicalWeight) + ($drugAssets * _drugWeight)>>
+<<if _improvementAssetsTotal > $slaveAssets * 0.4>>
 	The corporation has enough training and medical assets to rapidly improve its human holdings.
 	<<set $slaveAssets += Math.ceil(Math.log($slaveAssets)*400)>>
-<<elseif ($trainingAssets > $slaveAssets * 0.1) && ($surgicalAssets > $slaveAssets * 0.1) && ($drugAssets > $slaveAssets * 0.1)>>
+<<elseif _improvementAssetsTotal > $slaveAssets * 0.2>>
 	The corporation uses its training and medical assets to improve its human holdings.
 	<<set $slaveAssets += Math.ceil(Math.log($slaveAssets)*200)>>
 <<else>>