From 758251f7c14d27a831a45b4c4a983cc81e609ce3 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Mon, 30 Mar 2020 23:58:39 -0400
Subject: [PATCH] update function usage to support new return structure
---
src/Corporation/corporateMarket.tw | 4 ++-
src/pregmod/criminalMarkets.tw | 4 ++-
src/pregmod/nuevaUniversidadDeLibertad.tw | 4 ++-
src/pregmod/theCattleRanch.tw | 4 ++-
src/pregmod/theHippolytaAcademy.tw | 4 ++-
src/pregmod/wetwareCPUs.tw | 4 ++-
src/uncategorized/bulkSlaveGenerate.tw | 3 +-
src/uncategorized/growthResearchInstitute.tw | 4 ++-
src/uncategorized/lecoleDesEnculees.tw | 4 ++-
src/uncategorized/resSale.tw | 36 +++++++++++++++-----
src/uncategorized/slaveMarkets.tw | 4 ++-
src/uncategorized/stClaverPreparatory.tw | 4 ++-
src/uncategorized/theFutanariSisters.tw | 4 ++-
src/uncategorized/theGymnasiumAcademy.tw | 4 ++-
src/uncategorized/theSlavegirlSchool.tw | 4 ++-
15 files changed, 68 insertions(+), 23 deletions(-)
diff --git a/src/Corporation/corporateMarket.tw b/src/Corporation/corporateMarket.tw
index 641e5b782de..def8ba4ea05 100644
--- a/src/Corporation/corporateMarket.tw
+++ b/src/Corporation/corporateMarket.tw
@@ -65,7 +65,9 @@ Of course, you know all about the corporation, but sales<<if $corp.SpecAge == 3>
_HeU explains that the corporation captures many people, so it only retains and trains those that fit its product lines.
-<<= generateMarketSlave("corporate")>>
+<<set _marketResult = generateMarketSlave("corporate")>>
+<<set $activeSlave = _marketResult.slave>>
+<<print _marketResult.text>>
<br><br>
_HisU presentation done, the
diff --git a/src/pregmod/criminalMarkets.tw b/src/pregmod/criminalMarkets.tw
index 748463c9075..a319abe3279 100644
--- a/src/pregmod/criminalMarkets.tw
+++ b/src/pregmod/criminalMarkets.tw
@@ -41,7 +41,9 @@ You board the transport to
<</switch>>
-<<= generateMarketSlave($weeklyMarket)>>
+<<set _marketResult = generateMarketSlave($weeklyMarket)>>
+<<set $activeSlave = _marketResult.slave>>
+<<print _marketResult.text>>
<br><br>
diff --git a/src/pregmod/nuevaUniversidadDeLibertad.tw b/src/pregmod/nuevaUniversidadDeLibertad.tw
index d37f3781643..a3c476b56aa 100644
--- a/src/pregmod/nuevaUniversidadDeLibertad.tw
+++ b/src/pregmod/nuevaUniversidadDeLibertad.tw
@@ -11,7 +11,9 @@
<br><br>Nueva Universidad de Libertad offers a fresh graduate for inspection via video call. The interview takes place in said graduate's dormitory. The room is sparse and utilitarian, and immaculately clean. Likely by design, it looks like the set from an old sci-fi movie.
-<<= generateMarketSlave("NUL")>>
+<<set _marketResult = generateMarketSlave("NUL")>>
+<<set $activeSlave = _marketResult.slave>>
+<<print _marketResult.text>>
<<set _slaveCost = slaveCost($activeSlave)>>
<<if $NUL.schoolSale != 0>>
<<set _slaveCost = Math.trunc(_slaveCost*0.5)>>
diff --git a/src/pregmod/theCattleRanch.tw b/src/pregmod/theCattleRanch.tw
index ce0cd6693ad..a217cb10266 100644
--- a/src/pregmod/theCattleRanch.tw
+++ b/src/pregmod/theCattleRanch.tw
@@ -11,7 +11,9 @@
<br><br>The Cattle Ranch parades a choice selection of cows for your viewing pleasure. You're free to do as you please to the slaves, as long as you don't cause lasting harm to them.<<if isFertile($PC) && $PC.preg != -1>> You can't help but notice the number of bulls lining up along the fence sniffing at you.<</if>>
-<<= generateMarketSlave("TCR")>>
+<<set _marketResult = generateMarketSlave("TCR")>>
+<<set $activeSlave = _marketResult.slave>>
+<<print _marketResult.text>>
<<set _slaveCost = slaveCost($activeSlave)>>
<<if $TCR.schoolSale != 0>>
<<set _slaveCost = Math.trunc(_slaveCost*0.5)>>
diff --git a/src/pregmod/theHippolytaAcademy.tw b/src/pregmod/theHippolytaAcademy.tw
index a9a3c60c50c..c141d463568 100644
--- a/src/pregmod/theHippolytaAcademy.tw
+++ b/src/pregmod/theHippolytaAcademy.tw
@@ -20,7 +20,9 @@ The Hippolyta Academy is one of the most famous slave bodyguarding schools in al
<br><br>The Hippolyta Academy offers a fresh graduate for inspection. The interview takes place in one of the many training areas of the school, where the physical prowess of the candidate can be easily showcased.
-<<= generateMarketSlave("HA")>>
+<<set _marketResult = generateMarketSlave("HA")>>
+<<set $activeSlave = _marketResult.slave>>
+<<print _marketResult.text>>
<<set _slaveCost = slaveCost($activeSlave)>>
<<if $HA.schoolSale != 0>>
<<set _slaveCost = Math.trunc(_slaveCost*0.6)>>
diff --git a/src/pregmod/wetwareCPUs.tw b/src/pregmod/wetwareCPUs.tw
index d1970d04a09..01307db09bb 100644
--- a/src/pregmod/wetwareCPUs.tw
+++ b/src/pregmod/wetwareCPUs.tw
@@ -11,7 +11,9 @@
<br><br>
-<<= generateMarketSlave("wetware")>>
+<<set _marketResult = generateMarketSlave("wetware")>>
+<<set $activeSlave = _marketResult.slave>>
+<<print _marketResult.text>>
<<set _slaveCost = slaveCost($activeSlave)>>
<<if $slavesSeen > $slaveMarketLimit>><<set _slaveCost += Math.trunc(_slaveCost*(($slavesSeen-$slaveMarketLimit)*0.1))>><</if>>
diff --git a/src/uncategorized/bulkSlaveGenerate.tw b/src/uncategorized/bulkSlaveGenerate.tw
index 496e71fccfa..68cdeb14ad2 100644
--- a/src/uncategorized/bulkSlaveGenerate.tw
+++ b/src/uncategorized/bulkSlaveGenerate.tw
@@ -81,7 +81,8 @@
<</switch>>
<<for _i = 0; _i < $numSlaves; _i++>>
- <<run generateMarketSlave($slaveMarket, $numArcology)>>
+ <<set _marketResult = generateMarketSlave($slaveMarket, $numArcology)>>
+ <<set $activeSlave = _marketResult.slave>>
<<set $slavesSeen++>>
<<if $applyLaw == 0>>
<<set _slaveCost = slaveCost($activeSlave)>>
diff --git a/src/uncategorized/growthResearchInstitute.tw b/src/uncategorized/growthResearchInstitute.tw
index 869d8babdf9..31c25fa7001 100644
--- a/src/uncategorized/growthResearchInstitute.tw
+++ b/src/uncategorized/growthResearchInstitute.tw
@@ -11,7 +11,9 @@
<br><br>GRI offers a fresh graduate for inspection via video call. The interview takes place in the graduate's bare-metal holding cell. Disturbingly, it is strongly reminiscent of an enclosure for a lab animal, only scaled up to contain a lab animal of human dimensions.
-<<= generateMarketSlave("GRI")>>
+<<set _marketResult = generateMarketSlave("GRI")>>
+<<set $activeSlave = _marketResult.slave>>
+<<print _marketResult.text>>
<<set _slaveCost = slaveCost($activeSlave)>>
<<setLocalPronouns $activeSlave>>
<<if $GRI.schoolSale != 0>>
diff --git a/src/uncategorized/lecoleDesEnculees.tw b/src/uncategorized/lecoleDesEnculees.tw
index 608f2a2856f..66a9733cd7c 100644
--- a/src/uncategorized/lecoleDesEnculees.tw
+++ b/src/uncategorized/lecoleDesEnculees.tw
@@ -11,7 +11,9 @@
<br><br>L'École des Enculées offers a fresh graduate for inspection via video call. The interview takes place in the dormitory for the oldest class of girls. Absurdly sexual squeals repeatedly interrupt the call, making it very clear that someone close by the interviewee is experiencing a strong combination of anal pain and anal pleasure.
-<<= generateMarketSlave("LDE")>>
+<<set _marketResult = generateMarketSlave("LDE")>>
+<<set $activeSlave = _marketResult.slave>>
+<<print _marketResult.text>>
<<set _slaveCost = slaveCost($activeSlave)>>
<<if $LDE.schoolSale != 0>>
<<set _slaveCost = Math.trunc(_slaveCost*0.5)>>
diff --git a/src/uncategorized/resSale.tw b/src/uncategorized/resSale.tw
index b72d74e7b62..3f378be64c8 100644
--- a/src/uncategorized/resSale.tw
+++ b/src/uncategorized/resSale.tw
@@ -7,35 +7,53 @@
/* generate sales slave for images and pronouns */
<<if $RESSale == "TSS">>
<<set $TSS.schoolSale = 1>>
- <<= generateMarketSlave("TSS")>>
+ <<set _marketResult = generateMarketSlave("TSS")>>
+ <<set $activeSlave = _marketResult.slave>>
+ <<print _marketResult.text>>
<<set $activeSlave.clothes = "a schoolgirl outfit">>
<<elseif $RESSale == "GRI">>
<<set $GRI.schoolSale = 1>>
- <<= generateMarketSlave("GRI")>>
+ <<set _marketResult = generateMarketSlave("GRI")>>
+ <<set $activeSlave = _marketResult.slave>>
+ <<print _marketResult.text>>
<<set $activeSlave.clothes = "a slave gown">>
<<elseif $RESSale == "SCP">>
<<set $SCP.schoolSale = 1>>
- <<= generateMarketSlave("SCP")>>
+ <<set _marketResult = generateMarketSlave("SCP")>>
+ <<set $activeSlave = _marketResult.slave>>
+ <<print _marketResult.text>>
<<set $activeSlave.clothes = "a string bikini">>
<<elseif $RESSale == "LDE">>
<<set $LDE.schoolSale = 1>>
- <<= generateMarketSlave("LDE")>>
+ <<set _marketResult = generateMarketSlave("LDE")>>
+ <<set $activeSlave = _marketResult.slave>>
+ <<print _marketResult.text>>
<<elseif $RESSale == "TGA">>
<<set $TGA.schoolSale = 1>>
- <<= generateMarketSlave("TGA")>>
+ <<set _marketResult = generateMarketSlave("TGA")>>
+ <<set $activeSlave = _marketResult.slave>>
+ <<print _marketResult.text>>
<<elseif $RESSale == "TCR">>
<<set $TCR.schoolSale = 1>>
- <<= generateMarketSlave("TCR")>>
+ <<set _marketResult = generateMarketSlave("TCR")>>
+ <<set $activeSlave = _marketResult.slave>>
+ <<print _marketResult.text>>
<<elseif $RESSale == "HA">>
<<set $HA.schoolSale = 1>>
- <<= generateMarketSlave("HA")>>
+ <<set _marketResult = generateMarketSlave("HA")>>
+ <<set $activeSlave = _marketResult.slave>>
+ <<print _marketResult.text>>
<<set $activeSlave.clothes = "a nice maid outfit">>
<<elseif $RESSale == "NUL">>
<<set $NUL.schoolSale = 1>>
- <<= generateMarketSlave("NUL")>>
+ <<set _marketResult = generateMarketSlave("NUL")>>
+ <<set $activeSlave = _marketResult.slave>>
+ <<print _marketResult.text>>
<<else>>
<<set $TFS.schoolSale = 1>>
- <<= generateMarketSlave("TFS")>>
+ <<set _marketResult = generateMarketSlave("TFS")>>
+ <<set $activeSlave = _marketResult.slave>>
+ <<print _marketResult.text>>
<</if>>
<<setLocalPronouns $activeSlave>>
diff --git a/src/uncategorized/slaveMarkets.tw b/src/uncategorized/slaveMarkets.tw
index 219e66cc40a..35a819ff6c0 100644
--- a/src/uncategorized/slaveMarkets.tw
+++ b/src/uncategorized/slaveMarkets.tw
@@ -171,7 +171,9 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex
<</switch>>
-<<= generateMarketSlave($slaveMarket, ($numArcology || 1))>>
+<<set _marketResult = generateMarketSlave($slaveMarket, ($numArcology || 1))>>
+<<set $activeSlave = _marketResult.slave>>
+<<print _marketResult.text>>
<br><br>
diff --git a/src/uncategorized/stClaverPreparatory.tw b/src/uncategorized/stClaverPreparatory.tw
index d2431778c12..5a1b3102d96 100644
--- a/src/uncategorized/stClaverPreparatory.tw
+++ b/src/uncategorized/stClaverPreparatory.tw
@@ -11,7 +11,9 @@
<br><br>St. Claver Preparatory offers a fresh graduate for inspection via video call. The interview takes place in a very obviously medical office, with medical supply robots wheeling past its glass walls and nurses hurrying to and fro.
-<<= generateMarketSlave("SCP")>>
+<<set _marketResult = generateMarketSlave("SCP")>>
+<<set $activeSlave = _marketResult.slave>>
+<<print _marketResult.text>>
<<set _slaveCost = slaveCost($activeSlave)>>
<<if $SCP.schoolSale != 0>>
<<set _slaveCost = Math.trunc(_slaveCost*0.5)>>
diff --git a/src/uncategorized/theFutanariSisters.tw b/src/uncategorized/theFutanariSisters.tw
index 096b4e634d9..78100e15ae8 100644
--- a/src/uncategorized/theFutanariSisters.tw
+++ b/src/uncategorized/theFutanariSisters.tw
@@ -132,7 +132,9 @@ The Sisters offer a member selected for sale into slavery for inspection via vid
<br><br>
-<<= generateMarketSlave("TFS")>>
+<<set _marketResult = generateMarketSlave("TFS")>>
+<<set $activeSlave = _marketResult.slave>>
+<<print _marketResult.text>>
<<set _slaveCost = slaveCost($activeSlave)>>
<<set _slaveCost = Math.trunc(_slaveCost*0.8)>>
<<if $TFS.schoolSale != 0>>
diff --git a/src/uncategorized/theGymnasiumAcademy.tw b/src/uncategorized/theGymnasiumAcademy.tw
index 6a8926ece9e..5cd8f84550e 100644
--- a/src/uncategorized/theGymnasiumAcademy.tw
+++ b/src/uncategorized/theGymnasiumAcademy.tw
@@ -11,7 +11,9 @@
<br><br>The Gymnasium-Academy offers a fresh graduate for inspection via video call. The interview takes place in an office overlooking an expansive workout room, in which a large number of naked, fit young bodies are performing punishing workout routines.
-<<= generateMarketSlave("TGA")>>
+<<set _marketResult = generateMarketSlave("TGA")>>
+<<set $activeSlave = _marketResult.slave>>
+<<print _marketResult.text>>
<<set _slaveCost = slaveCost($activeSlave)>>
<<if $TGA.schoolSale != 0>>
<<set _slaveCost = Math.trunc(_slaveCost*0.5)>>
diff --git a/src/uncategorized/theSlavegirlSchool.tw b/src/uncategorized/theSlavegirlSchool.tw
index 169ca27671c..fcd88b0d600 100644
--- a/src/uncategorized/theSlavegirlSchool.tw
+++ b/src/uncategorized/theSlavegirlSchool.tw
@@ -11,7 +11,9 @@
<br><br>The Slavegirl School offers a fresh graduate for inspection via video call. The interview takes place in a faculty member's office. Absurdly, it's barely distinguishable from an office at any traditional institution of higher education. The only giveaway is the profusion of sex toys on the desk and the pornography on the walls.
-<<= generateMarketSlave("TSS")>>
+<<set _marketResult = generateMarketSlave("TSS")>>
+<<set $activeSlave = _marketResult.slave>>
+<<print _marketResult.text>>
<<set _slaveCost = slaveCost($activeSlave)>>
<<if $TSS.schoolSale != 0>>
<<set _slaveCost = Math.trunc(_slaveCost*0.5)>>
--
GitLab