From b8df53ac3e8c72056d5f1673bf67ea09ac55ccf1 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Fri, 24 May 2019 14:51:29 -0500
Subject: [PATCH] UpdatesAndFixes
---
devNotes/scene-guide.txt | 8 ++++----
src/facilities/nursery/longChildDescription.tw | 2 +-
src/js/generateMarketSlave.js | 2 +-
src/js/utilJS.js | 2 +-
src/uncategorized/longSlaveDescription.tw | 2 +-
src/uncategorized/masterSuiteReport.tw | 4 ++--
src/uncategorized/reFSAcquisition.tw | 2 +-
src/uncategorized/reRecruit.tw | 8 ++++----
src/uncategorized/reShelterInspection.tw | 2 +-
9 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/devNotes/scene-guide.txt b/devNotes/scene-guide.txt
index 1437834a9f0..e54e87cfb7a 100644
--- a/devNotes/scene-guide.txt
+++ b/devNotes/scene-guide.txt
@@ -72,10 +72,10 @@ So a random (really stupid) example might be:
You fuck $activeSlave.slaveName's _orifice.
<<if _wasVirgin != ''>>
<<if $activeSlave.devotion > 50>>
- She @@.hotpink;loves@@ losing her <<print _wasVirgin>> virginity to you.
+ $He @@.hotpink;loves@@ losing $his <<print _wasVirgin>> virginity to you.
<<set $activeSlave.devotion += 5>>
<<else>>
- She @@.mediumorchid;@@dislikes losing her <<print _wasVirgin>> virginity to you.
+ $He @@.mediumorchid;@@dislikes losing $his <<print _wasVirgin>> virginity to you.
<<set $activeSlave.devotion -= 5>>
<</if>>
<</if>>
@@ -107,13 +107,13 @@ Some hints:
<</if>>
And then fill it in later than it is to end up with a situation where you have a dozen unclosed tags and you can't remember where they are or what they do.
-2. For very simple stuff, it's fine to "inline" your stuff. For example, when penetrating a slave, doing "you fuck her <<if $activeSlave.vagina > -1>>pussy<<else>>ass<</if>>" to show "pussy" or "ass" as necessary. However, if you need to do the same comparison a bunch of times, do something like
+2. For very simple stuff, it's fine to "inline" your stuff. For example, when penetrating a slave, doing "you fuck $his <<if $activeSlave.vagina > -1>>pussy<<else>>ass<</if>>" to show "pussy" or "ass" as necessary. However, if you need to do the same comparison a bunch of times, do something like
<<if $activeSlave.vagina > -1>>
<<set _targetOrifice = "vagina">>
<<else>>
<<set _targetOrifice = "asshole">>
<</if>>
-And then, when you need it, do "you fuck her _targetOrifice" in sixteen different places without having the pain in the ass of copy/pasting the same if/else clause every time.
+And then, when you need it, do "you fuck $his _targetOrifice" in sixteen different places without having the pain in the ass of copy/pasting the same if/else clause every time.
3. INDENT YOUR LOGIC. USE TABS. I'm serious. Don't question me. It will make EVERYONE hate you, when they have to deal with your code, if it's not indented properly.
This is much easier to read:
diff --git a/src/facilities/nursery/longChildDescription.tw b/src/facilities/nursery/longChildDescription.tw
index 8fded54285f..b1c89a5945c 100644
--- a/src/facilities/nursery/longChildDescription.tw
+++ b/src/facilities/nursery/longChildDescription.tw
@@ -773,7 +773,7 @@ is
<<if $saleDescription == 0>>
<<if $activeChild.origin != 0>>
- <<= $activeChild.origin>>
+ $activeChild.origin
<</if>>
<</if>>
diff --git a/src/js/generateMarketSlave.js b/src/js/generateMarketSlave.js
index 1d5c8fb0f86..449a1acc5ed 100644
--- a/src/js/generateMarketSlave.js
+++ b/src/js/generateMarketSlave.js
@@ -1253,7 +1253,7 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) {
V.activeSlave.butt = jsEither([1, 2, 2, 3]);
V.activeSlave.boobs = jsEither([200, 300, 300, 400]);
if (V.TSS.schoolUpgrade === 1) {
- V.activeSlave.origin = "You bought $him fresh from the new Slavegirl School after $he was retrained as a slave $girl.";
+ V.activeSlave.origin = "You bought $him fresh from the new Slavegirl School after $he was retrained as a slave girl.";
V.activeSlave.butt += 1;
V.activeSlave.boobs += 200;
V.activeSlave.anus = 1;
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index 065f135a85b..887ff4cb228 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -1878,7 +1878,7 @@ window.pronounReplacer = function(slavetext) {
slavetext = "You got $him at the Slave Shelter. $His previous owner forced $him to cut off $his dick and balls and cook them.";
break;
case "You got her at the Slave Shelter. She is an enslaved Daughter of Liberty, caught some weeks after the failed coup. Her previous owner used her as a punching bag and dart board, then when he was bored of her tattooed obscenities all over her body and threw her away.":
- slavetext = "You got $him at the Slave Shelter. $He is an enslaved Daughter of Liberty, caught some weeks after the failed coup. $His previous owner used $him as a punching bag and dart board, then when he was bored of $his tattooed obscenities all over $his body and threw $him away.";
+ slavetext = "You got $him at the Slave Shelter. $He is an enslaved Daughter of Liberty, caught some weeks after the failed coup. $His previous owner used $him as a punching bag and dart board, then when he was bored of $him tattooed obscenities all over $his body and threw $him away.";
break;
case "You helped free her from a POW camp after being abandoned by her country, leaving her deeply indebted to you.":
slavetext = "You helped free $him from a POW camp after being abandoned by $his country, leaving $him deeply indebted to you.";
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 0387dd09b17..8831b619c61 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -1277,7 +1277,7 @@ is
<<if $saleDescription == 0>>
<<if $activeSlave.origin != 0>>
- <<= $activeSlave.origin>>
+ $activeSlave.origin
<</if>>
<</if>>
diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw
index 96397a11ff5..79a977d9d04 100644
--- a/src/uncategorized/masterSuiteReport.tw
+++ b/src/uncategorized/masterSuiteReport.tw
@@ -31,7 +31,7 @@
<<set _masterSuiteAverageSadism -= $slaves[$i].fetishStrength>>
<</switch>>
<</if>>
- <<if ($legendaryAbolitionistID == 0) && ($slaves[$i].devotion > 95) && ($slaves[$i].prestige == 0) && (($slaves[$i].origin == "You sentenced $him to enslavement as a punishment for attempted theft of a slave.") || ($slaves[$i].origin == "$He is an enslaved Daughter of Liberty.") || ($slaves[$i].origin === "You got $him at the Slave Shelter. $He is an enslaved Daughter of Liberty, caught some weeks after the failed coup. $His previous owner used $him as a punching bag and dart board, then when he was bored of $his tattooed obscenities all over $his body and threw $him away.") || ($slaves[$i].origin === "$He is an enslaved member of an anti-slavery extremist group."))>>
+ <<if ($legendaryAbolitionistID == 0) && ($slaves[$i].devotion > 95) && ($slaves[$i].prestige == 0) && (($slaves[$i].origin == "You sentenced $him to enslavement as a punishment for attempted theft of a slave.") || ($slaves[$i].origin == "$He is an enslaved Daughter of Liberty.") || ($slaves[$i].origin === "You got $him at the Slave Shelter. $He is an enslaved Daughter of Liberty, caught some weeks after the failed coup. $His previous owner used $him as a punching bag and dart board, then when he was bored of $him tattooed obscenities all over $his body and threw $him away.") || ($slaves[$i].origin === "$He is an enslaved member of an anti-slavery extremist group."))>>
<<set $legendaryAbolitionistID = $slaves[$i].ID>>
<</if>>
<</for>>
@@ -110,7 +110,7 @@
<<set $Concubine = $slaves[_FLs]>>
''Your concubine <<= SlaveFullName($Concubine)>> is serving you in $masterSuiteName.'' More than any other slave, $his sexual brilliance and physical appeal are @@.green;critical@@ to your reputation.
- <<if ($Concubine.prestigeDesc == "You bankrupted and enslaved $him in revenge for $his part in the attack on your arcology by the Daughters of Liberty.")>>
+ <<if (($Concubine.prestigeDesc == "You bankrupted and enslaved $him in revenge for $his part in the attack on your arcology by the Daughters of Liberty.") && ($Concubine.newGamePlus == 0))>>
$He was once your rival, and your relationship is widely thought to be @@.green;the perfect modern romance.@@
<<run repX(500, "concubine", $Concubine)>>
<<elseif ($Concubine.prestige > 0)>>
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index 32f55a440aa..81edd9e243f 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -31,7 +31,7 @@
<</if>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
-<<set $activeSlave.origin = "$He offered $himself for voluntary enslavement, choosing you as $his new owner because you treat lactating <<= $girl>>s well.">>
+<<set $activeSlave.origin = "$He offered $himself for voluntary enslavement, choosing you as $his new owner because you treat lactating girls well.">>
<<set $activeSlave.health = random(-20,20)>>
<<set $activeSlave.devotion = random(-15,15)>>
<<set $activeSlave.trust = random(5,15)>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index 7a75470fa0a..cd7b497d7ee 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -947,7 +947,7 @@
<<set $activeSlave.pubicHColor = "blonde">>
<<set $activeSlave.skin = "pale">>
<<set $activeSlave.hLength = 40>>
-<<set $activeSlave.hStyle = "halfway down $his back">>
+<<set $activeSlave.hStyle = "neat">>
<<set $activeSlave.slaveName = either("Angel", "Angelica", "Gabriela", "Layla", "Liel", "Seraph")>>
<<case "CCS DA">>
@@ -992,7 +992,7 @@
<<set $activeSlave.pubicHColor = "black">>
<<set $activeSlave.skin = "pale">>
<<set $activeSlave.hLength = 40>>
-<<set $activeSlave.hStyle = "halfway down $his back">>
+<<set $activeSlave.hStyle = "neat">>
<<set $activeSlave.slaveName = either("Eve", "Jezebel", "Lileli", "Lilith", "Lucy", "Malicia")>>
<<case "racer DG chaser">>
@@ -1003,7 +1003,7 @@
<<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "$He was a dickgirl chaser in the slave races before being sold to you.">>
<<set $activeSlave.prestige = 1>>
-<<set $activeSlave.prestigeDesc = "Many people remember $him from the slave<<= $girl>> races where $he slammed $his cock into countless runners' pussies after catching them.">>
+<<set $activeSlave.prestigeDesc = "Many people remember $him from the slavegirl races where $he slammed $his cock into countless runners' pussies after catching them.">>
<<set $activeSlave.devotion = random(-15,10)>>
<<set $activeSlave.trust = random(-20,10)>>
<<set $activeSlave.health = random(30,50)>>
@@ -1096,7 +1096,7 @@
<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "$He was a famous virgin runner in the slave races before being sold to you.">>
<<set $activeSlave.prestige = 2>>
-<<set $activeSlave.prestigeDesc = "For years, $he delighted the watchers of slave $girl racing with winning competition after competition with $his virginity intact.">>
+<<set $activeSlave.prestigeDesc = "For years, $he delighted the watchers of slavegirl racing with winning competition after competition with $his virginity intact.">>
<<set $activeSlave.devotion = random(15,25)>>
<<set $activeSlave.trust = random(10,20)>>
<<set $activeSlave.health = random(30,60)>>
diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw
index ed6f0feb2ee..24221d5b3eb 100644
--- a/src/uncategorized/reShelterInspection.tw
+++ b/src/uncategorized/reShelterInspection.tw
@@ -287,7 +287,7 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema
<<set $shelterAbuse -= 3>>
<</if>>
- <<case "You got $him at the Slave Shelter. $He is an enslaved Daughter of Liberty, caught some weeks after the failed coup. $His previous owner used $him as a punching bag and dart board, then when he was bored of $his tattooed obscenities all over $his body and threw $him away.">>
+ <<case "You got $him at the Slave Shelter. $He is an enslaved Daughter of Liberty, caught some weeks after the failed coup. $His previous owner used $him as a punching bag and dart board, then when he was bored of $him tattooed obscenities all over $his body and threw $him away.">>
<<if _Inspectee.slaveName != $genePool[_Arrival].slaveName>>
The inspector notices _Inspectee.birthName's new name. The inspector looks deflated, and reluctantly makes a positive note on _his2 tablet.
<<set $shelterAbuse-->>
--
GitLab