From 215cbb433759fe67c626f23b88a557bb970119b6 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Mon, 10 Aug 2020 17:24:16 -0400
Subject: [PATCH] fixes
---
devNotes/AnatomyOfAFreeCitiesEvent.txt | 4 ++--
devNotes/Economy notes.txt | 6 +++---
devNotes/clothing hair and accessory passages.txt | 2 +-
src/data/backwardsCompatibility/BackwardsCompatibility.tw | 4 ++--
src/data/backwardsCompatibility/backwardsCompatibility.js | 2 +-
src/init/storyInit.tw | 2 +-
src/neighbor/neighborDescription.tw | 2 +-
src/pregmod/analyzePregnancy.tw | 6 +++---
8 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/devNotes/AnatomyOfAFreeCitiesEvent.txt b/devNotes/AnatomyOfAFreeCitiesEvent.txt
index bfd27d2daff..00cf61d6653 100644
--- a/devNotes/AnatomyOfAFreeCitiesEvent.txt
+++ b/devNotes/AnatomyOfAFreeCitiesEvent.txt
@@ -30,7 +30,7 @@ Immediate effects
Every event can have immediate effects, which happen when the event gets chosen. For most events, those are what should happen if the player ignores the event (by hitting "Continue" or the space bar on the keyboard). Choice effects (see below) can override or roll back those.
- reRecuit (4-19)
+ reRecruit (4-19)
<<if Array.isArray($recruit)>>
<<if $cheatMode == 1>>
<<set $nextButton = "Back", $nextLink = "Nonrandom Event", $returnTo = "Nonrandom Event">> /* if user just clicks spacebar */
@@ -53,7 +53,7 @@ Main event text
The bulk of the writing will be in the main event text. There are quite a few rules to deal with here.
The PC is referred to in the second person singular ("you"), everyone else in third person.
The PC has no direct speech. All the things "you" say are described, not quoted.
-A slave's description can be linked from an event by replacing thier name with <<= App.UI.slaveDescriptionDialog(_Slave)>>. This allows the player to click on the slave name and view their description, then go back to the event. This is not a passage transition so you don't need to worry about preserving temporary state.
+A slave's description can be linked from an event by replacing their name with <<= App.UI.slaveDescriptionDialog(_Slave)>>. This allows the player to click on the slave name and view their description, then go back to the event. This is not a passage transition so you don't need to worry about preserving temporary state.
If you want to introduce a new actor by their relationship to another actor, use <<= contextualIntro(_firstSlave, _newSlave)>>. You can pass a third parameter of "true" if you want the new actor's name to be linked to their description dialog.
<<SlaveTitle _Slave>> sets $desc (which ends up being a string like "slavegirl", "MILF", "futanari" and so on, depending on slave).
diff --git a/devNotes/Economy notes.txt b/devNotes/Economy notes.txt
index b6be489ac08..46c15523b16 100644
--- a/devNotes/Economy notes.txt
+++ b/devNotes/Economy notes.txt
@@ -9,7 +9,7 @@ Finding the demand is relatively straightforward, as it depends on the current a
Finding the supply requires more work as all slaves tasked with sexually serving the populace need to be considered.
The function 'slaveJobValues()' takes care of pretty much all of that and can be found in 'economyJS.js'.
-'slaveJobValues()' takes into account gloryholes/arcade, public sluts/club sluts and street whores/brothel whores seperately.
+'slaveJobValues()' takes into account gloryholes/arcade, public sluts/club sluts and street whores/brothel whores separately.
Gloryhole prices aren't too involved, since the 'product' is very homogenous and sluts don't get paid for their services.
Whores on the other hand have variable skills and appearance and may appeal to different classes of citizens.
@@ -38,9 +38,9 @@ We must also consider the supply by other providers operating within the arcolog
Combine the two and we now have the total supply for that week and we can finally compare supply and demand to provide a final price modifier.
Each class of citizens has their own demand and supply statistics and thus their own price modifier as well.
All of this once again takes place within the top part of 'slaveAssignmentsReport.tw'.
-When demand outstrips supply, a whore will recieve a premium for their services, but not proportionally.
+When demand outstrips supply, a whore will receive a premium for their services, but not proportionally.
Supplying only half of what is demanded does not mean prices are doubled, they'll be increased by less than that.
-Likewise when supply outstrips the demand a whore will recieve less for their services, but not proportionally.
+Likewise when supply outstrips the demand a whore will receive less for their services, but not proportionally.
Doubling the demand reduces the price by significantly more than 50%.
There is however an absolute minimum of 30% of the standard price.
diff --git a/devNotes/clothing hair and accessory passages.txt b/devNotes/clothing hair and accessory passages.txt
index 9d1fd90b1be..788d86d97d8 100644
--- a/devNotes/clothing hair and accessory passages.txt
+++ b/devNotes/clothing hair and accessory passages.txt
@@ -16,7 +16,7 @@ Hair:
(mostly shaved/bald hairstyle checks, probably not worth checking)
fPat.tw
remoteSurgery.tw
- suregeryDegradation.tw
+ surgeryDegradation.tw
saLongTermEffects.tw
saAgent.tw
rulesAutosurgery.tw
diff --git a/src/data/backwardsCompatibility/BackwardsCompatibility.tw b/src/data/backwardsCompatibility/BackwardsCompatibility.tw
index 3d45b870e72..1e4b86c77fe 100644
--- a/src/data/backwardsCompatibility/BackwardsCompatibility.tw
+++ b/src/data/backwardsCompatibility/BackwardsCompatibility.tw
@@ -2,10 +2,10 @@
<<set $nextButton = "Continue", $nextLink = "Main", $returnTo = "Main">>
-<<run App.Update.setNonexistantProperties(V, App.Data.defaultGameStateVariables)>>
+<<run App.Update.setNonexistentProperties(V, App.Data.defaultGameStateVariables)>>
/* resetOnNGPlus contains half of the variables we need, but we use it politely here instead of forcing it so it fills in holes instead of overwriting data */
-<<run App.Update.setNonexistantProperties(V, App.Data.resetOnNGPlus)>>
+<<run App.Update.setNonexistentProperties(V, App.Data.resetOnNGPlus)>>
<span id="backwardsCompatibility"></span>
<script>
App.Update.backwardsCompatibility();
diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js
index cc228b13471..d4c5b9282ba 100644
--- a/src/data/backwardsCompatibility/backwardsCompatibility.js
+++ b/src/data/backwardsCompatibility/backwardsCompatibility.js
@@ -25,7 +25,7 @@ App.Update.autoshred = function(node) {
node.append(`Done!`);
};
-App.Update.setNonexistantProperties = function(obj, props) {
+App.Update.setNonexistentProperties = function(obj, props) {
let count = 0;
for (const p of Object.getOwnPropertyNames(props)) {
if (typeof obj[p] === "undefined") {
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index c73026fe426..7734e6ed20b 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with thi
*/
/* Set up the game as politely as possible. If values are already set, they are preserved. */
-<<run App.Update.setNonexistantProperties(V, App.Data.defaultGameStateVariables)>>
+<<run App.Update.setNonexistentProperties(V, App.Data.defaultGameStateVariables)>>
/* These variables must be created AND set to default values, NG+ or not */
<<run App.Update.setExistantProperties(V, App.Data.resetOnNGPlus)>>
diff --git a/src/neighbor/neighborDescription.tw b/src/neighbor/neighborDescription.tw
index 2d4dc8f1796..e16aebdbe55 100644
--- a/src/neighbor/neighborDescription.tw
+++ b/src/neighbor/neighborDescription.tw
@@ -483,7 +483,7 @@ its neighbors.
<<elseif $arcologies[$i].FSChattelReligionist > 40>>
<<set $desc = $desc + "a popular destination for devout old world citizens engaging in sex tourism.">>
<<else>>
- <<set $desc = $desc + "in the throes of public dissention over its religious laws.">>
+ <<set $desc = $desc + "in the throes of public dissension over its religious laws.">>
<</if>>
<<set _neighborDescription.push($desc)>>
<</if>>
diff --git a/src/pregmod/analyzePregnancy.tw b/src/pregmod/analyzePregnancy.tw
index 45c768136ca..e181f59ad04 100644
--- a/src/pregmod/analyzePregnancy.tw
+++ b/src/pregmod/analyzePregnancy.tw
@@ -20,7 +20,7 @@
<h2>Overall statistics</h2>
<div class="indent">
<<set _cc = Math.round(getSlave($activeSlave.ID).bellyPreg)>>
- <<set _safecc = Math.round(getSlave($activeSlave.ID).pregAdaptation*2000)>>
+ <<set _safeCC = Math.round(getSlave($activeSlave.ID).pregAdaptation*2000)>>
<<if $geneticMappingUpgrade > 0>>
<div>
Estimated physical degree of pregnancy adaptation: <<print num(Math.round(getSlave($activeSlave.ID).pregAdaptation))>>
@@ -32,7 +32,7 @@
<<else>>
abdominal
<</if>>
- volume: <<= num(_safecc)>> cc
+ volume: <<= num(_safeCC)>> cc
</div>
<</if>>
<div>
@@ -45,7 +45,7 @@
<<else>>
abdominal
<</if>>
- volume: <<if _safecc < _cc && $geneticMappingUpgrade > 0>>@@.red;<<= num(_cc)>>@@<<else>><<= num(_cc)>><</if>> cc
+ volume: <<if _safeCC < _cc && $geneticMappingUpgrade > 0>>@@.red;<<= num(_cc)>>@@<<else>><<= num(_cc)>><</if>> cc
</div>
</div>
</p>
--
GitLab