From b8ca2efb29033b752d185eb43abea931133c7d00 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Tue, 5 Mar 2019 12:47:07 -0600
Subject: [PATCH] Whatevs
---
compile | 2 +-
src/facilities/farmyard/farmyardReport.tw | 2 +-
src/js/economyJS.js | 12 +++---
src/js/utilJS.js | 4 +-
src/pregmod/incubatorRetrievalWorkaround.tw | 4 +-
src/uncategorized/BackwardsCompatibility.tw | 4 +-
src/uncategorized/RESS.tw | 2 +-
src/uncategorized/costsBudget.tw | 4 +-
src/uncategorized/costsWidgets.tw | 13 +++---
src/uncategorized/longSlaveDescription.tw | 44 ++++++++++-----------
src/uncategorized/persBusiness.tw | 2 +-
src/uncategorized/reMalefactor.tw | 2 +-
src/uncategorized/recETS.tw | 2 +-
src/uncategorized/saLongTermEffects.tw | 2 +-
src/uncategorized/surgeryDegradation.tw | 4 +-
src/utility/descriptionWidgetsStyle.tw | 2 +-
16 files changed, 52 insertions(+), 53 deletions(-)
diff --git a/compile b/compile
index 5d8feaa2194..d44d129ab69 100755
--- a/compile
+++ b/compile
@@ -65,4 +65,4 @@ fi
#Make the output prettier, replacing \t with a tab and \n with a newline
sed -i -e '/^.*<div id="store-area".*$/s/\\t/\t/g' -e '/^.*<div id="store-area".*$/s/\\n/\n/g' bin/FC_pregmod_tmp.html \
- && mv bin/FC_pregmod_tmp.html bin/FC_pregmod.html
+ && mv bin/FC_pregmod_tmp.html bin/FC_pregmod.html
diff --git a/src/facilities/farmyard/farmyardReport.tw b/src/facilities/farmyard/farmyardReport.tw
index 2c1e2acfae5..fdd3719639d 100644
--- a/src/facilities/farmyard/farmyardReport.tw
+++ b/src/facilities/farmyard/farmyardReport.tw
@@ -6,7 +6,7 @@
<<SlaveSort $FarmyardiIDs>>
<<set _DL = $FarmyardiIDs.length, $farmyardSlaves = _DL, _SL = $slaves.length, $FarmerCashBonus = 0, _FLsFetish = 0, _profits = 0, _foodWeek = 0>>
<<set $FarmerDevotionBonus = 1, $FarmerDevotionThreshold = 45, $FarmerTrustBonus = 1, $FarmerTrustThreshold = 35, $FarmerHealthBonus = 0>>
-/*<<set $legendaryWombID = 0>> TODO: will the Farmyard have a lengendary womb system? */
+/*<<set $legendaryWombID = 0>> TODO: will the Farmyard have a legendary womb system? */
<!-- Statistics gathering -->
<<set $facility = $facility || {}, $facility.farmyard = initFacilityStatistics($facility.farmyard)>>
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 9567d7f2f59..e2441ada283 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -95,12 +95,12 @@ window.getCost = function(array) {
//these two apply a multiplicative effect to all costs so far.
// Calculate what the deduced expenses would be, then subtract
costSoFar = (oldCash - State.variables.cash); //How much we have spent by this point; expected to be positive.
- cashX(costSoFar - getEnvironmentCosts(costSoFar), "environment"); //getEnv takes total costs and makes it worse. Figure out how much worse and record it
+ cashX(costSoFar - getEnvironmentCosts(costSoFar), "environment"); //getEnv takes total costs and makes it worse. Figure out how much worse and record it
costSoFar = (oldCash - State.variables.cash);
cashX(costSoFar - getPCMultiplierCosts(costSoFar), "PCskills");
- //in the old order these were applied after multiplication. Not sure if deliberate, but I'm leaving it for now.
+ //in the old order these were applied after multiplication. Not sure if deliberate, but I'm leaving it for now.
cashX(forceNeg(getSFCosts()), "specialForces");
cashX(forceNeg(getWeatherCosts()), "weather");
return (oldCash - State.variables.cash);
@@ -1076,9 +1076,9 @@ window.initFacilityStatistics = function(facility) {
/*
-Welcome to the new way to spend and make money, all while having it recorded: cashX! In the past, costs were directly deducted from $cash, with something like <<set $cash -= 100>>.
+Welcome to the new way to spend and make money, all while having it recorded: cashX! In the past, costs were directly deducted from $cash, with something like <<set $cash -= 100>>.
-The new system will still happily spend your money, but it will also record it in the appropriate budget category and (optinally) the appropriate slave as well.
+The new system will still happily spend your money, but it will also record it in the appropriate budget category and (optionally) the appropriate slave as well.
Let's say you were going to spend 100 on your favorite $activeSlave with cashX. You might try:
@@ -1087,13 +1087,13 @@ Let's say you were going to spend 100 on your favorite $activeSlave with cashX.
There we go!
1. -100 taken from your account
2. Recorded: -100 for the slaveMod category, to be displayed on the Budget screen
-3. Recorded: -100 noted in your activeSlave's permanent record. She better get busy paying that off!
+3. Recorded: -100 noted in your activeSlave's permanent record. She better get busy paying that off!
cashX can be used in JS as well, and can be included in [[]] style links.
Make sure that expenses arrive in the COST slot as a negative, they are often positive in code. Use the new function forceNeg or pass it along on a temporary variable if needed.
-Costs don't have to be numbers either, you can use variables. <<run cashX(forceNeg($contractCost), "slaveTransfer", $activeSlave)>>. forceNeg makes sure that whatever value $contractCost has is negative, and will therefore be recorded as an expense. You don't have to use it if you're sure the number you are passing along is negative.
+Costs don't have to be numbers either, you can use variables. <<run cashX(forceNeg($contractCost), "slaveTransfer", $activeSlave)>>. forceNeg makes sure that whatever value $contractCost has is negative, and will therefore be recorded as an expense. You don't have to use it if you're sure the number you are passing along is negative.
A full list of categories (slaveMod, slaveTransfer, event) are in the widget "setupLastWeeksCash", currently found in costsWidgets.tw. It's important to match your cost to one of those categories (or add a new one there, and display it in costsBudget.tw.)
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index aaff5aa6fbd..e570569b0ab 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -501,7 +501,7 @@ window.repFormat = function(s) {
return commaNum(Math.round(s * 100) / 100) + " rep";
}
} else {
- /* In order to calculate just how much any one category matters so we can show a "fuzzy" symbolic value to the player, we need to know how "busy" reputation was this week. To calculate this, I ADD income to expenses. Why? 100 - 100 and 10000 - 10000 BOTH are 0, but a +50 event matters a lot more in the first case than the second. I exclude overflow from the caluclation because it's not a "real" expense for our purposes, and divide by half just to make percentages a bit easier*/
+ /* In order to calculate just how much any one category matters so we can show a "fuzzy" symbolic value to the player, we need to know how "busy" reputation was this week. To calculate this, I ADD income to expenses. Why? 100 - 100 and 10000 - 10000 BOTH are 0, but a +50 event matters a lot more in the first case than the second. I exclude overflow from the calculation because it's not a "real" expense for our purposes, and divide by half just to make percentages a bit easier. */
var weight = s/(((V.lastWeeksRepIncome.Total - V.lastWeeksRepExpenses.Total) + V.lastWeeksRepExpenses.overflow)/2);
if (weight > 0.60) {
return `@@.green;+++++ rep@@`;
@@ -555,7 +555,7 @@ window.budgetLine = function(category, title) {
<td>${title}</td>\
<td>\
<<if (${income}.${category}) > 0>>\
- @@.yellowgreen;<<print cashFormat(${income}.${category})>>@@\ /*please don't put a plus sign in front of income, it's not done on a budget sheet. Safe to assume money is money unless it's in parenthesis or with a - sign.*/
+ @@.yellowgreen;<<print cashFormat(${income}.${category})>>@@\ /*please don't put a plus sign in front of income, it's not done on a budget sheet. Safe to assume money is money unless it's in parenthesis or with a - sign.*/
<<else>>\
<<print cashFormat(${income}.${category})>>\
<</if>>\
diff --git a/src/pregmod/incubatorRetrievalWorkaround.tw b/src/pregmod/incubatorRetrievalWorkaround.tw
index 488b17854a6..77370940f9e 100644
--- a/src/pregmod/incubatorRetrievalWorkaround.tw
+++ b/src/pregmod/incubatorRetrievalWorkaround.tw
@@ -80,7 +80,7 @@
Unknown.
<</if>>
<</if>>
-
+
<<run newSlave(_newSlave)>>
<<if $incubatorOrgans.length > 0>>
<<for _irw2 = 0; _irw2 < $incubatorOrgans.length; _irw2++>>
@@ -95,7 +95,7 @@
<</if>>
<</for>>
<</if>>
-
+
<</for>>
<<set $newSlavePool = 0>>
<</if>>
\ No newline at end of file
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index ba2faf69cc3..95757eb36b3 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -3303,8 +3303,8 @@ Setting missing slave variables:
<<if ndef _Slave.chastityAnus || ndef _Slave.chastityPenis || ndef _Slave.chastityVagina>>
<<if _Slave.dickAccessory == "combined chastity">>
<<set _Slave.chastityAnus = 1>>
- <<set _Slave.chastityPenis = 1>>
- <<set _Slave.dickAccessory = "none">>
+ <<set _Slave.chastityPenis = 1>>
+ <<set _Slave.dickAccessory = "none">>
<<elseif _Slave.vaginalAccessory == "combined chastity">>
<<set _Slave.chastityAnus = 1>>
<<set _Slave.chastityVagina = 1>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 2da414975ba..8775c9e5678 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -2897,7 +2897,7 @@ Your eyes move down $his body, noting
<<elseif $activeSlave.waist < -95>>
$his cartoonish wasp waist and the way it emphasizes $his status as a sex toy.
<<elseif $activeSlave.hips > 0>>
- $his wide hips and the sensual sway to them as $he walks.
+ $his wide hips and the sensual sway to them as $he walks.
<<elseif $activeSlave.waist < -10>>
$his nice narrow waist and the way it emphasizes the feminine swell of $his hips.
<<elseif $activeSlave.weight > 30>>
diff --git a/src/uncategorized/costsBudget.tw b/src/uncategorized/costsBudget.tw
index 802590cdb8e..15d5f6621ab 100644
--- a/src/uncategorized/costsBudget.tw
+++ b/src/uncategorized/costsBudget.tw
@@ -10,7 +10,7 @@
<br>
-//Here you can view many of the financial details of your arcology, <<= properTitle()>>. The detailed list of slaves and their costs (food, hormones) that you may remember can now be found in the "Slave maintenance" link. Other links will allow you to directly control areas of your arcology to adjust spending to suit your tastes.
+//Here you can view many of the financial details of your arcology, <<= properTitle()>>. The detailed list of slaves and their costs (food, hormones) that you may remember can now be found in the "Slave maintenance" link. Other links will allow you to directly control areas of your arcology to adjust spending to suit your tastes.
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>>
<br>
@@ -283,7 +283,7 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
</td>
<td>
<<set $lastWeeksCashProfits.Total = ($lastWeeksCashIncome.Total + $lastWeeksCashExpenses.Total)>>
- /* each "profit" item is calculated on this sheet, and there's two ways to generate a profit total: the difference of the income and expense totals, and adding all the profit items. If they aren't the same, I probably forgot to properly add an item's profit calculation to this sheet.*/
+ /* each "profit" item is calculated on this sheet, and there's two ways to generate a profit total: the difference of the income and expense totals, and adding all the profit items. If they aren't the same, I probably forgot to properly add an item's profit calculation to this sheet.*/
<<if $lastWeeksCashProfits.Total != hashSum($lastWeeksCashProfits) - $lastWeeksCashProfits.Total>>/* Profits includes the total number of profits, so we have to subtract it back out */
<<print (cashFormat(Math.trunc(hashSum($lastWeeksCashProfits)-$lastWeeksCashProfits.Total)))>><br>
@@.red;Fix profit calc<br>@@
diff --git a/src/uncategorized/costsWidgets.tw b/src/uncategorized/costsWidgets.tw
index a8f2669f1da..b952e9b8177 100644
--- a/src/uncategorized/costsWidgets.tw
+++ b/src/uncategorized/costsWidgets.tw
@@ -485,7 +485,7 @@
<<else>>
<<print commaNum(_repTotal)>>
<</if>>
- <<else>> /*lowercasedonkey: TODO: I don't like how vague my placeholder is. Probably need to set up some kind of sliding scale to describe how much rep (roughly) she has made or lost. Need to get a sense of common ranges.*/
+ <<else>> /* lowercasedonkey: TODO: I don't like how vague my placeholder is. Probably need to set up some kind of sliding scale to describe how much rep (roughly) she has made or lost. Need to get a sense of common ranges. */
<br>
Overall, $he has
<<if _repTotal == 0>>
@@ -500,9 +500,8 @@
<</if>>
<</widget>>
-
<<widget "setupLastWeeksCash">>
-/*Feel free to add categories. Just make sure to display them in costsBudget.tw as well!*/
+/* Feel free to add categories. Just make sure to display them in costsBudget.tw as well! */
<<set $lastWeeksCashIncome = {
/*Slave Jobs*/
whore: 0,
@@ -584,7 +583,7 @@ PCskills: 0,
stocksTraded: 0, /*trading*/
stocks: 0, /*share growth*/
fines: 0,
-event: 0, /*poker night etc. Try to file things elsewhere if you can.*/
+event: 0, /* poker night etc. Try to file things elsewhere if you can. */
war: 0,
rents: 0,
@@ -601,7 +600,7 @@ total: 0
<<widget "setupLastWeeksRep">>
-/*Feel free to add categories. Just make sure to display them in costsBudget.tw as well!*/
+/* Feel free to add categories. Just make sure to display them in costsBudget.tw as well! */
<<set $lastWeeksRepIncome = {
/*Slave Jobs*/
fucktoy: 0,
@@ -648,10 +647,10 @@ specialForces: 0,
/*Personal Finance*/
personalBusiness: 0,
PCappearance: 0,
-PCactions: 0, /*actions involving your body: becoming pregnant, etc. */
+PCactions: 0, /* actions involving your body: becoming pregnant, etc. */
PCRelationships: 0,
SlaveRelationships: 0,
-event: 0, /*poker night etc. Try to file things elsewhere if you can.*/
+event: 0, /*poker night etc. Try to file things elsewhere if you can.*/
/*special*/
multiplier: 0,
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 56a1a7f580a..ac65d6a8e82 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -1170,13 +1170,13 @@ is
<<elseif _lover.mother == $activeSlave.ID || _lover.father == $activeSlave.ID>>
$He is in an @@.lightgreen;incestuous relationship with $his daughter, <<= SlaveFullName(_lover)>>.@@
<<elseif def $showDistantRelatives && $showDistantRelatives == 1>>
- <<if isAunt($activeSlave, _lover)>>
- $He is in an @@.lightgreen;incestuous relationship with $his aunt, <<= SlaveFullName(_lover)>>.@@
- <<elseif isAunt(_lover, $activeSlave)>>
- $He is in an @@.lightgreen;incestuous relationship with $his niece, <<= SlaveFullName(_lover)>>.@@
- <<elseif areCousins($activeSlave, _lover)>>
- $He is in an @@.lightgreen;incestuous relationship with $his cousin, <<= SlaveFullName(_lover)>>.@
- <</if>>
+ <<if isAunt($activeSlave, _lover)>>
+ $He is in an @@.lightgreen;incestuous relationship with $his aunt, <<= SlaveFullName(_lover)>>.@@
+ <<elseif isAunt(_lover, $activeSlave)>>
+ $He is in an @@.lightgreen;incestuous relationship with $his niece, <<= SlaveFullName(_lover)>>.@@
+ <<elseif areCousins($activeSlave, _lover)>>
+ $He is in an @@.lightgreen;incestuous relationship with $his cousin, <<= SlaveFullName(_lover)>>.@
+ <</if>>
<<else>>
<<switch areSisters($activeSlave, _lover)>>
<<case 1>>
@@ -1204,21 +1204,21 @@ is
$He is in an @@.lightgreen;incestuous relationship with $his daughter, you.@@
<</if>>
<<elseif def $showDistantRelatives && $showDistantRelatives == 1>>
- <<if isAunt($activeSlave, $PC)>>
- <<if $PC.title == 1>>
- $He is in an @@.lightgreen;incestuous relationship with $his uncle, you.@@
- <<elseif $PC.title == 0>>
- $He is in an @@.lightgreen;incestuous relationship with $his aunt, you.@@
- <</if>>
- <<elseif isAunt($PC, $activeSlave) && $PC.title == 0>>
- <<if $PC.title == 1>>
- $He is in an @@.lightgreen;incestuous relationship with $his nephew, you.@@
- <<elseif $PC.title == 0>>
- $He is in an @@.lightgreen;incestuous relationship with $his niece, you.@@
- <</if>>
- <<elseif areCousins($PC, $activeSlave)>>
- $He is in an @@.lightgreen;incestuous relationship with $his cousin, you.@@
- <</if>>
+ <<if isAunt($activeSlave, $PC)>>
+ <<if $PC.title == 1>>
+ $He is in an @@.lightgreen;incestuous relationship with $his uncle, you.@@
+ <<elseif $PC.title == 0>>
+ $He is in an @@.lightgreen;incestuous relationship with $his aunt, you.@@
+ <</if>>
+ <<elseif isAunt($PC, $activeSlave) && $PC.title == 0>>
+ <<if $PC.title == 1>>
+ $He is in an @@.lightgreen;incestuous relationship with $his nephew, you.@@
+ <<elseif $PC.title == 0>>
+ $He is in an @@.lightgreen;incestuous relationship with $his niece, you.@@
+ <</if>>
+ <<elseif areCousins($PC, $activeSlave)>>
+ $He is in an @@.lightgreen;incestuous relationship with $his cousin, you.@@
+ <</if>>
<<elseif areSisters($PC, $activeSlave) == 1>>
<<if $PC.title == 1>>
$He is in an @@.lightgreen;incestuous relationship with $his twin brother, you.@@
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index 30e8d98aaf0..16bafe50273 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -803,7 +803,7 @@ Routine upkeep of your demesne costs @@.yellow;<<print cashFormat($costs)>>.@@
<</if>>
<</if>>
<</if>>
-<<set $costs = Math.trunc(Math.abs(getCost($slaves)) * 100)/100>> /*overwrite the prediction and actually pay the bill. GetCost should return a negative. Round to two decimal places.*/
+<<set $costs = Math.trunc(Math.abs(getCost($slaves)) * 100)/100>> /*overwrite the prediction and actually pay the bill. GetCost should return a negative. Round to two decimal places.*/
<<if isNaN($costs)>>
<br>@@.red;Error, costs is NaN@@
<</if>>
diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw
index 0444932d12e..6e6139c1396 100644
--- a/src/uncategorized/reMalefactor.tw
+++ b/src/uncategorized/reMalefactor.tw
@@ -551,7 +551,7 @@ $He is easily taken into custody and $his contraband confiscated once the jeerin
<<if $malefactor == "anchorBaby">>
<br><<link "Grant $him citizenship">>
<<replace "#result">>
- You help the exhausted mother to $his feet and hand $him $his second newborn. $He watches you, uncertain of your motives, until you have $him escorted to the proper welcoming facility and put in a good word for having $him added to your arcology's free population. You announce to the public that such a fertile <<if $activeSlave.physicalAge > 30>>MILF<<elseif $activeSlave.physicalAge > 19>>$woman<<elseif $activeSlave.physicalAge > 12>>teen<<else>>youth<</if>> will be a boon to <<if $arcologies[0].FSRepopulationFocus != "unset">>Repopulationism<<else>>society<</if>>, and that the contract $he is signing mandates $he be on powerful fertility agents whenever $he isn't pregnant. During $his residency, free or not, $he will provide society with dozens of future children. The public
+ You help the exhausted mother to $his feet and hand $him $his second newborn. $He watches you, uncertain of your motives, until you have $him escorted to the proper welcoming facility and put in a good word for having $him added to your arcology's free population. You announce to the public that such a fertile <<if $activeSlave.physicalAge > 30>>MILF<<elseif $activeSlave.physicalAge > 19>>$woman<<elseif $activeSlave.physicalAge > 12>>teen<<else>>youth<</if>> will be a boon to <<if $arcologies[0].FSRepopulationFocus != "unset">>Repopulationism<<else>>society<</if>>, and that the contract $he is signing mandates $he be on powerful fertility agents whenever $he isn't pregnant. During $his residency, free or not, $he will provide society with dozens of future children. The public
<<if $arcologies[0].FSRepopulationFocus != "unset">>
@@.green;approves of breeders, free or not,@@ and word spreads that any and all mothers are welcome into your arcology @@.green;adding to its prosperity.@@
<<run repX(500, "event", $activeSlave)>>
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index 67a6339deb1..da8cc0e78bd 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -1664,7 +1664,7 @@ This call is coming from a public kiosk, which is usually an indication that the
<<default>>
<br>ERROR: bad recETS event $RecETSevent
-
+
<</switch>>
<<switch $RecETSevent>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index f8e1b4c582d..9eee97a5e22 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -4764,7 +4764,7 @@
<<= FSChangePorn("BodyPurist", 1)>>
<</if>>
<</if>>
-
+
<<elseif $arcologies[0].FSTransformationFetishist != "unset">>
<<set _transformed = 0>>
<<if ($slaves[$i].boobsImplant > 0) && ($slaves[$i].buttImplant > 0) && ($slaves[$i].lipsImplant > 0)>>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index ee6541b6ae5..0d5188fc7e2 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -440,7 +440,7 @@ As the remote surgery's long recovery cycle completes,
<<if canSee($activeSlave)>>$He eyes $his new ears disapprovingly and they twitch slightly in response.<<else>>$He can't see but it's clear from the dull ache that $his ears have been extensively modified.<</if>><<if $activeSlave.amp != 1>>$He's still a bit sore, but $he reaches up to feel them gently.<</if>>$His new ears seem to respond to $his emotional state, with time and mild electro-stimulation $he will learn to control $his new ear muscles so $he can move them at will. $He's come to terms with the fact that $he's a slave, but $he is still somewhat angry that you would go this far. Since the surgery was fairly invasive, @@.red;$his health has been greatly affected.@@ $He is @@.gold;sensibly fearful@@ of your total power over $his body.
<<set $activeSlave.trust -= 5, $activeSlave.devotion -= 5>>
<<else>>
- <<if canSee($activeSlave)>>$He eyes $his new ears with disgust and they twitch slightly in response.<<else>>$He can't see but it's clear from the dull ache that $his ears have been extensively modified.<</if>><<if $activeSlave.amp != 1>>$He's still a bit sore, but $he reaches up to feel them gently.<</if>> $His new ears seem to respond to $his emotional state, with time and mild electro-stimulation $he will learn to control $his new ear muscles so $he can move them at will. For now, @@.mediumorchid;$he seems to view $his altered ears as a cruel imposition.@@ Since the surgery was fairly invasive, @@.red;$his health has been greatly affected.@@ $He is now @@.gold;terribly afraid@@ of your total power over $his body.
+ <<if canSee($activeSlave)>>$He eyes $his new ears with disgust and they twitch slightly in response.<<else>>$He can't see but it's clear from the dull ache that $his ears have been extensively modified.<</if>><<if $activeSlave.amp != 1>>$He's still a bit sore, but $he reaches up to feel them gently.<</if>> $His new ears seem to respond to $his emotional state, with time and mild electro-stimulation $he will learn to control $his new ear muscles so $he can move them at will. For now, @@.mediumorchid;$he seems to view $his altered ears as a cruel imposition.@@ Since the surgery was fairly invasive, @@.red;$his health has been greatly affected.@@ $He is now @@.gold;terribly afraid@@ of your total power over $his body.
<<set $activeSlave.trust -= 10, $activeSlave.devotion -= 10>>
<</if>>
@@ -1464,7 +1464,7 @@ As the remote surgery's long recovery cycle completes,
<<elseif ($activeSlave.devotion > 20)>>
$He exits the surgery gingerly, since $he can feel that something was done to $his testicles. $He examines them carefully <<if canSee($activeSlave)>>in the mirror<<else>>by feeling alone<</if>>. Realizing that $his balls fit $his scrotum perfectly, $he's flooded with relief. $He's so elated that $he hasn't been severely damaged that $he doesn't mind your taking surgical control of $his genitals. @@.red;$His health has been slightly affected.@@
<<else>>
- $He exits the surgery gingerly, since $he can feel that something was done to $his testicles. $He examines them carefully <<if canSee($activeSlave)>>in the mirror<<else>>by feeling alone<</if>>. Realizing that $his balls fit $his scrotum perfectly, $he's flooded with relief, since $he was afraid that you'd done something far more terrible. Once $he has time to think about it, though, $he's somewhat @@.mediumorchid;resentful,@@ since $he naturally feels a certain proprietary interest in $his own genetals. @@.red;$His health has been slightly affected.@@
+ $He exits the surgery gingerly, since $he can feel that something was done to $his testicles. $He examines them carefully <<if canSee($activeSlave)>>in the mirror<<else>>by feeling alone<</if>>. Realizing that $his balls fit $his scrotum perfectly, $he's flooded with relief, since $he was afraid that you'd done something far more terrible. Once $he has time to think about it, though, $he's somewhat @@.mediumorchid;resentful,@@ since $he naturally feels a certain proprietary interest in $his own genitals. @@.red;$His health has been slightly affected.@@
<<set $activeSlave.devotion -= 5>>
<</if>>
diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw
index 579e73cd46e..b8c90b4416f 100644
--- a/src/utility/descriptionWidgetsStyle.tw
+++ b/src/utility/descriptionWidgetsStyle.tw
@@ -869,7 +869,7 @@ $activeSlave.slaveName is
<</if>>
<<chastityPiercingDescription>>
-
+
<<case "a Santa dress">>
made of red felt with white fur
<<if ($activeSlave.amp == 1)>>
--
GitLab