From 3b6a346a9d5c0c0e56dacd158037fb2e9c21a42d Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Sat, 5 Jan 2019 22:39:47 -0600
Subject: [PATCH] Searching
---
devNotes/twine JS.txt | 6 ++--
src/events/intro/introSummary.tw | 8 ++---
src/init/storyInit.tw | 8 ++---
src/pregmod/fMarry.tw | 2 +-
src/uncategorized/REroyalblood.tw | 30 ++++++++++---------
src/uncategorized/reFSAcquisition.tw | 1 +
.../reFSEgyptianRevivalistAcquisition.tw | 3 +-
src/uncategorized/reRecruit.tw | 1 +
src/uncategorized/recETS.tw | 1 +
9 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 38d9f2902dd..0fc8334aae3 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -300,7 +300,7 @@ window.canImpreg = function(slave1, slave2) {
} else if (slave1.ID === -1) {
if (slave2.ballType != "human") {
return false;
- } else if (!isPlayerFertile(slave1)) {
+ } else if (!isFertile(slave1)) {
return false;
} else {
return true;
@@ -1620,7 +1620,7 @@ window.setPregType = function(actor) {
} else if(actor.pregType == 0) {
ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]); //base chance for twins
if(actor.ovaImplant == "fertility") {
- ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
+ ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
fertilityStack++;
}
if(actor.hormones == 2) {
@@ -35662,7 +35662,7 @@ window.Main = function() {
}
window.Squad = function() {
const V = State.variables;
- V.SF.Squad = {Troops:40, Armoury:0, Firebase:0, AV:0, TV:0, Drones:0, Drugs:0, PGT:0, AA:0, TA:0, SpacePlane:0, GunS:0, Satellite:{lv:0, InOrbit:0}, GiantRobot:0, MissileSilo:0, AircraftCarrier:0, Sub:0, HAT:0};
+ V.SF.Squad = {Troops:40, Armoury:0, Firebase:0, AV:0, TV:0, Drones:0, Drugs:0, PGT:0, AA:0, TA:0, SpacePlane:0, GunS:0, Satellite:{lv:0, InOrbit:0}, GiantRobot:0, MissileSilo:0, AircraftCarrier:0, Sub:0, HAT:0};
}
window.Colonel = function() {
const V = State.variables;
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index d3b308c08f3..a5264276602 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -26,7 +26,7 @@ You may review your settings before clicking "Continue" to begin.
<</if>>
__''World Settings''__
-<br>Economic climate:
+<br>Economic climate:
<<set $localEcon = $economy>>
<<if $economy > 125>>
''not truly dire. Not yet.'' //Very Easy//
@@ -45,7 +45,7 @@ __''World Settings''__
<br>[[Easier|Intro Summary][$economy = 80]]
<</if>>
<<if $difficultySwitch == 1>><<set $econAdvantage = -2>><</if>>
-<br>Economic forecast:
+<br>Economic forecast:
<<if $difficultySwitch == 0>>
''no change.'' //Vanilla//
<br>[[Harder|Intro Summary][$difficultySwitch = 1, $econRate = 1]]
@@ -1034,7 +1034,7 @@ Currently
<<if $imageChoice == 1>>
''Vector art by NoX/Deepmurk'' is selected. [[Switch to rendered imagepack|Intro Summary][$imageChoice = 0]] | [[Switch to non-embedded vector art|Intro Summary][$imageChoice = 2]] | [[Switch to revamped embedded vector art|Intro Summary][$imageChoice = 3]]
<br>
- Face art
+ Face art
<<if $seeFaces > 0>>
@@.cyan;ENABLED.@@ [[Disable|Intro Summary][$seeFaces = 0]]
<<else>>
@@ -1070,7 +1070,7 @@ Currently
<</if>>
<</if>>
<br>
- PA avatar images are
+ PA avatar images are
<<if $seeAvatar == 1>>
''enabled.'' [[Disable|Intro Summary][$seeAvatar = 0]]
<<else>>
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index cd8a6303586..95c1c10ed3a 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -296,7 +296,7 @@ You should have received a copy of the GNU General Public License along with thi
<<set $useSlaveSummaryTabs = 0>>
<<set $useSlaveSummaryOverviewTab = 0>>
<<set $useSlaveListInPageJSNavigation = 0>>
-
+
/* master suite reporting and alternate descriptions */
<<set $verboseDescriptions = 0>>
/* Accordion 000-250-006 */
@@ -328,7 +328,7 @@ You should have received a copy of the GNU General Public License along with thi
<<set $weightAffectsAssets = 1>>
<<set $curativeSideEffects = 1>>
-
+
/*non-vanilla shit*/
<<set $pedo_mode = 0>>
<<set $minimumSlaveAge = 18>>
@@ -346,7 +346,7 @@ You should have received a copy of the GNU General Public License along with thi
<<set $customMenialRetirementAge = 65>>
<<set $FSCreditCount = 5>>
<<set $FSCreditCountString = "five">>
-
+
<<include "Init Rules">>
<<else>> /* imported save (NG+) */
@@ -1228,7 +1228,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $citizenRetirementMenials = 0>>
<<set $citizenRetirementTrigger = 0>>
<<set $FSSupLawTrigger = 0>>
-<<set $FSSubLawTrigger = 0>>
+<<set $FSSubLawTrigger = 0>>
<<set $SexMilestoneRetirement = 0>>
<<set $MilkMilestoneRetirement = 0>>
<<set $CumMilestoneRetirement = 0>>
diff --git a/src/pregmod/fMarry.tw b/src/pregmod/fMarry.tw
index 24e2741f616..bb4348c7feb 100644
--- a/src/pregmod/fMarry.tw
+++ b/src/pregmod/fMarry.tw
@@ -20,7 +20,7 @@
<<set _himselfL = lispReplace($himself)>>
<<else>>
<<set _name = $slaves[_m].slaveName>>
- /* Use the modified "L"isp variables when they are speaking, just in case. */
+ /* Use the modified "L"isp variables when they are speaking, just in case. */
<<set _heL =$he>>
<<set _hisL = $his>>
<<set _himL = $him>>
diff --git a/src/uncategorized/REroyalblood.tw b/src/uncategorized/REroyalblood.tw
index c10ace60a69..6e57f8b7721 100644
--- a/src/uncategorized/REroyalblood.tw
+++ b/src/uncategorized/REroyalblood.tw
@@ -34,7 +34,7 @@
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.health = random(30,60)>>
-<<set $activeSlave.behavioralFlaw = either("bitchy", "arrogant")>>
+<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
<<set _princess = clone($activeSlave)>>
/*prince*/
<<set $activeSlave.ID = $activeSlave.ID + 1000>>
@@ -86,7 +86,7 @@
<<set $activeSlave.combatSkill = 1>>
<<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.health = random(30,60)>>
-<<set $activeSlave.behavioralFlaw = either("bitchy", "arrogant")>>
+<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
<<set _prince = clone($activeSlave)>>
/*Queen*/
<<set $activeSlave.ID = $activeSlave.ID + 1>>
@@ -140,14 +140,16 @@
<<set $activeSlave.pubertyXY = 0>>
<<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.health = random(30,60)>>
-<<set $activeSlave.behavioralFlaw = either("bitchy", "arrogant")>>
+<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
<<set _queen = clone($activeSlave)>>
-One unfortunate consequence of existing in a global world is that business opportunities continue to crop up unabated by the onset of night in one corner of the world or another, an inconsiderate phenomenon for arcology owners who happen to be asleep when an event of importance takes place outside the walls of their arcology. This particular evening you are awoken by an alert from $assistantName, unusually intense for this late hour.
+<<setAssistantPronouns>>
+
+One unfortunate consequence of existing in a global world is that business opportunities continue to crop up unabated by the onset of night in one corner of the world or another, an inconsiderate phenomenon for arcology owners who happen to be asleep when an event of importance takes place outside the walls of their arcology. This particular evening you are awoken by an alert from $assistantName, unusually intense for this late hour.
<<if $assistant > 0>>
- "<<= properMaster()>>, there is a time sensitive enslavement opportunity available if you're interested." She pauses before continuing. "You're going to want to see this one <<= properMaster()>>."
+ "<<= properMaster()>>, there is a time sensitive enslavement opportunity available if you're interested." _HeA pauses before continuing. "You're going to want to see this one <<= properMaster()>>."
<<else>>
- It informs you that there is a time sensitive enslavement opportunity for you to peruse, and that it has calculated the potential rewards are worthy of your consideration even in the middle of the night.
+ _HeA informs you that there is a time sensitive enslavement opportunity for you to peruse, and that _heA has calculated the potential rewards are worthy of your consideration even in the middle of the night.
<</if>>
<br><br>
A convenient video feed is brought up, displaying a quick visual summary of the opportunity at hand.
@@ -167,7 +169,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<span id="result">
<<link "Go back to sleep">>
<<replace "#result">>
- You inform your personal assistant that you aren't planning to take any action. It's not every day that a monarchy collapses in the Old World, but it's also not particularly uncommon either.
+ You inform your personal assistant that you aren't planning to take any action. It's not every day that a monarchy collapses in the Old World, but it's also not particularly uncommon either.
<</replace>>
<</link>>
<<if ($cash >= 50000) && ($rep >= 2000)>>
@@ -354,7 +356,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.canRecruit = 0>>
- <<set $activeSlave.behavioralFlaw = either("bitchy", "arrogant")>>
+ <<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
<<run newSlave($activeSlave)>> /* skip New Slave Intro */
<<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<</for>>
@@ -405,7 +407,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.canRecruit = 0>>
- <<set $activeSlave.behavioralFlaw = either("bitchy", "arrogant")>>
+ <<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
<<run newSlave($activeSlave)>> /* skip New Slave Intro */
<<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<</for>>
@@ -417,7 +419,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<replace "#result">>
You take a tablet and transmit a communication request to the new arcology owner. It doesn't take long for him to accept but when his video feed connects on your screen, you find yourself staring at the pained expression of the Queen herself. It becomes abundantly clear that someone is mounting her from behind as her body shakes and spasms from the intensity of their thrusts. You note that the Queen appears to be getting fucked on an extravagant, yet bloodstained, four-poster bed, likely the site of her former husband's demise. The mysterious individual unsurprisingly turns out to be the new arcology owner, revealing himself by shoving the Queen's face down against the stained bed sheets as he lowers his own face into frame. "How can I help you?"
<br><br>
- The man seems somewhat surprised that you want to purchase the Queen, given the breadth and quality of his other merchandise available, but not unduly so. Soon enough negotiations begin and a short time later an equitable price is agreed upon. Your new peer even throws in a slight discount, in exchange for allowing him to use the Queen himself for the remainder of the night.
+ The man seems somewhat surprised that you want to purchase the Queen, given the breadth and quality of his other merchandise available, but not unduly so. Soon enough negotiations begin and a short time later an equitable price is agreed upon. Your new peer even throws in a slight discount, in exchange for allowing him to use the Queen himself for the remainder of the night.
<br><br>
When the Queen arrives at your penthouse, she seems almost relieved and almost basks in the opulence of her new surroundings. Yet, it seems likely that her relief has more to do with saving her from a lifetime of gang rape at the mercy of her former subjects, than it does the familiar luxury. She submits to biometric scanning obediently and without fuss<<if $seePreg != 0>>, during which you discover to her surprise that she is pregnant. Since she hasn't begun to show yet, it's unclear whether the child is the former King's or the new arcology owner's. You don't have the means to discern the father of the child, but you notice she cradles her ever so slightly rounded stomach protectively nonetheless<</if>>.
<br><br>
@@ -579,7 +581,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.canRecruit = 0>>
- <<set $activeSlave.behavioralFlaw = either("bitchy", "arrogant")>>
+ <<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
<<run newSlave($activeSlave)>> /* skip New Slave Intro */
<<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<</for>>
@@ -636,7 +638,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.canRecruit = 0>>
- <<set $activeSlave.behavioralFlaw = either("bitchy", "arrogant")>>
+ <<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
<<run newSlave($activeSlave)>> /* skip New Slave Intro */
<<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<</for>>
@@ -693,7 +695,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.canRecruit = 0>>
- <<set $activeSlave.behavioralFlaw = either("bitchy", "arrogant")>>
+ <<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
<<run newSlave($activeSlave)>> /* skip New Slave Intro */
<<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<</for>>
@@ -766,7 +768,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.canRecruit = 0>>
- <<set $activeSlave.behavioralFlaw = either("bitchy", "arrogant")>>
+ <<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
<<run newSlave($activeSlave)>> /* skip New Slave Intro */
<<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<</for>>
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index 16ee95f91c7..93b42f68898 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -1071,6 +1071,7 @@
<</switch>>
<<setLocalPronouns $activeSlave>>
+<<setAssistantPronouns>>
<<switch $FSAcquisitionEvents>>
<<case "Pastoralist">>
diff --git a/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw b/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
index 1ae454105b1..7afd0bf36b7 100644
--- a/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
+++ b/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
@@ -32,9 +32,10 @@
<</if>>
<<set $activeSlave.relationship = 4>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID + 1000>>
-
<<if ($activeSlave.dick > 0) && ($activeSlave.balls == 0)>><<set $activeSlave.balls = random(1,5)>><</if>>
+<<setAssistantPronouns>>
+
You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
<br><br>
This call is coming from a public kiosk, which is usually an indication that the person on the other end is a transient individual who has decided to take slavery over homelessness. In this case, however, the story is more unusual - the callers seem stressed, but otherwise normal. They haltingly and quietly explain, with many nervous glances off-camera to ensure they are not overheard, that they are both siblings and lovers, and their attempts to keep the truth of the nature of their relationship from their friends, family, and society at large have failed. They had heard of $arcologies[0].name's reverence for incestuous relationships, and have managed to talk themselves into the questionable conclusion that their only chance to be together was for them to sell themselves to someone who would not just accept but encourage their incest - namely, you.
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index 0c39837eb5a..b14a5b92da7 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -2025,6 +2025,7 @@
<</switch>>
<<setLocalPronouns $activeSlave>>
+<<setAssistantPronouns>>
<<switch $recruit>>
<<case "female recruit">>
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index fa5118184c5..75f23133a7a 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -1399,6 +1399,7 @@
<<setLocalPronouns $relative>>
<<setLocalPronouns $relative2 2>>
+<<setAssistantPronouns>>
<span id="mainbody">
--
GitLab