diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 2897ebcb939b9c5eed59c8f67480f6110ce4e498..2f438643ed3cdc6206c975f9d6b50fdc94cdfd21 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4852,4 +4852,9 @@ Pregmod 0.10.3.0
-fixes
193
+ -fixes
+
+ 12/09/17
+ -SFanon's passive PC skill gaining
+ -anon's various additions and corrections
-fixes
\ No newline at end of file
diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw
index b5b3642b626e75d16035745f61d15499d8f38fec..ac4ac39ab44f5f03b649076c3704069bf5a1d752 100644
--- a/src/SecExp/attackReport.tw
+++ b/src/SecExp/attackReport.tw
@@ -452,7 +452,7 @@
<<set $cash += _loot>>
<br>
Damage to the infrastructure was @@.yellow;virtually non-existent@@, costing only pocket cash to bring the structure back to normal. The inhabitants as well reported little to no injuries, because of this the prosperity of the arcology did not suffer.
- <<set $cash -= 1000 * _majorBattleMod, $PC.engineering += .1>>>>
+ <<set $cash -= 1000 * _majorBattleMod, $PC.engineering += .1>>
<<if $PCvictoryStreak >= 3>>
It seems your victories over the constant threats directed your way is having @@.green;a positive effect on the prosperity of the arcology@@, due to the security your leadership affords.
<<set $arcologies[0].prosperity += 5 * _majorBattleMod>>
@@ -474,7 +474,7 @@
<</if>>
<br>
In the raiding following the battle @@.red;the arcology sustained heavy damage@@, which will cost quite the amount of cash to fix. Reports of @@.red;citizens or slaves killed or missing@@ flood your office for a few days following the defeat.
- <<set $cash -= 5000 * _majorBattleMod, $PC.engineering += .1>>>>
+ <<set $cash -= 5000 * _majorBattleMod, $PC.engineering += .1>>
<<if $week <= 30>>
<<set $ACitizens -= random(100) * _majorBattleMod>>
<<set $ASlaves -= random(150) * _majorBattleMod>>
diff --git a/src/SecExp/rebellionReport.tw b/src/SecExp/rebellionReport.tw
index 141362de987a3ca11de8ec26044dd1509c3ac64d..217955a855a7c2675b5fb469ff325b479879a26b 100644
--- a/src/SecExp/rebellionReport.tw
+++ b/src/SecExp/rebellionReport.tw
@@ -276,7 +276,7 @@
<<if $engageRule == 0>>
Since you ordered your troops to limit their weaponry to low caliber or non lethal, the arcology reported only @@.red;minor damage@@. Most citizens and non involved slaves remained unharmed, though some casualties between the civilians were inevitable.
A few businesses were looted and burned, but the damage was pretty limited.
- <<set $arcRepairTime += 3, $PC.engineering += .1>>>>
+ <<set $arcRepairTime += 3, $PC.engineering += .1>>
<<if $week <= 30>>
<<set $ACitizens -= random(40)>>
<<set $ASlaves -= random(65)>>
@@ -301,7 +301,7 @@
<<elseif $engageRule == 1>>
You ordered your troops to limit their weaponry to non-heavy, non-explosive, because of this the arcology reported @@.red;moderate damage@@. Most citizens and non involved slaves remained unharmed or only lightly wounded, but many others did not make it. Unfortunately casualties between the civilians were inevitable.
A few businesses were looted and burned, but the damage was pretty limited.
- <<set $arcRepairTime += 5, $PC.engineering += .1>>>>
+ <<set $arcRepairTime += 5, $PC.engineering += .1>>
<<if $week <= 30>>
<<set $ACitizens -= random(60)>>
<<set $ASlaves -= random(85)>>
@@ -326,7 +326,7 @@
<<elseif $engageRule == 2>>
Since you did not apply any restriction on the weapons your forces should use, the arcology reported @@.red;heavy damage@@. Many citizens and uninvolved slaves are reported killed or missing. Casualties between the civilians were inevitable.
Many businesses were damaged during the battle either by the fight itself, by fires which spread unchecked for hours or by looters.
- <<set $arcRepairTime += 7, $PC.engineering += .1>>>>
+ <<set $arcRepairTime += 7, $PC.engineering += .1>>
<<if $week <= 30>>
<<set $ACitizens -= random(100)>>
<<set $ASlaves -= random(150)>>
@@ -351,7 +351,7 @@
<<else>>
Thanks to the advance riot control weaponry developed by your experts, the rebels were mostly subdued or killed with @@.yellow;little to no collateral damage to the arcology@@ and its inhabitants.
A few businesses were looted, but the damage was very limited.
- <<set $arcRepairTime += 2, $PC.engineering += .1>>>>
+ <<set $arcRepairTime += 2, $PC.engineering += .1>>
<<set $cash -= 1000>>
<<if $week <= 30>>
<<set $ACitizens -= random(20)>>
@@ -388,7 +388,7 @@
<<if random(1,100) <= (75 - ($fort.reactor * 25))>>
Unfortunately during the fighting a group of slaves infiltrated the reactor complex and sabotaged it, causing massive power fluctuations and blackouts.
It will take @@.red;time and money to repair the damage@@.
- <<set $garrison.reactorTime = $repairTime + random(1) - $fort.reactor, $PC.engineering += .1>>>>
+ <<set $garrison.reactorTime = $repairTime + random(1) - $fort.reactor, $PC.engineering += .1>>
<<set $cash -= 2000>>
<<else>>
While the reactor was left defenseless without a garrison, there was no attempt at sabotage. Let's hope we'll always be this lucky.
@@ -400,7 +400,7 @@
<<if random(1,100) <= (75 - ($fort.waterway * 25))>>
Unfortunately during the fighting a group of slaves infiltrated the water management complex and sabotaged it, causing huge water leaks throughout the arcology and severely limiting the water supply.
It will take @@.red;time and money to repair the damage@@.
- <<set $garrison.waterwayTime = $repairTime + random(1) - $fort.waterway, $PC.engineering += .1>>>>
+ <<set $garrison.waterwayTime = $repairTime + random(1) - $fort.waterway, $PC.engineering += .1>>
<<set $cash -= 2000>>
<<else>>
While the water management complex was left defenseless without a garrison, there was no attempt at sabotage. Let's hope we'll always be this lucky.
@@ -412,7 +412,7 @@
<<if random(1,100) <= (75 - ($fort.assistant * 25))>>
Unfortunately during the fighting a group of slaves infiltrated the facility housing $assistantName's mainframe and sabotaged it. Without its AI the arcology will be next to impossible to manage.
It will take @@.red;time and money to repair the damage@@.
- <<set $garrison.assistantTime = $repairTime + random(1) - $fort.assistant, $PC.engineering += .1>>>>
+ <<set $garrison.assistantTime = $repairTime + random(1) - $fort.assistant, $PC.engineering += .1>>
<<set $cash -= 2000>>
<<else>>
While the $assistantName's mainframe was left defenseless without a garrison, there was no attempt at sabotage. Let's hope we'll always be this lucky.
@@ -587,7 +587,7 @@
<</if>>
<</if>>
The damage to the structure will be @@.red;costly to repair@@.
- <<set $cash -= 2000, $PC.engineering += .1>>>>
+ <<set $cash -= 2000, $PC.engineering += .1>>
<<else>>
While the penthouse was left without a sizeable garrison, there was no dangerous assault against it. Let's hope we'll always be this lucky.
<</if>>
@@ -695,7 +695,7 @@
<</if>>
<</if>>
The damage to the structure will be @@.red;costly to repair@@.
- <<set $cash -= 2000, $PC.engineering += .1>>>>
+ <<set $cash -= 2000, $PC.engineering += .1>>
<<else>>
There was no sizeable assault against the penthouse. Let's hope we'll always be this lucky.
<</if>>
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index b052129dc7832913802c4a2ba56f6fad0554f83e..8d1b1cf52aee668069716ec48c74f1eb793d953d 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -2573,7 +2573,7 @@ __I do not give credit without explicit permission to do so.__ If you have contr
<br>''fcanon'' for various fixes, massive improvements to the RA and wrangling my inabilty to spll gud.
<br>''stuffedgameanon'' for fixes, streamlining the starting girls family code, family trees, unbelievable improvements to the games functionality, the sanityChecker, a tag checker and above ALL else; Improving the game's speed by an obscene amount. I swear this guy is a wizard.
<br>''anon'' for a prototype foot job scene.
-<br>''Preglocke'' for cleaning and expanding the foot job scene.
+<br>''Preglocke'' for cleaning and expanding the foot job scene and various little content additions and corrections.
<br>''anon'' for writing forced marriages, extra escape outcomes and more player refreshment types.
<br>''anon'' for global realism stave trade setting.
<br>''anon'' for new recruit events.
@@ -2588,7 +2588,7 @@ __I do not give credit without explicit permission to do so.__ If you have contr
<br>''Utopia'' for dirty dealings gang leader focus and updates to it.
<br>''hexall90'' for height growth drugs, incubator organ farm support and detailing, the dispensary cleanup, the joint Eugenics bad end rework, the Hippolyta Academy, and the Security Expansion Mod.
<br>''laziestman'' for sexy spats.
-<br>''SFanon (blank)'' for SF related work and the joint Eugenics bad end rework.
+<br>''SFanon (blank)'' for SF related work, passive player skill gain and the joint Eugenics bad end rework.
<br>''anon'' for extending FCGudder's economy reports to the other facilities.
<br>''MilkAnon'' for his contributions to FCTV and the FC world in general.
<br>''valen102938'' for dealing with vector art, both creating new art and utilising unused art.
diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw
index 0be599787660a376b0171fc443154746a3059403..951cef68911892dcf3029fdce182f2d8ca8d4356 100644
--- a/src/npc/fFeelings.tw
+++ b/src/npc/fFeelings.tw
@@ -9,27 +9,27 @@
<<if ($activeSlave.devotion < -50)>>
She
<<if ($activeSlave.trust >= -20)>>
- <<if canTalk($activeSlave) == false>>gestures<<elseif (_lisping == 1)>>lisps<<else>>declares<</if>> angrily that it's wrong to keep her a slave, and that you should free her.
+ <<if !canTalk($activeSlave)>>gestures<<elseif (_lisping == 1)>>lisps<<else>>declares<</if>> angrily that it's wrong to keep her a slave, and that you should free her.
<<elseif ($activeSlave.trust >= -50)>>
- <<if canTalk($activeSlave) == false>>gestures<<elseif (_lisping == 1)>>lisps<<else>>mutters<</if>> hesitantly that it's wrong to keep her a slave, and that you should free her.
+ <<if !canTalk($activeSlave)>>gestures<<elseif (_lisping == 1)>>lisps<<else>>mutters<</if>> hesitantly that it's wrong to keep her a slave, and that you should free her.
<<else>>
<<if !canTalk($activeSlave)>>gestures a perfunctory plea not to hurt her.<<else>>mutters a perfunctory "Plea<<s>>e don't hurt me, <<if $activeSlave.rudeTitle == 1>><<PoliteRudeTitle $activeSlave>><<else>><<Master>><</if>>."<</if>>
<</if>>
<<elseif ($activeSlave.devotion < -20)>>
She
- <<if canTalk($activeSlave) == false>>gestures<<elseif (_lisping == 1)>>lisps<<else>>mutters<</if>>
+ <<if !canTalk($activeSlave)>>gestures<<elseif (_lisping == 1)>>lisps<<else>>mutters<</if>>
<<if ($activeSlave.trust >= -20)>>
- hesitantly that she does not like being a slave, and then <<if canTalk($activeSlave) == false>>lets her hands fall to her sides<<else>>falls silent<</if>>.
+ hesitantly that she does not like being a slave, and then <<if !canTalk($activeSlave)>>lets her hands fall to her sides<<else>>falls silent<</if>>.
<<elseif ($activeSlave.trust >= -50)>>
- fearfully that she does not like being a slave, and then <<if canTalk($activeSlave) == false>>lets her hands fall to her sides, shaking a little<<else>>falls silent, shaking a little<</if>>.
+ fearfully that she does not like being a slave, and then <<if !canTalk($activeSlave)>>lets her hands fall to her sides, shaking a little<<else>>falls silent, shaking a little<</if>>.
<<else>>
- a perfunctory <<if canTalk($activeSlave) == false>>plea not to hurt her<<else>>"Plea<<s>>e don't hurt me, <<Master>>."<</if>>
+ a perfunctory <<if !canTalk($activeSlave)>>plea not to hurt her<<else>>"Plea<<s>>e don't hurt me, <<Master>>."<</if>>
<</if>>
<<elseif ($activeSlave.devotion <= 20)>>
She
- <<if canTalk($activeSlave) == false>>gestures<<else>><<say>>s<</if>> <<if ($activeSlave.trust >= -20)>>earnestly<<elseif ($activeSlave.trust >= -50)>>fearfully<<else>>shakily<</if>>
+ <<if !canTalk($activeSlave)>>gestures<<else>><<say>>s<</if>> <<if ($activeSlave.trust >= -20)>>earnestly<<elseif ($activeSlave.trust >= -50)>>fearfully<<else>>shakily<</if>>
that she will do whatever you order her to, since she does not want to be
<<switch $activeSlave.standardPunishment>>
<<case "confinement">>shut up in the dark, which is of course her standard punishment.
@@ -42,19 +42,19 @@
<<else>>
<<if ($activeSlave.devotion <= 50)>>
- <<if canTalk($activeSlave) == false>>
+ <<if !canTalk($activeSlave)>>
She gestures that you're her <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>master<<else>>mistress<</if>>, and she will do her best to obey you. She continues to sign<<if $activeSlave.accent == 3>>, using gestures to supplant her poor $language<</if>>:
<<else>>
"You're my <<Master>>, and I'll do my be<<s>>t to obey you," she says
<</if>>
<<elseif ($activeSlave.devotion <= 95)>>
- <<if canTalk($activeSlave) == false>>
+ <<if !canTalk($activeSlave)>>
She gestures that you're her beloved <<Master>>. She continues to sign<<if $activeSlave.accent == 3>>, using gestures to supplant her poor $language<</if>>:
<<else>>
"<<if ($activeSlave.relationship == -3)>>I'm content with being your wife,<<else>>You're<</if>> my beloved <<Master>>, and you know what'<<s>> be<<s>>t for me," she <<say>>s.
<</if>>
<<else>>
- <<if canTalk($activeSlave) == false>>
+ <<if !canTalk($activeSlave)>>
She makes a simple gesture, meaning "I love you." She continues to sign<<if $activeSlave.accent == 3>>, using gestures to supplant her poor $language<</if>>:
<<else>>
"I love you," she <<say>>s in her <<if ($activeSlave.voice == 1)>>deep<<elseif ($activeSlave.voice == 2)>>pretty<<else>><<if ($activeSlave.voiceImplant == 1)>>high bimbo<<else>>girly<</if>><</if>> voice.
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 7631110e3f7fefa9bac31c7f3cffe6b6f7e2f39b..8853506cd7c95424a2979793a959a45efdabeacc 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -594,7 +594,7 @@ earning you @@.yellowgreen;¤_earnings.@@
The damage to the reactor caused by the last rebellion is extensive. Businesses and private citizens struggle to operate with the unreliable and limited energy production offered by the auxiliary generators.
It will still take <<if $garrison.reactorTime> 1>>$garrison.reactorTime weeks<<else>>a week<</if>> to finish repair works.
<<set _AWeekGrowth -= random(1,2)>>
- <<set $garrison.reactorTime--, $PC.engineering += .1>>>>
+ <<set $garrison.reactorTime--, $PC.engineering += .1>>
<</if>>
<</if>>
<<set _AWeekGrowth = Math.trunc(0.5*_AWeekGrowth)>>
diff --git a/src/uncategorized/managePenthouse.tw b/src/uncategorized/managePenthouse.tw
index 16fa6a0290bbb5c1c3b044bcaa3876d364c86d89..49b4d8494e2486e63b275f56bac4f97bd0331387 100644
--- a/src/uncategorized/managePenthouse.tw
+++ b/src/uncategorized/managePenthouse.tw
@@ -19,7 +19,7 @@ __Penthouse Capacity__
<br>
The main penthouse dormitory, which houses slaves who aren't living in a facility and aren't granted a luxurious standard of living, has a capacity of ''$dormitory'' slaves.
-[[Expand the dormitory|Manage Penthouse][$cash -= Math.trunc($dormitory*1000*$upgradeMultiplierArcology), $dormitory += 10, $PC.engineering += .1, $PC.slaving += .1]]
+[[Expand the dormitory|Manage Penthouse][$cash -= Math.trunc($dormitory*1000*$upgradeMultiplierArcology), $dormitory += 10, $PC.engineering += .1]]
//Costs ¤<<print Math.trunc($dormitory*1000*$upgradeMultiplierArcology)>>//
<br>
//Exceeding this limit is bad for slaves' health, devotion and trust//
@@ -27,7 +27,7 @@ The main penthouse dormitory, which houses slaves who aren't living in a facilit
<br>
The penthouse also features little individual rooms, which house slaves who do enjoy a luxurious standard of living. They have a capacity of ''$rooms'' slaves.
-[[Expand the rooms|Manage Penthouse][$cash -= Math.trunc($rooms*1000*$upgradeMultiplierArcology), $rooms += 5, $PC.engineering += .1, $PC.slaving += .1]]
+[[Expand the rooms|Manage Penthouse][$cash -= Math.trunc($rooms*1000*$upgradeMultiplierArcology), $rooms += 5, $PC.engineering += .1]]
//Costs ¤<<print Math.trunc($rooms*1000*$upgradeMultiplierArcology)>>//
<br>
//The number of rooms determines the number of slaves that can be granted luxury//
@@ -130,7 +130,7 @@ __Penthouse Upgrades__
<br>
<<if $servantMilkers != 1>>
- Your penthouse is equipped with basic milkers for lactating slaves. [[Install more and tie them into the liquid systems|Manage Penthouse][$cash -= Math.trunc(25000*$upgradeMultiplierArcology), $servantMilkers = 1, $PC.engineering += 1]]
+ Your penthouse is equipped with basic milkers for lactating slaves. [[Install more and tie them into the liquid systems|Manage Penthouse][$cash -= Math.trunc(25000*$upgradeMultiplierArcology), $servantMilkers = 1, $PC.engineering += .1]]
//Costs ¤<<print Math.trunc(25000*$upgradeMultiplierArcology)>>//
<<else>>
Every room in the penthouse is equipped with milkers tied into the liquid systems, letting slaves with full udders drain them anywhere.
@@ -140,7 +140,7 @@ __Penthouse Upgrades__
<<if $boobAccessibility != 1>>
<<if $pregAccessibility == 1 || $ballsAccessibility || $buttAccessibility>>
- Your penthouse has already been widened for overly wide slaves but there are no special accommodations for slaves with enormous breasts. [[Remodel for accessibility|Manage Penthouse][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $boobAccessibility = 1, $PC.engineering += 1]]
+ Your penthouse has already been widened for overly wide slaves but there are no special accommodations for slaves with enormous breasts. [[Remodel for accessibility|Manage Penthouse][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $boobAccessibility = 1, $PC.engineering += .5]]
//Costs ¤<<print Math.trunc(20000*$upgradeMultiplierArcology)>>//
<<else>>
Your penthouse has no special accessibility provisions for slaves with enormous breasts. [[Remodel for accessibility|Manage Penthouse][$cash -= Math.trunc(50000*$upgradeMultiplierArcology), $boobAccessibility = 1, $PC.engineering += 1]]
@@ -154,7 +154,7 @@ __Penthouse Upgrades__
<br>
<<if $pregAccessibility != 1>>
<<if $boobAccessibility == 1 || $ballsAccessibility || $buttAccessibility>>
- Your penthouse has already been widened to make life for overly wide slaves easier but there are no special accommodations for slaves with enormous pregnancies. [[Remodel for accessibility|Manage Penthouse][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $pregAccessibility = 1, $PC.engineering += 1]]
+ Your penthouse has already been widened to make life for overly wide slaves easier but there are no special accommodations for slaves with enormous pregnancies. [[Remodel for accessibility|Manage Penthouse][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $pregAccessibility = 1, $PC.engineering += .5]]
//Costs ¤<<print Math.trunc(20000*$upgradeMultiplierArcology)>>//
<<else>>
Your penthouse has no special accessibility provisions for slaves with enormous pregnancies. [[Remodel for accessibility|Manage Penthouse][$cash -= Math.trunc(50000*$upgradeMultiplierArcology), $pregAccessibility = 1, $PC.engineering += 1]]
@@ -169,7 +169,7 @@ __Penthouse Upgrades__
<br>
<<if $dickAccessibility != 1>>
- Your penthouse has no special accessibility provisions for slaves with enormous dicks. [[Remodel for accessibility|Manage Penthouse][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $dickAccessibility = 1, $PC.engineering += 1]]
+ Your penthouse has no special accessibility provisions for slaves with enormous dicks. [[Remodel for accessibility|Manage Penthouse][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $dickAccessibility = 1, $PC.engineering += .5]]
//Costs ¤<<print Math.trunc(20000*$upgradeMultiplierArcology)>>//
<<else>>
The entire penthouse has been remodeled to make life with enormous dicks easier. Carts, slings and harnesses are available to keep things from dragging and there is now plenty of room for huge genitals to occupy when a slave must use appliances, tables and seats.
@@ -178,7 +178,7 @@ __Penthouse Upgrades__
<br>
<<if $ballsAccessibility != 1>>
<<if $boobAccessibility == 1 || $buttAccessibility || $pregAccessibility>>
- Your penthouse has already been widened to make life for overly wide slaves easier but there are no special accommodations for slaves with enormous testicles. [[Remodel for accessibility|Manage Penthouse][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $ballsAccessibility = 1, $PC.engineering += 1]]
+ Your penthouse has already been widened to make life for overly wide slaves easier but there are no special accommodations for slaves with enormous testicles. [[Remodel for accessibility|Manage Penthouse][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $ballsAccessibility = 1, $PC.engineering += .5]]
//Costs ¤<<print Math.trunc(20000*$upgradeMultiplierArcology)>>//
<<else>>
Your penthouse has no special accessibility provisions for slaves with enormous testicles. [[Remodel for accessibility|Manage Penthouse][$cash -= Math.trunc(50000*$upgradeMultiplierArcology), $ballsAccessibility = 1, $PC.engineering += 1]]
@@ -191,7 +191,7 @@ __Penthouse Upgrades__
<br>
<<if $buttAccessibility != 1>>
<<if $boobAccessibility == 1 || $dickAccessibility || $ballsAccessibility>>
- Your penthouse has already been widened to make life for overly wide slaves easier but there are no special accommodations for slaves with gigantic posteriours. [[Remodel for accessibility|Manage Penthouse][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $buttAccessibility = 1]]
+ Your penthouse has already been widened to make life for overly wide slaves easier but there are no special accommodations for slaves with gigantic posteriours. [[Remodel for accessibility|Manage Penthouse][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $buttAccessibility = 1, $PC.engineering += .5]]
//Costs ¤<<print Math.trunc(20000*$upgradeMultiplierArcology)>>//
<<else>>
Your penthouse has no special accessibility provisions for slaves with enormous posteriors. [[Remodel for accessibility|Manage Penthouse][$cash -= Math.trunc(50000*$upgradeMultiplierArcology), $buttAccessibility = 1, $PC.engineering += 1]]
@@ -206,7 +206,7 @@ __Penthouse Upgrades__
<br>
<<if $feeder == 0>>
- [[Upgrade the kitchen's nutritional sensing systems|Manage Penthouse][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $feeder = 1, $PC.engineering += 1]]
+ [[Upgrade the kitchen's nutritional sensing systems|Manage Penthouse][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $feeder = 1, $PC.engineering += .1]]
//Costs ¤<<print Math.trunc(5000*$upgradeMultiplierArcology)>>//
<<else>>
The kitchen mounts sensors to refine diets in real time.
@@ -215,7 +215,7 @@ __Penthouse Upgrades__
<br>
<<if $cockFeeder == 0>>
- [[Enhance the feeding system with faux phalli|Manage Penthouse][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $cockFeeder = 1, $PC.engineering += 1]]
+ [[Enhance the feeding system with faux phalli|Manage Penthouse][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $cockFeeder = 1, $PC.engineering += .1]]
//Costs ¤<<print Math.trunc(5000*$upgradeMultiplierArcology)>>//
<<else>>
The kitchen dispenses food from phalli slaves must suck off in order to eat. //[[Remove them|Manage Penthouse][$cockFeeder = 0]]//
@@ -224,7 +224,7 @@ __Penthouse Upgrades__
<br>
<<if $suppository == 0>>
- [[Replace the drug dispensers with reciprocating dildo suppositories|Manage Penthouse][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $suppository = 1, $PC.engineering += 1]]
+ [[Replace the drug dispensers with reciprocating dildo suppositories|Manage Penthouse][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $suppository = 1, $PC.engineering += .1]]
//Costs ¤<<print Math.trunc(5000*$upgradeMultiplierArcology)>>//
<<else>>
The kitchen applies drugs that can be absorbed rectally by assfucking slaves with dildos that cum the pharmaceuticals. //[[Remove them|Manage Penthouse][$suppository = 0]]//
@@ -234,7 +234,7 @@ __Penthouse Upgrades__
<<if $dairy != 0>>
<<if $dairyPiping == 0>>
- [[Install pipes connecting the Dairy to the rest of your penthouse for use in enema play|Manage Penthouse][$cash -= Math.trunc(15000*$upgradeMultiplierArcology), $dairyPiping = 1, $PC.engineering += 1]]
+ [[Install pipes connecting the Dairy to the rest of your penthouse for use in enema play|Manage Penthouse][$cash -= Math.trunc(15000*$upgradeMultiplierArcology), $dairyPiping = 1, $PC.engineering += .5]]
//Costs ¤<<print Math.trunc(15000*$upgradeMultiplierArcology)>>//
<<else>>
Various taps around the penthouse supply product from $dairyName for use in enema play and force-feeding.
@@ -258,7 +258,7 @@ __Penthouse Upgrades__
[[Set up a personal armory to support a bodyguard|Manage Penthouse][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $dojo = 1, $PC.engineering += 1]]
//Costs ¤<<print Math.trunc(5000*$upgradeMultiplierArcology)>>//
<<elseif $dojo == 1>>
- There is a small armory next to your office that can support a bodyguard. [[Upgrade the armory with a private room for the bodyguard|Manage Penthouse][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $dojo = 2, $PC.engineering += 1]]
+ There is a small armory next to your office that can support a bodyguard. [[Upgrade the armory with a private room for the bodyguard|Manage Penthouse][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $dojo = 2, $PC.engineering += .5]]
//Costs ¤<<print Math.trunc(5000*$upgradeMultiplierArcology)>>//
<<else>>
There is a small armory next to your office that can support a bodyguard, with a little room for her to rest in when off duty.
@@ -281,7 +281,7 @@ __Penthouse Upgrades__
<<if $dispensary == 0>>
<<if $rep > 2000>>
- [[Install a pharmaceutical fabricator|Manage Penthouse][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $dispensary = 1, $drugsCost = $drugsCost/4], $PC.engineering += 1]
+ [[Install a pharmaceutical fabricator|Manage Penthouse][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $dispensary = 1, $drugsCost = $drugsCost/4], $PC.engineering += .1]
//Costs ¤<<print Math.trunc(20000*$upgradeMultiplierArcology)>>//
<<else>>
//You lack the reputation to obtain cutting-edge pharmaceutical technology//
@@ -299,7 +299,7 @@ __Penthouse Upgrades__
<<case 1>>
There is a facility to construct mechanical prosthetic limbs for amputated slaves.
<<if ($rep > 14000)>>
- [[Research advanced prototype prosthetics|Manage Penthouse][$cash -= Math.trunc(100000*$upgradeMultiplierArcology), $prostheticsUpgrade = 2, $PC.engineering += 1]]
+ [[Research advanced prototype prosthetics|Manage Penthouse][$cash -= Math.trunc(100000*$upgradeMultiplierArcology), $prostheticsUpgrade = 2]]
//Costs ¤<<print Math.trunc(100000*$upgradeMultiplierArcology)>>//
<<else>>
//You lack the reputation to research and produce prototype prosthetics.//
@@ -307,7 +307,7 @@ __Penthouse Upgrades__
<<case 2>>
There is a prosthetics facility upgraded to use advanced materials and designs.
<<if ($rep > 16000)>>
- [[Research high-tech cybernetic limbs|Manage Penthouse][$cash -= Math.trunc(100000*$upgradeMultiplierArcology), $prostheticsUpgrade = 3, $PC.engineering += 1]]
+ [[Research high-tech cybernetic limbs|Manage Penthouse][$cash -= Math.trunc(100000*$upgradeMultiplierArcology), $prostheticsUpgrade = 3]]
//Costs ¤<<print Math.trunc(100000*$upgradeMultiplierArcology)>>//
<<else>>
//You lack the reputation to research and produce prototype cybernetic limbs.//
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 652bd3da3eacdb056ee3819e6d17faf8f977e060..c1ab6b30412dd6cac473649df4c5c44a55c6f4d7 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -1,8 +1,8 @@
:: New Slave Intro [nobr]
<<set $nextButton = "Continue", $showEncyclopedia = 0>>
-<if $PC.slaving < 100 && random($PC.slaving,100) > 50>><<set $PC.slaving += .5>><<else>><<set $PC.slaving += .1>><</if>>
-<if $PC.trading < 100 && random($PC.trading,100) > 50>><<set $PC.trading += .5>><<else>><<set $PC.trading += .1>><</if>>
+<<if $PC.slaving < 100 && random($PC.slaving,100) > 50>><<set $PC.slaving += .5>><<else>><<set $PC.slaving += .1>><</if>>
+<<if $PC.trading < 100 && random($PC.trading,100) > 50>><<set $PC.trading += .5>><<else>><<set $PC.trading += .1>><</if>>
<<if $nextLink != "AS Dump" && passage() != "Bulk Slave Intro">>
<<set $returnTo = $nextLink, $nextLink = "AS Dump">>
diff --git a/src/uncategorized/pPeacekeepersInfluence.tw b/src/uncategorized/pPeacekeepersInfluence.tw
index 72142c0bd565d314f09176151d1e9d7ce94762b2..d05033ee9e463cc2203da17fd62e49e0ccb54399 100644
--- a/src/uncategorized/pPeacekeepersInfluence.tw
+++ b/src/uncategorized/pPeacekeepersInfluence.tw
@@ -49,7 +49,7 @@ As you review intelligence from the area at your desk,
She knows just how to get your attention.
<<case "imp">>The scandalous little imp swoops into view and eagerly stares at you, as if she has some juicy gossip to tell you.
<<case "witch">>The cute little witch pops up, before blushing and undressing. An important message for you is scrawled across her skin.
- <<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>Your shapeshifting assistant pops out of a crack on your desk, her belly swollen with something. She bends over and pushes out information for you, though you not sure how.
+ <<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>Your shapeshifting assistant pops out of a crack on your desk, her belly swollen with something. She bends over and pushes out information for you, though you're not sure how.
<<default>>The round symbol pulses brightly, her way of indicating that she has important information for you.
<</switch>>
"General $peacekeepers.generalName's men and women are using sex slaves," she reports, and brings up a trove of surveillance data to back up her assertion. "It was unofficial at first,
@@ -85,7 +85,7 @@ As you review intelligence from the area at your desk,
<<case "fairy">>She reaches behind herself and starts groping her butt again. "If we sell them some super cuties, they'll really love us!" she giggles as she gives herself a playful slap.
<<case "pregnant fairy">>Since she has your attention now, she slowly spreads her legs and flashes her pussy once again. Seeing you watch with interest this time, a small smile creeps up on her face. "If we sell them some of our prettier girls, they'll be sure to warm up to us."
<<case "hypergoddess">>She caresses her pregnancy. "If we sell them some of our fertile slaves, I'm sure their burgeoning pregnancies will ease them into relying on us," she says confidently. "Or at least it will result in more slaves later on."
- <<case "loli">>She claps excitedly. "If we sell them new friends, then they'll hear from them about how great the Free Cities are and want to become our freinds too!" She says hopefully, eager to meet all the newcomers to the arcology.
+ <<case "loli">>She claps excitedly. "If we sell them new friends, then they'll hear from them about how great the Free Cities are and want to become our friends too!" She says hopefully, eager to meet all the newcomers to the arcology.
<<case "preggololi">>She claps excitedly. "I don't know what they think of lolis, but selling them a few cute little slave girls will surely warm them up to us," she says, patting her belly. "Plus, I'm sure they'll love how tight they are and how much energy they have once you break them in!"
<<case "angel">>She wrings a wing nervously. "If we send them nice girls, we'd be doing a disservice to them by sending them away. But if we don't, how can we be certain that the girls they have will be well cared for? We definitely need to teach them our ways." She concludes.
<<case "cherub">>She lands and ponders deeply. "We have to show them the right way before they get mislead. Some of our finest girls should help convert them to our ways!"
@@ -93,7 +93,7 @@ As you review intelligence from the area at your desk,
<<case "succubus">>She fingers her pussy meaningfully. "Oh, and they could even develop into a regular market if they're sold distinctive, sexy girls. Plus that means more money for you, and less competition for me." She winks.
<<case "imp">>She punches her fist into her palm. "We should sell them sexy, but unbroken, girls. That way they can learn to love breaking slaves into proper sex toys!" She shivers with orgasm at the thought.
<<case "witch">>She runs her hat through her hands. "If we sell them skilled girls, they'll grow closer to us. But we have to be careful not to send them klutzes like me; not everyone finds that adorable." She takes the time to mend the rip she accidentally tore in her hat's brim.
- <<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>She ponders deeply. "We could sell them the most loyal girls we have. They'll naturally lead them back to us. And then they are ours to do as we plase," she says smiling deviously.
+ <<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>She ponders deeply. "We could sell them the most loyal girls we have. They'll naturally lead them back to us. And then they are ours to do as we please," she says smiling deviously.
<<default>>Her symbol takes on a rapid succession of pulsating lewd shapes, signifying some of the arcology's better varieties of sex slaves. "If they're sold good product, they may become a reliable market," she asserts.
<</switch>>
<<else>>
diff --git a/src/uncategorized/saHormoneEffects.tw b/src/uncategorized/saHormoneEffects.tw
index c9d1cfac60533ef7de6b12df2fd180bbbbbcacaa..de3d80dd9d894f32b375ebda154358e80ab3cfe2 100644
--- a/src/uncategorized/saHormoneEffects.tw
+++ b/src/uncategorized/saHormoneEffects.tw
@@ -405,10 +405,10 @@
<<elseif $slaves[$i].hormoneBalance <= -350>>
<<if ($slaves[$i].physicalAge < 25)>>
<<if ($slaves[$i].shoulders-(Math.abs($slaves[$i].shouldersImplant)) < 1) && ($slaves[$i].shoulders < 2) && (random(1,100) < 20+(10*$hormoneUpgradePower))>>
- <<set _Effects.push("ShouldersBroader")>>
+ $possessiveCap body has not yet found its final bone structure, which typically happens in the mid-twenties. Hormonal effects cause @@.orange;$possessive shoulders to develop a more masculine wideness@@ than they would have done naturally.
<</if>>
<<if ($slaves[$i].hips+(Math.abs($slaves[$i].hipsImplant)) > -1) && ($slaves[$i].hips > -2) && (random(1,100) <= 20+(10*$hormoneUpgradePower))>>
- <<set _Effects.push("HipsNarrower")>>
+ $possessiveCap body has not yet found its final bone structure, which typically happens in the mid-twenties. Hormonal effects cause @@.orange;$possessive hips to develop more narrowly@@ than they would have done naturally.
<</if>>
<</if>>
diff --git a/src/uncategorized/saPleaseYou.tw b/src/uncategorized/saPleaseYou.tw
index dee918180b17b71ff10d14cd7b31d55f237d43e2..ac977c87b3e4f5e54323fd02f03508a632d60cde 100644
--- a/src/uncategorized/saPleaseYou.tw
+++ b/src/uncategorized/saPleaseYou.tw
@@ -195,7 +195,7 @@ serves you this week.
<<elseif if $PC.dick == 1 && ($fuckSlaves <= ($PC.sexualEnergy + $PC.balls * $PC.balls))>>
Your balls produce enough cum that $pronoun usually gets facials after a mouthful of semen, and $object loves you for it.
<<else>>
- $pronounCap usually has to fight for $posessive share of cum, making sure to milk cum from your urethra <<if $fuckSlaves >1>>or suck it out of a pussy<</if>>.
+ $pronounCap usually has to fight for $possessive share of cum, making sure to milk cum from your urethra <<if $fuckSlaves >1>>or suck it out of a pussy<</if>>.
<</if>>
<<else>>
$pronounCap spends the week warming your bed and lavishing devoted attention on your <<if $PC.dick == 1>>cock<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>pussy<</if>> with $possessive loving mouth.
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index 80d851e700ce1fb4e307b866752e5a32eed351a2..4117260172e074b8159ffe7ab4df38448cb51ec6 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -1018,43 +1018,43 @@
<</if>>
<<if $slaves[$i].livingRules != "luxurious">>
- <<if $dormitoryPopulation > $dormitory>>
- <<set $seed = $dormitoryPopulation - $dormitory>>
- The slave dormitory is
- <<if $seed <= 5>>
- @@.yellow;somewhat overcrowded.@@ The mild inconvenience
- <<if $slaves[$i].trust > 20>>
- @@.gold;reduces her trust@@ in you a little.
- <<set $slaves[$i].trust -= 2>>
- <<else>>
- @@.mediumorchid;lowers you@@ a little in her opinion.
- <<set $slaves[$i].devotion -= 2>>
- <</if>>
- <<elseif $seed <= 10>>
- @@.yellow;badly overcrowded.@@ The constant difficulties
- <<if $slaves[$i].trust > 20>>
- @@.gold;reduces her trust@@ in you
- <<set $slaves[$i].trust -= 3>>
- <<else>>
- @@.mediumorchid;lowers you@@ in her opinion
- <<set $slaves[$i].devotion -= 3>>
- <</if>>
- and is @@.red;not good for her,@@ since it's difficult to rest there.
- <<set $slaves[$i].health -= 2>>
- <<else>>
- @@.yellow;extremely overcrowded.@@ The unpleasant situation
- <<if $slaves[$i].trust > 20>>
- seriously @@.gold;reduces her trust@@ in you
- <<set $slaves[$i].trust -= 5>>
+ <<if $dormitoryPopulation > $dormitory>>
+ <<set _dormPop = $dormitoryPopulation - $dormitory>>
+ The slave dormitory is
+ <<if _dormPop <= 5>>
+ @@.yellow;somewhat overcrowded.@@ The mild inconvenience
+ <<if $slaves[$i].trust > 20>>
+ @@.gold;reduces her trust@@ in you a little.
+ <<set $slaves[$i].trust -= 2>>
+ <<else>>
+ @@.mediumorchid;lowers you@@ a little in her opinion.
+ <<set $slaves[$i].devotion -= 2>>
+ <</if>>
+ <<elseif _dormPop <= 10>>
+ @@.yellow;badly overcrowded.@@ The constant difficulties
+ <<if $slaves[$i].trust > 20>>
+ @@.gold;reduces her trust@@ in you
+ <<set $slaves[$i].trust -= 3>>
+ <<else>>
+ @@.mediumorchid;lowers you@@ in her opinion
+ <<set $slaves[$i].devotion -= 3>>
+ <</if>>
+ and is @@.red;not good for her,@@ since it's difficult to rest there.
+ <<set $slaves[$i].health -= 2>>
<<else>>
- seriously @@.mediumorchid;lowers you@@ in her opinion
- <<set $slaves[$i].devotion -= 5>>
+ @@.yellow;extremely overcrowded.@@ The unpleasant situation
+ <<if $slaves[$i].trust > 20>>
+ seriously @@.gold;reduces her trust@@ in you
+ <<set $slaves[$i].trust -= 5>>
+ <<else>>
+ seriously @@.mediumorchid;lowers you@@ in her opinion
+ <<set $slaves[$i].devotion -= 5>>
+ <</if>>
+ and is @@.red;bad for her health.@@
+ <<set $slaves[$i].health -= 4>>
<</if>>
- and is @@.red;bad for her health.@@
- <<set $slaves[$i].health -= 4>>
<</if>>
<</if>>
- <</if>>
<<if ($universalRulesConsent == 0)>>
<<if ($slaves[$i].devotion <= 20)>>
@@ -1110,40 +1110,40 @@
<</if>>
<<if ($slaves[$i].attrKnown == 0)>>
- <<if $slaves[$i].need && $slaves[$i].energy > 20>>
- <<set $slaves[$i].attrKnown = 1>>
- <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> monitors her as she gets off, analyzing her sexuality. It seems she is
- <<if $slaves[$i].attrXY <= 5>>
- @@.red;disgusted by men@@
- <<elseif $slaves[$i].attrXY <= 15>>
- @@.red;turned off by men@@
- <<elseif $slaves[$i].attrXY <= 35>>
- @@.red;not attracted to men@@
- <<elseif $slaves[$i].attrXY <= 65>>
- indifferent to men
- <<elseif $slaves[$i].attrXY <= 85>>
- @@.green;attracted to men@@
- <<elseif $slaves[$i].attrXY <= 95>>
- @@.green;aroused by men@@
- <<else>>
- @@.green;passionate about men@@
- <</if>>
- and
- <<if $slaves[$i].attrXX <= 5>>
- @@.red;disgusted by women.@@
- <<elseif $slaves[$i].attrXX <= 15>>
- @@.red;turned off by women.@@
- <<elseif $slaves[$i].attrXX <= 35>>
- @@.red;not attracted to women.@@
- <<elseif $slaves[$i].attrXX <= 65>>
- indifferent to women.
- <<elseif $slaves[$i].attrXX <= 85>>
- @@.green;attracted to women.@@
- <<elseif $slaves[$i].attrXX <= 95>>
- @@.green;aroused by women.@@
- <<else>>
- @@.green;passionate about women.@@
- <</if>>
+ <<if ($week-$slaves[$i].weekAcquired > 4) && $slaves[$i].energy > 20>>
+ <<set $slaves[$i].attrKnown = 1>>
+ <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> hsa been monitoring her as she gets off, analyzing her sexuality. It seems she is
+ <<if $slaves[$i].attrXY <= 5>>
+ @@.red;disgusted by men@@
+ <<elseif $slaves[$i].attrXY <= 15>>
+ @@.red;turned off by men@@
+ <<elseif $slaves[$i].attrXY <= 35>>
+ @@.red;not attracted to men@@
+ <<elseif $slaves[$i].attrXY <= 65>>
+ indifferent to men
+ <<elseif $slaves[$i].attrXY <= 85>>
+ @@.green;attracted to men@@
+ <<elseif $slaves[$i].attrXY <= 95>>
+ @@.green;aroused by men@@
+ <<else>>
+ @@.green;passionate about men@@
+ <</if>>
+ and
+ <<if $slaves[$i].attrXX <= 5>>
+ @@.red;disgusted by women.@@
+ <<elseif $slaves[$i].attrXX <= 15>>
+ @@.red;turned off by women.@@
+ <<elseif $slaves[$i].attrXX <= 35>>
+ @@.red;not attracted to women.@@
+ <<elseif $slaves[$i].attrXX <= 65>>
+ indifferent to women.
+ <<elseif $slaves[$i].attrXX <= 85>>
+ @@.green;attracted to women.@@
+ <<elseif $slaves[$i].attrXX <= 95>>
+ @@.green;aroused by women.@@
+ <<else>>
+ @@.green;passionate about women.@@
+ <</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw
index 00872254298eee39b0c0c1fe1e9ce63babee16bc..01baae22cd3b266f309e1cdb19f8b8ff8fb2c77c 100644
--- a/src/uncategorized/schoolroomReport.tw
+++ b/src/uncategorized/schoolroomReport.tw
@@ -53,8 +53,6 @@
<<elseif $Schoolteacher.skillTE >= $masteredXP>>
She has experience with students and learning from working for you, making her more effective.
<<set _idleBonus++>>
- <<elseif $Schoolteacher.skillTE >= $masteredXP>>
- She has experience with students and learning from working for you, making her more effective.
<<else>>
<<set $slaves[_FLs].skillTE += random(1,($Schoolteacher.intelligence+4)*2)>>
<</if>>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index 6329b84f1606f3e7d6ba7d33813b38cd970d7de5..6db997fb5156c376de2fc3b530f3f8b8765ff8a0 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -163,9 +163,9 @@
<<if ($completedOrgans.length > 0) && ($limbsCompleted > 0)>>
<br>[[Implant and Attach|Multiple Organ Implant]] @@.yellow;all organs and limbs that are ready.@@
-<<elseif ($completedOrgans.length > 1)>>
+<<elseif ($completedOrgans.length > 0)>>
<br>[[Implant|Multiple Organ Implant]] @@.yellow;all organs that are ready for implantation.@@
-<<elseif ($limbsCompleted > 1)>>
+<<elseif ($limbsCompleted > 0)>>
<br>[[Attach|Multiple Organ Implant]] @@.yellow;all sets of limbs that are ready to be attached.@@
<</if>>
<br>