From 7d405cf4e29914ca2ed751b971d82de5a25e80f0 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Mon, 15 Jun 2020 02:12:37 -0400
Subject: [PATCH] simple removal of lsd
---
src/Mods/SecExp/secExpSmilingMan.tw | 2 +-
src/facilities/nursery/nurseryRetrievalWorkaround.tw | 2 +-
src/npc/startingGirls/startingGirls.tw | 2 +-
src/pregmod/FCTV/seFCTVshows.tw | 2 +-
.../JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw | 2 +-
src/pregmod/criminalMarkets.tw | 2 +-
src/pregmod/eliteSlave.tw | 2 +-
src/pregmod/incubatorRetrievalWorkaround.tw | 2 +-
src/pregmod/pRaped.tw | 2 +-
src/pregmod/seHuskSlaveDelivery.tw | 2 +-
src/uncategorized/bulkSlaveIntro.tw | 2 +-
src/uncategorized/completeCatalog.tw | 2 +-
src/uncategorized/genericPlotEvents.tw | 4 ++--
src/uncategorized/longSlaveDescription.tw | 2 --
src/uncategorized/pSnatchAndGrabResult.tw | 2 +-
src/uncategorized/prestigiousSlave.tw | 2 +-
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 | 4 ++--
src/uncategorized/slaveShelter.tw | 2 +-
src/uncategorized/specialSlave.tw | 2 +-
src/utility/slaveCreationWidgets.tw | 4 ++--
26 files changed, 28 insertions(+), 30 deletions(-)
delete mode 100644 src/uncategorized/longSlaveDescription.tw
diff --git a/src/Mods/SecExp/secExpSmilingMan.tw b/src/Mods/SecExp/secExpSmilingMan.tw
index 38ecf9ab6a3..20af44ef2d3 100644
--- a/src/Mods/SecExp/secExpSmilingMan.tw
+++ b/src/Mods/SecExp/secExpSmilingMan.tw
@@ -383,7 +383,7 @@
<</if>>
<br><br>
<<set $saleDescription = 0, $applyLaw = 0>>
- <<include "Long Slave Description">>
+ <<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
<br> <<include "New Slave Intro">>
<</if>>
<</if>>
diff --git a/src/facilities/nursery/nurseryRetrievalWorkaround.tw b/src/facilities/nursery/nurseryRetrievalWorkaround.tw
index 56cf180119c..a45500b82a7 100644
--- a/src/facilities/nursery/nurseryRetrievalWorkaround.tw
+++ b/src/facilities/nursery/nurseryRetrievalWorkaround.tw
@@ -7,7 +7,7 @@ $readySlave.slaveName has been discharged from $nurseryName and is ready to beco
<<set $activeSlave = $readySlave>>
<<set $saleDescription = 0, $applyLaw = 0>>
<<set $nurseryBabies-->>
-<<include "Long Slave Description">>
+<<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
<<run newSlave($activeSlave)>>
<<set $slaves.push($activeSlave)>>
<<set $nextLink = "AS Dump">>
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index 97424dd6dfa..bb591ee1b00 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -363,7 +363,7 @@
<</if>>
<</if>>
-<h2>You are customizing this slave:</h2> <<include "Long Slave Description">>
+<h2>You are customizing this slave:</h2> <<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
<div class="tabbar">
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Overview')" id="tab Overview">Overview</button>
diff --git a/src/pregmod/FCTV/seFCTVshows.tw b/src/pregmod/FCTV/seFCTVshows.tw
index fa3d38dc4dc..09062d79262 100644
--- a/src/pregmod/FCTV/seFCTVshows.tw
+++ b/src/pregmod/FCTV/seFCTVshows.tw
@@ -479,7 +479,7 @@
<<else>>
//@@.red;You lack the necessary funds.@@//
<</if>>
- <br><br> <<include "Long Slave Description">>
+ <br><br> <<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
<<run FCTV.incrementShow()>>
<<case 5>>
diff --git a/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw b/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw
index ade2190d822..f3bde4622db 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>><<include "Long Slave Description">>
+<br><br><<set $saleDescription = 1, $applyLaw = 0>><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
<br><br>$His price is <<print cashFormat(_slaveCost)>>.
diff --git a/src/pregmod/criminalMarkets.tw b/src/pregmod/criminalMarkets.tw
index 6df481168b5..49103797079 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>><<include "Long Slave Description">>
+<<set $saleDescription = 1>><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
<<set _slaveCost = slaveCost($activeSlave)>>
diff --git a/src/pregmod/eliteSlave.tw b/src/pregmod/eliteSlave.tw
index 17bb7cba409..7aa4c2c73a1 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>><<include "Long Slave Description">>
+<<set $saleDescription = 1, $applyLaw = 1>><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
<</if>>
diff --git a/src/pregmod/incubatorRetrievalWorkaround.tw b/src/pregmod/incubatorRetrievalWorkaround.tw
index dd6705e8cbb..0bcd8c12f66 100644
--- a/src/pregmod/incubatorRetrievalWorkaround.tw
+++ b/src/pregmod/incubatorRetrievalWorkaround.tw
@@ -11,7 +11,7 @@
<<set $activeSlave = $readySlave>>
<<set $saleDescription = 0, $applyLaw = 0>>
<<set $incubatorSlaves-->>
- <<include "Long Slave Description">>
+ <<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
<<if $readySlave.tankBaby != 3>>
<<if $incubatorOrgans.length > 0>>
<<for _irw = 0; _irw < $incubatorOrgans.length; _irw++>>
diff --git a/src/pregmod/pRaped.tw b/src/pregmod/pRaped.tw
index e70049ccaf2..9960871d3cf 100644
--- a/src/pregmod/pRaped.tw
+++ b/src/pregmod/pRaped.tw
@@ -239,7 +239,7 @@ While returning from a meeting with a prospective investor, an unfortunate wrong
//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>>
- <<include "Long Slave Description">>
+ <<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
<span id="result">
<<if $cash >= _ContractCost>>
diff --git a/src/pregmod/seHuskSlaveDelivery.tw b/src/pregmod/seHuskSlaveDelivery.tw
index cada3a1d2c9..62ad1d4f254 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>><<include "Long Slave Description">><<set $saleDescription = 1>>
+<<set $saleDescription = 1, $applyLaw = 0>><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>><<set $saleDescription = 1>>
<br><br>
<span id="result">
<<if $cash >= $surgeryCost>>
diff --git a/src/uncategorized/bulkSlaveIntro.tw b/src/uncategorized/bulkSlaveIntro.tw
index bb6c6acf7bd..6b4f17c803f 100644
--- a/src/uncategorized/bulkSlaveIntro.tw
+++ b/src/uncategorized/bulkSlaveIntro.tw
@@ -84,7 +84,7 @@
/* 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 */
- <<include "Long Slave Description">>
+ <<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
<br>
diff --git a/src/uncategorized/completeCatalog.tw b/src/uncategorized/completeCatalog.tw
index 6a05425d47d..be75901182b 100644
--- a/src/uncategorized/completeCatalog.tw
+++ b/src/uncategorized/completeCatalog.tw
@@ -21,7 +21,7 @@
<p>
<<set $saleDescription = 1>>
- <<include "Long Slave Description">>
+ <<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
<<set _slaveCost = heroSlaveCost($activeSlave, 40000)>>
</p>
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index 079e3e66708..69705c1d2e5 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -120,7 +120,7 @@ As you step off the elevator, you hear several <<if $seeDicks != 100>>female <</
//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>>
- <<include "Long Slave Description">>
+ <<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
<<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>
@@ -129,7 +129,7 @@ As you step off the elevator, you hear several <<if $seeDicks != 100>>female <</
//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>>
- <<include "Long Slave Description">>
+ <<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
<<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/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
deleted file mode 100644
index 1d389ac06f8..00000000000
--- a/src/uncategorized/longSlaveDescription.tw
+++ /dev/null
@@ -1,2 +0,0 @@
-:: Long Slave Description [nobr]
-<<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
\ No newline at end of file
diff --git a/src/uncategorized/pSnatchAndGrabResult.tw b/src/uncategorized/pSnatchAndGrabResult.tw
index c2bf607e7b0..3257dc8908f 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>><<include "Long Slave Description">>
+<<set $saleDescription = 0, $applyLaw = 0>><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
<br><<include "New Slave Intro">>
diff --git a/src/uncategorized/prestigiousSlave.tw b/src/uncategorized/prestigiousSlave.tw
index 398559781d9..2cce4eb36a6 100644
--- a/src/uncategorized/prestigiousSlave.tw
+++ b/src/uncategorized/prestigiousSlave.tw
@@ -930,6 +930,6 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<</if>>
<<set $saleDescription = 1>>
-<br><br><<include "Long Slave Description">>
+<br><br><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
<</if>>
diff --git a/src/uncategorized/reBoomerang.tw b/src/uncategorized/reBoomerang.tw
index 8b5447c3759..6ad5f8c43f7 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>><<include "Long Slave Description">>
+<<set $saleDescription = 1, $applyLaw = 0>><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
<br><br>
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index eb615734f83..b08ea66179b 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>><<include "Long Slave Description">>
+<<set $saleDescription = 0>><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
<br><br>
diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw
index 6a06815776d..9c8f703b52b 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>><<include "Long Slave Description">>
+<<set $saleDescription = 1>><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
<br><br>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index 665917fb510..dc28592ccd8 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>><<include "Long Slave Description">>
+<<set $saleDescription = 1, $applyLaw = 0>><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
<br><br>
diff --git a/src/uncategorized/seCustomSlaveDelivery.tw b/src/uncategorized/seCustomSlaveDelivery.tw
index 70634457fb1..baf09520142 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>><<include "Long Slave Description">>
+<<set $saleDescription = 1, $applyLaw = 0>><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
<br><br>
diff --git a/src/uncategorized/seRecruiterSuccess.tw b/src/uncategorized/seRecruiterSuccess.tw
index 14a62da68b7..d452b3780db 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>><<include "Long Slave Description">>
+<<set $saleDescription = 1, $applyLaw = 0>><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
<br><br>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 0ab37dccd50..be377d836bd 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -124,12 +124,12 @@
[[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">><<include "Long Slave Description">><</replace>><</link>>
+ <<link "Update">><<replace "#LSD">><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>><</replace>><</link>>
</span>
*/
<p id="optionPages"></p>
</div>
- <span id="LSD">/*<<include "Long Slave Description">>*/</span>
+ <span id="LSD">/*<<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>*/</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 4ef3f225a4d..cfca5593bbf 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>><<include "Long Slave Description">>
+<<set $activeSlave = $shelterSlave, $saleDescription = 1>><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
<br><br>
diff --git a/src/uncategorized/specialSlave.tw b/src/uncategorized/specialSlave.tw
index 4634b3fa3a3..a5e018b6ba9 100644
--- a/src/uncategorized/specialSlave.tw
+++ b/src/uncategorized/specialSlave.tw
@@ -31,6 +31,6 @@
<br><br>
- <<set $saleDescription = 1>><<include "Long Slave Description">>
+ <<set $saleDescription = 1>><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
<</if>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 0e21f1e7a2b..64ba326d6db 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -794,7 +794,7 @@
<<else>>
<<set $applyLaw = 1>>
<</if>>
-<<set $saleDescription = 1>><<include "Long Slave Description">>
+<<set $saleDescription = 1>><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
<</widget>>
/%
@@ -823,5 +823,5 @@
<</if>>
<br><br>
-<<set $saleDescription = 1>><<include "Long Slave Description">>
+<<set $saleDescription = 1>><<includeDOM App.Desc.longSlave({slave: V.activeSlave})>>
<</widget>>
--
GitLab