diff --git a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
index c710359c8744ca53ade8bef27476b5826f3abacc..6acf59fbd89e6871f84ca36816aa6ae080e2230d 100644
--- a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
+++ b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
@@ -66,7 +66,7 @@
<<set $tempSlave.vaginaLube = Number($tempSlave.vaginaLube) || 0>>
<<set $tempSlave.pubertyAgeXX = Number($tempSlave.pubertyAgeXX) || 13>>
<<set WombNormalizePreg($tempSlave)>>
-<<set $tempSlave.pregWeek = Number($tempSlave.pregWeek) || $tempSlave.preg>>
+<<set $tempSlave.pregWeek = Number($tempSlave.pregWeek) || Math.max($tempSlave.preg, 0)>>
<<if $tempSlave.preg <= 0>>
<<set $tempSlave.pregKnown = 0>>
<<elseif $tempSlave.preg > 0>>
@@ -113,7 +113,10 @@
<<set $tempSlave.indentureRestrictions = 2>>
<<print "Indenture Restrictions was bigger than 2 reset to Full Restrictions">><br>
<</if>>
-<<if $tempSlave.weekAcquired < 0>><<set $tempSlave.weekAcquired = 0>><<print "Week Acquired was negativ reset to 0">><br><</if>>
+<<if $tempSlave.weekAcquired < 0>>
+ <<set $tempSlave.weekAcquired = 0>>
+ <<print "Week Acquired was negative reset to 0">><br>
+<</if>>
<<if ($tempSlave.relationshipTarget == $tempSlave.ID) && ($tempSlave.relationship > 0)>>
<<set $tempSlave.relationshipTarget = 0>>
<<set $tempSlave.relationship = -1>>
@@ -167,10 +170,10 @@
<<set $tempSlave.lips = 100>>
<</if>>
<<if ($tempSlave.voice == 0) && ($tempSlave.voiceImplant == 1)>>
- <<print "Slave is mute Voice Surgery resetted" >><br>
+ <<print "Slave is mute Voice Surgery reset" >><br>
<<set $tempSlave.voiceImplant = 0>>
<</if>>
-<<if $tempSlave.amp <-5>>
+<<if $tempSlave.amp < -5>>
<<print "Amputation Value too low, reset to -5 (Cybernetic limbs)">><br>
<<set $tempSlave.amp = -5>>
<<elseif $tempSlave.amp > 1>>
@@ -181,10 +184,22 @@
<<print "Slave has Normal Limbs, Limb Interface reset to 0 (No Interface)">><br>
<<set $tempSlave.PLimb = 0>>
<</if>>
+<<if ($tempSlave.PLimb == 0) && ($tempSlave.amp < 0)>>
+ <<print "Slave has no Prosthetic limb Interface, limbs reset to 1 (Amputated)">>
+ <<set _tempLimbs = {type: 0, armsTat: 0, legsTat: 0}>>
+ <<set _tempLimbs.type = $tempSlave.amp, _tempLimbs.armsTat = $tempSlave.armsTat, _tempLimbs.legsTat = $tempSlave.legsTat>>
+ <<if !Array.isArray($tempSlave.readyLimbs)>>
+ <<set $tempSlave.readyLimbs = []>>
+ <</if>>
+ <<set $tempSlave.readyLimbs.push(_tempLimbs)>>
+ <<set $tempSlave.amp = 1>>
+<</if>>
<<if ($tempSlave.amp != 0)>>
<<set $tempSlave.heightImplant = 0>>
- <<set $tempSlave.legsTat = 0>>
- <<set $tempSlave.armsTat = 0>>
+ <<if $tempSlave.amp == 1>>
+ <<set $tempSlave.legsTat = 0>>
+ <<set $tempSlave.armsTat = 0>>
+ <</if>>
<<set $tempSlave.nails = 0>>
<<set $tempSlave.heels = 0>>
<<if $tempSlave.brand != 0>>
@@ -207,10 +222,6 @@
<</if>>
<</if>>
<</if>>
-<<if ($tempSlave.PLimb == 0) && ($tempSlave.amp != 0)>>
- <<print "Slave has no Prostetic limb Interface, limbs reset to 1 (Amputated)">>
- <<set $tempSlave.amp = 1>>
-<</if>>
<<if $tempSlave.fuckdoll < 0>>
<<print "Fuckdoll Value too low, reset to 0 (Not a Fuckdoll)">><br>
<<set $tempSlave.fuckdoll = 0>>
@@ -308,8 +319,9 @@
<<set $tempSlave.preg = 0>>
<<set $tempSlave.pregType = 0>>
<<set $tempSlave.pregSource = 0>>
+ <<set $tempSlave.pregWeek = 0>>
<</if>>
-<<if ($tempSlave.pubertyXX == 0) && ($tempSlave.physicalAge >= $tempSlave.pubertyAgeXX)>>
+<<if ($tempSlave.pubertyXX != 1) && ($tempSlave.physicalAge >= $tempSlave.pubertyAgeXX)>>
<<print "Slaves physical Age is equal or higher than female Puberty Age, Puberty set to 1 (Post Puberty)" >><br>
<<set $tempSlave.pubertyXX = 1>>
<</if>>
@@ -322,6 +334,7 @@
<<set $tempSlave.preg = 0>>
<<set $tempSlave.pregType = 0>>
<<set $tempSlave.pregSource = 0>>
+ <<set $tempSlave.pregWeek = 0>>
<</if>>
<<if $tempSlave.balls < 0>>
<<print "Slave Balls Value set too low, reset to 0 (No Balls)">><br>
@@ -344,7 +357,7 @@
<<elseif (ndef $tempSlave.pubertyXY) && ($tempSlave.physicalAge < $tempSlave.pubertyAgeXY)>>
<<set $tempSlave.pubertyXY = 0>>
<</if>>
-<<if ($tempSlave.physicalAge >= $tempSlave.pubertyAgeXY) && ($tempSlave.pubertyXY == 0)>>
+<<if ($tempSlave.physicalAge >= $tempSlave.pubertyAgeXY) && ($tempSlave.pubertyXY != 1)>>
<<print "Slaves physical Age is equal or higher than male Puberty Age, Puberty set to 1 (Post Puberty)" >><br>
<<set $tempSlave.pubertyXY = 1>>
<</if>>
@@ -402,7 +415,7 @@
<<set $tempSlave.energy = 0>>
<<elseif $tempSlave.energy > 100>>
<<print "Sex Drive was set too high, reset to 100">><br>
- <<set $tempSlave.energy =100>>
+ <<set $tempSlave.energy = 100>>
<</if>>
<<if $tempSlave.penetrativeCount < 0>>
<<print "Penetrative sex Count was set too low, reset to 0">><br>
diff --git a/src/pregmod/SecForceEX/SpecialForceBarracksAdditionalColonelInteractions.tw b/src/pregmod/SecForceEX/SpecialForceBarracksAdditionalColonelInteractions.tw
index 7c4dc2af6f990cb16bc95dc7a7fb39b8b5966ab2..769f9a64500139d06f4768b245369536e65b9465 100644
--- a/src/pregmod/SecForceEX/SpecialForceBarracksAdditionalColonelInteractions.tw
+++ b/src/pregmod/SecForceEX/SpecialForceBarracksAdditionalColonelInteractions.tw
@@ -4,7 +4,7 @@
<br><br>
<span id="result3">
Where do you want to spend time with The Colonel this week?
- <<if $ColonelRelationship >= 200>>
+ <<if $ColonelRelationship >= 25>>
<br><<link "Up on the surface, along with an escort of course.">>
<<set $securityForceColonelToken = 1>>
<<replace "#result3">>
@@ -60,7 +60,7 @@
<<elseif $PC.medicine >= 10>>
Your basic skill in medicine is sufficient only to stabilize the citizen.
<</if>>
- <<set $ColonelRelationship += 1>>
+ <<set $ColonelRelationship += 2>>
<</replace>>
<</link>>
<</if>>
@@ -75,7 +75,7 @@
<</link>>
<br><<link "Learn">>
<<replace "#result10">>
- <<set $securityForceColonelToken = 1>>
+ <<set $securityForceColonelToken = 1, $ColonelRelationship += 1>>
<<link "Go back">>
<<goto "SFM Barracks">>
<<set $securityForceColonelToken = 0>>
@@ -98,7 +98,6 @@
<<elseif $PC.medicine >= 10>>
//Yes that is a bandage, good job.//
<</if>>
- <<set $ColonelRelationship += 1>>
<</replace>>
<</link>>
,
@@ -117,7 +116,6 @@
<<elseif $PC.trading >= 10>>//
//Now Good job you now know what NPV stands for.//
<</if>>
- <<set $ColonelRelationship += 1>>
<</replace>>
<</link>>
,
@@ -136,7 +134,6 @@
<<elseif $PC.slaving >= 10>>
//Yes, having your slaves die on you is generally considered a bad thing, unless you are into that kind of thing you sick fuck. But who am I to judge.//
<</if>>
- <<set $ColonelRelationship += 1>>
<</replace>>
<</link>>
,
@@ -155,7 +152,6 @@
<<elseif $PC.engineering >= 10>>
//Hammer meet nail.//
<</if>>
- <<set $ColonelRelationship += 1>>
<</replace>>
<</link>>
,
@@ -174,7 +170,6 @@
<<elseif $PC.hacking >= 10>>
//You can now somewhat use a mouse.//
<</if>>
- <<set $ColonelRelationship += 1>>
<</replace>>
<</link>>
,
@@ -205,21 +200,20 @@
<<elseif $PC.warfare >= 10>>
//Slightly better but you still have a long way to go.//
<</if>>
- <<set $ColonelRelationship += 1>>
<</replace>>
<</link>>
</span>
<</replace>>
<</link>>
-
- <<if $ColonelRelationship >= 300>>
+
+ <<if $ColonelRelationship >= 45>>
<br><<link "Have some fun">>
<<link "Go back">>
<<goto "SFM Barracks">>
<<set $securityForceSexedColonel = 0, $securityForceColonelToken = 0>>
<</link>>
<<replace "#result10">>
- <<set $securityForceSexedColonel = 1, $securityForceColonelToken = 1>>
+ <<set $securityForceSexedColonel = 1, $securityForceColonelToken = 1, $ColonelRelationship += 3>>
<span id="result11">
Where should this fun take place?
<<link "Go back">>
@@ -238,35 +232,35 @@
<<replace "#result6">>
<<include "SpecialForceColonelSexDec">>
<</replace>>
- <<set $securityForceSexedColonel += 1, $ColonelRelationship += 1>>
+ <<set $securityForceSexedColonel += 1>>
<</link>>
<br><<link "Ass">>
<<replace "#result6">>
<<include "SpecialForceColonelSexDec">>
<</replace>>
- <<set $securityForceSexedColonel += 1, $ColonelRelationship += 1>>
+ <<set $securityForceSexedColonel += 1>>
<</link>>
<br><<link "Both pussy and ass">>
<<replace "#result6">>
<<include "SpecialForceColonelSexDec">>
<</replace>>
- <<set $securityForceSexedColonel += 2, $ColonelRelationship += 1>>
+ <<set $securityForceSexedColonel += 2>>
<</link>>
<br><<link "Mouth">>
<<replace "#result6">>
<<include "SpecialForceColonelSexDec">>
<</replace>>
- <<set $securityForceSexedColonel += 1, $ColonelRelationship += 1>>
+ <<set $securityForceSexedColonel += 1>>
<</link>>
<br><<link "All three holes">>
<<replace "#result6">>
<<include "SpecialForceColonelSexDec">>
<</replace>>
- <<set $securityForceSexedColonel += 3, $ColonelRelationship += 1>>
+ <<set $securityForceSexedColonel += 3>>
<</link>>
</span>
<</replace>>
@@ -284,35 +278,35 @@
<<replace "#result6">>
<<include "SpecialForceColonelSexDec">>
<</replace>>
- <<set $securityForceSexedColonel += 1, $ColonelRelationship += 1>>
+ <<set $securityForceSexedColonel += 1>>
<</link>>
<br><<link "Ass">>
<<replace "#result6">>
<<include "SpecialForceColonelSexDec">>
<</replace>>
- <<set $securityForceSexedColonel += 1, $ColonelRelationship += 1>>
+ <<set $securityForceSexedColonel += 1>>
<</link>>
<br><<link "Both pussy and ass">>
<<replace "#result6">>
<<include "SpecialForceColonelSexDec">>
<</replace>>
- <<set $securityForceSexedColonel += 2, $ColonelRelationship += 1>>
+ <<set $securityForceSexedColonel += 2>>
<</link>>
<br><<link "Mouth">>
<<replace "#result6">>
<<include "SpecialForceColonelSexDec">>
<</replace>>
- <<set $securityForceSexedColonel += 1, $ColonelRelationship += 1>>
+ <<set $securityForceSexedColonel += 1>>
<</link>>
<br><<link "All three holes">>
<<replace "#result6">>
<<include "SpecialForceColonelSexDec">>
<</replace>>
- <<set $securityForceSexedColonel += 3, $ColonelRelationship += 1>>
+ <<set $securityForceSexedColonel += 3>>
<</link>>
</span>
<</replace>>
@@ -325,4 +319,4 @@
<</replace>>
<</link>>
</span>
-<</if>>
\ No newline at end of file
+<</if>>
diff --git a/src/pregmod/SecForceEX/securityForceTradeShow.tw b/src/pregmod/SecForceEX/securityForceTradeShow.tw
index 66577898518c3bf8b0e3b7de9302e0c88a4dd69a..9b2365b00248053e227e768e8ddd188b5fa3723d 100644
--- a/src/pregmod/SecForceEX/securityForceTradeShow.tw
+++ b/src/pregmod/SecForceEX/securityForceTradeShow.tw
@@ -5,7 +5,7 @@
<<if ndef $TradeShowAttendanceGranted>> <<set $TradeShowAttendanceGranted = 0>> <</if>>
<<if $OverallTradeShowAttendance == 0>>
-
+
<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, back when I was a major before I joined $securityForceName. Me and a couple of colleagues went to a bi-yearly international security trade show, I would very much like to continue doing so. Can I?<span id="choice1">
<<link "Yes,">>
@@ -23,7 +23,7 @@
</span>
<<elseif $OverallTradeShowAttendance >= 1>>
-The (bi-yearly) security trade show has finally come around and even though you've already granted The Colonel permission to attend, she's decided to come and ask for the leave personally.
+The (bi-yearly) security trade show has finally come around and even though you've already granted The Colonel permission to attend, she's decided to come and ask for the leave personally.
<span id="choice2">
@@ -33,7 +33,7 @@ The (bi-yearly) security trade show has finally come around and even though you'
<br>"Thanks <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>>"
<<set $CurrentTradeShowAttendanceGranted = 1, _TradeShowAttendes = 150, _BonusProviderPercentage = .15, _MenialSlavesPerAttendee = 15>>
-
+
<<include "SpecialForceUpgradeTree">>
<<if $arcologies[0].prosperity < 25>>
@@ -95,7 +95,7 @@ The (bi-yearly) security trade show has finally come around and even though you'
<<set _SuccesfulPersuationAttempt = 1>>
<<set _PersuationBonus = 1.10>>
<</if>>
-
+
<<if _SuccesfulPersuationAttempt == 0>>
<<set _PersuationBonus = 1>>
<</if>>
@@ -112,18 +112,18 @@ The (bi-yearly) security trade show has finally come around and even though you'
<<set $cash = $cash+_Profit>>
<<set $TradeShowIncome += _Profit>>
<<set $TotalTradeShowIncome += _Profit>>
-
- <<if $ColonelRelationship >= 400 && $LieutenantColonel == 1 && $ColonelCore == "brazen">>
- <br><br>
+
+ <<if $ColonelRelationship >= 65 && $LieutenantColonel == 1 && $ColonelCore == "brazen">>
+ <br><br>
<<link "Have sex with The Colonel in a bathroom stall">>
The crowd are shocked by the loud noises coming from a bathroom stall.
<<set $rep -= 150, $securityForceSexedColonel += 1>>
<</link>>
<</if>>
-
+
<</replace>>
<</link>>
-
+
<<link "Request she remain on base">>
<<replace "#choice2">>
<br>The look of disappointment is barely noticeable on The Colonel's face.
@@ -132,4 +132,4 @@ The (bi-yearly) security trade show has finally come around and even though you'
</span>
-<</if>>
\ No newline at end of file
+<</if>>
diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw
index 5c426fda6aa69977ab640942a52991d20378b3cc..fbd0010268051362432443e07719825635c54f26 100644
--- a/src/uncategorized/SFMBarracks.tw
+++ b/src/uncategorized/SFMBarracks.tw
@@ -3,21 +3,21 @@
<<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 ndef $ColonelRelationship>>
- <<set $ColonelRelationship = 0>> /* 0 - Employee and boss, 100 - Friend, 200 - Close friend, 300 - Girlfriend, 400 - Lover */
+ <<set $ColonelRelationship = 0>> /* 0 - Employee and boss, 10 - Friend, 25 - Close friend, 45 - Girlfriend, 65 - Lover */
<</if>>
<<if $ColonelRelationship == 0>>
<<set _RelationshipTitle = "boss">>
-<<elseif $ColonelRelationship >= 100>>
+<<elseif $ColonelRelationship >= 10>>
<<set _RelationshipTitle = "friend">>
-<<elseif $ColonelRelationship >= 200>>
+<<elseif $ColonelRelationship >= 25>>
<<set _RelationshipTitle = "close friend">>
-<<elseif $ColonelRelationship >= 300>>
+<<elseif $ColonelRelationship >= 45>>
<<if $PC.title == 1>>
<<set _RelationshipTitle = "boyfriend">>
<<else>>
<<set _RelationshipTitle = "girlfriend">>
<</if>>
-<<elseif $ColonelRelationship >= 400>>
+<<elseif $ColonelRelationship >= 65>>
<<set _RelationshipTitle = "lover">>
<</if>>
<<set $Env = simpleWorldEconomyCheck()>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index a8a6b7fe8a8695b0986a151a7de089503e165859..917545d4985832683631fc3d1fc2222d1fbd481c 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -1599,7 +1599,7 @@
%/
<<widget "CustomSlaveFace">>
<<replace #face>>
- <<if $customSlave.face < -1>>Very unattractive face.
+ <<if $customSlave.face < -40>>Very unattractive face.
<<elseif $customSlave.face < -10>>Unattractive face.
<<elseif $customSlave.face <= 10>>Average face.
<<elseif $customSlave.face <= 40>>Attractive face.
@@ -2778,7 +2778,7 @@
<<set $activeSlave.heels = either(0, 0, 0, 0, 0, 1, 1)>>
<</if>>
<<set $activeSlave.voice = random(0,2)>>
- <<set $activeSlave.face = random(-3,1)>>
+ <<set $activeSlave.face = random(-100,20)>>
<<if $activeSlave.vagina > -1>>
<<set $activeSlave.vagina = either(1, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 10)>>
<<set $activeSlave.preg = random(-3,-1)>>