diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 0c254ad891e05520bde954e2a988a8a8d7c75112..0371f95e93f2329b2925dfb7388094925fc42fa9 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -7530,6 +7530,10 @@ window.newSlave = function newSlave(slave) {
} else {
slave.pregWeek = 0;
}
+
+ if (slave.clone !== 0) {
+ slave.canRecruit = 0;
+ }
if (V.familyTesting === 1) {
slave.sisters = 0;
@@ -7652,6 +7656,10 @@ window.newChild = function newChild(child) {
child.childSurname = 0;
}
+ if (child.clone !== 0) {
+ child.canRecruit = 0;
+ }
+
if (child.fuckdoll > 0) {
child.pronoun = "it";
child.possessivePronoun = "its";
diff --git a/src/SpecialForce/Report.tw b/src/SpecialForce/Report.tw
index 076652f88971eba7dbfe52372d33e01641176f26..718a257f16ab0f8265be7d1be7e2c278a2ed08b1 100644
--- a/src/SpecialForce/Report.tw
+++ b/src/SpecialForce/Report.tw
@@ -12,11 +12,11 @@
<<set $SF.Squad.Troops += Math.ceil(random(-2*$SF.Squad.Troops/100,-3*$SF.Squad.Troops/100))>>
<</if>>
<</if>>
- <<set _SFIncome = 75000,_actionMultiplier = 1,_troopMultiplier = 1,_unitMultiplier = 1,_depravityMultiplier = 1,_SFupkeep = 0,_FNGs = 10,_Trade = 0.025>>
+ <<set _SFIncome = 75000,_actionMultiplier = 1,_troopMultiplier = 1,_unitMultiplier = 1,_depravityMultiplier = 1,_SFupkeep = 0,_FNGs = 10,_Trade = 0.025,$SFUC = 0>>
<<if $SF.UC.Assign > 0>>
- <<if $SF.UC.Assign === 1>> <<set $SFUC = Math.ceil($SF.Squad.Troops*.1),$SF.Squad.Troops-$SFUC>>
- <<else>> <<set $SFUC = Math.ceil($SF.Squad.Troops*.25),$SF.Squad.Troops-$SFUC>> <</if>>
- <</if>>
+ <<if $SF.UC.Assign < 2>> <<set $SFUC = Math.ceil($SF.Squad.Troops*.1)>>
+ <<else>> <<set $SFUC = Math.ceil($SF.Squad.Troops*.25)>> <</if>>
+ <</if>> <<set $SF.Squad.Troops-$SFUC>>
<<if $SF.Squad.Troops > 200>> <<set _Trade += 0.05*(Math.ceil($SF.Squad.Troops/100))>>
<<set _troopMultiplier = $SF.Squad.Troops/200, _SFupkeep += $SF.Squad.Troops*25>>
<<if $secExp > 0>>
diff --git a/src/js/assayJS.tw b/src/js/assayJS.tw
index ab3eb968430a7f90c143d85f5cc62bb9fe1f25a6..7b6aabd5354fa50e2b303b14051f5f5e5ef45949 100644
--- a/src/js/assayJS.tw
+++ b/src/js/assayJS.tw
@@ -290,6 +290,10 @@ window.newSlave = function newSlave(slave) {
slave.pregWeek = 0;
}
+ if (slave.clone !== 0) {
+ slave.canRecruit = 0;
+ }
+
if (V.familyTesting === 1) {
slave.sisters = 0;
slave.daughters = 0;
@@ -411,6 +415,10 @@ window.newChild = function newChild(child) {
child.childSurname = 0;
}
+ if (child.clone !== 0) {
+ child.canRecruit = 0;
+ }
+
if (child.fuckdoll > 0) {
child.pronoun = "it";
child.possessivePronoun = "its";
diff --git a/src/pregmod/geneLab.tw b/src/pregmod/geneLab.tw
index e4f28b253dcea64560f7eb63da7f066d4d1be38f..c5feb381bffc96af3f304fec35afa92994141c70 100644
--- a/src/pregmod/geneLab.tw
+++ b/src/pregmod/geneLab.tw
@@ -13,6 +13,7 @@ The Gene Lab
Genetic Harvesting
<hr>
+<<if $cheatMode == 1>>
<<if ($cloningSystem != 1) && ($rep <= 18000*_PCSkillCheck)>>
//You lack the reputation needed to access methods for human cloning//
<br>
@@ -29,4 +30,5 @@ Genetic Harvesting
<<elseif ($cloningSystem > 0)>>
The gene lab is capable of implanting a slave's genetic sequence into a blank embryo to produce a basic clone.
<br>
+<</if>>
<</if>>
\ No newline at end of file
diff --git a/src/uncategorized/fsDevelopments.tw b/src/uncategorized/fsDevelopments.tw
index bb6904b8add0b9e8c6ebe1074ebf9d65a6d390bb..6d6e186906efddb38a69bbf7d29d05d55ccda12a 100644
--- a/src/uncategorized/fsDevelopments.tw
+++ b/src/uncategorized/fsDevelopments.tw
@@ -94,9 +94,9 @@
/* Spending, terrain, rep effects */
<<set _broadProgress = 0>>
-<<if $SF.Toggle && $SF.Active >= 1 && $SF.UC.Assign > 0>>
+<<if $SF.Toggle && $SF.Active >= 1 && $SF.UC.Assign > 0 && $SFUC > 0>>
Assigning a <<if $SF.UC.Assign === 1>>small<<else>>large<</if>> portion of $SF.Lower to undercover work helps forward your goals for your arcology's future.
- <<set _broadProgress += $SF.UC.Assign>> <br>
+ <<set _broadProgress += $SFUC/100>> <br>
<</if>>
<<if $FSSpending > 1>>
Your @@.yellowgreen;societal spending@@ helps forward your goals for the arcology's future.
diff --git a/src/uncategorized/lawCompliance.tw b/src/uncategorized/lawCompliance.tw
index 91804a9aca1df37db7b3f1bd3d13f080770bf3ea..063701332eaf5c3aca362c85eac22dad47674ba6 100644
--- a/src/uncategorized/lawCompliance.tw
+++ b/src/uncategorized/lawCompliance.tw
@@ -55,10 +55,15 @@
<<set $activeSlave.health = random(50,90)>>
<<set $activeSlave.weight = random(-20,0)>>
<<elseif $arcologies[0].FSHedonisticDecadenceSMR == 1>>
- <<set $activeSlave.muscles = random(-80,0)>>
<<set $activeSlave.weight = random(50,200)>>
- <<set $activeSlave.health = random(-30,10)>>
- Much of $his time before sale was spent being fattened up and lying around.
+ <<if $arcologies[0].FSHedonisticDecadenceStrongFat == 1>>
+ <<set $activeSlave.muscles = random(10,60)>>
+ <<set $activeSlave.health = random(10,40)>>
+ <<else>>
+ <<set $activeSlave.muscles = random(-80,0)>>
+ <<set $activeSlave.health = random(-30,10)>>
+ <</if>>
+ Much of $his time before sale was spent being fattened up and <<if $arcologies[0].FSHedonisticDecadenceStrongFat == 1>>pumping iron<<else>>lying around<</if>>.
<<if $activeSlave.devotion <= 20>>
$He had to be forcefed massive amounts of slave food while bound to meet requirements, filling $him with @@.gold;fear@@ and @@.mediumorchid;disgust.@@
<<set $activeSlave.trust -= 5>>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index 693eb240408b26d57d1a42c634936e5455d6729c..2ee04afdbe1e4877c3f9305c4ecbc5f14ceabac7 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -137,6 +137,8 @@
<<set $activeSlave.pregKnown = 0>>
<<set WombFlush($activeSlave)>>
<<run SetBellySize($activeSlave)>>
+ <<set $activeSlave.clone = 0>>
+ <<set $activeSlave.cloneID = 0>>
/*<<set _relativeSeed = random(1,100)>> To be used if additional variants are added. Since there currently is one each, checking a seed for a 100% chance is pointless. */
@@ -152,6 +154,7 @@
<<set $activeSlave.preg = random(5,39)>>
<<set $activeSlave.pregType = 1>>
<<set $activeSlave.pregKnown = 1>>
+ <<set $activeSlave.pregSource = 0>>
<<set $activeSlave.pregWeek = $activeSlave.preg>>
<<run SetBellySize($activeSlave)>>
<</if>>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index e7bdc32cd9015f9eccfba6d989fe5ced60f992e5..63683a9a63edad6960351e49e6d31683cab81cd9 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -36,8 +36,8 @@
|| ($Flag == 1 && s.assignment == "get treatment in the clinic")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Nurse.ID))),
"Nurse Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canWalk(s) && canSee(s)),
- "Schoolroom": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && s.fetish != "mindbroken" && (
- ($Flag == 0 && s.assignment != "learn in the schoolroom")
+ "Schoolroom": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
+ ($Flag == 0 && s.fetish != "mindbroken" && s.assignment != "learn in the schoolroom")
|| ($Flag == 1 && s.assignment == "learn in the schoolroom")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Schoolteacher.ID))),
"Schoolteacher Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canTalk(s) && canWalk(s) && canSee(s)),