diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 5a09fbe22726f974ef60b311fec07200aecf7a76..60c41e5b2a83f67d2537816754b73ed17533483f 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -214,6 +214,9 @@
<<if ndef $slaves[$i].customImage>>
<<set $slaves[$i].customImage to 0>>
<</if>>
+ <<if ndef $slaves[$i].nationality>>
+ <<set $slaves[$i].nationality = "slave">>
+ <</if>>
<</for>>
<<set $slavesOriginal = $slaves>>
<<set $organs = []>>
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index bfdbce264289868558107c8b0d2623606d8af6f0..570304314819fcd6a9083b003192eb8617a540a2 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -1,6 +1,6 @@
:: Acquisition [nobr]
-<<if $saveImported == 1>><<set $startingValue to 5000>><<else>><<set $startingValue to 25000>><</if>>
+<<if $saveImported == 1>><<set _valueOwed to 5000>><<else>><<set _valueOwed to 50000>><</if>>
<<if $freshPC == 1>>
<<if $PC.vagina == 1>>
<<set $PC.births = 0>>
@@ -119,17 +119,15 @@ The previous owner seems to have left in something of a hurry.
<</if>>
<<set $heroSlaves to $heroSlaves.shuffle()>>
-<<set $seed to 0>>
+<<set _valueGiven to 0>>
<<if $ageMode == 1>>
<<display [[Aging Test]]>>
<<elseif $cheatMode == 1>>
<<display [[Cheatmode Database]]>>
<<elseif $saveImported == 1>>
<<elseif ($targetArcology.type != "New") && ($targetArcology.type != "Multiculturalist")>>
- <<for $j to 0; $j < $heroSlaves.length; $j++>>
- <<if $startingValue - $seed <= 5000>>
- <<break>>
- <</if>>
+ <<for $j to 0; $j < 5; $j++>>
+ <<if _valueOwed - _valueGiven <= 5000>><<break>><</if>>
<<switch $targetArcology.type>>
<<case "Supremacist">>
<<set $arcologies[0].FSSupremacistLawME = 1>><<display "Generate New Slave">><<set $arcologies[0].FSSupremacistLawME = 0>>
@@ -428,21 +426,20 @@ The previous owner seems to have left in something of a hurry.
<<default>>
ERROR: bad arcology type
<</switch>>
- <<set $activeSlave.origin = "You acquired her along with the arcology.">>
- <<set $activeSlave.career = "a slave">>
+ <<set $activeSlave.origin = "You acquired her along with the arcology.", $activeSlave.career = "a slave">>
<<slaveCost $activeSlave>>
- <<set $seed = Math.trunc($seed+$slaveCost, 0, $startingValue)>>
+ <<set _valueGiven += $slaveCost>>
<<AddSlave $activeSlave>>
<</for>>
<<else>>
<<for $j to 0; $j < $heroSlaves.length; $j++>>
- <<if $startingValue - $seed <= 5000>>
+ <<if _valueOwed - _valueGiven <= 5000>>
<<break>>
<</if>>
<<set $activeSlave to $heroSlaves[$j]>>
<<set $dump to $heroSlaves.pluck($j,$j)>>
<<slaveCost $activeSlave>>
- <<if $seed + $slaveCost < $startingValue*2>>
+ <<if _valueGiven + $slaveCost < _valueOwed*2>>
<<NationalityToAccent>>
<<set $activeSlave.pubicHColor to $activeSlave.hColor>>
<<set $activeSlave.pubicHStyle = "waxed">>
@@ -450,7 +447,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.oldDevotion to $activeSlave.devotion>>
<<set $activeSlave.oldTrust to $activeSlave.trust>>
- <<set $seed += $slaveCost>>
+ <<set _valueGiven += $slaveCost>>
<<AddSlave $activeSlave>>
<<if $activeSlave.fetish is "mindbroken">>
$activeSlave.slaveName is, sadly, not mentally competent, and is wandering through the penthouse at the moment.
@@ -492,9 +489,9 @@ The previous owner seems to have left in something of a hurry.
<</if>>
<</for>>
<</if>>
-<<if $startingValue - $seed > 0>>
- There are some valuables present, worth ¤<<print $startingValue - $seed>>.
- <<set $cash += $startingValue - $seed>>
+<<if _valueOwed-_valueGiven > 0>>
+ There are some valuables present, worth ¤<<print _valueOwed-_valueGiven>>.
+ <<set $cash += _valueOwed-_valueGiven>>
<</if>>
//
diff --git a/src/pregmod/extendedFamilyWidgets.tw b/src/pregmod/extendedFamilyWidgets.tw
index cef276de55ce53c12f5a429ea435fc6dedbae91e..666c45bac065d89caa5627681a6660dd41141986 100644
--- a/src/pregmod/extendedFamilyWidgets.tw
+++ b/src/pregmod/extendedFamilyWidgets.tw
@@ -494,23 +494,23 @@
/*testtest PC sibling passages - determines how many siblings you have*/
<<set $children = []>>
-<<set $rel_num to areSisters($activeSlave, $PC)>>
-<<if($rel_num gt 0)>>
- <<if($activeSlave.vagina > -1)>>
- <<set $rel_type to "sister">>
+<<set _rel_num to areSisters($activeSlave, $PC)>>
+<<if(_rel_num > 0)>>
+ <<if ($activeSlave.vagina > -1)>>
+ <<set _rel_type to "sister">>
<<else>>
- <<set $rel_type to "brother">>
+ <<set _rel_type to "brother">>
<</if>>
- <<if($rel_num == 1)>>
- <<set $rel_desc to "your twin">>
- <<elseif $rel_num == 2>>
- <<set $rel_desc to "your ">>
- <<elseif $rel_num == 3>>
- <<set $rel_desc to "your half-">>
+ <<if (_rel_num == 1)>>
+ <<set _rel_desc to "your twin">>
+ <<elseif _rel_num == 2>>
+ <<set _rel_desc to "your ">>
+ <<elseif _rel_num == 3>>
+ <<set _rel_desc to "your half-">>
<</if>>
<<for $i to 0; $i < $slaves.length; $i++>>
<<if $slaves[$i].ID != $activeSlave.ID>>
- <<if $rel_num == areSisters($activeSlave, $slaves[$i]) && ($activeSlave.vagina > -1) == ($slaves[$i].vagina > -1)>>
+ <<if _rel_num == areSisters($activeSlave, $slaves[$i]) && ($activeSlave.vagina > -1) == ($slaves[$i].vagina > -1)>>
<<set console.log('sisters', $slaves[$i].birthName)>>
<<set $children.push($slaves[$i])>>
<</if>>
@@ -518,7 +518,7 @@
<</for>>
$pronounCap
<<if $children.length > 1>>
- @@color:lightgreen;is your $rel_desc $rel_type along with
+ @@color:lightgreen;is _rel_desc _rel_type along with
<<for $j to 0; $j < $children.length; $j++>>
<<if $j < $children.length-1>>
$children[$j].slaveName,
@@ -527,9 +527,9 @@
<</if>>
<</for>>
<<elseif $children.length > 0>>
- is @@color:lightgreen;your $rel_desc $rel_type with $children[0].slaveName.@@
+ is @@color:lightgreen;_rel_desc _rel_type with $children[0].slaveName.@@
<<else>>
- is @@color:lightgreen;your $rel_desc $rel_type.@@
+ is @@color:lightgreen;_rel_desc _rel_type.@@
<</if>>
<</if>>