From 63dc039ad6e7be77c638e4c0557fbd912ee70022 Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Sun, 10 Jun 2018 22:10:49 -0400
Subject: [PATCH] Fixes
---
src/gui/Encyclopedia/encyclopedia.tw | 41 ++++++++++----------
src/uncategorized/corporationDevelopments.tw | 10 ++---
src/uncategorized/saLongTermEffects.tw | 4 +-
src/uncategorized/surgeryDegradation.tw | 6 +--
src/utility/assayWidgets.tw | 6 +--
5 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 7559fa4b2f6..9c262f2d810 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -946,7 +946,7 @@ SLAVE BODY:
<<case "Musculature">>
- Slaves' ''musculature'' occurs in seven levels, and affects combat effectiveness, beauty, and the effects of breasts. For combat, the penultimate level is best. At game start, muslces are a minor detriment to beauty, though this can be changed through [[future society|Encyclopedia][$encyclopedia = "Future Societies"]] choices. Extremely large breasts can begin to hinder slaves, but the first level will allow them to carry their burdens.
+ Slaves' ''musculature'' occurs in seven levels, and affects combat effectiveness, beauty, and the effects of breasts. For combat, the penultimate level is best. At game start, muscles are a minor detriment to beauty, though this can be changed through [[future society|Encyclopedia][$encyclopedia = "Future Societies"]] choices. Extremely large breasts can begin to hinder slaves, but the first level will allow them to carry their burdens.
<br><br>From the slave documentation;
<br>96+ - extremely muscular
@@ -957,13 +957,13 @@ SLAVE BODY:
<br>-95 - -31 - very weak
<br>-96- - frail
- <br><br>A standard [[bodyguard|Encyclopedia][$encyclopedia = "Bodyguard"]] is negatively impacted by being weak or extremely muscular and postively impacted by being muscular. A slave that is at the max of tall or very tall (>= 185) can handle being extremely muscular.
+ <br><br>A standard [[bodyguard|Encyclopedia][$encyclopedia = "Bodyguard"]] is negatively impacted by being weak or extremely muscular and positively impacted by being muscular. A slave that is at the max of tall or very tall (>= 185) can handle being extremely muscular.
<br><br>[[DJ|Encyclopedia][$encyclopedia = "DJ"]] 's are more effective when they are just under being muscular and inside being toned.
<br><br>A [[nurse|Encyclopedia][$encyclopedia = "Nurse"]] is more effective when they are toned or greater.
- <br><br>Values >= 95 allows slaves with extremly hypertrophied balls (>70) to move around with effort.
+ <br><br>Values >= 95 allows slaves with extremely hypertrophied balls (>70) to move around with effort.
<<case "Nipples">>
@@ -2815,26 +2815,25 @@ LORE: INTERVIEWS
**Our guarantee does not cover slaveowners who underestimate their slaves' potency and wind up pregnant.
<<case "The Black Market">>
- <h4>The Black Market</h4>
- You may be the ruler of your arcology, but you don't exist in a vacuum. You can do all kinds of thing and get lots of things that regular citizens can't. So the Black Market, is a chance for less prominent citizens to do or get stuff like an arcology leader might experience. But for a ruler like yourself, it's a chance to avoid the severe scruitiny you're subject to on a regular basis, and to get a hold of bleeding edge or illegal research and technologies. The market itself is always moving from place to place, but if you're reputable enough, you can find it when you need it.
- <br><br>
- You will be able to find all manner of Future Society Technologies, while not exactly illegal, they are hard to get through regular channels. Everyweek, the dealers will have a few for you to purchase if you like. But for the truely illegal or unethical items, Your only choice is to go to the Black Market.
- <br><br>
- <dl>
- <dt>Black market specialty goods:</dt>
- <dd>[[Childhood Fertility Induced NCS|Encyclopedia][$encyclopedia = "Childhood Fertility Induced NCS"]]</dd>
- </dl>
+ <h4>The Black Market</h4>
+ You may be the ruler of your arcology, but you don't exist in a vacuum. You can do all kinds of thing and get lots of things that regular citizens can't. So the Black Market, is a chance for less prominent citizens to do or get stuff like an arcology leader might experience. But for a ruler like yourself, it's a chance to avoid the severe scrutiny you're subject to on a regular basis, and to get a hold of bleeding edge or illegal research and technologies. The market itself is always moving from place to place, but if you're reputable enough, you can find it when you need it.
+ <br><br>
+ You will be able to find all manner of Future Society Technologies, while not exactly illegal, they are hard to get through regular channels. Every week, the dealers will have a few for you to purchase if you like. But for the truly illegal or unethical items, Your only choice is to go to the Black Market.
+ <br><br>
+ <dl>
+ <dt>Black market specialty goods:</dt>
+ <dd>[[Childhood Fertility Induced NCS|Encyclopedia][$encyclopedia = "Childhood Fertility Induced NCS"]]</dd>
+ </dl>
<<case "Childhood Fertility Induced NCS">>
-
- <dl>
- <dt>Childhood Fertility Induced NCS</dt>
- <dd>
- This uses a designer retrograde virus to set the genetic markers for the Neotenic Complex Syndrome, a syndrome originally called Syndrome X discovered in the early 2000's. In layman's terms, it @@.gold;suppresses the growth and secondary sexual characteristics of slaves@@; both male and female. The original condition was usually fatal or dangerous. This modified version of the genetic flaw is not harmful (relatively speaking), and in addition to the growth blockage, it permits the slave to continue the @@.lime;development of gonads@@ at a slighlty faster than normal pace. Secondary sexual characteristics are also reversed, though interestingly enough, pregnancy is still possible.Slaves put on this genetic engineered blend will be permanently changed and will no longer grow in stature or assets without severe chemical assistance, and even then at a reduced rate when compared to non-NCS-induced slaves, and should their ongoing growth treatments stop they will slowly regress back to the physicality of a child.<br><br>
- @@.red;The genetic tampering is considered illegal,@@ but there is also a @@.yellow;moral question as this abrogates the rights of slaves to ever grow up.@@<br><br>
- Can only be purchased in [[The Black Market|Encyclopedia][$encyclopedia = "The Black Market"]].
- </dd>
- </dl>
+ <dl>
+ <dt>Childhood Fertility Induced NCS</dt>
+ <dd>
+ This uses a designer retrograde virus to set the genetic markers for the Neotenic Complex Syndrome, a syndrome originally called Syndrome X discovered in the early 2000's. In layman's terms, it @@.gold;suppresses the growth and secondary sexual characteristics of slaves@@; both male and female. The original condition was usually fatal or dangerous. This modified version of the genetic flaw is not harmful (relatively speaking), and in addition to the growth blockage, it permits the slave to continue the @@.lime;development of gonads@@ at a slightly faster than normal pace. Secondary sexual characteristics are also reversed, though interestingly enough, pregnancy is still possible.Slaves put on this genetic engineered blend will be permanently changed and will no longer grow in stature or assets without severe chemical assistance, and even then at a reduced rate when compared to non-NCS-induced slaves, and should their ongoing growth treatments stop they will slowly regress back to the physicality of a child.<br><br>
+ @@.red;The genetic tampering is considered illegal,@@ but there is also a @@.yellow;moral question as this abrogates the rights of slaves to ever grow up.@@<br><br>
+ Can only be purchased in [[The Black Market|Encyclopedia][$encyclopedia = "The Black Market"]].
+ </dd>
+ </dl>
<<case "Security Expansion">>
<<include "encyclopediaSecExpMain">>
diff --git a/src/uncategorized/corporationDevelopments.tw b/src/uncategorized/corporationDevelopments.tw
index 6df3bcf1c4a..76b31a90823 100644
--- a/src/uncategorized/corporationDevelopments.tw
+++ b/src/uncategorized/corporationDevelopments.tw
@@ -165,7 +165,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $cash += 1000*$sharePrice>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99,$PC.trading >= 100 ? 99 : 98)))/100>>
<<replace "#CorpAction">>
- <br>"You sold <<print commaNum(1000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>> for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@" driving the share price down slightly."
+ <br>"You sold <<print commaNum(1000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@ for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@" driving the share price down slightly."
<</replace>>
<</link>>
<<if $personalShares-5000 > $publicShares>>
@@ -175,7 +175,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $cash += 5000*$sharePrice>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99,$PC.trading >= 100 ? 99 : 98)))/100>>
<<replace "#CorpAction">>
- <br>"You sold <<print commaNum(5000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>> for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@" driving the share price down slightly."
+ <br>"You sold <<print commaNum(5000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@ for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@" driving the share price down slightly."
<</replace>>
<</link>>
<</if>>
@@ -185,7 +185,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $cash += 10000*$sharePrice>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99,$PC.trading >= 100 ? 99 : 98)))/100>>
<<replace "#CorpAction">>
- <br>You sold <<print commaNum(10000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*10000))>> for @@.yellowgreen;<<print cashFormat(Math.ceil(10000*$sharePrice))>>@@" driving the share price down slightly."
+ <br>You sold <<print commaNum(10000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*10000))>>@@ for @@.yellowgreen;<<print cashFormat(Math.ceil(10000*$sharePrice))>>@@" driving the share price down slightly."
<</replace>>
<</link>>
<</if>>
@@ -222,7 +222,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash += 1000*Math.ceil($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>>
<<replace "#CorpAction">>
- <br>"The corporation issued <<print commaNum(1000)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>> for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@" driving the share price down slightly."
+ <br>"The corporation issued <<print commaNum(1000)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@ for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@" driving the share price down slightly."
<</replace>>
<</link>>
<<if $personalShares-5000 > $publicShares>>
@@ -231,7 +231,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash += 5000*Math.ceil($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>>
<<replace "#CorpAction">>
- <br>"The corporation issued <<print commaNum(5000)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>> for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@" driving the share price down slightly."
+ <br>"The corporation issued <<print commaNum(5000)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@ for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@" driving the share price down slightly."
<</replace>>
<</link>>
<</if>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 8bd86f5f248..236de7a3ad7 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -6361,7 +6361,7 @@
$possessiveCap @@.orange;NCS@@ is actively @@.orange;reducing the size of $possessive giant dick.@@
<<set $slaves[$i].dick -= 2, _countNCS++>>
<<elseif ($slaves[$i].clit >= 5)>>
- $possessiveCap @@.orange;NCS@@ has @@.orange;reduced the size of $possessive enourmous clit-dick.@@
+ $possessiveCap @@.orange;NCS@@ has @@.orange;reduced the size of $possessive enormous clit-dick.@@
<<set $slaves[$i].clit -= 2, _countNCS++>>
<<elseif ((_countNCS < 3) && ($slaves[$i].dick > 2) && (random(1,100) < (($slaves[$i].dick + 1) * 9)))>>
$possessiveCap @@.orange;NCS@@ is actively @@.orange;reducing the size of $possessive dick.@@
@@ -6388,7 +6388,7 @@
** Regular butts based on chances, decrease as the size does.
*/
<<if ($slaves[$i].butt-$slaves[$i].buttImplant >= 10)>>
- $possessiveCap @@.orange;NCS@@ applies and @@.orange;reduces the size of $possessive bolbuous butt.@@
+ $possessiveCap @@.orange;NCS@@ applies and @@.orange;reduces the size of $possessive bulbous butt.@@
<<set $slaves[$i].butt -= 2, _countNCS++>>
<<elseif ((_countNCS < 3) && ($slaves[$i].butt-$slaves[$i].buttImplant >= 1) && (random(1,100) < ($slaves[$i].butt * 9)))>>
$possessiveCap @@.orange;NCS@@ applies and @@.orange;reduces the size of $possessive butt.@@
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index 5674433f279..00323b4a4d2 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -2138,7 +2138,7 @@ As the remote surgery's long recovery cycle completes,
<<elseif ($activeSlave.devotion > -20)>>
<<set _voiceReaction = $pronounCap + " laughs grimly at " + $object + "self as " + $pronoun + " gets used to it.">>
<</if>>
- <<set _statusChanges.push($pronounCap + ' hears ' + $possessive + ' voice comming out as @@.orange;higher@@ and more ' + _voiceLevel + ' than it was before. ' + _voiceReaction), $activeSlave.voice += 1>>
+ <<set _statusChanges.push($pronounCap + ' hears ' + $possessive + ' voice coming out as @@.orange;higher@@ and more ' + _voiceLevel + ' than it was before. ' + _voiceReaction), $activeSlave.voice += 1>>
<</if>>
/*
Handle the display of the changes for the newly NCS'ed slave.
@@ -2151,7 +2151,7 @@ As the remote surgery's long recovery cycle completes,
<<else>>anxious about what you did to her, dreading the news.
<</if>>
<<else>>
- Over the course of the treatment $pronoun begins to feel the inital effects and on inspection, when $pronoun <<if $activeSlave.amp == 1>>is carried<<else>>walks<</if>> out of the surgery room, $pronounCap feels somehow smaller and changed in <<if _numberChanges == 1>>at least one way<<elseif _numberChanges == 2>>two ways<<else>>several ways<</if>>.<br><br>
+ Over the course of the treatment $pronoun begins to feel the initial effects and on inspection, when $pronoun <<if $activeSlave.amp == 1>>is carried<<else>>walks<</if>> out of the surgery room, $pronounCap feels somehow smaller and changed in <<if _numberChanges == 1>>at least one way<<elseif _numberChanges == 2>>two ways<<else>>several ways<</if>>.<br><br>
<<if _hair != ''>>_hair<</if>>
<<if _genitalChanges.length > 0>>
$pronounCap can _sense that her junk's different now, it seems $possessive
@@ -2185,7 +2185,7 @@ As the remote surgery's long recovery cycle completes,
<<else>>
_physicalChanges[0]
<</if>>
- <<set _reaction = either('comes as a bit of a suprise', 'comes as quite a shock', "doesn't seem to phase " + $object, 'confirms her suspiscions', $pronoun + ' finds interesting', $pronoun + " can't get over") + '.'>>
+ <<set _reaction = either('comes as a bit of a surprise', 'comes as quite a shock', "doesn't seem to phase " + $object, 'confirms her suspicions', $pronoun + ' finds interesting', $pronoun + " can't get over") + '.'>>
which _reaction
<</if>>
<<if _statusChanges.length > 0>>
diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw
index cad1e71dd02..905bd3996b0 100644
--- a/src/utility/assayWidgets.tw
+++ b/src/utility/assayWidgets.tw
@@ -1899,13 +1899,13 @@
<<set _slaveMultiplier += 0.1>>
<</if>>
<<if !setup.milkmaidCareers.includes($activeSlave.career) && $activeSlave.skillMM >= $masteredXP>>
- <<set _slaveMultiplier += 0.1>>
+ <<set _slaveMultiplier += 0.1>>
<</if>>
<<if !setup.madamCareers.includes($activeSlave.career) && $activeSlave.skillMD >= $masteredXP>>
- S <<set _slaveMultiplier += 0.1>>
+ <<set _slaveMultiplier += 0.1>>
<</if>>
<<if !setup.DJCareers.includes($activeSlave.career) && $activeSlave.skillDJ >= $masteredXP>>
- <<set _slaveMultiplier += 0.1>>
+ <<set _slaveMultiplier += 0.1>>
<</if>>
<<if !setup.HGCareers.includes($activeSlave.career) && $activeSlave.skillHG >= $masteredXP>>
<<set _slaveMultiplier += 0.1>>
--
GitLab