From fee3d39c238821c966a5bad083ce4f3d6af94172 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Mon, 30 Mar 2020 20:03:49 -0500
Subject: [PATCH] ParentFix
---
FCHost/fchost/fchost_storage.cc | 6 +++---
artTools/vector_deepmurk_extras.svg | 2 +-
artTools/vector_deepmurk_primary.svg | 2 +-
artTools/vector_deepmurk_secondary.svg | 2 +-
artTools/vector_revamp_source.svg | 2 +-
slave variables documentation - Pregmod.txt | 2 +-
src/Corporation/corporate-divisionProcessing.js | 1 -
src/Corporation/corporate.js | 2 +-
src/uncategorized/arcmgmt.tw | 2 +-
src/uncategorized/reRelativeRecruiter.tw | 4 ++--
10 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/FCHost/fchost/fchost_storage.cc b/FCHost/fchost/fchost_storage.cc
index 6d223e0b7b8..af13e4c8817 100644
--- a/FCHost/fchost/fchost_storage.cc
+++ b/FCHost/fchost/fchost_storage.cc
@@ -7,7 +7,7 @@
CefRefPtr<CefV8Value> FCHostSessionStorage::keys() const
{
- // holy hell this is awful. I hope Sugarcube doesn't actually USE this...
+ // holy hell this is awful. I hope Sugarcube doesn't actually USE this...
CefRefPtr<CefV8Value> ret = CefV8Value::CreateArray(static_cast<int>(storage.size()));
auto itr = storage.cbegin();
for (int i = 0; i < static_cast<int>(storage.size()); ++i, ++itr)
@@ -18,7 +18,7 @@ CefRefPtr<CefV8Value> FCHostSessionStorage::keys() const
}
#if defined(OS_WIN)
-/* This should't happen, so don't waste time on it. Sugarcube really only writes simple alphanumeric keys.
+/* This shouldn't happen, so don't waste time on it. Sugarcube really only writes simple alphanumeric keys.
static bool SanitizePath(std::wstring& inpath)
{
std::transform(inpath.begin(), inpath.end(), inpath.begin(), [](wchar_t c)
@@ -35,7 +35,7 @@ void FCHostPersistentStorage::set(const CefString& key, CefRefPtr<CefV8Value> va
{
__super::set(key, val);
- // only strings get persisted (should be ok, Sugarcube will serialize first)
+ // only strings get persisted (should be OK, Sugarcube will serialize first)
if (val->IsString())
{
// we should probably be doing this async but TBT Sugarcube is the slow part, not the file IO
diff --git a/artTools/vector_deepmurk_extras.svg b/artTools/vector_deepmurk_extras.svg
index f18382d4ced..2b74000dc9c 100644
--- a/artTools/vector_deepmurk_extras.svg
+++ b/artTools/vector_deepmurk_extras.svg
@@ -298,7 +298,7 @@
<style
type="text/css"
id="style">
- /* please maintain these definitions manually */
+ /* please maintain these definitions manually */
.white{fill:#FFFFFF;}
.skin{fill:#F6E0E8;}
.head{}
diff --git a/artTools/vector_deepmurk_primary.svg b/artTools/vector_deepmurk_primary.svg
index bffb51c4436..51602301ba6 100644
--- a/artTools/vector_deepmurk_primary.svg
+++ b/artTools/vector_deepmurk_primary.svg
@@ -64,7 +64,7 @@
<inkscape:grid type="xygrid" id="grid897"/>
</sodipodi:namedview>
<style type="text/css" id="style">
- /* please maintain these definitions manually */
+ /* please maintain these definitions manually */
.white{fill:#FFFFFF;}
.skin{fill:#F6E0E8;}
.head{}
diff --git a/artTools/vector_deepmurk_secondary.svg b/artTools/vector_deepmurk_secondary.svg
index 7cf277a327f..5ca142e7ecf 100644
--- a/artTools/vector_deepmurk_secondary.svg
+++ b/artTools/vector_deepmurk_secondary.svg
@@ -64,7 +64,7 @@
<inkscape:grid type="xygrid" id="grid897"/>
</sodipodi:namedview>
<style type="text/css" id="style">
- /* please maintain these definitions manually */
+ /* please maintain these definitions manually */
.white{fill:#FFFFFF;}
.skin{fill:#F6E0E8;}
.head{}
diff --git a/artTools/vector_revamp_source.svg b/artTools/vector_revamp_source.svg
index be0a37e3d99..a21275fa75a 100644
--- a/artTools/vector_revamp_source.svg
+++ b/artTools/vector_revamp_source.svg
@@ -19,7 +19,7 @@
</defs>
<sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="2482" inkscape:window-height="1411" id="namedview4358" showgrid="false" inkscape:zoom="0.99999996" inkscape:cx="360.42883" inkscape:cy="363.29092" inkscape:window-x="69" inkscape:window-y="-9" inkscape:window-maximized="1" inkscape:current-layer="Notes_" inkscape:object-nodes="true" inkscape:object-paths="true" inkscape:snap-smooth-nodes="false" inkscape:snap-object-midpoints="true" inkscape:snap-global="false" inkscape:snap-nodes="true" inkscape:snap-intersection-paths="false" inkscape:snap-bbox="true" inkscape:snap-others="false" showguides="false" inkscape:lockguides="true"/>
<style type="text/css" id="style">
- /* please maintain these definitions manually */
+ /* please maintain these definitions manually */
.white{fill:#FFFFFF;}
.skin{fill:#F6E0E8;}
.head{}
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 719097a67b9..5900a574bcc 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -3579,7 +3579,7 @@ Has the slave gone through male puberty.
scar:
is an object
-keys include any place on a slave body that can receive a scar, values are an object. This sub-object's keys are the kind of scar, and the property is an int showing how bad it is.
+keys include any place on a slave body that can receive a scar, values are an object. This sub-object's keys are the kind of scar, and the property is an int showing how bad it is.
breedingMark:
diff --git a/src/Corporation/corporate-divisionProcessing.js b/src/Corporation/corporate-divisionProcessing.js
index 368a8f5f010..719dac292fc 100644
--- a/src/Corporation/corporate-divisionProcessing.js
+++ b/src/Corporation/corporate-divisionProcessing.js
@@ -75,7 +75,6 @@ App.Corporate.Init_DivisionProcessing = function(shared) {
delete V.corp[this._const.corpId + "Slaves2"];
}
-
get foundingCostSlaves() { return this._const.founding.size * this.purchasedSlaveValue; }
get foundingCost() { return this.foundingCostDivision + this.foundingCostSlaves; }
create() {
diff --git a/src/Corporation/corporate.js b/src/Corporation/corporate.js
index 7524a8a7d82..9fd85d79768 100644
--- a/src/Corporation/corporate.js
+++ b/src/Corporation/corporate.js
@@ -833,7 +833,7 @@ App.Corporate.Init = function() {
// todo: Make a switch to allow the user to control purchasing behavior.
// todo: Expensive first
// todo: Cheapest first
- // Even purchase requsts:
+ // Even purchase requests:
let purchaseValues = evenFillArray(Object.values(ledger.divisionLedgers)
.filter(divLedger=>divLedger.market.buy > 0)
, this.cash
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 6f45e6c8057..d4f0e3eaf50 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -1227,7 +1227,7 @@ _percTopClass = Math.trunc(($topClass / ($ACitizens + $ASlaves)) * 1000) / 10>>
<</if>>
<<if $arcologies[0].FSPetiteAdmirationLaw == 1>>
<<set _rentMultiplier *= 0.95>>
- Citzens are offered subsidized rent to take drastically shorter partners and harem members.
+ Citizens are offered subsidized rent to take drastically shorter partners and harem members.
<<elseif $arcologies[0].FSStatuesqueGlorificationLaw == 1>>
<<set _rentMultiplier *= 0.95>>
Tall citizens are offered rent subsidies, at the expense of short citizens, to encourage more statuesque individuals to join the free population of your arcology.
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index e216f2e94f3..3e2898a9c69 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -495,9 +495,9 @@
<<case "son">>
$he had a _daughter2, who was sent to the slave orphanages. $He's heard a rumor through other slaves that $his _daughter2 will go up for sale soon.
<<case "mother">>
- $his _mother2 might be getting sold soon. _He2 has been a slave for some time. $He's heard a rumor through other slaves that $his _mother2 will go up for sale soon.
+ $his mother might be getting sold soon. _He2 has been a slave for some time. $He's heard a rumor through other slaves that $his mother will go up for sale soon.
<<case "father">>
- $his _mother2 might be getting sold soon. _He2 has been a slave for some time. $He's heard a rumor through other slaves that $his _mother2 will go up for sale soon.
+ $his father might be getting sold soon. _He2 has been a slave for some time. $He's heard a rumor through other slaves that $his father will go up for sale soon.
<<case "older sister">>
$his older _sister2 is being sold. _He2 was likely to be enslaved the last $eventSlave.slaveName knew of _him2, and now $he's heard a rumor through other slaves that $his big _sister2 is going to be sold to a new owner.
<<case "older brother">>
--
GitLab