diff --git a/.gitignore b/.gitignore
index 72364f99fe4bf8d5262df3b19b33102aeaa791e5..7615207d9a2954bce4324b51782b1a3d89e0eaa2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,3 +87,6 @@ ENV/
# Rope project settings
.ropeproject
+
+# Start.tw
+src/config/start.tw
\ No newline at end of file
diff --git a/src/cheats/mod_EditSlaveCheat.tw b/src/cheats/mod_EditSlaveCheat.tw
index 59b96dcaf75447c0c1a25aae3b5622f3f9c5cc97..f1752d5f80e1643b02f8d515a3c13d095c0af41f 100644
--- a/src/cheats/mod_EditSlaveCheat.tw
+++ b/src/cheats/mod_EditSlaveCheat.tw
@@ -19,9 +19,17 @@
<br>
-''Slave Blood Relations (twin, sister, mother, daughter):''
-<<textbox "$activeSlave.relation" $activeSlave.relation>>
-
+<<if $familyTesting == 1>>
+ ''Enter the IDs for this slaves parents(-2 or 0:random and untracked by system, -1:PC, all others are applicable):''
+ <br>
+ ''mother ID''
+ <<textbox "$activeSlave.mother" $activeSlave.mother "Starting Girls">>
+ <br>
+ ''father ID''
+ <<textbox "$activeSlave.father" $activeSlave.father "Starting Girls">>
+<<else>>
+ ''Slave Blood Relations (twin, sister, mother, daughter):''
+ <<textbox "$activeSlave.relation" $activeSlave.relation>>
<br>
''Blood Relations Target ID:''
@@ -42,7 +50,8 @@
''Relationship Target ID:'' <<textbox "$activeSlave.relationshipTarget" $activeSlave.relationshipTarget>>
<br><br>
-
+<</if>>
+<br>
''Career ($activeSlave.career)''
<<textbox "$activeSlave.career" $activeSlave.career>> //Slave variables documentation is your friend. Will tell you exactly what to put here//
diff --git a/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw b/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw
index 37441d9c5ee5bd3edeb644c6008ed54148e1c0a5..1979d0c8e06a27cf4690649321b36f42c89ea67f 100644
--- a/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw
+++ b/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw
@@ -7,8 +7,13 @@
<<set $rep to Number($rep)>>
<<set $cash to Number($cash)>>
<<set $week to Number($week)>>
- <<set $activeSlave.relationTarget to Number($activeSlave.relationTarget)>>
- <<set $activeSlave.relationshipTarget to Number($activeSlave.relationshipTarget)>>
+ <<if $familyTesting == 1>>
+ <<set $activeSlave.mother to Number($activeSlave.mother)>>
+ <<set $activeSlave.father to Number($activeSlave.father)>>
+ <<else>>
+ <<set $activeSlave.relationTarget to Number($activeSlave.relationTarget)>>
+ <<set $activeSlave.relationshipTarget to Number($activeSlave.relationshipTarget)>>
+ <</if>>
<<set $activeSlave.indenture to Number($activeSlave.indenture)>>
<<set $activeSlave.face to Number($activeSlave.face)>>
<<set $activeSlave.hLength to Number($activeSlave.hLength)>>
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 3174ef511f93bb9a373d20483f389ea7ae4903d2..870abc17f87a5109ecddda02da5eca724672ec99 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -274,6 +274,16 @@ Girls will not be able to impregnate others if their age is under <<textbox "$po
[[Enable extended families|Intro Summary][$familyTesting to 1]]
<</if>> //Extended family mode must be on for the incubation facility to be enabled.//
+<<if $familyTesting == 1>>
+<<if $inbreeding == 1>>
+ Successive breeding ''will'' result in sub-average slaves.
+ [[Disable inbreeding|Intro Summary][$inbreeding to 0]]
+<<else>>
+ Successive breeding ''will not'' result in sub-average slaves.
+ [[Enable inbreeding|Intro Summary][$inbreeding to 1]]
+<</if>>
+<</if>>
+
<br>
<<if $verboseDescriptions == 1>>
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index f17a3df7635f0213b767bc81269d74d211a84285..d185f19c5e7d7d6c17669b698fa1e94cd42f1952 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -319,7 +319,7 @@
<<set $cheater to 0>>
<<set $PCName to "Anonymous">>
-<<set $PC to {title: 1, ID: -1, dick: 1, vagina: 0, preg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, career: "capitalist", rumor: "wealth", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, race: "white", skin: "white", eyeColor: "blue", hColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0}>>
+<<set $PC to {title: 1, ID: -1, dick: 1, vagina: 0, preg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, career: "capitalist", rumor: "wealth", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, race: "white", skin: "white", eyeColor: "blue", hColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0, intelligence: 3, face: 3}>>
<<set $cash = 10000>>
<<set $normalizedEvents to 0>>
<<set $autosave to 1>>
@@ -529,6 +529,9 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $incubatorUpgradeWeight = 0>>
<<set $incubatorUpgradeMuscles = 0>>
<<set $incubatorUpgradeReproduction = 0>>
+<<set $incubatorWeightSetting = 0>>
+<<set $incubatorMusclesSetting = 0>>
+<<set $incubatorReproductionSetting = 0>>
<<set $incubatorName = "the Incubator">>
<<set $incubatorNameCaps = "The Incubator">>
<<set $reservedChildren = 0>>
@@ -730,6 +733,8 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $showBestiality = 0>>
<<set $retainCareer = 1>>
<<set $freshPC = 0>>
+<<set $inbreeding = 1>>
+<<set $originOveride = 0>>
<<set $fakeBellies to ["a small empathy belly", "a medium empathy belly", "a large empathy belly", "a huge empathy belly"]>> /* lets fake bellies be separated from other .bellyAccessory */
diff --git a/src/npc/removeActiveSlave.tw b/src/npc/removeActiveSlave.tw
index b46fe3624403e09c8ee62ae3824b207031bb489a..3db53ef2a15354407a5bdcf83d4b807374f0d73c 100644
--- a/src/npc/removeActiveSlave.tw
+++ b/src/npc/removeActiveSlave.tw
@@ -25,6 +25,25 @@
<<set $slaves[$y].pregSource to 0>>
<</if>>
<</for>>
+ <<if $PC.mother == $activeSlave.ID>>
+ <<set $PC.mother to $missingParentID>>
+ <<if $PC.father == $activeSlave.ID>>
+ <<set $PC.father to $missingParentID>>
+ <</if>>
+ <<set $missingParentID-->>
+ <</if>>
+ <<if $PC.father == $activeSlave.ID>>
+ <<set $PC.father to $missingParentID>>
+ <<set $missingParentID-->>
+ <</if>>
+ <<if $PC.sisters > 0>>
+ /*put sister decrement code here*/
+ <</if>>
+ <<if $PC.daughters > 0>>
+ <<if $activeSlave.father == -1 || $activeSlave.mother == -1>>
+ <<set $PC.daughters-->>
+ <</if>>
+ <</if>>
<<if $activeSlave.daughters > 0>>
<<for $y to 0; $y < $slaves.length; $y++>>
<<if $slaves[$y].mother is $activeSlave.ID>>
diff --git a/src/npc/startingGirls/commitStartingGirl.tw b/src/npc/startingGirls/commitStartingGirl.tw
index e58353382a87ac4def70e35e8bc776392fb864b0..88a91830316cea6e4e7ee6914230f4e25b862f00 100644
--- a/src/npc/startingGirls/commitStartingGirl.tw
+++ b/src/npc/startingGirls/commitStartingGirl.tw
@@ -12,6 +12,7 @@
<<set $activeSlave.boobs = Math.trunc($activeSlave.boobs/50)*50>>
<<set $careerBonusApplied = 0>>
+<<set $originOveride = 0>>
<<if $cash < $minimumSlaveCost>><<goto "Acquisition">><</if>>
diff --git a/src/npc/startingGirls/moreCustomOptions.tw b/src/npc/startingGirls/moreCustomOptions.tw
index a0045aca30a1201ec1081125012112c99ee1ab0d..7ac21d6c72525a3b941c2cd9992af2f995b898c5 100644
--- a/src/npc/startingGirls/moreCustomOptions.tw
+++ b/src/npc/startingGirls/moreCustomOptions.tw
@@ -19,8 +19,13 @@
''Eye color:'' <<textbox "$activeSlave.eyeColor" $activeSlave.eyeColor "More customization options">>
Custom tattoo: <<textbox "$activeSlave.customTat" $activeSlave.customTat "More customization options">>
//Use complete, capitalized and punctuated sentences//
-Custom origin story: <<textbox "$activeSlave.origin" $activeSlave.origin "Add custom descriptors">>
+Custom origin story: <<textbox "$activeSlave.origin" $activeSlave.origin "More customization options">>
//For best results, use complete, capitalized and punctuated sentences.//
+<<if $originOveride == 0>>
+ [[Origin Override|More customization options][$originOveride to 1]] //Will keep your custom origin from being overwritten.//
+<<else>>
+ [[Disable Override|More customization options][$originOveride to 0]] //Will unlock origin and allow slavegen to overwrite it.//
+<</if>>
Custom description: <<textbox "$activeSlave.customDesc" $activeSlave.customDesc "More customization options">>
//Use complete, capitalized and punctuated sentences.//
Custom label: <<textbox "$activeSlave.customLabel" $activeSlave.customLabel "More customization options">>
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index a5f8ad95a6fcc69a6d6a6f8eb292503574c23c8b..7d981c9cfbbc78b5cffe5d27d43feda421c31920 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -139,6 +139,7 @@ __You are customizing this slave:__
<</if>>
<</if>>
/* this block makes starting girls actually apply the slave origins, mostly since it just hates you and everything you do */
+<<if $originOveride = 0>>
<<if $PC.career is "capitalist">>
<<if $activeSlave.mother == -1 && $activeSlave.father == -1>>
<<set $activeSlave.origin to "To solidify an investment in hermaphrodite self-fertility, you took part in a test successful test trial. Nine months later your daughter was born.">>
@@ -286,6 +287,7 @@ __You are customizing this slave:__
<<set $activeSlave.origin to "You won her at cards, a memento from your life as one of the idle rich before you became an arcology owner.">>
<<set $activeSlave.customTat to "She has the silhouette of an arcology tattooed on the nape of her neck.">>
<</if>>
+<</if>>
<<if $activeSlave.vagina < 1>>
<<set $activeSlave.vaginalSkill = 0>>
<</if>>
diff --git a/src/pregmod/extendedFamilyWidgets.tw b/src/pregmod/extendedFamilyWidgets.tw
index 666c45bac065d89caa5627681a6660dd41141986..98b4994f6bc76377d4074429334aa1635860a0a3 100644
--- a/src/pregmod/extendedFamilyWidgets.tw
+++ b/src/pregmod/extendedFamilyWidgets.tw
@@ -532,6 +532,7 @@
is @@color:lightgreen;_rel_desc _rel_type.@@
<</if>>
<</if>>
+<<set $children = []>>
/*testtest PC twin passages - determines how many twins you have but not implemented yet
<<for $i to 0; $i < $slaves.length; $i++>>
diff --git a/src/pregmod/generateChild.tw b/src/pregmod/generateChild.tw
index 55a1af000cd7a7079da6f9333e1298c25494cbc9..ec38196c3d2dc033c28c428d95461a3f6047f671 100644
--- a/src/pregmod/generateChild.tw
+++ b/src/pregmod/generateChild.tw
@@ -1,4 +1,4 @@
-:: generateChild [nobr]
+:: Generate Child [nobr]
<<if $mom != 0>>
<<set $mergeMom = 0>>
@@ -75,7 +75,7 @@
<<if $PC.skin == $mergeDad.skin>>
<<set $activeSlave.skin = $PC.skin>>
<<else>>
- <<GenSkinTone $PC, $mergeDad>>
+ <<GenSkinTone $PC $mergeDad>>
<</if>>
<<if $PC.eyeColor == $mergeDad.eyeColor>>
<<set $activeSlave.eyeColor = $PC.eyeColor>>
@@ -184,7 +184,7 @@
<<if $PC.skin == $mergeDad.skin>>
<<set $activeSlave.skin = $PC.skin>>
<<else>>
- <<GenSkinTone $PC, $mergeDad>>
+ <<GenSkinTone $PC $mergeDad>>
<</if>>
<<if $PC.eyeColor == $mergeDad.eyeColor>>
<<set $activeSlave.eyeColor = $PC.eyeColor>>
@@ -253,16 +253,16 @@
<</if>>
<</if>>
<<set $activeSlave.mother = $mergeMom.ID>>
- <<if $mergeMom.pregSource > 0>>
+ <<if $mom.pregSource > 0>>
<<set $activeSlave.father = $mergeDad.ID>>
- <<set $activeSlave.slaveName = String($mergeMom.slaveName + " and " + $mergeDad.slaveName + "'s child")>>
- <<elseif $mergeMom.pregSource == -1>>
+ <<set $activeSlave.slaveName = String($mom.slaveName + " and " + $mergeDad.slaveName + "'s child")>>
+ <<elseif $mom.pregSource == -1>>
<<set $activeSlave.father = -1>>
- <<set $activeSlave.slaveName = String($mergeMom.slaveName + " and my child")>>
+ <<set $activeSlave.slaveName = String($mom.slaveName + " and my child")>>
<<else>>
<<set $activeSlave.father = $missingParentID>>
<<set $missingParentID-->>
- <<set $activeSlave.slaveName = String($mergeMom.slaveName + "'s slut child")>>
+ <<set $activeSlave.slaveName = String($mom.slaveName + "'s slut child")>>
<</if>>
<<if $mergeMom.nationality == $mergeDad.nationality>>
<<set $activeSlave.nationality = $mergeDad.nationality>>
@@ -276,7 +276,7 @@
<<else>>
<<set $activeSlave.race = "mixed race">>
<</if>>
- <<if $mergeMom.pregSource == -2 && $arcologies[0].FSSupremacist != "unset">>
+ <<if $mom.pregSource == -2 && $arcologies[0].FSSupremacist != "unset">>
<<set $activeSlave.race = either($mergeMom.race, $arcologies[0].FSSubjugationistRace, $arcologies[0].FSSubjugationistRace)>>
<<if $mergeMom.race != $arcologies[0].FSSubjugationistRace>>
<<if random(1,100) > 50>>
@@ -287,7 +287,7 @@
<<if $mergeMom.skin == $mergeDad.skin>>
<<set $activeSlave.skin = $mergeMom.skin>>
<<else>>
- <<GenSkinTone $mergeMom, $mergeDad>>
+ <<GenSkinTone $mergeMom $mergeDad>>
<</if>>
<<if $mergeMom.eyeColor == $mergeDad.eyeColor>>
<<set $activeSlave.eyeColor = $mergeMom.eyeColor>>
@@ -310,7 +310,7 @@
<<else>>
<<set $activeSlave.eyeColor = either($mergeMom.eyeColor, $mergeDad.eyeColor)>>
<</if>>
- <<if $mergeMom.pregSource == -2 || $mergeMom.pregSource == 0>>
+ <<if $mom.pregSource == -2 || $mom.pregSource == 0>>
<<set $activeSlave.eyeColor = either($mergeMom.eyeColor, "brown", "blue", "brown", "green", "hazel", "green")>>
<</if>>
<<if $mergeMom.hColor == $mergeDad.hColor>>
@@ -338,8 +338,8 @@
<<else>>
<<set $activeSlave.hColor = either($mergeMom.hColor, $mergeDad.hColor)>>
<</if>>
- <<if $mergeMom.pregSource == -2 || $mergeMom.pregSource == 0>>
- <<set $activeSlave.hColor = either($mergeMom.hColor, "brown", "blonde", "black", "brown")>>
+ <<if $mom.pregSource == -2 || $mom.pregSource == 0>>
+ <<set $activeSlave.hColor = either($mergeMom.hColor, "brown", "blonde", "black", "brown", "black", "brown", "black")>>
<</if>>
<<set $activeSlave.pubicHColor = $activeSlave.hColor>>
<<set $activeSlave.underArmHColor = $activeSlave.hColor>>
@@ -379,11 +379,26 @@
<<set $activeSlave.face = either(2, 2, 2, 3)>>
<<set $activeSlave.intelligence = either(2, 2, 2, 2, 3, 3)>>
<<elseif $activeSlave.mother == -1>>
- <<if $activeSlave.face < 2>>
- <<set $activeSlave.face++>>
- <</if>>
- <<if $activeSlave.intelligence < 2>>
- <<set $activeSlave.intelligence++>>
+ <<if $PC.pregSource > 0>>
+ <<if $mergeDad.face < $PC.face>>
+ <<set $activeSlave.face to random($mergeDad.face, $PC.face)>>
+ <<else>>
+ <<set $activeSlave.face to $PC.face>>
+ <</if>>
+ <<if $activeSlave.face < 2>>
+ <<set $activeSlave.face += 1>>
+ <</if>>
+ <<if $mergeDad.intelligence < $PC.intelligence>>
+ <<set $activeSlave.intelligence to random($mergeDad.intelligence, $PC.intelligence)>>
+ <<else>>
+ <<set $activeSlave.intelligence to $mergeMom.intelligence>>
+ <</if>>
+ <<if $activeSlave.intelligence < 2>>
+ <<set $activeSlave.intelligence += 1>>
+ <</if>>
+ <<else>>
+ <<set $activeSlave.face = either(1, 2, 2, 2, 3)>>
+ <<set $activeSlave.intelligence = either(1, 2, 2, 2, 2, 3, 3)>>
<</if>>
<<elseif $activeSlave.father == -1 && $mom > 0>>
<<if $mom.breedingMark == 1>>
@@ -391,28 +406,53 @@
<<set $activeSlave.intelligence = either(2, 2, 2, 2, 3, 3)>>
<<set $activeSlave.breedingMark = 1>>
<<else>>
- <<if $activeSlave.face < 2>>
- <<set $activeSlave.face++>>
+ <<if $PC.face > $mergeMom.face>>
+ <<set $activeSlave.face to random($mergeMom.face, $PC.face)>>
+ <<else>>
+ <<set $activeSlave.face to $mergeMom.face>>
<</if>>
- <<if $activeSlave.intelligence < 2>>
- <<set $activeSlave.intelligence++>>
+ <<if $PC.intelligence > $mergeMom.intelligence>>
+ <<set $activeSlave.intelligence to random($mergeMom.intelligence, $PC.intelligence)>>
+ <<else>>
+ <<set $activeSlave.intelligence to $mergeMom.intelligence>>
+ <</if>>
+ <<if $inbreeding == 1>>
+ <<if $activeSlave.face > -3 && random(1,100) < 60>>
+ <<set $activeSlave.face -= 1>>
+ <</if>>
+ <<if $activeSlave.intelligence > -3 && random(1,100) < 60>>
+ <<set $activeSlave.intelligence -= 1>>
+ <<if $activeSlave.intelligence > -3 && random(1,100) < 30>>
+ <<set $activeSlave.intelligence -= 1>>
+ <</if>>
+ <</if>>
<</if>>
- <</if>>
-<<elseif $activeSlave.father == -1>>
- <<if $activeSlave.face < 2>>
- <<set $activeSlave.face++>>
- <</if>>
- <<if $activeSlave.intelligence < 2>>
- <<set $activeSlave.intelligence++>>
<</if>>
<<else>>
- <<set $activeSlave.face to random($mergeDad.face, $mergeMom.face)>>
- <<if $activeSlave.face > -3 && random(1,100) < 90>>
- <<set $activeSlave.face-->>
+ <<if $mergeDad.face < $mergeMom.face>>
+ <<set $activeSlave.face to random($mergeDad.face, $mergeMom.face)>>
+ <<elseif $mergeDad.face > $mergeMom.face>>
+ <<set $activeSlave.face to random($mergeMom.face, $mergeDad.face)>>
+ <<else>>
+ <<set $activeSlave.face to $mergeMom.face>>
+ <</if>>
+ <<if $mergeDad.intelligence < $mergeMom.intelligence>>
+ <<set $activeSlave.intelligence to random($mergeDad.intelligence, $mergeMom.intelligence)>>
+ <<elseif $mergeDad.intelligence > $mergeMom.intelligence>>
+ <<set $activeSlave.intelligence to random($mergeMom.intelligence, $mergeDad.intelligence)>>
+ <<else>>
+ <<set $activeSlave.intelligence to $mergeMom.intelligence>>
<</if>>
- <<set $activeSlave.intelligence to random($mergeDad.intelligence, $mergeMom.intelligence)>>
- <<if $activeSlave.intelligence > -3 && random(1,100) < 90>>
- <<set $activeSlave.intelligence-->>
+ <<if $inbreeding == 1>>
+ <<if $activeSlave.face > -3 && random(1,100) < 90>>
+ <<set $activeSlave.face -= 1>>
+ <</if>>
+ <<if $activeSlave.intelligence > -3 && random(1,100) < 90>>
+ <<set $activeSlave.intelligence -= 1>>
+ <<if $activeSlave.intelligence > -3 && random(1,100) < 60>>
+ <<set $activeSlave.intelligence -= 1>>
+ <</if>>
+ <</if>>
<</if>>
<</if>>
@@ -451,7 +491,7 @@
<<set $activeSlave.oralSkill = 0>>
<<set $activeSlave.analSkill = 0>>
<<set $activeSlave.vaginalSkill = 0>>
-<<set $activeSlave.accent = 3>>
+<<set $activeSlave.accent = 4>>
<<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.hStyle = "long">>
<<set $activeSlave.hLength = 300>>
diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw
index 15b27ad07fc127b882080b6243d0976678231622..c4bf132328f37333d05c5296dc775412e68e8fb5 100644
--- a/src/pregmod/newChildIntro.tw
+++ b/src/pregmod/newChildIntro.tw
@@ -50,20 +50,85 @@ You completed the legalities before heading to $incubatorName, knowing the tank
<br><<click "Have your PA assign her a random name">>
<<replace "#naming">>
<<NationalityToName $activeSlave>>
- <<set $activeSlave.birthName = $activeSlave.slaveName>>
$assistantName registers the new girl as "<<print $activeSlave.slaveName>>" in your registry.
<</replace>>
<<replace "#newName">>
''__@@color:pink;$activeSlave.slaveName@@__''
<</replace>>
<</click>>
+<<if $arcologies[0].FSPastoralist != "unset">>
+ <<if $activeSlave.lactation > 0>>
+ <br><<click "Have your PA assign her a random cow name">>
+ <<replace "#naming">>
+ <<set $activeSlave.slaveName to $cowSlaveNames.random()>>
+ $assistantName registers the new girl as "<<print $activeSlave.slaveName>>" in your registry.
+ <</replace>>
+ <<replace "#newName">>
+ ''__@@color:pink;$activeSlave.slaveName@@__''
+ <</replace>>
+ <</click>>
+ <</if>>
+<</if>>
+<<if $arcologies[0].FSChattelReligionist != "unset">>
+ <br><<click "Have your PA assign her a random devotional name">>
+ <<replace "#naming">>
+ <<set $activeSlave.slaveName to $chattelReligionistSlaveNames.random()>>
+ $assistantName registers the new girl as "<<print $activeSlave.slaveName>>" in your registry.
+ <</replace>>
+ <<replace "#newName">>
+ ''__@@color:pink;$activeSlave.slaveName@@__''
+ <</replace>>
+ <</click>>
+<</if>>
+<<if $arcologies[0].FSRomanRevivalist != "unset">>
+ <br><<click "Have your PA assign her a random Roman name">>
+ <<replace "#naming">>
+ <<set $activeSlave.slaveName to $romanSlaveNames.random()>>
+ $assistantName registers the new girl as "<<print $activeSlave.slaveName>>" in your registry.
+ <</replace>>
+ <<replace "#newName">>
+ ''__@@color:pink;$activeSlave.slaveName@@__''
+ <</replace>>
+ <</click>>
+<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
+ <br><<click "Have your PA assign her a random ancient Egyptian name">>
+ <<replace "#naming">>
+ <<set $activeSlave.slaveName to $ancientEgyptianSlaveNames.random()>>
+ $assistantName registers the new girl as "<<print $activeSlave.slaveName>>" in your registry.
+ <</replace>>
+ <<replace "#newName">>
+ ''__@@color:pink;$activeSlave.slaveName@@__''
+ <</replace>>
+ <</click>>
+<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
+ <br><<click "Have your PA assign her a random feudal Japanese name">>
+ <<replace "#naming">>
+ <<set $activeSlave.slaveName to $edoSlaveNames.random()>>
+ $assistantName registers the new girl as "<<print $activeSlave.slaveName>>" in your registry.
+ <</replace>>
+ <<replace "#newName">>
+ ''__@@color:pink;$activeSlave.slaveName@@__''
+ <</replace>>
+ <</click>>
+<</if>>
+<<if $arcologies[0].FSDegradationist != "unset">>
+ <br><<click "Have your PA assign her a degrading name">>
+ <<replace "#naming">>
+ <<display "Degrading Name">>
+ $assistantName registers the new girl as "<<print $activeSlave.slaveName>>" in your registry.
+ <</replace>>
+ <<replace "#newName">>
+ ''__@@color:pink;$activeSlave.slaveName@@__''
+ <</replace>>
+ <</click>>
+<</if>>
<<if $activeSlave.mother > 0>>
<<for _j to 0; _j < $slaves.length; _j++>>
<<if $activeSlave.mother == $slaves[_j].ID>>
<<if $slaves[_j].ID == $Concubine.ID>>
<br><<click "Permit your Concubine to name her daughter">>
<<replace "#naming">>
- <<ParentNames $slaves[_j], $activeSlave>>
+ <<ParentNames $slaves[_j] $activeSlave>>
After some careful consideration, $slaves[_j].slaveName picks a name she thinks you might find attractive; from now on her daughter will be known as "<<print $activeSlave.slaveName>>".
<</replace>>
<<replace "#newName">>
@@ -74,7 +139,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
<<elseif $slaves[_j].relationship == -4>>
<br><<click "Permit your wife to name her daughter">>
<<replace "#naming">>
- <<ParentNames $slaves[_j], $activeSlave>>
+ <<ParentNames $slaves[_j] $activeSlave>>
After some careful consideration, $slaves[_j].slaveName picks a name suitable for your daughter; from now on she will be known as "<<print $activeSlave.slaveName>>".
<</replace>>
<<replace "#newName">>
@@ -85,7 +150,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
<<elseif $slaves[_j].ID == $Bodyguard.ID>>
<br><<click "Permit your bodyguard to name her daughter">>
<<replace "#naming">>
- <<ParentNames $slaves[_j], $activeSlave>>
+ <<ParentNames $slaves[_j] $activeSlave>>
After some careful consideration, $slaves[_j].slaveName decides on "<<print $activeSlave.slaveName>>" for her daughter. She hopes you'll find it fitting her station.
<</replace>>
<<replace "#newName">>
@@ -96,7 +161,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
<<elseif $slaves[_j].ID == $HeadGirl.ID>>
<br><<click "Permit your headgirl to name her daughter">>
<<replace "#naming">>
- <<ParentNames $slaves[_j], $activeSlave>>
+ <<ParentNames $slaves[_j] $activeSlave>>
After some careful consideration, $slaves[_j].slaveName decides on "<<print $activeSlave.slaveName>>" for her daughter. and hopes it will be a name your other slaves will learn to respect.
<</replace>>
<<replace "#newName">>
@@ -107,7 +172,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
<<elseif $slaves[_j].devotion > 50 && slaves[_j].trust > 50>>
<br><<click "Permit her devoted mother to name her daughter">>
<<replace "#naming">>
- <<ParentNames $slaves[_j], $activeSlave>>
+ <<ParentNames $slaves[_j] $activeSlave>>
After some careful consideration, $slaves[_j].slaveName picks a name she hopes you'll like; from now on her daughter will be known as "<<print $activeSlave.slaveName>>".
<</replace>>
<<replace "#newName">>
@@ -125,7 +190,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
<<if $slaves[_j].ID == $Concubine.ID>>
<br><<click "Permit your Concubine to name her daughter">>
<<replace "#naming">>
- <<ParentNames $slaves[_j], $activeSlave>>
+ <<ParentNames $slaves[_j] $activeSlave>>
After some careful consideration, $slaves[_j].slaveName picks a name she thinks you might find attractive; from now on her daughter will be known as "<<print $activeSlave.slaveName>>".
<</replace>>
<<replace "#newName">>
@@ -136,7 +201,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
<<elseif $slaves[_j].relationship == -4>>
<br><<click "Permit your wife to name her daughter">>
<<replace "#naming">>
- <<ParentNames $slaves[_j], $activeSlave>>
+ <<ParentNames $slaves[_j] $activeSlave>>
After some careful consideration, $slaves[_j].slaveName picks a name suitable for your daughter; from now on she will be known as "<<print $activeSlave.slaveName>>".
<</replace>>
<<replace "#newName">>
@@ -147,7 +212,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
<<elseif $slaves[_j].ID == $Bodyguard.ID>>
<br><<click "Permit your bodyguard to name her daughter">>
<<replace "#naming">>
- <<ParentNames $slaves[_j], $activeSlave>>
+ <<ParentNames $slaves[_j] $activeSlave>>
After some careful consideration, $slaves[_j].slaveName decides on "<<print $activeSlave.slaveName>>" for her daughter. She hopes you'll find it fitting her station.
<</replace>>
<<replace "#newName">>
@@ -158,7 +223,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
<<elseif $slaves[_j].ID == $HeadGirl.ID>>
<br><<click "Permit your headgirl to name her daughter">>
<<replace "#naming">>
- <<ParentNames $slaves[_j], $activeSlave>>
+ <<ParentNames $slaves[_j] $activeSlave>>
After some careful consideration, $slaves[_j].slaveName decides on "<<print $activeSlave.slaveName>>" for her daughter. and hopes it will be a name your other slaves will learn to respect.
<</replace>>
<<replace "#newName">>
@@ -169,7 +234,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
<<elseif $slaves[_j].devotion > 50 && slaves[_j].trust > 50>>
<br><<click "Permit her devoted mother to name her daughter">>
<<replace "#naming">>
- <<ParentNames $slaves[_j], $activeSlave>>
+ <<ParentNames $slaves[_j] $activeSlave>>
After some careful consideration, $slaves[_j].slaveName picks a name she hopes you'll like; from now on her daughter will be known as "<<print $activeSlave.slaveName>>".
<</replace>>
<<replace "#newName">>
@@ -182,7 +247,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
<</for>>
<</if>>
</span>
-
+<<set $activeSlave.birthName = $activeSlave.slaveName>>
<br><br>
<span id="newName">''__@@color:pink;$activeSlave.slaveName@@__''</span> now stands before your desk
diff --git a/src/pregmod/pregmodWidgets.tw b/src/pregmod/pregmodWidgets.tw
index 2b1dbfb45e3d14cc37563696adb3642b489f75ac..cef9eafc0d338c3f6856146be08a82761059c39d 100644
--- a/src/pregmod/pregmodWidgets.tw
+++ b/src/pregmod/pregmodWidgets.tw
@@ -115,6 +115,12 @@
<<if ndef $args[0].choosesOwnChastity>>
<<set $args[0].choosesOwnChastity = 0>>
<</if>>
+<<if ndef $PC.intelligence>>
+ <<set $PC.intelligence = 3>>
+<</if>>
+<<if ndef $PC.face>>
+ <<set $PC.face = 3>>
+<</if>>
<<if ndef $args[0].pubertyXX>>
<<if $args[0].physicalAge >= $args[0].pubertyAgeXX>>
@@ -878,13 +884,28 @@ extremely pale -5
<<case 1>>
<<set $activeSlave.skin = "pale">>
<<case 0>>
- <<set _skin1 = "extremely pale">>
+ <<set $activeSlave.skin = "extremely pale">>
<<default>>
<<set $activeSlave.skin = either($args[0].skin, $args[1].skin)>>
<</switch>>
<</widget>>
+/*
+<<widget "GenSkinTone">>
+<<script>>
+(function() {
+ var skinToMelanin = {black: 10, ebony: 9.5, brown: 9, dark: 8, olive: 7, 'light brown': 6, bronzed: 5.5, tanned: 5, light: 4, 'rosy white': 3.5, white: 3, fair: 2, 'very fair': 1.5, lightened: 1.5, pale: 1, 'pure white': 0.5, 'extremely pale': 0.001};
+ var parents = State.variables.args;
+ var skin0 = parents[0] ? (skinToMelanin[parents[0].skin] || 5) : 3;
+ var skin1 = parents[1] ? (skinToMelanin[parents[1].skin] || 5) : 3;
+ var skin = Math.round(Math.random() * (skin1 - skin0) + skin0);
+ State.variables.activeSlave.skin = ['extremely pale', 'pale', 'fair', 'white', 'light', 'tanned', 'light brown', 'olive', 'dark', 'brown', 'black'][skin];
+})();
+<</script>>
+<</widget>>
+*/
+
<<widget "ParentNames">>
<<switch $args[0].nationality>>
diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index b6ae51bf7f0fbb8978c85512250c5e993c1ec218..3a9139647e1d06be978716da448d73e2b8401481 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -13,20 +13,8 @@
<<if ndef $defaultRules>>
<<display "Init Rules">>
<</if>>
-<<if ndef $incubator>>
- <<set $incubator = 0>>
-<</if>>
-<<if ndef $incubatorUpgradeSpeed>>
- <<set $incubatorUpgradeSpeed = 5>>
-<</if>>
-<<if ndef $incubatorUpgradeWeight>>
- <<set $incubatorUpgradeWeight = 0>>
-<</if>>
-<<if ndef $incubatorUpgradeMuscles>>
- <<set $incubatorUpgradeMuscles = 0>>
-<</if>>
-<<if ndef $incubatorUpgradeReproduction>>
- <<set $incubatorUpgradeReproduction = 0>>
+<<if ndef $inbreeding>>
+ <<set $inbreeding = 1>>
<</if>>
<<if ndef $incubatorWeightSetting>>
<<set $incubatorWeightSetting = 0>>
@@ -35,20 +23,7 @@
<<set $incubatorMusclesSetting = 0>>
<</if>>
<<if ndef $incubatorReproductionSetting>>
- <<set $incubatorReproductionSetting = 0>>
-<</if>>
-<<if ndef $reservedChildren>>
- <<set $reservedChildren = 0>>
-<</if>>
-<<if ndef $tanks>>
- <<set $tanks = []>>
- <<set $tanks = [0]>>
-<</if>>
-<<if ndef $animalParts>>
- <<set $animalParts = 0>>
-<</if>>
-<<if ndef $genePool>>
- <<set $genePool = []>>
+ <<set $incubatorReproductionSetting = 0>>
<</if>>
<<set $currentRule to $defaultRules[0]>>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index 2e3b2e95ee679321c3b8fe3451c42af4adc4ca7c..67e4f8d870396e75c3368deefb5256736fa378a9 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -10,6 +10,7 @@
<<set $newRelativeRecruitID = 1100000>>
<</if>>
+
<<for $i to 0; $i < $slaves.length; $i++>>
<<if $slaves[$i].fuckdoll == 0>>
<<if $slaves[$i].canRecruit == 1>>
@@ -29,38 +30,54 @@
<</for>>
<<set $recruitedType = []>>
-<<if $eventSlave.mother == 0 && $activeSlave.actualAge < 24>>
+<<if $eventSlave.mother == 0 && $activeSlave.actualAge < 24 && $seeDicks != 100>>>>
<<set $recruitedType.push("mother")>>
<<set $recruitedType.push("mother")>>
<<set $recruitedType.push("mother")>>
<</if>>
-<<if $eventSlave.father == 0 && $activeSlave.actualAge < 24>>
+<<if $eventSlave.father == 0 && $activeSlave.actualAge < 24 && $seeDicks != 0>>
<<set $recruitedType.push("father")>>
<</if>>
<<if $eventSlave.daughters < 3 && $activeSlave.actualAge > ($minimumSlaveAge+$fertilityAge) && isFertile($activeSlave)>>
- <<set $recruitedType.push("daughter")>>
- <<set $recruitedType.push("daughter")>>
- <<set $recruitedType.push("son")>>
+ <<if $seeDicks != 100>>
+ <<set $recruitedType.push("daughter")>>
+ <<set $recruitedType.push("daughter")>>
+ <</if>>
+ <<if $seeDicks != 0>>
+ <<set $recruitedType.push("son")>>
+ <</if>>
<<set $tempMF = "mother">>
<</if>>
<<if $eventSlave.daughters < 3 && $activeSlave.actualAge > ($minimumSlaveAge+$potencyAge) && $activeSlave.balls > 0>>
- <<set $recruitedType.push("daughter")>>
- <<set $recruitedType.push("daughter")>>
- <<set $recruitedType.push("son")>>
+ <<if $seeDicks != 100>>
+ <<set $recruitedType.push("daughter")>>
+ <<set $recruitedType.push("daughter")>>
+ <</if>>
+ <<if $seeDicks != 0>>
+ <<set $recruitedType.push("son")>>
+ <</if>>
<<set $tempMF = "father">>
<</if>>
<<if $eventSlave.sisters < 3>>
<<if $activeSlave.actualAge <= ($retirementAge-5)>>
- <<set $recruitedType.push("older sister")>>
- <<set $recruitedType.push("older sister")>>
- <<set $recruitedType.push("older brother")>>
- <<set $recruitedType.push("older brother")>>
+ <<if $seeDicks != 100>>
+ <<set $recruitedType.push("older sister")>>
+ <<set $recruitedType.push("older sister")>>
+ <</if>>
+ <<if $seeDicks != 0>>
+ <<set $recruitedType.push("older brother")>>
+ <<set $recruitedType.push("older brother")>>
+ <</if>>
<</if>>
<<if $activeSlave.actualAge >= ($minimumSlaveAge+5)>>
- <<set $recruitedType.push("younger sister")>>
- <<set $recruitedType.push("younger sister")>>
- <<set $recruitedType.push("younger brother")>>
- <<set $recruitedType.push("younger brother")>>
+ <<if $seeDicks != 100>>
+ <<set $recruitedType.push("younger sister")>>
+ <<set $recruitedType.push("younger sister")>>
+ <</if>>
+ <<if $seeDicks != 0>>
+ <<set $recruitedType.push("younger brother")>>
+ <<set $recruitedType.push("younger brother")>>
+ <</if>>
<</if>>
<<set $recruitedType.push("twin")>>
<</if>>
@@ -240,6 +257,7 @@ She waits anxiously for your decision.
<<set $activeSlave.voice = 1>>
<<set $activeSlave.energy = 0>>
<<set $activeSlave.penis = 2>>
+ <<set $activeSlave.vagina = -1>>
<<set $activeSlave.boobs = (random(5,6)*100)>>
<<set $activeSlave.butt = random(4,6)>>
<<set $activeSlave.actualAge = ($eventSlave.actualAge+random(15,20))>>
@@ -338,6 +356,7 @@ She waits anxiously for your decision.
<<set $activeSlave.entertainSkill += random(0,20)>>
<<set $activeSlave.whoreSkill += random(0,20)>>
<<set $activeSlave.anus = 0>>
+ <<set $activeSlave.vagina = -1>>
<<set $activeSlave.energy = 70>>
<<set $activeSlave.dickPiercing = 1>>
<<set $activeSlave.tounguePiercing = 1>>
@@ -359,6 +378,7 @@ She waits anxiously for your decision.
<<set $activeSlave.balls = 1>>
<<set $activeSlave.foreskin = 10>>
<<set $activeSlave.scrotum = 10>>
+ <<set $activeSlave.vagina = -1>>
<<set $activeSlave.anus = 3>>
<<set $activeSlave.makeup = 3>>
<<set $activeSlave.nails = 5>>
@@ -490,7 +510,7 @@ She waits anxiously for your decision.
<<set $newRelativeRecruitID++>>
<br><br>
-You look up the $activeSlave.relation. She costs ¤$slaveCost, a bargain, but you won't be able to inspect her beyond her likely resemblance to her
+You look up the $relationType. She costs ¤$slaveCost, a bargain, but you won't be able to inspect her beyond her likely resemblance to her
<<switch $relationType>>
<<case "daughter">>
mother. Her listing states that she was used as a prostitute by her previous owner.
@@ -692,7 +712,7 @@ You look up the $activeSlave.relation. She costs ¤$slaveCost, a bargain, but yo
<<AddSlave $activeSlave>>
<<SlaveTitle $eventSlave>>
<<replace "#result">>
- You complete the legalities and biometric scanning quickly and without fuss. $activeSlave.slaveName arrives shortly. The two slaves remember each other only dimly - they parted a long time ago - but they embrace. The devoted $desc explains the situation and encourages her $activeSlave.relation to be a good slave to you. $activeSlave.slaveName looks a little fearful but clearly realizes that she's lucky to be here.
+ You complete the legalities and biometric scanning quickly and without fuss. $activeSlave.slaveName arrives shortly. The two slaves remember each other only dimly - they parted a long time ago - but they embrace. The devoted $desc explains the situation and encourages her $relationType to be a good slave to you. $activeSlave.slaveName looks a little fearful but clearly realizes that she's lucky to be here.
<<set $nextLink to "AS Dump">>
<<set $recruitedType = 0>>
<<set $relationType = 0>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index be54047a47dd9cc5a17cdbd9b627be903008cc3d..017534ee74343973e7a2fbbdffc3c746a18d67b1 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -5669,10 +5669,18 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr
<<set $seed to 30>>
<<elseif $slaves[$i].speechRules is "accent elimination">>
<<set $seed to 15>>
+<<elseif $slaves[$i].speechRules is "language lessons">>
+ <<set $seed to 10>>
<<else>>
<<set $seed to 20>>
<</if>>
-<<if $slaves[$i].accent >= 3>>
+<<if $slaves[$i].accent >= 4>>
+ <<if $week - $slaves[$i].weekAcquired > $seed - ($slaves[$i].intelligence*5) - 5>>
+ <<set $slaves[$i].accent -= 1>>
+ <<set $slaves[$i].speechRules = "accent elimination">>
+ She has managed to pick up enough $language that @@color:green;she can now barely get her point across.@@ Her accent is horrible, but it's a start.
+ <</if>>
+<<elseif $slaves[$i].accent >= 3>>
<<if $week - $slaves[$i].weekAcquired > $seed - ($slaves[$i].intelligence*5)>>
<<set $slaves[$i].accent -= 1>>
She has managed to pick up enough $language that @@color:green;she's now reasonably fluent in the language.@@ Her accent is quite heavy, but she can make herself understood.
diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw
index d3890d7b940ad29cca0f3cb005a60f427bff6b74..503954ff77ef1c175f4f8e75b5d377deed59dd1d 100644
--- a/src/uncategorized/saRelationships.tw
+++ b/src/uncategorized/saRelationships.tw
@@ -1,7 +1,7 @@
:: SA relationships [nobr]
-<<set _SL = $slaves.length, _SlaveI = $slaves[$i], _SlaveJ = null, _J = -1, _K = -1>>
-<<if _SlaveI.fuckdoll == 0>>
+<<if $slaves[$i].fuckdoll == 0>>
+ <<set _SL = $slaves.length, _SlaveI = $slaves[$i], _SlaveJ = null, _J = -1, _K = -1, _drop = 0>>
<<if _SlaveI.relationship == 0>>
<<if (_SlaveI.devotion + _SlaveI.trust > 175) && (random(1,3) == 1)>>
_SlaveI.slaveName is quite devoted to you, and trusts both you and her place as a slave. Since she does not have a strong relationship with another slave,
@@ -39,7 +39,7 @@
<<if (_SlaveJ.ID != _SlaveI.ID)>>
<<if _SlaveJ.fetish != "mindbroken">>
_SlaveI.slaveName greets _SlaveJ.slaveName with joy. It's not clear whether they ever knew each other during their lives as Futanari Sisters, but it seems that they believe themselves to be in a relationship by simple virtue of having been Sisters. In any case, _SlaveI.slaveName and _SlaveJ.slaveName @@color:lightgreen;become inseparable lovers@@ instantly, as though there's no possibility they would do anything else. They're even surprised when other slaves ask them about it; it's as though they're unaware that other possibilities even exist.
- <<set _SlaveJ.relationship = 4, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 4, _SlaveI.relationshipTarget = _SlaveJ.ID, _J = _j>>
+ <<set _SlaveJ.relationship = 4, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 4, _SlaveI.relationshipTarget = _SlaveJ.ID>>
<<break>>
<</if>>
<</if>>
@@ -63,7 +63,7 @@
<</if>>
<</for>>
<</if>>
- <<set _SlaveJ.relationship = 4, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 4, _SlaveI.relationshipTarget = _SlaveJ.ID, _J = _j>>
+ <<set _SlaveJ.relationship = 4, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 4, _SlaveI.relationshipTarget = _SlaveJ.ID>>
<<break>>
<</if>>
<</if>>
@@ -87,7 +87,7 @@
<<if (_SlaveI.assignment == "work in the brothel") && (_SlaveJ.ID == $Madam.ID)>>
<<if _SlaveJ.relationshipRules != "restrictive">>
_SlaveI.slaveName manages to ingratiate herself with the Madam, _SlaveJ.slaveName. The two slaves have @@color:lightgreen;struck up a friendship.@@
- <<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID, _J = _j>>
+ <<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID>>
<<break>>
<<else>>
<<if _SlaveI.devotion < -20>>
@@ -98,7 +98,7 @@
<<elseif (_SlaveI.assignment == "serve in the club") && (_SlaveJ.ID is $DJ.ID)>>
<<if _SlaveJ.relationshipRules != "restrictive">>
_SlaveI.slaveName manages to ingratiate herself with the DJ, _SlaveJ.slaveName. The two slaves have @@color:lightgreen;struck up a friendship.@@
- <<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID, _J = _j>>
+ <<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID>>
<<break>>
<<else>>
<<if _SlaveI.devotion < -20>>
@@ -109,7 +109,7 @@
<<elseif (_SlaveI.assignment == "work in the dairy") && (_SlaveJ.ID == $Milkmaid.ID)>>
<<if _SlaveJ.relationshipRules != "restrictive">>
_SlaveI.slaveName manages to ingratiate herself with the Milkmaid, _SlaveJ.slaveName. The two slaves have @@color:lightgreen;struck up a friendship.@@
- <<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID, _J = _j>>
+ <<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID>>
<<break>>
<<else>>
<<if _SlaveI.devotion < -20>>
@@ -120,7 +120,7 @@
<<elseif (_SlaveI.assignment == "learn in the schoolroom") && (_SlaveJ.ID == $Schoolteacher.ID)>>
<<if _SlaveJ.relationshipRules != "restrictive">>
_SlaveI.slaveName manages to ingratiate herself with the Schoolteacher, _SlaveJ.slaveName. The two slaves have @@color:lightgreen;struck up a friendship.@@
- <<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID, _J = _j>>
+ <<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID>>
<<break>>
<<else>>
<<if _SlaveI.devotion < -20>>
@@ -131,7 +131,7 @@
<<elseif (_SlaveI.assignment == "rest in the spa") && (_SlaveJ.ID == $Attendant.ID)>>
<<if _SlaveJ.relationshipRules != "restrictive">>
_SlaveI.slaveName basks in the affection and care of the spa attendant, _SlaveJ.slaveName. The two slaves have @@color:lightgreen;struck up a friendship.@@
- <<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID, _J = _j>>
+ <<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID>>
<<break>>
<<else>>
<<if _SlaveI.devotion < -20>>
@@ -142,7 +142,7 @@
<<elseif (_SlaveI.assignment == "work as a servant") && (_SlaveJ.ID == $Stewardess.ID)>>
<<if _SlaveJ.relationshipRules != "restrictive">>
_SlaveI.slaveName manages to ingratiate herself with the Stewardess, _SlaveJ.slaveName. The two slaves have @@color:lightgreen;struck up a friendship.@@
- <<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID, _J = _j>>
+ <<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID>>
<<break>>
<<else>>
<<if _SlaveI.devotion < -20>>
@@ -153,7 +153,7 @@
<<elseif (_SlaveI.assignment == "be confined in the cellblock") && (_SlaveJ.ID == $Wardeness.ID)>>
<<if _SlaveJ.relationshipRules != "restrictive">>
_SlaveI.slaveName manages to earn the respect of the Wardeness, _SlaveJ.slaveName. The two slaves have @@color:lightgreen;struck up a friendship.@@
- <<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID, _J = _j>>
+ <<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID>>
<<break>>
<<else>>
<<if _SlaveI.devotion < -20>>
@@ -164,7 +164,7 @@
<<elseif (_SlaveI.assignment == "serve in the master suite") && (_SlaveJ.ID == $Concubine.ID)>>
<<if _SlaveJ.relationshipRules != "restrictive">>
_SlaveI.slaveName becomes especially close to the Concubine, _SlaveJ.slaveName. The two slaves have @@color:lightgreen;struck up a friendship.@@
- <<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID, _J = _j>>
+ <<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID>>
<<break>>
<<else>>
<<if _SlaveI.devotion < -20>>
@@ -176,7 +176,7 @@
<<if random(1, 100) > 50>>
<<if _SlaveJ.relationshipRules != "restrictive">>
_SlaveI.slaveName and _SlaveJ.slaveName see a lot of each other at work and @@color:lightgreen;strike up a friendship.@@
- <<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID, _J = _j>>
+ <<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID>>
<<break>>
<<else>>
<<if $resentment == 0>>
@@ -190,7 +190,7 @@
<<if (_SlaveI.releaseRules != "restrictive")>>
<<if _SlaveJ.relationshipRules == "permissive">>
_SlaveI.slaveName and _SlaveJ.slaveName share sexual inclinations, so it's only natural that they @@color:lightgreen;become friends with benefits.@@
- <<set _SlaveJ.relationship = 3, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 3, _SlaveI.relationshipTarget = _SlaveJ.ID, _J = _j>>
+ <<set _SlaveJ.relationship = 3, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 3, _SlaveI.relationshipTarget = _SlaveJ.ID>>
<<break>>
<<else>>
_SlaveI.slaveName tries to strike up a sexual relationship with _SlaveJ.slaveName and is @@color:gold;punished@@ for breaking the rules against such things; she @@color:mediumorchid;resents@@ being prevented from pursuing her.
@@ -206,26 +206,28 @@
<</if>>
<</for>>
<<if _SlaveI.relationshipTarget != _SlaveJ.ID>>
- <<set _SlaveJ = null, _J = -1>>
+ <<set _SlaveJ = null>>
<</if>>
<</if>>
<</if>>
<</if>>
<</if>>
- <<else>> /* RELATIONSHIP IS NOT 0; NOW ON TO ONGOING RELATIONSHIPS */
- <<if (_SlaveI.relationship > 0) || (_SlaveI.relation > 0)>>
- <<for _j to 0; _j < _SL; _j++>>
- <<if _SlaveI.relationshipTarget == $slaves[_j].ID>>
- /% Also sets a few extra vars. to get rid of redundancy of possible old bug fixes? %/
- <<set _SlaveJ = $slaves[_j], _J = _j , _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveJ.relationship = _SlaveI.relationship>>
- <</if>>
- <<if _SlaveI.relationTarget == $slaves[_j].ID>>
- <<if _SlaveI.rivalryTarget != _SlaveI.relationTarget>>
- <<set _K = _j>>
- <</if>>
+ <<set _drop = 1>>
+ <</if>>
+ <<if (_SlaveI.relationship > 0) || (_SlaveI.relation > 0)>>
+ <<for _j to 0; _j < _SL; _j++>>
+ <<if _SlaveI.relationshipTarget == $slaves[_j].ID>>
+ /% Also sets a few extra vars. to get rid of redundancy of possible old bug fixes? %/
+ <<set _SlaveJ = $slaves[_j], _J = _j , _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveJ.relationship = _SlaveI.relationship>>
+ <</if>>
+ <<if _SlaveI.relationTarget == $slaves[_j].ID>>
+ <<if _SlaveI.rivalryTarget != _SlaveI.relationTarget>>
+ <<set _K = _j>>
<</if>>
- <</for>>
- <</if>>
+ <</if>>
+ <</for>>
+ <</if>>
+ <<if (_SlaveI.relationship != 0) && (_drop == 0)>> /% RELATIONSHIP IS NOT 0; NOW ON TO ONGOING RELATIONSHIPS %/
/% Game change due to possible bug clears rivalry only if between SlaveI and SlaveJ if they are the rivals. So delete this one or the other one just below %/
<<if (_SlaveI.rivalry != 0 && _SlaveJ != null)>>
<<if _SlaveI.rivalryTarget == _SlaveI.relationshipTarget>>
@@ -1238,8 +1240,8 @@
<</if>> /* closes family mod */
-<</if>> /* CLOSES FUCKDOLL CHECK */
-<<set $slaves[$i] = _SlaveI>>
-<<if _SlaveJ != null>>
- <<set $slaves[_J] = _SlaveJ>>
-<</if>>
+ <<set $slaves[$i] = _SlaveI>>
+ <<if _SlaveJ != null>>
+ <<set $slaves[_J] = _SlaveJ>>
+ <</if>>
+<</if>> /% CLOSES FUCKDOLL CHECK %/
diff --git a/src/uncategorized/saRivalries.tw b/src/uncategorized/saRivalries.tw
index 5b7cec7b19d80346bfa9b16f508158e93bfc6458..4cdefd3b139c00f494ec104338f7e2b541e5eb09 100644
--- a/src/uncategorized/saRivalries.tw
+++ b/src/uncategorized/saRivalries.tw
@@ -1,29 +1,27 @@
:: SA rivalries [nobr]
-
-<<if $slaves[$i].fuckdoll == 0>>
+<<if $slaves[$i].fuckdoll == 0>>
+<<set _SL = $slaves.length>>
<<if $slaves[$i].rivalry == 0>>
<<if $slaves[$i].fetish != "mindbroken">>
<<if $slaves[$i].behavioralFlaw is "none">>
- <<set $seed to random(1,100)>>
+ <<set _seed to random(1,100)>>
<<else>>
- <<set $seed to random(1,110)>>
- <</if>>
- <<if $seed > 90>>
- <<for $j to 0; $j < $slaves.length; $j++>>
- <<if $slaves[$j].ID != $slaves[$i].ID>>
- <<if $slaves[$j].assignment is $slaves[$i].assignment>>
- <<if $slaves[$j].assignment != "stay confined">>
- <<if $slaves[$j].assignment != "be confined in the arcade">>
- <<if ($slaves[$j].rivalry == 0) && ($slaves[$i].rivalry == 0)>>
- <<if ($slaves[$i].relationshipTarget != $slaves[$j].ID)>>
- <<if random(-100,100) > ($slaves[$j].devotion+$slaves[$i].devotion)>>
- $slaves[$i].slaveName and $slaves[$j].slaveName see too much of each other and @@color:lightsalmon;start to dislike each other.@@
- <<set $slaves[$j].rivalry to 1>>
- <<set $slaves[$j].rivalryTarget to $slaves[$i].ID>>
- <<set $slaves[$i].rivalry to 1>>
- <<set $slaves[$i].rivalryTarget to $slaves[$j].ID>>
+ <<set _seed to random(1,110)>>
+ <</if>>
+ <<if _seed > 90>>
+ <<for _j to 0; _j < _SL; _j++>>
+ <<if $slaves[_j].assignment == $slaves[$i].assignment>>
+ <<if $slaves[_j].ID != $slaves[$i].ID>>
+ <<if $slaves[_j].assignment != "stay confined">>
+ <<if $slaves[_j].assignment != "be confined in the arcade">>
+ <<if ($slaves[_j].rivalry == 0)>>
+ <<if ($slaves[$i].relationshipTarget != $slaves[_j].ID)>>
+ <<if random(-100,100) > ($slaves[_j].devotion+$slaves[$i].devotion)>>
+ $slaves[$i].slaveName and $slaves[_j].slaveName see too much of each other and @@color:lightsalmon;start to dislike each other.@@
+ <<set $slaves[_j].rivalry to 1, $slaves[_j].rivalryTarget to $slaves[$i].ID>>
+ <<set $slaves[$i].rivalry to 1, $slaves[$i].rivalryTarget to $slaves[_j].ID>>
<</if>>
<</if>>
<</if>>
@@ -36,166 +34,87 @@
<</if>>
<<else>>
-
-<<if $slaves[$i].fetish is "mindbroken">>
-
-Since she is mindbroken, she @@color:lightsalmon;can't really maintain@@ any meaningful rivalry with
-<<for $j to 0; $j < $slaves.length; $j++>>
- <<if $slaves[$j].ID is $slaves[$i].rivalryTarget>>
- $slaves[$j].slaveName.
- <<set $slaves[$j].rivalry to 0>>
- <<set $slaves[$j].rivalryTarget to 0>>
- <<break>>
- <</if>>
+<<set _SlaveJ = null>>
+<<for _j = 0; _j < _SL; _j++>>
+<<if $slaves[_j].ID is $slaves[$i].rivalryTarget>>
+ <<set _SlaveJ = $slaves[_j]>>
+ <<break>>
+<</if>>
<</for>>
-<<set $slaves[$i].rivalry to 0>>
-<<set $slaves[$i].rivalryTarget to 0>>
+<<if _SlaveJ != null>>
+
+<<if $slaves[$i].fetish is "mindbroken">>
+ Since she is mindbroken, she @@color:lightsalmon;can't really maintain@@ any meaningful rivalry with _SlaveJ.slaveName.
+ <<set_SlaveJ.rivalry to 0,_SlaveJ.rivalryTarget to 0>>
+ <<set $slaves[$i].rivalry to 0, $slaves[$i].rivalryTarget to 0>>
<<else>>
<<if (random(1,100) > 70)>>
- <<for $j to 0; $j < $slaves.length; $j++>>
- <<if $slaves[$j].ID is $slaves[$i].rivalryTarget>>
- <<if ($slaves[$j].assignment != $slaves[$i].assignment) && ($slaves[$i].subTarget != $slaves[$j].ID) && ($slaves[$j].subTarget != $slaves[$i].ID)>>
- With time apart $slaves[$i].slaveName and $slaves[$j].slaveName @@color:lightgreen;dislike each other less.@@
- <<set $slaves[$j].rivalry -= 1>>
- <<set $slaves[$i].rivalry -= 1>>
- <<elseif ($slaves[$j].fetish is $slaves[$i].fetish) && ($slaves[$j].fetishKnown == 1) && ($slaves[$i].fetishKnown == 1)>>
- $slaves[$i].slaveName and $slaves[$j].slaveName share sexual interests, and in the sexual atmosphere of the arcology, it's @@color:lightgreen;difficult for them to keep up their dislike@@ of one another with the mutual attraction.
- <<set $slaves[$j].rivalry -= 1>>
- <<set $slaves[$i].rivalry -= 1>>
- <<elseif ($slaves[$j].devotion > 50) && ($slaves[$i].devotion > 50)>>
- Since both $slaves[$i].slaveName and $slaves[$j].slaveName are devoted to you, they work together to @@color:lightgreen;get over their feud,@@ since it gets in the way of their duties.
- <<set $slaves[$j].rivalry -= 1>>
- <<set $slaves[$i].rivalry -= 1>>
- <<elseif ($slaves[$j].trust < -20) && ($slaves[$i].devotion < -20)>>
- Since both $slaves[$i].slaveName and $slaves[$j].slaveName are terrified of you, they work together to @@color:lightgreen;get over their feud,@@ since it brings punishment on both of them.
- <<set $slaves[$j].rivalry -= 1>>
- <<set $slaves[$i].rivalry -= 1>>
- <<elseif ($slaves[$j].ID is $slaves[$i].relationshipTarget) && ($slaves[$i].relationship > 3)>>
- <<set $slaves[$j].rivalry to 0>>
- <<set $slaves[$j].rivalryTarget to 0>>
- <<set $slaves[$i].rivalry to 0>>
- <<set $slaves[$i].rivalryTarget to 0>>
+ <<if (_SlaveJ.assignment != $slaves[$i].assignment) && ($slaves[$i].subTarget != _SlaveJ.ID) && (_SlaveJ.subTarget != $slaves[$i].ID)>>
+ With time apart $slaves[$i].slaveName and _SlaveJ.slaveName @@color:lightgreen;dislike each other less.@@
+ <<set _SlaveJ.rivalry -= 1, $slaves[$i].rivalry -= 1>>
+ <<elseif (_SlaveJ.fetish is $slaves[$i].fetish) && (_SlaveJ.fetishKnown == 1) && ($slaves[$i].fetishKnown == 1)>>
+ $slaves[$i].slaveName and _SlaveJ.slaveName share sexual interests, and in the sexual atmosphere of the arcology, it's @@color:lightgreen;difficult for them to keep up their dislike@@ of one another with the mutual attraction.
+ <<set _SlaveJ.rivalry -= 1, $slaves[$i].rivalry -= 1>>
+ <<elseif (_SlaveJ.devotion > 50) && ($slaves[$i].devotion > 50)>>
+ Since both $slaves[$i].slaveName and _SlaveJ.slaveName are devoted to you, they work together to @@color:lightgreen;get over their feud,@@ since it gets in the way of their duties.
+ <<set _SlaveJ.rivalry -= 1, $slaves[$i].rivalry -= 1>>
+ <<elseif (_SlaveJ.trust < -20) && ($slaves[$i].devotion < -20)>>
+ Since both $slaves[$i].slaveName and _SlaveJ.slaveName are terrified of you, they work together to @@color:lightgreen;get over their feud,@@ since it brings punishment on both of them.
+ <<set _SlaveJ.rivalry -= 1, $slaves[$i].rivalry -= 1>>
+ <<elseif (_SlaveJ.ID is $slaves[$i].relationshipTarget) && ($slaves[$i].relationship > 3)>>
+ <<set _SlaveJ.rivalry to 0, _SlaveJ.rivalryTarget to 0>>
+ <<set $slaves[$i].rivalry to 0, $slaves[$i].rivalryTarget to 0>>
<<elseif (random(1,100) > 70)>>
- $slaves[$i].slaveName and $slaves[$j].slaveName's @@color:lightgreen;feud dissipates a little.@@
- <<set $slaves[$j].rivalry -= 1>>
- <<set $slaves[$i].rivalry -= 1>>
- <</if>>
- <<break>>
- <</if>>
- <</for>>
-<<elseif $familyTesting == 1 && ($slaves[$i].mother > 0 || $slaves[$i].father > 0 || $slaves[$i].daughters > 0 || $slaves[$i].sisters > 0) && (random(1,100) > 80)>>
- <<for $j to 0; $j < $slaves.length; $j++>>
- <<if $slaves[$j].ID is $slaves[$i].rivalryTarget>>
- $slaves[$i].slaveName and $slaves[$j].slaveName @@color:lightsalmon;pursue their family rivalry.@@
- <<set $slaves[$j].rivalry += 1>>
- <<set $slaves[$i].rivalry += 1>>
- <<break>>
+ $slaves[$i].slaveName and _SlaveJ.slaveName's @@color:lightgreen;feud dissipates a little.@@
+ <<set _SlaveJ.rivalry -= 1, $slaves[$i].rivalry -= 1>>
<</if>>
- <</for>>
+<<elseif $familyTesting == 1 && totalRelatives($slaves[$i]) > 0 && (random(1,100) > 80)>>
+ $slaves[$i].slaveName and_SlaveJ.slaveName @@color:lightsalmon;pursue their family rivalry.@@
+ <<set _SlaveJ.rivalry -= 1, $slaves[$i].rivalry -= 1>>
<<elseif ($slaves[$i].relation != 0) && ($slaves[$i].relationTarget is $slaves[$i].rivalryTarget) && (random(1,100) > 80)>>
- <<for $j to 0; $j < $slaves.length; $j++>>
- <<if $slaves[$j].ID is $slaves[$i].rivalryTarget>>
- $slaves[$i].slaveName and $slaves[$j].slaveName @@color:lightsalmon;pursue their family rivalry.@@
- <<set $slaves[$j].rivalry += 1>>
- <<set $slaves[$i].rivalry += 1>>
- <<break>>
- <</if>>
- <</for>>
-<<elseif $familyTesting == 1 && ($slaves[$i].mother > 0 || $slaves[$i].father > 0 || $slaves[$i].daughters > 0 || $slaves[$i].sisters > 0) && (random(1,100) > 80)>>
- <<for $j to 0; $j < $slaves.length; $j++>>
- <<if $slaves[$j].ID is $slaves[$i].rivalryTarget>>
- $slaves[$i].slaveName and $slaves[$j].slaveName @@color:lightgreen;patch up their family relationship.@@
- <<set $slaves[$j].rivalry -= 1>>
- <<set $slaves[$i].rivalry -= 1>>
- <<break>>
- <</if>>
- <</for>>
+ $slaves[$i].slaveName and _SlaveJ.slaveName @@color:lightsalmon;pursue their family rivalry.@@
+ <<set _SlaveJ.rivalry += 1, $slaves[$i].rivalry += 1>>
+<<elseif $familyTesting == 1 && totalRelatives($slaves[$i]) > 0 && (random(1,100) > 80)>>
+ $slaves[$i].slaveName and _SlaveJ.slaveName @@color:lightgreen;patch up their family relationship.@@
+ <<set _SlaveJ.rivalry -= 1, $slaves[$i].rivalry -= 1>>
<<elseif ($slaves[$i].relation != 0) && ($slaves[$i].relationTarget is $slaves[$i].rivalryTarget) && (random(1,100) > 80)>>
- <<for $j to 0; $j < $slaves.length; $j++>>
- <<if $slaves[$j].ID is $slaves[$i].rivalryTarget>>
- $slaves[$i].slaveName and $slaves[$j].slaveName @@color:lightgreen;patch up their family relationship.@@
- <<set $slaves[$j].rivalry -= 1>>
- <<set $slaves[$i].rivalry -= 1>>
- <<break>>
- <</if>>
- <</for>>
+ $slaves[$i].slaveName and _SlaveJ.slaveName @@color:lightgreen;patch up their family relationship.@@
+ <<set _SlaveJ.rivalry -= 1, $slaves[$i].rivalry -= 1>>
<<elseif ($slaves[$i].energy > 95) && (random(1,100) > 60)>>
- <<for $j to 0; $j < $slaves.length; $j++>>
- <<if $slaves[$j].ID is $slaves[$i].rivalryTarget>>
- $slaves[$i].slaveName lusts after $slaves[$j].slaveName, and does everything she can to @@color:lightgreen;patch up their differences.@@
- <<set $slaves[$j].rivalry -= 1>>
- <<set $slaves[$i].rivalry -= 1>>
- <<break>>
- <</if>>
- <</for>>
+ $slaves[$i].slaveName lusts after _SlaveJ.slaveName, and does everything she can to @@color:lightgreen;patch up their differences.@@
+ <<set _SlaveJ.rivalry -= 1, $slaves[$i].rivalry -= 1>>
<<elseif ($slaves[$i].attrXX > 85) && (random(1,100) > 70)>>
- <<for $j to 0; $j < $slaves.length; $j++>>
- <<if $slaves[$j].ID is $slaves[$i].rivalryTarget>>
- <<if ($slaves[$j].vagina > -1) || ($slaves[$j].faceShape != "masculine")>>
- $slaves[$i].slaveName lusts after $slaves[$j].slaveName, and does everything she can to @@color:lightgreen;patch up their differences.@@
- <<set $slaves[$j].rivalry -= 1>>
- <<set $slaves[$i].rivalry -= 1>>
- <<break>>
- <</if>>
+ <<if (_SlaveJ.vagina > -1) || (_SlaveJ.faceShape != "masculine")>>
+ $slaves[$i].slaveName lusts after _SlaveJ.slaveName, and does everything she can to @@color:lightgreen;patch up their differences.@@
+ <<set _SlaveJ.rivalry -= 1, $slaves[$i].rivalry -= 1>>
<</if>>
- <</for>>
<<elseif ($slaves[$i].attrXY > 85) && (random(1,100) > 70)>>
- <<for $j to 0; $j < $slaves.length; $j++>>
- <<if $slaves[$j].ID is $slaves[$i].rivalryTarget>>
- <<if ($slaves[$j].balls > 0) || ($slaves[$j].faceShape is "masculine")>>
- $slaves[$i].slaveName lusts after $slaves[$j].slaveName, and does everything she can to @@color:lightgreen;patch up their differences.@@
- <<set $slaves[$j].rivalry -= 1>>
- <<set $slaves[$i].rivalry -= 1>>
- <<break>>
- <</if>>
+ <<if (_SlaveJ.balls > 0) || (_SlaveJ.faceShape is "masculine")>>
+ $slaves[$i].slaveName lusts after _SlaveJ.slaveName, and does everything she can to @@color:lightgreen;patch up their differences.@@
+ <<set _SlaveJ.rivalry -= 1, $slaves[$i].rivalry -= 1>>
<</if>>
- <</for>>
<<elseif (random(1,100) > 90)>>
- <<for $j to 0; $j < $slaves.length; $j++>>
- <<if $slaves[$j].ID is $slaves[$i].rivalryTarget>>
- $slaves[$i].slaveName and $slaves[$j].slaveName @@color:lightsalmon;bicker@@ and indulge their rivalry whenever they can.
- <<set $slaves[$j].rivalry += 1>>
- <<set $slaves[$i].rivalry += 1>>
- <<break>>
- <</if>>
- <</for>>
+ $slaves[$i].slaveName and _SlaveJ.slaveName @@color:lightsalmon;bicker@@ and indulge their rivalry whenever they can.
+ <<set _SlaveJ.rivalry += 1, $slaves[$i].rivalry += 1>>
<<elseif (random(1,100) > 90)>>
- <<for $j to 0; $j < $slaves.length; $j++>>
- <<if $slaves[$j].ID is $slaves[$i].rivalryTarget>>
- $slaves[$i].slaveName and $slaves[$j].slaveName manage to @@color:lightgreen;de-escalate their little feud.@@
- <<set $slaves[$j].rivalry -= 1>>
- <<set $slaves[$i].rivalry -= 1>>
- <<break>>
- <</if>>
- <</for>>
+ $slaves[$i].slaveName and _SlaveJ.slaveName manage to @@color:lightgreen;de-escalate their little feud.@@
+ <<set _SlaveJ.rivalry -= 1, $slaves[$i].rivalry -= 1>>
<</if>>
-
+<</if>>
+<<set $slaves[_j] = _SlaveJ>>
<</if>>
<</if>>
<<if $slaves[$i].rivalry != 0>>
- <<set $seed to 0>>
- <<for $j to 0; $j < $slaves.length; $j++>>
- <<if $slaves[$j].ID is $slaves[$i].rivalryTarget>>
- <<if $slaves[$i].ID is $slaves[$j].rivalryTarget>>
- <<set $seed to 1>>
- <<break>>
- <</if>>
- <</if>>
- <</for>>
- <<if $seed == 0>>
- <<for $j to 0; $j < $slaves.length; $j++>>
- <<if $slaves[$j].ID is $slaves[$i].rivalryTarget>>
- <<set $slaves[$j].rivalry to 0>>
- <<set $slaves[$j].rivalryTarget to 0>>
+<<for _j to 0; _j < _SL; _j++>>
+ <<if ($slaves[_j].ID == $slaves[$i].rivalryTarget) && ($slaves[$i].ID != $slaves[_j].rivalryTarget)>>
+ <<set $slaves[_j].rivalry to 0, $slaves[_j].rivalryTarget to 0>>
+ <<set $slaves[$i].rivalry to 0, $slaves[$i].rivalryTarget to 0>>
<<break>>
- <</if>>
- <</for>>
- <<set $slaves[$i].rivalry to 0>>
- <<set $slaves[$i].rivalryTarget to 0>>
<</if>>
+<</for>>
<</if>>
<</if>> /* CLOSES FUCKDOLL CHECK */
diff --git a/src/uncategorized/saTakeClasses.tw b/src/uncategorized/saTakeClasses.tw
index 15ce46c9421f1335eb4ca441bdbeb189dc0a4d46..870a53e42421063bf18e0d785644a902b45411e4 100644
--- a/src/uncategorized/saTakeClasses.tw
+++ b/src/uncategorized/saTakeClasses.tw
@@ -149,12 +149,18 @@ takes courses in slavery<<if $schoolroomUpgradeSkills + $schoolroomUpgradeRemedi
<<if $slaves[$i].voice != 0>>
<<if ($slaves[$i].intelligence > random(-4,4))>>
<<if ($schoolroomUpgradeLanguage == 0)>>
- <<if ($slaves[$i].accent >= 3)>>
+ <<if ($slaves[$i].accent > 3)>>
+ She has @@color:green;learned some $language,@@ and can make her point with some gesturing, though she speaks $language horribly.
+ <<set $slaves[$i].accent -= 1>>
+ <<elseif ($slaves[$i].accent == 3)>>
She has @@color:green;learned functional $language,@@ and can make herself understood, though her $slaves[$i].nationality accent is still quite heavy.
- <<set $slaves[$i].accent to 2>>
+ <<set $slaves[$i].accent -= 1>>
<</if>>
<<else>>
- <<if ($slaves[$i].accent >= 2)>>
+ <<if ($slaves[$i].accent > 3)>>
+ She has @@color:green;learned some $language,@@ and can make her point with some gesturing, though she speaks $language horribly.
+ <<set $slaves[$i].accent -= 1>>
+ <<elseif ($slaves[$i].accent >= 2)>>
She has @@color:green;learned decent $language,@@ though she retains enough of her $slaves[$i].nationality accent to make her voice distinctly sexy.
<<set $slaves[$i].accent to 1>>
<</if>>
diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw
index b6a905cf859dc767788c7628b9fd5faaf49ccf67..578624acbea6842b758bb0e6ae9db9b9c12eb299 100644
--- a/src/uncategorized/schoolroomReport.tw
+++ b/src/uncategorized/schoolroomReport.tw
@@ -152,8 +152,8 @@
<</if>>
<</if>>
<</for>>
- <<if ($schoolroomSlaves < $schoolroomS)>>
- <<set $seed to random(1,10)+(($schoolroomS-$schoolroomSlaves)*(random(150,170)+($idleBonus*10)))>>
+ <<if ($schoolroomSlaves < $schoolroom)>>
+ <<set $seed to random(1,10)+(($schoolroom-$schoolroomSlaves)*(random(150,170)+($idleBonus*10)))>>
<<set $cash += $seed>>
Since she doesn't have enough students to occupy all her time, $schoolroomName takes in citizens' slaves on a contract basis and she teaches them too, earning @@color:yellowgreen;¤$seed.@@
<</if>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 7972c7eefe76a0a4d72bd2a48c1e91eab25ce182..2fbfe0afb914a1c73e06f6e9cfa9bf7ce5c1ebf8 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -280,7 +280,7 @@
<</if>>
<</if>>
<<if ($activeSlave.fetish != "mindbroken")>>
- <<if ($activeSlave.amp != 1) || ($activeSlave.voice != 0)>>
+ <<if (($activeSlave.amp != 1) || ($activeSlave.voice != 0)) && $activeSlave.accent != 4>>
| <<click "Ask her about her feelings">><<replace "#miniscene">><<display "FFeelings">><br> <</replace>><</click>>
<</if>>
<</if>>
@@ -749,9 +749,9 @@ __Diet Base__: <strong><span id="dietBase"><<if $activeSlave.dietCum == 2>>Cum B
<<if $activeSlave.voice != 0>>
__Speech Rules__: ''<span id="speechRules">$activeSlave.speechRules</span>.''
<<if $activeSlave.speechRules is "restrictive">>
- <<click "Permissive">><<set $activeSlave.speechRules to "permissive">><<replace "#speechRules">><<print $activeSlave.speechRules>><</replace>><</click>><<if $activeSlave.accent > 0>> | <<click "Accent elimination">><<set $activeSlave.speechRules to "accent elimination">><<replace "#speechRules">><<print $activeSlave.speechRules>><</replace>><</click>><</if>>
+ <<click "Permissive">><<set $activeSlave.speechRules to "permissive">><<replace "#speechRules">><<print $activeSlave.speechRules>><</replace>><</click>><<if $activeSlave.accent > 0 && $activeSlave.accent < 4>> | <<click "Accent elimination">><<set $activeSlave.speechRules to "accent elimination">><<replace "#speechRules">><<print $activeSlave.speechRules>><</replace>><</click>><</if>><<if $activeSlave.accent > 3>> | <<click "Language lessons">><<set $activeSlave.speechRules to "language lessons">><<replace "#speechRules">><<print $activeSlave.speechRules>><</replace>><</click>><</if>>
<<elseif $activeSlave.speechRules is "permissive">>
- <<if $activeSlave.accent > 0>><<click "Accent elimination">><<set $activeSlave.speechRules to "accent elimination">><<replace "#speechRules">><<print $activeSlave.speechRules>><</replace>><</click>> | <</if>><<click "Restrictive">><<set $activeSlave.speechRules to "restrictive">><<replace "#speechRules">><<print $activeSlave.speechRules>><</replace>><</click>>
+ <<if $activeSlave.accent > 0 && $activeSlave.accent < 4>><<click "Accent elimination">><<set $activeSlave.speechRules to "accent elimination">><<replace "#speechRules">><<print $activeSlave.speechRules>><</replace>><</click>> | <</if>><<if $activeSlave.accent > 3>><<click "Language lessons">><<set $activeSlave.speechRules to "language lessons">><<replace "#speechRules">><<print $activeSlave.speechRules>><</replace>><</click>> | <</if>><<click "Restrictive">><<set $activeSlave.speechRules to "restrictive">><<replace "#speechRules">><<print $activeSlave.speechRules>><</replace>><</click>>
<<else>>
<<click "Permissive">><<set $activeSlave.speechRules to "permissive">><<replace "#speechRules">><<print $activeSlave.speechRules>><</replace>><</click>> | <<click "Restrictive">><<set $activeSlave.speechRules to "restrictive">><<replace "#speechRules">><<print $activeSlave.speechRules>><</replace>><</click>>
<</if>>
@@ -1059,6 +1059,8 @@ __Buttplug__: ''<span id="buttplug">$activeSlave.buttplug</span>.''
<<if ($slaves.length > 1)>>
<<if $activeSlave.origin == "You bought her from a body dump, completely broken." && ($week-$activeSlave.weekAcquired <= 8)>>
//A discarded slave must be kept for at least two months to unsure health before being sold.//
+ <<elseif $activeSlave.accent > 3>>
+ //Her lack of language and basic life skills is a red sign to most slave appraisers. She must not act like a child to be sold without raising suspicion.//
<<else>>
[[Sell her|Sell Slave][$cash -= 500]] //Listing her for sale will cost ¤500// |
<<if ($seeAge != 0)>>
diff --git a/src/uncategorized/slaveMarkets.tw b/src/uncategorized/slaveMarkets.tw
index 21d5fee9fc8df627ffd0a6855d5b232eb16c2771..d813a4a2e108ed756b7f7289b4a78a2dbcf44527 100644
--- a/src/uncategorized/slaveMarkets.tw
+++ b/src/uncategorized/slaveMarkets.tw
@@ -73,7 +73,7 @@ You're in the area of the slave market owned by your corporation. The corporatio
/*<<set $activeSlave.actualAge = ramdom(18,19)>>*/
<<elseif $captureUpgradeAge == "old">>
Newly enslaved MILFs are strongly favored for training.
- */<<set $activeSlave.actualAge = ramdom(36,$retirementAge)>>*/
+ /*<<set $activeSlave.actualAge = ramdom(36,$retirementAge)>>*/
<<else>>
Promising slaves are trained without special sorting based on age.
<</if>>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index a60d995762d97ebe14ecc2168a9ab7f6f328ddf1..3dbe00fe1931fe6c74f38de14eb83ea574adf7ec 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -694,6 +694,8 @@ will
''SpR:P''
<<case "accent elimination">>
''SpR:NoAcc''
+<<case "language lessons">>
+ ''SpR:LL''
<<default>>
''SpR:R''
<</switch>>
@@ -1590,6 +1592,8 @@ Release rules: _Slave.releaseRules.
@@color:red;Acc--@@
<<elseif _Slave.accent is 2>>
Acc-
+ <<elseif _Slave.accent is 4>>
+ Acc--
<<elseif _Slave.accent == 1>>
@@color:pink;Acc@@
<</if>>
@@ -1807,6 +1811,8 @@ _Slave.faceShape face.
<<else>>
<<if _Slave.accent is 3>>
@@color:red;Bad accent.@@
+<<elseif _Slave.accent is 4>>
+ @@color:red;No language skills.@@
<<elseif _Slave.accent is 2>>
Accent.
<<elseif _Slave.accent == 1>>
diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw
index d53f5ffa782a6826d5379636e07f9a5f9e59e09d..4d49cfa76b6bdc0aef84c56f15da6960f25e9aff 100644
--- a/src/utility/assayWidgets.tw
+++ b/src/utility/assayWidgets.tw
@@ -627,7 +627,7 @@
<<if canTalk($args[0]) == false>>
<<set $beauty -= 2>>
<<else>>
- <<if ($args[0].accent is 3)>>
+ <<if ($args[0].accent >= 3)>>
<<set $beauty -= 1>>
<<elseif ($args[0].accent == 1)>>
<<set $beauty += 1>>