diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw index 30093a9a72998ad35cdbb44b13731d2a0e33c6e6..a17814d2120dd2d0ec067da4cb61b2a07fbc1ddb 100644 --- a/src/npc/startingGirls/startingGirls.tw +++ b/src/npc/startingGirls/startingGirls.tw @@ -298,7 +298,6 @@ __You are customizing this slave:__ <span id="slaveinfo"> <<set $saleDescription = 1>> <<include "Long Slave Description">> -<<set $saleDescription = 0>> </span> <br> ''<<link "Refresh">><<goto "Starting Girls">><</link>>'' diff --git a/src/uncategorized/bulkSlaveIntro.tw b/src/uncategorized/bulkSlaveIntro.tw index f6d1019cc13e9a17ea87fada58e17790c7859a73..6b42c4c085a54bed201fce3e2dc1e129339341ca 100644 --- a/src/uncategorized/bulkSlaveIntro.tw +++ b/src/uncategorized/bulkSlaveIntro.tw @@ -82,7 +82,6 @@ /* 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">> - <<set $saleDescription = 0>> <br> diff --git a/src/uncategorized/corporateMarket.tw b/src/uncategorized/corporateMarket.tw index feeb4aaf029c40c84b57f5ffbeee9e39c0a77ef7..d52400f53288c6f55f65f027b178470c5376cc19 100644 --- a/src/uncategorized/corporateMarket.tw +++ b/src/uncategorized/corporateMarket.tw @@ -95,8 +95,7 @@ The offered price is ¤<<print $slaveCost>>.<<if $slavesSeen > $slaveMarketLimit [[Decline to purchase her and check out another slave|Corporate Market][$slavesSeen += 1]] <br><br> -<<set $applyLaw = 1>> -<<set $saleDescription = 1>><<include "Long Slave Description">><<set $saleDescription = 0>> +<<set $saleDescription = 1, $applyLaw = 1>><<include "Long Slave Description">> <br><br> diff --git a/src/uncategorized/growthResearchInstitute.tw b/src/uncategorized/growthResearchInstitute.tw index bfdabb044786e015001fd27de8281c0a5b096502..8a496ea2c65fcad73f333c711388c16f243f49ce 100644 --- a/src/uncategorized/growthResearchInstitute.tw +++ b/src/uncategorized/growthResearchInstitute.tw @@ -38,6 +38,4 @@ <</if>> <br><br> -<<set $saleDescription = 1>> -<<include "Long Slave Description">> -<<set $saleDescription = 0>> +<<set $saleDescription = 1>><<include "Long Slave Description">> diff --git a/src/uncategorized/householdLiquidator.tw b/src/uncategorized/householdLiquidator.tw index f0cc390f51e3bf79d1858c1e5baa66e0c04b83f9..935f32c742cf98ed6424651acde3a9fc5f9bd94a 100644 --- a/src/uncategorized/householdLiquidator.tw +++ b/src/uncategorized/householdLiquidator.tw @@ -39,10 +39,7 @@ The price is ¤<<print $slaveCost*3>>. <br>[[Decline to purchase them and check out another set of slaves|Household Liquidator][$slavesSeen += 2]] <br><br> -<<set $saleDescription = 1>> -<<set $applyLaw = 1>> -<<include "Long Slave Description">> -<<set $saleDescription = 0>> +<<set $saleDescription = 1, $applyLaw = 1>><<include "Long Slave Description">> <<elseif random(1,100) > 20>> diff --git a/src/uncategorized/lecoleDesEnculees.tw b/src/uncategorized/lecoleDesEnculees.tw index 8b39d9d9083e32c18b6f49e6655eae6ff517833e..d964af6e657cee9b1ec5d4bc285030ffedc99e91 100644 --- a/src/uncategorized/lecoleDesEnculees.tw +++ b/src/uncategorized/lecoleDesEnculees.tw @@ -38,6 +38,4 @@ <</if>> <br><br> -<<set $saleDescription = 1>> -<<include "Long Slave Description">> -<<set $saleDescription = 0>> +<<set $saleDescription = 1>><<include "Long Slave Description">> diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw index 2588b17bafb2b03184d641602c99597a60354804..0b65a133f2a86d349d2ecbe73e8d1bd9b430ea63 100644 --- a/src/uncategorized/longSlaveDescription.tw +++ b/src/uncategorized/longSlaveDescription.tw @@ -3021,3 +3021,5 @@ Her scars make her look like she's in the right place. She is completely @@.cyan;dependent on aphrodisiacs@@, and it is unlikely you will ever be able to wean her off them. <</if>> <</if>> + +<<set $saleDescription = 0, $applyLaw = 0>> /* clear sale flag, if set */ diff --git a/src/uncategorized/pSnatchAndGrabResult.tw b/src/uncategorized/pSnatchAndGrabResult.tw index 9dcccf801629df1d4e84af3e81f830d891ccb939..98d8937d81e246f2816faf7ab27b4bfba1de911c 100644 --- a/src/uncategorized/pSnatchAndGrabResult.tw +++ b/src/uncategorized/pSnatchAndGrabResult.tw @@ -1,6 +1,4 @@ -:: P snatch and grab result - -<<nobr>> +:: P snatch and grab result [nobr] <<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event", $returnTo = "Random Nonindividual Event", $PSnatch = 0>> @@ -71,10 +69,10 @@ <<set $activeSlave.trust = 100>> <<set $activeSlave.health = 250>> <<set $activeSlave.face = 15>> -<<set $activeSlave.faceShape to "androgynous">> -<<set $activeSlave.anus to 0>> -<<set $activeSlave.vagina to 0>> -<<set $activeSlave.ovaries to 1>> +<<set $activeSlave.faceShape = "androgynous">> +<<set $activeSlave.anus = 0>> +<<set $activeSlave.vagina = 0>> +<<set $activeSlave.ovaries = 1>> <<if $seeDicks == 0>> <<set $activeSlave.dick = 0>> <<set $activeSlave.balls = 0>> @@ -105,11 +103,11 @@ <<set $activeSlave.weight = 0>> <<set $activeSlave.muscles = 20>> <<set $activeSlave.waist = -75>> -<<set $activeSlave.hStyle to "shaved bald, with a barcode tattooed on the top of her head">> -<<set $activeSlave.hLength to 0>> -<<set $activeSlave.customDesc to "Her skin is unnaturally perfect, totally without blemishes. She radiates unnatural health and resilience.">> -<<set $activeSlave.behavioralFlaw to "odd">> -<<set $activeSlave.fetish to "none">> +<<set $activeSlave.hStyle = "shaved bald, with a barcode tattooed on the top of her head">> +<<set $activeSlave.hLength = 0>> +<<set $activeSlave.customDesc = "Her skin is unnaturally perfect, totally without blemishes. She radiates unnatural health and resilience.">> +<<set $activeSlave.behavioralFlaw = "odd">> +<<set $activeSlave.fetish = "none">> <<set $activeSlave.energy = 100>> <<set $activeSlave.fetishKnown = 1>> <<set $activeSlave.attrKnown = 1>> @@ -120,14 +118,13 @@ <<slaveCost $activeSlave>> <<set $slaveCost -= 1000>> -<</nobr>>\ -\ In the middle of the night, there is a polite knock on your penthouse door. You are alerted by $assistantName, who observes with some irritation that the mercenary who knocked has gone, has left a large case outside the door, and has satisfied the security systems that the case contains nothing hazardous. The case prompts you for a handprint code; your hand works just fine. It contains a naked, hairless, perfectly healthy young body in the fetal position. This person awakes as the case opens, looks you confidently in the eye, and says "Are you my <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>?" When you state that, apparently, you are, she climbs out of the case, prostrates herself in the hall before you, and says reverentially into the floor, "I love you, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>." -<<set $saleDescription = 0, $applyLaw = 0>>\ - <<include "Long Slave Description">>\ - <<include "New Slave Intro">> +<br><br> +<<set $saleDescription = 0, $applyLaw = 0>><<include "Long Slave Description">> + +<br><<include "New Slave Intro">> diff --git a/src/uncategorized/prestigiousSlave.tw b/src/uncategorized/prestigiousSlave.tw index 6b467678d5b7eb58c0ecd2759431a65a86a247b0..9273bc7a2e7dac75bee6e38125419e01faba1311 100644 --- a/src/uncategorized/prestigiousSlave.tw +++ b/src/uncategorized/prestigiousSlave.tw @@ -808,8 +808,6 @@ It will take ¤<<print $slaveCost>> to win the auction. <</if>> <</nobr>> -<<set $saleDescription = 1>>\ -<<include "Long Slave Description">>\ -<<set $saleDescription = 0>>\ +<<set $saleDescription = 1>><<include "Long Slave Description">>\ <</if>> diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw index e7fc96314efdd946a8c65d83f0af3a2233e17534..40cf0ea5cb65d6edc7f48d8d14c6165acee7dd49 100644 --- a/src/uncategorized/reMalefactor.tw +++ b/src/uncategorized/reMalefactor.tw @@ -247,9 +247,7 @@ <br><br> -<<set $saleDescription = 1, $applyLaw = 0>> -<<include "Long Slave Description">> -<<set $saleDescription = 0>> +<<set $saleDescription = 1>><<include "Long Slave Description">> <br><br> diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw index 2dc4002ea0c484f1512ee22d8267b40cbd64ee1c..a1e6de23bf838edfe318c3577ff5e743eb991c9a 100644 --- a/src/uncategorized/reRecruit.tw +++ b/src/uncategorized/reRecruit.tw @@ -1592,9 +1592,7 @@ Your desk flags a video message as having potential. It's a desperate refugee fr <br><br> -<<set $saleDescription = 1, $applyLaw = 0>> -<<include "Long Slave Description">> -<<set $saleDescription = 0>> +<<set $saleDescription = 1, $applyLaw = 0>><<include "Long Slave Description">> <br><br> diff --git a/src/uncategorized/seBirth.tw b/src/uncategorized/seBirth.tw index 98e1fa12fbf92b3a6352873a929ce266fc2d3142..bb2486954416f26d6493dbd5f5182e467a2685da 100644 --- a/src/uncategorized/seBirth.tw +++ b/src/uncategorized/seBirth.tw @@ -123,14 +123,14 @@ <<if $slaves[$i].fetish == "humiliation">> <<set $suddenBirth += 1 + $slaves[$i].fetishStrength/25>> <</if>> -<<if $slaves[$i].weight > 95>> - <<set $suddenBirth += 1>> -<<elseif $slaves[$i].weight > 130>> - <<set $suddenBirth += 2>> +<<if $slaves[$i].weight > 190>> + <<set $suddenBirth += 10>> <<elseif $slaves[$i].weight > 160>> <<set $suddenBirth += 4>> -<<elseif $slaves[$i].weight > 190>> - <<set $suddenBirth += 10>> +<<elseif $slaves[$i].weight > 130>> + <<set $suddenBirth += 2>> +<<elseif $slaves[$i].weight > 95>> + <<set $suddenBirth += 1>> <</if>> <<if $slaves[$i].muscles < -95>> <<set $suddenBirth += 20>> diff --git a/src/uncategorized/seCoursing.tw b/src/uncategorized/seCoursing.tw index e7d9b1aae37ae26b4b1d149782b48cdaa78d3082..4cae23723f50400d7a6759e9c580fb1e41c55ebc 100644 --- a/src/uncategorized/seCoursing.tw +++ b/src/uncategorized/seCoursing.tw @@ -35,7 +35,7 @@ The rules have been explained to the hares: they're to be freed if they can reac The third and final hare <</if>> -<<set _origin = _possibleOrigins.random()>> +<<set _origin = _possibleOrigins.pluck()>> /* select random origin and remove from list to avoid using same origin multiple times */ <<if _origin == "virgin">> <<set $activeSlaveOneTimeMaxAge = 20>> <<include "Generate XX Slave">> diff --git a/src/uncategorized/seCustomSlaveDelivery.tw b/src/uncategorized/seCustomSlaveDelivery.tw index a19d6a9a9f95f455709b20bba350fbf459724308..4506d22947eef7818f9ffaa256f9332a75247eab 100644 --- a/src/uncategorized/seCustomSlaveDelivery.tw +++ b/src/uncategorized/seCustomSlaveDelivery.tw @@ -1,6 +1,4 @@ -:: SE custom slave delivery - -<<nobr>> +:: SE custom slave delivery [nobr] <<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $showEncyclopedia = 1, $encyclopedia = "Enslaving People">> @@ -74,26 +72,32 @@ <<slaveCost $activeSlave>> <<set $slaveCost = $slaveCost*2>> -<</nobr>>\ -\ A slave dealer has submitted a slave to satisfy the order you posted. +<br><br> + //As usual, the asking price is quite high, to cover the costs of finding a slave to order. In compensation, you can freely decline the slave and keep the order open, or even modify it later.// -<<set $saleDescription = 1>><<include "Long Slave Description">><<set $saleDescription = 0>> +<br><br> + +<<set $saleDescription = 1, $applyLaw = 0>><<include "Long Slave Description">> + +<br><br> Her price is ¤<<print $slaveCost>>. +<br><br> + <span id="result"> -<<if $cash >= $slaveCost>>\ +<<if $cash >= $slaveCost>> <<link "Accept the offered slave">> - <<set $cash -= $slaveCost>> - <<replace "#result">> - She has been reasonably broken by the dealer that offered her to you. She has also picked up on the fact that she was specially selected, and is a little hopeful that this means she may be treated well. She is now awaiting your instructions. - <<include "New Slave Intro">> - <</replace>> -<</link>> -<<else>>\ + <<set $cash -= $slaveCost>> + <<replace "#result">> + She has been reasonably broken by the dealer that offered her to you. She has also picked up on the fact that she was specially selected, and is a little hopeful that this means she may be treated well. She is now awaiting your instructions. + <<include "New Slave Intro">> + <</replace>> + <</link>> +<<else>> //You lack the necessary funds to accept the offered slave.// -<</if>>\ +<</if>> </span> diff --git a/src/uncategorized/seRecruiterSuccess.tw b/src/uncategorized/seRecruiterSuccess.tw index 4b61f35ccd54103fbb199131fb7c5a651b86be49..ef6a162e094a0efce32f1cdaa6040cddf7cf4837 100644 --- a/src/uncategorized/seRecruiterSuccess.tw +++ b/src/uncategorized/seRecruiterSuccess.tw @@ -1,6 +1,4 @@ -:: SE recruiter success - -<<nobr>> +:: SE recruiter success [nobr] <<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $showEncyclopedia = 1, $encyclopedia = "Enslaving People", $recruiterProgress = 0>> @@ -74,19 +72,19 @@ Your recruiter $Recruiter.slaveName has succeeded; she's convinced an old world <<if $activeSlave.balls == 0>> <<set $activeSlave.balls = random(1,3)>> <</if>> -<<set $activeSlave.oralSkill to random(15,40)>> -<<set $activeSlave.analSkill to random(15,40)>> -<<set $activeSlave.faceImplant to random(0,1)>> +<<set $activeSlave.oralSkill = random(15,40)>> +<<set $activeSlave.analSkill = random(15,40)>> +<<set $activeSlave.faceImplant = random(0,1)>> <<set $activeSlave.face = Math.clamp($activeSlave.face+(20*$activeSlave.faceImplant),-100,100)>> -<<set $activeSlave.lipsPiercing to random(0,1)>> -<<set $activeSlave.tonguePiercing to random(0,1)>> -<<set $activeSlave.earPiercing to random(0,1)>> -<<set $activeSlave.nosePiercing to random(0,1)>> -<<set $activeSlave.eyebrowPiercing to random(0,1)>> -<<set $activeSlave.navelPiercing to random(0,1)>> -<<set $activeSlave.nipplesPiercing to random(0,1)>> -<<set $activeSlave.clitPiercing to random(0,1)>> -<<set $activeSlave.sexualFlaw to "hates women">> +<<set $activeSlave.lipsPiercing = random(0,1)>> +<<set $activeSlave.tonguePiercing = random(0,1)>> +<<set $activeSlave.earPiercing = random(0,1)>> +<<set $activeSlave.nosePiercing = random(0,1)>> +<<set $activeSlave.eyebrowPiercing = random(0,1)>> +<<set $activeSlave.navelPiercing = random(0,1)>> +<<set $activeSlave.nipplesPiercing = random(0,1)>> +<<set $activeSlave.clitPiercing = random(0,1)>> +<<set $activeSlave.sexualFlaw = "hates women">> <<if $recruiterEugenics == 1>> <<if $IntelligenceEugenicsSMR == 1>> <<set $activeSlave.intelligence = either(1, 2, 2, 2, 2, 2, 3)>> @@ -181,29 +179,28 @@ Your recruiter $Recruiter.slaveName has succeeded; she's convinced a desperate o <<slaveCost $activeSlave>> <<set $slaveCost -= $contractCost>> -<</nobr>>\ -\ +<br><br> -<<set $saleDescription = 1, $applyLaw = 0>>\ -<<include "Long Slave Description">>\ -<<set $saleDescription = 0>>\ +<<set $saleDescription = 1, $applyLaw = 0>><<include "Long Slave Description">> + +<br><br> <span id="result"> -<<if $cash >= $contractCost>>\ +<<if $cash >= $contractCost>> <<link "Enslave her">> <<set $cash -= $contractCost>> <<replace "#result">> <<include "New Slave Intro">> <</replace>> <</link>> //This will cost ¤$contractCost// -<<link "Sell her immediately">> +<br><<link "Sell her immediately">> <<set $cash += $slaveCost>> <<replace "#result">> $activeSlave.slaveName accepts being resold without much fuss. She's merely exchanged one unknown owner for another. For all she knows her new buyer will be less abusive than you would have been. She would be less complacent if she knew who her buyers are; she'll be immured in an arcade within the hour. <</replace>> <</link>> //This will bring in ¤$slaveCost// -<<else>>\ +<<else>> //You lack the necessary funds to enslave her.// <<set $recruiterProgress = 7>> -<</if>>\ +<</if>> </span> diff --git a/src/uncategorized/slaveMarkets.tw b/src/uncategorized/slaveMarkets.tw index 8ca62812f68c55765af7d15a556a19480a4298b0..93b2e684cc7be4980178bef5f0b2bf97bf7bafee 100644 --- a/src/uncategorized/slaveMarkets.tw +++ b/src/uncategorized/slaveMarkets.tw @@ -242,4 +242,4 @@ The offered price is ¤<<print $slaveCost>>.<<if $slavesSeen > $slaveMarketLimit <<if $slaveMarket != "indentures" && $slaveMarket != "neighbor" && $slaveMarket != "heap">> <<set $applyLaw = 1>> <</if>> -<<set $saleDescription = 1>><<include "Long Slave Description">><<set $saleDescription = 0>> +<<set $saleDescription = 1>><<include "Long Slave Description">> diff --git a/src/uncategorized/slaveShelter.tw b/src/uncategorized/slaveShelter.tw index 9e4a39f0276fc29e106f59949b115dbf4d69bb58..8ee5307ec8b59fcc7673ac13e6f0d1539b85534d 100644 --- a/src/uncategorized/slaveShelter.tw +++ b/src/uncategorized/slaveShelter.tw @@ -224,7 +224,7 @@ The placement fee is ¤<<print $slaveCost>>. <br><br> -<<set $activeSlave = $shelterSlave, $saleDescription = 1>><<include "Long Slave Description">><<set $saleDescription = 0>> +<<set $activeSlave = $shelterSlave, $saleDescription = 1>><<include "Long Slave Description">> <br><br> diff --git a/src/uncategorized/specialSlave.tw b/src/uncategorized/specialSlave.tw index f512e133ab89c75891ede40141a3b7a7275bb9d0..7c056e43322cf6cc7c5e3c248f1cdf1dcc0edb95 100644 --- a/src/uncategorized/specialSlave.tw +++ b/src/uncategorized/specialSlave.tw @@ -55,7 +55,7 @@ <br><br> <<set $specialSlavesPriceOverride = 1>> - <<set $saleDescription = 1>><<include "Long Slave Description">><<set $saleDescription = 0>> + <<set $saleDescription = 1>><<include "Long Slave Description">> <<set $specialSlavesPriceOverride = 0>> <</if>> diff --git a/src/uncategorized/stClaverPreparatory.tw b/src/uncategorized/stClaverPreparatory.tw index c52c09db7d3b84f18285a35257497e844a1cd7ae..294d645b780108dc1b248ed4efcbb0406e8b999d 100644 --- a/src/uncategorized/stClaverPreparatory.tw +++ b/src/uncategorized/stClaverPreparatory.tw @@ -38,6 +38,4 @@ <</if>> <br><br> -<<set $saleDescription = 1>> -<<include "Long Slave Description">> -<<set $saleDescription = 0>> +<<set $saleDescription = 1>><<include "Long Slave Description">> diff --git a/src/uncategorized/theFutanariSisters.tw b/src/uncategorized/theFutanariSisters.tw index 4e0c085af60d2f884fd05c86f87242368ed843cc..e2fcf9f1bccde7b675e8d6b597083afa54be3a4d 100644 --- a/src/uncategorized/theFutanariSisters.tw +++ b/src/uncategorized/theFutanariSisters.tw @@ -109,4 +109,4 @@ The price is ¤<<print $slaveCost>>.<<if $slavesSeen > $slaveMarketLimit>> You h <</if>> <br><br> -<<set $saleDescription = 1>><<include "Long Slave Description">><<set $saleDescription = 0>> +<<set $saleDescription = 1>><<include "Long Slave Description">> diff --git a/src/uncategorized/theGymnasiumAcademy.tw b/src/uncategorized/theGymnasiumAcademy.tw index 5516e635a8f396f9add72605c975d93f3638df4c..05d50656bc3b3b27d0c2eb1a6dbc42fa537b8ecc 100644 --- a/src/uncategorized/theGymnasiumAcademy.tw +++ b/src/uncategorized/theGymnasiumAcademy.tw @@ -38,6 +38,4 @@ <</if>> <br><br> -<<set $saleDescription = 1>> -<<include "Long Slave Description">> -<<set $saleDescription = 0>> +<<set $saleDescription = 1>><<include "Long Slave Description">> diff --git a/src/uncategorized/theSlavegirlSchool.tw b/src/uncategorized/theSlavegirlSchool.tw index 096c314622a6c567dd149a8a260f6f414bfe82bd..75e7d1fefd87a8defd743b4b882e4ae692af72f3 100644 --- a/src/uncategorized/theSlavegirlSchool.tw +++ b/src/uncategorized/theSlavegirlSchool.tw @@ -39,6 +39,4 @@ <</if>> <br><br> -<<set $saleDescription = 1>> -<<include "Long Slave Description">> -<<set $saleDescription = 0>> +<<set $saleDescription = 1>><<include "Long Slave Description">> diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw index dac578314200ccdc8d1f80ce6343bdc9108301a1..5b1a0e6f311b5c8efa1dc9f0f84173c375228969 100644 --- a/src/utility/slaveCreationWidgets.tw +++ b/src/utility/slaveCreationWidgets.tw @@ -743,7 +743,6 @@ <<replace #slaveinfo>> <<set $saleDescription = 1>> <<include "Long Slave Description">> - <<set $saleDescription = 0>> <</replace>> <</widget>>