Merge branch 'final-missing-cashX-transactions' into 'pregmod-master'

Appying cashX, small fixes

See merge request pregmodfan/fc-pregmod!3470

src/uncategorized/BackwardsCompatibility.tw

@@ -2635,7 +2635,7 @@ Setting missing global variables:
 <<if ndef $newCorp>>
 	<<set $newCorp = 1>>
 	<<set $corpIncorporated = 0>>
-	<<set $cash += Math.min(Math.trunc(($corpValue / ($publicShares + $personalShares)) * $personalShares), 1000000)>> /*Paying the player for his old corporation, so they can get the new one started with haste. It should perhaps have a message going with it*/
+	<<run cashX(Math.min(Math.trunc(($corpValue / ($publicShares + $personalShares)) * $personalShares), 1000000), "stocksTraded")>> /*Paying the player for his old corporation, so they can get the new one started with haste. It should perhaps have a message going with it*/
 	<<set $mercenariesHelpCorp = 0>>
 	<<set $corpMarket = 0>>
 	<<unset $corpPeopleEnslaved, $slaveAssets, $slaveAssetPrice, $corpProfit, $corpCash, $corpValue, $sharePrice, $oldSharePrice, $personalShares, $publicShares, $generalAssetPrice, $generalAssets, $entrapmentAssets, $entrapmentAssetPrice, $captureAssets, $captureAssetPrice, $trainingAssets, $trainingAssetPrice, $surgicalAssets, $surgicalAssetPrice, $drugAssets, $drugAssetPrice, $generalUpgradeBreaking, $generalUpgradeWeight, $generalUpgradeMuscle, $entrapmentUpgradeDevotionOne, $entrapmentUpgradeDevotionTwo, $entrapmentUpgradeIntelligence, $captureUpgradeGender, $surgicalUpgradeGenitalia, $captureUpgradeAge, $captureUpgradeRace, $trainingUpgradeAccent, $trainingUpgradeEducation, $trainingUpgradeSexEd, $surgicalUpgradeCosmetics, $surgicalUpgradeImplants, $drugUpgradeHormones, $drugUpgradeInjectionOne, $drugUpgradeInjectionTwo>>

src/uncategorized/buySlaves.tw

@@ -381,16 +381,16 @@ The market price of standard Fuckdolls is <<print cashFormat(_menialPrice*2)>>.
 <<set _optionsBreak = 0>>
 <<if _bulkMax > 0>>
 <<if $arcologies[0].FSPaternalist == "unset" && $cash > _menialPrice*2>>
-	[[Buy|Buy Slaves][$fuckdolls+=1,$menialSupplyFactor-=1,cashX(forceNeg(_menialPrice*2), "menialTransfer")]]
+	[[Buy|Buy Slaves][$fuckdolls+=1,$menialSupplyFactor-=1,cashX(forceNeg(_menialPrice*2), "fuckdollsTransfer")]]
 	<<if $cash > (menialSlaveCost(10)*2)*10>>
-		[[(x10)|Buy Slaves][$fuckdolls+=10,$menialSupplyFactor-=10,cashX(forceNeg((menialSlaveCost(10)*2)*10), "menialTransfer")]]
+		[[(x10)|Buy Slaves][$fuckdolls+=10,$menialSupplyFactor-=10,cashX(forceNeg((menialSlaveCost(10)*2)*10), "fuckdollsTransfer")]]
 	<</if>>
 	<<if $cash > (menialSlaveCost(100)*2)*100>>
-		[[(x100)|Buy Slaves][$fuckdolls+=100,$menialSupplyFactor-=100,cashX(forceNeg((menialSlaveCost(100)*2)*100), "menialTransfer")]]
+		[[(x100)|Buy Slaves][$fuckdolls+=100,$menialSupplyFactor-=100,cashX(forceNeg((menialSlaveCost(100)*2)*100), "fuckdollsTransfer")]]
 	<</if>>
 	<<if $cash > ((_menialPrice+1)*4)>>
 		<<set _fuckdollBulkPremium = Math.trunc(1 + Math.clamp($cash/(_menialPrice*2),0,_bulkMax)/400)>>
