From e1b85f3c3aac343c4d38b30d992fd8774e0991d2 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 28 Jan 2018 15:37:05 -0500
Subject: [PATCH] fixes and content submissions.
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 14 +++
devNotes/twine JS | 5 +
src/SecExp/attackReport.tw | 2 +-
src/SecExp/secBarracks.tw | 18 ++--
src/SecExp/securityHQ.tw | 18 ++--
src/SecExp/weaponsManufacturing.tw | 23 ++--
src/js/economyJS.tw | 5 +
.../JobFulfillmentCenterDelivery.tw | 6 +-
src/pregmod/generateChild.tw | 2 +-
src/uncategorized/arcmgmt.tw | 14 +--
src/uncategorized/buySlaves.tw | 101 +++++++++---------
src/uncategorized/customSlave.tw | 4 +-
.../freeRangeDairyAssignmentScene.tw | 2 +-
src/uncategorized/hgApplication.tw | 30 +++---
src/uncategorized/persBusiness.tw | 54 ++++------
src/uncategorized/reRecruit.tw | 10 +-
src/uncategorized/remoteSurgery.tw | 6 +-
src/utility/miscWidgets.tw | 3 +-
src/utility/raWidgets.tw | 2 +-
src/utility/slaveCreationWidgets.tw | 8 +-
20 files changed, 174 insertions(+), 153 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 0dc0df82a06..a250bdd03d5 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4,6 +4,20 @@
1/28/18
+ 305
+ -fixed issues with orphanage recruits
+ -small text fixes
+ -fixed mistargeted spans in custom slave
+ -fixed infinite JFC looping
+ -fixed childgen getting confused when the player fathered a slave
+ -limited height surgeries to +- 15cm from expected average
+ -anon's economy tweaks
+ -crimeanon's fixes
+
+ 304
+ -anon's tweaks
+ -removed leftover code from RESS
+
303
-anon's corp tweaks
diff --git a/devNotes/twine JS b/devNotes/twine JS
index 3c4cc8abcee..e3a2aa0bf4b 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -2347,6 +2347,11 @@ window.getSlaveCost = function(s) {
return cost;
};
+window.menialSlaveCost = function() {
+ var df = State.variables.menialDemandFactor;
+ return random(998,1001) + Math.trunc(Math.sign(df) * Math.sqrt(1 - Math.exp(-1*Math.pow(df/500, 2)*(4/Math.PI + 0.140012 * Math.pow(df/500, 2))/(1 + 0.140012 * Math.pow(df/500, 2))))*150); /* https://en.wikipedia.org/wiki/Error_function */
+};
+
window.getSlaveStatisticData = function(s, facility) {
if(!s || !facility) {
// Base data, even without facility
diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw
index a76f5f72632..4c7f55da250 100644
--- a/src/SecExp/attackReport.tw
+++ b/src/SecExp/attackReport.tw
@@ -349,7 +349,7 @@
<<if $enemyLosses != $attackTroops>>
inflicting <<print $enemyLosses>> casualties, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties <<elseif $losses > 0>> a casualty <<else>> zero <</if>> themselves.
<<else>>
- completely annihilating their troops, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties <<<elseif $losses > 0>> a casualty. <<else>> zero casualties.<</if>>
+ completely annihilating their troops, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties <<elseif $losses > 0>> a casualty. <<else>> zero casualties.<</if>>
<</if>>
<</if>>
<<if $battleResult == 3>>
diff --git a/src/SecExp/secBarracks.tw b/src/SecExp/secBarracks.tw
index 4dd1e5159da..d654995f712 100644
--- a/src/SecExp/secBarracks.tw
+++ b/src/SecExp/secBarracks.tw
@@ -178,21 +178,23 @@ __Security Drones__
__Slaves__
<br>/* slaves */
You are free to organize your menial slaves into fighting units. Currently you have <<print commaNum($helots)>> slaves available, while <<print commaNum($slavesEmployedManpower)>> are already employed as soldiers. During all your battles you lost a total of <<print commaNum($slavesTotalCasualties)>>.
-<<set _menialPrice = Math.trunc(($slaveCostFactor*1000)/100)*100>>
-<<set _menialPrice = Math.clamp(_menialPrice, 500, 1500)>>
<<silently>><<MenialPopCap>><</silently>>
+<<set _menialPrice = menialSlaveCost()>>
+<<if $cash > _menialPrice>>
<<if $PopCap > $helots+$fuckdolls+$menialBioreactors>>
<br>
[[Buy|secBarracks][$helots+=1,$menialDemandFactor+=1,$cash-=_menialPrice]]
- <<if $cash > _menialPrice*10>>
- [[(x10)|secBarracks][$helots+=10,$menialDemandFactor+=10,$cash-=_menialPrice*10]]
+ <<if $cash > (_menialPrice+200)*10>>
+ [[(x10)|secBarracks][$helots+=10,$menialDemandFactor+=10,$cash-=(_menialPrice+200)*10]]
<</if>>
- <<if $cash > _menialPrice*100>>
- [[(x100)|secBarracks][$helots+=100,$menialDemandFactor+=100,$cash-=_menialPrice*100]]
+ <<if $cash > (_menialPrice+200)*100>>
+ [[(x100)|secBarracks][$helots+=100,$menialDemandFactor+=100,$cash-=(_menialPrice+200)*100]]
<</if>>
- <<if $cash > _menialPrice*2>>
- [[(max)|secBarracks][$helots+=Math.trunc($cash/(_menialPrice)),$menialDemandFactor+=Math.trunc($cash/(_menialPrice)),$cash-=Math.trunc($cash/(_menialPrice))*(_menialPrice)]]
+ <<if $cash > (_menialPrice+200)*2>>
+ [[(max)|secBarracks][$helots+=Math.trunc($cash/(_menialPrice+200)),$menialDemandFactor+=Math.trunc($cash/(_menialPrice+200)),$cash-=Math.trunc($cash/(_menialPrice+200))*(_menialPrice+200)]]
<</if>>
+ //Bulk purchases will cost <<print cashFormat(200)>> over market price.//
+<</if>>
<</if>>
<br>
<<set _sL = $slaveUnits.length>>
diff --git a/src/SecExp/securityHQ.tw b/src/SecExp/securityHQ.tw
index 5e48c89a408..5fedbc9136b 100644
--- a/src/SecExp/securityHQ.tw
+++ b/src/SecExp/securityHQ.tw
@@ -21,20 +21,22 @@ You have <span id="secHel"><<print $secHelots>></span> slaves working in the HQ.
You have enough slaves to man all security systems.
<</if>>
<<silently>><<MenialPopCap>><</silently>>
-<<set _menialPrice = Math.trunc(($slaveCostFactor*1000)/100)*100>>
-<<set _menialPrice = Math.clamp(_menialPrice, 500, 1500)>>
+<<set _menialPrice = menialSlaveCost()>>
+<<if $cash > _menialPrice>>
<<if $PopCap > $helots+$fuckdolls+$menialBioreactors || $helots+$fuckdolls+$menialBioreactors == 0>>
<br>
[[Buy|securityHQ][$helots+=1,$menialDemandFactor+=1,$cash-=_menialPrice]]
- <<if $cash > _menialPrice*10>>
- [[(x10)|securityHQ][$helots+=10,$menialDemandFactor+=10,$cash-=_menialPrice*10]]
+ <<if $cash > (_menialPrice+200)*10>>
+ [[(x10)|securityHQ][$helots+=10,$menialDemandFactor+=10,$cash-=(_menialPrice+200)*10]]
<</if>>
- <<if $cash > _menialPrice*100>>
- [[(x100)|securityHQ][$helots+=100,$menialDemandFactor+=100,$cash-=_menialPrice*100]]
+ <<if $cash > (_menialPrice+200)*100>>
+ [[(x100)|securityHQ][$helots+=100,$menialDemandFactor+=100,$cash-=(_menialPrice+200)*100]]
<</if>>
- <<if $cash > _menialPrice*2>>
- [[(max)|securityHQ][$helots+=Math.trunc($cash/(_menialPrice)),$menialDemandFactor+=Math.trunc($cash/(_menialPrice)),$cash-=Math.trunc($cash/(_menialPrice))*(_menialPrice)]]
+ <<if $cash > (_menialPrice+200)*2>>
+ [[(max)|securityHQ][$helots+=Math.trunc($cash/(_menialPrice+200)),$menialDemandFactor+=Math.trunc($cash/(_menialPrice+200)),$cash-=Math.trunc($cash/(_menialPrice+200))*(_menialPrice+200)]]
<</if>>
+ //Bulk purchases will cost <<print cashFormat(200)>> over market price.//
+<</if>>
<</if>>
<br>
<<if $helots >= 5>>
diff --git a/src/SecExp/weaponsManufacturing.tw b/src/SecExp/weaponsManufacturing.tw
index 1b3a190e7d9..47da170ce4f 100644
--- a/src/SecExp/weaponsManufacturing.tw
+++ b/src/SecExp/weaponsManufacturing.tw
@@ -32,22 +32,25 @@ many small old world nations as the advanced technology that free cities have av
You own <<print commaNum($helots)>> free menial slaves. This manufacturing complex can house 500 at most, with <<print 500 - $weapHelots>> free slots.
<br>
<<silently>><<MenialPopCap>><</silently>>
-<<set _menialPrice = Math.trunc(($slaveCostFactor*1000)/100)*100>>
-<<set _menialPrice = Math.clamp(_menialPrice, 500, 1500)>>
+<<set _menialPrice = menialSlaveCost()>>
+<<if $cash > _menialPrice>>
<<if $PopCap > $helots+$fuckdolls+$menialBioreactors || $helots+$fuckdolls+$menialBioreactors == 0>>
<br>
- [[Buy|weaponsManufacturing][$helots+=1,$menialDemandFactor+=1,$cash-=_menialPrice]]
- <<if $cash > _menialPrice*10>>
- [[(x10)|weaponsManufacturing][$helots+=10,$menialDemandFactor+=10,$cash-=_menialPrice*10]]
+ [[Buy|weaponsManufacturing][$helots+=1,$menialDemandFactor+=1,$cash-=_menialPrice]]
<</if>>
- <<if $cash > _menialPrice*100>>
- [[(x100)|weaponsManufacturing][$helots+=100,$menialDemandFactor+=100,$cash-=_menialPrice*100]]
+ <<if $cash > (_menialPrice+200)*10>>
+ [[(x10)|weaponsManufacturing][$helots+=10,$menialDemandFactor+=10,$cash-=(_menialPrice+200)*10]]
<</if>>
- <<if $cash > _menialPrice*2>>
- [[(max)|weaponsManufacturing][$helots+=Math.trunc($cash/(_menialPrice)),$menialDemandFactor+=Math.trunc($cash/(_menialPrice)),$cash-=Math.trunc($cash/(_menialPrice))*(_menialPrice)]]
+ <<if $cash > (_menialPrice+200)*100>>
+ [[(x100)|weaponsManufacturing][$helots+=100,$menialDemandFactor+=100,$cash-=(_menialPrice+200)*100]]
<</if>>
+ <<if $cash > (_menialPrice+200)*2>>
+ [[(max)|weaponsManufacturing][$helots+=Math.trunc($cash/(_menialPrice+200)),$menialDemandFactor+=Math.trunc($cash/(_menialPrice+200)),$cash-=Math.trunc($cash/(_menialPrice+200))*(_menialPrice+200)]]
+ <</if>>
+ //Bulk purchases will cost <<print cashFormat(200)>> over market price.//
<</if>>
-<br>
+<</if>>
+
<<if $weapHelots < 500>>
<<if $helots >= 1>>
<<link "Transfer a menial slave">>
diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw
index d51c4faf8f8..6a49f2af962 100644
--- a/src/js/economyJS.tw
+++ b/src/js/economyJS.tw
@@ -590,6 +590,11 @@ window.getSlaveCost = function(s) {
return cost;
};
+window.menialSlaveCost = function() {
+ var df = State.variables.menialDemandFactor;
+ return random(998,1001) + Math.trunc(Math.sign(df) * Math.sqrt(1 - Math.exp(-1*Math.pow(df/500, 2)*(4/Math.PI + 0.140012 * Math.pow(df/500, 2))/(1 + 0.140012 * Math.pow(df/500, 2))))*150); /* https://en.wikipedia.org/wiki/Error_function */
+};
+
window.getSlaveStatisticData = function(s, facility) {
if(!s || !facility) {
// Base data, even without facility
diff --git a/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw b/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw
index d72b472b74b..ae0532b4749 100644
--- a/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw
+++ b/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw
@@ -1,6 +1,6 @@
:: JobFulfillmentCenterDelivery [nobr]
-<<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $showEncyclopedia = 1, $encyclopedia = "Enslaving People">>
+<<set $JFCOrder = 0, $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $showEncyclopedia = 1, $encyclopedia = "Enslaving People">>
<<JFCSlave>>
<<slaveCost $activeSlave>>
@@ -8,7 +8,7 @@
A slave dealer has submitted a slave to satisfy your ''$Role'' order.
-<br><br>//As usual, the asking price is quite high, to cover the costs of finding a suitable slave. In compensation, you can freely decline the slave and keep the order open, or even modify it later.//
+<br><br>//As usual, the asking price is quite high, to cover the costs of training a proper <<print $Role>>. In compensation, you can freely decline the slave should she not meet your standards or the job has already been filled.//
<br><br><<set $saleDescription = 1, $applyLaw = 0>><<include "Long Slave Description">>
@@ -21,7 +21,7 @@ A slave dealer has submitted a slave to satisfy your ''$Role'' order.
<<replace "#result">>
She has been very well trained by the dealer that offered her to you. She has also picked up on the fact that she was specially selected, and is a little hopeful that this means she may be treated well. She is now eagerly awaiting your instructions.
<<include "New Slave Intro">>
- <<set $JFCOrder = 0, $Role = "">>
+ <<set $Role = "">>
<</replace>>
<</link>>
<<else>>
diff --git a/src/pregmod/generateChild.tw b/src/pregmod/generateChild.tw
index ac56f5b4b35..31757956f08 100644
--- a/src/pregmod/generateChild.tw
+++ b/src/pregmod/generateChild.tw
@@ -465,7 +465,7 @@
<<set $activeSlave.face =random(20,100)>>
<<set $activeSlave.intelligence = either(1, 2, 2, 2, 2, 3, 3)>>
<</if>>
-<<elseif $activeSlave.father == -1 && $mom > 0>>
+<<elseif $activeSlave.father == -1>>
<<if $mom.breedingMark == 1>>
<<set $activeSlave.face = random(60,100)>>
<<set $activeSlave.intelligence = either(2, 2, 2, 2, 3, 3)>>
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 46a9a7b615c..8ef3bb5819e 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -760,7 +760,7 @@ The Hippolyta Academy have a <<if $TFS.schoolProsperity > 4>>very prosperous<<el
<<if $marketAssistantLimit != 0>>
<<silently>><<MenialPopCap>><</silently>>
-<<set $seed = Math.clamp($slaveCostFactor*1000, 500, 1500)>>
+<<set $seed = menialSlaveCost()>>
<br>
Your ''business assistant'' manages the menial slave market.
<<if $seed <= 900+$marketAssistantAggressiveness>>/* BUY */
@@ -770,11 +770,11 @@ Your ''business assistant'' manages the menial slave market.
<<if $cash > $marketAssistantLimit+$seed>>
<<if $assistant == 0>>It<<else>>She<</if>> acquires more chattel, since it's a buyers' market.
<<if ($arcologies[0].FSPastoralist != "unset") && ($arcologies[0].FSPaternalist == "unset")>>
- <<set $menialBioreactors += Math.trunc(($cash-$marketAssistantLimit)/($seed-100)), $cash -= Math.trunc(($cash-$marketAssistantLimit)/($seed-100))*($seed-100)>>
+ <<set $menialBioreactors += Math.trunc(($cash-$marketAssistantLimit)/($seed)), $menialDemandFactor += Math.trunc(($cash-$marketAssistantLimit)/($seed)), $cash -= Math.trunc(($cash-$marketAssistantLimit)/($seed))*($seed)>>
<<elseif ($arcologies[0].FSDegradationist != "unset")>>
- <<set $fuckdolls += Math.trunc(($cash-$marketAssistantLimit)/($seed*2)), $cash -= Math.trunc(($cash-$marketAssistantLimit)/($seed*2))*($seed*2)>>
+ <<set $fuckdolls += Math.trunc(($cash-$marketAssistantLimit)/(($seed+100)*2)), $menialDemandFactor += Math.trunc(($cash-$marketAssistantLimit)/(($seed+100)*2)), $cash -= Math.trunc(($cash-$marketAssistantLimit)/(($seed+100)*2))*(($seed+100)*2)>>
<<else>>
- <<set $helots += Math.trunc(($cash-$marketAssistantLimit)/($seed)), $cash -= Math.trunc(($cash-$marketAssistantLimit)/($seed))*($seed)>>
+ <<set $helots += Math.trunc(($cash-$marketAssistantLimit)/($seed+100)), $menialDemandFactor += Math.trunc(($cash-$marketAssistantLimit)/($seed+100)), $cash -= Math.trunc(($cash-$marketAssistantLimit)/($seed+100))*($seed+100)>>
<</if>>
<</if>>
<</if>>
@@ -783,13 +783,13 @@ Your ''business assistant'' manages the menial slave market.
<<if $assistant == 0>>It<<else>>She<</if>> liquidates your chattel holdings, since it's a sellers' market.
<</if>>
<<if $helots > 0>>
- <<set $cash+=$helots*($seed),$helots = 0>>
+ <<set $cash += $helots*($seed), $menialDemandFactor -= $helots, $helots = 0>>
<</if>>
<<if $fuckdolls > 0>>
- <<set $cash+=$fuckdolls*($seed),$fuckdolls = 0>>
+ <<set $cash += $fuckdolls*($seed*2), $menialDemandFactor -= $fuckdolls, $fuckdolls = 0>>
<</if>>
<<if $menialBioreactors > 0>>
- <<set $cash+=$menialBioreactors*($seed),$menialBioreactors = 0>>
+ <<set $cash += $menialBioreactors*($seed-100), $menialDemandFactor -= $menialBioreactors, $menialBioreactors = 0>>
<</if>>
<<else>>
Prices are average, so <<if $assistant == 0>>it<<else>>she<</if>> does not make any significant moves.
diff --git a/src/uncategorized/buySlaves.tw b/src/uncategorized/buySlaves.tw
index a2a4ae91005..ca0398b087f 100644
--- a/src/uncategorized/buySlaves.tw
+++ b/src/uncategorized/buySlaves.tw
@@ -258,8 +258,7 @@ __Menial Slaves__
<<MenialPopCap>>
The parts of your arcology you own can house a total of $PopCap menial slaves.
-<<set _menialPrice = Math.trunc(($slaveCostFactor*1000)/100)*100>>
-<<set _menialPrice = Math.clamp(_menialPrice, 500, 1500)>>
+<<set _menialPrice = menialSlaveCost()>>
<br>
<<if $helots > 1>>
@@ -273,15 +272,16 @@ The market price of menials is <<print cashFormat(_menialPrice)>>.
<<set _optionsBreak = 0>>
<<if $PopCap > $helots+$fuckdolls+$menialBioreactors>>
[[Buy|Buy Slaves][$helots+=1,$menialDemandFactor+=1,$cash-=_menialPrice]]
- <<if $cash > _menialPrice*10>>
- [[(x10)|Buy Slaves][$helots+=10,$menialDemandFactor+=10,$cash-=_menialPrice*10]]
+ <<if $cash > (_menialPrice+200)*10>>
+ [[(x10)|Buy Slaves][$helots+=10,$menialDemandFactor+=10,$cash-=(_menialPrice+200)*10]]
<</if>>
- <<if $cash > _menialPrice*100>>
- [[(x100)|Buy Slaves][$helots+=100,$menialDemandFactor+=100,$cash-=_menialPrice*100]]
+ <<if $cash > (_menialPrice+200)*100>>
+ [[(x100)|Buy Slaves][$helots+=100,$menialDemandFactor+=100,$cash-=(_menialPrice+200)*100]]
<</if>>
- <<if $cash > _menialPrice*2>>
- [[(max)|Buy Slaves][$helots+=Math.trunc($cash/(_menialPrice)),$menialDemandFactor+=Math.trunc($cash/(_menialPrice)),$cash-=Math.trunc($cash/(_menialPrice))*(_menialPrice)]]
+ <<if $cash > (_menialPrice+200)*2>>
+ [[(max)|Buy Slaves][$helots+=Math.trunc($cash/(_menialPrice+200)),$menialDemandFactor+=Math.trunc($cash/(_menialPrice+200)),$cash-=Math.trunc($cash/(_menialPrice+200))*(_menialPrice+200)]]
<</if>>
+ //Bulk purchases will cost <<print cashFormat(200)>> over market price.//
<<set _optionsBreak = 1>>
<</if>>
<<if $helots >= 1>>
@@ -293,35 +293,34 @@ The market price of menials is <<print cashFormat(_menialPrice)>>.
[[(x100)|Buy Slaves][$helots-=100,$menialDemandFactor-=100,$cash+=_menialPrice*100]]
<</if>>
<</if>>
-[[(all)|Buy Slaves][$cash+=$helots*(_menialPrice),$menialDemandFactor-=$helots*(_menialPrice),$helots = 0]]
+[[(all)|Buy Slaves][$cash+=$helots*(_menialPrice),$menialDemandFactor-=$helots,$helots = 0]]
<<if $arcologies[0].FSPaternalist == "unset">>
- <<if $arcadeUpgradeFuckdolls == 1>>
- <<set _fconvertCost = 1000>>
- <<if _menialPrice >= 1100>>
- <<set _fconvertCost = (_menialPrice+100)>>
+ <<if $arcadeUpgradeFuckdolls == 1>>
+ <<set _fconvertCost = 1000>>
+ <<if _menialPrice >= 1100>>
+ <<set _fconvertCost = (_menialPrice+100)>>
+ <</if>>
+ <br> [[Convert to Fuckdoll|Buy Slaves][$helots-=1,$fuckdolls+=1,$cash-=(_fconvertCost)]]
+ <<if $helots >= 10>>
+ [[(x10)|Buy Slaves][$helots-=10,$fuckdolls+=10,$cash-=10*(_fconvertCost)]]
+ <<if $helots >= 100>>
+ [[(x100)|Buy Slaves][$helots-=100,$fuckdolls+=100,$cash-=100*(_fconvertCost)]]
+ <</if>>
+ <</if>>
+ [[(all)|Buy Slaves][$fuckdolls+=$helots,$cash-=(_fconvertCost)*($helots),$helots=0]]
+ //Conversion costs <<print cashFormat(_fconvertCost) each>>//
<</if>>
- <br> [[Convert to Fuckdoll|Buy Slaves][$helots-=1,$fuckdolls+=1,$cash-=(_fconvertCost)]]
- <<if $helots >= 10>>
- [[(x10)|Buy Slaves][$helots-=10,$fuckdolls+=10,$cash-=10*(_fconvertCost)]]
- <<if $helots >= 100>>
- [[(x100)|Buy Slaves][$helots-=100,$fuckdolls+=100,$cash-=100*(_fconvertCost)]]
+ <<if $dairyFeedersUpgrade > 0>>
+ <br> [[Convert to Bioreactor|Buy Slaves][$helots-=1,$menialBioreactors+=1,$cash-=500]]
+ <<if $helots >= 10>>
+ [[(x10)|Buy Slaves][$helots-=10,$menialBioreactors+=10,$cash-=5000]]
+ <<if $helots >= 100>>
+ [[(x100)|Buy Slaves][$helots-=100,$menialBioreactors+=100,$cash-=50000]]
+ <</if>>
+ <</if>>
+ [[(all)|Buy Slaves][$menialBioreactors+=$helots,$cash-=500*$helots,$helots=0]]
+ //Conversion costs <<print cashFormat(500)>> each//
<</if>>
- <</if>>
- [[(all)|Buy Slaves][$fuckdolls+=$helots,$cash-=(_fconvertCost)*($helots),$helots=0]]
- //Costs <<print cashFormat(_fconvertCost)>>//
- <</if>>
- <<if $dairyFeedersUpgrade > 0>>
- <br> [[Convert to Bioreactor|Buy Slaves][$helots-=1,$menialBioreactors+=1,$cash-=500]]
- //Costs <<print cashFormat(500)>>//
- <<if $helots >= 10>>
- [[(x10)|Buy Slaves][$helots-=10,$menialBioreactors+=10,$cash-=5000]]
- <<if $helots >= 100>>
- [[(x100)|Buy Slaves][$helots-=100,$menialBioreactors+=100,$cash-=50000]]
- <</if>>
- <</if>>
- [[(all)|Buy Slaves][$menialBioreactors+=$helots,$cash-=500*$helots,$helots=0]]
- //Costs <<print cashFormat(500)>>//
- <</if>>
<</if>>
<</if>>
@@ -337,16 +336,17 @@ The market price of standard fuckdolls is <<print cashFormat(_menialPrice*2)>>.
<<set _optionsBreak = 0>>
<<if $PopCap > $helots+$fuckdolls+$menialBioreactors>>
<<if $arcologies[0].FSPaternalist == "unset">>
- [[Buy|Buy Slaves][$fuckdolls+=1,$menialDemandFactor+=1,$cash-=_menialPrice*2]]
- <<if $cash > _menialPrice*20>>
- [[(x10)|Buy Slaves][$fuckdolls+=10,$menialDemandFactor+=10,$cash-=_menialPrice*20]]
+ [[Buy|Buy Slaves][$fuckdolls+=1,$menialDemandFactor+=1,$cash-=(_menialPrice*2+200)]]
+ <<if $cash > (_menialPrice*2+200)*10>>
+ [[(x10)|Buy Slaves][$fuckdolls+=10,$menialDemandFactor+=10,$cash-=(_menialPrice*2+200)*20]]
<</if>>
- <<if $cash > _menialPrice*200>>
- [[(x100)|Buy Slaves][$fuckdolls+=100,$menialDemandFactor+=100,$cash-=_menialPrice*200]]
+ <<if $cash > (_menialPrice*2+200)*100>>
+ [[(x100)|Buy Slaves][$fuckdolls+=100,$menialDemandFactor+=100,$cash-=(_menialPrice*2+200)*100]]
<</if>>
- <<if $cash > _menialPrice*4>>
- [[(max)|Buy Slaves][$fuckdolls+=Math.trunc($cash/(_menialPrice*2)),$menialDemandFactor+=Math.trunc($cash/(_menialPrice*2)),$cash-=Math.trunc($cash/(_menialPrice*2))*(_menialPrice*2)]]
+ <<if $cash > (_menialPrice*2+200)*2>>
+ [[(max)|Buy Slaves][$fuckdolls+=Math.trunc($cash/(_menialPrice*2+200)),$menialDemandFactor+=Math.trunc($cash/(_menialPrice*2+200)),$cash-=Math.trunc($cash/(_menialPrice*2+200))*(_menialPrice*2+200)]]
<</if>>
+ //Bulk purchases will cost <<print cashFormat(200)>> over market price.//
<<set _optionsBreak = 1>>
<</if>>
<</if>>
@@ -359,7 +359,7 @@ The market price of standard fuckdolls is <<print cashFormat(_menialPrice*2)>>.
[[(x100)|Buy Slaves][$fuckdolls-=100,$menialDemandFactor-=100,$cash+=_menialPrice*200]]
<</if>>
<</if>>
-[[(all)|Buy Slaves][$cash+=$fuckdolls*(_menialPrice*2),$menialDemandFactor-=$fuckdolls*(_menialPrice*2),$fuckdolls = 0]]
+[[(all)|Buy Slaves][$cash+=$fuckdolls*(_menialPrice*2),$menialDemandFactor-=$fuckdolls,$fuckdolls = 0]]
<</if>>
<</if>>
@@ -375,16 +375,17 @@ The market price of standard bioreactors is <<print cashFormat((_menialPrice-100
<<set _optionsBreak = 0>>
<<if $PopCap > $helots+$fuckdolls+$menialBioreactors>>
<<if $arcologies[0].FSPaternalist == "unset">>
- [[Buy|Buy Slaves][$menialBioreactors+=1,$menialDemandFactor+=1,$cash-=(_menialPrice-100)]]
- <<if $cash > (_menialPrice-100)*10>>
- [[(x10)|Buy Slaves][$menialBioreactors+=10,$menialDemandFactor+=10,$cash-=(_menialPrice-100)*10]]
+ [[Buy|Buy Slaves][$menialBioreactors+=1,$menialDemandFactor+=1,$cash-=(_menialPrice+100)]]
+ <<if $cash > (_menialPrice+100)*10>>
+ [[(x10)|Buy Slaves][$menialBioreactors+=10,$menialDemandFactor+=10,$cash-=(_menialPrice+100)*10]]
<</if>>
- <<if $cash > (_menialPrice-100)*100>>
- [[(x100)|Buy Slaves][$menialBioreactors+=100,$menialDemandFactor+=100,$cash-=(_menialPrice-100)*100]]
+ <<if $cash > (_menialPrice+100)*100>>
+ [[(x100)|Buy Slaves][$menialBioreactors+=100,$menialDemandFactor+=100,$cash-=(_menialPrice+100)*100]]
<</if>>
- <<if $cash > (_menialPrice-100)*2>>
- [[(max)|Buy Slaves][$menialBioreactors+=Math.trunc($cash/(_menialPrice-100)),$menialDemandFactor+=Math.trunc($cash/(_menialPrice-100)),$cash-=Math.trunc($cash/(_menialPrice-100))*(_menialPrice-100)]]
+ <<if $cash > (_menialPrice+100)*2>>
+ [[(max)|Buy Slaves][$menialBioreactors+=Math.trunc($cash/(_menialPrice+100)),$menialDemandFactor+=Math.trunc($cash/(_menialPrice+100)),$cash-=Math.trunc($cash/(_menialPrice+100))*(_menialPrice+100)]]
<</if>>
+ //Bulk purchases will cost <<print cashFormat(200)>> over market price.//
<<set _optionsBreak = 1>>
<</if>>
<</if>>
@@ -397,6 +398,6 @@ The market price of standard bioreactors is <<print cashFormat((_menialPrice-100
[[(x100)|Buy Slaves][$menialBioreactors-=100,$menialDemandFactor-=100,$cash+=(_menialPrice-100)*100]]
<</if>>
<</if>>
-[[(all)|Buy Slaves][$cash+=$menialBioreactors*(_menialPrice-100),$menialDemandFactor-=$menialBioreactors*(_menialPrice-100),$menialBioreactors = 0]]
+[[(all)|Buy Slaves][$cash+=$menialBioreactors*(_menialPrice-100),$menialDemandFactor-=$menialBioreactors,$menialBioreactors = 0]]
<</if>>
<</if>>
diff --git a/src/uncategorized/customSlave.tw b/src/uncategorized/customSlave.tw
index f6acbb84699..153d647526b 100644
--- a/src/uncategorized/customSlave.tw
+++ b/src/uncategorized/customSlave.tw
@@ -711,8 +711,8 @@
<br>
<span id = "lube">
-<<if $customSlave.vaginaLube == 0>>Dry Vagina.
-<<elseif $customSlave.vaginaLube == 1>>Wet Vagina.
+<<if $customSlave.vaginaLube == 0>>Dry vagina.
+<<elseif $customSlave.vaginaLube == 1>>Wet vagina.
<<else>>Sopping wet vagina.
<</if>>
</span>
diff --git a/src/uncategorized/freeRangeDairyAssignmentScene.tw b/src/uncategorized/freeRangeDairyAssignmentScene.tw
index 255af0badd3..23bad72a681 100644
--- a/src/uncategorized/freeRangeDairyAssignmentScene.tw
+++ b/src/uncategorized/freeRangeDairyAssignmentScene.tw
@@ -300,7 +300,7 @@ The milking cups on her nipples switch from rhythmic pulsing into intense suctio
<<elseif $activeSlave.boobs > 10000>>
in absurdly large amounts. Her gargantuan breasts do not seem to get less milk-laden for a long time.
<<elseif $activeSlave.boobs > 5000>>
- in a large amount. Her huge breasts can provide multiple liters of milk.
+ in powerful jets. Her huge breasts can provide multiple liters of milk.
<<elseif $activeSlave.boobs > 1000>>
for quite some time. Her large breasts can store an impressive volume of milk.
<<elseif $activeSlave.boobs > 700>>
diff --git a/src/uncategorized/hgApplication.tw b/src/uncategorized/hgApplication.tw
index 28bfdbb8043..100219f86fa 100644
--- a/src/uncategorized/hgApplication.tw
+++ b/src/uncategorized/hgApplication.tw
@@ -224,16 +224,16 @@ She punishes $activeSlave.slaveName whenever she sees her breaking the rules yet
<<set $activeSlave.training = 0>>
<<if ($HeadGirl.fetish == "cumslut") && ($HeadGirl.fetishStrength > 60)>>
- In spare moments she teaches $activeSlave.slaveName how to suck cocks, cunts, and assholes. Her enthusiasm for oral sex is infectious. $activeSlave.slaveName's oral skills have improved.
+ In spare moments she teaches $activeSlave.slaveName how to suck cocks, cunts, and assholes. Her enthusiasm for oral sex is infectious. $activeSlave.slaveName's @@.green;oral skills have improved.@@
<<set $skillIncrease = random(5,10)>><<OralSkillIncrease $activeSlave>>
<<elseif ($HeadGirl.dick > 0) && canAchieveErection($HeadGirl) && $HeadGirl.dickAccessory != ("chastity")>>
- In spare moments she teaches $activeSlave.slaveName how to suck cocks, cunts, and assholes. Your head girl uses her penis as an effective teaching tool. $activeSlave.slaveName's oral skills have improved.
+ In spare moments she teaches $activeSlave.slaveName how to suck cocks, cunts, and assholes. Your head girl uses her penis as an effective teaching tool. $activeSlave.slaveName's @@.green;oral skills have improved.@@
<<set $skillIncrease = random(5,10)>><<OralSkillIncrease $activeSlave>>
<<elseif ($HeadGirl.clit > 2)>>
- In spare moments she teaches $activeSlave.slaveName how to suck cocks, cunts, and assholes. Your head girl uses her pseudophallus-sized clit as an effective teaching tool. $activeSlave.slaveName's oral skills have improved.
+ In spare moments she teaches $activeSlave.slaveName how to suck cocks, cunts, and assholes. Your head girl uses her pseudophallus-sized clit as an effective teaching tool. $activeSlave.slaveName's @@.green;oral skills have improved.@@
<<set $skillIncrease = random(5,10)>><<OralSkillIncrease $activeSlave>>
<<else>>
- In spare moments she teaches $activeSlave.slaveName how to suck cocks, cunts, and assholes. $activeSlave.slaveName's oral skills have improved.
+ In spare moments she teaches $activeSlave.slaveName how to suck cocks, cunts, and assholes. $activeSlave.slaveName's @@.green;oral skills have improved.@@
<</if>>
<<set $skillIncrease = Math.ceil(_effectiveness/10)>><<OralSkillIncrease $activeSlave>>
@@ -241,16 +241,16 @@ She punishes $activeSlave.slaveName whenever she sees her breaking the rules yet
<<set $activeSlave.training = 0>>
<<if ($HeadGirl.fetish == "buttslut") && ($HeadGirl.fetishStrength > 60)>>
- In spare moments she teaches $activeSlave.slaveName how to take it up the ass. Your head girl's enthusiasm for backdoor loving is infectious. $activeSlave.slaveName's anal skills have improved.
+ In spare moments she teaches $activeSlave.slaveName how to take it up the ass. Your head girl's enthusiasm for backdoor loving is infectious. $activeSlave.slaveName's @@.green;anal skills have improved.@@
<<set $skillIncrease = random(5,10)>><<AnalSkillIncrease $activeSlave>>
<<elseif ($HeadGirl.dick > 0) && canAchieveErection($HeadGirl) && $HeadGirl.dickAccessory != ("chastity")>>
- In spare moments she teaches $activeSlave.slaveName how to take a dick up the butt. Your head girl uses her penis as an effective teaching tool. $activeSlave.slaveName's anal skills have improved.
+ In spare moments she teaches $activeSlave.slaveName how to take a dick up the butt. Your head girl uses her penis as an effective teaching tool. $activeSlave.slaveName's @@.green;anal skills have improved.@@
<<set $skillIncrease = random(5,10)>><<AnalSkillIncrease $activeSlave>>
<<elseif ($HeadGirl.clit > 2)>>
- In spare moments she teaches $activeSlave.slaveName how to take a phallus up the butt. Your head girl uses her pseudophallus-sized clit as an effective teaching tool. $activeSlave.slaveName's anal skills have improved.
+ In spare moments she teaches $activeSlave.slaveName how to take a phallus up the butt. Your head girl uses her pseudophallus-sized clit as an effective teaching tool. $activeSlave.slaveName's @@.green;anal skills have improved.@@
<<set $skillIncrease = random(5,10)>><<AnalSkillIncrease $activeSlave>>
<<else>>
- In spare moments she teaches $activeSlave.slaveName how to take a dick up the butt. $activeSlave.slaveName's anal skills have improved.
+ In spare moments she teaches $activeSlave.slaveName how to take a dick up the butt. $activeSlave.slaveName's @@.green;anal skills have improved.@@
<</if>>
<<set $skillIncrease = Math.ceil(_effectiveness/10)>><<AnalSkillIncrease $activeSlave>>
@@ -258,33 +258,33 @@ She punishes $activeSlave.slaveName whenever she sees her breaking the rules yet
<<set $activeSlave.training = 0>>
<<if ($HeadGirl.energy > 95)>>
- In spare moments she teaches $activeSlave.slaveName how to take a dick. Your head girl's enthusiasm for sex is infectious. $activeSlave.slaveName's vanilla sex skills have improved.
+ In spare moments she teaches $activeSlave.slaveName how to take a dick. Your head girl's enthusiasm for sex is infectious. $activeSlave.slaveName's @@.green;vanilla sex skills have improved.@@
<<set $skillIncrease = random(5,10)>><<VaginalSkillIncrease $activeSlave>>
<<elseif ($HeadGirl.dick > 0) && canAchieveErection($HeadGirl) && $HeadGirl.dickAccessory != ("chastity")>>
- In spare moments she teaches $activeSlave.slaveName how to take a dick. Your head girl uses her penis as an effective teaching tool. $activeSlave.slaveName's vanilla sex skills have improved.
+ In spare moments she teaches $activeSlave.slaveName how to take a dick. Your head girl uses her penis as an effective teaching tool. $activeSlave.slaveName's @@.green;vanilla sex skills have improved.@@
<<set $skillIncrease = random(5,10)>><<VaginalSkillIncrease $activeSlave>>
<<elseif ($HeadGirl.clit > 2)>>
- In spare moments she teaches $activeSlave.slaveName how to take a phallus. Your head girl uses her pseudophallus-sized clit as an effective teaching tool. $activeSlave.slaveName's vanilla sex skills have improved.
+ In spare moments she teaches $activeSlave.slaveName how to take a phallus. Your head girl uses her pseudophallus-sized clit as an effective teaching tool. $activeSlave.slaveName's @@.green;vanilla sex skills have improved.@@
<<set $skillIncrease = random(5,10)>><<VaginalSkillIncrease $activeSlave>>
<<else>>
- In spare moments she teaches $activeSlave.slaveName how to take a dick. $activeSlave.slaveName's vanilla sex skills have improved.
+ In spare moments she teaches $activeSlave.slaveName how to take a dick. $activeSlave.slaveName's @@.green;vanilla sex skills have improved.@@
<</if>>
<<set $skillIncrease = Math.ceil(_effectiveness/10)>><<VaginalSkillIncrease $activeSlave>>
<<elseif $HGtraining == "whore skill">>
<<set $activeSlave.training = 0>>
-In spare moments she teaches $activeSlave.slaveName how to prostitute herself. $activeSlave.slaveName's whoring skills have improved.
+In spare moments she teaches $activeSlave.slaveName how to prostitute herself. $activeSlave.slaveName's @@.green;whoring skills have improved.@@
<<set $skillIncrease = Math.ceil(_effectiveness/10)>><<WhoreSkillIncrease $activeSlave>>
<<elseif $HGtraining == "entertain skill">>
<<set $activeSlave.training = 0>>
<<if ($HeadGirl.fetish == "humiliation") && ($HeadGirl.fetishStrength > 60)>>
- In spare moments she teaches $activeSlave.slaveName how to entertain. Your head girl's enthusiasm for public display is infectious. $activeSlave.slaveName's entertainment skills have improved.
+ In spare moments she teaches $activeSlave.slaveName how to entertain. Your head girl's enthusiasm for public display is infectious. $activeSlave.slaveName's @@.green;entertainment skills have improved.@@
<<set $skillIncrease = random(5,10)>><<EntertainSkillIncrease $activeSlave>>
<<else>>
- In spare moments she teaches $activeSlave.slaveName how to entertain. $activeSlave.slaveName's entertainment skills have improved.
+ In spare moments she teaches $activeSlave.slaveName how to entertain. $activeSlave.slaveName's @@.green;entertainment skills have improved.@@
<</if>>
<<set $skillIncrease = Math.ceil(_effectiveness/10)>><<EntertainSkillIncrease $activeSlave>>
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index f6638763658..51e9f1d9cc4 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -801,40 +801,28 @@ Routine upkeep of your demesne costs @@.yellow;<<print cashFormat($costs)>>.@@
<</if>>
<</if>>
-<<if $menialDemandFactor != 0>>
<<if Math.abs($menialDemandFactor) > 100>>
-<<if ($menialDemandFactor > 1000) && ($slaveCostFactor <= 1.1)>>
- Your dealings in menial slaves have had a major impact on the slave market, @@.yellow;greatly increasing slave prices.@@
- <<set $menialDemandFactor = 0>>
- <<set $slaveCostFactor += 0.15>>
- <br><br>
-<<elseif ($menialDemandFactor > 500) && ($slaveCostFactor <= 1.15)>>
- Your dealings in menial slaves have had a noticeable impact on the slave market, @@.yellow;significantly increasing slave prices.@@
- <<set $menialDemandFactor = 0>>
- <<set $slaveCostFactor += 0.1>>
- <br><br>
-<<elseif ($menialDemandFactor > 250) && ($slaveCostFactor <= 1.2)>>
- Your dealings in menial slaves have had a minor impact on the slave market, @@.yellow;slightly increasing slave prices.@@
- <<set $menialDemandFactor = 0>>
- <<set $slaveCostFactor += 0.05>>
- <br><br>
-<<elseif ($menialDemandFactor < -1000) && ($slaveCostFactor >= 0.9)>>
- Your dealings in menial slaves have had a major impact on the slave market, @@.yellow;greatly reducing slave prices.@@
- <<set $menialDemandFactor = 0>>
- <<set $slaveCostFactor -= 0.15>>
- <br><br>
-<<elseif ($menialDemandFactor < -500) && ($slaveCostFactor >= 0.85)>>
- Your dealings in menial slaves have had a noticeable impact on the slave market, @@.yellow;significantly reducing slave prices.@@
- <<set $menialDemandFactor = 0>>
- <<set $slaveCostFactor -= 0.1>>
- <br><br>
-<<elseif ($menialDemandFactor < -250) && ($slaveCostFactor >= 0.8)>>
- Your dealings in menial slaves have had a minor impact on the slave market, @@.yellow;slightly reducing slave prices.@@
- <<set $menialDemandFactor = 0>>
- <<set $slaveCostFactor -= 0.05>>
- <br><br>
-<</if>>
-<</if>>
+ <<if ($menialDemandFactor > 1000)>>
+ <<set $menialDemandFactor -= random(500, 1000)>>
+ <<elseif ($menialDemandFactor > 500)>>
+ <<set $menialDemandFactor -= random(250, 500)>>
+ <<elseif ($menialDemandFactor > 250)>>
+ <<set $menialDemandFactor -= random(100, 250)>>
+ <<elseif ($menialDemandFactor < -1000)>>
+ <<set $menialDemandFactor += random(500, 1000)>>
+ <<elseif ($menialDemandFactor < -500)>>
+ <<set $menialDemandFactor += random(250, 500)>>
+ <<elseif ($menialDemandFactor < -250)>>
+ <<set $menialDemandFactor += random(100, 250)>>
+ <<else>>
+ <<set $menialDemandFactor += random(-100, 100)>>
+ <</if>>
+<<elseif random(1,100) > 95>>
+ <<set $menialDemandFactor += random(-1500, 1500)>>
+<<elseif random(1,100) > 75>>
+ <<set $menialDemandFactor += random(-500, 500)>>
+<<else>>
+ <<set $menialDemandFactor += random(-250, 250)>>
<</if>>
<<if $securityForceActive == 1>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index cb5c7b9c27c..8564a187f75 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -296,6 +296,7 @@ One of your tenants asks for an interview. He's an effeminate young man; it seem
<<set $encyclopedia = "Slave Schools">>
<<set $activeSlaveOneTimeMinAge = Math.max($minimumSlaveAge,10)>>
<<set $activeSlaveOneTimeMaxAge = 16>>
+<<set $one_time_age_overrides_pedo_mode = 1>>
<<include "Generate XX Slave">>
<<set $activeSlave.origin = "She was raised in a radical slave school that treated her with drugs and surgery from a very young age.">>
<<set $activeSlave.career = "a slave">>
@@ -321,11 +322,11 @@ One of your tenants asks for an interview. He's an effeminate young man; it seem
A young slave is going door to door offering herself for sale on behalf of her owner. It's rare to see a slave obedient enough to be entrusted with her own sale, and she's interesting, so you let her up. She stands in front of your desk and waits for instructions. She's wearing a very skimpy schoolgirl skirt and a white blouse so tight and brief that the tops of her areolae are visible. The badge on her blouse identifies her as a product of one of the Free Cities' legal slave orphanages. You instruct her to tell you about herself.
<br><br>
-"I was raised and trained by a slave orphanage, <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>. It is not legal to own underage girls, but it is legal to charge an orphan for the costs of raising her when she reaches $minimumSlaveAge, and those debts are always high enough to enslave her. My <<print $activeSlave.actualAge>>th birthday was yesterday, so I am a slave and for sale now."
+"I was raised and trained by a slave orphanage, <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>. It is not legal to own underage girls, but it is legal to charge an orphan for the costs of raising her when she reaches $minimumSlaveAge, and those debts are always high enough to enslave her. My <<print $activeSlave.actualAge>>th birthday was yesterday, <<if $activeSlave.actualAge == $minimumSlaveAge>>so I am a slave and for sale now<<else>>so I'm too old to stay at the orphanage any longer<</if>>."
<br><br>
"I have been trained for obedience since I came to the orphanage. At <<print Math.min(14, $activeSlave.actualAge - 4)>> they put me on drugs to make sure I'd grow nice T&A. On my <<print Math.min(16, $activeSlave.actualAge - 2)>>th birthday I got my first set of implants. Every time my boobs got used to the implants, I got sent in for a bigger set. I'm on my second set." She unbuttons her blouse and displays a pair of big fake tits. "I've also had my lips done." She blows you a wet kiss.
<br><br>
-She hikes up her skirt and spins around slowly. "The drugs also made my butt bigger, and I've had my butt done too. Since it wasn't okay to fuck me before I had turned $minimumSlaveAge and been made a slave, I'm a virgin and my anus has never had anything up it, <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>." She pulls her buttocks apart to prove it.
+She hikes up her skirt and spins around slowly. "The drugs also made my butt bigger, and I've had my butt done too. <<if $activeSlave.actualAge == $minimumSlaveAge>>Since it wasn't okay to fuck me before I had turned $minimumSlaveAge and been made a slave<<else>>Since my owner thought it would make me more desirable<</if>>, I'm a virgin and my anus has never had anything up it, <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>." She pulls her buttocks apart to prove it.
<br><br>
"I cost <<print cashFormat(2500)>>, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>."
@@ -334,6 +335,7 @@ She hikes up her skirt and spins around slowly. "The drugs also made my butt big
<<set $encyclopedia = "Slave Schools">>
<<set $activeSlaveOneTimeMinAge = Math.max($minimumSlaveAge,10)>>
<<set $activeSlaveOneTimeMaxAge = 16>>
+<<set $one_time_age_overrides_pedo_mode = 1>>
<<include "Generate XY Slave">>
<<set $activeSlave.origin = "She was raised in a radical slave school that treated her from a very young age, up to the point that she never experienced male puberty.">>
<<set $activeSlave.career = "a slave">>
@@ -362,11 +364,11 @@ She hikes up her skirt and spins around slowly. "The drugs also made my butt big
A young slave is going door to door offering herself for sale on behalf of her owner. It's rare to see a slave obedient enough to be entrusted with her own sale, and she's interesting, so you let her up. She stands in front of your desk and waits for instructions. She's wearing a very skimpy schoolgirl skirt and a white blouse so tight and brief that the tops of her areolae are visible. Something is tenting the front of her skirt slightly. The badge on her blouse identifies her as a product of one of the Free Cities' legal slave orphanages. You instruct her to tell you about herself.
<br><br>
-"I was raised and trained by a slave orphanage, <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>. It is not legal to own underage girls, but it is legal to charge an orphan for the costs of raising her when she reaches $minimumSlaveAge, and those debts are always high enough to enslave her. My <<print $activeSlave.actualAge>>th birthday was yesterday, so I am a slave and for sale now."
+"I was raised and trained by a slave orphanage, <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>. It is not legal to own underage girls, but it is legal to charge an orphan for the costs of raising her when she reaches $minimumSlaveAge, and those debts are always high enough to enslave her. My <<print $activeSlave.actualAge>>th birthday was yesterday, <<if $activeSlave.actualAge == $minimumSlaveAge>>so I am a slave and for sale now<<else>>so I'm too old to stay at the orphanage any longer<</if>>."
<br><br>
"I have been trained for obedience since I came to the orphanage. I came as a male, but they reassigned me to female right away. At <<print Math.min(14, $activeSlave.actualAge - 4)>> they put me on drugs to make sure I'd grow nice T&A and look more feminine. Those drugs also stopped my penis from growing much, so it's small, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>. On my <<print Math.min(16, $activeSlave.actualAge - 2)>>th birthday I got my first set of implants. Every time my chest got used to the implants, I got sent in for a bigger set. I'm on my third set." She unbuttons her blouse and displays a pair of fake tits.
<br><br>
-She hikes up her skirt and spins around slowly, displaying a petite, half-hard cock. "The drugs also made my butt bigger and my hips wider. Since it wasn't okay to fuck me before I had turned $minimumSlaveAge and been made a slave, my anus has never had anything up it, <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>." She pulls her buttocks apart to prove it. "I... I would be happy to serve you like I am now <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>, or you could send me for surgery to give me a pussy instead, I would like that too, <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>."
+She hikes up her skirt and spins around slowly, displaying a petite, half-hard cock. "The drugs also made my butt bigger and my hips wider. <<if $activeSlave.actualAge == $minimumSlaveAge>>Since it wasn't okay to fuck me before I had turned $minimumSlaveAge and been made a slave<<else>>Since my owner thought it would make me more desirable<</if>>, my anus has never had anything up it, <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>." She pulls her buttocks apart to prove it. "I... I would be happy to serve you like I am now <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>, or you could send me for surgery to give me a pussy instead, I would like that too, <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>."
<br><br>
"I cost <<print cashFormat(2500)>>, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>."
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index c898dacbfae..3221c747846 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -1145,15 +1145,15 @@ Work on her structurally:
<<if $activeSlave.indentureRestrictions < 1>>
[[Lengthen major bones|Surgery Degradation][$activeSlave.heightImplant = 1,$activeSlave.height += 10,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "height"]] | [[Shorten major bones|Surgery Degradation][$activeSlave.heightImplant = -1,$activeSlave.height -= 10,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "height"]]
<</if>>
-<<elseif ($activeSlave.height < 185) && ($activeSlave.height >= 150) && ($surgeryUpgrade == 1)>>
+<<elseif ($activeSlave.height < (Height.mean($activeSlave)+15)) && ($activeSlave.height >= (Height.mean($activeSlave)-15)) && ($surgeryUpgrade == 1)>>
<<if $activeSlave.indentureRestrictions < 1>>
[[Advanced height gain surgery|Surgery Degradation][$activeSlave.heightImplant = 1,$activeSlave.height += 10,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "height"]] | [[Advanced height reduction surgery|Surgery Degradation][$activeSlave.heightImplant = -1,$activeSlave.height -= 10,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "height"]]
<</if>>
-<<elseif ($activeSlave.height < 185) && ($surgeryUpgrade == 1)>>
+<<elseif ($activeSlave.height < (Height.mean($activeSlave)+15)) && ($surgeryUpgrade == 1)>>
<<if $activeSlave.indentureRestrictions < 1>>
[[Advanced height gain surgery|Surgery Degradation][$activeSlave.heightImplant = 1,$activeSlave.height += 10,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "height"]]
<</if>>
-<<elseif ($activeSlave.height >= 150) && ($surgeryUpgrade == 1)>>
+<<elseif ($activeSlave.height >= (Height.mean($activeSlave)-15)) && ($surgeryUpgrade == 1)>>
<<if $activeSlave.indentureRestrictions < 1>>
[[Advanced height reduction surgery|Surgery Degradation][$activeSlave.heightImplant = -1,$activeSlave.height -= 10,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "height"]]
<</if>>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index aa3a38be066..5e748400cac 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -1391,8 +1391,7 @@
<</for>>
<<set _OverMenialCap = ($helots+$fuckdolls+$menialBioreactors)-$PopCap>>
<<if _OverMenialCap > 0>>
- <<set _Price = Math.trunc(($slaveCostFactor*1000)/100)*100>>
- <<set _Price = Math.clamp(_Price, 500, 1500)>>
+ <<set _Price = menialSlaveCost()>>
<<if $helots > 0>>
<<if $helots > _OverMenialCap>>
<<set $cash += _OverMenialCap*_Price, $menialDemandFactor -= _OverMenialCap,
diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw
index 3331c15d8af..01022a44cd5 100644
--- a/src/utility/raWidgets.tw
+++ b/src/utility/raWidgets.tw
@@ -4156,7 +4156,7 @@ Your brand design is ''$brandDesign.''
<</if>>
<</if>>
-<<if $args[0].preg > 3 && _combinedRule.pregSpeed != "nds" && $args[0].breedingMark != 1 && $args[0].indentureRestrictions < 1 && $args[0].pregType < 50>>
+<<if $args[0].pregKnown == 1 && _combinedRule.pregSpeed != "nds" && $args[0].breedingMark != 1 && $args[0].indentureRestrictions < 1 && $args[0].pregType < 50>>
<<if _combinedRule.pregSpeed == "slow" && $args[0].preg < 31>>
<<set $args[0].pregControl = "slow gestation">>
<br>$args[0].slaveName is pregnant, so she has been put on the gestation slowing agents.
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 78485afb3b1..b4d9dc65b7d 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -1720,7 +1720,7 @@
Call as <<CustomSlaveClit>>
%/
<<widget "CustomSlaveClit">>
- <<replace #balls>>
+ <<replace #clit>>
<<if $customSlave.clit == 0>>Normal clitoris.
<<elseif $customSlave.clit == 1>>Big clitoris.
<<elseif $customSlave.clit == 3>>Enormous clitoris.
@@ -1808,9 +1808,9 @@
Call as <<CustomSlaveLube>>
%/
<<widget "CustomSlaveLube">>
- <<replace #labia>>
- <<if $customSlave.vaginaLube == 0>>Dry Vagina.
- <<elseif $customSlave.vaginaLube == 1>>Wet Vagina.
+ <<replace #lube>>
+ <<if $customSlave.vaginaLube == 0>>Dry vagina.
+ <<elseif $customSlave.vaginaLube == 1>>Wet vagina.
<<else>>Sopping wet vagina.
<</if>>
<</replace>>
--
GitLab