From 2f763f15b03bbad79e37fdfe4ff85ee28e6432ea Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 3 Oct 2018 18:33:01 -0400
Subject: [PATCH] continued overhauling
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 7 ++
src/SecExp/attackHandler.tw | 48 +++++++-----
src/SecExp/attackReport.tw | 42 +++++-----
src/SecExp/rebellionReport.tw | 8 +-
src/SecExp/secExpSmilingMan.tw | 4 +-
src/SecExp/securityReport.tw | 4 +-
src/pregmod/editGenetics.tw | 8 +-
src/pregmod/reMaleCitizenHookup.tw | 2 +-
src/pregmod/reTheSirenStrikesBack.tw | 4 +-
src/pregmod/seFCTVshows.tw | 16 ++--
src/pregmod/widgets/seBirthWidgets.tw | 8 +-
src/uncategorized/REroyalblood.tw | 36 ++++-----
src/uncategorized/genericPlotEvents.tw | 4 +-
src/uncategorized/pRivalryCapture.tw | 4 +-
src/uncategorized/pRivalryHostage.tw | 32 ++++----
src/uncategorized/pSlaveMedic.tw | 14 ++--
src/uncategorized/peConcubineInterview.tw | 8 +-
src/uncategorized/reBoomerang.tw | 6 +-
src/uncategorized/reCitizenHookup.tw | 2 +-
src/uncategorized/reFSAcquisition.tw | 44 +++++------
...EgyptianRevivalistAcquisitionWorkaround.tw | 2 +-
src/uncategorized/reNickname.tw | 8 +-
src/uncategorized/reRecruit.tw | 76 +++++++++----------
src/uncategorized/resFailure.tw | 34 ++++-----
src/uncategorized/saLongTermEffects.tw | 2 +-
src/uncategorized/seCustomSlaveDelivery.tw | 19 ++++-
src/uncategorized/seRaiding.tw | 38 +++++-----
src/uncategorized/seRecruiterSuccess.tw | 12 +--
src/uncategorized/seRetirement.tw | 4 +-
29 files changed, 261 insertions(+), 235 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 7156c3d5421..0354deb68a5 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -1,5 +1,12 @@
Pregmod
+0.10.7.1-0.10.x
+
+ 1
+ -overhauled intelligence and education
+ -more vector work from Deepmurk
+ -fixes
+
0.10.7.1-0.9.x
9/30/2018
diff --git a/src/SecExp/attackHandler.tw b/src/SecExp/attackHandler.tw
index 8cb4e18619c..cf0e6fcd8bb 100644
--- a/src/SecExp/attackHandler.tw
+++ b/src/SecExp/attackHandler.tw
@@ -243,39 +243,43 @@
<<set _mercMod += 0.10>>
<<set _SFMod += 0.10>>
<</if>>
- <<if (setup.bodyguardCareers.includes($Bodyguard.career) || setup.HGCareers.includes($Bodyguard.career)) && $Bodyguard.intelligence == 3>>
+ <<if (setup.bodyguardCareers.includes($Bodyguard.career) || setup.HGCareers.includes($Bodyguard.career)) && $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 95>>
<<set _atkMod += 0.25>>
<<set _defMod += 0.25>>
<<set _tacChance += 0.50>>
- <<elseif $Bodyguard.intelligence == 3>>
+ <<elseif $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 95>>
<<set _atkMod += 0.20>>
<<set _defMod += 0.15>>
<<set _tacChance += 0.35>>
- <<elseif (setup.bodyguardCareers.includes($Bodyguard.career) || setup.HGCareers.includes($Bodyguard.career)) && $Bodyguard.intelligence == 2>>
+ <<elseif (setup.bodyguardCareers.includes($Bodyguard.career) || setup.HGCareers.includes($Bodyguard.career)) && $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 50>>
<<set _atkMod += 0.15>>
<<set _defMod += 0.10>>
<<set _tacChance += 0.25>>
- <<elseif $Bodyguard.intelligence == 2>>
+ <<elseif $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 50>>
<<set _atkMod += 0.10>>
<<set _defMod += 0.10>>
<<set _tacChance += 0.20>>
- <<elseif setup.bodyguardCareers.includes($Bodyguard.career) || setup.HGCareers.includes($Bodyguard.career) && $Bodyguard.intelligence >= 1>>
+ <<elseif (setup.bodyguardCareers.includes($Bodyguard.career) || setup.HGCareers.includes($Bodyguard.career)) && $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 15>>
<<set _atkMod += 0.10>>
<<set _defMod += 0.05>>
<<set _tacChance += 0.15>>
- <<elseif !(setup.bodyguardCareers.includes($Bodyguard.career) && setup.HGCareers.includes($Bodyguard.career)) || $Bodyguard.intelligence <= -2>>
+ <<elseif $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 15>>
+ <<set _atkMod += 0.5>>
+ <<set _defMod += 0.05>>
+ <<set _tacChance += 0.10>>
+ <<elseif !(setup.bodyguardCareers.includes($Bodyguard.career) && setup.HGCareers.includes($Bodyguard.career)) || $Bodyguard.intelligence+$Bodyguard.intelligenceImplant < -50>>
<<set _atkMod -= 0.15>>
<<set _defMod -= 0.15>>
<<set _tacChance -= 0.30>>
- <<elseif $Bodyguard.intelligence <= -2>>
+ <<elseif $Bodyguard.intelligence+$Bodyguard.intelligenceImplant < -50>>
<<set _atkMod -= 0.15>>
<<set _defMod -= 0.10>>
<<set _tacChance -= 0.25>>
- <<elseif !(setup.bodyguardCareers.includes($Bodyguard.career) && setup.HGCareers.includes($Bodyguard.career)) || $Bodyguard.intelligence <= -1>>
+ <<elseif !(setup.bodyguardCareers.includes($Bodyguard.career) && setup.HGCareers.includes($Bodyguard.career)) || $Bodyguard.intelligence+$Bodyguard.intelligenceImplant < -15>>
<<set _atkMod -= 0.10>>
<<set _defMod -= 0.10>>
<<set _tacChance -= 0.20>>
- <<elseif $Bodyguard.intelligence <= -1>>
+ <<elseif $Bodyguard.intelligence+$Bodyguard.intelligenceImplant < -15>>
<<set _atkMod -= 0.10>>
<<set _defMod -= 0.05>>
<<set _tacChance -= 0.15>>
@@ -317,7 +321,7 @@
<<if $Bodyguard.balls >= 8>>
<<set _woundChance += 1>>
<</if>>
- <<if $Bodyguard.intelligence <= -3>>
+ <<if $Bodyguard.intelligence+$Bodyguard.intelligenceImplant < -95>>
<<set _woundChance += 1>>
<</if>>
<<if random(1,100) <= _woundChance>>
@@ -367,39 +371,43 @@
<<set _mercMod += 0.10>>
<<set _SFMod += 0.10>>
<</if>>
- <<if (setup.bodyguardCareers.includes($HeadGirl.career) || setup.HGCareers.includes($HeadGirl.career)) && $HeadGirl.intelligence == 3>>
+ <<if (setup.bodyguardCareers.includes($HeadGirl.career) || setup.HGCareers.includes($HeadGirl.career)) && $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 95>>
<<set _atkMod += 0.25>>
<<set _defMod += 0.25>>
<<set _tacChance += 0.50>>
- <<elseif $HeadGirl.intelligence == 3>>
+ <<elseif $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 95>>
<<set _atkMod += 0.20>>
<<set _defMod += 0.15>>
<<set _tacChance += 0.35>>
- <<elseif (setup.bodyguardCareers.includes($HeadGirl.career) || setup.HGCareers.includes($HeadGirl.career)) && $HeadGirl.intelligence == 2>>
+ <<elseif (setup.bodyguardCareers.includes($HeadGirl.career) || setup.HGCareers.includes($HeadGirl.career)) && $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 50>>
<<set _atkMod += 0.15>>
<<set _defMod += 0.10>>
<<set _tacChance += 0.25>>
- <<elseif $HeadGirl.intelligence == 2>>
+ <<elseif $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 50>>
<<set _atkMod += 0.10>>
<<set _defMod += 0.10>>
<<set _tacChance += 0.20>>
- <<elseif setup.bodyguardCareers.includes($HeadGirl.career) || setup.HGCareers.includes($HeadGirl.career) && $HeadGirl.intelligence >= 1>>
+ <<elseif (setup.bodyguardCareers.includes($HeadGirl.career) || setup.HGCareers.includes($HeadGirl.career)) && $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 15>>
<<set _atkMod += 0.10>>
<<set _defMod += 0.05>>
<<set _tacChance += 0.15>>
- <<elseif !(setup.bodyguardCareers.includes($HeadGirl.career) && setup.HGCareers.includes($HeadGirl.career)) || $HeadGirl.intelligence <= -2>>
+ <<elseif $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 15>>
+ <<set _atkMod += 0.05>>
+ <<set _defMod += 0.05>>
+ <<set _tacChance += 0.10>>
+ <<elseif !(setup.bodyguardCareers.includes($HeadGirl.career) && setup.HGCareers.includes($HeadGirl.career)) || $HeadGirl.intelligence+$HeadGirl.intelligenceImplant < -50>>
<<set _atkMod -= 0.15>>
<<set _defMod -= 0.15>>
<<set _tacChance -= 0.30>>
- <<elseif $HeadGirl.intelligence <= -2>>
+ <<elseif $HeadGirl.intelligence+$HeadGirl.intelligenceImplant < -50>>
<<set _atkMod -= 0.15>>
<<set _defMod -= 0.10>>
<<set _tacChance -= 0.25>>
- <<elseif !(setup.bodyguardCareers.includes($HeadGirl.career) && setup.HGCareers.includes($HeadGirl.career)) || $HeadGirl.intelligence <= -1>>
+ <<elseif !(setup.bodyguardCareers.includes($HeadGirl.career) && setup.HGCareers.includes($HeadGirl.career)) || $HeadGirl.intelligence+$HeadGirl.intelligenceImplant < -15>>
<<set _atkMod -= 0.10>>
<<set _defMod -= 0.10>>
<<set _tacChance -= 0.20>>
- <<elseif $HeadGirl.intelligence <= -1>>
+ <<elseif $HeadGirl.intelligence+$HeadGirl.intelligenceImplant < -15>>
<<set _atkMod -= 0.10>>
<<set _defMod -= 0.05>>
<<set _tacChance -= 0.15>>
@@ -441,7 +449,7 @@
<<if $HeadGirl.balls >= 8>>
<<set _woundChance += 1>>
<</if>>
- <<if $HeadGirl.intelligence <= -3>>
+ <<if $HeadGirl.intelligence+$HeadGirl.intelligenceImplant < -95>>
<<set _woundChance += 1>>
<</if>>
<<if random(1,100) <= _woundChance>>
diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw
index 9f43ac9f591..7a1648bf41c 100644
--- a/src/SecExp/attackReport.tw
+++ b/src/SecExp/attackReport.tw
@@ -900,25 +900,25 @@
Your soldiers <<if $deployingSlaves == 1>>however,<</if>> are not enthusiastic to have a slave as a commander, but they trust you enough not to question your decision.
<</if>>
<</if>>
- <<if (setup.bodyguardCareers.includes($Bodyguard.career) || setup.HGCareers.includes($Bodyguard.career)) && $Bodyguard.intelligence == 3>>
+ <<if (setup.bodyguardCareers.includes($Bodyguard.career) || setup.HGCareers.includes($Bodyguard.career)) && $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 95>>
With her experience and her great intellect, she is able to exploits the smallest of tactical advantages, making your troops very effective.
- <<elseif $Bodyguard.intelligence == 3>>
+ <<elseif $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 95>>
While she lacks experience, her great intellect allows her to seize and exploit any tactical advantage the battlefield offers her.
- <<elseif (setup.bodyguardCareers.includes($Bodyguard.career) || setup.HGCareers.includes($Bodyguard.career)) && $Bodyguard.intelligence == 2>>
+ <<elseif (setup.bodyguardCareers.includes($Bodyguard.career) || setup.HGCareers.includes($Bodyguard.career)) && $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 50>>
Having both the experience and the intelligence, she performs admirably as your commander. Her competence greatly increases the efficiency of your troops.
- <<elseif $Bodyguard.intelligence == 2>>
+ <<elseif $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 50>>
Despite not having a lot of experience as a leader, her intelligence makes her a good commander, increasing the efficiency of your troops.
- <<elseif setup.bodyguardCareers.includes($Bodyguard.career) || setup.HGCareers.includes($Bodyguard.career) && $Bodyguard.intelligence >= 1>>
+ <<elseif setup.bodyguardCareers.includes($Bodyguard.career) || setup.HGCareers.includes($Bodyguard.career) && $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 15>>
Thanks to her experience, she is a decent commander, competently guiding your troops through the battle.
- <<elseif $Bodyguard.intelligence >= 1>>
- Lacking experience her performance as a commander is rather forgettable.
- <<elseif !(setup.bodyguardCareers.includes($Bodyguard.career) && setup.HGCareers.includes($Bodyguard.career)) || $Bodyguard.intelligence <= -2>>
+ <<elseif $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 15>>
+ Lacking experience, her performance as a commander is rather forgettable.
+ <<elseif !(setup.bodyguardCareers.includes($Bodyguard.career) && setup.HGCareers.includes($Bodyguard.career)) || $Bodyguard.intelligence+$Bodyguard.intelligenceImplant < -50>>
Despite the experience she accumulated during her past career, her very low intelligence is a great disadvantage for your troops.
- <<elseif $Bodyguard.intelligence <= -2>>
+ <<elseif $Bodyguard.intelligence+$Bodyguard.intelligenceImplant < -50>>
Without experience and low intelligence, she performs horribly as a commander, greatly affecting your troops.
- <<elseif !(setup.bodyguardCareers.includes($Bodyguard.career) && setup.HGCareers.includes($Bodyguard.career)) || $Bodyguard.intelligence <= -1>>
+ <<elseif !(setup.bodyguardCareers.includes($Bodyguard.career) && setup.HGCareers.includes($Bodyguard.career)) || $Bodyguard.intelligence+$Bodyguard.intelligenceImplant < -15>>
Despite the experience she accumulated during her past career, she lacks the intelligence to apply it quickly and effectively, making for a rather poor performance in the field.
- <<elseif $Bodyguard.intelligence <= -1>>
+ <<elseif $Bodyguard.intelligence+$Bodyguard.intelligenceImplant < -15>>
She lacks the experience and the intelligence to be an effective commander, the performance of your troops suffers because of her poor leadership.
<</if>>
<<if $gainedCombat == 1>>
@@ -1036,25 +1036,25 @@
Your soldiers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander, but they trust you enough not to question your decision.
<</if>>
<</if>>
- <<if (setup.bodyguardCareers.includes($HeadGirl.career) || setup.HGCareers.includes($HeadGirl.career)) && $HeadGirl.intelligence == 3>>
+ <<if (setup.bodyguardCareers.includes($HeadGirl.career) || setup.HGCareers.includes($HeadGirl.career)) && $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 95>>
With her experience and her great intellect, she is able to exploits the smallest of tactical advantages, making your troops greatly effective.
- <<elseif $HeadGirl.intelligence == 3>>
+ <<elseif $HeadGirl.+$HeadGirl.intelligenceImplant > 95>>
While she lacks experience, her great intellect allows her to seize and exploit any tactical advantage the battlefield offers her.
- <<elseif (setup.bodyguardCareers.includes($HeadGirl.career) || setup.HGCareers.includes($HeadGirl.career)) && $HeadGirl.intelligence == 2>>
+ <<elseif (setup.bodyguardCareers.includes($HeadGirl.career) || setup.HGCareers.includes($HeadGirl.career)) && $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 50>>
Having both the experience and the intelligence, she performs admirably as your commander. Her competence greatly increases the efficiency of your troops.
- <<elseif $HeadGirl.intelligence == 2>>
+ <<elseif $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 50>>
Despite not having a lot of experience as a leader, her intelligence makes her a good commander, increasing the efficiency of your troops.
- <<elseif setup.bodyguardCareers.includes($HeadGirl.career) || setup.HGCareers.includes($HeadGirl.career) && $HeadGirl.intelligence >= 1>>
+ <<elseif setup.bodyguardCareers.includes($HeadGirl.career) || setup.HGCareers.includes($HeadGirl.career) && $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 15>>
Thanks to her experience, she is a decent commander, competently guiding your troops through the battle.
- <<elseif $HeadGirl.intelligence >= 1>>
+ <<elseif $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 15>>
Lacking experience her performance as a commander is rather forgettable.
- <<elseif !(setup.bodyguardCareers.includes($HeadGirl.career) && setup.HGCareers.includes($HeadGirl.career)) || $HeadGirl.intelligence <= -2>>
+ <<elseif !(setup.bodyguardCareers.includes($HeadGirl.career) && setup.HGCareers.includes($HeadGirl.career)) || $HeadGirl.intelligence+$HeadGirl.intelligenceImplant < -50>>
Despite the experience she accumulated during her past career, her very low intelligence is a great disadvantage for your troops.
- <<elseif $HeadGirl.intelligence <= -2>>
+ <<elseif $HeadGirl.intelligence+$HeadGirl.intelligenceImplant < -50>>
Without experience and low intelligence, she performs horribly as a commander, greatly affecting your troops.
- <<elseif !(setup.bodyguardCareers.includes($HeadGirl.career) && setup.HGCareers.includes($HeadGirl.career)) || $HeadGirl.intelligence <= -1>>
+ <<elseif !(setup.bodyguardCareers.includes($HeadGirl.career) && setup.HGCareers.includes($HeadGirl.career)) || $HeadGirl.intelligence+$HeadGirl.intelligenceImplant < -15>>
Despite the experience she accumulated during her past career, she lacks the intelligence to apply it quickly and effectively, making for a rather poor performance in the field.
- <<elseif $HeadGirl.intelligence <= -1>>
+ <<elseif $HeadGirl.intelligence+$HeadGirl.intelligenceImplant < -15>>
She lacks the experience and the intelligence to be an effective commander, the performance of your troops suffers because of her poor leadership.
<</if>>
<<if $gainedCombat == 1>>
diff --git a/src/SecExp/rebellionReport.tw b/src/SecExp/rebellionReport.tw
index c5195debe87..f360f6a0d71 100644
--- a/src/SecExp/rebellionReport.tw
+++ b/src/SecExp/rebellionReport.tw
@@ -503,7 +503,7 @@
<<if $Concubine.balls >= 8>>
<<set _woundChance += 1>>
<</if>>
- <<if $Concubine.intelligence <= -3>>
+ <<if $Concubine.intelligence+$Concubine.intelligenceImplant < -95>>
<<set _woundChance += 1>>
<</if>>
<<set _woundChance *= random(2,4)>>
@@ -566,7 +566,7 @@
<<if $Bodyguard.balls >= 8>>
<<set _woundChance += 1>>
<</if>>
- <<if $Bodyguard.intelligence <= -3>>
+ <<if $Bodyguard.intelligence+$Bodyguard.intelligenceImplant < -95>>
<<set _woundChance += 1>>
<</if>>
<<set _woundChance *= random(2,4)>>
@@ -673,7 +673,7 @@
<<if $Concubine.balls >= 8>>
<<set _woundChance += 1>>
<</if>>
- <<if $Concubine.intelligence <= -3>>
+ <<if $Concubine.intelligence+$Concubine.intelligenceImplant < -95>>
<<set _woundChance += 1>>
<</if>>
<<set _woundChance *= random(2,4)>>
@@ -781,7 +781,7 @@
<<if $Concubine.balls >= 8>>
<<set _woundChance += 1>>
<</if>>
- <<if $Concubine.intelligence <= -3>>
+ <<if $Concubine.intelligence+$Concubine.intelligenceImplant < -95>>
<<set _woundChance += 1>>
<</if>>
<<set _woundChance *= random(2,4)>>
diff --git a/src/SecExp/secExpSmilingMan.tw b/src/SecExp/secExpSmilingMan.tw
index e7fdfc09bb1..1aacb9678c1 100644
--- a/src/SecExp/secExpSmilingMan.tw
+++ b/src/SecExp/secExpSmilingMan.tw
@@ -324,8 +324,8 @@
<<include "Generate XX Slave">>
<<set $activeSlave.origin = "She was a criminal mastermind, captured shortly after completing her master plan.">>
<<set $activeSlave.career = "a student from a private school">>
- <<set $activeSlave.intelligence = 3>>
- <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligence = 100>>
+ <<set $activeSlave.intelligenceImplant = 30>>
<<set $activeSlave.slaveSurname = "Yamadera">>
<<set $activeSlave.birthSurname = "Yamadera">>
<<set $activeSlave.skin = "pale">>
diff --git a/src/SecExp/securityReport.tw b/src/SecExp/securityReport.tw
index a4f4ca56d5a..779597f8195 100644
--- a/src/SecExp/securityReport.tw
+++ b/src/SecExp/securityReport.tw
@@ -268,9 +268,9 @@
<<else>>
''__@@.pink;<<= SlaveFullName($Recruiter)>>@@__'' is able to further boost your militia recruitement campaign from her PR hub office.
<<if $propCampaignBoost == 1>>
- <<set _recruits += 4+$Recruiter.intelligence+$Recruiter.intelligenceImplant>>
+ <<set _recruits += 4+Math.floor(($Recruiter.intelligence+$Recruiter.intelligenceImplant)/32)>>
<<else>>
- <<set _recruits += 3+$Recruiter.intelligence+$Recruiter.intelligenceImplant>>
+ <<set _recruits += 3+Math.floor(($Recruiter.intelligence+$Recruiter.intelligenceImplant)/32)>>
<</if>>
<</if>>
<</if>>
diff --git a/src/pregmod/editGenetics.tw b/src/pregmod/editGenetics.tw
index 89e27b7c55c..6c499989407 100644
--- a/src/pregmod/editGenetics.tw
+++ b/src/pregmod/editGenetics.tw
@@ -100,7 +100,7 @@
</tr>
<tr><td></td><td colspan="6"><hr></td><td></td></tr>
<tr>
- <th>Intelligence</th><td class="editor number-editor" data-param="intelligence" data-min="-3" data-max="3"><%= tmpl.intelligenceDesc(s.intelligence) %></td>
+ <th>Intelligence</th><td class="editor number-editor" data-param="intelligence" data-min="-100" data-max="100"><%= tmpl.hormonalCat.cat(s.intelligence) %></td>
<th>Behavioral</th><td><%= s.behavioralFlaw !== 'none' ? s.behavioralFlaw : s.behavioralQuirk %></td>
<th>Sexual</th><td><%= s.sexualFlaw !== 'none' ? s.sexualFlaw : s.sexualQuirk %></td>
<td colspan="2"></td>
@@ -189,11 +189,7 @@
}
return res.join(' ');
};
- tmpl.intelligenceDesc = function(s) {
- return ({
- '-3': 'borderline retarded', '-2': 'very slow', '-1': 'slow', '0': 'average',
- '1': 'smart', '2': 'very smart', '3': 'brilliant'}[s] || 'unknown') + ' (' + Number(s) + ')';
- };
+ tmpl.intelligenceCat = new Categorizer([-Infinity, 'borderline retarded'], [-95, 'very slow'], [-50, 'slow'], [-15, 'average'], [16, 'smart'], [51, 'very smart'], [96, 'brilliant']);
tmpl.birthFullName = _.template(jQuery('#birthFullNameTmpl').html(), {variable: 's'});
tmpl.currentFullName = _.template(jQuery('#currentFullNameTmpl').html(), {variable: 's'});
tmpl.parentFullName = function(id) {
diff --git a/src/pregmod/reMaleCitizenHookup.tw b/src/pregmod/reMaleCitizenHookup.tw
index 680916c450f..bd6ce5f1d88 100644
--- a/src/pregmod/reMaleCitizenHookup.tw
+++ b/src/pregmod/reMaleCitizenHookup.tw
@@ -188,7 +188,7 @@ He's clearly attracted to you; even the most consummate actor would have difficu
<br><<link "To them that hath, it shall be given">>
<<replace "#result">>
You're not exactly starved for casual sex, but you've never thought there was any such thing as too much of a good thing. <<if _FS != "Physical Idealist">>You pull his arm around your waist<<else>>You nudge him in the ribs and motion to the door<</if>>. You hear a slight gasp from him as he realizes that his gambit has succeeded with more immediate effect than he expected. He shivers with anticipation as you steer him back through a side door, grabbing a pair of glasses of <<if $PC.refreshmentType == 1>>$PC.refreshment<<else>>liquor<</if>> on the way, and making a discreet exit towards your private suite.
- <<if $Concubine != 0 && $Concubine.intelligence > 1>>
+ <<if $Concubine != 0 && $Concubine.intelligence+$Concubine.intelligenceImplant > 50>>
$Concubine.slaveName is there, of course, and she instantly sees that her continued presence for a ménage à trois is wanted by both you and your guest.
<</if>>
Your guest restrains his eager praise now that you're in private, but his wide-eyed appreciation of your domain is compliment enough. Once in your suite, you undress him, revealing
diff --git a/src/pregmod/reTheSirenStrikesBack.tw b/src/pregmod/reTheSirenStrikesBack.tw
index ab0cec7dc04..82a2d7b2644 100644
--- a/src/pregmod/reTheSirenStrikesBack.tw
+++ b/src/pregmod/reTheSirenStrikesBack.tw
@@ -29,8 +29,8 @@
<<set $activeSlave.hStyle = "neat">>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
-<<set $activeSlave.intelligenceImplant = 1>>
-<<set $activeSlave.intelligence = 3>>
+<<set $activeSlave.intelligenceImplant = 30>>
+<<set $activeSlave.intelligence = 100>>
<<set $activeSlave.prestige = 3>>
<<set $activeSlave.prestigeDesc = "She was a well known music producer infamous for constantly having musicians disappear on her watch.">>
<<set $activeSlave.accent = 1>>
diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw
index 43ca42ba0d2..c22295f8698 100644
--- a/src/pregmod/seFCTVshows.tw
+++ b/src/pregmod/seFCTVshows.tw
@@ -158,8 +158,8 @@ Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveN
<<set $activeSlave.oralSkill = random(20,60)>>
<<set $activeSlave.analSkill = 0>>
<<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.intelligence = random(2,3)>>
- <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligence = random(51,70)>>
+ <<set $activeSlave.intelligenceImplant = 30>>
<<set $activeSlave.devotion = random(60,90)>>
<<set $activeSlave.trust = random(50,80)>>
<<set $activeSlave.chem = 0>>
@@ -216,8 +216,8 @@ Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveN
<<set $activeSlave.sexualQuirk = either("romantic", "caring", "caring")>>
<<set $activeSlave.chem = 0>>
<<set $activeSlave.health = 75>>
- <<set $activeSlave.intelligence = random(0,2)>>
- <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligence = random(-15,80)>>
+ <<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.origin = "You purchased her from FCTV's Home Slave Shopping stream channel.">>
<<set $activeSlave.career = setup.youngCareers.random()>>
<<if $activeSlave.race == "asian" || $activeSlave.race == "indo-aryan" || $activeSlave.race == "amerindian">>an<<else>>a<</if>> $activeSlave.race breeder, young and healthy with an advanced <<if $seeHyperPreg == 0>><i>@@.pink;super pregnancy.@@</i><<else>>@@.pink;hyper pregnancy.@@<</if>> $activeSlave.slaveName is really into making babies, and has even had her hips surgically widened to help her carry a large brood. Our tests here at HSS show that she's pregnant with $activeSlave.pregType babies!"
@@ -255,8 +255,8 @@ Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveN
<<set $activeSlave.vaginalSkill = random(50,1000)>>
<<set $activeSlave.analSkill = random(20,80)>>
<<set $activeSlave.whoreSkill = random(20,80)>>
- <<set $activeSlave.intelligence = random(0,2)>>
- <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligence = random(-15,80)>>
+ <<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.devotion = random(60,90)>>
<<set $activeSlave.trust = random(50,80)>>
<<set $activeSlave.chem = 0>>
@@ -327,8 +327,8 @@ Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveN
<<set $activeSlave.behavioralFlaw = "none">>
<<set $activeSlave.behavioralQuirk = "none">>
<<set $activeSlave.sexualQuirk = "none">>
- <<set $activeSlave.intelligence = random(0,2)>>
- <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligence = random(-15,80)>>
+ <<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.devotion = random(60,90)>>
<<set $activeSlave.trust = random(50,80)>>
<<set $activeSlave.chem = 0>>
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index b208f1aef2c..1f4f1e11dde 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -93,7 +93,7 @@
<<if $slaves[$i].hips > 0>>
<<set $birthDamage -= $slaves[$i].hips>>
<</if>>
-<<if $slaves[$i].intelligenceImplant > 0>>
+<<if $slaves[$i].intelligenceImplant >= 15>>
<<set $birthDamage -= 2>>
<</if>>
<<if $slaves[$i].laborCount > 0>>
@@ -185,7 +185,7 @@
<<set $suddenBirth -= 20>>
<</if>>
<</if>>
-<<set $suddenBirth -= ($slaves[$i].intelligence + $slaves[$i].intelligenceImplant)>>
+<<set $suddenBirth -= Math.trunc(($slaves[$i].intelligence + $slaves[$i].intelligenceImplant)/10)>>
/* end calcs */
<</widget>>
@@ -643,7 +643,7 @@ This decriptions can be expanded with more outcomes later. But it's not practica
$His's <<if _curBabies > 1>>children<<else>>child<</if>> had extra time to grow @@.red;greatly complicating childbirth@@.
<<set _compoundCondition = 1>>
<</if>>
- <<if (($slaves[$i].vagina >= 2 || $slaves[$i].vaginaLube > 0) && $slaves[$i].mpreg == 1) || $slaves[$i].births > 0 || $slaves[$i].hips > 0 || (setup.nurseCareers.includes($slaves[$i].career) && $slaves[$i].fetish != "mindbroken" && $slaves[$i].muscles >= -95) || $slaves[$i].intelligenceImplant > 0 || $slaves[$i].pregAdaptation >= 100>>
+ <<if (($slaves[$i].vagina >= 2 || $slaves[$i].vaginaLube > 0) && $slaves[$i].mpreg == 1) || $slaves[$i].births > 0 || $slaves[$i].hips > 0 || (setup.nurseCareers.includes($slaves[$i].career) && $slaves[$i].fetish != "mindbroken" && $slaves[$i].muscles >= -95) || $slaves[$i].intelligenceImplant >= 15 || $slaves[$i].pregAdaptation >= 100>>
<br>However:
<<if $slaves[$i].mpreg == 1>>
<<if $slaves[$i].anus >= 2>>
@@ -679,7 +679,7 @@ This decriptions can be expanded with more outcomes later. But it's not practica
<br>
Thanks to $his @@.green;previous career@@, childbirth went smoothly.
<</if>>
- <<if $slaves[$i].intelligenceImplant > 0>>
+ <<if $slaves[$i].intelligenceImplant >= 15>>
<br>
$He was @@.green;taught how to handle birth@@ in class.
<</if>>
diff --git a/src/uncategorized/REroyalblood.tw b/src/uncategorized/REroyalblood.tw
index b9c314aed4c..de348aeebb8 100644
--- a/src/uncategorized/REroyalblood.tw
+++ b/src/uncategorized/REroyalblood.tw
@@ -26,8 +26,8 @@
<<set $activeSlave.balls = 0>>
<<set $activeSlave.anus = 0>>
<<set $activeSlave.weight = 0>>
-<<set $activeSlave.intelligence = random(1,3)>>
-<<set $activeSlave.intelligenceImplant = 1>>
+<<set $activeSlave.intelligence = random(15,100)>>
+<<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.entertainSkill = 45>>
<<set $activeSlave.analSkill = 0>>
<<set $activeSlave.oralSkill = 0>>
@@ -75,8 +75,8 @@
<<set $activeSlave.anus = 0>>
<<set $activeSlave.weight = 0>>
<<set $activeSlave.muscles = 50>>
-<<set $activeSlave.intelligence = random(1,3)>>
-<<set $activeSlave.intelligenceImplant = 1>>
+<<set $activeSlave.intelligence = random(15,100)>>
+<<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.face = Math.clamp($activeSlave.face+20,-100,100)>>
<<set $activeSlave.faceImplant = 15>>
<<set $activeSlave.analSkill = 0>>
@@ -130,8 +130,8 @@
<<set $activeSlave.butt = random(2,4)>>
<<set $activeSlave.anus = 0>>
<<set $activeSlave.weight = 0>>
-<<set $activeSlave.intelligence = random(1,3)>>
-<<set $activeSlave.intelligenceImplant = 1>>
+<<set $activeSlave.intelligence = random(15,100)>>
+<<set $activeSlave.intelligenceImplant = 30>>
<<set $activeSlave.entertainSkill = 45>>
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.birthsTotal = 2>>
@@ -347,8 +347,8 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.butt = 1>>
<<set $activeSlave.anus = 0>>
<<set $activeSlave.weight = 0>>
- <<set $activeSlave.intelligence = either(-1, 1, 2)>>
- <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligence = random(-50,70)>>
+ <<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.entertainSkill = 25>>
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.health = random(30,60)>>
@@ -398,8 +398,8 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.butt = 1>>
<<set $activeSlave.anus = 0>>
<<set $activeSlave.weight = 0>>
- <<set $activeSlave.intelligence = either(-1, 1, 2)>>
- <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligence = random(-50,70)>>
+ <<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.entertainSkill = 25>>
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.health = random(30,60)>>
@@ -571,8 +571,8 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.butt = 1>>
<<set $activeSlave.anus = 0>>
<<set $activeSlave.weight = 0>>
- <<set $activeSlave.intelligence = either(-1, 1, 2)>>
- <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligence = random(-50,70)>>
+ <<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.entertainSkill = 25>>
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.health = random(30,60)>>
@@ -626,8 +626,8 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.butt = 1>>
<<set $activeSlave.anus = 0>>
<<set $activeSlave.weight = 0>>
- <<set $activeSlave.intelligence = either(-1, 1, 2)>>
- <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligence = random(-50,70)>>
+ <<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.entertainSkill = 25>>
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.health = random(30,60)>>
@@ -682,8 +682,8 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.butt = 1>>
<<set $activeSlave.anus = 0>>
<<set $activeSlave.weight = 0>>
- <<set $activeSlave.intelligence = either(-1, 1, 2)>>
- <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligence = random(-50,70)>>
+ <<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.entertainSkill = 25>>
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.health = random(30,60)>>
@@ -755,8 +755,8 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.butt = 1>>
<<set $activeSlave.anus = 0>>
<<set $activeSlave.weight = 0>>
- <<set $activeSlave.intelligence = either(-1, 1, 2)>>
- <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligence = random(-50,70)>>
+ <<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.entertainSkill = 25>>
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.health = random(30,60)>>
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index 4ac76364f03..e8614daf853 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -282,8 +282,8 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
<<set $oneTimeDisableDisability = 1>>
<<include "Generate XX Slave">>
<<set $activeSlave.origin = "She was the principal of a girls' school whose remnants you enslaved. A strap-on and a large quantity of personal lubricant were found in her possession when she was enslaved.">>
- <<set $activeSlave.intelligence = random(1,2)>>
- <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligence = random(16,80)>>
+ <<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.teeth = "normal">>
<<set $activeSlave.career = "a principal">>
<<set $activeSlave.devotion = -20>>
diff --git a/src/uncategorized/pRivalryCapture.tw b/src/uncategorized/pRivalryCapture.tw
index 3dcbcef03f9..9527724aba9 100644
--- a/src/uncategorized/pRivalryCapture.tw
+++ b/src/uncategorized/pRivalryCapture.tw
@@ -427,8 +427,8 @@ the delicious moment of finding your rival on her knees in front of you with a b
<<set $activeSlave.hLength = 80>>
<<set $activeSlave.addict = 10>>
<</switch>>
-<<set $activeSlave.intelligence = 3>>
-<<set $activeSlave.intelligenceImplant = 1>>
+<<set $activeSlave.intelligence = 100>>
+<<set $activeSlave.intelligenceImplant = 30>>
<<set $activeSlave.devotion = -20>>
<<set $activeSlave.trust = -10>>
<<set $activeSlave.origin = "She was once an arcology owner like yourself.">>
diff --git a/src/uncategorized/pRivalryHostage.tw b/src/uncategorized/pRivalryHostage.tw
index 60a10689967..1f0f6367582 100644
--- a/src/uncategorized/pRivalryHostage.tw
+++ b/src/uncategorized/pRivalryHostage.tw
@@ -45,7 +45,7 @@ Only a few days into your inter-arcology war, you receive a video message from y
<<set $activeSlave.actualAge = random(18,24)>>
<</if>>
<<set $activeSlave.face = 100>>
- <<set $activeSlave.intelligence = 2>>
+ <<set $activeSlave.intelligence = radom(51,95)>>
<<set $activeSlave.intelligenceImplant = 0>>
<<set $activeSlave.oralSkill = 100>>
<<set $activeSlave.entertainSkill = 100>>
@@ -58,7 +58,7 @@ Only a few days into your inter-arcology war, you receive a video message from y
<<set $activeSlave.actualAge = random(18,20)>>
<</if>>
<<set $activeSlave.face = 100>>
- <<set $activeSlave.intelligence = 0>>
+ <<set $activeSlave.intelligence = random(-15,15)>>
<<set $activeSlave.intelligenceImplant = 0>>
<<set $activeSlave.oralSkill = 100>>
<<set $activeSlave.entertainSkill = 100>>
@@ -79,7 +79,7 @@ Only a few days into your inter-arcology war, you receive a video message from y
<<set $activeSlave.actualAge = random(18,20)>>
<</if>>
<<set $activeSlave.face = 25>>
- <<set $activeSlave.intelligence = -1>>
+ <<set $activeSlave.intelligence = random(-50,-16)>>
<<set $activeSlave.intelligenceImplant = 0>>
<<set $activeSlave.oralSkill = 15>>
<<set $activeSlave.entertainSkill = 0>>
@@ -111,8 +111,8 @@ Only a few days into your inter-arcology war, you receive a video message from y
<<set $activeSlave.actualAge = random(18,21)>>
<</if>>
<<set $activeSlave.face = 75>>
- <<set $activeSlave.intelligence = 3>>
- <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligence = 100>>
+ <<set $activeSlave.intelligenceImplant = 30>>
<<case "capitalist">>
career in venture capital. She was a rising manager, young, attractive, and bright. You never worked particularly closely with her,
<<set $activeSlave.career = "a manager">>
@@ -122,8 +122,8 @@ Only a few days into your inter-arcology war, you receive a video message from y
<<set $activeSlave.actualAge = random(18,24)>>
<</if>>
<<set $activeSlave.face = 55>>
- <<set $activeSlave.intelligence = 3>>
- <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligence = 100>>
+ <<set $activeSlave.intelligenceImplant = 30>>
<<case "mercenary">>
career as a mercenary. She was in logistical support, and was clever and pretty, but without the essential hardness. You were never that close,
<<set $activeSlave.career = "a soldier">>
@@ -133,8 +133,8 @@ Only a few days into your inter-arcology war, you receive a video message from y
<<set $activeSlave.actualAge = random(20,24)>>
<</if>>
<<set $activeSlave.face = 55>>
- <<set $activeSlave.intelligence = 3>>
- <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligence = 100>>
+ <<set $activeSlave.intelligenceImplant = 15>>
<<case "engineer">>
career as an arcology engineer. She was a glorified saleswoman, with the gorgeous looks and extreme intelligence necessary to sell entire arcologies. You were never close,
<<set $activeSlave.career = "a saleswoman">>
@@ -144,8 +144,8 @@ Only a few days into your inter-arcology war, you receive a video message from y
<<set $activeSlave.actualAge = random(18,24)>>
<</if>>
<<set $activeSlave.face = 100>>
- <<set $activeSlave.intelligence = 3>>
- <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligence = 100>>
+ <<set $activeSlave.intelligenceImplant = 30>>
<<case "medicine">>
career in medicine. She was a surgical nurse, one of the best. She was smart, pretty, and she had sure hands. You were never that close,
<<set $activeSlave.career = "a nurse">>
@@ -155,8 +155,8 @@ Only a few days into your inter-arcology war, you receive a video message from y
<<set $activeSlave.actualAge = random(16,24)>>
<</if>>
<<set $activeSlave.face = 55>>
- <<set $activeSlave.intelligence = 3>>
- <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligence = 100>>
+ <<set $activeSlave.intelligenceImplant = 30>>
<<case "slaver">>
career as a slaver. She was a guard in one of the slave receiving pens, and a notorious one, at that. Nobody was quite as eager to break in new girls as she was. You were never that close,
<<set $activeSlave.career = "a prison guard">>
@@ -167,7 +167,7 @@ Only a few days into your inter-arcology war, you receive a video message from y
<</if>>
<<set $activeSlave.energy = 100>>
<<set $activeSlave.face = 55>>
- <<set $activeSlave.intelligence = 2>>
+ <<set $activeSlave.intelligence = random(51,95)>>
<<set $activeSlave.intelligenceImplant = 0>>
<<set $activeSlave.muscles = 20>>
<<set $activeSlave.fetish = "sadist">>
@@ -182,7 +182,7 @@ Only a few days into your inter-arcology war, you receive a video message from y
<<set $activeSlave.actualAge = random(18,24)>>
<</if>>
<<set $activeSlave.face = 100>>
- <<set $activeSlave.intelligence = 2>>
+ <<set $activeSlave.intelligence = radom(51,95)>>
<<set $activeSlave.intelligenceImplant = 0>>
<<set $activeSlave.oralSkill = 100>>
<<set $activeSlave.entertainSkill = 100>>
@@ -195,7 +195,7 @@ Only a few days into your inter-arcology war, you receive a video message from y
<<set $activeSlave.actualAge = random(36,39)>>
<</if>>
<<set $activeSlave.face = 100, $activeSlave.faceImplant = 15>>
- <<set $activeSlave.intelligence = 3, $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligence = 100, $activeSlave.intelligenceImplant = 30>>
<<set $activeSlave.whoreSkill = 100, $activeSlave.entertainSkill = 100>>
<</switch>>
<<set $activeSlave.visualAge = $activeSlave.actualAge>>
diff --git a/src/uncategorized/pSlaveMedic.tw b/src/uncategorized/pSlaveMedic.tw
index 9ca7c89ef0e..47376d137c8 100644
--- a/src/uncategorized/pSlaveMedic.tw
+++ b/src/uncategorized/pSlaveMedic.tw
@@ -21,15 +21,15 @@
<<set $activeSlave.oldDevotion = $activeSlave.devotion>>
<<set $activeSlave.vagina = 2>>
<<set $activeSlave.preg = -1>>
-<<set $activeSlave.muscles = either(20,50)>>
+<<set $activeSlave.muscles = random(20,50)>>
<<set $activeSlave.ovaries = 1>>
<<set $activeSlave.vaginalSkill = 35>>
<<set $activeSlave.oralSkill = 35>>
<<set $activeSlave.analSkill = 15>>
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.entertainSkill = 15>>
-<<set $activeSlave.intelligence = 2>>
-<<set $activeSlave.intelligenceImplant = 1>>
+<<set $activeSlave.intelligence = random(51,95)>>
+<<set $activeSlave.intelligenceImplant = 15>>
<<if $activeSlave.physicalAge >= 12>>
<<set $activeSlave.teeth = "cosmetic braces">>
<</if>>
@@ -52,7 +52,7 @@ You make a habit of dropping in on your mercenaries whenever you get the chance.
When you enter the lounge of their <<if $barracks>>barracks<<else>>main living area<</if>>, you see $activeSlave.slaveName kneeling next to a mercenary with most of his armor stripped off. She's the <<if $activeSlave.nationality == "a Cook Islander">>Cook Islander<<elseif $activeSlave.nationality == "a Liechtensteiner">>Liechtensteiner<<elseif $activeSlave.nationality == "a New Zealander">>New Zealander<<elseif $activeSlave.nationality == "a Solomon Islander">>Solomon Islander<<else>>$activeSlave.nationality<</if>> nurse they captured and enslaved, and she seems to be doing pretty well in her new life. She seems to be checking the sutures on a minor wound to the man's flank.
-"Don't squirm!" she says with an annoyed tone. "I'll get you off when I've checked this." He chuckles and holds still; she redresses the wound, stands up, and strips off her tank top, allowing her huge tits to swing free. She's quite young, but her $activeSlave.skin body is quite curvy. As she swings one leg across the seated mercenary, she continues, "Please sit still and let me do the work. You need to take it easy for a day or two or you'll pop those sutures." Using her hands, she gently caresses his stiff prick with her pillowy breasts, eliciting a grunt. She's a strong girl, and pleasures him without letting any of her weight rest on his body at all. When he climaxes, she leans in to clean him with her mouth and then heads off to wash.
+"Don't squirm!" she says with an annoyed tone. "I'll get you off when I've checked this." He chuckles and holds still; she redresses the wound, stands up, and strips off her tank top, allowing her huge tits to swing free. She's quite young, but her $activeSlave.skin body is appealingly curvy. As she swings one leg across the seated mercenary, she continues, "Please sit still and let me do the work. You need to take it easy for a day or two or you'll pop those sutures." Using her hands, she gently caresses his stiff prick with her pillowy breasts, eliciting a grunt. She's a strong girl, and pleasures him without letting any of her weight rest on his body at all. When he climaxes, she leans in to clean him with her mouth and then heads off to wash out her cleavage.
<<else>>
@@ -71,15 +71,15 @@ When you enter the lounge of their <<if $barracks>>barracks<<else>>main living a
<<set $activeSlave.vagina = 2>>
<<set $activeSlave.preg = -1>>
<<set $activeSlave.height = random(165,190)>>
-<<set $activeSlave.muscles = either(20,50)>>
+<<set $activeSlave.muscles = random(20,50)>>
<<set $activeSlave.ovaries = 1>>
<<set $activeSlave.vaginalSkill = 35>>
<<set $activeSlave.oralSkill = 35>>
<<set $activeSlave.analSkill = 15>>
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.entertainSkill = 15>>
-<<set $activeSlave.intelligence = 2>>
-<<set $activeSlave.intelligenceImplant = 1>>
+<<set $activeSlave.intelligence = random(51,95)>>
+<<set $activeSlave.intelligenceImplant = 30>>
<<set $activeSlave.teeth = "normal">>
<<set $activeSlave.anus = 2>>
<<set $activeSlave.boobs += 400>>
diff --git a/src/uncategorized/peConcubineInterview.tw b/src/uncategorized/peConcubineInterview.tw
index a6d825bfdb5..04e898a4bc0 100644
--- a/src/uncategorized/peConcubineInterview.tw
+++ b/src/uncategorized/peConcubineInterview.tw
@@ -220,14 +220,14 @@ You receive an official communication from a popular talk show ehosted in one of
<</if>>
<br>
The interview winds on, gradually descending into prurient territory. $activeSlave.slaveName answers readily, giving everyone watching quite a window into an oversexed slave society.
- <<if $activeSlave.intelligence > 0>>
+ <<if $activeSlave.intelligence+$activeSlave.intelligenceImplant > 15>>
She's clever enough to @@.green;shock and titillate@@ at the same time; in response to a probing question about whether she has any plans for the rest of the night, she <<say>>s, "Of cour<<s>>e my <<Master>> make<<s>> the plan<<s>>. But I hope I can get back to the arcology early." She shifts suggestively in her chair. "I'm looking forward to getting fucked tonight."
<<set $rep += 100>>
<<else>>
She's rather blunt in her responses, answering with a little too much detail; not that the audience minds.
<</if>>
The host, taken off guard, laughs in surprise and says he envies you that. He asks a follow up question that hints at her sexual preferences without coming straight out and asking how she likes it.
- <<if $activeSlave.intelligence + $activeSlave.intelligenceImplant + Math.floor($activeSlave.entertainSkill/50) >= 3 && $activeSlave.tankBaby == 0>>
+ <<if $activeSlave.intelligence + $activeSlave.intelligenceImplant + $activeSlave.entertainSkill >= 130 && $activeSlave.tankBaby == 0>>
She has enough knowledge of the old world to be able to answer without going too far, and @@.green;subtly alludes@@ to how much she enjoys
<<if ($activeSlave.fetish == "submissive")>>
submitting to you in bed.
@@ -300,7 +300,7 @@ You receive an official communication from a popular talk show ehosted in one of
<</if>>
in a matter-of-fact tone of voice.
<</if>>
- <<if $activeSlave.intelligence > 1>>
+ <<if $activeSlave.intelligence+$activeSlave.intelligenceImplant > 50>>
<br>
Only because you know her so well are you able to perceive the instant of cold calculation before she makes a @@.green;perfect tactical decision@@ and turns directly to the camera. "Whatever you want," she <<say>>s confidently, "You can find it in a Free Citie<<s>> arcology like my <<Master>>'<<s>>. Where I live, there'<<s>>
<<if $arcologies[0].FSRestart > 0>>
@@ -387,7 +387,7 @@ You receive an official communication from a popular talk show ehosted in one of
<<set $rep += 300>>
The host politely regains control of his show, but there's a cautious respect in the rest of his questions.
<</if>>
- <<if $activeSlave.intelligenceImplant == 1 && $PC.title == 0>>
+ <<if $activeSlave.intelligence+$activeSlave.intelligenceImplant > 50 && $PC.title == 0>>
<br>
$activeSlave.slaveName even manages to @@.green;respond well@@ to a probing question about your gender.
She <<if _lisps>>lisps<<else>>explains<</if>>, "You have to under<<s>>tand that all that non<<s>>en<<s>>e about men and women mean<<s>> le<<ss>> to u<<s>> in the Free Citie<<s>>. My <<Master>> i<<s>> a <<s>>u<<cc>>e<<ss>>ful and powerful woman.
diff --git a/src/uncategorized/reBoomerang.tw b/src/uncategorized/reBoomerang.tw
index cf911f52cd3..99de90a8738 100644
--- a/src/uncategorized/reBoomerang.tw
+++ b/src/uncategorized/reBoomerang.tw
@@ -106,7 +106,7 @@ brings up the relevant feeds. There's a naked body crumpled pathetically against
<<set $activeSlave.balls = Math.clamp($activeSlave.balls+random(1,2),0,10)>>
<<if $activeSlave.dick>><<set $activeSlave.dick = Math.clamp($activeSlave.dick+random(1,2),0,10)>><</if>>
<</if>>
- <<set $activeSlave.intelligence = Math.clamp($activeSlave.intelligence-2,-3,3)>>
+ <<set $activeSlave.intelligence = Math.clamp($activeSlave.intelligence-50,-100,100)>>
<<case "volume breeder" "preg fetishist">>
<<switch _buyer>>
<<case "preg fetishist">>
@@ -289,7 +289,7 @@ brings up the relevant feeds. There's a naked body crumpled pathetically against
"Take me back, or kill me," she <<say>>s. You sold her to an arcade, and it's surprising she managed to make it up here at all. "Plea<<s>>e," she begs. "I will do literally anything. I c-can feel my<<s>>elf going c-cra<<z>>y. I'd rather die."
<<set $activeSlave.anus = 4>>
<<if $activeSlave.vagina != -1>><<set $activeSlave.vagina = 4>><</if>>
- <<set $activeSlave.intelligence = Math.clamp($activeSlave.intelligence-2,-3,3)>>
+ <<set $activeSlave.intelligence = Math.clamp($activeSlave.intelligence-50,-100,100)>>
<<set $activeSlave.behavioralFlaw = "odd", $activeSlave.sexualFlaw = "apathetic">>
<<case "harvester">>
"I'm ju<<s>>t kept in a pen unle<<ss>> they're d-doing <<s>>urgery on me." It's not surprising; you did sell her to an organ farm. What's unexpected is that she's still alive. They must be removing the less essential parts gradually. "I'm going to die," she <<say>>s hollowly. "Next <<s>>urgery, I won't wake up."
@@ -339,7 +339,7 @@ It isn't obvious how she managed to escape, though no doubt you could review the
<<if $activeSlave.trust > 95>>
"Plea<<s>>e," she sobs, breaking down at last. "I th-thought I w-wa<<s>> a g-good girl. T-take me b-back and I'll p-pretend I n-never left. I'll d-do anything you a<<s>>k. I'll worship the ground you walk on. Plea<<s>>e."
<<set $activeSlave.devotion = 100>>
-<<elseif $activeSlave.intelligence < 0>>
+<<elseif $activeSlave.intelligence+$activeSlave.intelligenceImplant < -15>>
"Plea<<s>>e," she sobs, breaking down at last. "I d-don't know where el<<s>>e to go." That much you believe; she's an idiot.
<<else>>
"I know I'll be caught," she sobs, breaking down at last. "I know you'd f-find me. <<S>>o I came here. Plea<<s>>e." She's right about that much. This is literally the only chance she has of getting away from her current owners.
diff --git a/src/uncategorized/reCitizenHookup.tw b/src/uncategorized/reCitizenHookup.tw
index 81308844381..ef5dbd04b7b 100644
--- a/src/uncategorized/reCitizenHookup.tw
+++ b/src/uncategorized/reCitizenHookup.tw
@@ -202,7 +202,7 @@ She's clearly attracted to you; even the most consummate actress would have diff
<br><<link "To them that hath, it shall be given">>
<<replace "#result">>
You're not exactly starved for casual sex, but you've never thought there was any such thing as too much of a good thing. You place a <<if $PC.title == 1>>masculine<<else>>feminine<</if>> hand against the small of her back, feeling the warmth of her through the material of her evening wear. You hear a slight gasp from her as she realizes that her gambit has succeeded with more immediate effect than she expected. She shivers with anticipation as you steer her back through a side door, making a discreet exit towards your private suite.
- <<if $Concubine != 0 && $Concubine.intelligence > 1>>
+ <<if $Concubine != 0 && $Concubine.intelligence+$Concubine.intelligenceImplant > 50>>
$Concubine.slaveName is there, of course, and she instantly sees that her continued presence for a ménage à trois is wanted by both you and your guest.
<</if>>
Your guest restrains her eager praise now that you're in private, but her wide-eyed appreciation of your domain is compliment enough. Once in your suite, she strips, revealing
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index a7379c3c1a6..704261ce0c8 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -289,8 +289,8 @@
<<set $activeSlave.health = random(40,60)>>
<<set $activeSlave.devotion = random(25,45)>>
<<set $activeSlave.trust = random(25,45)>>
-<<set $activeSlave.intelligence = 2>>
-<<set $activeSlave.intelligenceImplant = 1>>
+<<set $activeSlave.intelligence = random(51,95)>>
+<<set $activeSlave.intelligenceImplant = 15>>
<<if $activeSlave.physicalAge >= 12>>
<<set $activeSlave.teeth = "normal">>
<</if>>
@@ -449,7 +449,7 @@
<<set $activeSlave.health = random(-40,30)>>
<<set $activeSlave.devotion = random(10,15)>>
<<set $activeSlave.trust = random(-55,-75)>>
-<<set $activeSlave.intelligence = -2>>
+<<set $activeSlave.intelligence = random(-95,-51)>>
<<set $activeSlave.anus = random(2,3)>>
<<set $activeSlave.weight = random(-80,-20)>>
<<set $activeSlave.boobs -= 50*random(1,2)>>
@@ -507,8 +507,8 @@
<<set $activeSlave.trust = random(25,45)>>
<<set $activeSlave.career = setup.educatedCareers.random()>>
<<set $activeSlave.health = random(-60,-50)>>
-<<set $activeSlave.intelligence = 2>>
-<<set $activeSlave.intelligenceImplant = 1>>
+<<set $activeSlave.intelligence = random(51,95)>>
+<<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.teeth = "normal">>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.behavioralFlaw = "arrogant">>
@@ -590,8 +590,8 @@
<<set $activeSlave.trust = random(25,45)>>
<<set $activeSlave.career = setup.educatedCareers.random()>>
<<set $activeSlave.health = random(-60,-50)>>
-<<set $activeSlave.intelligence = 2>>
-<<set $activeSlave.intelligenceImplant = 1>>
+<<set $activeSlave.intelligence = random(51,95)>>
+<<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.teeth = "normal">>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
@@ -638,7 +638,7 @@
<<set $activeSlave.devotion = random(-15,15)>>
<<set $activeSlave.trust = random(-15,15)>>
<<set $activeSlave.health = random(-60,-50)>>
-<<set $activeSlave.intelligence = random(0,2)>>
+<<set $activeSlave.intelligence = random(0,90)>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.behavioralFlaw = either("anorexic", "odd")>>
@@ -664,7 +664,7 @@
<<set $activeSlave.devotion = random(-15,15)>>
<<set $activeSlave.trust = random(-15,15)>>
<<set $activeSlave.health = random(-60,-50)>>
-<<set $activeSlave.intelligence = random(0,2)>>
+<<set $activeSlave.intelligence = random(0,90)>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<slaveCost $activeSlave>>
<<set $slaveCost -= 1000>>
@@ -682,7 +682,7 @@
<<set $activeSlave.addict = 1>>
<<set $activeSlave.devotion = random(0,15)>>
<<set $activeSlave.trust = random(0,15)>>
-<<set $activeSlave.intelligence = either(-2,-1)>>
+<<set $activeSlave.intelligence = either(-95,-16)>>
<<set $activeSlave.intelligenceImplant = 0>>
<<slaveCost $activeSlave>>
<<set $slaveCost -= 1000>>
@@ -868,8 +868,8 @@
<<include "Generate XX Slave">>
<<set $activeSlave.origin = "She thought she was important; she was not.">>
<<set $activeSlave.career = "a student from a private school">>
-<<set $activeSlave.intelligence = random(1,2)>>
-<<set $activeSlave.intelligenceImplant = 1>>
+<<set $activeSlave.intelligence = random(16,95)>>
+<<set $activeSlave.intelligenceImplant = 30>>
<<set $activeSlave.health = random(20,40)>>
<<set $activeSlave.devotion = random(-100,-90)>>
<<set $activeSlave.trust = random(-100,-90)>>
@@ -922,8 +922,8 @@
<<set $activeSlave.oralSkill = 0>>
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.entertainSkill = 0>>
-<<set $activeSlave.intelligence = random(1,2)>>
-<<set $activeSlave.intelligenceImplant = 1>>
+<<set $activeSlave.intelligence = random(16,95)>>
+<<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.teeth = "normal">>
<<slaveCost $activeSlave>>
<<set $slaveCost -= 1000>>
@@ -948,8 +948,8 @@
<<set $activeSlave.oralSkill = 1>>
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.entertainSkill = 0>>
-<<set $activeSlave.intelligence = random(1,2)>>
-<<set $activeSlave.intelligenceImplant = 1>>
+<<set $activeSlave.intelligence = random(16,95)>>
+<<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.teeth = "normal">>
<<slaveCost $activeSlave>>
<<set $slaveCost -= 1000>>
@@ -976,8 +976,8 @@
<<set $activeSlave.vaginalSkill = 0>>
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.entertainSkill = 0>>
-<<set $activeSlave.intelligence = random(-1,1)>>
-<<set $activeSlave.intelligenceImplant = 1>>
+<<set $activeSlave.intelligence = random(-50,50)>>
+<<set $activeSlave.intelligenceImplant = 15>>
<<if $activeSlave.physicalAge >= 12>>
<<set $activeSlave.teeth = "normal">>
<</if>>
@@ -1004,8 +1004,8 @@
<<set $activeSlave.analSkill = 15>>
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.entertainSkill = 100>>
-<<set $activeSlave.intelligence = 2>>
-<<set $activeSlave.intelligenceImplant = 1>>
+<<set $activeSlave.intelligence = random(51,95)>>
+<<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.teeth = "normal">>
<<set $activeSlave.sexualFlaw = either("idealistic")>>
<<slaveCost $activeSlave>>
@@ -1029,8 +1029,8 @@
<<set $activeSlave.analSkill = random(15,40)>>
<<set $activeSlave.whoreSkill = random(15,40)>>
<<set $activeSlave.entertainSkill = random(15,40)>>
-<<set $activeSlave.intelligence = 2>>
-<<set $activeSlave.intelligenceImplant = 1>>
+<<set $activeSlave.intelligence = random(51,95)>>
+<<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.teeth = "normal">>
<<set $activeSlave.behavioralFlaw = either("arrogant")>>
<<slaveCost $activeSlave>>
diff --git a/src/uncategorized/reFSEgyptianRevivalistAcquisitionWorkaround.tw b/src/uncategorized/reFSEgyptianRevivalistAcquisitionWorkaround.tw
index 6ae818f1e71..b3ddc6de9f8 100644
--- a/src/uncategorized/reFSEgyptianRevivalistAcquisitionWorkaround.tw
+++ b/src/uncategorized/reFSEgyptianRevivalistAcquisitionWorkaround.tw
@@ -31,7 +31,7 @@ They arrive hand-in-hand and don't let go of each other until the end of the ens
<<set _secondSlave.hStyle = either("ass-length", "long", "shoulder-length", "short", "very short", "shaved bald")>>
<<if (_secondSlave.actualAge <= 22)>>
<<set _secondSlave.career = setup.youngCareers.random()>>
-<<elseif (_secondSlave.intelligenceImplant == 1)>>
+<<elseif (_secondSlave.intelligenceImplant >= 15)>>
<<set _secondSlave.career = setup.educatedCareers.random()>>
<<else>>
<<set _secondSlave.career = setup.uneducatedCareers.random()>>
diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index e0704bebdd1..7c0cd0c6586 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -173,16 +173,16 @@
<<if ($activeSlave.amp == 1)>>
<<set $qualifiedNicknames.push("amp")>>
<</if>>
-<<if ($activeSlave.boobsImplant > 1000) || ($activeSlave.buttImplant > 3)>>
+<<if Math.floor($activeSlave.boobsImplant/$activeSlave.boobs) >= .60 || Math.floor($activeSlave.buttImplant/$activeSlave.butt) > .60>>
<<set $qualifiedNicknames.push("implants")>>
<</if>>
-<<if ($activeSlave.boobsImplant >= 750) && ($activeSlave.buttImplant >= 2) && ($activeSlave.lipsImplant >= 1) && ($activeSlave.intelligence < -1)>>
+<<if ($activeSlave.boobsImplant >= 750) && Math.floor($activeSlave.boobsImplant/$activeSlave.boobs) >= .60 && ($activeSlave.buttImplant >= 2) && Math.floor($activeSlave.buttImplant/$activeSlave.butt) > .60 && ($activeSlave.lipsImplant >= 10) && Math.floor($activeSlave.lipsImplant/$activeSlave.lips) > .30 && ($activeSlave.intelligence+$activeSlave.intelligenceImplant < -15)>>
<<set $qualifiedNicknames.push("bimbo")>>
<</if>>
-<<if ($activeSlave.intelligence < -2)>>
+<<if ($activeSlave.intelligence+$activeSlave.intelligenceImplant < -50)>>
<<set $qualifiedNicknames.push("stupid")>>
<</if>>
-<<if ($activeSlave.intelligence > 2)>>
+<<if ($activeSlave.intelligence+$activeSlave.intelligenceImplant > 50)>>
<<set $qualifiedNicknames.push("smart")>>
<</if>>
<<if ($activeSlave.eyes == -2)>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index 1ec6141133c..f39a11771e2 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -229,8 +229,8 @@
<<set $activeSlave.hStyle = "neat">>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
-<<set $activeSlave.intelligenceImplant = 1>>
-<<set $activeSlave.intelligence = 3>>
+<<set $activeSlave.intelligenceImplant = 15>>
+<<set $activeSlave.intelligence = 100>>
<<set $activeSlave.prestige = 3>>
<<set $activeSlave.prestigeDesc = "She was a famous young musical prodigy known throughout both the old world and the free cities.">>
<<set $activeSlave.accent = 1>>
@@ -443,8 +443,8 @@
<<set $activeSlave.anus = 0>>
<<set $activeSlave.weight = 0>>
<<set $activeSlave.muscles = 20>>
-<<set $activeSlave.intelligence = random(1,2)>>
-<<set $activeSlave.intelligenceImplant = 1>>
+<<set $activeSlave.intelligence = random(16,90)>>
+<<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.teeth = "normal">>
<<set $activeSlave.career = "a student">>
<<set $activeSlave.behavioralFlaw = "liberated">>
@@ -477,8 +477,8 @@
<<set $activeSlave.scrotum = $activeSlave.balls>>
<<set $activeSlave.weight = 0>>
<<set $activeSlave.muscles = 50>>
-<<set $activeSlave.intelligence = random(1,2)>>
-<<set $activeSlave.intelligenceImplant = 1>>
+<<set $activeSlave.intelligence = random(15,90)>>
+<<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.teeth = "normal">>
<<set $activeSlave.career = "a student">>
<<set $activeSlave.behavioralFlaw = "liberated">>
@@ -509,8 +509,8 @@
<<set $activeSlave.anus = 0>>
<<set $activeSlave.weight = random(100,180)>>
<<set $activeSlave.muscles = random(-20,0)>>
-<<set $activeSlave.intelligence = random(-1,2)>>
-<<set $activeSlave.intelligenceImplant = 1>>
+<<set $activeSlave.intelligence = random(-50,90)>>
+<<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.teeth = "normal">>
<<set $activeSlave.career = "a student">>
<<set $activeSlave.behavioralFlaw = "hates men">>
@@ -559,8 +559,8 @@
<<set $activeSlave.anus = 0>>
<<set $activeSlave.weight = 0>>
<<set $activeSlave.muscles = 20>>
-<<set $activeSlave.intelligence = random(-1,1)>>
-<<set $activeSlave.intelligenceImplant = 1>>
+<<set $activeSlave.intelligence = random(-50,50)>>
+<<set $activeSlave.intelligenceImplant = 15>>
<<if $activeSlave.physicalAge >= 12>>
<<set $activeSlave.teeth = "normal">>
<</if>>
@@ -595,8 +595,8 @@
<<set $activeSlave.balls = 0>>
<<set $activeSlave.weight = 0>>
<<set $activeSlave.muscles = 20>>
-<<set $activeSlave.intelligence = random(-1,1)>>
-<<set $activeSlave.intelligenceImplant = 1>>
+<<set $activeSlave.intelligence = random(-50,50)>>
+<<set $activeSlave.intelligenceImplant = 15>>
<<if $activeSlave.physicalAge >= 12>>
<<set $activeSlave.teeth = "normal">>
<</if>>
@@ -631,8 +631,8 @@
<<set $activeSlave.scrotum = $activeSlave.balls>>
<<set $activeSlave.weight = 0>>
<<set $activeSlave.muscles = 20>>
-<<set $activeSlave.intelligence = random(-1,1)>>
-<<set $activeSlave.intelligenceImplant = 1>>
+<<set $activeSlave.intelligence = random(-50,50)>>
+<<set $activeSlave.intelligenceImplant = 15>>
<<if $activeSlave.physicalAge >= 12>>
<<set $activeSlave.teeth = "normal">>
<</if>>
@@ -699,7 +699,7 @@
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.anus = 3>>
-<<set $activeSlave.intelligence = random(-1,1)>>
+<<set $activeSlave.intelligence = random(-50,50)>>
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.fetish = "submissive">>
<<set $activeSlave.behavioralFlaw = "hates men">>
@@ -745,7 +745,7 @@
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.anus = 3>>
-<<set $activeSlave.intelligence = random(-1,1)>>
+<<set $activeSlave.intelligence = random(-50,50)>>
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.fetish = "submissive">>
<<set $activeSlave.behavioralFlaw = "hates men">>
@@ -789,7 +789,7 @@
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.anus = 3>>
-<<set $activeSlave.intelligence = random(-1,1)>>
+<<set $activeSlave.intelligence = random(-50,50)>>
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.fetish = "submissive">>
<<set $activeSlave.behavioralFlaw = "hates men">>
@@ -836,7 +836,7 @@
<<set $activeSlave.weight = 0>>
<<set $activeSlave.waist = -20>>
<<set $activeSlave.muscles = random(10,50)>>
-<<set $activeSlave.intelligence = random(0,1)>>
+<<set $activeSlave.intelligence = random(-15,50)>>
<<set $activeSlave.career = "a dancer">>
<<set $activeSlave.fetish = "submissive">>
<<set $activeSlave.behavioralFlaw = "devout">>
@@ -881,7 +881,7 @@
<<set $activeSlave.weight = 0>>
<<set $activeSlave.waist = -20>>
<<set $activeSlave.muscles = random(10,50)>>
-<<set $activeSlave.intelligence = random(0,1)>>
+<<set $activeSlave.intelligence = random(-15,50)>>
<<set $activeSlave.career = "a dancer">>
<<set $activeSlave.fetish = "dom">>
<<set $activeSlave.behavioralQuirk = "sinful">>
@@ -928,7 +928,7 @@
<</if>>
<<set $activeSlave.weight = 0>>
<<set $activeSlave.muscles = 50>>
-<<set $activeSlave.intelligence = random(-1,1)>>
+<<set $activeSlave.intelligence = random(-50,50)>>
<<set $activeSlave.career = "an athlete">>
<<set $activeSlave.fetish = "dom">>
<<set $activeSlave.behavioralFlaw = "arrogant">>
@@ -979,7 +979,7 @@
<<set $activeSlave.weight = 0>>
<<set $activeSlave.muscles = 20>>
<<set $activeSlave.shoulders = 0>>
-<<set $activeSlave.intelligence = random(-1,1)>>
+<<set $activeSlave.intelligence = random(-50,50)>>
<<set $activeSlave.entertainSkill = 15>>
<<set $activeSlave.career = "an athlete">>
<<set $activeSlave.fetish = "submissive">>
@@ -1019,7 +1019,7 @@
<<set $activeSlave.anus = 0>>
<<set $activeSlave.weight = 0>>
<<set $activeSlave.muscles = 50>>
-<<set $activeSlave.intelligence = random(0,1)>>
+<<set $activeSlave.intelligence = random(-15,50)>>
<<set $activeSlave.entertainSkill = 35>>
<<set $activeSlave.career = "an athlete">>
<<set $activeSlave.fetish = "pregnancy">>
@@ -1058,7 +1058,7 @@
<<set $activeSlave.weight = random(-50,0)>>
<<set $activeSlave.muscles = random(0,15)>>
<<set $activeSlave.shoulders = random(-1,1)>>
-<<set $activeSlave.intelligence = random(-1,1)>>
+<<set $activeSlave.intelligence = random(-50,50)>>
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.fetish = "submissive">>
<<set $activeSlave.behavioralQuirk = "insecure">>
@@ -1094,7 +1094,7 @@
<<set $activeSlave.weight = random(-80,20)>>
<<set $activeSlave.muscles = random(0,15)>>
<<set $activeSlave.shoulders = random(-1,1)>>
-<<set $activeSlave.intelligence = random(-1,1)>>
+<<set $activeSlave.intelligence = random(-50,50)>>
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.fetish = "submissive">>
<<set $activeSlave.behavioralQuirk = "adores women">>
@@ -1140,7 +1140,7 @@
<<set $activeSlave.weight = random(-80,20)>>
<<set $activeSlave.muscles = random(0,15)>>
<<set $activeSlave.shoulders = random(0,2)>>
-<<set $activeSlave.intelligence = random(-2,1)>>
+<<set $activeSlave.intelligence = random(-95,50)>>
<<set $activeSlave.nosePiercing = 2>>
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.fetish = "pregnancy">>
@@ -1184,7 +1184,7 @@
<<set $activeSlave.weight = random(-80,20)>>
<<set $activeSlave.muscles = random(10,50)>>
<<set $activeSlave.shoulders = random(1,2)>>
-<<set $activeSlave.intelligence = random(-2,1)>>
+<<set $activeSlave.intelligence = random(-95,50)>>
<<set $activeSlave.nosePiercing = 2>>
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.fetish = "pregnancy">>
@@ -1220,7 +1220,7 @@
<<set $activeSlave.weight = random(-80,20)>>
<<set $activeSlave.muscles = random(0,40)>>
<<set $activeSlave.shoulders = random(-1,2)>>
-<<set $activeSlave.intelligence = random(-2,1)>>
+<<set $activeSlave.intelligence = random(-95,50)>>
<<set $activeSlave.nosePiercing = 2>>
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.fetish = "pregnancy">>
@@ -1257,7 +1257,7 @@
<<set $activeSlave.weight = random(-80,20)>>
<<set $activeSlave.muscles = random(0,40)>>
<<set $activeSlave.shoulders = random(-1,2)>>
-<<set $activeSlave.intelligence = random(-1,1)>>
+<<set $activeSlave.intelligence = random(-50,50)>>
<<set $activeSlave.career = "an orphan">>
<<set $activeSlave.fetish = "pregnancy">>
<<set $activeSlave.behavioralFlaw = either("bitchy", "hates men", "hates women")>>
@@ -1301,7 +1301,7 @@
<<set $activeSlave.waist = random(-40,0)>>
<<set $activeSlave.muscles = 0>>
<<set $activeSlave.shoulders = random(-1,0)>>
-<<set $activeSlave.intelligence = random(-1,1)>>
+<<set $activeSlave.intelligence = random(-50,50)>>
<<set $activeSlave.career = "an orphan">>
<<set $activeSlave.fetish = "humiliation">>
<<set $activeSlave.behavioralQuirk = either("funny", "adores women", "adores men", "insecure")>>
@@ -1338,7 +1338,7 @@
<<set $activeSlave.weight = random(-20,0)>>
<<set $activeSlave.muscles = 0>>
<<set $activeSlave.shoulders = random(-2,0)>>
-<<set $activeSlave.intelligence = -1>>
+<<set $activeSlave.intelligence = random(-50,-16)>>
<<set $activeSlave.career = "from an upper class family">>
<<set $activeSlave.fetish = "humiliation">>
<<set $activeSlave.behavioralFlaw = "arrogant">>
@@ -1368,7 +1368,7 @@
<<set $activeSlave.fetish = "none">>
<<set $activeSlave.fetishKnown = 0>>
<<set $activeSlave.health = random(-80,-60)>>
-<<set $activeSlave.intelligence = -1>>
+<<set $activeSlave.intelligence = random(-50,0)>>
<<set $activeSlave.intelligenceImplant = 0>>
<<set $activeSlave.career = setup.uneducatedCareers.random()>>
<<set $activeSlave.birthsTotal = 2>>
@@ -1401,7 +1401,7 @@
<<set $activeSlave.weight = random(-20,0)>>
<<set $activeSlave.muscles = 0>>
<<set $activeSlave.shoulders = random(-2,0)>>
-<<set $activeSlave.intelligence = -1>>
+<<set $activeSlave.intelligence = random(-50,-16)>>
<<set $activeSlave.career = "from an upper class family">>
<<set $activeSlave.behavioralFlaw = "arrogant">>
<<set $activeSlave.voice = 3>>
@@ -1430,7 +1430,7 @@
<<set $activeSlave.trust = random(25,45)>>
<<set $activeSlave.career = "an artist">>
<<set $activeSlave.health = random(-60,-50)>>
-<<set $activeSlave.intelligence = 1>>
+<<set $activeSlave.intelligence = random(16,50)>>
<<set $activeSlave.entertainSkill = 40>>
<<set $activeSlave.intelligenceImplant = 0>>
<<set $activeSlave.behavioralFlaw = "odd">>
@@ -1465,7 +1465,7 @@
<<set $activeSlave.weight = random(-50,0)>>
<<set $activeSlave.muscles = random(0,15)>>
<<set $activeSlave.shoulders = random(-1,1)>>
-<<set $activeSlave.intelligence = random(-1,1)>>
+<<set $activeSlave.intelligence = random(-50,50)>>
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.fetish = "submissive">>
<<set $activeSlave.behavioralQuirk = "insecure">>
@@ -1648,7 +1648,7 @@
<<include "Generate XX Slave">>
<<set $activeSlave.origin = "Her womb held a baby you desired.">>
<<set $activeSlave.face = 100>>
-<<set $activeSlave.intelligence = 3>>
+<<set $activeSlave.intelligence = random(96,100)>>
<<if $activeSlave.vagina < 1>>
<<set $activeSlave.vagina = 1>>
<</if>>
@@ -1685,8 +1685,8 @@
<<set $activeSlave.anus = 0>>
<<set $activeSlave.chem = 1500>>
<<set $activeSlave.clothes = "a comfortable bodysuit">>
-<<set $activeSlave.intelligence = 3>>
-<<set $activeSlave.intelligenceImplant = 1>>
+<<set $activeSlave.intelligence = 100>>
+<<set $activeSlave.intelligenceImplant = 30>>
<<set $activeSlave.energy = 0>>
<<set $activeSlave.attrXX = 0, $activeSlave.attrXY = 0>>
<<set $activeSlave.customLabel = "Z-23series">>
@@ -1737,7 +1737,7 @@
<<set $activeSlave.weight = 0>>
<<set $activeSlave.waist = -20>>
<<set $activeSlave.muscles = random(-20,10)>>
-<<set $activeSlave.intelligence = random(0,2)>>
+<<set $activeSlave.intelligence = random(0,90)>>
<<set $activeSlave.career = "a missionary">>
<<set $activeSlave.fetish = "submissive">>
<<set $activeSlave.fetishStrength = 100>>
diff --git a/src/uncategorized/resFailure.tw b/src/uncategorized/resFailure.tw
index 3219f1dc89d..1c84b9ed2cc 100644
--- a/src/uncategorized/resFailure.tw
+++ b/src/uncategorized/resFailure.tw
@@ -53,9 +53,9 @@
<<set $activeSlave.physicalAge = $activeSlave.actualAge>>
<<set $activeSlave.ovaryAge = $activeSlave.actualAge>>
<</if>>
- <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.teeth = "normal">>
- <<set $activeSlave.intelligence = either (-1, 0, 1, 2)>>
+ <<set $activeSlave.intelligence = random(-50,95)>>
<<set $activeSlave.devotion = random(25,45)>>
<<set $activeSlave.trust = random(25,45)>>
<<set $activeSlave.health = random(50,60)>>
@@ -106,7 +106,7 @@
<<set $activeSlave.anus = 1>>
<<set $activeSlave.vagina = 5>>
<<set $activeSlave.vaginaLube = 2>>
- <<set $activeSlave.intelligence = either(-3, -3, -3, -3, -2, -2, -1)>>
+ <<set $activeSlave.intelligence = either(-100, -100, -100, -96, -80, -70, -50)>>
<<set $activeSlave.devotion = 100>>
<<set $activeSlave.trust = 100>>
<<set $activeSlave.health = random(50,60)>>
@@ -219,13 +219,13 @@
<<set $activeSlave.career = "a slave">>
<<if $SCP.schoolUpgrade == 1>>
<<set $activeSlave.intelligenceImplant = 0>>
- <<set $activeSlave.intelligence = -2>>
+ <<set $activeSlave.intelligence = -70>>
<<set $activeSlave.devotion = 20>>
<<set $activeSlave.trust = 20>>
<<else>>
- <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.teeth = "normal">>
- <<set $activeSlave.intelligence = either(-1, 0, 1, 2)>>
+ <<set $activeSlave.intelligence = random(-50,50)>>
<<set $activeSlave.devotion = random(25,45)>>
<<set $activeSlave.trust = random(25,45)>>
<</if>>
@@ -357,9 +357,9 @@
<<include "Generate XY Slave">>
<<set $activeSlave.origin = "She was given to you by a failed branch campus of the intense Gymnasium-Academy right after her majority.">>
<<set $activeSlave.career = "a slave">>
- <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.teeth = "normal">>
- <<set $activeSlave.intelligence = either (-1, 0, 1, 2)>>
+ <<set $activeSlave.intelligence = random(-50,95)>>
<<set $activeSlave.chem = 20>>
<<if $TGA.schoolUpgrade == 1>>
<<set $activeSlave.devotion = 20>>
@@ -413,9 +413,9 @@
<<include "Generate XX Slave">>
<<set $activeSlave.origin = "She was given to you by a failed branch campus of the Hippolyta Academy right after her majority.">>
<<set $activeSlave.career = "a slave">>
- <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.teeth = "normal">>
- <<set $activeSlave.intelligence = either(0,1,2)>>
+ <<set $activeSlave.intelligence = random(0,95)>>
<<set $activeSlave.chem = 20>>
<<if $HA.schoolUpgrade == 1>>
<<set $activeSlave.devotion = 20>>
@@ -478,7 +478,7 @@
<<set $activeSlave.career = "a Futanari Sister">>
<<set $activeSlave.faceShape = either("sensual", "exotic")>>
<<if _slaveGenRange == 1>>
- <<set $activeSlave.intelligence = -1>>
+ <<set $activeSlave.intelligence = random(-50,-20)>>
<<set $activeSlave.chem = 150>>
<<set $activeSlave.butt = either(5,6)>>
<<set $activeSlave.hips = 1>>
@@ -512,7 +512,7 @@
<<set $activeSlave.anus = 2>>
<<set $activeSlave.fetish = "submissive">>
<<elseif _slaveGenRange == 2>>
- <<set $activeSlave.intelligence = 0>>
+ <<set $activeSlave.intelligence = random(-15,15)>>
<<set $activeSlave.chem = 200>>
<<set $activeSlave.butt = either(6,7)>>
<<set $activeSlave.hips = 2>>
@@ -546,7 +546,7 @@
<<set $activeSlave.anus = 2>>
<<set $activeSlave.fetish = either("buttslut", "cumslut")>>
<<elseif _slaveGenRange == 3>>
- <<set $activeSlave.intelligence = 1>>
+ <<set $activeSlave.intelligence = random(16,50)>>
<<set $activeSlave.chem = 250>>
<<set $activeSlave.butt = either(7,8)>>
<<set $activeSlave.hips = 2>>
@@ -580,7 +580,7 @@
<<set $activeSlave.anus = 3>>
<<set $activeSlave.fetish = either("buttslut", "cumslut")>>
<<else>>
- <<set $activeSlave.intelligence = 2>>
+ <<set $activeSlave.intelligence = random(51,95)>>
<<set $activeSlave.chem = 300>>
<<set $activeSlave.butt = either(8,9)>>
<<set $activeSlave.hips = 2>>
@@ -630,7 +630,7 @@
<<run SetBellySize($activeSlave)>>
<</if>>
<</if>>
- <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligenceImplant = 30>>
<<set $activeSlave.teeth = "normal">>
<<if $TFS.schoolUpgrade == 2>>
<<set $activeSlave.energy = 100>>
@@ -671,7 +671,7 @@
<<include "Generate XY Slave">>
<<set $activeSlave.origin = "She was the leader of your arcology's Futanari Sisters until you engineered her community's failure and enslavement.">>
<<set $activeSlave.career = "a Futanari Sister">>
- <<set $activeSlave.intelligence = 2>>
+ <<set $activeSlave.intelligence = random(51,95)>>
<<set $activeSlave.chem = 300>>
<<set $activeSlave.butt = either(8,9)>>
<<set $activeSlave.hips = 2>>
@@ -716,7 +716,7 @@
<<run SetBellySize($activeSlave)>>
<</if>>
<</if>>
- <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligenceImplant = 30>>
<<set $activeSlave.teeth = "normal">>
<<if $TFS.schoolUpgrade == 2>>
<<set $activeSlave.energy = 100>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 386ea6983ff..227993c081a 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -5945,7 +5945,7 @@
$His deafness forces $him to @@.gold;distrust everyone@@ as everything out of sight is a potential threat to $him.
<<set $slaves[$i].trust -= 10>>
<<else>>
- Being deaf forces $him to @@.gold;fear@@ everything he can't see. At any moment, something could jump on $his back and force $him into position.
+ Being deaf forces $him to @@.gold;fear@@ everything $he can't see. At any moment, something could jump on $his back and force $him into position.
<<set $slaves[$i].trust -= 25>>
<</if>>
<<elseif $slaves[$i].hears == -1>>
diff --git a/src/uncategorized/seCustomSlaveDelivery.tw b/src/uncategorized/seCustomSlaveDelivery.tw
index 23a44aec0b0..718e34f4e69 100644
--- a/src/uncategorized/seCustomSlaveDelivery.tw
+++ b/src/uncategorized/seCustomSlaveDelivery.tw
@@ -147,6 +147,23 @@
<<set $activeSlave.height = Math.round(Height.random($activeSlave, {skew: 5, spread: .15, limitMult: [2, 5]}))>>
<</if>>
+<<if $customSlave.intelligence == 3>>
+ <<set $activeSlave.intelligence = random(96,100)>>
+<<elseif $customSlave.intelligence == 2>>
+ <<set $activeSlave.intelligence = random(51,95)>>
+<<elseif $customSlave.intelligence == 1>>
+ <<set $activeSlave.intelligence = random(15,50)>>
+<<elseif $customSlave.intelligence == -1>>
+ <<set $activeSlave.intelligence = random(-50,-16)>>
+<<elseif $customSlave.intelligence == -2>>
+ <<set $activeSlave.intelligence = random(-95,-51)>>
+<<elseif $customSlave.intelligence == -3>>
+ <<set $activeSlave.intelligence = random(-100,-96)>>
+<<else>>
+ <<set $activeSlave.intelligence = random(-15,15)>>
+<</if>>
+<<set $activeSlave.intelligenceImplant = $customSlave.intelligenceImplant>>
+
<<if $customSlave.analVirgin == 0>>
<<set $activeSlave.anus = $customSlave.analVirgin>>
<</if>>
@@ -169,8 +186,6 @@
<<set $activeSlave.entertainSkill = $customSlave.whoreSkills>>
<<set $activeSlave.whoreSkill = $customSlave.whoreSkills>>
<<set $activeSlave.combatSkill = $customSlave.combatSkills>>
-<<set $activeSlave.intelligence = $customSlave.intelligence>>
-<<set $activeSlave.intelligenceImplant = $customSlave.intelligenceImplant>>
<<set $activeSlave.eyes = $customSlave.eyes>>
<<set $activeSlave.hears = $customSlave.hears>>
<<set $activeSlave.amp = $customSlave.amp>>
diff --git a/src/uncategorized/seRaiding.tw b/src/uncategorized/seRaiding.tw
index 5dbe46ec9f5..db08477acf7 100644
--- a/src/uncategorized/seRaiding.tw
+++ b/src/uncategorized/seRaiding.tw
@@ -114,8 +114,8 @@ target
<<set $activeSlave.analSkill = 15>>
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.entertainSkill = 10>>
- <<set $activeSlave.intelligence = 2>>
- <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligence = random(70,90)>>
+ <<set $activeSlave.intelligenceImplant = 30>>
<<set $activeSlave.teeth = "normal">>
<<set $activeSlave.weight = random(-20,90)>>
<<if isFertile($activeSlave) && $seePreg != 0>>
@@ -146,8 +146,8 @@ target
<<set $activeSlave.oralSkill = 0>>
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.entertainSkill = 0>>
- <<set $activeSlave.intelligence = random(1,2)>>
- <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligence = random(0,60)>>
+ <<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.teeth = "normal">>
<<set $activeSlave.weight = random(-60,40)>>
<<if isFertile($activeSlave) && $seePreg != 0>>
@@ -177,8 +177,8 @@ target
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.combatSkill = 1>>
<<set $activeSlave.entertainSkill = 10>>
- <<set $activeSlave.intelligence = random(1,2)>>
- <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligence = random(20,60)>>
+ <<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.teeth = "normal">>
<<set $activeSlave.weight = 0>>
<<set $activeSlave.muscles = 25>>
@@ -227,7 +227,7 @@ target
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.combatSkill = 1>>
<<set $activeSlave.entertainSkill = 10>>
- <<set $activeSlave.intelligenceImplant = 0>>
+ <<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.teeth = "normal">>
<<set $activeSlave.weight = random(0,20)>>
<<set $activeSlave.muscles = 10>>
@@ -257,8 +257,8 @@ target
<<set $activeSlave.analSkill = 15>>
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.entertainSkill = 10>>
- <<set $activeSlave.intelligence = 2>>
- <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligence = random(60,90)>>
+ <<set $activeSlave.intelligenceImplant = 30>>
<<set $activeSlave.teeth = "normal">>
<<set $activeSlave.weight = random(-40,40)>>
<<if isFertile($activeSlave) && $seePreg != 0>>
@@ -386,7 +386,7 @@ target
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.combatSkill = 1>>
<<set $activeSlave.entertainSkill = 10>>
- <<set $activeSlave.intelligenceImplant = 0>>
+ <<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.weight = random(-10,90)>>
<<set $activeSlave.muscles = random(10,35)>>
<<if isFertile($activeSlave) && $seePreg != 0>>
@@ -452,8 +452,8 @@ target
<<set $activeSlave.analSkill = 15>>
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.entertainSkill = 10>>
- <<set $activeSlave.intelligence = 2>>
- <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligence = random(60,90)>>
+ <<set $activeSlave.intelligenceImplant = 30>>
<<set $activeSlave.teeth = "normal">>
<<set $activeSlave.weight = random(-10,60)>>
<<if isFertile($activeSlave) && $seePreg != 0>>
@@ -496,7 +496,7 @@ target
<<set $activeSlave.analSkill = 15>>
<<set $activeSlave.whoreSkill = 25>>
<<set $activeSlave.entertainSkill = 25>>
- <<set $activeSlave.intelligence = 2>>
+ <<set $activeSlave.intelligence = random(51,80)>>
<<set $activeSlave.weight = random(-10,120)>>
is a halfway house for vulnerable woman operating in a nearby conflict zone. Far from being a wholesome institution, the proprietor of this halfway house is a notorious procuress who sells her guests into slavery. Raiding the halfway house avoids the procuress' fees on a new shipment of slaves, with the procuress herself as a tempting bonus.
<<case "investor">>
@@ -514,8 +514,8 @@ target
<<set $activeSlave.analSkill = 15>>
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.entertainSkill = 10>>
- <<set $activeSlave.intelligence = 2>>
- <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligence = random(51,80)>>
+ <<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.weight = random(-50,60)>>
<<if isFertile($activeSlave) && $seePreg != 0>>
<<set $activeSlave.preg = either(-1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 10, 20, 30, 39)>>
@@ -543,8 +543,8 @@ target
<<set $activeSlave.analSkill = 15>>
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.entertainSkill = 10>>
- <<set $activeSlave.intelligence = 2>>
- <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligence = random(70,90)>>
+ <<set $activeSlave.intelligenceImplant = 30>>
<<set $activeSlave.teeth = "normal">>
<<set $activeSlave.weight = random(-50,50)>>
is a research lab operating on the lawless fringe between the Old World and the Free Cities. Here, scientists push the boundaries of the known world without the burden of governmental oversight or moral restrictions. Their defacto leader is a fellow scientist, one of the first to leave the Old World behind in pursuit of knowledge.
@@ -561,8 +561,8 @@ target
<<set $activeSlave.analSkill = 15>>
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.entertainSkill = 20>>
- <<set $activeSlave.intelligence = 1>>
- <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.intelligence = random(20,50)>>
+ <<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.weight = random(-50,140)>>
<<if isFertile($activeSlave) && $seePreg != 0>>
<<set $activeSlave.preg = either(-1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 10, 20, 30, 39)>>
diff --git a/src/uncategorized/seRecruiterSuccess.tw b/src/uncategorized/seRecruiterSuccess.tw
index 6d59c0b39a3..d9fa1a9824d 100644
--- a/src/uncategorized/seRecruiterSuccess.tw
+++ b/src/uncategorized/seRecruiterSuccess.tw
@@ -19,7 +19,7 @@
<<set $activeSlave.analSkill = 0>>
<<if $recruiterEugenics == 1>>
<<if $IntelligenceEugenicsSMR == 1>>
- <<set $activeSlave.intelligence = either(1, 2, 2, 2, 2, 2, 3)>>
+ <<set $activeSlave.intelligence = random(40,100)>>
<</if>>
<<if $HeightEugenicsSMR == 1>>
<<set $activeSlave.height = random(185,190)>>
@@ -51,7 +51,7 @@ Your recruiter $Recruiter.slaveName has succeeded; she's convinced a starving yo
<<set $activeSlave.analSkill = 0>>
<<if $recruiterEugenics == 1>>
<<if $IntelligenceEugenicsSMR == 1>>
- <<set $activeSlave.intelligence = either(1, 2, 2, 2, 2, 2, 3)>>
+ <<set $activeSlave.intelligence = random(40,100)>>
<</if>>
<<if $HeightEugenicsSMR == 1>>
<<set $activeSlave.height = random(185,190)>>
@@ -78,7 +78,7 @@ Your recruiter $Recruiter.slaveName has succeeded; she's convinced a recent divo
<</if>>
<<if $recruiterEugenics == 1>>
<<if $IntelligenceEugenicsSMR == 1>>
- <<set $activeSlave.intelligence = either(1, 2, 2, 2, 2, 2, 3)>>
+ <<set $activeSlave.intelligence = random(40,100)>>
<</if>>
<<if $HeightEugenicsSMR == 1>>
<<set $activeSlave.height = random(185,190)>>
@@ -122,7 +122,7 @@ Your recruiter $Recruiter.slaveName has succeeded; she's convinced an old world
<<set $activeSlave.sexualFlaw = "hates women">>
<<if $recruiterEugenics == 1>>
<<if $IntelligenceEugenicsSMR == 1>>
- <<set $activeSlave.intelligence = either(1, 2, 2, 2, 2, 2, 3)>>
+ <<set $activeSlave.intelligence = random(40,100)>>
<</if>>
<<if $HeightEugenicsSMR == 1>>
<<set $activeSlave.height = random(185,190)>>
@@ -156,7 +156,7 @@ Your recruiter $Recruiter.slaveName has succeeded; she's convinced an old world
<<set $activeSlave.weight = random(0,50)>>
<<if $recruiterEugenics == 1>>
<<if $IntelligenceEugenicsSMR == 1>>
- <<set $activeSlave.intelligence = either(1, 2, 2, 2, 2, 2, 3)>>
+ <<set $activeSlave.intelligence = random(40,100)>>
<</if>>
<<if $HeightEugenicsSMR == 1>>
<<set $activeSlave.height = random(185,190)>>
@@ -203,7 +203,7 @@ Your recruiter $Recruiter.slaveName has succeeded; she's convinced an unhealthy
<<set $activeSlave.clitPiercing = random(0,1)>>
<<if $recruiterEugenics == 1>>
<<if $IntelligenceEugenicsSMR == 1>>
- <<set $activeSlave.intelligence = either(1, 2, 2, 2, 2, 2, 3)>>
+ <<set $activeSlave.intelligence = random(40,100)>>
<</if>>
<<if $HeightEugenicsSMR == 1>>
<<set $activeSlave.height = random(185,190)>>
diff --git a/src/uncategorized/seRetirement.tw b/src/uncategorized/seRetirement.tw
index b08b5374e9b..310a306bb58 100644
--- a/src/uncategorized/seRetirement.tw
+++ b/src/uncategorized/seRetirement.tw
@@ -86,10 +86,10 @@ She's certainly going to have some adjustments to make.
<<set _pornFame = _pornFame.replace("She is world famous for her career in slave pornography. Millions are intimately familiar with", "enjoy")>>
<<set _pornFame = _pornFame.replace(".", ",")>>
In addition to her annuity, you've laid the groundwork for her to become wealthy by the way you publicized pornography of her. Many thousands of people across the world are willing to pay to _pornFame and they enjoy it in part because she doesn't mind it, either. She's in a position to make great money for doing on camera what she would probably do anyway.
-<<elseif ($activeSlave.intelligence >= -1) && ($activeSlave.muscles > 5) && ($activeSlave.combatSkill >= 1) && ($activeSlave.amp != 1) && ($activeSlave.face > 10)>>
+<<elseif ($activeSlave.intelligence+$activeSlave.intelligenceImplant >= -50) && ($activeSlave.muscles > 5) && ($activeSlave.combatSkill >= 1) && ($activeSlave.amp != 1) && ($activeSlave.face > 10)>>
<br><br>
She's pretty and deadly. If she feels she prefers wealth and danger to living on her annuity, she'll have no trouble finding work. In fact, she'll likely have trouble sifting through all the mercenary organizations, businesses in need of attractive and competent guards for public spaces, and citizens looking for effective bodyguards willing to hire her.
-<<elseif ($activeSlave.intelligence >= 2) && ($activeSlave.intelligenceImplant >= 1)>>
+<<elseif ($activeSlave.intelligence+$activeSlave.intelligenceImplant > 50) && ($activeSlave.intelligenceImplant >= 15)>>
<br><br>
She has no skills extraordinary enough to bring prospective employers in search of her, in this new, slaveowning economy, but she is highly intelligent, educated, and has a small income. As you know from your own abundant personal experience, her intelligence is a lever, her annuity is a fulcrum, and with the two, she may move the world someday. You have no doubt that, at the very least, she will be far from the poorest of your citizens.
<</if>>
--
GitLab