From 4c7e82c73ba9dd6c51bf729b0ec4c3ba3b50bafb Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Mon, 15 Jun 2020 02:04:53 -0400
Subject: [PATCH] remove longSlaveDescription.tw
---
src/Mods/SecExp/secExpSmilingMan.tw | 3 +--
src/facilities/nursery/nurseryRetrievalWorkaround.tw | 3 +--
src/pregmod/FCTV/seFCTVshows.tw | 4 ++--
.../JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw | 2 +-
src/pregmod/criminalMarkets.tw | 2 +-
src/pregmod/eliteSlave.tw | 2 +-
src/pregmod/incubatorRetrievalWorkaround.tw | 5 ++---
src/pregmod/pRaped.tw | 3 +--
src/pregmod/seHuskSlaveDelivery.tw | 2 +-
src/uncategorized/bulkSlaveIntro.tw | 4 ++--
src/uncategorized/completeCatalog.tw | 3 +--
src/uncategorized/genericPlotEvents.tw | 6 ++----
src/uncategorized/pSnatchAndGrabResult.tw | 2 +-
src/uncategorized/prestigiousSlave.tw | 3 +--
src/uncategorized/reBoomerang.tw | 2 +-
src/uncategorized/reFSAcquisition.tw | 2 +-
src/uncategorized/reMalefactor.tw | 2 +-
src/uncategorized/reRecruit.tw | 2 +-
src/uncategorized/seCustomSlaveDelivery.tw | 2 +-
src/uncategorized/seRecruiterSuccess.tw | 2 +-
src/uncategorized/slaveInteract.tw | 9 +--------
src/uncategorized/slaveShelter.tw | 2 +-
src/uncategorized/specialSlave.tw | 2 +-
src/utility/slaveCreationWidgets.tw | 6 +++---
24 files changed, 30 insertions(+), 45 deletions(-)
diff --git a/src/Mods/SecExp/secExpSmilingMan.tw b/src/Mods/SecExp/secExpSmilingMan.tw
index 20af44ef2d3..e7c651465a1 100644
--- a/src/Mods/SecExp/secExpSmilingMan.tw
+++ b/src/Mods/SecExp/secExpSmilingMan.tw
@@ -382,8 +382,7 @@
a second — $he barely manages to recover $his usual demeanor.
<</if>>
<br><br>
- <<set $saleDescription = 0, $applyLaw = 0>>
- <<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
+ <<includeDOM App.Desc.longSlave({slave: V.activeSlave, applyLaw: 0, saleDescription: 0})>>
<br> <<include "New Slave Intro">>
<</if>>
<</if>>
diff --git a/src/facilities/nursery/nurseryRetrievalWorkaround.tw b/src/facilities/nursery/nurseryRetrievalWorkaround.tw
index a45500b82a7..56ea568540c 100644
--- a/src/facilities/nursery/nurseryRetrievalWorkaround.tw
+++ b/src/facilities/nursery/nurseryRetrievalWorkaround.tw
@@ -5,9 +5,8 @@ $readySlave.slaveName has been discharged from $nurseryName and is ready to beco
<br><br>
<<set $activeSlave = $readySlave>>
-<<set $saleDescription = 0, $applyLaw = 0>>
<<set $nurseryBabies-->>
-<<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
+<<includeDOM App.Desc.longSlave({slave: V.activeSlave, saleDescription: 0, applyLaw: 0})>>
<<run newSlave($activeSlave)>>
<<set $slaves.push($activeSlave)>>
<<set $nextLink = "AS Dump">>
diff --git a/src/pregmod/FCTV/seFCTVshows.tw b/src/pregmod/FCTV/seFCTVshows.tw
index 09062d79262..aa2316a8df5 100644
--- a/src/pregmod/FCTV/seFCTVshows.tw
+++ b/src/pregmod/FCTV/seFCTVshows.tw
@@ -469,7 +469,7 @@
<<set _slaveCost = 500*Math.trunc(_slaveCost/500)>>
The offered price is <<print cashFormat(_slaveCost)>>.
- <<set $activeSlave = _slave, $saleDescription = 1>>
+ <<set $activeSlave = _slave>>
<<if $cash >= _slaveCost>>
<<link "Buy this contract.">>
<<run cashX(forceNeg(_slaveCost), "slaveTransfer", _slave)>>
@@ -479,7 +479,7 @@
<<else>>
//@@.red;You lack the necessary funds.@@//
<</if>>
- <br><br> <<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
+ <br><br> <<includeDOM App.Desc.longSlave({slave: V.activeSlave, saleDescription: 1})>>
<<run FCTV.incrementShow()>>
<<case 5>>
diff --git a/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw b/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw
index f3bde4622db..1dd2dc4ab20 100644
--- a/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw
+++ b/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw
@@ -11,7 +11,7 @@ A slave dealer has submitted a slave to satisfy your ''$Role'' order.
<br><br>//As usual, the asking price is quite high, to cover the costs of training a proper <<print $Role>>. In compensation, you can freely decline the slave should $he not meet your standards or the job has already been filled.//
-<br><br><<set $saleDescription = 1, $applyLaw = 0>><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
+<br><br><<includeDOM App.Desc.longSlave({slave: V.activeSlave, saleDescription: 1, applyLaw: 0})>>
<br><br>$His price is <<print cashFormat(_slaveCost)>>.
diff --git a/src/pregmod/criminalMarkets.tw b/src/pregmod/criminalMarkets.tw
index 49103797079..19776e32455 100644
--- a/src/pregmod/criminalMarkets.tw
+++ b/src/pregmod/criminalMarkets.tw
@@ -69,6 +69,6 @@ It will cost <<print cashFormat(_slaveCost)>> to enslave $him.
<</if>>
<br><br>
-<<set $saleDescription = 1>><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
+<<includeDOM App.Desc.longSlave({slave: V.activeSlave, saleDescription: 1})>>
<<set _slaveCost = slaveCost($activeSlave)>>
diff --git a/src/pregmod/eliteSlave.tw b/src/pregmod/eliteSlave.tw
index 7aa4c2c73a1..d00e4f94187 100644
--- a/src/pregmod/eliteSlave.tw
+++ b/src/pregmod/eliteSlave.tw
@@ -254,6 +254,6 @@ It will take <<print cashFormat(_slaveCost)>> to win the auction.
<br><br>
-<<set $saleDescription = 1, $applyLaw = 1>><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
+<<includeDOM App.Desc.longSlave({slave: V.activeSlave, saleDescription: 1, applyLaw: 1})>>
<</if>>
diff --git a/src/pregmod/incubatorRetrievalWorkaround.tw b/src/pregmod/incubatorRetrievalWorkaround.tw
index 0bcd8c12f66..c9fc65e6d25 100644
--- a/src/pregmod/incubatorRetrievalWorkaround.tw
+++ b/src/pregmod/incubatorRetrievalWorkaround.tw
@@ -9,9 +9,8 @@
<br><br>
<<set $activeSlave = $readySlave>>
- <<set $saleDescription = 0, $applyLaw = 0>>
<<set $incubatorSlaves-->>
- <<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
+ <<includeDOM App.Desc.longSlave({slave: V.activeSlave, saleDescription: 0, applyLaw: 0})>>
<<if $readySlave.tankBaby != 3>>
<<if $incubatorOrgans.length > 0>>
<<for _irw = 0; _irw < $incubatorOrgans.length; _irw++>>
@@ -36,7 +35,7 @@
<<if $cash >= $surgeryCost>>
<br>[[Contact the bodyswap surgeon.|husk Slave Swap Workaround]] //Will significantly increase the selected slave's upkeep.//
<br>[[Sell the husk to Flesh Heap.|Main][cashX(Math.trunc(slaveCost($activeSlave)/3), "slaveTransfer")]]
-//This body can be bought by the Flesh Heap for <<print cashFormat(Math.trunc(slaveCost($activeSlave)/3))>>//.
+ //This body can be bought by the Flesh Heap for <<print cashFormat(Math.trunc(slaveCost($activeSlave)/3))>>//.
<<else>>
<<run cashX(Math.trunc(slaveCost($activeSlave)/3), "slaveTransfer")>>
//You can't sustain $him and thus must sell $him for <<print cashFormat(Math.trunc(slaveCost($activeSlave)/3))>>.//
diff --git a/src/pregmod/pRaped.tw b/src/pregmod/pRaped.tw
index 9960871d3cf..e7c39ad7c16 100644
--- a/src/pregmod/pRaped.tw
+++ b/src/pregmod/pRaped.tw
@@ -238,8 +238,7 @@ While returning from a meeting with a prospective investor, an unfortunate wrong
<br>
//Applying enslavement as punishment will cost <<print cashFormat(_ContractCost)>>. Doing so and then selling $him immediately will bring in approximately <<print cashFormat(_slaveCost)>>.//
<br>
- <<set $saleDescription = 1>>
- <<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
+ <<includeDOM App.Desc.longSlave({slave: V.activeSlave, saleDescription: 1})>>
<span id="result">
<<if $cash >= _ContractCost>>
diff --git a/src/pregmod/seHuskSlaveDelivery.tw b/src/pregmod/seHuskSlaveDelivery.tw
index 62ad1d4f254..9c4b1dcceb7 100644
--- a/src/pregmod/seHuskSlaveDelivery.tw
+++ b/src/pregmod/seHuskSlaveDelivery.tw
@@ -70,7 +70,7 @@ A slave came in fitting the description you provided.
<br>
//As expected, $he is a complete vegetable, but that is what you ordered after all. You lack the facilities to care for $him in this state, so you should do what you are planning quickly. Or you could return $him to the Flesh Heap, though you won't get your credits back.//
<br><br>
-<<set $saleDescription = 1, $applyLaw = 0>><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>><<set $saleDescription = 1>>
+<<includeDOM App.Desc.longSlave({slave: V.activeSlave, saleDescription: 1, applyLaw: 0})>>
<br><br>
<span id="result">
<<if $cash >= $surgeryCost>>
diff --git a/src/uncategorized/bulkSlaveIntro.tw b/src/uncategorized/bulkSlaveIntro.tw
index 6b4f17c803f..43e22f0c9f0 100644
--- a/src/uncategorized/bulkSlaveIntro.tw
+++ b/src/uncategorized/bulkSlaveIntro.tw
@@ -83,8 +83,8 @@
<<set $activeSlave = $newSlaves[$newSlaveIndex]>>
/* Due to possible gingering, the Long Slave Description must be displayed before the New Slave Intro */
- <<set $saleDescription = 1>> /* policies were applied earlier, if needed */
- <<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
+ /* policies were applied earlier, if needed */
+ <<includeDOM App.Desc.longSlave({slave: V.activeSlave, saleDescription: 1})>>
<br>
diff --git a/src/uncategorized/completeCatalog.tw b/src/uncategorized/completeCatalog.tw
index be75901182b..7a07e025d62 100644
--- a/src/uncategorized/completeCatalog.tw
+++ b/src/uncategorized/completeCatalog.tw
@@ -20,8 +20,7 @@
</p>
<p>
- <<set $saleDescription = 1>>
- <<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
+ <<includeDOM App.Desc.longSlave({slave: V.activeSlave, saleDescription: 1})>>
<<set _slaveCost = heroSlaveCost($activeSlave, 40000)>>
</p>
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index 69705c1d2e5..a6c56236088 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -119,8 +119,7 @@ As you step off the elevator, you hear several <<if $seeDicks != 100>>female <</
<br><br>
//Enslaving $him will cost <<print cashFormat(_ContractCost)>>. Alternatively, you could sell $him. Less costs, this will bring in <<print cashFormat(_slaveCost)>>.//
<br><br>
- <<set $saleDescription = 0>>
- <<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
+ <<includeDOM App.Desc.longSlave({slave: V.activeSlave, saleDescription: 0})>>
<<elseif $PStrip == 2>>
One day, you walk by the commercial space where the strip club that closed was located. It's now advertised as a massage parlor, and indeed, you can see a couple of competent-looking, modestly dressed masseuses seeing to clients. The only chink in the old world decorum is the pretty sign detailing pricing, which lists not only various massages but the masseuses' hands, breasts, mouths,<<if $seeDicks != 100>> pussies,<</if>> and anuses.
<br><br>
@@ -128,8 +127,7 @@ As you step off the elevator, you hear several <<if $seeDicks != 100>>female <</
<br><br>
//Enslaving $him will cost <<print cashFormat(_ContractCost)>>. Alternatively, you could sell $him. Less costs, this will bring in <<print cashFormat(_slaveCost)>>.//
<br><br>
- <<set $saleDescription = 0>>
- <<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
+ <<includeDOM App.Desc.longSlave({slave: V.activeSlave, saleDescription: 0})>>
<<else>>
<<setNonlocalPronouns $seeDicks>>
One day, you walk by the commercial space where the strip club that closed was located. The <<= _girlU>>s you set up in cheap housing tried to run the place as a worker-owned strip bar for a while, but as you suspected, they were obliged to start whoring in short order. With the price of sex driven so low by slave competition, there's hardly any profit in bodies patrons can't even touch. The <<= _girlU>>s here might be prostitutes now, but they're still free and they're surviving.
diff --git a/src/uncategorized/pSnatchAndGrabResult.tw b/src/uncategorized/pSnatchAndGrabResult.tw
index 3257dc8908f..49eee0e6783 100644
--- a/src/uncategorized/pSnatchAndGrabResult.tw
+++ b/src/uncategorized/pSnatchAndGrabResult.tw
@@ -141,6 +141,6 @@ The case prompts you for a handprint code; your hand works just fine. It contain
When you state that, apparently, you are, $he climbs out of the case, prostrates $himself in the hall before you, and says reverentially into the floor, "I love you, <<if $PC.title != 0>>Master<<else>>Mistress<</if>>."
<br><br>
-<<set $saleDescription = 0, $applyLaw = 0>><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
+<<includeDOM App.Desc.longSlave({slave: V.activeSlaves, saleDescription: 0, applyLaw: 0})>>
<br><<include "New Slave Intro">>
diff --git a/src/uncategorized/prestigiousSlave.tw b/src/uncategorized/prestigiousSlave.tw
index 2cce4eb36a6..0d6f8fce07d 100644
--- a/src/uncategorized/prestigiousSlave.tw
+++ b/src/uncategorized/prestigiousSlave.tw
@@ -929,7 +929,6 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
//You lack the necessary funds to place a winning bid.//
<</if>>
-<<set $saleDescription = 1>>
-<br><br><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
+<br><br><<includeDOM App.Desc.longSlave({slave: V.activeSlave, saleDescription: 1})>>
<</if>>
diff --git a/src/uncategorized/reBoomerang.tw b/src/uncategorized/reBoomerang.tw
index 6ad5f8c43f7..fbaf1aef78e 100644
--- a/src/uncategorized/reBoomerang.tw
+++ b/src/uncategorized/reBoomerang.tw
@@ -370,7 +370,7 @@ It isn't obvious how $he managed to escape, though no doubt you could review the
<br><br>
-<<set $saleDescription = 1, $applyLaw = 0>><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
+<<includeDOM App.Desc.longSlave({slave: V.activeSlave, saleDescription: 1, applyLaw: 0})>>
<br><br>
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index b08ea66179b..ed97f272b3e 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -1522,7 +1522,7 @@ The call comes in from an office, and you suppress the urge to check whether $as
<br><br>
-<<set $saleDescription = 0>><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
+<<includeDOM App.Desc.longSlave({slave: V.activeSlave, saleDescription: 0})>>
<br><br>
diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw
index 9c8f703b52b..86dc4387614 100644
--- a/src/uncategorized/reMalefactor.tw
+++ b/src/uncategorized/reMalefactor.tw
@@ -388,7 +388,7 @@ $He is easily taken into custody and $his contraband confiscated once the jeerin
<br><br>
-<<set $saleDescription = 1>><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
+<<set $>><<includeDOM App.Desc.longSlave({slave: V.activeSlave, saleDescription: 1})>>
<br><br>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index dc28592ccd8..7404e652d43 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -2557,7 +2557,7 @@ He explains that one of his servant <<= $girl>>s was impregnated by his fool of
<br><br>
-<<set $saleDescription = 1, $applyLaw = 0>><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
+<<includeDOM App.Desc.longSlave({slave: V.activeSlave, saleDescription: 1, applyLaw: 0})>>
<br><br>
diff --git a/src/uncategorized/seCustomSlaveDelivery.tw b/src/uncategorized/seCustomSlaveDelivery.tw
index baf09520142..42fdca2a0d7 100644
--- a/src/uncategorized/seCustomSlaveDelivery.tw
+++ b/src/uncategorized/seCustomSlaveDelivery.tw
@@ -218,7 +218,7 @@ A slave dealer has submitted a slave to satisfy the order you posted.
<br><br>
-<<set $saleDescription = 1, $applyLaw = 0>><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
+<<includeDOM App.Desc.longSlave({slave: V.activeSlave, saleDescription: 1, applyLaw: 0})>>
<br><br>
diff --git a/src/uncategorized/seRecruiterSuccess.tw b/src/uncategorized/seRecruiterSuccess.tw
index d452b3780db..93d67cdd89b 100644
--- a/src/uncategorized/seRecruiterSuccess.tw
+++ b/src/uncategorized/seRecruiterSuccess.tw
@@ -194,7 +194,7 @@ Your recruiter $Recruiter.slaveName has succeeded; _he2's convinced a desperate
<br><br>
-<<set $saleDescription = 1, $applyLaw = 0>><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
+<<includeDOM App.Desc.longSlave({slave: V.activeSlave, saleDescription: 1, applyLaw: 0})>>
<br><br>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index be377d836bd..cb87c3b9d95 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -120,16 +120,9 @@
<</replace>>
<</link>>
<span id="hideOptionPages"></span>
- /*|
- [[Hide descriptions|Slave Interact][$seeDetails = 0]]*/
- /*| Desc is now refreshed on tab click, but may need this later for an "all" view.
- <span style="font-weight:bold">
- <<link "Update">><<replace "#LSD">><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>><</replace>><</link>>
- </span>
- */
<p id="optionPages"></p>
</div>
- <span id="LSD">/*<<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>*/</span>
+ <span id="LSD"></span>
<<else>>
<div style="font-style:italic">
[[Show descriptions|Slave Interact][$seeDetails = 1]]
diff --git a/src/uncategorized/slaveShelter.tw b/src/uncategorized/slaveShelter.tw
index cfca5593bbf..2848c7a44e1 100644
--- a/src/uncategorized/slaveShelter.tw
+++ b/src/uncategorized/slaveShelter.tw
@@ -377,7 +377,7 @@ The placement fee is <<print cashFormat(_slaveCost)>>.
<br><br>
-<<set $activeSlave = $shelterSlave, $saleDescription = 1>><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
+<<set $activeSlave = $shelterSlave>><<includeDOM App.Desc.longSlave({slave: V.activeSlave, saleDescription: 1})>>
<br><br>
diff --git a/src/uncategorized/specialSlave.tw b/src/uncategorized/specialSlave.tw
index a5e018b6ba9..6efdeaa488d 100644
--- a/src/uncategorized/specialSlave.tw
+++ b/src/uncategorized/specialSlave.tw
@@ -31,6 +31,6 @@
<br><br>
- <<set $saleDescription = 1>><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
+ <<includeDOM App.Desc.longSlave({slave: V.activeSlave, saleDescription: 1})>>
<</if>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 64ba326d6db..7de197a0f6a 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -790,11 +790,11 @@
<</if>>
<br><br>
<<if App.Data.misc.lawlessMarkets.includes($slaveMarket)>>
- <<set $applyLaw = 0>>
+ <<set _applyLaw = 0>>
<<else>>
- <<set $applyLaw = 1>>
+ <<set _applyLaw = 1>>
<</if>>
-<<set $saleDescription = 1>><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
+<<set $>><<includeDOM App.Desc.longSlave({slave: V.activeSlave, saleDescription: 1, applyLaw: _applyLaw})>>
<</widget>>
/%
--
GitLab