From 03c7d27a04f6ca75eb7f2d244bce28f522d28b3b Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 28 Jan 2018 23:44:58 -0500
Subject: [PATCH] Fixes
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 3 +++
src/SecExp/attackReport.tw | 4 ++--
src/events/intro/introSummary.tw | 2 +-
src/gui/Encyclopedia/encyclopedia.tw | 2 +-
src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw | 4 ++--
src/pregmod/seFCTVshows.tw | 2 +-
src/pregmod/widgets/bodySwapReaction.TW | 2 +-
src/societies/aztec/slaveSacrifice.tw | 2 +-
src/uncategorized/RESS.tw | 2 +-
src/uncategorized/SFMBarracks.tw | 2 +-
src/uncategorized/buySlaves.tw | 2 +-
src/uncategorized/longSlaveDescription.tw | 2 +-
src/uncategorized/masterSuite.tw | 2 +-
src/uncategorized/reAWOL.tw | 2 +-
src/uncategorized/saLongTermEffects.tw | 2 +-
15 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 2457e7db816..b1253d3e5c5 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4,6 +4,9 @@
1/28/18
+ 307
+ -various submitted text corrections
+
306
-fixed missed && in SpecialForceUpgradeOptions
diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw
index 4c7f55da250..7a6d524b9c7 100644
--- a/src/SecExp/attackReport.tw
+++ b/src/SecExp/attackReport.tw
@@ -962,7 +962,7 @@
<<elseif $slaves[_j].prestige == 2>>
<<set $slaves[_j].prestigeDesc = "She is famous for being an incredible commander.">>
<<elseif $slaves[_j].prestige == 3>>
- <<set $slaves[_j].prestigeDesc = "She is is known as a legendary commander all over the world.">>
+ <<set $slaves[_j].prestigeDesc = "She is known as a legendary commander all over the world.">>
<</if>>
<<set $slaveVictories[_i].victories = 0>>
<<set $slaveIncreasedPrestige = 1>>
@@ -1110,7 +1110,7 @@
<<elseif $slaves[_j].prestige == 2>>
<<set $slaves[_j].prestigeDesc = "She is famous for being an incredible commander.">>
<<elseif $slaves[_j].prestige == 3>>
- <<set $slaves[_j].prestigeDesc = "She is is known as a legendary commander all over the world.">>
+ <<set $slaves[_j].prestigeDesc = "She is known as a legendary commander all over the world.">>
<</if>>
<<set $slaveVictories[_i].victories = 0>>
<<set $slaveIncreasedPrestige = 1>>
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index e7eb0bfc56c..d49a2d82063 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -595,7 +595,7 @@ __''Player Character''__
<<set $PCCreationCareer = "member of the idle wealthy">>
<</switch>>
<br>
- Before you came to the free cities, you were a ''$PCCreationCareer'' and it is rumoured that you acquired your archology through ''$PC.rumor''.
+ Before you came to the free cities, you were a ''$PCCreationCareer'' and it is rumoured that you acquired your arcology through ''$PC.rumor''.
<br>__Past career:__
<<if $PC.career != "arcology owner">>
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 671702d0dde..799f85f1e8f 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -2786,7 +2786,7 @@ An additional prostate implant designed to hyperstimulate one's prostate and sto
<<case "FCTV">>
Free Cities TV, or ''FCTV'' as it is more commonly called, is a very popular streaming video service. A venture started not long after the first Free Cities were founded, it took advantage of the new lack of regulatory oversight to create and host content that had long been banned in the old world. Under the guidance of 8HGG Inc., FCTV has developed into a popular mixed-mode service, with a variety of live streaming channels as well as a large selection of readystream content ranging from hyper porn to contemporary broadcast series shows.
<br><br>The successful service is largely supported by a combination of subscription and advertising revenue, and to a smaller extent on-demand content payments. Though still targeted at free citizens--or their slaves in the case of for-slave content--FCTV has become very popular in the old world. A combination of the service's eroticism, extreme content, and high production value has given it extraordinary popularity. Savvy execs at 8HGG and arcology owners alike have realized the benefits of exposing the old world populations to FCTV content, and a carefully-curated selection of content is kept available to old-worlders thanks to revenue from advertisements supporting immigration and voluntary enslavement. The content selection has a glamorized and often romanticized view of slavery, and typically displays common citizens and slaves alike living in opulence beyond the realm of posibility for most old-worlders.
-<br><br>FCTV has always worked closely with the Free Cities, developing a large network of sponsors and partnerships for content protection. This has increased the breadth of content and popularity of FCTV, while allowing the ruling class to encourage content supporting their vision of the future. While you can access non-citizen FCTV content from just about anywhere, an archology needs it's own [[receiver|Encyclopedia][$encyclopedia to "FCTVReceiver"]] to access citizen-only content. This measure of content protection does add extra expense, but nearly eliminating the risk of old-worlders seeing uncurated content is viewed as being worth the expense by most arcology owners.
+<br><br>FCTV has always worked closely with the Free Cities, developing a large network of sponsors and partnerships for content protection. This has increased the breadth of content and popularity of FCTV, while allowing the ruling class to encourage content supporting their vision of the future. While you can access non-citizen FCTV content from just about anywhere, an arcology needs its own [[receiver|Encyclopedia][$encyclopedia to "FCTVReceiver"]] to access citizen-only content. This measure of content protection does add extra expense, but nearly eliminating the risk of old-worlders seeing uncurated content is viewed as being worth the expense by most arcology owners.
<<case "FCTVReceiver">>
While nearly indistinguishable from a standard satellite antenna, the satellite dish used to receive FCTV-Citizen content is special because of the unique FCTV Receiver. Utilizing the latest in matched-pair quantum encryption, it is the only device capable of decrypting and encrypting your arcology-specific FCTV content communication. Simple additions to your arcology's existing fiberoptics extend the [[FCTV|Encyclopedia][$encyclopedia to "FCTV"]] network to your citizens. In exchange for bearing the cost of the encrypted network, arcology owners get a certain level of control over available content for cultural purposes, and also discounted rates for local advertisement.
diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
index 1d82ba83493..d4d810f3d36 100755
--- a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
+++ b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
@@ -230,7 +230,7 @@
"Sure, boss." she says, nodding. "Some new VTOLs would be great." She laughs. "They're the real multiplier over the scum out there. Not much a looter gang can do against air support." She picks up a tablet and taps a few commands on it. "I'll get right on it."
<<set $securityForceUpgradeToken = 1, $securityForceAircraftPower++, $cash -= _airCost*$Env>>
<</replace>>
- <</link>> // Costs <<print cashFormat( _airCost*$Env)>> //
+ <</link>> // Costs <<print cashFormat(_airCost*$Env)>> //
<</if>>
<<if $securityForceAircraftPower == _AircraftMax>>
<br>//$securityForceName has fully upgraded the air fleet to support it's activities.//
@@ -270,7 +270,7 @@
"Sure, boss." she says, nodding. "Upgrading the orbital plane should help a lot." She laughs. "The scum out there don't seem to like it when we have eyes they can't hit." She picks up a tablet and taps a few commands on it. "I'll get right on it."
<<set $securityForceUpgradeToken = 1, $securityForceSpacePlanePower++, $cash -= _spCost*$Env>>
<</replace>>
- <</link>> // Costs <<print cashFormat( _spCost*$Env)>> //
+ <</link>> // Costs <<print cashFormat(_spCost*$Env)>> //
<</if>>
<<if $securityForceSpacePlanePower == _SpacePlaneMax>>
<br>//$securityForceName has fully upgraded the space plane to support it's activities.//
diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw
index c98f15cc541..86e8bf58dcd 100644
--- a/src/pregmod/seFCTVshows.tw
+++ b/src/pregmod/seFCTVshows.tw
@@ -706,7 +706,7 @@ The offered price is <<print cashFormat($slaveCost)>>.
<br><br>Finally, she let out a long relaxed sigh before saying, “On that note, I think it’s time to head back. Coming Sadie?†Sadie nodded and took up a position beside Annie. They linked arms and presented their bottoms to Scott. He gave both their asses a quick smack and said, “Off you go.†Annie wiggled her bottom. “Daddy,†she whined plaintively, her eyes bright with amusement. He sighed good-naturedly and gave both her cheeks a solid smack. She squealed and tittered, her eyes twinkling, then wobbled to door and out of sight.
<br><br>The party made their way to an elevator past the dessert counter and went up a floor. The grocery portion of Blue Barn had much the same aesthetic as downstairs. All Cedar and Oak construction and pendant lamps hanging above. The hardwood floor was polished in the way only an obsessive compulsive could manage. Immediately out of the elevator were lines of wooden shelves and tables bearing Blue Barn merchandise.
<br><br>There were posters, coasters, clothing and all manner of little knickknacks, but the true star of the show were the plushies. Rows upon rows of them covered the shelves and tables arranged in little displays, all of them made in the image of cows working at the creamery. One table had the plushies in a mini concert hall, the ones on stage wielding toy instruments that had ‘Press me!’ stickers on them. Another table had them arranged in what looked to be a garden party. Spread across two tables was a diorama of the creamery with plushies placed throughout it. One plushie that looked distinctly like Martha was plopped behind the dessert counter. Another was placed near the elevators and if one looked closely they could see a matching cowslave sat drowsing amongst the merchandise.
- <br><br>The cow was young, busty, even for the archology, and heavily pregnant. She wore what looked to be Holstein print pajamas with a hood made to look like a stylized cow. Her strawberry blond hair was mussed with sleep and she cradled a plushie in one arm. Truly, she looked like a daughter waiting for her daddy to come home. As the party approached, she began to stir.
+ <br><br>The cow was young, busty, even for the arcology, and heavily pregnant. She wore what looked to be Holstein print pajamas with a hood made to look like a stylized cow. Her strawberry blond hair was mussed with sleep and she cradled a plushie in one arm. Truly, she looked like a daughter waiting for her daddy to come home. As the party approached, she began to stir.
<br><br>Scott reached out and began to gently pat her head. “How are you doing, Tabby?†Tabby just made a sound of contentment and pressed into his hand, luxuriating in his touch. After a few moments, she yawned and blinked, looking up at him. For a beat she just stared at him, her sleep addled brain struggling to process the sight in front of her. Finally, the penny dropped.
<br><br>She squeaked and sat up so quick one would think she had been hit with a cattle prod. With a panicked expression, she began to babble a fervent apology. “Master, I’m sorry I fell asleep.†She hiccupped and pleaded with him, on the verge of tears. “Please don’t tell Gabe I fell asleep again. She’ll yell at me for sure.†Scott just continued patting her head, kneeled beside her chair, and spoke in a calm tone, “Hey, hey, no need for tears. Just take a deep breath and calm down Tabby cat. I won’t tell Gabe.â€
<br><br>Tabby sniffed, took a deep breath, and hiccupped. For a moment, she just relaxed into Scott’s ministrations before she frowned and said, “I thought you weren’t coming in today master.†He moved her hair out her eyes. “I figured I’d get some shopping done and show the newbie around,†he said with a nod to Cathy. Tabby gave her a bright smile. “Oh, nice to meet you. Would you like a free sample?†she asked gesturing to table next to her.
diff --git a/src/pregmod/widgets/bodySwapReaction.TW b/src/pregmod/widgets/bodySwapReaction.TW
index 47eb8a29afd..50bf02f8ae7 100644
--- a/src/pregmod/widgets/bodySwapReaction.TW
+++ b/src/pregmod/widgets/bodySwapReaction.TW
@@ -202,7 +202,7 @@ Now you only have to wait for her to wake up.
<<elseif $args[0].boobs > $args[1].boobs+100>> /*(Bigger breasts)*/
<<if $args[0].devotion > 20>>
She gives her larger chest a heft, marveling at their size.
- <<else>>>
+ <<else>>
She is confused for a moment at the larger breasts adorning her chest before she tentatively takes one in hand and experimentally hefts it to gauge their new weight.
<</if>>
<<else>>
diff --git a/src/societies/aztec/slaveSacrifice.tw b/src/societies/aztec/slaveSacrifice.tw
index 23db76da38b..8d4960c3690 100644
--- a/src/societies/aztec/slaveSacrifice.tw
+++ b/src/societies/aztec/slaveSacrifice.tw
@@ -86,7 +86,7 @@
<</if>>
<br>
- As tradition dictates, the purification of her body will be used as penitence to the goddess in an attempt to pay for the favors bestowed upon your archology. First, one of your slaves is appointed to represent you as her owner who willingly gives the slave as sacrifice, and is put in charge of the slave's health while she goes through the penance process. $activeSlave.slaveName is thoroughly bathed, her whole body covered in blue paint, and her mouth in black, as payment for being a prostitute. She's taken to spend the night at the sexual servitude of another slave who will be sacrificed to Tezcatlipoca, god of the night sky. She's <<if ($activeSlave.devotion > 20)>>fucked all night long <<else>>raped over and over again throughout the night <</if>>; her holes dedicated to the sexual satisfaction of the slave who soon will face a much darker fate than her to please the gods.
+ As tradition dictates, the purification of her body will be used as penitence to the goddess in an attempt to pay for the favors bestowed upon your arcology. First, one of your slaves is appointed to represent you as her owner who willingly gives the slave as sacrifice, and is put in charge of the slave's health while she goes through the penance process. $activeSlave.slaveName is thoroughly bathed, her whole body covered in blue paint, and her mouth in black, as payment for being a prostitute. She's taken to spend the night at the sexual servitude of another slave who will be sacrificed to Tezcatlipoca, god of the night sky. She's <<if ($activeSlave.devotion > 20)>>fucked all night long <<else>>raped over and over again throughout the night <</if>>; her holes dedicated to the sexual satisfaction of the slave who soon will face a much darker fate than her to please the gods.
<<if canDoVaginal($activeSlave) && canDoAnal($activeSlave)>>
<<set _randomVag = random(0,2)>>
<<set _randomAnal = random(0,1)>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 8171efbd843..c7663586e91 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -15915,7 +15915,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
<<if $activeSlave.dick > 0>>
Her
<<if ["chastity", "combined chastity"].includes($activeSlave.dickAccessory)>>
- chastitiy cage sways
+ chastity cage sways
<<elseif canAchieveErection($activeSlave)>>
erection waves back and forth
<<elseif $activeSlave.dick > 6>>
diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw
index a7a756a69f9..a01f1650b59 100755
--- a/src/uncategorized/SFMBarracks.tw
+++ b/src/uncategorized/SFMBarracks.tw
@@ -120,7 +120,7 @@
<<if $securityForceUpgradeToken == 1 && ($SFAO < _max)>>
<br>//_Name is working to improve $securityForceName this week.//
<<elseif $TierTwoUnlock == 1>>
- <br>//You recive a message form The Colonel "there's a trade show coming up with exotic upgrades but I'll get laughed out unless we bring the best gear we can get now?"//
+ <br>//You receive a message form The Colonel "there's a trade show coming up with exotic upgrades but I'll get laughed out unless we bring the best gear we can get now?"//
<<elseif $SFAO >= _max>>
<br>//$securityForceName is fully equipped and upgraded - nothing else can be done.//
<</if>>
diff --git a/src/uncategorized/buySlaves.tw b/src/uncategorized/buySlaves.tw
index ca0398b087f..907b01a531d 100644
--- a/src/uncategorized/buySlaves.tw
+++ b/src/uncategorized/buySlaves.tw
@@ -308,7 +308,7 @@ The market price of menials is <<print cashFormat(_menialPrice)>>.
<</if>>
<</if>>
[[(all)|Buy Slaves][$fuckdolls+=$helots,$cash-=(_fconvertCost)*($helots),$helots=0]]
- //Conversion costs <<print cashFormat(_fconvertCost) each>>//
+ //Conversion costs <<print cashFormat(_fconvertCost)>> each//
<</if>>
<<if $dairyFeedersUpgrade > 0>>
<br> [[Convert to Bioreactor|Buy Slaves][$helots-=1,$menialBioreactors+=1,$cash-=500]]
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 52f608158dc..da5c344de1c 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -1877,7 +1877,7 @@ $activeSlave.slaveName's light scars are somewhat showing because of the oil.
$activeSlave.slaveName's big scars are showing even with her clothes.
<<elseif ($activeSlave.scars == 2) and ($activeSlave.clothes is "no clothes")>>
$activeSlave.slaveName's big scars are quite repulsive on her nude body.
-<<esleif ($activeSlave.scars == 2) and ($activeSlave.clothes is "body oil")>>
+<<eleeif ($activeSlave.scars == 2) and ($activeSlave.clothes is "body oil")>>
$activeSlave.slaveName's big scars are really put into view because of the oil.
<<elseif ($activeSlave.scars == 3) and ($activeSlave.clothes isnot "no clothes")>>
diff --git a/src/uncategorized/masterSuite.tw b/src/uncategorized/masterSuite.tw
index d0288394c92..a7e97c27bd9 100644
--- a/src/uncategorized/masterSuite.tw
+++ b/src/uncategorized/masterSuite.tw
@@ -289,7 +289,7 @@ $masterSuiteNameCaps is furnished
<<else>>
None of your slaves are serving here.
<<if $Concubine == 0>>
- [[Decommission the MasterSuite|Main][$masterSuite = 0, $masterSuiteUpgradeLuxury = 0, $masterSuitePregnancySlaveLuxuries = 0, $masterSuiteDecoration = "standard", $masterSuitePregnancyFertilityDrugs = 0, $masterSuitePregnancyFertilitySupplements = 0, $masterSuiteUpgradePregnancy = 0, $masterSuiteHyperPregnancy = 0]]
+ [[Decommission the Master Suite|Main][$masterSuite = 0, $masterSuiteUpgradeLuxury = 0, $masterSuitePregnancySlaveLuxuries = 0, $masterSuiteDecoration = "standard", $masterSuitePregnancyFertilityDrugs = 0, $masterSuitePregnancyFertilitySupplements = 0, $masterSuiteUpgradePregnancy = 0, $masterSuiteHyperPregnancy = 0]]
<</if>>
<</if>>
<br> [[Refit the suite to the height of traditional opulence|Master Suite][$cash -= _Tmult2, $masterSuiteUpgradeLuxury = 1]] //Costs <<print cashFormat(_Tmult2)>> and will focus the suite on you//
diff --git a/src/uncategorized/reAWOL.tw b/src/uncategorized/reAWOL.tw
index da1089162e4..1e06e9b9484 100644
--- a/src/uncategorized/reAWOL.tw
+++ b/src/uncategorized/reAWOL.tw
@@ -51,7 +51,7 @@ Your window of opportunity to act is closing. If you have plans for punishing th
<<link "You want her dead">>
<<replace "#SFresult">>
- Despite the trouble she has caused you, the culmination of this mercenary's wanton flight from the rest of the $mercenariesTitle is decidedly anti-climatic. The last you hear of her is in the footnote of one of your daily reports, with some minute yet suitably gory pictures as an accompaniment. When the stolen weapons are returned to their rightful place in your arcology, the unfortunate matter is concluded once and for all. @@.green;Your reputation improves@@, a result of the fear of crossing you that your result have inspired. Also @@.green;Archology prospertiy improves@@, a result of showing your citizens that you are willing and able to deal with such matters in-house.
+ Despite the trouble she has caused you, the culmination of this mercenary's wanton flight from the rest of the $mercenariesTitle is decidedly anti-climatic. The last you hear of her is in the footnote of one of your daily reports, with some minute yet suitably gory pictures as an accompaniment. When the stolen weapons are returned to their rightful place in your arcology, the unfortunate matter is concluded once and for all. @@.green;Your reputation improves@@, a result of the fear of crossing you that your result have inspired. Also the @@.green;arcology's prosperity improves@@, a result of showing your citizens that you are willing and able to deal with such matters in-house.
<<set $rep += 1000,$arcologies[0].prosperity += 2>>
<<if $arcologies[0].prosperity > $AProsperityCap>>
<<set $arcologies[0].prosperity = $AProsperityCap>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index c70212fae9f..2de140788c4 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -3776,7 +3776,7 @@
<<if ($slaves[$i].fuckdoll == 0) && ($slaves[$i].fetish != "mindbroken")>>
<<if ($slaves[$i].fetish == "pregnancy")>>
<<if $slaves[$i].preg >= 40>>
- She's full-term and never been hornier. Her pregnancy fetish combined with her ripe belly confers a @@.green;huge improvement in her sexual appetite.@@
+ She's full-term and has never been hornier. Her pregnancy fetish combined with her ripe belly confers a @@.green;huge improvement in her sexual appetite.@@
<<set $slaves[$i].energy += 5>>
<<elseif $slaves[$i].preg > 30>>
Being a pregnancy fetishist and hugely pregnant confers an @@.green;improvement in her sexual appetite.@@
--
GitLab