From 67464a69bea0444f5427c114d87c21762c2076a1 Mon Sep 17 00:00:00 2001 From: kopareigns <kopareigns@gmail.com> Date: Mon, 29 Oct 2018 21:27:38 -0400 Subject: [PATCH] BC fixes --- src/uncategorized/BackwardsCompatibility.tw | 88 +++++++++++---------- 1 file changed, 46 insertions(+), 42 deletions(-) diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index 707b8d8fb28..d92853568dd 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -972,7 +972,7 @@ <<set $merchantFSWares = ["GenderRadicalistResearch", "TransformationFetishistResearch", "AssetExpansionistResearch", "SlimnessEnthusiastResearch", "YouthPreferentialistResearch", "HedonisticDecadenceResearch"]>> <</if>> <<if ndef $merchantIllegalWares>> - <<set $merchantIllegalWares = ["childhoodFertilityInducedNCS", "UterineRestraintMesh", "RapidCellGrowthFormula"]>> + <<set $merchantIllegalWares = ["childhoodFertilityInducedNCS", "UterineRestraintMesh", "RapidCellGrowthFormula", "PGHack"]>> <<elseif $merchantIllegalWares.length == 0>> <<set $merchantIllegalWares.push("childhoodFertilityInducedNCS")>> <<set $merchantIllegalWares.push("UterineRestraintMesh")>> @@ -2657,6 +2657,46 @@ Setting missing global variables: <<set $NaNArray = []>> <</if>> +/* Economy Mod */ +<<if $economy == 0.5>> + <<set $economy = 200>> +<</if>> +<<if $economy == 1>> + <<set $economy = 100>> +<</if>> +<<if $economy == 1.5>> + <<set $economy = 67>> +<</if>> +<<if ndef $difficultySwitch>> + <<set $difficultySwitch = 0>> +<</if>> +<<if ndef $menialSupplyFactor>> + /* (1 - slaveCostFactor) * price elasticity * base price * 0.5 */ + <<set $menialSupplyFactor = (1 - $slaveCostFactor) * 400 * 1000 * 0.5>> + <<set $menialDemandFactor = (1 - $slaveCostFactor) * -400 * 1000 * 0.5>> +<</if>> +<<if ndef $slaveCostRandom>> + <<set $slaveCostRandom = 0>> +<</if>> +<<if ndef $demandTimer>> + <<set $demandTimer = 0>> +<</if>> +<<if ndef $elapsedDemandTimer>> + <<set $elapsedDemandTimer = 0>> +<</if>> +<<if ndef $supplyTimer>> + <<set $supplyTimer = 0>> +<</if>> +<<if ndef $elapsedSupplyTimer>> + <<set $elapsedSupplyTimer = 0>> +<</if>> +<<if ndef $deltaSupply>> + <<set $deltaSupply = 0>> +<</if>> +<<if ndef $deltaDemand>> + <<set $deltaDemand = 0>> +<</if>> + Done! <br><br> @@ -3219,7 +3259,11 @@ Setting missing slave variables: <<set _Slave.lipsTat = "advertisements">> <</switch>> -<<if (ndef _Slave.currentRules) || (_Slave.currentRules.length < 1)>> +<<if _Slave.customTat == " ">> + <<set _Slave.customTat = "">> +<</if>> + + <<if (ndef _Slave.currentRules) || (_Slave.currentRules.length < 1)>> <<set _Slave.currentRules = []>> <</if>> @@ -3448,43 +3492,3 @@ Done! <<if $releaseID < 1031>> <<set $releaseID = 1031>> <</if>> - -<<if $economy == 0.5>> - <<set $economy = 200>> -<</if>> -<<if $economy == 1>> - <<set $economy = 100>> -<</if>> -<<if $economy == 1.5>> - <<set $economy = 67>> -<</if>> -<<if ndef $difficultySwitch>> - <<set $difficultySwitch = 0>> -<</if>> - -<<if ndef $menialSupplyFactor>> - /* (1 - slaveCostFactor) * price elasticity * base price * 0.5 */ - <<set $menialSupplyFactor = (1 - $slaveCostFactor) * 400 * 1000 * 0.5>> - <<set $menialDemandFactor = (1 - $slaveCostFactor) * -400 * 1000 * 0.5>> -<</if>> -<<if ndef $slaveCostRandom>> - <<set $slaveCostRandom = 0>> -<</if>> -<<if ndef $demandTimer>> - <<set $demandTimer = 0>> -<</if>> -<<if ndef $elapsedDemandTimer>> - <<set $elapsedDemandTimer = 0>> -<</if>> -<<if ndef $supplyTimer>> - <<set $supplyTimer = 0>> -<</if>> -<<if ndef $elapsedSupplyTimer>> - <<set $elapsedSupplyTimer = 0>> -<</if>> -<<if ndef $deltaSupply>> - <<set $deltaSupply = 0>> -<</if>> -<<if ndef $deltaDemand>> - <<set $deltaDemand = 0>> -<</if>> -- GitLab