diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 92e06178bedbc95ce2023b8b8b43030a5534de23..4e51af15e143413b6c0aaf6d9758a78cf0c2791c 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,23 @@
0.10.7.0/1
+1/19/18
+
+ 284
+ -fixed advertising issues regarding implants
+ -fixed minor text issues
+
+ 283
+ -fixed reversed futanari sisters career effects
+ -minor text fixes
+
+ 282
+ -Crimeanon's tweaks
+ -SFanon's tweaks and SF cheat edit
+ -minor fixes
+ -tweaked eugenics breeding proposal to reflect post SE rebellion
+ -refiled chains under harsh clothing
+
1/18/18
281
diff --git a/devTools/BuildAndIPFSify.sh b/devTools/BuildAndIPFSify.sh
index 1c2919cfb7141f6ca3c37fb351fa3758743c6cb5..09a3be7d79f6e65cbfad3d3c8f6c887873e694f9 100755
--- a/devTools/BuildAndIPFSify.sh
+++ b/devTools/BuildAndIPFSify.sh
@@ -22,7 +22,7 @@ fi
# If we've done this before then unpin the previous hash so IPFS can GC it if it needs to
if [ -r ../IPFS_hash.txt ]; then
- ipfs pin rm --recursive=true "$(cut -d : -f 2 ../IPFS_hash.txt)"
+ ipfs pin rm --recursive=true "$(cut -d : -f 2 ../IPFS_hash.txt | tr -d ' ')"
fi
./compile || exit 1
diff --git a/src/SecExp/authorityReport.tw b/src/SecExp/authorityReport.tw
index 7c6a727f989f9b586dc272ab0bf1450d5e749bc4..fc974d050460485c6f285f6558ebd351dc6980f7 100644
--- a/src/SecExp/authorityReport.tw
+++ b/src/SecExp/authorityReport.tw
@@ -3,7 +3,6 @@
<<if $useTabs == 0>>__Authority__<</if>>
<br>
-
<<if $authority > 19500>>
Your authority is nearly absolute. The arcology is yours to command as it pleases you.
<<elseif $authority > 15000>>
diff --git a/src/SecExp/unitsBattleReport.tw b/src/SecExp/unitsBattleReport.tw
index 87f3874b8461941f712f8b3071ff29a615d0dfb5..7b39e0e1395c40744cb7880892cd47c5071aa365 100644
--- a/src/SecExp/unitsBattleReport.tw
+++ b/src/SecExp/unitsBattleReport.tw
@@ -2,35 +2,52 @@
<<if $losses == 0>>
<<if $deployingBots == 1>>
- Your squadron of security drones participated in the battle, dominating the airspace and providing vital intelligence to the rest of the army.
- During the battle they suffered no casualties.
+ <br>
+ Security Drones: no casualties.
<</if>>
<<if $SFIntervention == 1>>
- <<print $securityForcePersonnel>> soldiers from $securityForceName joined the battle aboard their <<if $securityForceVehiclePower >= 4>> armored <</if>> vehicles <<if $securityForceAC130 > 0>> and their AC130<</if>>.
- Free cities armies are a rare sight, but their power is undeniable and your $securityForceName is living testament of this.
- During the battle they suffered no casualties.
+ <br>
+ <<print $securityForcePersonnel>> soldiers from $securityForceName joined the battle: no casualties suffered.
<</if>>
<<if $deployingMilitia == 1>>
<<for _j = 0; _j < $militiaUnits.length; _j++>>
<<if $militiaUnits[_j].isDeployed == 1>>
- $militiaUnits[_j].platoonName participated in the battle, your proud citizens defending with their lives their arcology.
- During the battle they suffered no casualties.
+ <br>
+ $militiaUnits[_j].platoonName: no casualties.
+ <<if $militiaUnits[_j].training < 100>>
+ <<if random(1,100) > 60>>
+ Experience has increased.
+ <<set $militiaUnits[_j].training += random(5,15) + $majorBattle * random(5,15)>>
+ <</if>>
+ <</if>>
<</if>>
<</for>>
<</if>>
<<if $deployingSlaves == 1>>
<<for _j = 0; _j < $slaveUnits.length; _j++>>
<<if $slaveUnits[_j].isDeployed == 1>>
- $slaveUnits[_j].platoonName participated in the battle. While a rare sight, your slave soldiers show no less willingness to fight for their arcology than their free counterparts, be it because of fear or devotion to their owner.
- During the battle they suffered no casualties.
+ <br>
+ $slaveUnits[_j].platoonName: no casualties.
+ <<if $slaveUnits[_j].training < 100>>
+ <<if random(1,100) > 60>>
+ Experience has increased.
+ <<set $slaveUnits[_j].training += random(5,15) + $majorBattle * random(5,15)>>
+ <</if>>
+ <</if>>
<</if>>
<</for>>
<</if>>
<<if $deployingMercs == 1>>
<<for _j = 0; _j < $mercUnits.length; _j++>>
<<if $mercUnits[_j].isDeployed == 1>>
- $mercUnits[_j].platoonName participated in the battle. Mercenaries are a common sight on the modern battlefield and yours are proud to serve their generous contractor.
- During the battle they suffered no casualties.
+ <br>
+ $mercUnits[_j].platoonName: no casualties.
+ <<if $mercUnits[_j].training < 100>>
+ <<if random(1,100) > 60>>
+ Experience has increased.
+ <<set $mercUnits[_j].training += random(5,15) + $majorBattle * random(5,15)>>
+ <</if>>
+ <</if>>
<</if>>
<</for>>
<</if>>
@@ -73,90 +90,88 @@
<<set _rand = random(_lossesList.length - 1)>>
<<set _lossesList[_rand] += $losses - _count>>
<<elseif _count > $losses>>
- <br>@@.red;Error: assigned losses higher than actual losses@@
+ <<set _diff = _count - $losses>>
+ <<set _rand = random(_lossesList.length - 1)>>
+ <<set _lossesList[_rand] = Math.trunc(_lossesList[_rand]-_diff,0,100)>>
<</if>>
/* assigns the losses and notify the player */
<<if $deployingBots == 1>>
- <br>
<br>
<<set _loss = _lossesList.pluck()>>
<<set _loss = Math.clamp(_loss,0,$secBots.troops)>>
<<set $secBots.troops -= _loss>>
- Your squadron of security drones participated in the battle, dominating the airspace and providing vital intelligence to the rest of the army.
- During the battle they suffered
+ Security drones:
<<if _loss <= 0>>
- no casualties.
- <<elseif _loss <= 10>>
- light casualties.
- <<elseif _loss <= 30>>
- moderate casualties.
- <<elseif _loss <= 60>>
- heavy casualties.
+ no casualties
+ <<elseif _loss <= $secBots.troops * 0.2>>
+ light casualties
+ <<elseif _loss <= $secBots.troops * 0.4>>
+ moderate casualties
+ <<elseif _loss <= $secBots.troops * 0.6>>
+ heavy casualties
<<else>>
- catastrophic casualties.
+ catastrophic casualties
<</if>>
+ suffered.
<<if $secBots.troops <= 0>>
<<set $secBots.active = 0>>
Unfortunately the losses they took were simply too great, their effective combatants are in so small number you can no longer call them a deployable unit. It will take quite the investment to rebuild them.
<<elseif $secBots.troops <= 10>>
The unit has very few operatives left, it risks complete annihilation if deployed again.
<</if>>
+ <br>
<</if>>
<<if $SFIntervention == 1>>
- <br>
<br>
<<set _loss = _lossesList.pluck()>>
<<set _loss = Math.clamp(_loss,0,$securityForcePersonnel)>>
<<set $securityForcePersonnel -= _loss>>
- <<print $securityForcePersonnel>> soldiers from the $securityForceName joined the battle aboard their <<if $securityForceVehiclePower >= 4>> armored <</if>> vehicles <<if $securityForceAC130 > 0>> and their AC130<</if>>.
- Free cities armies are a rare sight, but their power is undeniable and your $securityForceName is living testament of this.
- During the battle they suffered
+ <<print $securityForcePersonnel>> soldiers from the $securityForceName joined the battle:
<<if _loss <= 0>>
- no casualties.
+ no casualties
<<elseif _loss <= 10>>
- light casualties.
+ light casualties
<<elseif _loss <= 30>>
- moderate casualties.
+ moderate casualties
<<elseif _loss <= 60>>
- heavy casualties.
+ heavy casualties
<<else>>
- catastrophic casualties.
+ catastrophic casualties
<</if>>
+ suffered.
+ <br>
<</if>>
<<if $deployingMilitia == 1>>
<<for _j = 0; _j < $militiaUnits.length; _j++>>
<<if $militiaUnits[_j].isDeployed == 1>>
- <br>
<br>
<<set $militiaUnits[_j].battlesFought++>>
<<set _loss = _lossesList.pluck()>>
<<set _loss = Math.clamp(_loss,0,$militiaUnits[_j].troops)>>
- $militiaUnits[_j].platoonName participated in the battle, your proud citizens defending with their lives their arcology.
- During the battle they suffered
+ $militiaUnits[_j].platoonName:
<<if _loss <= 0>>
no casualties
- <<elseif _loss <= 10>>
+ <<elseif _loss <= $militiaUnits[_j].troops * 0.2>>
light casualties
- <<elseif _loss <= 30>>
+ <<elseif _loss <= $militiaUnits[_j].troops * 0.4>>
moderate casualties
- <<elseif _loss <= 60>>
+ <<elseif _loss <= $militiaUnits[_j].troops * 0.6>>
heavy casualties
<<else>>
catastrophic casualties
<</if>>
+ suffered.
<<set _med = Math.round(Math.clamp(_loss * $militiaUnits[_j].medics * 0.25,1,_loss))>>
<<if $militiaUnits[_j].medics == 1 && _loss > 0>>
- , however some men were saved by the medics attached to this unit.
- <<else>>
- .
+ Some men were saved by their medics.
<</if>>
<<set $militiaUnits[_j].troops -= Math.trunc(Math.clamp(_loss - _med,0,$militiaUnits[_j].maxTroops))>>
<<set $militiaEmployedManpower -= Math.trunc(_loss - _med)>>
<<set $militiaTotalCasualties += Math.trunc(_loss - _med)>>
<<if $militiaUnits[_j].training < 100>>
<<if random(1,100) > 60>>
- Fighting in the field increased the experience of the unit, making it more effective in future fights.
+ Experience has increased.
<<set $militiaUnits[_j].training += random(5,15) + $majorBattle * random(5,15)>>
<</if>>
<</if>>
@@ -172,36 +187,33 @@
<<if $deployingSlaves == 1>>
<<for _j = 0; _j < $slaveUnits.length; _j++>>
<<if $slaveUnits[_j].isDeployed == 1>>
- <br>
<br>
<<set $slaveUnits[_j].battlesFought++>>
<<set _loss = _lossesList.pluck()>>
<<set _loss = Math.clamp(_loss,0,$slaveUnits[_j].troops)>>
- $slaveUnits[_j].platoonName participated in the battle. While a rare sight, your slave soldiers show no less willingness to fight for their arcology than their free counterparts, be it because of fear or devotion to their owner.
- During the battle they suffered
+ $slaveUnits[_j].platoonName:
<<if _loss <= 0>>
no casualties
- <<elseif _loss <= 10>>
+ <<elseif _loss <= $slaveUnits[_j].troops * 0.2>>
light casualties
- <<elseif _loss <= 30>>
+ <<elseif _loss <= $slaveUnits[_j].troops * 0.4>>
moderate casualties
- <<elseif _loss <= 60>>
+ <<elseif _loss <= $slaveUnits[_j].troops * 0.6>>
heavy casualties
<<else>>
catastrophic casualties
<</if>>
+ suffered.
<<set _med = Math.round(Math.clamp(_loss * $slaveUnits[_j].medics * 0.25,1,_loss))>>
<<if $slaveUnits[_j].medics == 1 && _loss > 0>>
- , however some men were saved by the medics attached to this unit.
- <<else>>
- .
+ Some men were saved by their medics.
<</if>>
<<set $slaveUnits[_j].troops -= Math.trunc(Math.clamp(_loss - _med,0,$slaveUnits[_j].maxTroops))>>
<<set $slavesEmployedManpower -= Math.trunc(_loss - _med)>>
<<set $slavesTotalCasualties += Math.trunc(_loss - _med)>>
<<if $slaveUnits[_j].training < 100>>
<<if random(1,100) > 60>>
- Fighting in the field increased the experience of the unit, making it more effective in future fights.
+ Experience has increased.
<<set $slaveUnits[_j].training += random(5,15) + $majorBattle * random(5,15)>>
<</if>>
<</if>>
@@ -217,36 +229,33 @@
<<if $deployingMercs == 1>>
<<for _j = 0; _j < $mercUnits.length; _j++>>
<<if $mercUnits[_j].isDeployed == 1>>
- <br>
<br>
<<set $mercUnits[_j].battlesFought++>>
<<set _loss = _lossesList.pluck()>>
<<set _loss = Math.clamp(_loss,0,$mercUnits[_j].troops)>>
- $mercUnits[_j].platoonName participated in the battle. Mercenaries are a common sight on the modern battlefield and yours are proud to serve their generous contractor.
- During the battle they suffered
+ $mercUnits[_j].platoonName:
<<if _loss <= 0>>
no casualties
- <<elseif _loss <= 10>>
+ <<elseif _loss <= $mercUnits[_j].troops * 0.2>>
light casualties
- <<elseif _loss <= 30>>
+ <<elseif _loss <= $mercUnits[_j].troops * 0.4>>
moderate casualties
- <<elseif _loss <= 60>>
+ <<elseif _loss <= $mercUnits[_j].troops * 0.6>>
heavy casualties
<<else>>
catastrophic casualties
<</if>>
+ suffered.
<<set _med = Math.round(Math.clamp(_loss * $mercUnits[_j].medics * 0.25,1,_loss))>>
<<if $mercUnits[_j].medics == 1 && _loss > 0>>
- , however some men were saved by the medics attached to this unit.
- <<else>>
- .
+ Some men were saved by their medics.
<</if>>
<<set $mercUnits[_j].troops -= Math.trunc(Math.clamp(_loss - _med,0,$mercUnits[_j].maxTroops))>>
<<set $mercEmployedManpower -= Math.trunc(_loss - _med)>>
<<set $mercTotalCasualties += Math.trunc(_loss - _med)>>
<<if $mercUnits[_j].training < 100>>
<<if random(1,100) > 60>>
- Fighting in the field increased the experience of the unit, making it more effective in future fights.
+ Experience has increased.
<<set $mercUnits[_j].training += random(5,15) + $majorBattle * random(5,15)>>
<</if>>
<</if>>
diff --git a/src/SecExp/unitsRebellionReport.tw b/src/SecExp/unitsRebellionReport.tw
index 28ec5c82ca10d8ede5dc43812753c9ddfa2c8573..970d536de5c89a4d8fa2bb54bd5406545f533a4c 100644
--- a/src/SecExp/unitsRebellionReport.tw
+++ b/src/SecExp/unitsRebellionReport.tw
@@ -2,22 +2,15 @@
<<if $losses == 0>>
<<if $irregulars > 0>>
- The volunteering citizens were quickly organized into an irregular militia unit and deployed in the arcology. While without the discipline of your other instruments, they nonetheless provided precious extra firepower and standing strength.
- <br>During the battle they suffered no casualties.
- <br>
+ The volunteering citizens were quickly organized into an irregular militia unit and deployed in the arcology. No casualties suffered.
<</if>>
<<if $deployingBots == 1>>
<br>
- Your squadron of security drones participated in the battle, dominating the airspace and providing vital intelligence to the rest of the army.
- <br>During the battle they suffered no casualties.
- <br>
+ Security drones: no casualties suffered.
<</if>>
<<if $securityForceCreate == 1>>
<br>
- $securityForceName, <<print commaNum($securityForcePersonnel)>> strong, was called to join the battle aboard their<<if $securityForceVehiclePower >= 4>> armored<</if>> vehicles <<if $securityForceAC130 > 0>>and their AC130<</if>>.
- They brought their unmatched strength to crush those that would want you deposed.
- <br>During the battle they suffered no casualties.
- <br>
+ $securityForceName, <<print commaNum($securityForcePersonnel)>> strong, was called to join the battle: no casualties suffered.
<</if>>
<<set _count = 0>>
<<if $loyalID.length > 0>>
@@ -298,7 +291,9 @@
<<set _rand = random(_lossesList.length - 1)>>
<<set _lossesList[_rand] += $losses - _count>>
<<elseif _count > $losses>>
- <br>@@.red;Error: assigned losses higher than actual losses@@
+ <<set _diff = _count - $losses>>
+ <<set _rand = random(_lossesList.length - 1)>>
+ <<set _lossesList[_rand] = Math.trunc(_lossesList[_rand]-_diff,0,100)>>
<</if>>
/* assigns the losses and notify the player */
@@ -311,19 +306,19 @@
<<else>>
<<set $ACitizens = 100>>
<</if>>
- The volunteering citizens were quickly organized into an irregular militia unit and deployed in the arcology. While without the discipline of your other instruments, they nonetheless provided precious extra firepower and standing strength.
- <br>During the battle they suffered
+ The volunteering citizens were quickly organized into an irregular militia unit and deployed in the arcology:
<<if _loss <= 0>>
- no casualties.
+ no casualties
<<elseif _loss <= 10>>
- light casualties.
+ light casualties
<<elseif _loss <= 30>>
- moderate casualties.
+ moderate casualties
<<elseif _loss <= 60>>
- heavy casualties.
+ heavy casualties
<<else>>
- catastrophic casualties.
+ catastrophic casualties
<</if>>
+ suffered.
<</if>>
<<if $secBots.active == 1>>
<br>
@@ -331,19 +326,19 @@
<<set _loss = _lossesList.pluck()>>
<<set _loss = Math.clamp(_loss,0,$secBots.troops)>>
<<set $secBots.troops -= _loss>>
- Your squadron of security drones participated in the battle, dominating the airspace and providing vital intelligence to the rest of the army.
- <br>During the battle they suffered
+ Security drones:
<<if _loss <= 0>>
- no casualties.
+ no casualties
<<elseif _loss <= 10>>
- light casualties.
+ light casualties
<<elseif _loss <= 30>>
- moderate casualties.
+ moderate casualties
<<elseif _loss <= 60>>
- heavy casualties.
+ heavy casualties
<<else>>
- catastrophic casualties.
+ catastrophic casualties
<</if>>
+ suffered.
<<if $secBots.troops <= 0>>
<<set $secBots.active = 0>>
Unfortunately the losses they took were simply too great, their effective combatants are in so small number you can no longer call them a deployable unit. It will take quite the investment to rebuild them.
@@ -357,20 +352,19 @@
<<set _loss = _lossesList.pluck()>>
<<set _loss = Math.clamp(_loss,0,$securityForcePersonnel)>>
<<set $securityForcePersonnel -= _loss>>
- $securityForceName, $securityForcePersonnel strong, is called to join the battle aboard their<<if $securityForceVehiclePower >= 4>> armored<</if>> vehicles<<if $securityForceAC130 > 0>> and their AC130<</if>>.
- They brought their unmatched strength to crush those that would want you deposed.
- <br>During the battle they suffered
+ $securityForceName, $securityForcePersonnel strong, is called to join the battle:
<<if _loss <= 0>>
- no casualties.
+ no casualties
<<elseif _loss <= 10>>
- light casualties.
+ light casualties
<<elseif _loss <= 30>>
- moderate casualties.
+ moderate casualties
<<elseif _loss <= 60>>
- heavy casualties.
+ heavy casualties
<<else>>
- catastrophic casualties.
+ catastrophic casualties
<</if>>
+ suffered.
<</if>>
<<if $deployingMilitia == 1>>
<<for _j = 0; _j < $militiaUnits.length; _j++>>
@@ -380,31 +374,29 @@
<<set $militiaUnits[_j].battlesFought++>>
<<set _loss = _lossesList.pluck()>>
<<set _loss = Math.clamp(_loss,0,$militiaUnits[_j].troops)>>
- $militiaUnits[_j].platoonName participated in the battle. They remained loyal to you to the end.
- <br>During the battle they suffered
+ $militiaUnits[_j].platoonName participated in the battle. They remained loyal to you.
<<if _loss <= 0>>
- no casualties
- <<elseif _loss <= 10>>
- light casualties
- <<elseif _loss <= 30>>
- moderate casualties
- <<elseif _loss <= 60>>
- heavy casualties
+ No casualties
+ <<elseif _loss <= $militiaUnits[_j].troops * 0.2>>
+ Light casualties
+ <<elseif _loss <= $militiaUnits[_j].troops * 0.4>>
+ Moderate casualties
+ <<elseif _loss <= $militiaUnits[_j].troops * 0.6>>
+ Heavy casualties
<<else>>
- catastrophic casualties
+ Catastrophic casualties
<</if>>
+ suffered.
<<set _med = Math.round(Math.clamp(_loss * $militiaUnits[_j].medics * 0.25,1,_loss))>>
<<if $militiaUnits[_j].medics == 1 && _loss > 0>>
- , however some men were saved by the medics attached to this unit.
- <<else>>
- .
+ Some men were saved by their medics.
<</if>>
<<set $militiaUnits[_j].troops -= Math.trunc(Math.clamp(_loss - _med,0,$militiaUnits[_j].maxTroops))>>
<<set $militiaEmployedManpower -= Math.trunc(_loss - _med)>>
<<set $militiaTotalCasualties += Math.trunc(_loss - _med)>>
<<if $militiaUnits[_j].training < 100>>
<<if random(1,100) > 60>>
- Fighting in the field increased the experience of the unit, making it more effective in future fights.
+ Experience has increased.
<<set $militiaUnits[_j].training += random(5,15) + $majorBattle * random(5,15)>>
<</if>>
<</if>>
@@ -430,31 +422,29 @@
<<break>>
<</if>>
<<set _loss = Math.clamp(_loss,0,$slaveUnits[_j].troops)>>
- $slaveUnits[_j].platoonName participated in the battle. They remained loyal to you to the end.
- <br>During the battle they suffered
+ $slaveUnits[_j].platoonName participated in the battle. They remained loyal to you.
<<if _loss <= 0>>
- no casualties
- <<elseif _loss <= 10>>
- light casualties
- <<elseif _loss <= 30>>
- moderate casualties
- <<elseif _loss <= 60>>
- heavy casualties
+ No casualties
+ <<elseif _loss <= $slaveUnits[_j].troops * 0.2>>
+ Light casualties
+ <<elseif _loss <= $slaveUnits[_j].troops * 0.4>>
+ Moderate casualties
+ <<elseif _loss <= $slaveUnits[_j].troops * 0.6>>
+ Heavy casualties
<<else>>
- catastrophic casualties
+ Catastrophic casualties
<</if>>
+ suffered.
<<set _med = Math.round(Math.clamp(_loss * $slaveUnits[_j].medics * 0.25,1,_loss))>>
<<if $slaveUnits[_j].medics == 1 && _loss > 0>>
- , however some men were saved by the medics attached to this unit.
- <<else>>
- .
+ Some men were saved by their medics.
<</if>>
<<set $slaveUnits[_j].troops -= Math.trunc(Math.clamp(_loss - _med,0,$slaveUnits[_j].maxTroops))>>
<<set $slavesEmployedManpower -= _loss - _med>>
<<set $slavesTotalCasualties += _loss - _med>>
<<if $slaveUnits[_j].training < 100>>
<<if random(1,100) > 60>>
- Fighting in the field increased the experience of the unit, making it more effective in future fights.
+ Experience gained.
<<set $slaveUnits[_j].training += random(5,15) + $majorBattle * random(5,15)>>
<</if>>
<</if>>
@@ -475,31 +465,29 @@
<<set $mercUnits[_j].battlesFought++>>
<<set _loss = _lossesList.pluck()>>
<<set _loss = Math.clamp(_loss,0,$mercUnits[_j].troops)>>
- $mercUnits[_j].platoonName participated in the battle. Mercenaries are a common sight on the modern battlefield and yours are proud to serve their generous contractor.
- <br>During the battle they suffered
+ $mercUnits[_j].platoonName participated in the battle. They remained loyal to you.
<<if _loss <= 0>>
- no casualties
- <<elseif _loss <= 10>>
- light casualties
- <<elseif _loss <= 30>>
- moderate casualties
- <<elseif _loss <= 60>>
- heavy casualties
+ No casualties
+ <<elseif _loss <= $mercUnits[_j].troops * 0.2>>
+ Light casualties
+ <<elseif _loss <= $mercUnits[_j].troops * 0.4>>
+ Moderate casualties
+ <<elseif _loss <= $mercUnits[_j].troops * 0.6>>
+ Heavy casualties
<<else>>
- catastrophic casualties
+ Catastrophic casualties
<</if>>
+ suffered.
<<set _med = Math.round(Math.clamp(_loss * $mercUnits[_j].medics * 0.25,1,_loss))>>
<<if $mercUnits[_j].medics == 1 && _loss > 0>>
- , however some men were saved by the medics attached to this unit.
- <<else>>
- .
+ Some men were saved by their medics.p
<</if>>
<<set $mercUnits[_j].troops -= Math.trunc(Math.clamp(_loss - _med,0,$mercUnits[_j].maxTroops))>>
<<set $mercEmployedManpower -= Math.trunc(_loss - _med)>>
<<set $mercTotalCasualties += Math.trunc(_loss - _med)>>
<<if $mercUnits[_j].training < 100>>
<<if random(1,100) > 60>>
- Fighting in the field increased the experience of the unit, making it more effective in future fights.
+ Experience gained.
<<set $mercUnits[_j].training += random(5,15) + $majorBattle * random(5,15)>>
<</if>>
<</if>>
@@ -512,6 +500,8 @@
<</if>>
<</for>>
<</if>>
+ <br>
+ <br>
<<if $rebellingID.length > 0 && $battleResult >= 2>>
/* win */
/* militia */
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index aa7bc8501a4127706c89f052a22cb47c7e7e50e5..68f40d6b799a4ecf44a80ba890cb5277d98da3ca 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -686,7 +686,7 @@ __''Player Character''__
<<if $PC.boobs > 0>>
Your breasts are ''$PCCreationBoobSize''
- and ''$PCCreationBreast''.
+ and ''<<print $PCCreationBreast>>''.
<<if $PC.boobsBonus == 0>>
[[Go bigger|Intro Summary][$PC.boobsBonus = 2, $PC.boobsImplant = 0]] | [[Get implants|Intro Summary][$PC.boobsBonus = 2, $PC.boobsImplant = 1]] | [[Go smaller|Intro Summary][$PC.boobsBonus = -1, $PC.boobsImplant = 0]]
<<elseif $PC.boobsBonus == 2>>
diff --git a/src/pregmod/SecForceEX/SpecialForceBarracksCheatEdit.tw b/src/pregmod/SecForceEX/SpecialForceBarracksCheatEdit.tw
new file mode 100644
index 0000000000000000000000000000000000000000..9b6c4d21087dbcaf0546a87c5131a070aceaf1f2
--- /dev/null
+++ b/src/pregmod/SecForceEX/SpecialForceBarracksCheatEdit.tw
@@ -0,0 +1,77 @@
+:: SpecialForceBarracksCheatEdit
+
+<<set $nextButton = "Back to SF Barracks", $nextLink = "SFM Barracks", $returnTo = "SFM Barracks">>
+<<include "SpecialForceUpgradeTree">>
+__Values__
+Upgrades: $SFAO/_max
+
+''Barracks:'' <<textbox "$securityForceArcologyUpgrades" $securityForceArcologyUpgrades "SFMSpecialForceBarracksCheatEditBarracks">>
+<br>Max: _BarracksMax
+
+''FacilitySupport:'' <<textbox "$FacilitySupport" $FacilitySupport "SFMSpecialForceBarracksCheatEditBarracks">>
+
+''Armory:'' <<textbox "$securityForceInfantryPower" $securityForceInfantryPower "SFMSpecialForceBarracksCheatEditBarracks">>
+<br>Max: _ArmouryMax
+
+''Stimulant Lab:'' <<textbox "$securityForceStimulantPower" $securityForceStimulantPower "SFMSpecialForceBarracksCheatEditBarracks">>
+<br>Max: _StimulantLabMax
+
+<<if _Garage > 0 && $securityForceArcologyUpgrades >= 1>>
+ ''Garage:''
+ ''LightAndMedium:'' <<textbox "$securityForceVehiclePower" $securityForceVehiclePower "SFMSpecialForceBarracksCheatEditBarracks">>
+ <br>Max: _LightAndMediumVehiclesMax
+
+ ''HeavyBattleTank:'' <<textbox "$securityForceHeavyBattleTank" $securityForceHeavyBattleTank "SFMSpecialForceBarracksCheatEditBarracks">>
+ <br>Max: _HeavyBattleTankMax
+<</if>>
+
+<<if $securityForceArcologyUpgrades >= 4>>
+ ''Hangar:''
+ ''Aircraft:'' <<textbox "$securityForceAircraftPower" $securityForceAircraftPower "SFMSpecialForceBarracksCheatEditBarracks">>
+ <br>Max: _AircraftMax
+
+ 'Space Plane'': <<textbox "$securityForceSpacePlanePower" $securityForceSpacePlanePower "SFMSpecialForceBarracksCheatEditBarracks">>
+ <br>Max: _SpacePlaneMax
+
+ ''Fortress Zeppelin:'' <<textbox "$securityForceFortressZeppelin" $securityForceFortressZeppelin "SFMSpecialForceBarracksCheatEditBarracks">>
+ <br>Max: _FortressZeppelinMax
+
+ ''AC130:'' <<textbox "$securityForceAC130" $securityForceAC130 "SFMSpecialForceBarracksCheatEditBarracks">>
+ <br>Max: _AC130Max
+
+ ''Heavy Transport:'' <<textbox "$securityForceHeavyTransport" $securityForceHeavyTransport "SFMSpecialForceBarracksCheatEditBarracks">>
+ <br>Max: _heavyTransportMax
+<</if>>
+
+ ''DroneBay:'' <<textbox "$securityForceDronePower" $securityForceDronePower "SFMSpecialForceBarracksCheatEditBarracks">>
+ <br>Max: _DroneBayMax
+
+<<if (_LaunchBayNO > 0 || _LaunchBayO > 0) && $securityForceArcologyUpgrades >= 4>>
+ ''LauchBay:''
+ <<if $terrain != "oceanic" && $terrain != "marine">>
+ ''Satellite:'' <<textbox "$securityForceSatellitePower" $securityForceSatellitePower "SFMSpecialForceBarracksCheatEditBarracks">>
+ <br>Max: _SatelliteMax
+
+ ''GiantRobot:'' <<textbox "$securityForceGiantRobot" $securityForceGiantRobot "SFMSpecialForceBarracksCheatEditBarracks">>
+ <br>Max: _GiantRobotMax
+
+ ''MissileSilo:'' <<textbox "$securityForceMissileSilo" $securityForceMissileSilo "SFMSpecialForceBarracksCheatEditBarracks">>
+ <br>Max: _MissileSiloMax
+ <<elseif == "oceanic" || $terrain == "marine">>
+ ''Satellite:'' <<textbox "$securityForceSatellitePower" $securityForceSatellitePower "SFMSpecialForceBarracksCheatEditBarracks">>
+ <br>Max: _SatelliteMax
+ <</if>>
+<</if>>
+
+<<if $terrain == "oceanic" || $terrain == "marine">>
+ ''Naval Yard:''
+
+ ''AircraftCarrier:'' <<textbox "$securityForceAircraftCarrier" $securityForceAircraftCarrier "SFMSpecialForceBarracksCheatEditBarracks">>
+ <br>Max: _AircraftCarrierMax
+
+ ''Submarine:'' <<textbox "$securityForceSubmarine" $securityForceSubmarine "SFMSpecialForceBarracksCheatEditBarracks">>
+ <br>Max: _SubmarineMax
+
+ ''Amphibious Transport:'' <<textbox "$securityForceHeavyAmphibiousTransport" $securityForceHeavyAmphibiousTransport "SFMSpecialForceBarracksCheatEditBarracks">>
+ <br>Max: _HeavyAmphibiousTransportMax
+<</if>>
\ No newline at end of file
diff --git a/src/pregmod/breederProposal.tw b/src/pregmod/breederProposal.tw
index 8886e3ff98b50636c1ae7f4572364fd1d21d138a..942b5921efb757a4c62f5d870e47854297900e42 100644
--- a/src/pregmod/breederProposal.tw
+++ b/src/pregmod/breederProposal.tw
@@ -4,9 +4,14 @@
You draft a proposal to the Societal Elite proposing the use of specially tested slaves as breeding stock. If they can pass the tests required to join the societal elite; even as slaves, their bodies can prove valuable to furthering eugenics. They will gain no additional rights, but their wombs will be used to birth elite children; helping stave off potential threats of inbreeding and adding possible missed beneficial traits into the Elite's gene pool.
<br><br>
-Within the hour, you are called before The Societal Elite.
+Within the hour, you are called before <<if $eugenicsFullControl == 1>>what's left of <</if>>The Societal Elite.
<br>
-<<if $PC.pregSource == -1>>
+<<if $eugenicsFullControl == 1>>
+ "That sounds like an acceptable proposal. We'll draft the standards for breeding stock and notify you shortly."
+ <<set $propOutcome = 1>>
+ <<InitStandards>>
+ <<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+<<elseif $PC.pregSource == -1>>
"Since you are doing your part and carrying an elite child, we will gladly reward you by granting your proposal. We shall decide upon the standards for breeding stock and notify you shortly."
<<set $propOutcome = 1>>
<<InitStandards>>
diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index f9db56696462fd8d54deb8d3d1febf216595345e..bcf672ed685dbfb7a38b58d30784d565610613fd 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -639,7 +639,7 @@ __Drugs__
You are not on any stamina enhancers. [[More stamina means more sex|Manage Personal Affairs][$PC.staminaPills = 1]]
<</if>>
-<<if $propOutcome == 1>>
+<<if $propOutcome == 1 && $arcologies[0].FSRestart != "unset">>
<br><br>
__Elite Breeder Qualifications__
<<if ndef $activeStandard>>
diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw
index eae12875cac1f5b40f54f8a29f13838212b387e5..62ce3a01555ef92a5c014384bfa69e7074304988 100644
--- a/src/uncategorized/SFMBarracks.tw
+++ b/src/uncategorized/SFMBarracks.tw
@@ -1,8 +1,6 @@
:: SFM Barracks [nobr]
-<<set _N1 = 2>>
-<<set _N2 = 2>>
-<<set _N3 = 2>>
+<<set _N1 = 2, _N2 = 2, _N3 = 2>>
<<set _Name = "<<if $CurrentTradeShowAttendance == 1 && $LieutenantColonel == 2>>Lieutenant Colonel <<SlaveFullName $LieutenantColonel>> <<elseif $CurrentTradeShowAttendance == 1 && $LieutenantColonel != 2>> a soldier <<elseif $CurrentTradeShowAttendance == 0>> The Colonel<</if>>">>
<<if $economy == .5>>
@@ -33,6 +31,13 @@
<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Barracks">>
+<<if $cheatMode == 1>>
+ <<link "Cheat edit vars">>
+ <<goto "SpecialForceBarracksCheatEdit">>
+ <</link>>
+ <br>
+<</if>>
+
//The barracks of <<textbox "$securityForceName" $securityForceName "SFM Barracks">> is located in the lower levels of $arcologies[0].name, occupying unneeded warehouse space. It is not accessible to the general citizenry, but your personal elevator has express service to it. As you step off, two soldiers in combat armour manning the entry checkpoint tense and raise their weapons, before nodding respectfully and stepping aside, allowing their patron entry. The barracks is cavernous, containing areas for the soldiers to sleep and keep their belongings, areas for the storage and maintenance of their weapons and equipment, and common areas for them to amuse themselves, since they rarely mix with your citizens on the upper levels. You survey the facilities.//
<br><br>
@@ -99,6 +104,9 @@
<br>
<</replace>>
<</link>>
+ <<if $arcologies[0].prosperity + $GoodWords2 > $AProsperityCap>>
+ <<set $arcologies[0].prosperity = $AProsperityCap>>
+ <</if>>
<</if>>
</span>
<</if>>
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index ffe8c539e16d2068fd9d800ac3f24cc0b639e17b..461d823fd74be0faa100d76bdd541c7c5a1f67fe 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -572,7 +572,7 @@
<<if ($arcologies[0].FSRepopulationFocus != "unset") && ($arcologies[0].FSRepopulationFocus >= 80)>>
Most customers prefer girls with big bellies.
<<set _pref = 1>>
- <<elseif ($arcologies[0].FSRestart != "unset") && ($arcologies[0].FSRestart >= 80) >>
+ <<elseif ($arcologies[0].FSRestart != "unset") && ($arcologies[0].FSRestart >= 80)>>
Most customers prefer girls with flat bellies.
<<set _pref = -1>>
<<else>>
@@ -705,10 +705,10 @@
<<set _ads = 0>>
<</if>>
<</if>>
- <<if ($arcologies[0].FSTransformationFetishist != "unset") && ($arcologies[0].FSDegradationist >= 80)>>
+ <<if ($arcologies[0].FSTransformationFetishist != "unset") && ($arcologies[0].FSTransformationFetishist >= 80)>>
Most customers prefer heavily implanted and surgically enhanced girls.
<<set _pref = 1>>
- <<elseif ($arcologies[0].FSBodyPurist != "unset") && ($arcologies[0].FSBodyPurist >= 80) >>
+ <<elseif ($arcologies[0].FSBodyPurist != "unset") && ($arcologies[0].FSBodyPurist >= 80)>>
Most customers prefer all-natural girls.
<<set _pref = -1>>
<<else>>
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index 59374fcdf2c9ffbee364b5fdc20c052587def5a5..2e2801935ea9bc512f9b0671a050a524bce87c26 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -456,7 +456,7 @@
<<set _ads = 0>>
<</if>>
<</if>>
- <<if ($arcologies[0].FSTransformationFetishist != "unset") && ($arcologies[0].FSDegradationist >= 80)>>
+ <<if ($arcologies[0].FSTransformationFetishist != "unset") && ($arcologies[0].FSTransformationFetishist >= 80)>>
Most customers prefer heavily implanted and surgically enhanced girls.
<<set _pref = 1>>
<<elseif ($arcologies[0].FSBodyPurist != "unset") && ($arcologies[0].FSBodyPurist >= 80) >>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 55f0eb51e9f5b7d40f56711c6f0a9210fe023f74..7f9f441717373b7294330783e8f93f9b83614ec9 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -58,7 +58,7 @@ $possessiveCap $activeSlave.faceShape face is
<<elseif $activeSlave.faceImplant > 95>>
//$possessiveCap's face cannot sustain further cosmetic surgery//
<<else>>
- <<set _artificiality = 25-5*Math.trunc($PC.medicine/100)-5*$surgeryUpgrade>>
+ <<set _artificiality = 25-5*Math.trunc($PC.medicine/50)-5*$surgeryUpgrade>>
//Facial surgery can either rework it and improve its attractiveness, or simply make it more attractive. No facial surgery is perfect and each surgery will make it look less natural.
<<if $PC.medicine >= 100 && $surgeryUpgrade>>
Your surgical skills and the advanced surgical suite will minimize this effect as much as possible.
diff --git a/src/uncategorized/rulesAssistant.tw b/src/uncategorized/rulesAssistant.tw
index d18eb219516f8ecc3466d44df29a9504abfa0965..66370cc658b95b85a41a885b91984cea526ab92e 100644
--- a/src/uncategorized/rulesAssistant.tw
+++ b/src/uncategorized/rulesAssistant.tw
@@ -579,15 +579,6 @@ Clothes:
<</link>>
|
<</if>>
-<<if ($arcologies[0].FSDegradationist != "unset") || ($cheatMode == 1) || ($clothesBoughtChains == 1)>>
- //FS//
- <<link "Chains">>
- <<set $currentRule.clothes = "chains">>
- <<RAChangeClothes>>
- <<RARuleModified>>
- <</link>>
- |
-<</if>>
<<if ($arcologies[0].FSChattelReligionist != "unset") || ($cheatMode == 1) || ($clothesBoughtHabit == 1)>>
//FS//
<<link "Chattel habit">>
@@ -694,6 +685,15 @@ Clothes:
<<RAChangeClothes>>
<<RARuleModified>>
<</link>>
+<<if ($arcologies[0].FSDegradationist != "unset") || ($cheatMode == 1) || ($clothesBoughtChains == 1)>>
+ | //FS//
+ <<link "Chains">>
+ <<set $currentRule.clothes = "chains">>
+ <<RAChangeClothes>>
+ <<RARuleModified>>
+ <</link>>
+ |
+<</if>>
|
<<link "Penitent nun">>
<<set $currentRule.clothes = "a penitent nuns habit">>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 1d3c29492ded803cf591a105f13b1890123c28c2..4787c5515307c549263418cc41425aff719c38cf 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -319,7 +319,7 @@
<<if $slaves[$i].fetishKnown == 1>>
She's such a butthole slut that she manages to get off just fine despite her dick being kept untouchable and soft behind a chastity cage.
<<else>>
- She seems to getting off just fine without access to her dick.
+ She seems to be getting off just fine without access to her dick.
<</if>>
<<elseif ($slaves[$i].energy > 95)>>
Her sex drive is so overcharged that she manages to orgasm often despite the chastity cage that <<if ($slaves[$i].balls == 0)>>prevents her or anyone else from touching her soft cock<<else>>keeps her dick soft and untouched<</if>>; it's almost always dripping a stream of precum.
@@ -2358,7 +2358,7 @@
even if she can't understand why.
<<case "a breeder">>
<<if $slaves[$i].pregKnown == 1 && $arcologies[0].FSRepopulation != "unset">>
- Her life used to revolve around being pregnant all the time and nothing has changed. However, being surrounded with happy, heavily pregnant women leaves her @@.hotpink;slightly more accepting@@ of her fate and @@.mediumaquamarine;hopeful@@ that her trained body will be useful to you.
+ Her life used to revolve around being pregnant all the time and nothing has changed. However, being surrounded with happy, heavily pregnant women leaves her @@.hotpink;slightly more accepting@@ of her fate and @@.mediumaquamarine;hopeful@@ that her trained body will be useful to you.
<<set $slaves[$i].trust += 1, $slaves[$i].devotion += 1>>
<<elseif $slaves[$i].pregControl == "speed up">>
Her life used to revolve around being pregnant all the time and nothing has changed. She @@.gold;watches in horror@@ as her middle visibly swells before her eyes. She @@.hotpink;slips more into submission@@ as the pressure in her womb increases.
@@ -2375,26 +2375,26 @@
<<set $slaves[$i].trust += 1, $slaves[$i].devotion += 1>>
<<case "a Futanari Sister">>
<<if $masterSuiteUpgradeLuxury == 2>>
- <<if $slaves[$i].assignment == "serve in the master suite">>
- She knows that $masterSuiteName features a fuckpit much like the one she spent years enjoying as a Futanari Sister, and @@.hotpink;does her best@@ to be a good girl in the hope you'll send her there someday.
- <<set $slaves[$i].devotion += 1>>
- <<else>>
- As a former Futanari Sister, the fuckpit in $masterSuiteName feels like home to her, and she has @@.mediumaquamarine;no desire to ever leave.@@
- <<set $slaves[$i].trust += 1>>
- <</if>>
+ <<if $slaves[$i].assignment == "serve in the master suite">>
+ As a former Futanari Sister, the fuckpit in $masterSuiteName feels like home to her, and she has @@.mediumaquamarine;no desire to ever leave.@@
+ <<set $slaves[$i].trust += 1>>
+ <<else>>
+ She knows that $masterSuiteName features a fuckpit much like the one she spent years enjoying as a Futanari Sister, and @@.hotpink;does her best@@ to be a good girl in the hope you'll send her there someday.
+ <<set $slaves[$i].devotion += 1>>
+ <</if>>
<</if>>
<<default>>
<<if $slaves[$i].trust >= -50>>
<<if setup.gratefulCareers.includes($slaves[$i].career)>>
- <<set $slaves[$i].trust += 1>>
- She remembers how hard her life was before she was a slave, and
- <<if $slaves[$i].trust > 50>>
- @@.mediumaquamarine;trusts you a bit more@@ for improving it.
- <<elseif $slaves[$i].trust > -20>>
- @@.mediumaquamarine;trusts you a bit more@@ because of it.
- <<else>>
- @@.mediumaquamarine;fears you a little less@@ because of it.
- <</if>>
+ <<set $slaves[$i].trust += 1>>
+ She remembers how hard her life was before she was a slave, and
+ <<if $slaves[$i].trust > 50>>
+ @@.mediumaquamarine;trusts you a bit more@@ for improving it.
+ <<elseif $slaves[$i].trust > -20>>
+ @@.mediumaquamarine;trusts you a bit more@@ because of it.
+ <<else>>
+ @@.mediumaquamarine;fears you a little less@@ because of it.
+ <</if>>
<</if>>
<</if>>
<<if $slaves[$i].devotion >= -50>>
@@ -4932,7 +4932,7 @@
<</if>>
<<if $arcologies[0].FSSubjugationist != "unset">>
- <<if ($slaves[$i].race is $arcologies[0].FSSubjugationistRace)>>
+ <<if ($slaves[$i].race == $arcologies[0].FSSubjugationistRace)>>
<<if $arcologies[0].FSSubjugationist >= $FSLockinLevel*0.5>>
Society @@.green;approves@@ of your keeping a slave of the subject $arcologies[0].FSSubjugationistRace race; this also advances $arcologies[0].FSSubjugationistRace inferiority.
<<else>>
@@ -4940,28 +4940,22 @@
<</if>>
<<FSChangePorn "Subjugationist" 1>>
<<if $slaves[$i].ovaries == 0>>
- <<if $slaves[$i].balls == 0 || $slaves[$i].vasectomy == 1>>
- Society @@.green;approves@@ of $slaves[$i].slaveName's <<if $slaves[$i].vasectomy == 1 && $slaves[$i].balls > 0>>vasectomy<<elseif $slaves[$i].dick > 0>>gelding<<else>>sterilization<</if>>, which ensures that $pronoun will not propagate the $arcologies[0].FSSubjugationistRace race.
- <<FSChangePorn "Subjugationist" 1>>
- <</if>>
+ <<if $slaves[$i].balls == 0 || $slaves[$i].vasectomy == 1>>
+ Society @@.green;approves@@ of $slaves[$i].slaveName's <<if $slaves[$i].vasectomy == 1 && $slaves[$i].balls > 0>>vasectomy<<elseif $slaves[$i].dick > 0>>gelding<<else>>sterilization<</if>>, which ensures that $pronoun will not propagate the $arcologies[0].FSSubjugationistRace race.
+ <<FSChangePorn "Subjugationist" 1>>
+ <</if>>
<</if>>
<<if $slaves[$i].fuckdoll > 0>>
Society @@.green;approves@@ of your keeping a Fuckdoll of the $arcologies[0].FSSubjugationistRace race.
<<FSChangePorn "Subjugationist" 1>>
<</if>>
<<else>>
- <<if $slaves[$i].pregKnown == 1>>
- <<if $slaves[$i].pregSource > 0>>
- <<for $j = 0; $j < $slaves.length; $j++>>
- <<if $slaves[$i].pregSource == $slaves[$j].ID>>
- <<if $slaves[$j].race is $arcologies[0].FSSubjugationistRace>>
- Society @@.red;strongly disapproves@@ of your allowing $slaves[$j].slaveName to be miscegenated by a $arcologies[0].FSSubjugationistRace subhuman like $slaves[$i].slaveName.
- <<FSChangePorn "Subjugationist" -2>>
- <</if>>
- <<break>>
+ <<if $slaves[$i].pregKnown == 1 && $slaves[$i].pregSource > 0>>
+ <<set _lte = $slaves.findIndex(function(s) { return $slaves[$i].pregSource == s.ID; })>>
+ <<if $slaves[_lte].race == $arcologies[0].FSSubjugationistRace>>
+ Society @@.red;strongly disapproves@@ of your allowing $slaves[$i].slaveName to be miscegenated by a $arcologies[0].FSSubjugationistRace subhuman like $slaves[_lte].slaveName.
+ <<FSChangePorn "Subjugationist" -2>>
<</if>>
- <</for>>
- <</if>>
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 884cc64382d2defd02733e3de3ca28db43bc27b5..02a21169c42ff8335f7805df3d2ab2dc4cceb407 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -649,9 +649,6 @@
<<if isItemAccessible("body oil")>>
| //FS// <<link "Body oil">><<set $activeSlave.clothes = "body oil",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
<</if>>
- <<if isItemAccessible("chains")>>
- | //FS// <<link "Chains">><<set $activeSlave.clothes = "chains",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
- <</if>>
<<if isItemAccessible("a chattel habit")>>
| //FS// <<link "Chattel habit">><<set $activeSlave.clothes = "a chattel habit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
<</if>>
@@ -685,6 +682,9 @@
<br> //Harsh://
<<link "Go naked">><<set $activeSlave.clothes = "no clothing", $activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+ <<if isItemAccessible("chains")>>
+ | //FS// <<link "Chains">><<set $activeSlave.clothes = "chains",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+ <</if>>
| <<link "Penitent nun">><<set $activeSlave.clothes = "a penitent nuns habit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
| <<link "Restrictive latex">><<set $activeSlave.clothes = "restrictive latex",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
| <<link "Shibari ropes">><<set $activeSlave.clothes = "shibari ropes",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
@@ -1144,7 +1144,7 @@ __Contraception__: <span id="fertility"><strong><<if $activeSlave.preg == -1>><<
<</if>>
<</if>>
-<<if $propOutcome == 1>>
+<<if $propOutcome == 1 && $arcologies[0].FSRestart != "unset">>
<<if $activeSlave.breedingMark == 0 && $activeSlave.fuckdoll == 0 && $activeSlave.eggType == "human" && isFertile($activeSlave)>>
<br>
[[Breeder Eligibility Exam|BreedingTest]]
diff --git a/src/uncategorized/wardrobeUse.tw b/src/uncategorized/wardrobeUse.tw
index 4ba047e083e5adcc80392e0b03d033af38512ec0..21166aaaa22572c014a5047deba70be5ef947834 100644
--- a/src/uncategorized/wardrobeUse.tw
+++ b/src/uncategorized/wardrobeUse.tw
@@ -196,13 +196,6 @@ Clothes: ''<span id="clothes">$activeSlave.clothes</span>.''
<<replace "#clothingDescription">><br>//<<ClothingDescription>>//<</replace>>
<</link>>
<</if>>
-<<if isItemAccessible("chains")>>
- | //FS// <<link "Chains">>
- <<set $activeSlave.clothes = "chains",$activeSlave.choosesOwnClothes = 0>>
- <<replace "#clothes">>$activeSlave.clothes<</replace>>
- <<replace "#clothingDescription">><br>//<<ClothingDescription>>//<</replace>>
- <</link>>
-<</if>>
<<if isItemAccessible("a chattel habit")>>
| //FS// <<link "Chattel habit">>
<<set $activeSlave.clothes = "a chattel habit",$activeSlave.choosesOwnClothes = 0>>
@@ -280,6 +273,13 @@ Clothes: ''<span id="clothes">$activeSlave.clothes</span>.''
<<replace "#clothes">>$activeSlave.clothes<</replace>>
<<replace "#clothingDescription">><br>//<<ClothingDescription>>//<</replace>>
<</link>>
+<<if isItemAccessible("chains")>>
+ | //FS// <<link "Chains">>
+ <<set $activeSlave.clothes = "chains",$activeSlave.choosesOwnClothes = 0>>
+ <<replace "#clothes">>$activeSlave.clothes<</replace>>
+ <<replace "#clothingDescription">><br>//<<ClothingDescription>>//<</replace>>
+ <</link>>
+<</if>>
| <<link "Penitent nun">>
<<set $activeSlave.clothes = "a penitent nuns habit",$activeSlave.choosesOwnClothes = 0>>
<<replace "#clothes">>$activeSlave.clothes<</replace>>