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

Fix markets

Closes #2198

See merge request !7607

src/markets/criminalMarkets.tw

 :: Criminal Market [nobr]
 
-<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $encyclopedia = "Slave Schools", $slaveMarket = $weeklyMarket>>
+<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $encyclopedia = "Slave Schools", $slaveMarket = $prisonCircuit[$prisonCircuitIndex]>>
 
 <<if ndef $newSlaves>><<set $newSlaves = []>><</if>>
 <<if $newSlaves.length > 0>>
@@ -8,7 +8,7 @@
 <</if>>
 
 You board the transport to
-<<switch $weeklyMarket>>
+<<switch $slaveMarket>>
 <<case "low tier criminals">> /* mixed prisoners */
 
 	a small prison on the edge of the city spanning from the foot of your arcology with the appearance of an old world police station. You arrive inside and are met by a cute receptionist, asking why one such as yourself would visit such a place. With formalities out of the way, the head of the station is called and arrives shortly. "Well now, didn't expect to see you here. Came to pick up a criminal and give them a chance at not being a menial?" You are then led further into the station and into the prisoners' quarters; most of them appear downcast and dismal, but some look up to see what the commotion is about. "You! Come here! This fine <<if $PC.title == 1>>gentleman<<else>>lady<</if>> wants to take a look, so be on your best behavior!" the head calls out, bringing one of the criminals close enough to be inspected.
@@ -41,7 +41,7 @@ You board the transport to
 
 <</switch>>
 
-<<set _marketResult = generateMarketSlave($weeklyMarket)>>
+<<set _marketResult = generateMarketSlave($slaveMarket)>>
 <<set $activeSlave = _marketResult.slave>>
 <<print _marketResult.text>>
 

src/markets/theMarket/tradeMenials.js

@@ -392,7 +392,7 @@ App.UI.tradeMenials = function() {
 				linkArray = [];
 				const sellSomeFuckdolls = function(number = 1) {
 					const value = menialSlaveCost(number) * number;
-					V.menials -= number;
+					V.fuckdolls -= number;
 					V.menialDemandFactor -= number;
 					cashX(value, "fuckdollsTransfer");
 					jQuery("#menial-transaction-result").empty().append(App.UI.DOM.cashFormat(value));
@@ -492,7 +492,7 @@ App.UI.tradeMenials = function() {
 				linkArray = [];
 				const sellSomeBioreactors = function(number = 1) {
 					const value = menialSlaveCost(number - 100) * number;
-					V.menials -= number;
+					V.menialBioreactors -= number;
 					V.menialDemandFactor -= number;
 					jQuery("#menial-transaction-result").empty().append(App.UI.DOM.cashFormat(value));
 					cashX(value, "bioreactorsTransfer");