-		[[(max)|Buy Slaves][$fuckdolls+=Math.trunc(Math.clamp($cash/(_menialPrice*2+_fuckdollBulkPremium),0,_bulkMax)),$menialSupplyFactor-=Math.trunc(Math.clamp($cash/(_menialPrice*2+_fuckdollBulkPremium),0,_bulkMax)),cashX(forceNeg(Math.trunc(Math.clamp($cash/(_menialPrice*2+_fuckdollBulkPremium),0,_bulkMax))*(_menialPrice*2+_fuckdollBulkPremium)), "menialTransfer")]]
+		[[(max)|Buy Slaves][$fuckdolls+=Math.trunc(Math.clamp($cash/(_menialPrice*2+_fuckdollBulkPremium),0,_bulkMax)),$menialSupplyFactor-=Math.trunc(Math.clamp($cash/(_menialPrice*2+_fuckdollBulkPremium),0,_bulkMax)),cashX(forceNeg(Math.trunc(Math.clamp($cash/(_menialPrice*2+_fuckdollBulkPremium),0,_bulkMax))*(_menialPrice*2+_fuckdollBulkPremium)), "fuckdollsTransfer")]]
 	<</if>>
 	//Bulk transactions may require offering a premium.//
 	<<set _optionsBreak = 1>>
@@ -398,14 +398,14 @@ The market price of standard Fuckdolls is <<print cashFormat(_menialPrice*2)>>.
 <</if>>
 <<if $fuckdolls >= 1>>
 	<<if _optionsBreak>>|<</if>>
-	[[Sell|Buy Slaves][$fuckdolls-=1,$menialDemandFactor-=1,cashX((_menialPrice*2), "menialTransfer")]]
+	[[Sell|Buy Slaves][$fuckdolls-=1,$menialDemandFactor-=1,cashX((_menialPrice*2), "fuckdollsTransfer")]]
 <<if $fuckdolls >= 10>>
-	[[(x10)|Buy Slaves][$fuckdolls-=10,$menialDemandFactor-=10,cashX((menialSlaveCost(-10)*20), "menialTransfer")]]
+	[[(x10)|Buy Slaves][$fuckdolls-=10,$menialDemandFactor-=10,cashX((menialSlaveCost(-10)*20), "fuckdollsTransfer")]]
 <<if $fuckdolls >= 100>>
-	[[(x100)|Buy Slaves][$fuckdolls-=100,$menialDemandFactor-=100,cashX((menialSlaveCost(-100)*200), "menialTransfer")]]
+	[[(x100)|Buy Slaves][$fuckdolls-=100,$menialDemandFactor-=100,cashX((menialSlaveCost(-100)*200), "fuckdollsTransfer")]]
 <</if>>
 <</if>>
-[[(all)|Buy Slaves][$cash+=$fuckdolls*(menialSlaveCost(-$fuckdolls)*2),$menialDemandFactor-=$fuckdolls,$fuckdolls = 0]]
+[[(all)|Buy Slaves][cashX($fuckdolls*(menialSlaveCost(-$fuckdolls)*2), "fuckdollsTransfer"),$menialDemandFactor-=$fuckdolls,$fuckdolls = 0]]
 <</if>>
 <</if>>
 
