From fbd0e78b1bec3f40147fdadb37d8caa13abccbb5 Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Fri, 31 Aug 2018 21:31:58 -0400
Subject: [PATCH] Temping/Removing variables
---
src/uncategorized/BackwardsCompatibility.tw | 6 ++++
src/uncategorized/marketsReport.tw | 32 ++++++++++-----------
src/uncategorized/sellSlave.tw | 4 ---
src/utility/descriptionWidgetsStyle.tw | 4 +--
4 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 29e53efe91a..640edefa830 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -187,6 +187,12 @@
<<if def $titles || def $schoolsPresent || def $schoolsPerfected || def $schoolTitle>>
<<unset $titles, $schoolsPresent, $schoolsPerfected, $schoolTitle>>
<</if>>
+<<if def $appraiserGender>>
+ <<unset $appraiserGender>>
+<</if>>
+<<if def $assetDirection || def $assetAffected>>
+ <<unset $assetDirection, $assetAffected>>
+<</if>>
/* pregmod stuff */
diff --git a/src/uncategorized/marketsReport.tw b/src/uncategorized/marketsReport.tw
index f05488787fc..9133b1261e7 100644
--- a/src/uncategorized/marketsReport.tw
+++ b/src/uncategorized/marketsReport.tw
@@ -2,11 +2,11 @@
//FC Markets Report://
-<<set $assetAffected = either("general", "slaves", "entrapment", "capture", "training", "surgical", "drugs")>>
-<<set $assetDirection = either("up", "down")>>
+<<set _assetAffected = either("general", "slaves", "entrapment", "capture", "training", "surgical", "drugs")>>
+<<set _assetDirection = either("up", "down")>>
-<<if $assetAffected == "general">>
- <<if $assetDirection == "up">>
+<<if _assetAffected == "general">>
+ <<if _assetDirection == "up">>
<<if random(1,100) > 50>>
...rising energy costs drove @@.yellowgreen;rising prices@@ of several market baskets...
<<else>>
@@ -21,8 +21,8 @@
<</if>>
<<set $generalAssetPrice -= 2>>
<</if>>
-<<elseif $assetAffected == "slaves">>
- <<if $assetDirection == "up">>
+<<elseif _assetAffected == "slaves">>
+ <<if _assetDirection == "up">>
<<if random(1,100) > 50>>
...heavy demand for fashionable varieties drove @@.yellowgreen;rising slave prices@@ last...
<<else>>
@@ -37,8 +37,8 @@
<</if>>
<<set $slaveAssetPrice -= 2>>
<</if>>
-<<elseif $assetAffected == "entrapment">>
- <<if $assetDirection == "up">>
+<<elseif _assetAffected == "entrapment">>
+ <<if _assetDirection == "up">>
<<if random(1,100) > 50>>
...prospect of deregulation drove a @@.yellowgreen;scramble@@ for means of enslavement...
<<else>>
@@ -53,8 +53,8 @@
<</if>>
<<set $entrapmentAssetPrice -= 2>>
<</if>>
-<<elseif $assetAffected == "capture">>
- <<if $assetDirection == "up">>
+<<elseif _assetAffected == "capture">>
+ <<if _assetDirection == "up">>
<<if random(1,100) > 50>>
...declaration of war @@.yellowgreen;pushed up@@ average mercenary wage...
<<else>>
@@ -69,8 +69,8 @@
<</if>>
<<set $captureAssetPrice -= 2>>
<</if>>
-<<elseif $assetAffected == "training">>
- <<if $assetDirection == "up">>
+<<elseif _assetAffected == "training">>
+ <<if _assetDirection == "up">>
<<if random(1,100) > 50>>
...rising demand in turn @@.yellowgreen;pushing up@@ prices for most means of slave training...
<<else>>
@@ -85,8 +85,8 @@
<</if>>
<<set $trainingAssetPrice -= 2>>
<</if>>
-<<elseif $assetAffected == "surgical">>
- <<if $assetDirection == "up">>
+<<elseif _assetAffected == "surgical">>
+ <<if _assetDirection == "up">>
<<if random(1,100) > 50>>
...fashionable extravagant implant procedures @@.yellowgreen;driving prices@@ of remote surgical...
<<else>>
@@ -101,8 +101,8 @@
<</if>>
<<set $surgicalAssetPrice -= 2>>
<</if>>
-<<elseif $assetAffected == "drugs">>
- <<if $assetDirection == "up">>
+<<elseif _assetAffected == "drugs">>
+ <<if _assetDirection == "up">>
<<if random(1,100) > 50>>
...intense demand for curatives in conflict zones @@.yellowgreen;increasing prices@@...
<<else>>
diff --git a/src/uncategorized/sellSlave.tw b/src/uncategorized/sellSlave.tw
index cde138953f8..0bb57bbdc42 100644
--- a/src/uncategorized/sellSlave.tw
+++ b/src/uncategorized/sellSlave.tw
@@ -74,7 +74,6 @@ A reputable slave appraiser arrives promptly to inspect $him and certify $his qu
<</if>>
<</if>>
I have appraised your slave. As directed by law, my appraisal is based on $his potential income in a brothel, with modification for any significant qualities. I have found the following.
- <<set _appraiserGender = 1>>
<<case "aztec">>
one of the arcology's slave examiners, comes elegantly in wearing a very richly ornamented cape and a simple headdress to accentuate her face.<<if $arcologies[0].FSRepopulationFocusLaw == 1>> Her bronzed middle is noticeably swollen with pregnancy.<</if>> She acquaints herself with the slave and carries on a short inspection and a shorter conversation. She returns to you, goes on one knee, and follows by saying.
<<if def $PC.customTitle>>
@@ -147,7 +146,6 @@ A reputable slave appraiser arrives promptly to inspect $him and certify $his qu
<</if>>
<</if>>
I have appraised your slave. My appraisal is based on $his potential income in the whorehouse, with modification for special matters. As to them, I have found the following.
- <<set _appraiserGender = 1>>
<<case "chinese">>
an older and rather stout woman<<if $arcologies[0].FSRepopulationFocusLaw == 1>>, with a noticeably heavy pregnancy,<</if>> in traditional Chinese dress, gives you a precise and proper greeting. She extracts a tablet from one of her wide sleeves and reviews video of the slave in action before performing a physical inspection. Then she seats herself, stows her tablet again, and recites in a didactic tone, "Honored
<<if def $PC.customTitle>>
@@ -174,7 +172,6 @@ A reputable slave appraiser arrives promptly to inspect $him and certify $his qu
<</if>>
<</if>>
my appraisals are based on a slave's potential income as a prostitute, with modifiers for special characteristics. I have appraised your slave, and I have found the following.
- <<set _appraiserGender = 0>>
<<case "priestess">>
a holy woman ordained to provide this service, wears a white surplice that covers her hair and a long white dress - but since she is a priestess of the new religion, not one of the old faiths, the ensemble also includes a white leather corset, chased with gold, that displays her breasts magnificently. It's easy to tell she's no slave, though, since her nipples are covered. She accepts your gaze with a smile, and assumes a straight-backed recitation posture. "Book of the Slaver, Chapter Seven: the Appraisal, Verse Six. The appraiser shall value a slave based on $his income as a whore, with allowances for special qualities, which $he shall disclose to the Owner. Amen." She turns to her work, and then adopts her recitation posture again.
<<if def $PC.customTitle>>
@@ -195,7 +192,6 @@ A reputable slave appraiser arrives promptly to inspect $him and certify $his qu
a member of the Societal Elite you are familiar with greets you respectfully and <<if $PC.dick == 1>>tosses you a wink as she pats her rounded belly. "He's doing well.<<else>>calms her kicking child so she can continue. "Think he'll look as good as his father?<</if>> Anyway, as I'm sure you know, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>sir<<else>>madam<</if>>," she says as she uses curt instructions to direct $activeSlave.slaveName, "appraisals are based on a slave's potential worth as a toy, with modifiers for special characteristics." She scrolls down the list. "I'll just mention the interesting ones.
<<case "futa">>
a curvy, middle aged, and quite attractive woman wearing a tank top and yoga pants, greets you cheerfully and turns to the slave. As she does, you can't help but notice that the yoga pants make it obvious she has a penis almost as long as one of her forearms. She makes notes on a tablet, flipping through videos that display the slave in action as she works. "<<if def $PC.customTitle>><<print $PC.customTitle>><<elseif $PC.title == 1>>Sir<<else>>Madame<</if>>, I'm, like, sorry to have to say this to you since I know you know it better than I do, but it's the script, you know? Anyway appraisals are based on a slave's potential performance as a public slut, with modifiers for special characteristics." She makes notes. "I'll just mention the significant ones.
- <<set _appraiserGender = 0>>
<<case "businesswoman">>
an older businesswoman with a reputation for correctness, gives you a prim nod before turning to the nude slave without wasting further time. She deftly makes notes on a haptic wrist interface, flipping through videos of the slave in action as she works. "As I'm sure you know, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>sir<<else>>madam<</if>>," she says as she uses curt instructions to direct $activeSlave.slaveName, "appraisals are based on a slave's potential income as a prostitute, with modifiers for special characteristics." Her fingers fly across the interface. "I'll just mention the significant ones.
<<case "slaver">>
diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw
index 0093b79f437..1d85ee9947d 100644
--- a/src/utility/descriptionWidgetsStyle.tw
+++ b/src/utility/descriptionWidgetsStyle.tw
@@ -858,9 +858,9 @@ $His
are near perfectly straight, instead of curving.
<<case "high-arched">>
form tall arches on $his forehead.
- <<case "elongated>>
+ <<case "elongated">>
are elongated to cover far more of $his brow than what would be considered average.
- <<case "shortened>>
+ <<case "shortened">>
are shortened to cover far less of $his brow than what would be considered average.
<<default>>
are styled to be $activeSlave.eyebrowHStyle.
--
GitLab