@@ -421,16 +421,16 @@ The market price of standard bioreactors is <<print cashFormat((_menialPrice-100
 <<set _optionsBreak = 0>>
 <<if _bulkMax > 0>>
 <<if $arcologies[0].FSPaternalist == "unset" && $cash > _menialPrice+100>>
-	[[Buy|Buy Slaves][$menialBioreactors+=1,$menialSupplyFactor-=1,cashX(forceNeg(_menialPrice+100), "menialTransfer")]]
+	[[Buy|Buy Slaves][$menialBioreactors+=1,$menialSupplyFactor-=1,cashX(forceNeg(_menialPrice+100), "menialBioreactors")]]
 	<<if $cash > (menialSlaveCost(10)-100)*10>>
-		[[(x10)|Buy Slaves][$menialBioreactors+=10,$menialSupplyFactor-=10,cashX(forceNeg((menialSlaveCost(10)-100)*10), "menialTransfer")]]
+		[[(x10)|Buy Slaves][$menialBioreactors+=10,$menialSupplyFactor-=10,cashX(forceNeg((menialSlaveCost(10)-100)*10), "menialBioreactors")]]
 	<</if>>
 	<<if $cash > (menialSlaveCost(100)-100)*100>>
-		[[(x100)|Buy Slaves][$menialBioreactors+=100,$menialSupplyFactor-=100,cashX(forceNeg((menialSlaveCost(100)-100)*100), "menialTransfer")]]
+		[[(x100)|Buy Slaves][$menialBioreactors+=100,$menialSupplyFactor-=100,cashX(forceNeg((menialSlaveCost(100)-100)*100), "menialBioreactors")]]
 	<</if>>
 	<<if $cash > (_menialPrice-99)*2>>
 		<<set _bioreactorBulkPremium = Math.trunc(1+ Math.clamp($cash/(_menialPrice-99),0,_bulkMax)/400)>>
-		[[(max)|Buy Slaves][$menialBioreactors+=Math.trunc(Math.clamp($cash/(_menialPrice-99+_bioreactorBulkPremium),0,_bulkMax)),$menialSupplyFactor-=Math.trunc(Math.clamp($cash/(_menialPrice-99+_bioreactorBulkPremium),0,_bulkMax)),cashX(forceNeg(Math.trunc(Math.clamp($cash/(_menialPrice-99+_bioreactorBulkPremium),0,_bulkMax))*(_menialPrice-99+_bioreactorBulkPremium)), "menialTransfer")]]
+		[[(max)|Buy Slaves][$menialBioreactors+=Math.trunc(Math.clamp($cash/(_menialPrice-99+_bioreactorBulkPremium),0,_bulkMax)),$menialSupplyFactor-=Math.trunc(Math.clamp($cash/(_menialPrice-99+_bioreactorBulkPremium),0,_bulkMax)),cashX(forceNeg(Math.trunc(Math.clamp($cash/(_menialPrice-99+_bioreactorBulkPremium),0,_bulkMax))*(_menialPrice-99+_bioreactorBulkPremium)), "menialBioreactors")]]
 	<</if>>
 	//Bulk transactions may require offering a premium.//
 	<<set _optionsBreak = 1>>
@@ -438,13 +438,13 @@ The market price of standard bioreactors is <<print cashFormat((_menialPrice-100
 <</if>>
 <<if $menialBioreactors >= 1>>
 	<<if _optionsBreak>>|<</if>>
-	[[Sell|Buy Slaves][$menialBioreactors-=1,$menialDemandFactor-=1,cashX((_menialPrice-100), "menialTransfer")]]
+	[[Sell|Buy Slaves][$menialBioreactors-=1,$menialDemandFactor-=1,cashX((_menialPrice-100), "menialBioreactors")]]
 <<if $menialBioreactors >= 10>>
-	[[(x10)|Buy Slaves][$menialBioreactors-=10,$menialDemandFactor-=10,cashX(((menialSlaveCost(-10)-100)*10), "menialTransfer")]]
+	[[(x10)|Buy Slaves][$menialBioreactors-=10,$menialDemandFactor-=10,cashX(((menialSlaveCost(-10)-100)*10), "menialBioreactors")]]
 <<if $menialBioreactors >= 100>>
-	[[(x100)|Buy Slaves][$menialBioreactors-=100,$menialDemandFactor-=100,cashX(((menialSlaveCost(-100)-100)*100), "menialTransfer")]]
+	[[(x100)|Buy Slaves][$menialBioreactors-=100,$menialDemandFactor-=100,cashX(((menialSlaveCost(-100)-100)*100), "menialBioreactors")]]
 <</if>>
 <</if>>
-[[(all)|Buy Slaves][cashX(($menialBioreactors*(menialSlaveCost(-$menialBioreactors)-100)), "menialTransfer"),$menialDemandFactor-=$menialBioreactors,$menialBioreactors = 0]]
+[[(all)|Buy Slaves][cashX(($menialBioreactors*(menialSlaveCost(-$menialBioreactors)-100)), "menialBioreactors"),$menialDemandFactor-=$menialBioreactors,$menialBioreactors = 0]]
 <</if>>
 <</if>>