diff --git a/artTools/README.md b/artTools/README.md
index 1ae73fb3f9cd4038b1ff95d258ee09cf18f1b2be..9a9dba8fc77a9353763ccb2e3f36ee0473ddba46 100644
--- a/artTools/README.md
+++ b/artTools/README.md
@@ -8,7 +8,6 @@ Note: This does not actually describe how to be an artist.
## TL;DR
killall inkscape
- artTools/inkscape_svg_fixup.py artTools/vector_source.svg
artTools/vector_layer_split.py artTools/vector_source.svg tw src/art/vector/layers/
compile
@@ -36,7 +35,7 @@ While editing, keep the Layers in mind.
Use them if your asset should be changed upon display.
Do not set the style directly in the object.
-## 3. Fix the document (Inkscape only)
+## 3. Fix the document (before commiting, Inkscape only)
Inkscape shows weird behaviour in some regards.
If you use Inkscape, close the document and run
diff --git a/artTools/inkscape_svg_fixup.py b/artTools/inkscape_svg_fixup.py
index 03d9ff3290a3744edcba48e20c8b7595c059710b..5767de7344bce0060a68c2d160962bfdc7abed39 100644
--- a/artTools/inkscape_svg_fixup.py
+++ b/artTools/inkscape_svg_fixup.py
@@ -22,52 +22,55 @@ Please open and save the file in Inkscape before committing.
import lxml.etree as etree
import sys
-input_file = sys.argv[1]
-ns = {
- 'svg' : 'http://www.w3.org/2000/svg',
- 'inkscape' : 'http://www.inkscape.org/namespaces/inkscape'
-}
-
-tree = etree.parse(input_file)
-
-# find document global style definition
-# mangle it and interpret as python dictionary
-style_element = tree.find('./svg:style',namespaces=ns)
-style_definitions = style_element.text
-pythonic_style_definitions = '{'+style_definitions.\
-replace('\t.','"').replace('{','":"').replace('}','",').\
-replace('/*','#')+'}'
-styles = eval(pythonic_style_definitions)
-
-# go through all SVG elements
-for elem in tree.iter():
- if (elem.tag == etree.QName(ns['svg'], 'g')):
- # compare inkscape label with group element ID
- l = elem.get(etree.QName(ns['inkscape'], 'label'))
- if l:
- i = elem.get('id')
- if (i != l):
- print("Overwriting ID %s with Label %s..."%(i, l))
- elem.set('id', l)
+def fix(tree):
+ # know namespaces
+ ns = {
+ 'svg' : 'http://www.w3.org/2000/svg',
+ 'inkscape' : 'http://www.inkscape.org/namespaces/inkscape'
+ }
- # remove all offending style attributes
- s = elem.get('style')
- c = elem.get('class')
- if (c and s):
- s = s.lower()
- c = c.split(' ')[0] # regard main style only
- cs = ''
- if c in styles:
- cs = styles[c].strip('; ').lower()
- if (c not in styles):
- print("Object id %s references unknown style class %s."%(i,c))
- else:
- if (cs != s.strip('; ')):
- print("Style %s removed from object id %s differed from class %s style %s."%(s,i,c,cs))
- del elem.attrib["style"]
+ # find document global style definition
+ # mangle it and interpret as python dictionary
+ style_element = tree.find('./svg:style',namespaces=ns)
+ style_definitions = style_element.text
+ pythonic_style_definitions = '{'+style_definitions.\
+ replace('\t.','"').replace('{','":"').replace('}','",').\
+ replace('/*','#')+'}'
+ styles = eval(pythonic_style_definitions)
+
+ # go through all SVG elements
+ for elem in tree.iter():
+ if (elem.tag == etree.QName(ns['svg'], 'g')):
+ # compare inkscape label with group element ID
+ l = elem.get(etree.QName(ns['inkscape'], 'label'))
+ if l:
+ i = elem.get('id')
+ if (i != l):
+ print("Overwriting ID %s with Label %s..."%(i, l))
+ elem.set('id', l)
+
+ # remove all offending style attributes
+ s = elem.get('style')
+ c = elem.get('class')
+ if (c and s):
+ s = s.lower()
+ c = c.split(' ')[0] # regard main style only
+ cs = ''
+ if c in styles:
+ cs = styles[c].strip('; ').lower()
+ if (c not in styles):
+ print("Object id %s references unknown style class %s."%(i,c))
+ else:
+ if (cs != s.strip('; ')):
+ print("Style %s removed from object id %s differed from class %s style %s."%(s,i,c,cs))
+ del elem.attrib["style"]
-# store SVG into file (input file is overwritten)
-svg = etree.tostring(tree, pretty_print=True)
-with open(input_file, 'wb') as f:
- f.write('<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n'.encode("utf-8"))
- f.write(svg)
+if __name__ == "__main__":
+ input_file = sys.argv[1]
+ tree = etree.parse(input_file)
+ fix(tree)
+ # store SVG into file (input file is overwritten)
+ svg = etree.tostring(tree, pretty_print=True)
+ with open(input_file, 'wb') as f:
+ f.write('<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n'.encode("utf-8"))
+ f.write(svg)
diff --git a/artTools/vector_layer_split.py b/artTools/vector_layer_split.py
index 8b17eb5bf62b3505b7860e29df54aabbf2f39860..de9751d9dbc292a75d569ebbbe516149ab84c948 100644
--- a/artTools/vector_layer_split.py
+++ b/artTools/vector_layer_split.py
@@ -10,13 +10,12 @@ Usage Example:
python3 vector_layer_split.py vector_source.svg tw ../src/art/vector/layers/
'''
-# TODO: this should automatically invoke fixup first (as a module, after loading input)
-
import lxml.etree as etree
import sys
import os
import copy
import re
+import inkscape_svg_fixup
input_file = sys.argv[1]
output_format = sys.argv[2]
@@ -31,6 +30,7 @@ ns = {
}
tree = etree.parse(input_file)
+inkscape_svg_fixup.fix(tree)
# prepare output template
template = copy.deepcopy(tree)
@@ -62,6 +62,7 @@ for e in root:
# prepare regex for later use
regex_xmlns = re.compile(' xmlns[^ ]+',)
+regex_space = re.compile('[>][ ]+[<]',)
# find all groups
layers = tree.xpath('//svg:g',namespaces=ns)
@@ -97,6 +98,7 @@ for layer in layers:
svg = regex_xmlns.sub('',svg)
svg = svg.replace(' inkscape:connector-curvature="0"','') # this just saves space
svg = svg.replace('\n','').replace('\r','') # print cannot be multi-line
+ svg = regex_space.sub('><',svg) # remove indentaion
svg = svg.replace('svg:','') # svg namespace was removed
svg = svg.replace('<g ','<g transform="\'+_art_transform+\'"') # internal groups are used for scaling
svg = svg.encode('utf-8')
diff --git a/artTools/vector_source.svg b/artTools/vector_source.svg
index 420d5e460ffa51736277d6604c5112c8d2b8acc5..7f5cb58eb22dfbc5c657fc3cd0af194f437a41c6 100644
--- a/artTools/vector_source.svg
+++ b/artTools/vector_source.svg
@@ -44,9 +44,9 @@
inkscape:window-height="952"
id="namedview4358"
showgrid="false"
- inkscape:zoom="0.6010408"
- inkscape:cx="-172.48322"
- inkscape:cy="502.36739"
+ inkscape:zoom="1.7000001"
+ inkscape:cx="213.90214"
+ inkscape:cy="687.62894"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
@@ -84,7 +84,8 @@
</style><g
inkscape:groupmode="layer"
id="Original_Canvas_"
- inkscape:label="Original_Canvas_"><rect
+ inkscape:label="Original_Canvas_"
+ style="display:inline"><rect
style="display:inline;opacity:0.40400002;fill:#ff0000"
id="rect4823"
width="1000"
@@ -161,7 +162,8 @@
id="path4821" /></g></g><g
inkscape:groupmode="layer"
id="Arm_Outfit_"
- inkscape:label="Arm_Outfit_"><g
+ inkscape:label="Arm_Outfit_"
+ style="display:inline"><g
inkscape:groupmode="layer"
id="Arm_Outfit_Shine_"
inkscape:label="Arm_Outfit_Shine_"><g
@@ -169,7 +171,7 @@
id="Arm_Outfit_Shine_Left_Mid"
inkscape:label="Arm_Outfit_Shine_Left_Mid"
style="display:inline"><path
- style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;filter:url(#Filter_Shine_Blur)"
+ style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#Filter_Shine_Blur);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 382.25391,230.08594 c 4.97311,17.05319 13.32815,36.98205 21.21288,85.26855 -5.92532,-48.71766 -14.3838,-68.97024 -21.21288,-85.26855 z"
id="path4909"
inkscape:connector-curvature="0"
@@ -189,7 +191,7 @@
d="m 379.20126,418.93983 c 7.4576,0.75752 14.50753,4.17733 19.21496,10.05528 -7.42067,-3.7385 -13.39796,-7.77943 -19.21496,-10.05528 z"
style="display:inline;fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0;filter:url(#Filter_Shine_Blur)"
transform="matrix(0.99928736,-0.03774624,0.03774624,0.99928736,-37.879743,-190.59389)" /><path
- style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;filter:url(#Filter_Shine_Blur)"
+ style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#Filter_Shine_Blur);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 404.71387,303.29199 c -4.31551,-23.61668 -8.5779,-42.59562 -17.05273,-62.39258 6.54404,20.34381 10.78573,39.21396 17.05273,62.39258 z"
id="path4906"
inkscape:connector-curvature="0"
@@ -204,7 +206,7 @@
d="m 380.71117,425.16475 c 3.53112,-0.37044 11.7217,0.95461 16.11076,3.18148 -4.86389,0.59191 -12.58152,-0.002 -16.11076,-3.18148 z"
style="display:inline;fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0;filter:url(#Filter_Shine_Blur)"
transform="matrix(0.99928736,-0.03774624,0.03774624,0.99928736,-42.455139,-199.84867)" /><path
- style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;filter:url(#Filter_Shine_Blur)"
+ style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#Filter_Shine_Blur);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 378.92676,103.22266 c 33.64855,15.07351 69.22703,39.76495 95.24999,58.64843 -24.87208,-20.52259 -60.52917,-45.29589 -95.24999,-58.64843 z"
id="path4904"
inkscape:connector-curvature="0"
@@ -357,7 +359,8 @@
id="Stump_Narrow" /></g><g
inkscape:groupmode="layer"
id="Leg_Outfit_"
- inkscape:label="Leg_Outfit_"><g
+ inkscape:label="Leg_Outfit_"
+ style="display:inline"><g
inkscape:groupmode="layer"
id="Leg_Outfit_Shine_"
inkscape:label="Leg_Outfit_Shine_"
@@ -540,7 +543,7 @@
inkscape:label="Torso_"><g
inkscape:groupmode="layer"
id="Torso_Normal"
- style="display:inline"
+ style="display:none"
inkscape:label="Torso_Normal"><path
inkscape:connector-curvature="0"
d="m 226,413.2 c 18.5,5 17.1,34.5 49.8,54.3 7.3,-16.9 20.1,-24.2 32.6,-34.3 12.4,-10 20,-18 41.9,-21.9 -6.1,-10.8 -8.3,-20.4 -9.1,-26.3 -1.4,-10.3 -0.2,-18.5 0.8,-25.3 1.3,-9.1 3.4,-15.7 5.8,-23 6,-18.8 9.6,-21.7 13.3,-34.8 1.7,-6.1 5.2,-18.4 4,-28.5 -4.3,-37.3 -74.4,-71.5 -103.8,-51.8 -4.3,2.9 -6.8,6.3 -10,10.7 -13.9,19 -13,41.2 -12.3,57.7 0.3,6.4 1.1,15.9 3.7,27.3 -1.3,7.3 -2.8,17.3 -3.7,29.3 -1.3,18.3 -0.1,25.7 -2.7,38.7 -1.6,7.2 -4.4,16.9 -10.3,27.9 z"
@@ -552,7 +555,7 @@
id="Body_Normal_1_" /></g><g
inkscape:groupmode="layer"
id="Torso_Hourglass"
- style="display:inline"
+ style="display:none"
inkscape:label="Torso_Hourglass"><path
inkscape:connector-curvature="0"
d="m 226,413.2 c 18.5,5 17.1,34.5 49.8,54.3 7.3,-16.9 20.1,-24.2 32.6,-34.3 12.4,-10 20,-18 41.9,-21.9 -7,-14.9 -12.2,-22.2 -15.8,-26.1 -0.9,-1 -3.9,-4.1 -6,-9 0,0 -1.9,-4.4 -2.3,-9 -0.4,-4.8 1.1,-10.5 13.5,-27.3 9,-12.2 10.8,-12.6 14.5,-19.8 3.7,-7.1 5.4,-13.1 6.8,-18.3 2.9,-11 4.7,-22.8 4,-28.5 -4.3,-37.3 -74.4,-71.5 -103.8,-51.8 -4.3,2.9 -6.8,6.3 -10,10.7 -13.9,19 -13,41.2 -12.3,57.7 0.3,6.4 1.1,15.9 3.7,27.3 3.8,16.5 1,28.2 0.8,32.5 -0.2,4.5 -0.7,12.2 -2.3,21 -1.9,9.9 -5.7,25 -15.1,42.5 z"
@@ -561,21 +564,10 @@
inkscape:connector-curvature="0"
d="m 272.9,208.2 c 0,0 -14,4.3 -24.7,28.3 -10.7,24 -10.5,59.4 -4.4,81 2.2,23 0.8,29.8 -1.3,49.9 -1.1,10.1 -8.9,25.2 -16.5,45.9 17.9,5.5 31.8,50.5 49.8,54.3 8.9,-18.2 32.8,-45.5 74.6,-56.2 -9.1,-20.7 -23.8,-29.7 -25.1,-42.7 -1.6,-15.9 22.9,-37 30,-52.9 8.9,-21.9 18.3,-62.5 10.5,-86 -11.7,-22 -21.9,-21.1 -21.9,-21.1 -32.7,-3.4 -35,-14 -30.7,-50.1 l -22.3,1 c 8.3,43.5 -2.9,39.9 -18,48.6"
class="skin torso"
- id="Body_Normal_3_" /><path
- d="m 292.51112,215.39999 a 2.3111103,2.3111103 0 0 1 -2.31111,2.31111 2.3111103,2.3111103 0 0 1 -2.31111,-2.31111 2.3111103,2.3111103 0 0 1 2.31111,-2.31111 2.3111103,2.3111103 0 0 1 2.31111,2.31111 z"
- id="path6413"
- inkscape:connector-curvature="0" /><path
- inkscape:connector-curvature="0"
- style="fill:#895b39"
- d="m 280.94904,279.65447 a 2.3111103,2.3111103 0 0 1 -2.31111,2.31111 2.3111103,2.3111103 0 0 1 -2.31111,-2.31111 2.3111103,2.3111103 0 0 1 2.31111,-2.31111 2.3111103,2.3111103 0 0 1 2.31111,2.31111 z"
- id="path6413-2" /><path
- inkscape:connector-curvature="0"
- style="fill:#895b39"
- d="m 268.00797,403.19272 a 2.3111103,2.3111103 0 0 1 -2.31111,2.31111 2.3111103,2.3111103 0 0 1 -2.31111,-2.31111 2.3111103,2.3111103 0 0 1 2.31111,-2.31111 2.3111103,2.3111103 0 0 1 2.31111,2.31111 z"
- id="path6413-3" /></g><g
+ id="Body_Normal_3_" /></g><g
inkscape:groupmode="layer"
id="Torso_Unnatural"
- style="display:inline"
+ style="display:none"
inkscape:label="Torso_Unnatural"><path
inkscape:connector-curvature="0"
d="m 226,413.2 c 18.5,5 17.1,34.5 49.8,54.3 7.3,-16.9 20.1,-24.2 32.6,-34.3 12.4,-10 20,-18 41.9,-21.9 -6.3,-11.5 -13.2,-19.1 -18.7,-24 -7.7,-7 -15.4,-11.5 -15.7,-19.3 -0.1,-4 1.7,-7.9 2.8,-10.2 2.7,-5.8 6.5,-9.3 8,-10.8 6.4,-6.1 16.1,-16.1 28.6,-29.4 6,-7.3 12.7,-40 12,-57.3 -18.4,-36.5 -83,-56.1 -106.2,-38.7 -1.9,1.5 -4.9,4.6 -7.4,7.9 -11.5,14.7 -13.2,30.7 -14.4,43.1 -0.5,5 -1.6,16.6 0.7,30.3 0.5,3.1 1.3,6.8 2.7,15 1.2,7.2 2.1,13 2.7,17 2,7.7 2.9,14.4 3.3,19.3 0.7,8 1,12.7 -1,18.3 -0.9,2.5 -1.2,2.2 -6,10.3 -0.7,1.2 -4.7,8 -8.7,15.7 -1.9,3.6 -4.3,8.6 -7,14.7 z"
@@ -905,15 +897,16 @@
inkscape:label="Torso_Outfit_Latex_Normal"
style="display:inline"><path
style="fill:#010101"
- d="M 283.36133 215.8418 C 274.92347 215.82131 267.27266 217.59805 261.30078 221.59961 C 257.00078 224.49961 254.50078 227.90078 251.30078 232.30078 C 237.40078 251.30078 238.3 273.5 239 290 C 239.3 296.4 240.09922 305.90078 242.69922 317.30078 C 241.39922 324.60078 239.9 334.59961 239 346.59961 C 237.7 364.89961 238.90078 372.30078 236.30078 385.30078 C 234.9168 391.52868 232.62415 399.63194 228.21484 408.82422 L 348.96484 408.82422 C 343.87735 399.04234 341.93748 390.44468 341.19922 385 C 339.79922 374.7 341 366.49922 342 359.69922 C 343.3 350.59922 345.40078 343.99922 347.80078 336.69922 C 353.80078 317.89922 357.39961 315.00039 361.09961 301.90039 C 362.79961 295.80039 366.29961 283.50039 365.09961 273.40039 C 361.67305 243.67695 316.46368 215.92218 283.36133 215.8418 z "
- id="Body_Shadow-9" /><path
+ d="m 283.36133,215.8418 c -8.43786,-0.0205 -16.08867,1.75625 -22.06055,5.75781 -4.3,2.9 -6.8,6.30117 -10,10.70117 C 237.40078,251.30078 238.3,273.5 239,290 c 0.3,6.4 1.09922,15.90078 3.69922,27.30078 -1.3,7.3 -2.79922,17.29883 -3.69922,29.29883 -1.3,18.3 -0.0992,25.70117 -2.69922,38.70117 -1.38398,6.2279 -3.67663,14.33116 -8.08594,23.52344 l 120.75,0 C 343.87735,399.04234 341.93748,390.44468 341.19922,385 339.79922,374.7 341,366.49922 342,359.69922 c 1.3,-9.1 3.40078,-15.7 5.80078,-23 6,-18.8 9.59883,-21.69883 13.29883,-34.79883 1.7,-6.1 5.2,-18.4 4,-28.5 -3.42656,-29.72344 -48.63593,-57.47821 -81.73828,-57.55859 z"
+ id="Body_Shadow-9"
+ inkscape:connector-curvature="0" /><path
inkscape:connector-curvature="0"
d="m 225.8,413.2 c 17.2,4.6 17.2,30.6 43.5,50.1 1.2,0.9 -21.9,-11.3 -4.5,-34.1 20,8.2 11.2,37.3 11.4,36.9 7.4,-15.9 19.8,-23 32,-32.9 12.4,-10 20,-18 41.9,-21.9 z"
class="shadow"
id="Body_Shadow_3_" /><path
inkscape:connector-curvature="0"
d="m 273,208.3 c 0,0 -14,4.3 -24.7,28.3 -10.7,24 -10.5,59.4 -4.4,81 -5.3,23.9 -3.3,30.9 -5.4,51 -1.1,10.1 -4.8,24.1 -12.4,44.6 16.5,5.3 30.7,47.1 47.7,53.7 0.7,0.3 -25.7,-15.9 -8.8,-37.6 19.9,9 11.3,37.4 11.5,36.9 9.4,-18.2 33.9,-44.3 73.9,-55 -6.8,-16.4 -7.2,-34.6 -7.5,-40.7 -0.8,-16 3.7,-37.3 12.4,-54.8 8.9,-21.9 18.3,-62.5 10.5,-86 -11.7,-22 -21.9,-21.1 -21.9,-21.1 -32.7,-3.3 -35,-14 -30.7,-50 l -22.3,1 c 8.4,43.6 -2.8,40 -17.9,48.7"
- style="fill:#515351"
+ class="outfit_base"
id="Body_Normal_4_" /></g><g
inkscape:groupmode="layer"
id="Torso_Outfit_Latex_Hourglass"
@@ -929,7 +922,7 @@
id="Body_Shadow_5_" /><path
inkscape:connector-curvature="0"
d="m 273,208.3 c 0,0 -14,4.3 -24.7,28.3 -10.7,24 -10.5,59.4 -4.4,81 2.2,23 0.7,29.7 -1.4,49.8 -1.1,10.1 -8.8,25.3 -16.5,45.9 16.5,5.3 30.7,47.1 47.7,53.7 0.7,0.3 -25.7,-15.9 -8.8,-37.6 19.9,9 11.3,37.4 11.5,36.9 9.4,-18.2 33.9,-44.3 73.9,-55 -9.7,-23.8 -24.7,-35.3 -25,-41.4 -0.8,-16 17.6,-31.3 29.9,-54.1 8.9,-21.9 18.3,-62.5 10.5,-86 -11.7,-22 -21.9,-21.1 -21.9,-21.1 -32.7,-3.3 -35,-14 -30.7,-50 l -22.3,1 c 8.5,43.5 -2.7,39.9 -17.8,48.6"
- style="fill:#515351"
+ class="outfit_base"
id="Body_Normal_6_" /></g><g
inkscape:groupmode="layer"
id="Torso_Outfit_Latex_Unnatural"
@@ -944,7 +937,7 @@
id="Body_Shadow_4_" /><path
inkscape:connector-curvature="0"
d="m 273,208.3 c 0,0 -14,4.3 -24.7,28.3 -10.7,24 -10.5,59.4 -4.4,81 2.2,23 7.6,30.9 5.5,51 -1.1,10.1 -15.7,24.1 -23.4,44.6 16.5,5.3 30.7,47.1 47.7,53.7 0.7,0.3 -25.7,-15.9 -8.8,-37.6 19.9,9 11.3,37.4 11.5,36.9 9.4,-18.2 33.9,-44.3 73.9,-55 -9.1,-20.7 -34,-29.7 -35.4,-42.7 -1.6,-15.9 25.4,-34.2 40.3,-52.9 8.9,-21.9 18.3,-62.5 10.5,-86 -11.7,-22 -21.9,-21.1 -21.9,-21.1 -32.7,-3.3 -35,-14 -30.7,-50 l -22.3,1 c 8.5,43.7 -2.7,40.1 -17.8,48.8"
- style="fill:#515351"
+ class="outfit_base"
id="Body_Normal_5_" /></g></g><g
inkscape:groupmode="layer"
id="Torso_Outfit_Shibari_Hourglass_"
@@ -3478,7 +3471,8 @@
inkscape:connector-curvature="0" /></g></g><g
inkscape:groupmode="layer"
id="Head_Outfit_"
- inkscape:label="Head_Outfit_"><g
+ inkscape:label="Head_Outfit_"
+ style="display:inline"><g
inkscape:groupmode="layer"
id="Head_Outfit_Shine"
inkscape:label="Head_Outfit_Shine"><path
@@ -3577,4 +3571,4 @@
x="-190.58824"
y="1234.5221"
id="tspan4370">Original art credit goes to Nov-X.</tspan></text>
-</g></svg>
\ No newline at end of file
+</g></svg>
diff --git a/src/art/artWidgets.tw b/src/art/artWidgets.tw
index b1720a51846a00741eba3dcfc4af85a9118312b8..93326bac0a8e076b18ea8bd82afde9ef7c3a3845 100644
--- a/src/art/artWidgets.tw
+++ b/src/art/artWidgets.tw
@@ -72,7 +72,9 @@ $args[2]: icon UI Display for vector art, 1 for on.
<<set _artSlave to $args[0] >>
<<silently>>
/* prepare HTML colour codes for slave display */
-/* note: latex clothing is partly emulated by black rubber colour for skin and shoes */
+/* note: latex clothing is mostly emulated by rubber colour for skin (and shoes) */
+/* TODO: consistently use american "color" instead of "colour" for all identifiers */
+<<include Art_Vector_Set_Colour_Outfit_>>
<<include Art_Vector_Set_Colour_Skin_>>
<<include Art_Vector_Set_Colour_Hair_>>
<<include Art_Vector_Set_Colour_Shoe_>>
diff --git a/src/art/vector/Chastity_Belt.tw b/src/art/vector/Chastity_Belt.tw
index ab7bca0f9e93dacc5af8b63c6ee6c23382aef2a1..b17da969b9ef74011c1b6a71e019af94c4a689d1 100644
--- a/src/art/vector/Chastity_Belt.tw
+++ b/src/art/vector/Chastity_Belt.tw
@@ -3,16 +3,21 @@
/* note: penile chastity is handled by penis display */
<<set _chastityAnal = _artSlave.dickAccessory == "anal chastity" || _artSlave.dickAccessory == "combined chastity" || _artSlave.vaginalAccessory == "anal chastity" || _artSlave.vaginalAccessory == "combined chastity" >>
+
<<set _chastityVaginal = _artSlave.vaginalAccessory == "chastity belt" || _artSlave.vaginalAccessory == "combined chastity">>
-<<if _chastityAnal>>
- <<include Art_Vector_Chastity_Anus>>
-<</if>>
+<<if _artSlave.clothes != "a latex catsuit" >>
-<<if _chastityVaginal>>
- <<include Art_Vector_Chastity_Vagina>>
-<</if>>
+ <<if _chastityAnal>>
+ <<include Art_Vector_Chastity_Anus>>
+ <</if>>
+
+ <<if _chastityVaginal>>
+ <<include Art_Vector_Chastity_Vagina>>
+ <</if>>
+
+ <<if _chastityAnal || _chastityVaginal >>
+ <<include Art_Vector_Chastity_Base>>
+ <</if>>
-<<if _chastityAnal || _chastityVaginal >>
- <<include Art_Vector_Chastity_Base>>
<</if>>
diff --git a/src/art/vector/Generate_Stylesheet.tw b/src/art/vector/Generate_Stylesheet.tw
index 53de7021ca229297a80fba472894ad838e9b2e52..b66f2dbd0c040e8afc5ab1ea96b5fad07d25bbf4 100644
--- a/src/art/vector/Generate_Stylesheet.tw
+++ b/src/art/vector/Generate_Stylesheet.tw
@@ -20,19 +20,20 @@
}
._art_display_class .white { fill:#FFFFFF; }
._art_display_class .skin { fill:_skinColour; }
-._art_display_class .head { fill:_headSkinColour; }
-._art_display_class .torso { fill:_torsoSkinColour; }
-._art_display_class .boob { fill:_boobSkinColour; }
-._art_display_class .penis { fill:_penisSkinColour; }
-._art_display_class .scrotum { fill:_scrotumSkinColour; }
-._art_display_class .areola { fill:_areolaColour; }
-._art_display_class .labia { fill:_labiaColour; }
+._art_display_class .head { _headSkinStyle }
+._art_display_class .torso { _torsoSkinStyle }
+._art_display_class .boob { _boobSkinStyle }
+._art_display_class .penis { _penisSkinStyle }
+._art_display_class .scrotum { _scrotumSkinStyle }
+._art_display_class .areola { _areolaStyle }
+._art_display_class .labia { _labiaStyle }
._art_display_class .hair { fill:_hairColour; }
._art_display_class .shoe { fill:_shoeColour; }
._art_display_class .shoe_shadow { fill:_shoeShadowColour; }
._art_display_class .smart_piercing { fill:#4DB748; }
._art_display_class .steel_piercing { fill:#787878; }
._art_display_class .steel_chastity { fill:#BABABA; }
+._art_display_class .outfit_base { fill:_outfitBaseColour; }
._art_display_class .gag { fill:#BF2126; }
._art_display_class .shadow { fill:#010101; }
._art_display_class .glasses { fill:#010101; }
diff --git a/src/art/vector/Penis.tw b/src/art/vector/Penis.tw
index d2ed27902a4d1b73641dae9b036b87db6859b0e5..fa4649c1d9f7bfd46a22c3107e0bd6eb0083e31b 100644
--- a/src/art/vector/Penis.tw
+++ b/src/art/vector/Penis.tw
@@ -33,6 +33,7 @@
<<set _art = "Art_Vector_Flaccid_"+_penisSize>>
<<include _art>>
<<if (_artSlave.dickAccessory == "chastity") || (_artSlave.dickAccessory == "combined chastity") >>
+ /* this draws chastity OVER latex catsuit. prndev finds this alright. */
<<set _art = "Art_Vector_Chastity_Cage_"+_penisSize>>
<<include _art>>
<</if>>
diff --git a/src/art/vector/Pubic_Hair.tw b/src/art/vector/Pubic_Hair.tw
index bf6c8e8aadbc8130937ed89a9c25b7e8ff6c110e..99f94d2da7f41555b28cb8579bc8bc69f302456b 100644
--- a/src/art/vector/Pubic_Hair.tw
+++ b/src/art/vector/Pubic_Hair.tw
@@ -1,25 +1,29 @@
:: Art_Vector_Pubic_Hair_ [nobr]
-<<if $showBodyMods == 1>>
- <<if _artSlave.vaginaTat == "rude words">>
- <<if _artSlave.dick != 0>>
- <<set _art_pussy_tattoo_text to "Useless" >>
- <<else>>
- <<set _art_pussy_tattoo_text to "Fucktoy" >>
+<<if _artSlave.fuckdoll != 0 || _artSlave.clothes != "a latex catsuit">>
+
+ <<if $showBodyMods == 1>>
+ <<if _artSlave.vaginaTat == "rude words">>
+ <<if _artSlave.dick != 0>>
+ <<set _art_pussy_tattoo_text to "Useless" >>
+ <<else>>
+ <<set _art_pussy_tattoo_text to "Fucktoy" >>
+ <</if>>
+ <<include Art_Vector_Pussy_Tattoo>>
<</if>>
- <<include Art_Vector_Pussy_Tattoo>>
<</if>>
-<</if>>
-<<switch _artSlave.pubicHStyle>>
- <<case "strip" "in a strip">>
- <<include Art_Vector_Pubic_Hair_Strip >>
- <<case "bush">>
- <<include Art_Vector_Pubic_Hair_Bush >>
- <<case "neat">>
- <<include Art_Vector_Pubic_Hair_Neat >>
- <<case "waxed">>
- /* no hair to display */
- <<default>>
- /* pubic hair style not supported - don't display anything*/
-<</switch>>
+ <<switch _artSlave.pubicHStyle>>
+ <<case "strip" "in a strip">>
+ <<include Art_Vector_Pubic_Hair_Strip >>
+ <<case "bush">>
+ <<include Art_Vector_Pubic_Hair_Bush >>
+ <<case "neat">>
+ <<include Art_Vector_Pubic_Hair_Neat >>
+ <<case "waxed">>
+ /* no hair to display */
+ <<default>>
+ /* pubic hair style not supported - don't display anything*/
+ <</switch>>
+
+<</if>>
diff --git a/src/art/vector/Pussy.tw b/src/art/vector/Pussy.tw
index 5291b51c99a2011107fd780e43db3947a09e736a..6a346d678b04c829c11f2977ed51936325c4bd98 100644
--- a/src/art/vector/Pussy.tw
+++ b/src/art/vector/Pussy.tw
@@ -3,3 +3,4 @@
<<if _artSlave.vagina >= 0>>
<<include Art_Vector_Pussy>>
<</if>>
+
diff --git a/src/art/vector/Pussy_Piercings.tw b/src/art/vector/Pussy_Piercings.tw
index 3324ed66b027b409c987e81c9d68c3b7280feb3b..4d0795e204b74ca058058324520991ffe85d70a0 100644
--- a/src/art/vector/Pussy_Piercings.tw
+++ b/src/art/vector/Pussy_Piercings.tw
@@ -1,17 +1,19 @@
:: Art_Vector_Pussy_Piercings_ [nobr]
-<<if $showBodyMods == 1>>
- <<if _artSlave.vaginaPiercing == 1>>
- <<include Art_Vector_Pussy_Piercing>>
- <<elseif _artSlave.vaginaPiercing == 2>>
- <<include Art_Vector_Pussy_Piercing_Heavy>>
- <</if>>
+<<if _artSlave.clothes != "a latex catsuit">> /* catsuit covers crotch */
+ <<if $showBodyMods == 1>>
+ <<if _artSlave.vaginaPiercing == 1>>
+ <<include Art_Vector_Pussy_Piercing>>
+ <<elseif _artSlave.vaginaPiercing == 2>>
+ <<include Art_Vector_Pussy_Piercing_Heavy>>
+ <</if>>
- <<if _artSlave.clitPiercing == 1>>
- <<include Art_Vector_Clit_Piercing>>
- <<elseif _artSlave.clitPiercing == 2>>
- <<include Art_Vector_Clit_Piercing_Heavy>>
- <<elseif _artSlave.clitPiercing == 3>>
- <<include Art_Vector_Clit_Piercing_Smart>>
+ <<if _artSlave.clitPiercing == 1>>
+ <<include Art_Vector_Clit_Piercing>>
+ <<elseif _artSlave.clitPiercing == 2>>
+ <<include Art_Vector_Clit_Piercing_Heavy>>
+ <<elseif _artSlave.clitPiercing == 3>>
+ <<include Art_Vector_Clit_Piercing_Smart>>
+ <</if>>
<</if>>
<</if>>
diff --git a/src/art/vector/Set_Colour_Outfit.tw b/src/art/vector/Set_Colour_Outfit.tw
new file mode 100644
index 0000000000000000000000000000000000000000..69f5b1907c4b9b52e812e15287e31aff951b04cf
--- /dev/null
+++ b/src/art/vector/Set_Colour_Outfit.tw
@@ -0,0 +1,14 @@
+:: Art_Vector_Set_Colour_Outfit_
+
+/* BEWARE: _outfitBaseColour is used by Art_Vector_Set_Colour_Skin_ */
+/* BEWARE: _outfitBaseColour is read by Wardrobe Use */
+
+<<unset _outfitBaseColour>>
+
+<<if _artSlave.fuckdoll != 0 || _artSlave.clothes == "restrictive latex" || _artSlave.clothes == "a latex catsuit">>
+ <<set _outfitBaseColour = "#515351" >> /* standard "black rubber" latex colour */
+ <<if def _artSlave.clothingBaseColor>>
+ <<set _outfitBaseColour = _artSlave.clothingBaseColor >> /* latex colour selected by user */
+ /* TODO: rewrite all textual descriptions not to explicitly mention the latex being of black colour. */
+ <</if>>
+<</if>>
diff --git a/src/art/vector/Set_Colour_Shoe.tw b/src/art/vector/Set_Colour_Shoe.tw
index 37a1dc993d905583ec473b1ec0402a3e4d024124..a8dbf3f2153b95a49bbba65aa4f90d24074f1dbc 100644
--- a/src/art/vector/Set_Colour_Shoe.tw
+++ b/src/art/vector/Set_Colour_Shoe.tw
@@ -2,6 +2,8 @@
/* courtesy of Nov-X */
+/* BEWARE: _shoeColour is read by Wardrobe Use */
+
/* note: only heels use this shadow */
<<set _shoeShadowColour to "#15406D">>
@@ -15,13 +17,18 @@
<<case "pumps">>
<<set _shoeColour to "#4F6AB2">>
<<default>>
- /* use heel colour by default */
+ /* use colour for "heels" by default */
<<set _shoeColour to "#3E65B0">>
-<</switch>>
+<</switch>>
+
+<<if def _artSlave.shoeColor>>
+ <<set _shoeColour = _artSlave.shoeColor >> /* shoe colour selected by user */
+ <<set _shoeShadowColour to _shoeColour+";opacity: 0.5">> /* TODO: do not abuse "color" variable for style definitions. do not rely on dark background for shadow effect either. */
+<</if>>
/* override colour in case of full body latex outfit */
<<if _artSlave.fuckdoll != 0 || _artSlave.clothes == "restrictive latex" >>
- <<set _shoeColour to "#515351">>
- <<set _shoeShadowColour to "#313331">>
+ <<set _shoeColour to _skinColour>>
+ <<set _shoeShadowColour to _shoeColour+";opacity: 0.5">> /* TODO: do not abuse "color" variable for style definitions. do not rely on dark background for shadow effect either. */
<</if>>
diff --git a/src/art/vector/Set_Colour_Skin.tw b/src/art/vector/Set_Colour_Skin.tw
index 69a14995d6c56c2c5f21d54d0abb879efd2cf80e..17bd78f70e5740882d8e7cea4be323a841ef8728 100644
--- a/src/art/vector/Set_Colour_Skin.tw
+++ b/src/art/vector/Set_Colour_Skin.tw
@@ -1,7 +1,16 @@
:: Art_Vector_Set_Colour_Skin_
-<<set _areolaColour to "#d76b93" >> /* this is the default and can be customized later */
-<<set _labiaColour to "#d76b93" >> /* this is the default and can be customized later */
+/* BEWARE: _outfitBaseColour is set by Art_Vector_Set_Colour_Outfit_ */
+
+<<set _areolaStyle to "fill:#d76b93;" >> /* this is the default and can be customized later */
+<<set _labiaStyle to _areolaStyle >> /* this is the default and can be customized later */
+/* todo: introduce one "flesh" CSS class */
+
+<<unset _headSkinStyle>>
+<<unset _torsoSkinStyle >>
+<<unset _boobSkinStyle>>
+<<unset _penisSkinStyle>>
+<<unset _scrotumSkinStyle>>
<<switch _artSlave.skin>>
<<case "light" "white" "fair" "lightened" >>
@@ -17,8 +26,8 @@
<<case "light brown" "dark">>
<<set _skinColour to "#C97631">>
/* darker areolae and labia for more contrast to skin */
- <<set _areolaColour to "#ba3549" >>
- <<set _labiaColour to "#ba3549" >>
+ <<set _areolaStyle to "fill:#ba3549;" >>
+ <<set _labiaStyle to _areolaStyle >>
<<case "brown" >>
<<set _skinColour to "#763818">>
<<case "black">>
@@ -27,38 +36,34 @@
<<set _skinColour to _artSlave.skin>>
<</switch>>
-/* set skin colour of specific body parts to match the main colour */
-<<set _headSkinColour to _skinColour>>
-<<set _torsoSkinColour to _skinColour>>
-<<set _boobSkinColour to _skinColour>>
-<<set _penisSkinColour to _skinColour>>
-<<set _scrotumSkinColour to _skinColour>>
-
/* BEGIN SKIN COLOUR OVERRIDES FOR LATEX CLOTHING EMULATION */
<<if _artSlave.fuckdoll != 0>>
/* slave is a fuckdoll - display all skin as if it was black rubber */
- <<set _skinColour to "#515351">>
- <<set _areolaColour to "#313331">>
- <<set _headSkinColour to _skinColour>>
- <<set _torsoSkinColour to _skinColour>>
- <<set _penisSkinColour to _skinColour>>
- <<set _scrotumSkinColour to _skinColour>>
+ <<set _skinColour to _outfitBaseColour>>
+ <<set _areolaStyle to "fill:rgba(0,0,0,0.3);">>
+ <<set _labiaStyle to _areolaStyle >>
<</if>>
-/* slave wears latex - display most skin as if it was black rubber */
+/* slave wears restrictive latex - display most skin as if it was rubber */
<<if _artSlave.clothes == "restrictive latex">>
- <<set _skinColour to "#515351">>
- /* restrictive latex coveres head */
- <<set _headSkinColour to _skinColour>>
+ /* nice latex does not cover any privates. */
+ <<set _torsoSkinStyle to "fill:"+_skinColour+";">>
+ <<set _boobSkinStyle to _torsoSkinStyle>>
+ <<set _penisSkinStyle to _torsoSkinStyle>>
+ <<set _scrotumSkinStyle to _torsoSkinStyle>>
+ /* rest of body is covered in latex */
+ <<set _skinColour to _outfitBaseColour>>
<</if>>
<<if _artSlave.clothes == "a latex catsuit">>
- <<set _skinColour to "#515351">>
- /* catsuit covers areolae and privates, too */
- <<set _areolaColour to "#313331">>
- <<set _boobSkinColour to _skinColour>>
- <<set _penisSkinColour to _skinColour>>
- <<set _scrotumSkinColour to _skinColour>>
+ /* nice latex does not cover head. */
+ <<set _headSkinStyle to "fill:"+_skinColour+";">>
+ /* rest of body is covered in latex */
+ <<set _skinColour to _outfitBaseColour>>
+ /* catsuit covers areolae and crotch, too */
+ <<set _areolaStyle to "fill:rgba(0,0,0,0.3);">> /* areolae are represented by a darker area */
+ /* todo: gain control over piercings to do the same with them ^^ */
+ <<set _labiaStyle to _areolaStyle >>
<</if>>
/* END SKIN COLOUR OVERRIDES FOR LATEX CLOTHING EMULATION */
diff --git a/src/art/vector/Torso_Outfit.tw b/src/art/vector/Torso_Outfit.tw
index ca19efb2713cff060fd7615ba678393365ac5e73..19fa81fa95afc85b5e183cb9edd4b4d303d15469 100644
--- a/src/art/vector/Torso_Outfit.tw
+++ b/src/art/vector/Torso_Outfit.tw
@@ -7,7 +7,7 @@
<<set _art = false >>
<<switch _artSlave.clothes>>
- <<case "restrictive latex" "a latex catsuit">>
+ <<case "restrictive latex">>
<<set _art = "Art_Vector_Torso_Outfit_Latex_" >>
<<case "uncomfortable straps">>
<<set _art = "Art_Vector_Torso_Outfit_Straps_" >>
diff --git a/src/art/vector/layers/Arm_Outfit_Shine_Left_High.tw b/src/art/vector/layers/Arm_Outfit_Shine_Left_High.tw
index cedbf4379505b400d8456326fe0d3f3272ff70ac..e4748491b5f9680f457c0d0f01077959dbe812f0 100644
--- a/src/art/vector/layers/Arm_Outfit_Shine_Left_High.tw
+++ b/src/art/vector/layers/Arm_Outfit_Shine_Left_High.tw
@@ -1,3 +1,3 @@
:: Art_Vector_Arm_Outfit_Shine_Left_High [nobr]
-<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><defs id="defs4360"><filter style="color-interpolation-filters:sRGB" inkscape:label="Filter_Shine_Blur" id="Filter_Shine_Blur" width="4" x="-2" height="4" y="-2"><feGaussianBlur stdDeviation="1.5 1.5" result="blur" id="feGaussianBlur4091-3"/></filter></defs><path sodipodi:nodetypes="ccc" id="path4027-2-5-4" d="m 380.71117,425.16475 c 3.53112,-0.37044 11.7217,0.95461 16.11076,3.18148 -4.86389,0.59191 -12.58152,-0.002 -16.11076,-3.18148 z" style="display:inline;fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0;filter:url(#Filter_Shine_Blur)" transform="matrix(0.99928736,-0.03774624,0.03774624,0.99928736,-42.455139,-199.84867)"/><path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;filter:url(#Filter_Shine_Blur)" d="m 378.92676,103.22266 c 33.64855,15.07351 69.22703,39.76495 95.24999,58.64843 -24.87208,-20.52259 -60.52917,-45.29589 -95.24999,-58.64843 z" id="path4904" sodipodi:nodetypes="ccc"/></svg></html>' >>
\ No newline at end of file
+<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><defs id="defs4360"><filter style="color-interpolation-filters:sRGB" inkscape:label="Filter_Shine_Blur" id="Filter_Shine_Blur" width="4" x="-2" height="4" y="-2"><feGaussianBlur stdDeviation="1.5 1.5" result="blur" id="feGaussianBlur4091-3"/></filter></defs><path sodipodi:nodetypes="ccc" id="path4027-2-5-4" d="m 380.71117,425.16475 c 3.53112,-0.37044 11.7217,0.95461 16.11076,3.18148 -4.86389,0.59191 -12.58152,-0.002 -16.11076,-3.18148 z" style="display:inline;fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0;filter:url(#Filter_Shine_Blur)" transform="matrix(0.99928736,-0.03774624,0.03774624,0.99928736,-42.455139,-199.84867)"/><path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#Filter_Shine_Blur);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 378.92676,103.22266 c 33.64855,15.07351 69.22703,39.76495 95.24999,58.64843 -24.87208,-20.52259 -60.52917,-45.29589 -95.24999,-58.64843 z" id="path4904" sodipodi:nodetypes="ccc"/></svg></html>' >>
\ No newline at end of file
diff --git a/src/art/vector/layers/Arm_Outfit_Shine_Left_Low.tw b/src/art/vector/layers/Arm_Outfit_Shine_Left_Low.tw
index 954e2a7d1b2251957cf7afecf1ae66ba693bccd7..449616f892a48a2bbaaf1da071ff102f23aa1c06 100644
--- a/src/art/vector/layers/Arm_Outfit_Shine_Left_Low.tw
+++ b/src/art/vector/layers/Arm_Outfit_Shine_Left_Low.tw
@@ -1,3 +1,3 @@
:: Art_Vector_Arm_Outfit_Shine_Left_Low [nobr]
-<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><defs id="defs4360"><filter style="color-interpolation-filters:sRGB" inkscape:label="Filter_Shine_Blur" id="Filter_Shine_Blur" width="4" x="-2" height="4" y="-2"><feGaussianBlur stdDeviation="1.5 1.5" result="blur" id="feGaussianBlur4091-3"/></filter></defs><path sodipodi:nodetypes="ccc" id="path4027-2-5-4-6" d="m 379.20126,418.93983 c 7.4576,0.75752 14.50753,4.17733 19.21496,10.05528 -7.42067,-3.7385 -13.39796,-7.77943 -19.21496,-10.05528 z" style="display:inline;fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0;filter:url(#Filter_Shine_Blur)" transform="matrix(0.99928736,-0.03774624,0.03774624,0.99928736,-37.879743,-190.59389)"/><path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;filter:url(#Filter_Shine_Blur)" d="m 404.71387,303.29199 c -4.31551,-23.61668 -8.5779,-42.59562 -17.05273,-62.39258 6.54404,20.34381 10.78573,39.21396 17.05273,62.39258 z" id="path4906" sodipodi:nodetypes="ccc"/></svg></html>' >>
\ No newline at end of file
+<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><defs id="defs4360"><filter style="color-interpolation-filters:sRGB" inkscape:label="Filter_Shine_Blur" id="Filter_Shine_Blur" width="4" x="-2" height="4" y="-2"><feGaussianBlur stdDeviation="1.5 1.5" result="blur" id="feGaussianBlur4091-3"/></filter></defs><path sodipodi:nodetypes="ccc" id="path4027-2-5-4-6" d="m 379.20126,418.93983 c 7.4576,0.75752 14.50753,4.17733 19.21496,10.05528 -7.42067,-3.7385 -13.39796,-7.77943 -19.21496,-10.05528 z" style="display:inline;fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0;filter:url(#Filter_Shine_Blur)" transform="matrix(0.99928736,-0.03774624,0.03774624,0.99928736,-37.879743,-190.59389)"/><path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#Filter_Shine_Blur);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 404.71387,303.29199 c -4.31551,-23.61668 -8.5779,-42.59562 -17.05273,-62.39258 6.54404,20.34381 10.78573,39.21396 17.05273,62.39258 z" id="path4906" sodipodi:nodetypes="ccc"/></svg></html>' >>
\ No newline at end of file
diff --git a/src/art/vector/layers/Arm_Outfit_Shine_Left_Mid.tw b/src/art/vector/layers/Arm_Outfit_Shine_Left_Mid.tw
index 637cec4b3f6c1c7900fa701ec2b274a1bfdae48c..fb141c70729e0c614b5fffffaaf6e5f83c430a8e 100644
--- a/src/art/vector/layers/Arm_Outfit_Shine_Left_Mid.tw
+++ b/src/art/vector/layers/Arm_Outfit_Shine_Left_Mid.tw
@@ -1,3 +1,3 @@
:: Art_Vector_Arm_Outfit_Shine_Left_Mid [nobr]
-<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><defs id="defs4360"><filter style="color-interpolation-filters:sRGB" inkscape:label="Filter_Shine_Blur" id="Filter_Shine_Blur" width="4" x="-2" height="4" y="-2"><feGaussianBlur stdDeviation="1.5 1.5" result="blur" id="feGaussianBlur4091-3"/></filter></defs><path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;filter:url(#Filter_Shine_Blur)" d="m 382.25391,230.08594 c 4.97311,17.05319 13.32815,36.98205 21.21288,85.26855 -5.92532,-48.71766 -14.3838,-68.97024 -21.21288,-85.26855 z" id="path4909" sodipodi:nodetypes="ccc"/><path sodipodi:nodetypes="ccc" id="path4027-2-5-4-3" d="m 361.54149,215.43549 c 3.52608,0.41561 11.22437,3.5104 15.01588,6.64845 -4.87493,-0.49283 -12.27273,-2.77034 -15.01588,-6.64845 z" style="display:inline;fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0;filter:url(#Filter_Shine_Blur)"/></svg></html>' >>
\ No newline at end of file
+<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><defs id="defs4360"><filter style="color-interpolation-filters:sRGB" inkscape:label="Filter_Shine_Blur" id="Filter_Shine_Blur" width="4" x="-2" height="4" y="-2"><feGaussianBlur stdDeviation="1.5 1.5" result="blur" id="feGaussianBlur4091-3"/></filter></defs><path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#Filter_Shine_Blur);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 382.25391,230.08594 c 4.97311,17.05319 13.32815,36.98205 21.21288,85.26855 -5.92532,-48.71766 -14.3838,-68.97024 -21.21288,-85.26855 z" id="path4909" sodipodi:nodetypes="ccc"/><path sodipodi:nodetypes="ccc" id="path4027-2-5-4-3" d="m 361.54149,215.43549 c 3.52608,0.41561 11.22437,3.5104 15.01588,6.64845 -4.87493,-0.49283 -12.27273,-2.77034 -15.01588,-6.64845 z" style="display:inline;fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0;filter:url(#Filter_Shine_Blur)"/></svg></html>' >>
\ No newline at end of file
diff --git a/src/art/vector/layers/Torso_Hourglass.tw b/src/art/vector/layers/Torso_Hourglass.tw
index 6990712fefcbc2477bfb9d8a1559a26bf1541569..644ff510cb630a42fc2c0356c93618ef5c3aac90 100644
--- a/src/art/vector/layers/Torso_Hourglass.tw
+++ b/src/art/vector/layers/Torso_Hourglass.tw
@@ -1,3 +1,3 @@
:: Art_Vector_Torso_Hourglass [nobr]
-<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path d="m 226,413.2 c 18.5,5 17.1,34.5 49.8,54.3 7.3,-16.9 20.1,-24.2 32.6,-34.3 12.4,-10 20,-18 41.9,-21.9 -7,-14.9 -12.2,-22.2 -15.8,-26.1 -0.9,-1 -3.9,-4.1 -6,-9 0,0 -1.9,-4.4 -2.3,-9 -0.4,-4.8 1.1,-10.5 13.5,-27.3 9,-12.2 10.8,-12.6 14.5,-19.8 3.7,-7.1 5.4,-13.1 6.8,-18.3 2.9,-11 4.7,-22.8 4,-28.5 -4.3,-37.3 -74.4,-71.5 -103.8,-51.8 -4.3,2.9 -6.8,6.3 -10,10.7 -13.9,19 -13,41.2 -12.3,57.7 0.3,6.4 1.1,15.9 3.7,27.3 3.8,16.5 1,28.2 0.8,32.5 -0.2,4.5 -0.7,12.2 -2.3,21 -1.9,9.9 -5.7,25 -15.1,42.5 z" class="shadow" id="Body_Shadow_2_"/><path d="m 272.9,208.2 c 0,0 -14,4.3 -24.7,28.3 -10.7,24 -10.5,59.4 -4.4,81 2.2,23 0.8,29.8 -1.3,49.9 -1.1,10.1 -8.9,25.2 -16.5,45.9 17.9,5.5 31.8,50.5 49.8,54.3 8.9,-18.2 32.8,-45.5 74.6,-56.2 -9.1,-20.7 -23.8,-29.7 -25.1,-42.7 -1.6,-15.9 22.9,-37 30,-52.9 8.9,-21.9 18.3,-62.5 10.5,-86 -11.7,-22 -21.9,-21.1 -21.9,-21.1 -32.7,-3.4 -35,-14 -30.7,-50.1 l -22.3,1 c 8.3,43.5 -2.9,39.9 -18,48.6" class="skin torso" id="Body_Normal_3_"/><path d="m 292.51112,215.39999 a 2.3111103,2.3111103 0 0 1 -2.31111,2.31111 2.3111103,2.3111103 0 0 1 -2.31111,-2.31111 2.3111103,2.3111103 0 0 1 2.31111,-2.31111 2.3111103,2.3111103 0 0 1 2.31111,2.31111 z" id="path6413"/><path style="fill:#895b39" d="m 280.94904,279.65447 a 2.3111103,2.3111103 0 0 1 -2.31111,2.31111 2.3111103,2.3111103 0 0 1 -2.31111,-2.31111 2.3111103,2.3111103 0 0 1 2.31111,-2.31111 2.3111103,2.3111103 0 0 1 2.31111,2.31111 z" id="path6413-2"/><path style="fill:#895b39" d="m 268.00797,403.19272 a 2.3111103,2.3111103 0 0 1 -2.31111,2.31111 2.3111103,2.3111103 0 0 1 -2.31111,-2.31111 2.3111103,2.3111103 0 0 1 2.31111,-2.31111 2.3111103,2.3111103 0 0 1 2.31111,2.31111 z" id="path6413-3"/></svg></html>' >>
\ No newline at end of file
+<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path d="m 226,413.2 c 18.5,5 17.1,34.5 49.8,54.3 7.3,-16.9 20.1,-24.2 32.6,-34.3 12.4,-10 20,-18 41.9,-21.9 -7,-14.9 -12.2,-22.2 -15.8,-26.1 -0.9,-1 -3.9,-4.1 -6,-9 0,0 -1.9,-4.4 -2.3,-9 -0.4,-4.8 1.1,-10.5 13.5,-27.3 9,-12.2 10.8,-12.6 14.5,-19.8 3.7,-7.1 5.4,-13.1 6.8,-18.3 2.9,-11 4.7,-22.8 4,-28.5 -4.3,-37.3 -74.4,-71.5 -103.8,-51.8 -4.3,2.9 -6.8,6.3 -10,10.7 -13.9,19 -13,41.2 -12.3,57.7 0.3,6.4 1.1,15.9 3.7,27.3 3.8,16.5 1,28.2 0.8,32.5 -0.2,4.5 -0.7,12.2 -2.3,21 -1.9,9.9 -5.7,25 -15.1,42.5 z" class="shadow" id="Body_Shadow_2_"/><path d="m 272.9,208.2 c 0,0 -14,4.3 -24.7,28.3 -10.7,24 -10.5,59.4 -4.4,81 2.2,23 0.8,29.8 -1.3,49.9 -1.1,10.1 -8.9,25.2 -16.5,45.9 17.9,5.5 31.8,50.5 49.8,54.3 8.9,-18.2 32.8,-45.5 74.6,-56.2 -9.1,-20.7 -23.8,-29.7 -25.1,-42.7 -1.6,-15.9 22.9,-37 30,-52.9 8.9,-21.9 18.3,-62.5 10.5,-86 -11.7,-22 -21.9,-21.1 -21.9,-21.1 -32.7,-3.4 -35,-14 -30.7,-50.1 l -22.3,1 c 8.3,43.5 -2.9,39.9 -18,48.6" class="skin torso" id="Body_Normal_3_"/></svg></html>' >>
\ No newline at end of file
diff --git a/src/art/vector/layers/Torso_Outfit_Latex_Hourglass.tw b/src/art/vector/layers/Torso_Outfit_Latex_Hourglass.tw
index 50377051ecd14a908ae2a8af12ae31224c7f9656..7be6bebe7062bb276dfff9e6e650839077bac531 100644
--- a/src/art/vector/layers/Torso_Outfit_Latex_Hourglass.tw
+++ b/src/art/vector/layers/Torso_Outfit_Latex_Hourglass.tw
@@ -1,3 +1,3 @@
:: Art_Vector_Torso_Outfit_Latex_Hourglass [nobr]
-<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path style="fill:#010101" d="m 283.26172,215.74219 c -8.43786,-0.0205 -16.09063,1.75625 -22.0625,5.75781 -4.3,2.9 -6.8,6.29922 -10,10.69922 -13.9,19 -12.99883,41.20117 -12.29883,57.70117 0.3,6.4 1.09922,15.89883 3.69922,27.29883 3.8,16.5 1.00078,28.2 0.80078,32.5 -0.2,4.5 -0.70078,12.2 -2.30078,21 -1.73947,9.06355 -5.08596,22.49315 -12.84961,38.125 l 120.84961,0 c -6.38699,-13.18859 -11.21229,-19.95541 -14.59961,-23.625 -0.9,-1 -3.9,-4.1 -6,-9 0,0 -1.90078,-4.4 -2.30078,-9 -0.4,-4.8 1.1,-10.49883 13.5,-27.29883 9,-12.2 10.8,-12.60078 14.5,-19.80078 3.7,-7.1 5.40078,-13.09883 6.80078,-18.29883 2.9,-11 4.7,-22.8 4,-28.5 -3.42656,-29.72344 -48.63593,-57.4782 -81.73828,-57.55859 z" id="Body_Shadow_2_-7"/><path d="m 225.8,413.2 c 17.2,4.6 17.2,30.6 43.5,50.1 1.2,0.9 -21.9,-11.3 -4.5,-34.1 20,8.2 11.2,37.3 11.4,36.9 7.4,-15.9 19.8,-23 32,-32.9 12.4,-10 20,-18 41.9,-21.9 z" class="shadow" id="Body_Shadow_5_"/><path d="m 273,208.3 c 0,0 -14,4.3 -24.7,28.3 -10.7,24 -10.5,59.4 -4.4,81 2.2,23 0.7,29.7 -1.4,49.8 -1.1,10.1 -8.8,25.3 -16.5,45.9 16.5,5.3 30.7,47.1 47.7,53.7 0.7,0.3 -25.7,-15.9 -8.8,-37.6 19.9,9 11.3,37.4 11.5,36.9 9.4,-18.2 33.9,-44.3 73.9,-55 -9.7,-23.8 -24.7,-35.3 -25,-41.4 -0.8,-16 17.6,-31.3 29.9,-54.1 8.9,-21.9 18.3,-62.5 10.5,-86 -11.7,-22 -21.9,-21.1 -21.9,-21.1 -32.7,-3.3 -35,-14 -30.7,-50 l -22.3,1 c 8.5,43.5 -2.7,39.9 -17.8,48.6" style="fill:#515351" id="Body_Normal_6_"/></svg></html>' >>
\ No newline at end of file
+<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path style="fill:#010101" d="m 283.26172,215.74219 c -8.43786,-0.0205 -16.09063,1.75625 -22.0625,5.75781 -4.3,2.9 -6.8,6.29922 -10,10.69922 -13.9,19 -12.99883,41.20117 -12.29883,57.70117 0.3,6.4 1.09922,15.89883 3.69922,27.29883 3.8,16.5 1.00078,28.2 0.80078,32.5 -0.2,4.5 -0.70078,12.2 -2.30078,21 -1.73947,9.06355 -5.08596,22.49315 -12.84961,38.125 l 120.84961,0 c -6.38699,-13.18859 -11.21229,-19.95541 -14.59961,-23.625 -0.9,-1 -3.9,-4.1 -6,-9 0,0 -1.90078,-4.4 -2.30078,-9 -0.4,-4.8 1.1,-10.49883 13.5,-27.29883 9,-12.2 10.8,-12.60078 14.5,-19.80078 3.7,-7.1 5.40078,-13.09883 6.80078,-18.29883 2.9,-11 4.7,-22.8 4,-28.5 -3.42656,-29.72344 -48.63593,-57.4782 -81.73828,-57.55859 z" id="Body_Shadow_2_-7"/><path d="m 225.8,413.2 c 17.2,4.6 17.2,30.6 43.5,50.1 1.2,0.9 -21.9,-11.3 -4.5,-34.1 20,8.2 11.2,37.3 11.4,36.9 7.4,-15.9 19.8,-23 32,-32.9 12.4,-10 20,-18 41.9,-21.9 z" class="shadow" id="Body_Shadow_5_"/><path d="m 273,208.3 c 0,0 -14,4.3 -24.7,28.3 -10.7,24 -10.5,59.4 -4.4,81 2.2,23 0.7,29.7 -1.4,49.8 -1.1,10.1 -8.8,25.3 -16.5,45.9 16.5,5.3 30.7,47.1 47.7,53.7 0.7,0.3 -25.7,-15.9 -8.8,-37.6 19.9,9 11.3,37.4 11.5,36.9 9.4,-18.2 33.9,-44.3 73.9,-55 -9.7,-23.8 -24.7,-35.3 -25,-41.4 -0.8,-16 17.6,-31.3 29.9,-54.1 8.9,-21.9 18.3,-62.5 10.5,-86 -11.7,-22 -21.9,-21.1 -21.9,-21.1 -32.7,-3.3 -35,-14 -30.7,-50 l -22.3,1 c 8.5,43.5 -2.7,39.9 -17.8,48.6" class="outfit_base" id="Body_Normal_6_"/></svg></html>' >>
\ No newline at end of file
diff --git a/src/art/vector/layers/Torso_Outfit_Latex_Normal.tw b/src/art/vector/layers/Torso_Outfit_Latex_Normal.tw
index 9253c39fd62470b2e336bbf3af4fc18a82f54fa1..8eec90faf7d693b03a5b4ec7f436d096fc82d6dc 100644
--- a/src/art/vector/layers/Torso_Outfit_Latex_Normal.tw
+++ b/src/art/vector/layers/Torso_Outfit_Latex_Normal.tw
@@ -1,3 +1,3 @@
:: Art_Vector_Torso_Outfit_Latex_Normal [nobr]
-<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path style="fill:#010101" d="M 283.36133 215.8418 C 274.92347 215.82131 267.27266 217.59805 261.30078 221.59961 C 257.00078 224.49961 254.50078 227.90078 251.30078 232.30078 C 237.40078 251.30078 238.3 273.5 239 290 C 239.3 296.4 240.09922 305.90078 242.69922 317.30078 C 241.39922 324.60078 239.9 334.59961 239 346.59961 C 237.7 364.89961 238.90078 372.30078 236.30078 385.30078 C 234.9168 391.52868 232.62415 399.63194 228.21484 408.82422 L 348.96484 408.82422 C 343.87735 399.04234 341.93748 390.44468 341.19922 385 C 339.79922 374.7 341 366.49922 342 359.69922 C 343.3 350.59922 345.40078 343.99922 347.80078 336.69922 C 353.80078 317.89922 357.39961 315.00039 361.09961 301.90039 C 362.79961 295.80039 366.29961 283.50039 365.09961 273.40039 C 361.67305 243.67695 316.46368 215.92218 283.36133 215.8418 z " id="Body_Shadow-9"/><path d="m 225.8,413.2 c 17.2,4.6 17.2,30.6 43.5,50.1 1.2,0.9 -21.9,-11.3 -4.5,-34.1 20,8.2 11.2,37.3 11.4,36.9 7.4,-15.9 19.8,-23 32,-32.9 12.4,-10 20,-18 41.9,-21.9 z" class="shadow" id="Body_Shadow_3_"/><path d="m 273,208.3 c 0,0 -14,4.3 -24.7,28.3 -10.7,24 -10.5,59.4 -4.4,81 -5.3,23.9 -3.3,30.9 -5.4,51 -1.1,10.1 -4.8,24.1 -12.4,44.6 16.5,5.3 30.7,47.1 47.7,53.7 0.7,0.3 -25.7,-15.9 -8.8,-37.6 19.9,9 11.3,37.4 11.5,36.9 9.4,-18.2 33.9,-44.3 73.9,-55 -6.8,-16.4 -7.2,-34.6 -7.5,-40.7 -0.8,-16 3.7,-37.3 12.4,-54.8 8.9,-21.9 18.3,-62.5 10.5,-86 -11.7,-22 -21.9,-21.1 -21.9,-21.1 -32.7,-3.3 -35,-14 -30.7,-50 l -22.3,1 c 8.4,43.6 -2.8,40 -17.9,48.7" style="fill:#515351" id="Body_Normal_4_"/></svg></html>' >>
\ No newline at end of file
+<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path style="fill:#010101" d="m 283.36133,215.8418 c -8.43786,-0.0205 -16.08867,1.75625 -22.06055,5.75781 -4.3,2.9 -6.8,6.30117 -10,10.70117 C 237.40078,251.30078 238.3,273.5 239,290 c 0.3,6.4 1.09922,15.90078 3.69922,27.30078 -1.3,7.3 -2.79922,17.29883 -3.69922,29.29883 -1.3,18.3 -0.0992,25.70117 -2.69922,38.70117 -1.38398,6.2279 -3.67663,14.33116 -8.08594,23.52344 l 120.75,0 C 343.87735,399.04234 341.93748,390.44468 341.19922,385 339.79922,374.7 341,366.49922 342,359.69922 c 1.3,-9.1 3.40078,-15.7 5.80078,-23 6,-18.8 9.59883,-21.69883 13.29883,-34.79883 1.7,-6.1 5.2,-18.4 4,-28.5 -3.42656,-29.72344 -48.63593,-57.47821 -81.73828,-57.55859 z" id="Body_Shadow-9"/><path d="m 225.8,413.2 c 17.2,4.6 17.2,30.6 43.5,50.1 1.2,0.9 -21.9,-11.3 -4.5,-34.1 20,8.2 11.2,37.3 11.4,36.9 7.4,-15.9 19.8,-23 32,-32.9 12.4,-10 20,-18 41.9,-21.9 z" class="shadow" id="Body_Shadow_3_"/><path d="m 273,208.3 c 0,0 -14,4.3 -24.7,28.3 -10.7,24 -10.5,59.4 -4.4,81 -5.3,23.9 -3.3,30.9 -5.4,51 -1.1,10.1 -4.8,24.1 -12.4,44.6 16.5,5.3 30.7,47.1 47.7,53.7 0.7,0.3 -25.7,-15.9 -8.8,-37.6 19.9,9 11.3,37.4 11.5,36.9 9.4,-18.2 33.9,-44.3 73.9,-55 -6.8,-16.4 -7.2,-34.6 -7.5,-40.7 -0.8,-16 3.7,-37.3 12.4,-54.8 8.9,-21.9 18.3,-62.5 10.5,-86 -11.7,-22 -21.9,-21.1 -21.9,-21.1 -32.7,-3.3 -35,-14 -30.7,-50 l -22.3,1 c 8.4,43.6 -2.8,40 -17.9,48.7" class="outfit_base" id="Body_Normal_4_"/></svg></html>' >>
\ No newline at end of file
diff --git a/src/art/vector/layers/Torso_Outfit_Latex_Unnatural.tw b/src/art/vector/layers/Torso_Outfit_Latex_Unnatural.tw
index 3b9d514ffba9dbe80e3dd510f6cf47a01896c1a9..9eabb763227c980745ad93d9abfc4ebacac21e59 100644
--- a/src/art/vector/layers/Torso_Outfit_Latex_Unnatural.tw
+++ b/src/art/vector/layers/Torso_Outfit_Latex_Unnatural.tw
@@ -1,3 +1,3 @@
:: Art_Vector_Torso_Outfit_Latex_Unnatural [nobr]
-<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path d="m 284.89453,215.17383 c -9.60625,0.0391 -17.99492,2.07578 -23.79492,6.42578 -1.9,1.5 -4.90039,4.60039 -7.40039,7.90039 -11.5,14.7 -13.19844,30.69961 -14.39844,43.09961 -0.5,5 -1.60078,16.60078 0.69922,30.30078 0.5,3.1 1.29922,6.8 2.69922,15 1.2,7.2 2.10117,13 2.70117,17 2,7.7 2.89883,14.39883 3.29883,19.29883 0.7,8 1,12.70078 -1,18.30078 -0.9,2.5 -1.2,2.20078 -6,10.30078 -0.7,1.2 -4.69922,7.99922 -8.69922,15.69922 -1.42356,2.69728 -3.12849,6.18129 -5.0293,10.32422 l 120.92383,0 c -5.907,-10.12422 -12.20081,-16.98505 -17.29492,-21.52344 -7.7,-7 -15.39922,-11.50078 -15.69922,-19.30078 -0.1,-4 1.69883,-7.89922 2.79883,-10.19922 2.7,-5.8 6.5,-9.30078 8,-10.80078 6.4,-6.1 16.10156,-16.10039 28.60156,-29.40039 6,-7.3 12.7,-39.99883 12,-57.29883 -13.8,-27.375 -53.5875,-45.24414 -82.40625,-45.12695 z" id="Body_Shadow_1_-8"/><path d="m 225.8,413.2 c 17.2,4.6 17.2,30.6 43.5,50.1 1.2,0.9 -21.9,-11.3 -4.5,-34.1 20,8.2 11.2,37.3 11.4,36.9 7.4,-15.9 19.8,-23 32,-32.9 12.4,-10 20,-18 41.9,-21.9 z" class="shadow" id="Body_Shadow_4_"/><path d="m 273,208.3 c 0,0 -14,4.3 -24.7,28.3 -10.7,24 -10.5,59.4 -4.4,81 2.2,23 7.6,30.9 5.5,51 -1.1,10.1 -15.7,24.1 -23.4,44.6 16.5,5.3 30.7,47.1 47.7,53.7 0.7,0.3 -25.7,-15.9 -8.8,-37.6 19.9,9 11.3,37.4 11.5,36.9 9.4,-18.2 33.9,-44.3 73.9,-55 -9.1,-20.7 -34,-29.7 -35.4,-42.7 -1.6,-15.9 25.4,-34.2 40.3,-52.9 8.9,-21.9 18.3,-62.5 10.5,-86 -11.7,-22 -21.9,-21.1 -21.9,-21.1 -32.7,-3.3 -35,-14 -30.7,-50 l -22.3,1 c 8.5,43.7 -2.7,40.1 -17.8,48.8" style="fill:#515351" id="Body_Normal_5_"/></svg></html>' >>
\ No newline at end of file
+<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><path d="m 284.89453,215.17383 c -9.60625,0.0391 -17.99492,2.07578 -23.79492,6.42578 -1.9,1.5 -4.90039,4.60039 -7.40039,7.90039 -11.5,14.7 -13.19844,30.69961 -14.39844,43.09961 -0.5,5 -1.60078,16.60078 0.69922,30.30078 0.5,3.1 1.29922,6.8 2.69922,15 1.2,7.2 2.10117,13 2.70117,17 2,7.7 2.89883,14.39883 3.29883,19.29883 0.7,8 1,12.70078 -1,18.30078 -0.9,2.5 -1.2,2.20078 -6,10.30078 -0.7,1.2 -4.69922,7.99922 -8.69922,15.69922 -1.42356,2.69728 -3.12849,6.18129 -5.0293,10.32422 l 120.92383,0 c -5.907,-10.12422 -12.20081,-16.98505 -17.29492,-21.52344 -7.7,-7 -15.39922,-11.50078 -15.69922,-19.30078 -0.1,-4 1.69883,-7.89922 2.79883,-10.19922 2.7,-5.8 6.5,-9.30078 8,-10.80078 6.4,-6.1 16.10156,-16.10039 28.60156,-29.40039 6,-7.3 12.7,-39.99883 12,-57.29883 -13.8,-27.375 -53.5875,-45.24414 -82.40625,-45.12695 z" id="Body_Shadow_1_-8"/><path d="m 225.8,413.2 c 17.2,4.6 17.2,30.6 43.5,50.1 1.2,0.9 -21.9,-11.3 -4.5,-34.1 20,8.2 11.2,37.3 11.4,36.9 7.4,-15.9 19.8,-23 32,-32.9 12.4,-10 20,-18 41.9,-21.9 z" class="shadow" id="Body_Shadow_4_"/><path d="m 273,208.3 c 0,0 -14,4.3 -24.7,28.3 -10.7,24 -10.5,59.4 -4.4,81 2.2,23 7.6,30.9 5.5,51 -1.1,10.1 -15.7,24.1 -23.4,44.6 16.5,5.3 30.7,47.1 47.7,53.7 0.7,0.3 -25.7,-15.9 -8.8,-37.6 19.9,9 11.3,37.4 11.5,36.9 9.4,-18.2 33.9,-44.3 73.9,-55 -9.1,-20.7 -34,-29.7 -35.4,-42.7 -1.6,-15.9 25.4,-34.2 40.3,-52.9 8.9,-21.9 18.3,-62.5 10.5,-86 -11.7,-22 -21.9,-21.1 -21.9,-21.1 -32.7,-3.3 -35,-14 -30.7,-50 l -22.3,1 c 8.5,43.7 -2.7,40.1 -17.8,48.8" class="outfit_base" id="Body_Normal_5_"/></svg></html>' >>
\ No newline at end of file
diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index 0b96a334cf02840015bfad7b0d68004d393f86cd..41716dcbbff5d0bca17f707b409de9015f5b3479 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -111,6 +111,9 @@
<<set $nationalities.push("Cuban")>>
<<set $nationalities.push("Puerto Rican")>>
<<set $nationalities.push("Jamaican")>>
+ <<set $nationalities.push("Guatemalan")>>
+ <<set $nationalities.push("Bermudian")>>
+ <<set $nationalities.push("Greenlandic")>>
<</if>>
<<case "South America">>
<<set $arcologies[0].FSSupremacistRace = "latina">>
@@ -124,6 +127,7 @@
<<set $nationalities.push("Bolivian")>>
<<set $nationalities.push("Chilean")>>
<<set $nationalities.push("Guatemalan")>>
+ <<set $nationalities.push("Uruguayan")>>
<</if>>
<<case "Brazil">>
<<set $arcologies[0].FSSupremacistRace = "white">>
@@ -137,6 +141,7 @@
<<set $nationalities.push("Bolivian")>>
<<set $nationalities.push("Chilean")>>
<<set $nationalities.push("Guatemalan")>>
+ <<set $nationalities.push("Uruguayan")>>
<</if>>
<<case "the Middle East">>
<<set $arcologies[0].FSSupremacistRace = "middle eastern">>
@@ -155,6 +160,7 @@
<<set $nationalities.push("Iraqi")>>
<<set $nationalities.push("Afghan")>>
<<set $nationalities.push("Yemeni")>>
+ <<set $nationalities.push("Syrian")>>
<</if>>
<<case "Africa">>
<<set $arcologies[0].FSSupremacistRace = "black">>
@@ -175,6 +181,10 @@
<<set $nationalities.push("Zimbabwean")>>
<<set $nationalities.push("Tanzanian")>>
<<set $nationalities.push("Ugandan")>>
+ <<set $nationalities.push("Cameroonian")>>
+ <<set $nationalities.push("Gabonese")>>
+ <<set $nationalities.push("Djiboutian")>>
+ <<set $nationalities.push("Zambian")>>
<</if>>
<<case "Asia">>
<<set $arcologies[0].FSSupremacistRace = "asian">>
@@ -195,6 +205,9 @@
<<set $nationalities.push("Uzbek")>>
<<set $nationalities.push("Nepalese")>>
<<set $nationalities.push("Kazakh")>>
+ <<set $nationalities.push("Cambodian")>>
+ <<set $nationalities.push("Bruneian")>>
+ <<set $nationalities.push("Singaporean")>>
<</if>>
<<case "Europe">>
<<set $arcologies[0].FSSupremacistRace = "white">>
@@ -229,12 +242,18 @@
<<set $nationalities.push("Portuguese")>>
<<set $nationalities.push("Hungarian")>>
<<set $nationalities.push("Estonian")>>
+ <<set $nationalities.push("Sammarinese")>>
+ <<set $nationalities.push("Monégasque")>>
+ <<set $nationalities.push("Montenegrin")>>
+ <<set $nationalities.push("Albanian")>>
<</if>>
<<case "Australia">>
<<set $arcologies[0].FSSupremacistRace = "white">>
<<set $arcologies[0].FSSubjugationistRace = "asian">>
<<set $nationalities.push("Australian","Australian","Australian")>>
<<set $nationalities.push("a New Zealander")>>
+ <<set $nationalities.push("Marshallese")>>
+ <<set $nationalities.push("Tuvaluan")>>
<<case "Japan">>
<<set $arcologies[0].FSSupremacistRace = "asian">>
<<set $arcologies[0].FSSubjugationistRace = "asian">>
@@ -285,6 +304,7 @@
<<set $nationalities.push("Burmese","Burmese")>>
<<set $nationalities.push("Algerian","Algerian")>>
<<set $nationalities.push("Sudanese","Sudanese")>>
+ <<set $nationalities.push("Malaysian", "Malaysian")>>
<<set $nationalities.push("Lebanese")>>
<<set $nationalities.push("Tunisian")>>
<<set $nationalities.push("Emirati")>>
@@ -337,7 +357,23 @@
<<set $nationalities.push("Jamaican")>>
<<set $nationalities.push("Cuban")>>
<<set $nationalities.push("Kazakh")>>
- <<set $nationalities.push("Malaysian", "Malaysian")>>
+ <<set $nationalities.push("Sammarinese")>>
+ <<set $nationalities.push("Marshallese")>>
+ <<set $nationalities.push("Syrian")>>
+ <<set $nationalities.push("Bermudian")>>
+ <<set $nationalities.push("Uruguayan")>>
+ <<set $nationalities.push("Monégasque")>>
+ <<set $nationalities.push("Montenegrin")>>
+ <<set $nationalities.push("Cambodian")>>
+ <<set $nationalities.push("Cameroonian")>>
+ <<set $nationalities.push("Gabonese")>>
+ <<set $nationalities.push("Djiboutian")>>
+ <<set $nationalities.push("Greenlandic")>>
+ <<set $nationalities.push("Tuvaluan")>>
+ <<set $nationalities.push("Zambian")>>
+ <<set $nationalities.push("Albanian")>>
+ <<set $nationalities.push("Bruneian")>>
+ <<set $nationalities.push("Singaporean")>>
<</if>>
<</if>>
<</if>>
diff --git a/src/events/intro/pcBodyIntro.tw b/src/events/intro/pcBodyIntro.tw
index 740239ddf9c1281bc5259d4c01171a25556531fa..3bf3957f7f18b024b4596b85770c147c7f6b80a4 100644
--- a/src/events/intro/pcBodyIntro.tw
+++ b/src/events/intro/pcBodyIntro.tw
@@ -66,7 +66,13 @@ My age: ''<<textbox "$PC.actualAge" $PC.actualAge "PC Body Intro">>''
<br><br>
-Name your character: <<textbox "$PC.name" $PC.name "PC Body Intro">>
+Name your character: <<textbox "$PC.name" $PC.name "PC Body Intro">> (surname)
+<<if $PC.surname>>
+ <<textbox "$PC.surname" $PC.surname "PC Body Intro">>
+ <<link "Go by a single name">><<set $PC.slaveSurname = 0>><<goto "PC Body Intro">><</link>>
+<<else>>
+ <<textbox "$PC.surname" "" "PC Body Intro">>
+<</if>>
<br>
//As with all text boxes in FC, press the enter key to commit your changes.//
<br>
@@ -90,13 +96,3 @@ Preferred method of consumption: ''<<if $PC.refreshmentType == 0>>Smoked<<elseif
<</if>>
<br><br>
-
-<<if $SFMODToggle == 1>>
- The Security Force Mod is ''enabled.''
-[[Disable|PC Body Intro][$SFMODToggle = 0]]
-<<else>>
- The Security Force Mod is ''disabled.''
-[[Enable|PC Body Intro][$SFMODToggle = 1]]
-<</if>>
-<br>
-// This mod from anon1888 offers a lategame security force, triggered around week 80. It should be considered non-canon if it conflicts with canonical updates to the base game. //
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index a3370206e3ac8a6b08dbf98daaea046153557e04..c9f500fae961c5133b2aacda505e36c901ddd84a 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -308,7 +308,7 @@ The player character's sexual energy can have gameplay effects. Though of course
<br><br>
It is possible to raise these limits by focusing on sexual decadence for the week. By paying less attention to business and not using sexual training on specific slaves, the player character will have more energy to spare and can offer intense sexual attention to three slaves or give sexual attention to up to seven slaves without dilution.
<br><br>
-The exist several other ways to raise the player's sexual energy as well.
+There exist several other ways to raise the player's sexual energy as well.
/**********
SLAVES
@@ -782,43 +782,51 @@ SLAVE ASSIGNMENTS (COMMON):
<<case "Attending Classes">>
-''Attending classes'' is an assignment which educates the slave, raising intelligence if possible. Being educated raises value and is useful for some jobs and leadership positions. //Associated facility: [[Schoolroom|Encyclopedia][$encyclopedia = "Schoolroom"]]//
-
+ <<encyclopediaEntryAttendingClasses>>
+ //Associated facility: [[Schoolroom|Encyclopedia][$encyclopedia = "Schoolroom"]]//
<<case "Confinement">>
-''Confinement'' is an assignment which accelerates breaking for disobedient slaves. If a slave isn't obedient enough to work and isn't [[unhealthy|Encyclopedia][$encyclopedia = "Health"]] enough to need rest, this will make her useful sooner. //Associated facility: [[Cellblock|Encyclopedia][$encyclopedia = "Cellblock"]]//
+ <<encyclopediaEntryConfinement>>
+ //Associated facility: [[Cellblock|Encyclopedia][$encyclopedia = "Cellblock"]]//
<<case "Fucktoy">>
-''Fucktoy service'' is an assignment which keeps the slave close under the player's eye; mostly just for fun, but fucktoys do improve reputation based on their beauty, and the player character's attention can be targeted to areas of the slave's body with possible fetish effects on happy slaves. //Associated facility: [[Master Suite|Encyclopedia][$encyclopedia = "Master Suite"]]//
+ <<encyclopediaEntryFucktoy>>
+ //Associated facility: [[Master Suite|Encyclopedia][$encyclopedia = "Master Suite"]]//
<<case "Glory Hole">>
-''Occupying a glory hole'' is an assignment which makes money off slaves regardless of their beauty, skills, or feelings; not fun or [[Healthy|Encyclopedia][$encyclopedia = "Health"]]. Very powerful for extracting ¤ out of otherwise useless slaves. //Associated facility: [[Arcade|Encyclopedia][$encyclopedia = "Arcade"]]//
+ <<encyclopediaEntryGloryHole>>
+ //Associated facility: [[Arcade|Encyclopedia][$encyclopedia = "Arcade"]]//
<<case "Milking">>
-''Getting milked'' is an assignment which makes money from lactation based on a slave's breasts, [[health|Encyclopedia][$encyclopedia = "Health"]], and hormonal status.<<if $seeDicks > 0>> Cows with balls will also give semen.<</if>> Creates profit quickly from slaves with big tits<<if $seeDicks > 0>> or balls<</if>>. //Associated facility: [[Dairy|Encyclopedia][$encyclopedia = "Dairy"]]//
+ <<encyclopediaEntryMilking>>
+ //Associated facility: [[Dairy|Encyclopedia][$encyclopedia = "Dairy"]]//
<<case "Public Service">>
-''Public Service'' is an assignment which increases reputation based on a slave's beauty, sexual appeal, and skills. Very similar to whoring, but for reputation rather than money. //Associated facility: [[Club|Encyclopedia][$encyclopedia = "Club"]]//
+ <<encyclopediaEntryPublicService>>
+ //Associated facility: [[Club|Encyclopedia][$encyclopedia = "Club"]]//
<<case "Rest">>
-''Rest'' is an assignment mostly used to improve [[health|Encyclopedia][$encyclopedia = "Health"]]. It can be useful to order slaves you wish to intensively modify to rest, since most modifications damage health. It will synergize with curative treatments, providing bonus healing when both are simultaneously applied. //Associated facilities: [[Spa|Encyclopedia][$encyclopedia = "Spa"]], [[Clinic|Encyclopedia][$encyclopedia = "Clinic"]]//
+ <<encyclopediaEntryRest>>
+ //Associated facilities: [[Spa|Encyclopedia][$encyclopedia = "Spa"]], [[Clinic|Encyclopedia][$encyclopedia = "Clinic"]]//
<<case "Sexual Servitude">>
-''Sexual servitude'' is an assignment which pleases other slaves by forcing the slave to service them sexually. Useful for driving the targeted slave's [[devotion|Encyclopedia][$encyclopedia = "Devotion"]] up quickly.
+ <<encyclopediaEntrySexualServitude>>
<<case "Servitude">>
-''Servitude'' is an assignment which reduces your upkeep based on the slave's [[devotion|Encyclopedia][$encyclopedia = "Devotion"]]. Available at lower obedience than other jobs, is insensitive to the quality of a slave's body, and doesn't require skills; a good transitional assignment. Unusually, low sex drive is advantageous as a servant, since it reduces distraction. Lactating slaves are slightly better at this job, since they can contribute to their fellow slaves' nutrition. //Associated facility: [[Servants' Quarters|Encyclopedia][$encyclopedia = "Servants' Quarters"]]//
+ <<encyclopediaEntryServitude>>
+ //Associated facility: [[Servants' Quarters|Encyclopedia][$encyclopedia = "Servants' Quarters"]]//
<<case "Whoring">>
-''Whoring'' is an assignment which makes money based on a slave's beauty, sexual appeal, and skills. Good whores take a long time to train and beautify but become very profitable. //Associated facility: [[Brothel|Encyclopedia][$encyclopedia = "Brothel"]]//
+ <<encyclopediaEntryWhoring>>
+ //Associated facility: [[Brothel|Encyclopedia][$encyclopedia = "Brothel"]]//
/**********
SLAVE BODY:
diff --git a/src/gui/Encyclopedia/encyclopediaWidgets.tw b/src/gui/Encyclopedia/encyclopediaWidgets.tw
new file mode 100644
index 0000000000000000000000000000000000000000..a59e376de21da354878be62a127337297202d425
--- /dev/null
+++ b/src/gui/Encyclopedia/encyclopediaWidgets.tw
@@ -0,0 +1,49 @@
+:: Encyclopedia Widgets [nobr widget]
+
+<<widget "encyclopediaEntryAttendingClasses">>
+''Attending classes'' is an assignment which educates the slave, raising intelligence if possible. Being educated raises value and is useful for some jobs and leadership positions.
+<</widget>>
+
+<<widget "encyclopediaEntryConfinement">>
+''Confinement'' is an assignment which accelerates breaking for disobedient slaves. If a slave isn't obedient enough to work and isn't [[unhealthy|Encyclopedia][$encyclopedia = "Health"]] enough to need rest, this will make her useful sooner.
+<</widget>>
+
+
+<<widget "encyclopediaEntryFucktoy">>
+''Fucktoy service'' is an assignment which keeps the slave close under the player's eye; mostly just for fun, but fucktoys do improve reputation based on their beauty, and the player character's attention can be targeted to areas of the slave's body with possible fetish effects on happy slaves.
+<</widget>>
+
+
+<<widget "encyclopediaEntryGloryHole">>
+''Occupying a glory hole'' is an assignment which makes money off slaves regardless of their beauty, skills, or feelings; not fun or [[Healthy|Encyclopedia][$encyclopedia = "Health"]]. Very powerful for extracting ¤ out of otherwise useless slaves.
+<</widget>>
+
+
+<<widget "encyclopediaEntryMilking">>
+''Getting milked'' is an assignment which makes money from lactation based on a slave's breasts, [[health|Encyclopedia][$encyclopedia = "Health"]], and hormonal status.<<if $seeDicks > 0>> Cows with balls will also give semen.<</if>> Creates profit quickly from slaves with big tits<<if $seeDicks > 0>> or balls<</if>>.
+<</widget>>
+
+
+<<widget "encyclopediaEntryPublicService">>
+''Public Service'' is an assignment which increases reputation based on a slave's beauty, sexual appeal, and skills. Very similar to whoring, but for reputation rather than money.
+<</widget>>
+
+
+<<widget "encyclopediaEntryRest">>
+''Rest'' is an assignment mostly used to improve [[health|Encyclopedia][$encyclopedia = "Health"]]. It can be useful to order slaves you wish to intensively modify to rest, since most modifications damage health. It will synergize with curative treatments, providing bonus healing when both are simultaneously applied.
+<</widget>>
+
+
+<<widget "encyclopediaEntrySexualServitude">>
+''Sexual servitude'' is an assignment which pleases other slaves by forcing the slave to service them sexually. Useful for driving the targeted slave's [[devotion|Encyclopedia][$encyclopedia = "Devotion"]] up quickly.
+<</widget>>
+
+
+<<widget "encyclopediaEntryServitude">>
+''Servitude'' is an assignment which reduces your upkeep based on the slave's [[devotion|Encyclopedia][$encyclopedia = "Devotion"]]. Available at lower obedience than other jobs, is insensitive to the quality of a slave's body, and doesn't require skills; a good transitional assignment. Unusually, low sex drive is advantageous as a servant, since it reduces distraction. Lactating slaves are slightly better at this job, since they can contribute to their fellow slaves' nutrition.
+<</widget>>
+
+
+<<widget "encyclopediaEntryWhoring">>
+''Whoring'' is an assignment which makes money based on a slave's beauty, sexual appeal, and skills. Good whores take a long time to train and beautify but become very profitable.
+<</widget>>
diff --git a/src/init/dummy.tw b/src/init/dummy.tw
index ef8aca46adcb79d368105b5ed039a70089cb3169..1b460669a09dfed5645779d29239bb8853f12778 100644
--- a/src/init/dummy.tw
+++ b/src/init/dummy.tw
@@ -9,7 +9,7 @@ $args.bodySwap
$recruiterSister
$servantMilkersJobs
$youngCareers, $educatedCareers, $uneducatedCareers, $gratefulCareers, $menialCareers, $entertainmentCareers, $whoreCareers, $HGCareers, $madamCareers, $DJCareers, $bodyguardCareers, $wardenessCareers, $nurseCareers, $attendantCareers, $milkmaidCareers, $stewardessCareers, $schoolteacherCareers
-$whiteAmericanSlaveNames, $africanAmericanSlaveNames, $asianAmericanSlaveNames, $latinaSlaveNames, $russianSlaveNames, $egyptianSlaveNames, $brazilianSlaveNames, $chineseSlaveNames, $koreanSlaveNames, $indianSlaveNames, $indonesianSlaveNames, $bangladeshiSlaveNames, $japaneseSlaveNames, $nigerianSlaveNames, $pakistaniSlaveNames, $mexicanSlaveNames, $filipinaSlaveNames, $ethiopianSlaveNames, $germanSlaveNames, $saudiSlaveNames, $turkishSlaveNames, $colombianSlaveNames, $argentinianSlaveNames, $vietnameseSlaveNames, $iranianSlaveNames, $congoleseSlaveNames, $frenchSlaveNames, $thaiSlaveNames, $britishSlaveNames, $italianSlaveNames, $spanishSlaveNames, $kenyanSlaveNames, $ukrainianSlaveNames, $canadianSlaveNames, $peruvianSlaveNames, $venezuelanSlaveNames, $irishSlaveNames, $icelandicSlaveNames, $finnishSlaveNames, $newZealanderSlaveNames, $polishSlaveNames, $greekSlaveNames, $israeliSlaveNames, $armenianSlaveNames, $moroccanSlaveNames, $romanianSlaveNames, $swedishSlaveNames, $lithuanianSlaveNames, $bolivianSlaveNames, $haitianSlaveNames, $cubanSlaveNames, $whiteSouthAfricanSlaveNames, $blackSouthAfricanSlaveNames, $chileanSlaveNames, $belgianSlaveNames, $danishSlaveNames, $norwegianSlaveNames, $hungarianSlaveNames, $estonianSlaveNames, $slovakSlaveNames, $kazakhSlaveNames, $zimbabweanSlaveNames, $ugandanSlaveNames, $tanzanianSlaveNames, $dutchSlaveNames, $austrianSlaveNames, $swissSlaveNames, $puertoRicanSlaveNames, $czechSlaveNames, $portugueseSlaveNames, $jamaicanSlaveNames, $malaysianSlaveNames, $guatemalanSlaveNames, $ghananSlaveNames, $serbianSlaveNames, $australianSlaveNames, $burmeseSlaveNames, $algerianSlaveNames, $sudaneseSlaveNames, $iraqiSlaveNames, $uzbekSlaveNames, $nepaleseSlaveNames, $afghanSlaveNames, $yemeniSlaveNames, $lebaneseSlaveNames, $tunisianSlaveNames, $emiratiSlaveNames, $libyanSlaveNames, $jordanianSlaveNames, $omaniSlaveNames, $malianSlaveNames
+$whiteAmericanSlaveNames, $africanAmericanSlaveNames, $asianAmericanSlaveNames, $latinaSlaveNames, $russianSlaveNames, $egyptianSlaveNames, $brazilianSlaveNames, $chineseSlaveNames, $koreanSlaveNames, $indianSlaveNames, $indonesianSlaveNames, $bangladeshiSlaveNames, $japaneseSlaveNames, $nigerianSlaveNames, $pakistaniSlaveNames, $mexicanSlaveNames, $filipinaSlaveNames, $ethiopianSlaveNames, $germanSlaveNames, $saudiSlaveNames, $turkishSlaveNames, $colombianSlaveNames, $argentinianSlaveNames, $vietnameseSlaveNames, $iranianSlaveNames, $congoleseSlaveNames, $frenchSlaveNames, $thaiSlaveNames, $britishSlaveNames, $italianSlaveNames, $spanishSlaveNames, $kenyanSlaveNames, $ukrainianSlaveNames, $canadianSlaveNames, $peruvianSlaveNames, $venezuelanSlaveNames, $irishSlaveNames, $icelandicSlaveNames, $finnishSlaveNames, $newZealanderSlaveNames, $polishSlaveNames, $greekSlaveNames, $israeliSlaveNames, $armenianSlaveNames, $moroccanSlaveNames, $romanianSlaveNames, $swedishSlaveNames, $lithuanianSlaveNames, $bolivianSlaveNames, $haitianSlaveNames, $cubanSlaveNames, $whiteSouthAfricanSlaveNames, $blackSouthAfricanSlaveNames, $chileanSlaveNames, $belgianSlaveNames, $danishSlaveNames, $norwegianSlaveNames, $hungarianSlaveNames, $estonianSlaveNames, $slovakSlaveNames, $kazakhSlaveNames, $zimbabweanSlaveNames, $ugandanSlaveNames, $tanzanianSlaveNames, $dutchSlaveNames, $austrianSlaveNames, $swissSlaveNames, $puertoRicanSlaveNames, $czechSlaveNames, $portugueseSlaveNames, $jamaicanSlaveNames, $malaysianSlaveNames, $guatemalanSlaveNames, $ghananSlaveNames, $serbianSlaveNames, $australianSlaveNames, $burmeseSlaveNames, $algerianSlaveNames, $sudaneseSlaveNames, $iraqiSlaveNames, $uzbekSlaveNames, $nepaleseSlaveNames, $afghanSlaveNames, $yemeniSlaveNames, $lebaneseSlaveNames, $tunisianSlaveNames, $emiratiSlaveNames, $libyanSlaveNames, $jordanianSlaveNames, $omaniSlaveNames, $malianSlaveNames, $sammarineseSlaveNames, $marshalleseSlaveNames, $syrianSlaveNames, $bermudianSlaveNames, $uruguayanSlaveNames, $monegasqueSlaveNames, $montenegrinSlaveNames, $cambodianSlaveNames, $cameroonianSlaveNames, $gaboneseSlaveNames, $djiboutianSlaveNames, $greenlandicSlaveNames, $tuvaluanSlaveNames, $zambianSlaveNames, $albanianSlaveNames, $bruneianSlaveNames, $singaporeanSlaveNames
$cowSlaveNames, $chattelReligionistSlaveNames, $romanSlaveNames, $aztecSlaveNames, $ancientEgyptianSlaveNames, $edoSlaveNames
$ArcologyNamesSupremacistWhite, $ArcologyNamesSupremacistAsian, $ArcologyNamesSupremacistLatina, $ArcologyNamesSupremacistMiddleEastern, $ArcologyNamesSupremacistBlack, $ArcologyNamesSupremacistIndoAryan, $ArcologyNamesSupremacistPacificIslander, $ArcologyNamesSupremacistMalay, $ArcologyNamesSupremacistAmerindian, $ArcologyNamesSupremacistSouthernEuropean, $ArcologyNamesSupremacistSemitic, $ArcologyNamesSupremacistMixedRace
$ArcologyNamesSubjugationistWhite, $ArcologyNamesSubjugationistAsian, $ArcologyNamesSubjugationistLatina, $ArcologyNamesSubjugationistMiddleEastern, $ArcologyNamesSubjugationistBlack, $ArcologyNamesSubjugationistIndoAryan, $ArcologyNamesSubjugationistPacificIslander, $ArcologyNamesSubjugationistMalay, $ArcologyNamesSubjugationistAmerindian, $ArcologyNamesSubjugationistSouthernEuropean, $ArcologyNamesSubjugationistSemitic, $ArcologyNamesSubjugationistMixedRace
@@ -21,7 +21,7 @@ $belarusianSlaveNames, $dominicanSlaveNames, $scottishSlaveNames
$ArcologyNamesEugenics, $ArcologyNamesRepopulationist, $ArcologyNamesHedonisticDecadence
$hare1, $hare2, $hare3, $hareSpeed, $hareSpeed1, $hareSpeed2, $hareSpeed3, $origin1, $origin2, $origin3, $LurcherSpeed
$$i
-$activeSlave.bodySwap, $activeSlave.customImageFormat, $activeSlave.customHairVector
+$activeSlave.bodySwap, $activeSlave.customImageFormat, $activeSlave.customHairVector, $activeSlave.shoeColor
$drugs
$PC.origRace, $PC.origSkin
*/
diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index 97cf9565a546497b295d44ead18bea63b3760c64..9af30f0639f135226bf45c4946d6b6ef0b00fcb7 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -12,19 +12,19 @@
<<set setup.filterRegions = ["Africa", "Asia", "Australia", "Europe", "Middle East", "North America", "South America"]>>
/* START Custom Nationalities region filter */
-<<set setup.northamericaNationalities = ["American", "Mexican", "Dominican", "Canadian", "Haitian", "Cuban", "Puerto Rican", "Jamaican"]>>
+<<set setup.northamericaNationalities = ["American", "Mexican", "Dominican", "Canadian", "Haitian", "Cuban", "Puerto Rican", "Jamaican", "Guatemalan", "Bermudian", "Greenlandic"]>>
-<<set setup.southamericaNationalities = ["Argentinian", "Bolivian", "Brazilian", "Chilean", "Colombian", "Guatemalan", "Peruvian", "Venezuelan"]>>
+<<set setup.southamericaNationalities = ["Argentinian", "Bolivian", "Brazilian", "Chilean", "Colombian", "Guatemalan", "Peruvian", "Venezuelan", "Uruguayan"]>>
-<<set setup.europeNationalities = ["Austrian", "Belarusian", "Belgian", "British", "Czech", "Danish", "Dutch", "Estonian", "Finnish", "French", "German", "Greek", "Hungarian", "Icelandic", "Irish", "Italian", "Lithuanian", "Norwegian", "Polish", "Portuguese", "Romanian", "Russian", "Scottish", "Serbian", "Slovak", "Spanish", "Swedish", "Swiss", "Ukrainian"]>>
+<<set setup.europeNationalities = ["Austrian", "Belarusian", "Belgian", "British", "Czech", "Danish", "Dutch", "Estonian", "Finnish", "French", "German", "Greek", "Hungarian", "Icelandic", "Irish", "Italian", "Lithuanian", "Norwegian", "Polish", "Portuguese", "Romanian", "Russian", "Scottish", "Serbian", "Slovak", "Spanish", "Swedish", "Swiss", "Ukrainian", "Sammarinese", "Monégasque", "Montenegrin", "Albanian"]>>
-<<set setup.asiaNationalities = ["Bangladeshi", "Burmese", "Chinese", "Filipina", "Indian", "Indonesian", "Japanese", "Kazakh", "Korean", "Malaysian", "Nepalese", "Pakistani", "Thai", "Uzbek", "Vietnamese"]>>
+<<set setup.asiaNationalities = ["Bangladeshi", "Burmese", "Chinese", "Filipina", "Indian", "Indonesian", "Japanese", "Kazakh", "Korean", "Malaysian", "Nepalese", "Pakistani", "Thai", "Uzbek", "Vietnamese", "Cambodian", "Bruneian", "Singaporean"]>>
-<<set setup.middleeastNationalities = ["Afghan", "Armenian", "Egyptian", "Emirati", "Iranian", "Iraqi", "Israeli", "Jordanian", "Lebanese", "Omani", "Saudi", "Turkish", "Yemeni"]>>
+<<set setup.middleeastNationalities = ["Afghan", "Armenian", "Egyptian", "Emirati", "Iranian", "Iraqi", "Israeli", "Jordanian", "Lebanese", "Omani", "Saudi", "Turkish", "Yemeni", "Syrian"]>>
-<<set setup.africaNationalities = ["Algerian", "Congolese", "Ethiopian", "Ghanan", "Kenyan", "Libyan", "Malian", "Moroccan", "Nigerian", "South African", "Sudanese", "Tanzanian", "Tunisian", "Ugandan", "Zimbabwean"]>>
+<<set setup.africaNationalities = ["Algerian", "Congolese", "Ethiopian", "Ghanan", "Kenyan", "Libyan", "Malian", "Moroccan", "Nigerian", "South African", "Sudanese", "Tanzanian", "Tunisian", "Ugandan", "Zimbabwean", "Cameroonian", "Gabonese", "Djiboutian", "Zambian"]>>
-<<set setup.australiaNationalities = ["Australian", "a New Zealander"]>>
+<<set setup.australiaNationalities = ["Australian", "a New Zealander", "Marshallese", "Tuvaluan"]>>
/* Nationalities based on $continent value. Note that $continent can be undefined! */
<<set setup.nationalityPoolSelector = {
@@ -147,6 +147,24 @@
"Scottish": weightedArray({"middle eastern": 1, "indo-aryan": 1, white: 7, "mixed race": 1}),
"Australian": weightedArray({white: 4, black: 2, asian: 2, "mixed race": 1}),
"a New Zealander": weightedArray({white: 8, "pacific islander": 2, "mixed race": 1}),
+ /* these need some love, for now they are default */
+ "Sammarinese": weightedArray({"southern european": 9, "mixed race": 1}),
+ "Marshallese": weightedArray({"pacific islander": 9, "mixed race": 1}),
+ "Syrian": weightedArray({semitic: 2, "middle eastern": 8, "mixed race": 1}),
+ "Bermudian": weightedArray({black: 8, white: 2, "mixed race": 1}),
+ "Uruguayan": weightedArray({white: 2, latina: 6, "mixed race": 1}),
+ "Monégasque": weightedArray({"southern european": 9, "mixed race": 1}),
+ "Montenegrin": weightedArray({white: 9, "mixed race": 1}),
+ "Cambodian": weightedArray({asian: 9, "mixed race": 1}),
+ "Cameroonian": weightedArray({black: 9, "mixed race": 1}),
+ "Gabonese": weightedArray({black: 9, "mixed race": 1}),
+ "Djiboutian": weightedArray({black: 8, "middle eastern": 2, "mixed race": 1}),
+ "Greenlandic": weightedArray({amerindian: 40, white: 9, "mixed race": 1}),
+ "Tuvaluan": weightedArray({"pacific islander": 9, "mixed race": 1}),
+ "Zambian": weightedArray({black: 9, "mixed race": 1}),
+ "Albanian": weightedArray({white: 9, "mixed race": 1}),
+ "Bruneian": weightedArray({malay: 30, asiaa: 12, "indo-aryan": 8, "mixed race": 1}),
+ "Singaporean": weightedArray({asian: 30, malay: 12, "indo-aryan": 8, "mixed race": 1}),
"": weightedArray({white: 9, "mixed race": 1}), /* default mix */
/* The following two are NOT in the game, but were referenced in NationalityToRace */
"Croatian": weightedArray({white: 49, "mixed race": 1}),
@@ -201,31 +219,31 @@
<<set setup.recruiterCareers = ["a military recruiter", "a club recruiter", "a college scout", "a girl scout", "a missionary", "a cult leader", "a political activist"]>> /* pregmod */
-<<set setup.baseNationalities = ["American", "Afghan", "Algerian", "Argentinian", "Armenian", "Australian", "Austrian", "Bangladeshi", "Belgian", "Bolivian", "Brazilian", "British", "Burmese", "Canadian", "Chilean", "Chinese", "Czech", "Colombian", "Congolese", "Cuban", "Danish", "Dutch", "Egyptian", "Emirati", "Estonian", "Ethiopian", "Filipina", "Finnish", "French", "German", "Ghanan", "Greek", "Guatemalan", "Haitian", "Hungarian", "Icelandic", "Indonesian", "Indian", "Iranian", "Iraqi", "Italian", "Irish", "Israeli", "Jamaican", "Japanese", "Jordanian", "Kazakh", "Kenyan", "Korean", "Lebanese", "Libyan", "Lithuanian", "Malaysian", "Malian", "Mexican", "Moroccan", "Nepalese", "a New Zealander", "Nigerian", "Norwegian", "Omani", "Pakistani", "Peruvian", "Polish", "Portuguese", "Puerto Rican", "Romanian", "Russian", "Saudi", "Serbian", "Slovak", "South African", "Spanish", "Sudanese", "Swedish", "Swiss", "Tanzanian", "Thai", "Tunisian", "Turkish", "Ugandan", "Ukrainian", "Uzbek", "Venezuelan", "Vietnamese", "Yemeni", "Zimbabwean", "Belarusian", "Dominican", "Scottish"]>>
+<<set setup.baseNationalities = ["Afghan", "Albanian", "Algerian", "American", "Argentinian", "Armenian", "Australian", "Austrian", "Bangladeshi", "Belgian", "Bermudian", "Bolivian", "Brazilian", "British", "Bruneian", "Burmese", "Cambodian", "Cameroonian", "Canadian", "Chilean", "Chinese", "Colombian", "Congolese", "Cuban", "Czech", "Danish", "Dutch", "Egyptian", "Emirati", "Estonian", "Ethiopian", "Filipina", "Finnish", "French", "Gabonese", "German", "Ghanan", "Greek", "Greenlandic", "Guatemalan", "Haitian", "Hungarian", "Icelandic", "Indian", "Indonesian", "Iranian", "Iraqi", "Irish", "Israeli", "Italian", "Jamaican", "Japanese", "Jordanian", "Kazakh", "Kenyan", "Korean", "Lebanese", "Libyan", "Lithuanian", "Malaysian", "Malian", "Marshallese", "Mexican", "Monégasque", "Montenegrin", "Moroccan", "Nepalese", "a New Zealander", "Nigerian", "Norwegian", "Omani", "Pakistani", "Peruvian", "Polish", "Portuguese", "Puerto Rican", "Romanian", "Russian", "Sammarinese", "Saudi", "Serbian", "Singaporean", "Slovak", "South African", "Spanish", "Sudanese", "Swedish", "Swiss", "Syrian", "Tanzanian", "Thai", "Tunisian", "Turkish", "Ugandan", "Ukrainian", "Uruguayan", "Uzbek", "Venezuelan", "Vietnamese", "Yemeni", "Zimbabwean", "Belarusian", "Dominican", "Scottish"]>>
-<<set setup.whiteNationalities = ["American", "Argentinian", "Australian", "Austrian", "Belarusian", "Belgian", "Brazilian", "British", "Canadian", "Chilean", "Czech", "Danish", "Dutch", "Estonian", "Finnish", "French", "German", "Hungarian", "Icelandic", "Irish", "Israeli", "Italian", "Lithuanian", "Norwegian", "Polish", "Portuguese", "Romanian", "Russian", "Scottish", "Serbian", "Slovak", "South African", "Swedish", "Swiss", "Ukrainian", "a New Zealander"]>>
+<<set setup.whiteNationalities = ["Albanian", "American", "Argentinian", "Australian", "Austrian", "Belgian", "Bermudian", "Brazilian", "British", "Canadian", "Chilean", "Czech", "Danish", "Djiboutian", "Dutch", "Estonian", "Finnish", "French", "German", "Greenlandic", "Hungarian", "Icelandic", "Irish", "Israeli", "Italian", "Lithuanian", "Montenegrin", "a New Zealander", "Norwegian", "Polish", "Romanian", "Russian", "Serbian", "Slovak", "South African", "Swiss", "Ukrainian", "Uruguayan", "Belarusian", "Scottish"]>>
-<<set setup.asianNationalities = ["American", "Australian", "Burmese", "Chinese", "Filipina", "Indonesian", "Japanese", "Kazakh", "Korean", "Malaysian", "Nepalese", "Saudi", "Thai", "Uzbek", "Vietnamese"]>>
+<<set setup.asianNationalities = ["American", "Australian", "Bruneian", "Burmese", "Cambodian", "Chinese", "Filipina", "Indonesian", "Japanese", "Kazakh", "Korean", "Malaysian", "Nepalese", "Saudi", "Singaporean", "Thai", "Uzbek", "Vietnamese"]>>
-<<set setup.latinaNationalities = ["American", "Argentinian", "Bolivian", "Brazilian", "Chilean", "Colombian", "Cuban", "Guatemalan", "Mexican", "Peruvian", "Puerto Rican", "Venezuelan"]>>
+<<set setup.latinaNationalities = ["American", "Argentinian", "Bolivian", "Brazilian", "Chilean", "Colombian", "Cuban", "Guatemalan", "Mexican", "Peruvian", "Puerto Rican", "Uruguayan", "Venezuelan"]>>
-<<set setup.middleeasternNationalities = ["Afghan", "Algerian", "American", "Egyptian", "Emirati", "Ethiopian", "French", "German", "Iraqi", "Israeli", "Italian", "Jordanian", "Lebanese", "Libyan", "Malian", "Moroccan", "Omani", "Saudi", "Sudanese", "Swedish", "Tunisian", "Turkish", "Yemeni"]>>
+<<set setup.middleeasternNationalities = [ "Afghan", "Algerian", "American", "Djiboutian", "Egyptian", "Emirati", "Ethiopian", "French", "German", "Iraqi", "Israeli", "Italian", "Jordanian", "Lebanese", "Libyan", "Malian", "Moroccan", "Omani", "Saudi", "Sudanese", "Swedish", "Syrian", "Tunisian", "Turkish", "Yemeni"]>>
-<<set setup.blackNationalities = ["American", "Australian", "Brazilian", "Congolese", "Cuban", "Dominican", "Egyptian", "Ethiopian", "French", "German", "Ghanan", "Haitian", "Jamaican", "Kenyan", "Malian", "Moroccan", "Nigerian", "Saudi", "South African", "Sudanese", "Swedish", "Tanzanian", "Ugandan", "Yemeni", "Zimbabwean"]>>
+<<set setup.blackNationalities = ["American", "Australian", "Bermudian", "Brazilian", "Cameroonian", "Congolese", "Cuban", "Djiboutian", "Egyptian", "Ethiopian", "French", "Gabonese", "German", "Ghanan", "Haitian", "Jamaican", "Kenyan", "Malian", "Moroccan", "Nigerian", "Saudi", "South African", "Sudanese", "Swedish", "Tanzanian", "Ugandan", "Yemeni", "Zambian", "Zimbabwean", "Dominican"]>>
-<<set setup.indoaryanNationalities = ["Afghan", "Armenian", "Bangladeshi", "British", "Burmese", "Emirati", "Hungarian", "Indian", "Iranian", "Kazakh", "Nepalese", "Omani", "Pakistani", "Romanian", "Slovak"]>>
+<<set setup.indoaryanNationalities = ["Afghan", "Armenian", "Bangladeshi", "British", "Bruneian", "Burmese", "Emirati", "Hungarian", "Indian", "Iranian", "Kazakh", "Nepalese", "Omani", "Pakistani", "Romanian", "Singaporean", "Slovak"]>>
-<<set setup.pacificislanderNationalities = ["Filipina", "Indonesian", "a New Zealander"]>>
+<<set setup.pacificislanderNationalities = ["Filipina", "Indonesian", "Marshallese", "a New Zealander", "Tuvaluan"]>>
-<<set setup.malayNationalities = ["Filipina", "Indonesian", "Malaysian", "Thai"]>>
+<<set setup.malayNationalities = ["Bruneian", "Filipina", "Indonesian", "Malaysian", "Singaporean", "Thai"]>>
-<<set setup.amerindianNationalities = ["American", "Bolivian", "Brazilian", "Canadian", "Guatemalan", "Mexican", "Peruvian"]>>
+<<set setup.amerindianNationalities = ["American", "Bolivian", "Brazilian", "Canadian", "Greenlandic", "Guatemalan", "Mexican", "Peruvian"]>>
-<<set setup.southerneuropeanNationalities = ["French", "Greek", "Italian", "Spanish"]>>
+<<set setup.southerneuropeanNationalities = ["French", "Greek", "Italian", "Monégasque", "Portuguese", "Sammarinese", "Spanish"]>>
-<<set setup.semiticNationalities = ["Armenian", "Egyptian", "Ethiopian", "Ghanan", "Iranian", "Iraqi", "Israeli", "Jordanian", "Kazakh", "Lebanese", "Pakistani", "Romanian", "Spanish", "Tanzanian", "Turkish", "Yemeni"]>>
+<<set setup.semiticNationalities = ["Armenian", "Egyptian", "Ethiopian", "Ghanan", "Iranian", "Iraqi", "Israeli", "Jordanian", "Kazakh", "Lebanese", "Pakistani", "Romanian", "Spanish", "Syrian", "Tanzanian", "Turkish", "Yemeni"]>>
@@ -510,6 +528,57 @@
<<set setup.malianSlaveNames = ["Adame", "Aminata", "Aoua", "Astan", "Aïda", "Bako", "Diéné", "Djenebou", "Fatalmoudou", "Fatoumata", "Hamchétou", "Inna", "Kadiatou", "Mariam", "Mariatou", "Meiya", "Nare", "Nassira", "Naîgnouma", "Oumou", "Rahamatou", "Sidibé", "Touty"]>>
<<set setup.malianSlaveSurnames = ["Ba", "Baba", "Bagayoko", "Bah", "Bamba", "Barry", "Berthe", "Bore", "Camara", "Ciss", "Cisse", "Coulibaly", "Daffe", "Dembele", "Diabate", "Diaby", "Diakit", "Diakite", "Diallo", "Diane", "Diarra", "Diawara", "Dicko", "Diop", "Dolo", "Doucoure", "Dougnon", "Doumbia", "Drame", "Fall", "Fane", "Faye", "Fofana", "Gueye", "Guindo", "Haidara", "Issa", "Kaba", "Kamissoko", "Kane", "Kante", "Kassambara", "Kassogue", "Kebe", "Keita", "Koita", "Kon", "Konate", "Kondo", "Kone", "Kouma", "Ly", "Magassouba", "Maiga", "Mali", "Mariko", "Mounkoro", "Niangado", "Ouattara", "Ouologuem", "Sacko", "Samake", "Sangare", "Sanogo", "Sare", "Sibide", "Sissoko", "Sogoba", "Sogodogo", "Soumare", "Sous", "Sow", "Sy", "Sylla", "Tamboura", "Tandia", "Tangara", "Teme", "Thera", "Togo", "Togola", "Tolo", "Tounkara", "Toure", "Traore"]>>
+<<set setup.sammarineseSlaveNames = ["Alessandra", "Anita", "Anna", "Antonella", "Arianna", "Assunta", "Cielia", "Daniela", "Domenica", "Emanuela", "Federica", "Gabrysia", "Gloriana", "Lorella", "Maria", "Martina", "Milena", "Patrizia", "Rosa", "Simona", "Valentina", "Valeria", "Vanessa"]>>
+<<set setup.sammarineseSlaveSurnames = ["Benedettini", "Berardi", "Berti", "Bollini", "Casadei", "Casali", "Ceccoli", "Chiaruzzi", "Ciavatta", "Conti", "della Valle", "Fabbri", "Felici", "Forcellini", "Gasperoni", "Giardi", "Guidi", "Mazza", "Montanari", "Mularoni", "Pelliccioni", "Raschi", "Righi", "Rossi", "Selva", "Stefanelli", "Tamagnini", "Terenzi", "Ugolini", "Valentini", "Zafferani", "Zanotti", "Zonzini"]>>
+
+<<set setup.marshalleseSlaveNames = ["Ann", "Atama", "Belisa", "Cathy", "Celine", "Colleen", "Elizabeth", "Emlain", "Gerlin", "Gina", "Helchyina", "Hemina", "Hilary", "Hilda", "Julianne", "Justina", "Karen", "Kathy", "Leah", "Lijon", "Mariana", "Marie", "Mattie", "May", "Mayoli", "Quitugua", "Rosita", "Rubitha", "Runica", "Stacey", "Tamara", "Victoria"]>>
+<<set setup.marshalleseSlaveSurnames = ["Abon", "Alex", "Alfred", "Alik", "Anien", "Anjain", "Balos", "Benjamin", "Capelle", "Clement", "David", "de Brum", "Dribo", "Enos", "George", "Gideon", "Harry", "Henry", "Jack", "Jacklick", "Jacob", "James", "Jitiam", "Joel", "John", "Johnny", "Johnson", "Joseph", "Kabua", "Kaious", "Kattil", "Keju", "Lang", "Langidrik", "Langrine", "Latdrik", "Loeak", "Lokeijak", "Luther", "Matthew", "Milne", "Ned", "Paul", "Peter", "Phillip", "Ralpho", "Riklon", "Robert", "Samson", "Samuel", "Silk", "Thomas", "Tibon"]>>
+
+<<set setup.syrianSlaveNames = ["Aaliyah", "Amal", "Amena", "Amira", "Anisa", "Asma", "Ayla", "Azza", "Bayan", "Bushra", "Caresse", "Dia", "Diana", "Dima", "Dina", "Fadwa", "Fatima", "Ghada", "Ghofrane", "Hala", "Hamida", "Heba", "Ikram", "Lina", "Maha", "Malak", "Malva", "Marella", "Maryana", "Maya", "Muna", "Najat", "Nesreen", "Raya", "Roba", "Samar", "Seba", "Selda", "Thanaa", "Thuraia", "Ulfat", "Yana", "Yusra", "Zaina", "Zein"]>>
+<<set setup.syrianSlaveSurnames = ["Abbas", "Abd", "Abo", "Abou", "Abu", "Ahmad", "Akkad", "Almasri", "Awad", "Barakat", "Bitar", "Darwish", "Deeb", "Diab", "Fares", "Haddad", "Hafez", "Haj", "Halabi", "Hallak", "Hamdan", "Hasan", "Homsi", "Hussein", "Ibrahim", "Ismail", "Issa", "Kabbani", "Khalil", "Khatib", "Khoury", "Maher", "Mahmoud", "Man", "Mansour", "Masri", "Mohamad", "Mohamed", "Mohammad", "Najjar", "Nasser", "Omar", "Othman", "Ramadan", "Saad", "Sabbagh", "Saleh", "Salem", "Salloum", "Salman", "Samman", "Sy", "Younes", "Yousef", "Zein"]>>
+
+<<set setup.bermudianSlaveNames = ["Akilah", "Alison", "Angela", "Ann", "Arantxa", "Ashley", "Chelsea", "Diana", "Gina", "Heather", "Isabella", "Jennifer", "Kiera", "Krystie", "Lana", "Lena", "Lois", "Marjorie", "Mary", "Michelle", "Nicole", "Oona", "Pamela", "Phyllis", "Rebecca", "Stephanie", "Summer", "Teresa", "Thelma"]>>
+<<set setup.bermudianSlaveSurnames = ["Bean", "Brown", "Burgess", "Butterfield", "Cann", "Darrell", "Davis", "Desilva", "Dill", "Douglas", "Fox", "Furbert", "Gibbons", "Hollis", "Jones", "King", "Lambert", "Minors", "Outerbridge", "Pearman", "Richardson", "Roberts", "Robinson", "Simmons", "Simons", "Smith", "Swan", "Taylor", "Thomas", "Trott", "Tucker", "White", "Williams", "Wilson", "Young"]>>
+
+<<set setup.uruguayanSlaveNames = ["Abril", "Agustina", "Amalia", "Amanda", "Ana", "Andrea", "Anna", "Bárbara", "Camila", "Concepción", "Cristina", "Delmira", "Elli", "Florencia", "Francisca", "Gabriela", "Juana", "Julia", "Julieta", "Laura", "Lucia", "Malena", "Maria", "MarÃa", "Marosa", "Marta", "Micaela", "Natalia", "Nina", "Paula", "Pilar", "Raquel", "Sofia", "Susana", "Valentina"]>>
+<<set setup.uruguayanSlaveSurnames = ["Acosta", "Alvarez", "Cabrera", "Cardozo", "Castro", "Correa", "da Silva", "Diaz", "Fernandez", "Ferreira", "Garcia", "Gomez", "Gonzalez", "Hernandez", "Lopez", "Machado", "Martinez", "Mendez", "Moreira", "Nuñez", "Olivera", "Pereira", "Pereyra", "Perez", "Pintos", "Rivero", "Rodriguez", "Sanchez", "Silva", "Silveira", "Silvera", "Sosa", "Suarez", "Varela", "Vazquez", "Vidal", "Viera"]>>
+
+<<set setup.monegasqueSlaveNames = ["Adriana", "Alexandra", "Angélique", "Anne-Marie", "Anne", "Camille", "Charlene", "Charlotte", "Claudia", "Elisabeth", "Elodie", "Fabienne", "Frédérika", "Hélène", "Hera", "Laurie", "Marcelle", "Marie", "Miranda", "Pauline", "Serena", "Stéphanie", "Tania", "Victoria"]>>
+<<set setup.monegasqueSlaveSurnames = ["Antognelli", "Benoit", "Bernardi", "Blade", "Blanc", "Bonnet", "Bruno", "Camara", "Cellario", "Costa", "Diallo", "Doria", "Fissore", "Fontaine", "Garcia", "Gastaud", "Gautier", "Gomez", "Hernandez", "Lanteri", "Legrand", "Lopez", "Marques", "Martinez", "Mathieu", "Mendes", "Michel", "Monte-Carlo", "Morel", "Ouedraogo", "Pastor", "Pastorelli", "Pierre", "Pizio", "Ramirez", "Rey", "Rodriguez", "Rossi", "Roux", "Sanchez", "Toure", "Viale"]>>
+
+<<set setup.montenegrinSlaveNames = ["Ada", "AnÄ‘e", "Anka", "Birka", "Bojana", "Borka", "Bosa", "Buda", "Budimirka", "Bula", "ÄŒeda", "ÄŒedomila", "Ćetna", "Cmiljana", "Danojla", "Dara", "Darinka", "Äekna", "Äina", "Dokna", "ÄorÄ‘ina", "Draga", "Dragica", "Draginja", "Dubravka", "Dunja", "ÃurÄ‘a", "ÄurÄ‘ina", "DuÅ¡anka", "DuÅ¡ka", "DuÅ¡na", "Ema", "Femija", "Gara", "Gina", "Gojislava", "Gora", "Gorana", "Gorde", "Gorka", "Gospava", "Grana", "Granica", "Groja", "Grozdana", "Ikonija", "Ilinka", "Ilosava", "Jadranka", "Janica", "Janja", "Jela", "Jelika", "Jelka", "Joka", "JoÅ¡ana", "Jova", "Julka", "Kića", "Kokna", "Kosa", "Kosara", "Koviljka", "Krstinja", "Ljeposava", "Lucija", "Lutka", "Manda", "Mara", "Marta", "Mila", "Milanka", "Milijana", "Milja", "Miljka", "MiljuÅ¡a", "Milojka", "Milosava", "Milunka", "MiluÅ¡a", "Mioljka", "Mirela", "Mirosava", "Miruna", "MiruÅ¡a", "MiÅ¡nja", "MiÅ¡ur", "Mitra", "Mladija", "Njegosava", "Novka", "Obrenija", "Pavka", "Pejka", "Pelivanka", "Perka", "Persa", "Petra", "Petrana", "PetruÅ¡a", "Plana", "Poleksija", "Radana", "Radojka", "RaduÅ¡a", "Raka", "Rosa", "Rumica", "Savka", "SinÄ‘a", "Soka", "Solumija", "Velika", "Velinka", "Veselinka", "Vida", "Vidna", "Vidosava", "Vidra", "Vinka", "Vjera", "Vukalica", "Zagorka", "Zorka", "Zorna"]>>
+<<set setup.montenegrinSlaveSurnames = ["Aleksić", "Babović", "Bakić", "Blagojević", "BoÅ¡ković", "Božović", "Bulatović", "ÄŒvorović", "Dragojević", "Ivanović", "Janković", "Joksimović", "Jovanović", "Karadžić", "Knežević", "KovaÄević", "Lazović", "Mandić", "Marković", "Martinović", "Milić", "MiloÅ¡ević", "Milović", "Minić", "Mitrović", "Montenegro", "Nikolić", "Novaković", "Obradović", "Pejović", "Perović", "PeÅ¡ić", "Petković", "Petrović", "Popović", "Radević", "Radonjić", "Radović", "Radulović", "StaniÅ¡ić", "Terzić", "TomaÅ¡ević", "Tomić", "VuÄković", "VujiÄić", "Vujović", "Vuković"]>>
+
+<<set setup.cambodianSlaveNames = ["Anchali", "Arunny", "Ary", "Bopha", "Chavy", "Chaya", "Chhay", "Chivy", "Da", "Dara", "Kiri", "Nuon", "Pheakkley", "Pisey", "Poeu", "Ponnleu", "Putrea", "Rachana", "Rachany", "Raksmei", "Rangsei", "Rasmey", "Rath", "Rathana", "Raveth", "Reach", "Reasmey", "Romduol", "Roth", "Rotha", "Rothana", "Rottana", "Roumjong", "Saley", "Samphy", "Saveth", "Serey", "Seyha", "Sikha", "Sinuon", "Sobin", "Soboen", "Socheat", "Sok", "Sokha", "Sokhanya", "Somaly", "Sophon", "Sophorn", "Soportevy", "Soriya", "Sorpheny", "Sourkea", "Srey", "Sros", "Suon", "Suorsdey", "Tevvy", "Thavary", "Theary", "Thida", "Thyda", "Tina", "Toch", "Touch", "Vanna", "Vimean", "Visal"]>>
+<<set setup.cambodianSlaveSurnames = ["An", "Bun", "Chea", "Chhay", "Chhim", "Chhun", "Chin", "Chum", "Eng", "Hak", "Heang", "Heng", "Him", "Hok", "Hong", "Hor", "Hun", "Im", "Keo", "Kong", "Lay", "Leang", "Leng", "Lim", "Ly", "Makara", "Mao", "Meas", "Men", "Meng", "Ouk", "Pen", "Phan", "Pich", "Pov", "Prak", "Ros", "Sam", "San", "Sao", "Say", "Seng", "Sim", "Sin", "So", "Sok", "Som", "Son", "Song", "Sorn", "Srey", "Sun", "Tan", "Tang", "Tep", "Touch", "Try", "Un", "Ung", "Va", "Van", "Vann", "Vong", "Yim"]>>
+
+<<set setup.cameroonianSlaveNames = ["Aazzi", "Abagbe", "Abagebe", "Angèle", "Anne-Marie", "Anne", "Arielle", "Audrey", "Bianca", "Carine", "Célestine", "Chantal", "Charlotte", "Delphine", "Dorothy", "Elisabeth", "Esther", "Eve", "Evelyne", "Florence", "Françoise", "Frieda", "Germaine", "Grace", "Isabelle", "Jamila", "Jamilia", "Jamilla", "Jamille", "Jasmine", "Jeanne", "Jumoke", "Kenya", "Kesi", "Kissa", "Marie", "Marjani", "Nadine", "Naomi", "Obama", "Okawa", "Oni", "Raziya", "Rhodesia", "Rosine", "Sahndra", "Suzanne", "Tatiana", "Thérèse", "Tracy", "Vanessa", "Werewere", "Yaou", "Zahara", "Zuwena"]>>
+<<set setup.cameroonianSlaveSurnames = ["Akamba", "Akono", "Amougou", "Andiolo", "Atangana", "Ateba", "Belinga", "Che", "Dongmo", "Essomba", "Etoundi", "Evina", "Fotso", "Fouda", "Hamadou", "Kamdem", "Kameni", "Kamga", "Kenfack", "Kengne", "Kom", "Kouam", "Mahamat", "Manga", "Mba", "Mbah", "Mballa", "Mbarga", "Mengue", "Messi", "Mohamadou", "Moussa", "Mvogo", "Mvondo", "Nana", "Ndi", "Ndongo", "Nga", "Ngah", "Ngassa", "Ngo", "Ngono", "Ngwa", "Njoya", "Noah", "Onana", "Oumarou", "Owona", "Simo", "Tagne", "Talla", "Tchinda", "Wandji", "Ze"]>>
+
+<<set setup.gaboneseSlaveNames = ["Adama", "Aicha", "Aida", "Anne", "Arla", "Brunilla", "Catherine", "Channa", "Christelle", "Desy", "Dominique", "Édith", "Edna", "Erica", "Filiane", "Geraldine", "Grace", "Honorine", "Iris", "Khadija", "Lana", "Laure", "Lisa", "Lucie", "Marie", "Nicole", "Nyangue", "Nyoun", "Odette", "Ornella", "Patience", "Pulchérie", "Rose", "Serena", "Sindiély", "Sylvia", "Vanessa", "Viviane", "Yasmine", "Yvette"]>>
+<<set setup.gaboneseSlaveSurnames = ["Abessolo", "Ada", "Akendengue", "Andeme", "Angue", "Assoumou", "Bekale", "Bouassa", "Boulingui", "Boussougou", "Diallo", "Diop", "Edou", "Ella", "Emane", "Engoang", "Essono", "Eyang", "Ibinga", "Ilendou", "Kassa", "Kombila", "Koumba", "Maganga", "Mavoungou", "Mba", "Mbadinga", "Mbina", "Mboumba", "Mengue", "Meye", "Mezui", "Mihindou", "Minko", "Mombo", "Moundounga", "Mounguengui", "Moussavou", "Moussounda", "Moutsinga", "Ndiaye", "Ndong", "Ngoma", "Ngoua", "Nguema", "Ntoutoume", "Ntsame", "Nzamba", "Nze", "Nziengui", "Obame", "Obiang", "Ogandaga", "Ogoula", "Onanga", "Ondo", "Ovono", "Owono", "Pambo", "Traore", "Wora"]>>
+
+<<set setup.djiboutianSlaveNames = ["Aicha", "Aïcha", "Amandine", "Asly", "Asma", "Ayane", "Chouchii", "Fathia", "Fatouma", "Haïbado", "Hasna", "Hawa", "Hodal", "Hodan", "Idil", "Ikram", "Kadra", "Khadrita", "Lidvine", "Mariam", "Mouna", "Nadan", "Nadia", "Noemie", "Rara", "Roda", "Sally", "Sophie", "Zeinab", "Zourah"]>>
+<<set setup.djiboutianSlaveSurnames = ["Abdallah", "Abdi", "Abdillahi", "Abdo", "Aden", "Bile", "Cabdi", "Cali", "Daher", "Dahir", "Daoud", "Deka", "Djama", "Elmi", "Farah", "Haji", "Hashi", "Hersi", "Houmed", "Houssein", "Hussein", "Ibrahim", "Idriss", "Ismael", "Ismail", "Issa", "Jama", "Mahamed", "Mahamoud", "Mohamed", "Mohamoud", "Moussa", "Nour", "Omar", "Osman", "Robleh", "Said", "Saleh", "Wais", "Youssouf", "Yusuf", "Yuusuf"]>>
+
+<<set setup.greenlandicSlaveNames = ["Aaja", "Aajunnguaq", "Agnethe", "Aka", "Ãmak", "Amanda", "Augusta", "Dorte", "Dorthe", "Emma", "Erika", "Erna", "Gertrud", "Juliane", "Julie", "Kâlat", "Kâlîna", "Karla", "Kátalît", "Katrine", "Kîsta", "Kîstat", "Kîstîna", "KÃtôra", "Kúngo", "Kûno", "Laakki", "Laannguaq", "Lãke", "Lãnguaĸ", "LÃpÃka", "Lippikka", "Maliina", "Mimi", "Naja", "Nikkuliinnguaq", "Nive", "Nivi", "Nukaaka", "Paarnannguaq", "Paarnaq", "Sara", "Sofie", "Tippu", "Tuula", "Uiloq", "Vivi"]>>
+<<set setup.greenlandicSlaveSurnames = ["Abelsen", "Andersen", "Berthelsen", "Brandt", "Broberg", "Christensen", "Christiansen", "Davidsen", "Egede", "Fleischer", "Frederiksen", "Geisler", "Hansen", "Heilmann", "Holm", "Jakobsen", "Jensen", "Johansen", "Josefsen", "Kleist", "Knudsen", "Kristensen", "Kristiansen", "Larsen", "Lennert", "Lund", "Lyberth", "Lynge", "Møller", "Nielsen", "Olsen", "Pedersen", "Petersen", "Poulsen", "Rasmussen", "Rosing", "Simonsen", "Sørensen"]>>
+
+<<set setup.tuvaluanSlaveNames = ["Aigafealofani", "Asenate", "Eselealofa", "Ilaisita", "Kaila", "Kalautia", "Kanake", "Kenese", "Lagi", "Lea", "Loukite", "Naama", "Naomi", "Pelenike", "Penieli", "Penina", "Pepapeti", "Perenike", "Puakena", "Pulafagau", "Salilo", "Seepa", "Sikinala", "Siliva", "Sina", "Sualua", "Tausaga", "Upumoni", "Vaimaila"]>>
+<<set setup.tuvaluanSlaveSurnames = ["Apinelu", "Elisala", "Ene", "Faiva", "Fili", "Hauma", "Homasi", "Ioane", "Irata", "Jane", "Kilima", "Kitiona", "Kumar", "Laupepa", "Lee", "Lusama", "Manao", "Maumau", "Momo", "Mono", "Nakala", "Napoe", "Natano", "Paeniu", "Panapa", "Penitusi", "Pese", "Petaia", "Pita", "Pokia", "Porter", "Puti", "Sakaio", "Smith", "Sogivalu", "Stanley", "Talu", "Tapasei", "Tauati", "Tavai", "Teo", "Tinilau", "Tomu", "Valoaga"]>>
+
+<<set setup.zambianSlaveNames = ["Alice", "Angela", "Bertha", "Betty", "Beverly", "Catherine", "Charlotte", "Cheyenne", "Chifundo", "Christine", "Cyndia", "Dalitso", "Dorcas", "Edith", "Esther", "Gwendoline", "Hellen", "Inonge", "Jean", "Jennifer", "Joyce", "Kitana", "Mary", "Masozi", "Mavuto", "Nabanji", "Nkandu", "Nthanda", "Roberta", "Robyn", "Salma", "Sara", "Susan", "Taonga", "Thandiwe", "Vera", "Victoria", "Winfridah", "Yamikani"]>>
+<<set setup.zambianSlaveSurnames = ["Banda", "Bwalya", "Chama", "Chanda", "Chileshe", "Chilufya", "Chirwa", "Chisanga", "Chisenga", "Chishimba", "Daka", "Gondwe", "Kabwe", "Kangwa", "Kasonde", "Katongo", "Kunda", "Lungu", "Mbewe", "Moyo", "Mtonga", "Mubanga", "Mudenda", "Mukuka", "Mulenga", "Mumba", "Musonda", "Mutale", "Mvula", "Mwaba", "Mwale", "Mwamba", "Mwansa", "Mwanza", "Mwape", "Mweemba", "Mwenya", "Mwewa", "Mwila", "Ndhlovu", "Ngoma", "Ngulube", "Nyirenda", "Phiri", "Sakala", "Sampa", "Siame", "Sikazwe", "Sinkala", "Sinyangwe", "Tembo", "Zimba", "Zulu"]>>
+
+<<set setup.albanianSlaveNames = ["Afrodita", "Alban", "Albana", "Altea", "Ana", "Ann", "Arbena", "Ariana", "Arjana", "Arjeta", "Arta", "Besa", "Besarta", "Besiana", "Blerta", "Blerte", "Bora", "Bukuroshe", "Denisa", "Donika", "Donjeta", "Doruntina", "Earta", "Eda", "Edona", "Entela", "Fatime", "Fatlinda", "Flutura", "Gentiana", "Gjevahire", "Kaltrina", "Klea", "Lule", "Marigona", "Marsela", "Megi", "Mimoza", "Mirjeta", "Odeta", "Pranvera", "Pranvere", "Shqiponja", "Sindi", "Suela", "Thëllënza", "Valbona", "Vlora", "Zamira", "Zamire"]>>
+<<set setup.albanianSlaveSurnames = ["Abazi", "Ademi", "Ahmeti", "Aliaj", "Aliu", "Bajrami", "Balla", "Bardhi", "Basha", "Beqiri", "Berisha", "Bytyqi", "Cela", "Dervishi", "Duka", "Elezi", "Gashi", "Gjini", "Gjoka", "Gjoni", "Halili", "Hasani", "Hoti", "Hoxha", "Hysa", "Hyseni", "Ibrahimi", "Islami", "Isufi", "Kastrati", "Kelmendi", "Koci", "Kola", "Krasniqi", "Kryeziu", "Kurti", "Leka", "Malaj", "Marku", "Mehmeti", "Mema", "Morina", "Muca", "Mustafa", "Osmani", "Prifti", "Rama", "Ramadani", "Rexhepi", "Sadiku", "Salihu", "Selimi", "Shabani", "Shala", "Shehu", "Sinani", "Spahiu", "Sula", "Zeneli"]>>
+
+<<set setup.bruneianSlaveNames = ["Afiqah", "Aisha", "Arin", "Azimatul", "Batrisyia", "Eilna", "Eyah", "Ezzah", "Fadhila", "Fatih", "Fatima", "Fatimah", "Fatin", "Hajah", "Haji", "Hakimah", "Hani", "Insyirah", "Izzati", "Jannah", "Khadija", "Liyana", "Majeedah", "Masna", "Mawar", "Melati", "Najibah", "Qistina", "Ramizah", "Salbiah", "Saleha", "Sarah", "Winna", "Zaidirah", "Zalfa"]>>
+<<set setup.bruneianSlaveSurnames = ["Abd", "Abdul", "Abdullah", "Abu", "Ahmad", "Ali", "Ang", "Awang", "Aziz", "Bakar", "Chai", "Chin", "Chong", "Chua", "Damit", "Daud", "Foo", "Goh", "Haji", "Hamid", "Hashim", "Hassan", "Ho", "Ibrahim", "Idris", "Ismail", "Khan", "Kong", "Kumar", "Lai", "Leong", "Liew", "Lim", "Mahmud", "Mohamad", "Mohamed", "Mohammad", "Mohammed", "Ng", "Omar", "Ong", "Othman", "Rahman", "Ramli", "Rosli", "Salleh", "Sim", "Sulaiman", "Tan", "Teo", "Wan", "Yahya", "Yap", "Yong", "Yusof", "Zainal", "Zaini"]>>
+
+<<set setup.singaporeanSlaveNames = ["Adina", "Agnes", "Amanda", "Aminah", "Balli", "Dawn", "Diyanah", "Ellen", "Fadilah", "Fann", "Fatimah", "Fatin", "Fiona", "Gina", "Iris", "Jade", "Janet", "Janice", "Jazreen", "Jean", "Jennifer", "Joanne", "Joyce", "Jun", "Khym", "Kim", "Kym", "Lim", "Linda", "Liyann", "Margaret", "Meijiao", "Michelle", "Min", "Nadya", "Naomi", "Nora", "Nuraliza", "Puteri", "Rachel", "Regina", "Rena", "Rin", "Selena", "Sharifah", "Siti", "Sofia", "Syiqah", "Sylvia", "Topaz", "Vanessa", "Wangi", "Wati", "Ziqian", "Zoe"]>>
+<<set setup.singaporeanSlaveSurnames = ["Ang", "Chan", "Chee", "Chen", "Cheng", "Cheong", "Chew", "Chia", "Chin", "Chong", "Choo", "Chua", "Foo", "Goh", "Heng", "Ho", "Huang", "Khoo", "Koh", "Kumar", "Lai", "Lau", "Lee", "Leong", "Li", "Liew", "Lim", "Lin", "Liu", "Loh", "Low", "Ng", "Ong", "Pang", "Poh", "Quek", "Seah", "Sim", "Singh", "Soh", "Tan", "Tang", "Tay", "Tee", "Teo", "Toh", "Wan", "Wang", "Wee", "Wong", "Yap", "Yeo", "Yong", "Zhang"]>>
+
<<set setup.cowSlaveNames = ["Anna", "Annabelle", "Annie", "Arabella", "Baby", "Bella", "Bella", "Bella", "Bertha", "Bessie", "Betty Sue", "Big Mac", "Blue", "Brown Cow", "Candie", "Cinnamon", "Clarabelle", "Clover", "Cocoa", "Cookie", "Cowlick", "Cupcake", "Dahlia", "Daisy", "Darla", "Diamond", "Dorothy", "Ella", "Emma", "Esmeralda", "Flower", "Gertie", "Hamburger", "Heifer", "Henrietta", "Honeybun", "Jasmayne", "Jasmine", "Lois", "Madonna", "Maggie", "Margie", "Meg", "Minnie", "Molly", "MooMoo", "Moscow", "Muffin", "Nettie", "Penelope", "Penny", "Pinky", "Precious", "Princess", "Rose", "Sasha", "Shelly", "Sugar", "Sunny", "Sunshine", "Sweetie", "Sweetpea", "Swiss Miss", "Waffles"]>>
@@ -630,6 +699,23 @@ Then pick _namePool.random(), or display those names as possible choices, or do
"Indian": setup.indianSlaveNames,
"Australian": setup.australianSlaveNames,
"a New Zealander": setup.newZealanderSlaveNames,
+ "Sammarinese": setup.sammarineseSlaveNames,
+ "Marshallese": setup.marshalleseSlaveNames,
+ "Syrian": setup.syrianSlaveNames,
+ "Bermudian": setup.bermudianSlaveNames,
+ "Uruguayan": setup.uruguayanSlaveNames,
+ "Monégasque": setup.monegasqueSlaveNames,
+ "Montenegrin": setup.montenegrinSlaveNames,
+ "Cambodian": setup.cambodianSlaveNames,
+ "Cameroonian": setup.cameroonianSlaveNames,
+ "Gabonese": setup.gaboneseSlaveNames,
+ "Djiboutian": setup.djiboutianSlaveNames,
+ "Greenlandic": setup.greenlandicSlaveNames,
+ "Tuvaluan": setup.tuvaluanSlaveNames,
+ "Zambian": setup.zambianSlaveNames,
+ "Albanian": setup.albanianSlaveNames,
+ "Bruneian": setup.bruneianSlaveNames,
+ "Singaporean": setup.singaporeanSlaveNames,
}>>
<<set setup.surnamePoolSelector = {
"American.black": setup.africanAmericanSlaveSurnames, "American.latina": setup.latinaSlaveSurnames, "American.asian": setup.asianAmericanSlaveSurnames,
@@ -723,6 +809,23 @@ Then pick _namePool.random(), or display those names as possible choices, or do
"Indian": setup.indianSlaveSurnames,
"Australian": setup.australianSlaveSurnames,
"a New Zealander": setup.newZealanderSlaveSurnames,
+ "Sammarinese": setup.sammarineseSlaveSurnames,
+ "Marshallese": setup.marshalleseSlaveSurnames,
+ "Syrian": setup.syrianSlaveSurnames,
+ "Bermudian": setup.bermudianSlaveSurnames,
+ "Uruguayan": setup.uruguayanSlaveSurnames,
+ "Monégasque": setup.monegasqueSlaveSurnames,
+ "Montenegrin": setup.montenegrinSlaveSurnames,
+ "Cambodian": setup.cambodianSlaveSurnames,
+ "Cameroonian": setup.cameroonianSlaveSurnames,
+ "Gabonese": setup.gaboneseSlaveSurnames,
+ "Djiboutian": setup.djiboutianSlaveSurnames,
+ "Greenlandic": setup.greenlandicSlaveSurnames,
+ "Tuvaluan": setup.tuvaluanSlaveSurnames,
+ "Zambian": setup.zambianSlaveSurnames,
+ "Albanian": setup.albanianSlaveSurnames,
+ "Bruneian": setup.bruneianSlaveSurnames,
+ "Singaporean": setup.singaporeanSlaveSurnames,
}>>
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 5e14b9b54538ddc6040d8f9ef774bde3c606188e..966f9e0f008d62ee37ee00afd27c0812baf44c1b 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -269,6 +269,7 @@ You should have received a copy of the GNU General Public License along with thi
<<set $showVignettes = 1>>
<<set $showAppraisal = 1>>
<<set $positionMainLinks = -1>>
+<<set $showTipsFromEncy = 1>>
<<set $displayAssignments = 1>>
<<set $sortSlavesBy = "devotion">>
<<set $sortSlavesOrder = "descending">>
@@ -327,7 +328,7 @@ You should have received a copy of the GNU General Public License along with thi
<</if>>
<<set $cash = Math.clamp(1000*Math.trunc($cash/100000), 5000, 1000000)>>
<<if $retainCareer == 0>>
- <<set $PC.career = "arcology owner">>
+ <<set $PC.career = "arcology owner", $PC.trading = 100, $PC.warfare = 100, $PC.slaving = 100, $PC.engineering = 100, $PC.medicine = 100>>
<</if>>
<<if $PC.mother > 0>>
<<set $PC.mother += 1200000>>
diff --git a/src/pregmod/widgets/slaveSummaryWidgets.tw b/src/pregmod/widgets/slaveSummaryWidgets.tw
index 853e6f8588009c9ed564208d3a315e7c07010176..3566df94ab0a63fa4ecafafa9f5bc023fdbd06b9 100644
--- a/src/pregmod/widgets/slaveSummaryWidgets.tw
+++ b/src/pregmod/widgets/slaveSummaryWidgets.tw
@@ -807,6 +807,40 @@ Release rules: _Slave.releaseRules.
Aus
<<case "a New Zealander">>
NZ
+<<case "Sammarinese">>
+ SM
+<<case "Marshallese">>
+ MI
+<<case "Syrian">>
+ Syr
+<<case "Bermudian">>
+ Ber
+<<case "Uruguayan">>
+ Uru
+<<case "Monégasque">>
+ Mnc
+<<case "Montenegrin">>
+ Mng
+<<case "Cambodian">>
+ Kam
+<<case "Cameroonian">>
+ Cam
+<<case "Gabonese">>
+ Gab
+<<case "Djiboutian">>
+ Dji
+<<case "Greenlandic">>
+ Grn
+<<case "Tuvaluan">>
+ Tuv
+<<case "Zambian">>
+ Zam
+<<case "Albanian">>
+ Alb
+<<case "Bruneian">>
+ Bru
+<<case "Singaporean">>
+ Sng
<<case "Ancient Egyptian Revivalist">>
Egy Rev
<<case "Ancient Chinese Revivalist">>
diff --git a/src/pregmod/widgets/slaveTradePresetWidgets.tw b/src/pregmod/widgets/slaveTradePresetWidgets.tw
index faf6d837cb162b54d9ef3195fdcfebebd40ac0d3..1fbd65280692a2c8738cc26fd7e4c8e7fb400677 100644
--- a/src/pregmod/widgets/slaveTradePresetWidgets.tw
+++ b/src/pregmod/widgets/slaveTradePresetWidgets.tw
@@ -3,39 +3,39 @@
/* To add presets, add <<widget "NationalityPresetName">> and define it as [[Name|passage()][$nationalities = [nationalities go here]]] */
<<widget "NationalityPresetVanillaGlobal">>
-[[Vanilla Global|passage()] [$nationalities = ["Afghan", "Afghan", "Algerian", "Algerian", "Algerian", "American", "American", "American", "American", "American", "Argentinian", "Argentinian", "Argentinian", "Armenian", "Armenian", "Australian", "Australian", "Austrian", "Austrian", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Belarusian", "Belarusian", "Belarusian", "Belarusian", "Belgian", "Belgian", "Bolivian", "Bolivian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "British", "British", "British", "Burmese", "Burmese", "Burmese", "Canadian", "Canadian", "Chilean", "Chilean", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Colombian", "Colombian", "Colombian", "Congolese", "Congolese", "Congolese", "Cuban", "Cuban", "Czech", "Czech", "Danish", "Danish", "Dominican", "Dominican", "Dominican", "Dominican", "Dutch", "Dutch", "Egyptian", "Egyptian", "Egyptian", "Emirati", "Emirati", "Estonian", "Estonian", "Ethiopian", "Ethiopian", "Ethiopian", "Filipina", "Filipina", "Filipina", "Finnish", "Finnish", "French", "French", "French", "German", "German", "German", "Ghanan", "Ghanan", "Greek", "Greek", "Guatemalan", "Guatemalan", "Haitian", "Haitian", "Hungarian", "Hungarian", "Icelandic", "Icelandic", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Iranian", "Iranian", "Iranian", "Iraqi", "Iraqi", "Irish", "Irish", "Israeli", "Israeli", "Italian", "Italian", "Italian", "Jamaican", "Jamaican", "Japanese", "Japanese", "Japanese", "Jordanian", "Jordanian", "Kazakh", "Kazakh", "Kenyan", "Kenyan", "Kenyan", "Korean", "Korean", "Korean", "Lebanese", "Lebanese", "Libyan", "Libyan", "Lithuanian", "Lithuanian", "Malaysian", "Malaysian", "Malaysian", "Malian", "Malian", "Mexican", "Mexican", "Mexican", "Mexican", "Moroccan", "Moroccan", "Nepalese", "Nepalese", "Nigerian", "Nigerian", "Nigerian", "Nigerian", "Norwegian", "Norwegian", "Omani", "Omani", "Pakistani", "Pakistani", "Pakistani", "Peruvian", "Peruvian", "Polish", "Polish", "Polish", "Portuguese", "Portuguese", "Puerto Rican", "Puerto Rican", "Romanian", "Romanian", "Russian", "Russian", "Russian", "Russian", "Saudi", "Saudi", "Scottish", "Scottish", "Serbian", "Serbian", "Slovak", "Slovak", "South African", "South African", "South African", "South African", "Spanish", "Spanish", "Spanish", "Sudanese", "Sudanese", "Sudanese", "Swedish", "Swedish", "Swiss", "Swiss", "Tanzanian", "Tanzanian", "Thai", "Thai", "Thai", "Tunisian", "Tunisian", "Turkish", "Turkish", "Turkish", "Ugandan", "Ugandan", "Ukrainian", "Ukrainian", "Ukrainian", "Uzbek", "Uzbek", "Venezuelan", "Venezuelan", "Venezuelan", "Vietnamese", "Vietnamese", "Vietnamese", "Yemeni", "Yemeni", "Zimbabwean", "Zimbabwean", "a New Zealander", "a New Zealander"]]]
+[[Vanilla Global|passage()] [$nationalities = ["Afghan", "Afghan", "Albanian", "Algerian", "Algerian", "Algerian", "American", "American", "American", "American", "American", "Argentinian", "Argentinian", "Argentinian", "Armenian", "Armenian", "Australian", "Australian", "Austrian", "Austrian", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Belarusian", "Belarusian", "Belarusian", "Belarusian", "Belgian", "Belgian", "Bolivian", "Bolivian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "British", "British", "British", "Bruneian", "Burmese", "Burmese", "Burmese", "Cambodian", "Cameroonian", "Canadian", "Canadian", "Chilean", "Chilean", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Colombian", "Colombian", "Colombian", "Congolese", "Congolese", "Congolese", "Cuban", "Cuban", "Czech", "Czech", "Danish", "Danish", "Djiboutian", "Dominican", "Dominican", "Dominican", "Dominican", "Dutch", "Dutch", "Egyptian", "Egyptian", "Egyptian", "Emirati", "Emirati", "Estonian", "Estonian", "Ethiopian", "Ethiopian", "Ethiopian", "Filipina", "Filipina", "Filipina", "Finnish", "Finnish", "French", "French", "French", "Gabonese", "German", "German", "German", "Ghanan", "Ghanan", "Greek", "Greek", "Guatemalan", "Guatemalan", "Haitian", "Haitian", "Hungarian", "Hungarian", "Icelandic", "Icelandic", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Iranian", "Iranian", "Iranian", "Iraqi", "Iraqi", "Irish", "Irish", "Israeli", "Israeli", "Italian", "Italian", "Italian", "Jamaican", "Jamaican", "Japanese", "Japanese", "Japanese", "Jordanian", "Jordanian", "Kazakh", "Kazakh", "Kenyan", "Kenyan", "Kenyan", "Korean", "Korean", "Korean", "Lebanese", "Lebanese", "Libyan", "Libyan", "Lithuanian", "Lithuanian", "Malaysian", "Malaysian", "Malaysian", "Malian", "Malian", "Marshallese", "Mexican", "Mexican", "Mexican", "Mexican", "Monégasque", "Montenegrin", "Moroccan", "Moroccan", "Nepalese", "Nepalese", "Nigerian", "Nigerian", "Nigerian", "Nigerian", "Norwegian", "Norwegian", "Omani", "Omani", "Pakistani", "Pakistani", "Pakistani", "Peruvian", "Peruvian", "Polish", "Polish", "Polish", "Portuguese", "Portuguese", "Puerto Rican", "Puerto Rican", "Romanian", "Romanian", "Russian", "Russian", "Russian", "Russian", "Sammarinese", "Saudi", "Saudi", "Scottish", "Scottish", "Serbian", "Serbian", "Singaporean", "Slovak", "Slovak", "South African", "South African", "South African", "South African", "Spanish", "Spanish", "Spanish", "Sudanese", "Sudanese", "Sudanese", "Swedish", "Swedish", "Swiss", "Swiss", "Syrian", "Tanzanian", "Tanzanian", "Thai", "Thai", "Thai", "Tunisian", "Tunisian", "Turkish", "Turkish", "Turkish", "Tuvaluan", "Ugandan", "Ugandan", "Ukrainian", "Ukrainian", "Ukrainian", "Uruguayan", "Uzbek", "Uzbek", "Venezuelan", "Venezuelan", "Venezuelan", "Vietnamese", "Vietnamese", "Vietnamese", "Yemeni", "Yemeni", "Zambian", "Zimbabwean", "Zimbabwean", "a New Zealander", "a New Zealander"]]]
<</widget>>
<<widget "NationalityPresetVanillaNA">>
-[[Vanilla North America|passage()] [$nationalities = ["American", "American", "American", "American", "American", "Canadian", "Mexican", "Mexican", "Dominican", "Dominican", "Haitian", "Cuban", "Puerto Rican", "Jamaican"]]]
+[[Vanilla North America|passage()] [$nationalities = ["American", "American", "American", "American", "American", "Canadian", "Mexican", "Mexican", "Dominican", "Dominican", "Haitian", "Cuban", "Puerto Rican", "Jamaican", "Guatemalan", "Bermudian", "Greenlandic"]]]
<</widget>>
<<widget "NationalityPresetVanillaSA">>
-[[Vanilla South America|passage()] [$nationalities = ["Brazilian", "Brazilian", "Brazilian", "Brazilian", "Argentinian", "Argentinian", "Colombian", "Colombian", "Peruvian", "Venezuelan", "Bolivian", "Chilean", "Guatemalan"]]]
+[[Vanilla South America|passage()] [$nationalities = ["Brazilian", "Brazilian", "Brazilian", "Brazilian", "Argentinian", "Argentinian", "Colombian", "Colombian", "Peruvian", "Venezuelan", "Bolivian", "Chilean", "Guatemalan", "Uruguayan"]]]
<</widget>>
<<widget "NationalityPresetVanillaME">>
-[[Vanilla Middle East|passage()] [$nationalities = ["Egyptian", "Egyptian", "Egyptian", "Iranian", "Iranian", "Saudi", "Saudi", "Turkish", "Turkish", "Lebanese", "Emirati", "Jordanian", "Omani", "Israeli", "Armenian", "Iraqi", "Afghan", "Yemeni"]]]
+[[Vanilla Middle East|passage()] [$nationalities = ["Egyptian", "Egyptian", "Egyptian", "Iranian", "Iranian", "Saudi", "Saudi", "Turkish", "Turkish", "Lebanese", "Emirati", "Jordanian", "Omani", "Israeli", "Armenian", "Iraqi", "Afghan", "Yemeni", "Syrian"]]]
<</widget>>
<<widget "NationalityPresetVanillaAfrica">>
-[[Vanilla Africa|passage()] [$nationalities = ["Nigerian", "Nigerian", "Nigerian", "South African", "South African", "South African", "Kenyan", "Kenyan", "Congolese", "Congolese", "Ethiopian", "Ethiopian", "Algerian", "Algerian", "Sudanese", "Sudanese", "Moroccan", "Ghanan", "Tunisian", "Malian", "Libyan", "Zimbabwean", "Tanzanian", "Ugandan"]]]
+[[Vanilla Africa|passage()] [$nationalities = ["Nigerian", "Nigerian", "Nigerian", "South African", "South African", "South African", "Kenyan", "Kenyan", "Congolese", "Congolese", "Ethiopian", "Ethiopian", "Algerian", "Algerian", "Sudanese", "Sudanese", "Moroccan", "Ghanan", "Tunisian", "Malian", "Libyan", "Zimbabwean", "Tanzanian", "Ugandan", "Cameroonian", "Gabonese", "Djiboutian", "Zambian"]]]
<</widget>>
<<widget "NationalityPresetVanillaAsia">>
-[[Vanilla Asia|passage()] [$nationalities = ["Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indonesian", "Indonesian", "Indonesian", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Thai", "Thai", "Vietnamese", "Vietnamese", "Korean", "Korean", "Pakistani", "Pakistani", "Filipina", "Filipina", "Japanese", "Japanese", "Burmese", "Burmese", "Malaysian", "Malaysian", "Uzbek", "Nepalese", "Kazakh"]]]
+[[Vanilla Asia|passage()] [$nationalities = ["Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indonesian", "Indonesian", "Indonesian", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Thai", "Thai", "Vietnamese", "Vietnamese", "Korean", "Korean", "Pakistani", "Pakistani", "Filipina", "Filipina", "Japanese", "Japanese", "Burmese", "Burmese", "Malaysian", "Malaysian", "Uzbek", "Nepalese", "Kazakh", "Cambodian", "Bruneian", "Singaporean"]]]
<</widget>>
<<widget "NationalityPresetVanillaEU">>
-[[Vanilla Europe|passage()] [$nationalities = ["Russian", "Russian", "Russian", "Russian", "German", "German", "German", "Belarusian", "Belarusian", "Ukrainian", "Ukrainian", "French", "French", "Italian", "Italian", "Spanish", "Spanish", "British", "British", "Polish", "Polish", "Romanian", "Lithuanian", "Irish", "Scottish", "Icelandic", "Finnish", "Greek", "Belgian", "Danish", "Czech", "Serbian", "Slovak", "Norwegian", "Dutch", "Austrian", "Swiss", "Portuguese", "Hungarian", "Estonian"]]]
+[[Vanilla Europe|passage()] [$nationalities = ["Russian", "Russian", "Russian", "Russian", "German", "German", "German", "Belarusian", "Belarusian", "Ukrainian", "Ukrainian", "French", "French", "Italian", "Italian", "Spanish", "Spanish", "British", "British", "Polish", "Polish", "Romanian", "Lithuanian", "Irish", "Scottish", "Icelandic", "Finnish", "Greek", "Belgian", "Danish", "Czech", "Serbian", "Slovak", "Norwegian", "Dutch", "Austrian", "Swiss", "Portuguese", "Hungarian", "Estonian", "Sammarinese", "Monégasque", "Montenegrin", "Albanian"]]]
<</widget>>
<<widget "NationalityPresetVanillaAU">>
-[[Vanilla Australia|passage()] [$nationalities = ["Australian", "Australian", "Australian", "a New Zealander"]]]
+[[Vanilla Australia|passage()] [$nationalities = ["Australian", "Australian", "Australian", "a New Zealander", "Marshallese", "Tuvaluan"]]]
<</widget>>
<<widget "NationalityPresetModEurope">>
-[[Europe|passage()] [$nationalities = ["Austrian", "Austrian", "Austrian", "Belgian", "Belgian", "Belgian", "Belgian", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "Danish", "Danish", "Dutch", "Dutch", "Dutch", "Dutch", "Dutch", "Dutch", "Finnish", "Finnish", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "Greek", "Greek", "Greek", "Greek", "Hungarian", "Hungarian", "Hungarian", "Irish", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Kazakh", "Kazakh", "Kazakh", "Kazakh", "Kazakh", "Lithuanian", "Norwegian", "Norwegian", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Portuguese", "Portuguese", "Portuguese", "Romanian", "Romanian", "Romanian", "Romanian", "Romanian", "Romanian", "Romanian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Scottish", "Scottish", "Serbian", "Serbian", "Slovak", "Slovak", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Swedish", "Swedish", "Swedish", "Swiss", "Swiss", "Swiss", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian"]]]
+[[Europe|passage()] [$nationalities = ["Albanian", "Austrian", "Austrian", "Austrian", "Belgian", "Belgian", "Belgian", "Belgian", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "Danish", "Danish", "Dutch", "Dutch", "Dutch", "Dutch", "Dutch", "Dutch", "Finnish", "Finnish", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "Greek", "Greek", "Greek", "Greek", "Hungarian", "Hungarian", "Hungarian", "Irish", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Kazakh", "Kazakh", "Kazakh", "Kazakh", "Kazakh", "Lithuanian", "Monégasque", "Montenegrin", "Norwegian", "Norwegian", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Portuguese", "Portuguese", "Portuguese", "Romanian", "Romanian", "Romanian", "Romanian", "Romanian", "Romanian", "Romanian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Sammarinese", "Scottish", "Scottish", "Serbian", "Serbian", "Slovak", "Slovak", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Swedish", "Swedish", "Swedish", "Swiss", "Swiss", "Swiss", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian"]]]
<</widget>>
<<widget "NationalityPresetModEastAsia">>
@@ -51,9 +51,9 @@
<</widget>>
<<widget "NationalityPresetModBrazil">>
-[[Brazil|passage()] [$nationalities = ["Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Argentinian", "Argentinian", "Colombian", "Colombian", "Peruvian", "Venezuelan", "Bolivian", "Chilean", "Guatemalan"]]]
+[[Brazil|passage()] [$nationalities = ["Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Argentinian", "Argentinian", "Colombian", "Colombian", "Peruvian", "Venezuelan", "Bolivian", "Chilean", "Guatemalan", "Uruguayan"]]]
<</widget>>
<<widget "NationalityPresetModGlobalRealism">>
-[[Global Realism|passage()] [$nationalities = ["American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "Afghan", "Afghan", "Afghan", "Afghan", "Afghan", "Afghan", "Algerian", "Algerian", "Algerian", "Algerian", "Algerian", "Algerian", "Algerian", "Argentinian", "Argentinian", "Argentinian", "Argentinian", "Argentinian", "Argentinian", "Argentinian", "Armenian", "Australian", "Australian", "Australian", "Australian", "Austrian", "Austrian", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Belarusian", "Belarusian", "Belgian", "Belgian", "Bolivian", "Bolivian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "Burmese", "Burmese", "Burmese", "Burmese", "Burmese", "Burmese", "Burmese", "Burmese", "Burmese", "Canadian", "Canadian", "Canadian", "Canadian", "Canadian", "Canadian", "Chilean", "Chilean", "Chilean", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Czech", "Czech", "Colombian", "Colombian", "Colombian", "Colombian", "Colombian", "Colombian", "Colombian", "Colombian", "Congolese", "Cuban", "Cuban", "Danish", "Dominican", "Dominican", "Dutch", "Dutch", "Dutch", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Emirati", "Emirati", "Estonian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Finnish", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "Ghanan", "Ghanan", "Ghanan", "Ghanan", "Ghanan", "Greek", "Greek", "Guatemalan", "Guatemalan", "Guatemalan", "Haitian", "Haitian", "Hungarian", "Hungarian", "Icelandic", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Iranian", "Iranian", "Iranian", "Iranian", "Iranian", "Iranian", "Iranian", "Iranian", "Iranian", "Iranian", "Iranian", "Iranian", "Iranian", "Iraqi", "Iraqi", "Iraqi", "Iraqi", "Iraqi", "Iraqi", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Irish", "Israeli", "Israeli", "Jamaican", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Jordanian", "Jordanian", "Kazakh", "Kazakh", "Kazakh", "Kenyan", "Kenyan", "Kenyan", "Kenyan", "Kenyan", "Kenyan", "Kenyan", "Kenyan", "Korean", "Korean", "Korean", "Korean", "Korean", "Korean", "Korean", "Korean", "Korean", "Korean", "Korean", "Korean", "Lebanese", "Libyan", "Lithuanian", "Malaysian", "Malaysian", "Malaysian", "Malaysian", "Malaysian", "Malian", "Malian", "Malian", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Moroccan", "Moroccan", "Moroccan", "Moroccan", "Moroccan", "Moroccan", "Nepalese", "Nepalese", "Nepalese", "Nepalese", "Nepalese", "a New Zealander", "Nigerian", "Nigerian", "Nigerian", "Nigerian", "Norwegian", "Omani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Peruvian", "Peruvian", "Peruvian", "Peruvian", "Peruvian", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Portuguese", "Portuguese", "Puerto Rican", "Romanian", "Romanian", "Romanian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Saudi", "Saudi", "Saudi", "Saudi", "Saudi", "Scottish", "Serbian", "Serbian", "Slovak", "South African", "South African", "South African", "South African", "South African", "South African", "South African", "South African", "South African", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Sudanese", "Sudanese", "Sudanese", "Sudanese", "Sudanese", "Sudanese", "Sudanese", "Swedish", "Swedish", "Swiss", "Swiss", "Tanzanian", "Tanzanian", "Tanzanian", "Tanzanian", "Tanzanian", "Tanzanian", "Tanzanian", "Tanzanian", "Tanzanian", "Thai", "Thai", "Thai", "Thai", "Thai", "Thai", "Thai", "Thai", "Thai", "Thai", "Thai", "Tunisian", "Tunisian", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Ugandan", "Ugandan", "Ugandan", "Ugandan", "Ugandan", "Ugandan", "Ugandan", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Uzbek", "Uzbek", "Uzbek", "Uzbek", "Uzbek", "Venezuelan", "Venezuelan", "Venezuelan", "Venezuelan", "Venezuelan", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Yemeni", "Yemeni", "Yemeni", "Yemeni", "Zimbabwean", "Zimbabwean", "Zimbabwean"]]]
+[[Global Realism|passage()] [$nationalities = ["American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "Afghan", "Afghan", "Afghan", "Afghan", "Afghan", "Afghan", "Albanian", "Albanian", "Algerian", "Algerian", "Algerian", "Algerian", "Algerian", "Algerian", "Algerian", "Argentinian", "Argentinian", "Argentinian", "Argentinian", "Argentinian", "Argentinian", "Argentinian", "Armenian", "Australian", "Australian", "Australian", "Australian", "Austrian", "Austrian", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Belarusian", "Belarusian", "Belgian", "Belgian", "Bermudian", "Bolivian", "Bolivian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "Bruneian", "Burmese", "Burmese", "Burmese", "Burmese", "Burmese", "Burmese", "Burmese", "Burmese", "Burmese", "Cambodian", "Cameroonian", "Canadian", "Canadian", "Canadian", "Canadian", "Canadian", "Canadian", "Chilean", "Chilean", "Chilean", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Czech", "Czech", "Colombian", "Colombian", "Colombian", "Colombian", "Colombian", "Colombian", "Colombian", "Colombian", "Congolese", "Cuban", "Cuban", "Danish", "Djiboutian", "Dominican", "Dominican", "Dutch", "Dutch", "Dutch", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Emirati", "Emirati", "Estonian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Finnish", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "Guatemalan", "Gabonese", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "Ghanan", "Ghanan", "Ghanan", "Ghanan", "Ghanan", "Greek", "Greek", "Greenlandic", "Guatemalan", "Guatemalan", "Guatemalan", "Haitian", "Haitian", "Hungarian", "Hungarian", "Icelandic", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Iranian", "Iranian", "Iranian", "Iranian", "Iranian", "Iranian", "Iranian", "Iranian", "Iranian", "Iranian", "Iranian", "Iranian", "Iranian", "Iraqi", "Iraqi", "Iraqi", "Iraqi", "Iraqi", "Iraqi", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Irish", "Israeli", "Israeli", "Jamaican", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Jordanian", "Jordanian", "Kazakh", "Kazakh", "Kazakh", "Kenyan", "Kenyan", "Kenyan", "Kenyan", "Kenyan", "Kenyan", "Kenyan", "Kenyan", "Korean", "Korean", "Korean", "Korean", "Korean", "Korean", "Korean", "Korean", "Korean", "Korean", "Korean", "Korean", "Lebanese", "Libyan", "Lithuanian", "Malaysian", "Malaysian", "Malaysian", "Malaysian", "Malaysian", "Malian", "Malian", "Malian", "Marshallese", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Monégasque", "Montenegrin", "Moroccan", "Moroccan", "Moroccan", "Moroccan", "Moroccan", "Moroccan", "Nepalese", "Nepalese", "Nepalese", "Nepalese", "Nepalese", "a New Zealander", "Nigerian", "Nigerian", "Nigerian", "Nigerian", "Norwegian", "Omani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Peruvian", "Peruvian", "Peruvian", "Peruvian", "Peruvian", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Portuguese", "Portuguese", "Puerto Rican", "Romanian", "Romanian", "Romanian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Sammarinese", "Saudi", "Saudi", "Saudi", "Saudi", "Saudi", "Scottish", "Serbian", "Serbian", "Singaporean", "Singaporean", "Slovak", "South African", "South African", "South African", "South African", "South African", "South African", "South African", "South African", "South African", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Sudanese", "Sudanese", "Sudanese", "Sudanese", "Sudanese", "Sudanese", "Sudanese", "Swedish", "Swedish", "Swiss", "Swiss", "Syrian", "Tanzanian", "Tanzanian", "Tanzanian", "Tanzanian", "Tanzanian", "Tanzanian", "Tanzanian", "Tanzanian", "Tanzanian", "Thai", "Thai", "Thai", "Thai", "Thai", "Thai", "Thai", "Thai", "Thai", "Thai", "Thai", "Tunisian", "Tunisian", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Tuvaluan", "Ugandan", "Ugandan", "Ugandan", "Ugandan", "Ugandan", "Ugandan", "Ugandan", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Uruguayan", "Uruguayan", "Uzbek", "Uzbek", "Uzbek", "Uzbek", "Uzbek", "Venezuelan", "Venezuelan", "Venezuelan", "Venezuelan", "Venezuelan", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Yemeni", "Yemeni", "Yemeni", "Yemeni", "Zambian", "Zimbabwean", "Zimbabwean", "Zimbabwean"]]]
<</widget>>
\ No newline at end of file
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 436079d9f41a5a29b8add4ad8f1abbfd98ae6e25..2e5b0344d04d19c092d0ca67f3a70e3ee141ec5f 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -7,7 +7,7 @@
<<unset $whiteNationalities, $asianNationalities, $latinaNationalities, $middleeasternNationalities, $blackNationalities, $indoaryanNationalities, $pacificislanderNationalities, $malayNationalities, $amerindianNationalities, $southerneuropeanNationalities, $semiticNationalities>>
- <<unset $whiteAmericanSlaveNames, $africanAmericanSlaveNames, $asianAmericanSlaveNames, $latinaSlaveNames, $russianSlaveNames, $egyptianSlaveNames, $brazilianSlaveNames, $chineseSlaveNames, $koreanSlaveNames, $indianSlaveNames, $indonesianSlaveNames, $bangladeshiSlaveNames, $japaneseSlaveNames, $nigerianSlaveNames, $pakistaniSlaveNames, $mexicanSlaveNames, $filipinaSlaveNames, $ethiopianSlaveNames, $germanSlaveNames, $saudiSlaveNames, $turkishSlaveNames, $colombianSlaveNames, $argentinianSlaveNames, $vietnameseSlaveNames, $iranianSlaveNames, $congoleseSlaveNames, $frenchSlaveNames, $thaiSlaveNames, $britishSlaveNames, $italianSlaveNames, $spanishSlaveNames, $kenyanSlaveNames, $ukrainianSlaveNames, $canadianSlaveNames, $peruvianSlaveNames, $venezuelanSlaveNames, $irishSlaveNames, $icelandicSlaveNames, $finnishSlaveNames, $newZealanderSlaveNames, $polishSlaveNames, $greekSlaveNames, $israeliSlaveNames, $armenianSlaveNames, $moroccanSlaveNames, $romanianSlaveNames, $swedishSlaveNames, $lithuanianSlaveNames, $bolivianSlaveNames, $haitianSlaveNames, $cubanSlaveNames, $whiteSouthAfricanSlaveNames, $blackSouthAfricanSlaveNames, $chileanSlaveNames, $belgianSlaveNames, $danishSlaveNames, $norwegianSlaveNames, $hungarianSlaveNames, $estonianSlaveNames, $slovakSlaveNames, $kazakhSlaveNames, $zimbabweanSlaveNames, $ugandanSlaveNames, $tanzanianSlaveNames, $dutchSlaveNames, $austrianSlaveNames, $swissSlaveNames, $puertoRicanSlaveNames, $czechSlaveNames, $portugueseSlaveNames, $jamaicanSlaveNames, $malaysianSlaveNames, $guatemalanSlaveNames, $ghananSlaveNames, $serbianSlaveNames, $australianSlaveNames, $burmeseSlaveNames, $algerianSlaveNames, $sudaneseSlaveNames, $iraqiSlaveNames, $uzbekSlaveNames, $nepaleseSlaveNames, $afghanSlaveNames, $yemeniSlaveNames, $lebaneseSlaveNames, $tunisianSlaveNames, $emiratiSlaveNames, $libyanSlaveNames, $jordanianSlaveNames, $omaniSlaveNames, $malianSlaveNames>>
+ <<unset $whiteAmericanSlaveNames, $africanAmericanSlaveNames, $asianAmericanSlaveNames, $latinaSlaveNames, $russianSlaveNames, $egyptianSlaveNames, $brazilianSlaveNames, $chineseSlaveNames, $koreanSlaveNames, $indianSlaveNames, $indonesianSlaveNames, $bangladeshiSlaveNames, $japaneseSlaveNames, $nigerianSlaveNames, $pakistaniSlaveNames, $mexicanSlaveNames, $filipinaSlaveNames, $ethiopianSlaveNames, $germanSlaveNames, $saudiSlaveNames, $turkishSlaveNames, $colombianSlaveNames, $argentinianSlaveNames, $vietnameseSlaveNames, $iranianSlaveNames, $congoleseSlaveNames, $frenchSlaveNames, $thaiSlaveNames, $britishSlaveNames, $italianSlaveNames, $spanishSlaveNames, $kenyanSlaveNames, $ukrainianSlaveNames, $canadianSlaveNames, $peruvianSlaveNames, $venezuelanSlaveNames, $irishSlaveNames, $icelandicSlaveNames, $finnishSlaveNames, $newZealanderSlaveNames, $polishSlaveNames, $greekSlaveNames, $israeliSlaveNames, $armenianSlaveNames, $moroccanSlaveNames, $romanianSlaveNames, $swedishSlaveNames, $lithuanianSlaveNames, $bolivianSlaveNames, $haitianSlaveNames, $cubanSlaveNames, $whiteSouthAfricanSlaveNames, $blackSouthAfricanSlaveNames, $chileanSlaveNames, $belgianSlaveNames, $danishSlaveNames, $norwegianSlaveNames, $hungarianSlaveNames, $estonianSlaveNames, $slovakSlaveNames, $kazakhSlaveNames, $zimbabweanSlaveNames, $ugandanSlaveNames, $tanzanianSlaveNames, $dutchSlaveNames, $austrianSlaveNames, $swissSlaveNames, $puertoRicanSlaveNames, $czechSlaveNames, $portugueseSlaveNames, $jamaicanSlaveNames, $malaysianSlaveNames, $guatemalanSlaveNames, $ghananSlaveNames, $serbianSlaveNames, $australianSlaveNames, $burmeseSlaveNames, $algerianSlaveNames, $sudaneseSlaveNames, $iraqiSlaveNames, $uzbekSlaveNames, $nepaleseSlaveNames, $afghanSlaveNames, $yemeniSlaveNames, $lebaneseSlaveNames, $tunisianSlaveNames, $emiratiSlaveNames, $libyanSlaveNames, $jordanianSlaveNames, $omaniSlaveNames, $malianSlaveNames, $sammarineseSlaveNames, $marshalleseSlaveNames, $syrianSlaveNames, $bermudianSlaveNames, $uruguayanSlaveNames, $monegasqueSlaveNames, $montenegrinSlaveNames, $cambodianSlaveNames, $cameroonianSlaveNames, $gaboneseSlaveNames, $djiboutianSlaveNames, $greenlandicSlaveNames, $tuvaluanSlaveNames, $zambianSlaveNames, $albanianSlaveNames, $bruneianSlaveNames, $singaporeanSlaveNames>>
<<unset $cowSlaveNames, $chattelReligionistSlaveNames, $romanSlaveNames, $aztecSlaveNames, $ancientEgyptianSlaveNames, $edoSlaveNames>>
diff --git a/src/uncategorized/RESSTR.tw b/src/uncategorized/RESSTR.tw
index 6b558fe0a62b3671eb739fbc9d004aa2c6711e18..303c8b53a3c023fff41a5ab3d7f17ac0fb3276a1 100644
--- a/src/uncategorized/RESSTR.tw
+++ b/src/uncategorized/RESSTR.tw
@@ -55,6 +55,14 @@
<<switch $RESSTRevent>>
+<<case "objectifying visit">>
+
+At appropriate intervals during the day, $assistantName directs an unoccupied slave to visit your office to ensure all your needs are currently being met. With such a vague task set before them, the slaves who enter your office in such a manner often find themselves used in a multitude of refreshingly novel ways. At this particular moment, <<EventNameLink $activeSlave>> comes through the door of your office and obediently kneels beside your desk to await further orders. It occurs to you, gazing down at your obedient slave, that she exists as little more than an object to meet your various needs. Perhaps you should treat her as such.
+
+<<case "implant inspection">>
+
+<<EventNameLink $activeSlave>> comes before you naked for her routine inspection. You take particular care to examine her implants; even a careful hand at the remote surgery has been known to produce unsightly scars, stretch marks, and the like. Her breasts are <<if $activeSlave.boobs < 1200>>large<<else>>massive<</if>>, but her implants render them perky and rounded despite their size. An impossibility, had they been fully natural. Standing before you, her breasts protrude outward from her chest proudly and without sag. As you inspect her with your hands, she <<if canTalk($activeSlave) == false || ($activeSlave.accent >= 3)>>breathes a little harder and looks like she would speak, if she could.<<elseif ($activeSlave.lips > 70)>>murmurs through her huge lips, "Dat feelth good, <<Master>>."<<elseif ($activeSlave.lipsPiercing+$activeSlave.tonguePiercing > 2)>>murmurs through her piercings, "Dat feelth good, <<Master>>."<<else>>murmurs, "That feels really nice, <<Master>>."<</if>>
+
<<case "gagged slave">>
You cross paths with <<EventNameLink $activeSlave>> as she returns from $activeSlave.assignment after a long day. One of the things most readily apparent about $activeSlave.slaveName is the <<if ($activeSlave.collar == "ball gag")>>ball gag keeping her mouth filled<<elseif ($activeSlave.collar == "bit gag")>>cruel bit gag keeping her jaw locked<<elseif ($activeSlave.collar == "dildo gag")>>dildo gag filling her mouth and throat<<elseif ($activeSlave.collar == "massive dildo gag")>>dildo gag hugely distending her throat<</if>>, the existence of which is a constant reminder to her of her submission to you and your immense power over her.
@@ -142,6 +150,84 @@ May I plea<<s>>e try out <<s>>omething <<s>>kimpier today?"
<span id="result">
<<switch $RESSTRevent>>
+<<case "objectifying visit">>
+
+<<link "Use her as a footrest">>
+ <<EventNameDelink $activeSlave>>
+ <<replace "#result">>
+ You order her to get beneath your desk on all fours, a task that she carries out quickly and obediently. Once she gets as comfortable as she can be perched awkwardly underneath your desk, she braces her ass for the inevitable rough anal she assumes must be coming. Fortunately for her, it never does. Instead, you kick your feet up and rest them on the small of her back. After a few hours of objectifying degradation in this way, you rise from your chair to attend business elsewhere in your penthouse and dismiss $activeSlave.slaveName. Although you didn't fuck her, her experience as a piece of furniture for your comfort @@.hotpink;has increased her submissiveness@@.
+ <<set $activeSlave.devotion += 5>>
+ <</replace>>
+<</link>>
+<br><<link "Use her breasts as stress balls">>
+ <<EventNameDelink $activeSlave>>
+ <<replace "#result">>
+ She came to your office clearly expecting to get fucked, but takes it in stride when you order her to kneel beside you and stick out her breasts. She is similarly unruffled when you first reach over to take one of her <<if $activeSlave.boobs > 2000>>massive breasts<<elseif $activeSlave.boobs > 1000>>large breasts<<elseif $activeSlave.boobs > 400>>breasts<<else>>tiny breasts<</if>> in your hand and slowly squeeze it. As a result, when a particularly irritating piece of news is relayed through your monitor and you suddenly crush the breast held in your hand in response, $activeSlave.slaveName can't help but let out a sharp yelp before silencing herself. She soon realizes her time with you in the near future will be as an outlet for your frustrations, and her breasts will be taking the brunt of the punishment. When you dismiss her hours later, she scurries out of your office cradling her bruised breasts and @@.gold;trembling from her recent objectifying experience@@.
+ <<set $activeSlave.trust -= 5>>
+ <</replace>>
+<</link>>
+<<if canDoAnal($activeSlave) || canDoVaginal($activeSlave)>>
+<br><<link "Use her as an excercise ball">>
+ <<EventNameDelink $activeSlave>>
+ <<replace "#result">>
+ You order her to get down on all fours and stick her butt up in the air, a position she assumes with the practiced efficiency of a veteran sex slave. She's expecting doggystyle and only lets out a perfunctory moan when you<<if $PC.dick == 0>> don a strap-on and<</if>> mount her ass from behind. However, she is caught off guard when you half sit on her ass while fucking it, using it like an exercise ball as you bounce up and down. Her <<if ($activeSlave.butt > 5)>>huge ass cushions your thighs as you pummel her into the ground<<elseif ($activeSlave.butt > 2)>>ass provides some cushioning as you pound her into the ground<<else>>ass does little to cushion you as you fuck her into the ground<</if>>, but $activeSlave.slaveName fares much worse in her role as living exercise equipment. By the end of your power workout you manage to work up quite a sweat, while your slave lays limp in the middle of your office with her gaped butt comically held up in the air. Using her ass in such a way @@.hotpink;nearly fucked her senseless@@, but she'll remember @@.gold;your objectifying treatment of her@@.
+ <<set $activeSlave.devotion += 2>>
+ <<set $activeSlave.trust -= 2>>
+ <<set $activeSlave.analCount += 1>>
+ <<set $analTotal += 1>>
+ <</replace>>
+<</link>><<if ($activeSlave.anus == 0)>> //This option will take anal virginity//<</if>>
+<</if>>
+
+<<case "implant inspection">>
+
+<<link "Give her a nice massage">>
+ <<EventNameDelink $activeSlave>>
+ <<replace "#result">>
+ You sit on the couch next to your desk and pat your thighs. She smiles and comes over, lowering herself <<if $PC.dick == 0>>into your lap<<else>>onto your member<<if $PC.vagina == 1>> and sliding a hand down to see to your pussy<</if>><</if>> without hesitation. You help her get comfortable and instead of <<if $PC.dick == 0>>grinding<<else>>thrusting<</if>> or telling her to ride, you just sit there with her in your lap, gently massaging her <<if $activeSlave.boobs < 900>>big <<else>>huge <</if>> tits. Despite their fine craftsmanship, implants are prone to rendering breasts sore, so she's soon groaning with relief at the attention you lavish upon them. You finally manage to bring her to orgasm with almost nothing but delicate stimulation of her nipples, despite her implants making them less sensitive than usual. @@.mediumaquamarine;She has become more trusting of you.@@
+ <<set $activeSlave.trust += 4>>
+ <<if ($activeSlave.vagina > -1)>>
+ <<set $activeSlave.vaginalCount += 1>>
+ <<set $vaginalTotal += 1>>
+ <<else>>
+ <<set $activeSlave.analCount += 1>>
+ <<set $analTotal += 1>>
+ <</if>>
+ <</replace>>
+<</link>>
+<br><<link "See if they've got any bounce">>
+ <<EventNameDelink $activeSlave>>
+ <<replace "#result">>
+ You tell her to kneel on the smooth floor. She knows this means doggy style, so she compliantly arches her back and cocks her hips to offer herself to you. You<<if $PC.dick == 0>> don a strap-on and<</if>> enter <<if ($activeSlave.vagina == -1)>>her ass<<else>>her pussy<</if>> without preamble and seize her hips. She braces herself, knowing what's coming, but soon she discovers a new disadvantage to her augmented breasts: even as you pound her hard and grope her chest, her tits barely move despite their rough treatment. Her unyielding breasts only encourage you to fuck her harder, in an effort to garner any iota of movement from her ample chest. <<if ($activeSlave.dick > 0)>>Her cock doesn't help, either, flopping around half-erect as she vacillates between pain and arousal. <<elseif ($activeSlave.clit > 2)>>Her huge clit doesn't help, either, flopping around half-erect as she vacillates between pain and arousal. <</if>><<if ($activeSlave.vagina > -1)>>Even a switch to her ass does little to slow your thrusts, and so her breasts continue to rest impassively on her chest as their owner is buttfucked senseless. <</if>> You finish with a particularly hard thrust <<if $PC.dick == 0>>and shake with climax<<else>>to spill your seed deep inside her butt<</if>>, ramming forward hard enough to knock her down to the floor. As you rise, her discomfited form is a pretty sight, with her perfectly rounded breasts keeping her body suspended off the ground and her well fucked butt lewdly relaxed. @@.hotpink;She has become more submissive.@@
+ <<set $activeSlave.devotion += 4>>
+ <<BothVCheck>>
+ <</replace>>
+<</link>><<if ($activeSlave.anus == 0) || ($activeSlave.vagina == 0)>> //This option will take virginity//<</if>>
+<br><<link "Show her off in public">>
+ <<EventNameDelink $activeSlave>>
+ <<replace "#result">>
+ You bring her out onto the promenade, still nude, her impressively augmented breasts attracting open stares with their perfect roundness and perkiness. <<if ($activeSlave.energy > 95)>>The nympho slut loves being shown off, and she flaunts her implanted boobs shamelessly.<<elseif ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetish == "humiliation")>>The slut loves being embarrassed, and she blushes furiously as her nipples stiffen with arousal despite her implants having sapped them off some of their sensitivity.<<elseif ($activeSlave.analCount > 100) && ($activeSlave.oralCount > 100)>>She's such a veteran sex slave that she takes the stares in stride.<<else>>She blushes a little, but tips her chin up and follows you obediently.<</if>> When you reach a good spot, you grab her <<if ($activeSlave.weight > 30)>>fat ass<<elseif ($activeSlave.weight > 10)>>plush hips<<elseif ($activeSlave.weight >= -10)>>trim hips<<elseif ($activeSlave.butt > 2)>>big butt<<else>>skinny ass<</if>> and <<if ($activeSlave.height >= 185)>>pull her tall body in<<elseif ($activeSlave.height >= 160)>>pull her up on tiptoe<<else>>push her petite form up onto a railing<</if>> for standing sex. She cocks her hips and takes your <<if $PC.dick == 0>>strap-on<<else>>cock<</if>> compliantly, and after a few thrusts you reach down, seize her behind each knee, and hoist her legs up so she's pinned against your <<if ($PC.boobs == 0)>>chest<<else>>boobs<</if>>, helpless to do anything but let you hold her in midair and fuck her. <<if ($activeSlave.vagina > 1)>>Her pussy can take a hard pounding, so you give it to her.<<elseif ($activeSlave.vagina > -1)>>Her poor tight pussy can barely take the pounding you're administering.<<elseif ($activeSlave.anus > 1)>>Her loose butthole can take a hard pounding, so you give it to her.<<else>>Her poor tight butthole can barely take the pounding you're administering.<</if>> She loses all composure, gasping and panting as the massive weight of her augmented chest weighs her down, causing her to all but collapse against you. Despite this, or perhaps partly because of it, she begins to orgasm,
+ <<if ($activeSlave.dick > 0) && ($activeSlave.dickAccessory == "chastity")>>
+ the discomfort of being half-hard under her chastity cage making her squirm as cum rushes out of the hole at its tip.
+ <<elseif ($activeSlave.dick > 0) && ($activeSlave.hormones < 1) && ($activeSlave.balls > 0)>>
+ <<if ($activeSlave.dick > 3)>>her huge cock releasing a jet of cum with each thrust into her<<elseif ($activeSlave.dick > 1)>>her cock releasing a spurt of cum with each thrust into her<<else>>her tiny dick spurting cum with each thrust into her<</if>>.
+ <<elseif ($activeSlave.dick > 0)>>
+ her soft cock scattering cum all over the place as it flops around.
+ <<elseif ($activeSlave.preg > 10)>>
+ her pregnant belly adding to her near-total discomfiture.
+ <<elseif ($activeSlave.muscles > 5)>>
+ her abs convulsing deliciously as she climaxes.
+ <<elseif ($activeSlave.vagina > -1)>>
+ her pussy tightening.
+ <<else>>
+ her poor anal ring tightening.
+ <</if>>
+ The crowd that surrounds you during this noisy spectacle @@.green;is suitably impressed.@@
+ <<set $rep += 250>>
+ <<BothVCheck>>
+ <</replace>>
+<</link>><<if ($activeSlave.anus == 0) || ($activeSlave.vagina == 0)>> //This option will take virginity//<</if>>
+
<<case "gagged slave">>
<<link "Give her something else to gag on">>
diff --git a/src/uncategorized/buildingWidgets.tw b/src/uncategorized/buildingWidgets.tw
index 6299e8cec3cad66ea29bc7db6f46d862f68d6aea..bff82fafbfa7fd87bc18937e009a36347e258783 100644
--- a/src/uncategorized/buildingWidgets.tw
+++ b/src/uncategorized/buildingWidgets.tw
@@ -128,7 +128,7 @@ if(!Macro.has('sectorblock')) {
<tr> /* Level 9, penthouse, sector 0 */
<td colspan="3"></td>
<td id="Penthouse" colspan="4">
- <<link "Penthouse">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Penthouse">><</link>>
+ <<link "Penthouse">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Penthouse">><</link>> @@.cyan;[P]@@
<<if $masterSuite||$servantsQuarters||$spa||$clinic||$schoolroom||$cellblock||$incubator||$HGSuite||$researchLab.built=="true">>
<br>
<<if $masterSuite>>[[Suite|Master Suite]] ($masterSuiteSlaves/$masterSuite<<if $Concubine>>, C<</if>>)<</if>>
diff --git a/src/uncategorized/economics.tw b/src/uncategorized/economics.tw
index cab219fcfff46f9564c9ab155d4131418353fd4c..c8ff36cd68e4d0188c872c1b934f15c35bdbe0a5 100644
--- a/src/uncategorized/economics.tw
+++ b/src/uncategorized/economics.tw
@@ -51,52 +51,7 @@
<<include "FS Developments">>
<</if>>
<<else>>
-<head>
-<style>
-
-div.tab {
- overflow: hidden;
- border: 1px solid #ccc;
- background-color: transparent;
-}
-
-div.tab button {
- background-color: inherit;
- float: left;
- border: none;
- outline: none;
- cursor: pointer;
- padding: 14px 16px;
- transition: 0.3s;
- font-size: 19px;
-}
-
-div.tab button:hover {
- background-color: #444;
-}
-
-div.tab button.active {
- background-color: #777;
-}
-
-.tabcontent {
- display: none;
- padding: 6px 12px;
- -webkit-animation: fadeEffect 1s;
- animation: fadeEffect 1s;
-}
-
-@-webkit-keyframes fadeEffect {
- from {opacity: 0;}
- to {opacity: 1;}
-}
-
-@keyframes fadeEffect {
- from {opacity: 0;}
- to {opacity: 1;}
-}
-</style>
-</head>
+<<CreateSimpleTabs>>
<body>
<div class="tab">
diff --git a/src/uncategorized/neighborsFSAdoption.tw b/src/uncategorized/neighborsFSAdoption.tw
index df553e61173dfb61ff36c7d7fd5f6b6791d51c97..afa448dee157f863cb44099702d2ff47e89b6525 100644
--- a/src/uncategorized/neighborsFSAdoption.tw
+++ b/src/uncategorized/neighborsFSAdoption.tw
@@ -816,7 +816,7 @@ societal development.
<<if ($arcologies[$i].FSSupremacist == "unset")>>
<<if ($arcologies[$i].FSSubjugationist == "unset") || ($arcologies[$i].FSSubjugationistRace != $arcologies[$j].FSSupremacistRace)>>
<<if $arcologies[$j].FSSupremacist > random(0,200)+($adopted*100)-$influenceBonus>>
- It @@.yellow;adopts $arcologies[$j].FSSupremacistRace Subjugation@@ due to influence from its trading partner $arcologies[$j].name.
+ It @@.yellow;adopts $arcologies[$j].FSSupremacistRace Supremacy@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSSupremacist = 5>><<set $adopted = 1>>
<<set $arcologies[$i].FSSupremacistRace = $arcologies[$j].FSSupremacistRace>>
<<break>>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index 7f4375cbf2f0c775653d0656dfa1cdc359f3a558..ba7022ba1458eaae1ef4f00bece1165f182602d0 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -143,6 +143,14 @@ Main menu leadership controls displayed
<br>
Slave summary caching is <<if $useSummaryCache>>@@.cyan;ENABLED@@. [[Disable|Options][$useSummaryCache = false]]<<else>>@@.red;DISABLED@@. [[Enable|Options][$useSummaryCache = true]]<</if>>
+<br>
+Tips from the Encyclopedia are
+<<if ($showTipsFromEncy == 0)>>
+ @@.red;DISABLED@@. [[Enable|Options][$showTipsFromEncy = 1]]
+<<else>>
+ @@.cyan;ENABLED@@. [[Disable|Options][$showTipsFromEncy = 0]]
+<</if>>
+
<br><br>
''REPORTS''
<br>
@@ -208,6 +216,8 @@ Economic Tabs on weekly reports are
@@.cyan;ENABLED@@. [[Disable|Options][$useTabs = 0]]
<</if>>
+<br>
+
Economic detail sheets for facilities are
<<if ($showEconomicDetails != 0)>>
@@.cyan;ENABLED@@. [[Disable|Options][$showEconomicDetails = 0]]
@@ -355,6 +365,7 @@ Curative side effects are @@.red;DISABLED@@. [[Enable|Options][$curativeSideEffe
[[Semi aging|Options][$seeAge = 2]]
<</if>>
<</if>>
+<br>
<<if ($cheatMode == 1)>>
<br>
Cheatmode is currently @@.cyan;ENABLED@@. [[Disable|Options][$cheatMode = 0]]
@@ -379,12 +390,11 @@ Cheatmode is currently @@.red;DISABLED@@. [[Enable|Options][$cheatMode = 1]]
//This will add a Display Variables and Bug Report passage to the sidebar.//
<</if>>
-<bR>
+<br>
Genetics array test:
<<link "Run Test">><<goto "test genetics">><</link>><<if $cheatMode>> | [[Edit Genetics]]<<else>> | @@.gray;Edit Genetics@@ (needs cheat mode)<</if>>
<br><<link "Reset RA Rules">><<include "Init Rules">><<goto "Rules Assistant">><</link>>
-
/*
<br><br>
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index bf41aa5a79ca82ef8d7a3f2f077282356a85968d..51afb8013e5d793ea67ae6835dedaa24c38b0e8d 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -72,11 +72,11 @@
You spend your free time hustling around your penthouse, cleaning and making sure everything is in order. You manage to reduce your upkeep by 25%. <<if $PC.vagina == 1>>This is much easier to do without a big baby bump in the way.<</if>>
<</if>>
<<elseif ($personalAttention == "smuggling")>>
- <<if random(1,100) >= 90 && $FSDegradationistDecoration >= 80>>
+ <<if random(1,100) >= 90 && $arcologies[0].FSDegradationistDecoration >= 80>>
<<set $seed = random(2000,3000)>>
During your free time, you make business with a few low-standards slavers and manage to buy stolen slaves and sell them at a profit. Even if people recognized you, such treatment of slaves is normal, and only a few people would really complain about it. Your dealings have made you @@.yellowgreen;¤<<print ($seed+Math.trunc(Math.abs($cash)/40))>>.@@
<<set $cash += ($seed+Math.trunc(Math.abs($cash)/40))>>
- <<elseif $FSPaternalistDecoration >= 80>>
+ <<elseif $arcologies[0].FSPaternalistDecoration >= 80>>
You manage to find a few slavers without any problem, but when you actually try to do business, you are quickly recognized. You only manage to make @@.yellowgreen;¤<<print ($seed+Math.trunc(Math.abs($cash)/40))>>@@ before you are sent away. The people of your arcology are @@.red;outraged by your lack of respect@@ for slave rights.
<<set $seed = random(1000,1500)>>
<<set $cash += ($seed+Math.trunc(Math.abs($cash)/40))>>
diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw
index 52f7614f140ec7ec9da27f34d467cab9f221d5da..9cb830fd9a4126c1b747e2efd713fcc908feebbc 100644
--- a/src/uncategorized/randomIndividualEvent.tw
+++ b/src/uncategorized/randomIndividualEvent.tw
@@ -1064,6 +1064,12 @@
<</if>>
<</if>>
+<<if ($eventSlave.trust > 20)>>
+<<if ($eventSlave.devotion > 50)>>
+ <<set $RESSTRevent.push("objectifying visit")>>
+<</if>>
+<</if>>
+
<<if ($eventSlave.devotion > 20)>>
<<if ($eventSlave.trust > -10)>>
<<if ($eventSlave.ID != $HeadGirl.ID)>>
@@ -1162,6 +1168,14 @@
<</if>>
<</if>>
+<<if ($eventSlave.boobs > 800)>>
+<<if ($eventSlave.boobsImplant > 1)>>
+<<if ($eventSlave.devotion > 20)>>
+ <<set $RESSTRevent.push("implant inspection")>>
+<</if>>
+<</if>>
+<</if>>
+
<<if ($eventSlave.devotion < -20)>>
<<if ($eventSlave.trust >= -20)>>
<<if ($eventSlave.clothes == "uncomfortable straps")>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index d6d23c92f6610eaf81f17f18e01cdf197d7671a4..12e8dd99ed20ec3eb5c42702520fe3f59a65a65b 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -699,6 +699,74 @@
<<set $FSAcquisitionEvents.push("Chattel Religionist")>>
<<set $events.push("RE FS acquisition")>>
<</if>>
+ <<if $arcologies[0].FSSupremacist > random(1,100)>>
+ <<set $FSAcquisitionEvents.push("Supremacist Two")>>
+ <<set $events.push("RE FS acquisition")>>
+ <</if>>
+ <<if $arcologies[0].FSSubjugationist > random(1,100)>>
+ <<set $FSAcquisitionEvents.push("Subjugationist Two")>>
+ <<set $events.push("RE FS acquisition")>>
+ <</if>>
+ <<if $arcologies[0].FSGenderRadicalist > random(1,100)>>
+ <<set $FSAcquisitionEvents.push("Gender Radicalist Two")>>
+ <<set $events.push("RE FS acquisition")>>
+ <</if>>
+ <<if $arcologies[0].FSGenderFundamentalist > random(1,100)>>
+ <<set $FSAcquisitionEvents.push("Gender Fundamentalist Two")>>
+ <<set $events.push("RE FS acquisition")>>
+ <</if>>
+ <<if $arcologies[0].FSPaternalist > random(1,100)>>
+ <<set $FSAcquisitionEvents.push("Paternalist Two")>>
+ <<set $events.push("RE FS acquisition")>>
+ <</if>>
+ <<if $arcologies[0].FSDegradationist > random(1,100)>>
+ <<set $FSAcquisitionEvents.push("Degradationist Two")>>
+ <<set $events.push("RE FS acquisition")>>
+ <</if>>
+ <<if $arcologies[0].FSBodyPurist > random(1,100)>>
+ <<set $FSAcquisitionEvents.push("Body Purist Two")>>
+ <<set $events.push("RE FS acquisition")>>
+ <</if>>
+ <<if $arcologies[0].FSTransformationFetishist > random(1,100)>>
+ <<set $FSAcquisitionEvents.push("Transformation Fetishist Two")>>
+ <<set $events.push("RE FS acquisition")>>
+ <</if>>
+ <<if $arcologies[0].FSYouthPreferentialist > random(1,100)>>
+ <<set $FSAcquisitionEvents.push("Youth Preferentialist Two")>>
+ <<set $events.push("RE FS acquisition")>>
+ <</if>>
+ <<if $arcologies[0].FSMaturityPreferentialist > random(1,100)>>
+ <<set $FSAcquisitionEvents.push("Maturity Preferentialist Two")>>
+ <<set $events.push("RE FS acquisition")>>
+ <</if>>
+ <<if $arcologies[0].FSSlimnessEnthusiast > random(1,100)>>
+ <<set $FSAcquisitionEvents.push("Slimness Enthusiast Two")>>
+ <<set $events.push("RE FS acquisition")>>
+ <</if>>
+ <<if $arcologies[0].FSAssetExpansionist > random(1,100)>>
+ <<set $FSAcquisitionEvents.push("Asset Expansionist Two")>>
+ <<set $events.push("RE FS acquisition")>>
+ <</if>>
+ <<if $arcologies[0].FSPastoralist > random(1,100)>>
+ <<set $FSAcquisitionEvents.push("Pastoralist Two")>>
+ <<set $events.push("RE FS acquisition")>>
+ <</if>>
+ <<if $arcologies[0].FSPhysicalIdealist > random(1,100)>>
+ <<set $FSAcquisitionEvents.push("Physical Idealist Two")>>
+ <<set $events.push("RE FS acquisition")>>
+ <</if>>
+ <<if $arcologies[0].FSHedonisticDecadence > random(1,100)>>
+ <<set $FSAcquisitionEvents.push("Hedonistic Decadence Two")>>
+ <<set $events.push("RE FS acquisition")>>
+ <</if>>
+ <<if $arcologies[0].FSRepopulationFocus > random(1,100)>>
+ <<set $FSAcquisitionEvents.push("Repopulation Efforts Two")>>
+ <<set $events.push("RE FS acquisition")>>
+ <</if>>
+ <<if $arcologies[0].FSRestart > random(1,100)>>
+ <<set $FSAcquisitionEvents.push("Eugenics Two")>>
+ <<set $events.push("RE FS acquisition")>>
+ <</if>>
<<if $arcologies[0].FSRomanRevivalist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Roman Revivalist")>>
<<set $events.push("RE FS acquisition")>>
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index 0da6d56f816dc760e143acfd994b3558d435a2bf..10c02b241cd5956dae337bbe373437655f53c7b8 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -44,6 +44,25 @@
<<slaveCost $activeSlave>>
<<set $slaveCost -= 1000>>
+<<case "Pastoralist Two">>
+
+<<set $contractCost = 1000>>
+<<set $activeSlaveOneTimeMinAge = 32>>
+<<set $activeSlaveOneTimeMaxAge = 42>>
+<<set $one_time_age_overrides_pedo_mode = 1>>
+<<include "Generate XX Slave">>
+<<set $activeSlave.origin = "She offered herself for voluntary enslavement, hoping to become a valuable source of milk for you.">>
+<<set $activeSlave.age to random(32,$retirementAge-2)>>
+<<set $activeSlave.health = random(-20,20)>>
+<<set $activeSlave.devotion = random(-15,15)>>
+<<set $activeSlave.trust = random(5,15)>>
+<<set $activeSlave.lactation = 1>>
+<<set $activeSlave.vagina = 1>>
+<<set $activeSlave.boobs += 200*random(2,5)>>
+<<set $activeSlave.birthsTotal = random(1,3)>>
+<<slaveCost $activeSlave>>
+<<set $slaveCost -= 1000>>
+
<<case "Supremacist">>
<<set $contractCost = 2000>>
@@ -57,9 +76,24 @@
<<slaveCost $activeSlave>>
<<set $slaveCost -= 2000>>
+<<case "Supremacist Two">>
+
+<<set $contractCost = 2000>>
+<<include "Generate New Slave">>
+<<if $activeSlave.race == $arcologies[0].FSSupremacistRace>>
+ <<goto "RE FSSupremacist acquisition">>
+<</if>>
+<<set $activeSlave.origin = "She made the mistake of marrying into a $arcologies[0].FSSupremacistRace neighborhood and was kidnapped then sold to you.">>
+<<set $activeSlave.devotion -= 8>>
+<<set $activeSlave.trust = random(-45,-25)>>
+<<slaveCost $activeSlave>>
+<<set $slaveCost -= 2000>>
+
<<case "Subjugationist">>
<<set $contractCost = 1000>>
+<<set $activeSlaveOneTimeMinAge = 18>>
+<<set $activeSlaveOneTimeMaxAge = 42>>
<<include "Generate New Slave">>
<<set $activeSlave.origin = "She was beaten, sexually assaulted, and finally enslaved for being stupid enough to visit an arcology that doesn't like her kind.">>
<<set $activeSlave.race = $arcologies[0].FSSubjugationistRace>>
@@ -70,93 +104,41 @@
<<slaveCost $activeSlave>>
<<set $slaveCost -= 1000>>
-<<case "Hedonistic Decadence">>
+<<case "Subjugationist Two">>
<<set $contractCost = 1000>>
-<<set $activeSlaveOneTimeMaxAge = 24>>
+<<set $activeSlaveOneTimeMaxAge = 42>>
<<include "Generate New Slave">>
-<<set $activeSlave.origin = "She sold herself to you to escape those who condemned her lifetyle.">>
-<<set $activeSlave.career = "a shut-in">>
-<<set $activeSlave.health = random(-40,20)>>
-<<set $activeSlave.devotion = random(35,45)>>
-<<set $activeSlave.trust = random(20,25)>>
-<<if $activeSlave.vagina > -1>>
- <<set $activeSlave.vagina = 4>>
-<</if>>
-<<set $activeSlave.anus = 4>>
-<<if $activeSlave.ovaries == 1>>
- <<set $activeSlave.preg = -1>>
-<</if>>
-<<set $activeSlave.weight = -15>>
-<<set $activeSlave.underArmHStyle = "bushy">>
-<<set $activeSlave.pubicHStyle = "bushy">>
-<<set $activeSlave.behavioralFlaw = "gluttonous">>
-<<set $activeSlave.sexualQuirk = "size queen">>
-<<set $activeSlave.tonguePiercing = 2>>
-<<set $activeSlave.nipplesPiercing = 2>>
-<<set $activeSlave.nosePiercing = 2>>
-<<set $activeSlave.earPiercing = 2>>
-<<set $activeSlave.lipsPiercing = 2>>
-<<set $activeSlave.vaginaPiercing = 2>>
-<<set $activeSlave.anusPiercing = 2>>
-<<set $activeSlave.eyebrowPiercing = 2>>
-<<set $activeSlave.navelPiercing = 2>>
-<<set $activeSlave.corsetPiercing = 1>>
-<<set $activeSlave.areolaePiercing = 1>>
-<<set $activeSlave.clothes = "a slutty outfit">>
-<<set $activeSlave.shoes = "heels">>
-<<set $slaves[$i].inflation = 3, $slaves[$i].inflationType = "food", $slaves[$i].inflationMethod = 1>>
-<<slaveCost $activeSlave>>
-<<set $slaveCost -= 1000>>
-
-<<case "Repopulation Efforts">>
-
-<<set $contractCost = 1000>>
-<<if $pedo_mode == 1>>
- <<set $activeSlaveOneTimeMinAge = $fertilityAge>>
- <<set $activeSlaveOneTimeMaxAge = 18>>
- <<set $one_time_age_overrides_pedo_mode = 1>> /% Can lactate. %/
-<<else>>
- <<set $activeSlaveOneTimeMinAge = 14>>
- <<set $activeSlaveOneTimeMaxAge = 30>>
-<</if>>
-<<include "Generate XX Slave">>
-<<set $activeSlave.origin = "She sold herself to you in the hopes that her body would help keep humanity alive.">>
-<<set $activeSlave.career = setup.youngCareers.random()>>
-<<set $activeSlave.health = random(40,60)>>
-<<set $activeSlave.devotion = random(25,35)>>
-<<set $activeSlave.trust = random(20,25)>>
-<<set $activeSlave.vagina = 0>>
-<<set $activeSlave.preg = 0>>
-<<set $activeSlave.pregType = 0>>
-<<set $activeSlave.fetish = "pregnancy">>
+<<set $activeSlave.origin = "She came to your arcology to be enslaved out of a sense of self-loathing for her kind.">>
+<<set $activeSlave.race = $arcologies[0].FSSubjugationistRace>>
+<<set $activeSlave.health = random(-80,-60)>>
+<<set $activeSlave.trust = random(-25,-15)>>
+<<set $activeSlave.devotion = random(-45,-25)>>
+<<set $activeSlave.anus = random(1,2)>>
<<slaveCost $activeSlave>>
<<set $slaveCost -= 1000>>
-<<case "Eugenics">>
+<<case "Gender Radicalist">>
<<set $contractCost = 1000>>
-<<set $activeSlaveOneTimeMinAge = 10>>
-<<set $activeSlaveOneTimeMaxAge = 18>>
-<<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.health = random(20,40)>>
-<<set $activeSlave.devotion = random(-100,-90)>>
-<<set $activeSlave.trust = random(-100,-90)>>
-<<set $activeSlave.vagina = 0>>
-<<set $activeSlave.preg = 0>>
-<<set $activeSlave.behavioralFlaw = "arrogant">>
+<<include "Generate XY Slave">>
+<<set $activeSlave.origin = "She offered herself for voluntary enslavement to escape life in an area that disapproved of her sexual tendencies.">>
+<<set $activeSlave.health = random(-20,20)>>
+<<set $activeSlave.devotion = random(15,20)>>
+<<set $activeSlave.trust = random(0,10)>>
+<<set $activeSlave.anus = random(1,2)>>
+<<set $activeSlave.behavioralFlaw = "hates women">>
<<slaveCost $activeSlave>>
<<set $slaveCost -= 1000>>
-<<case "Gender Radicalist">>
+<<case "Gender Radicalist Two">>
<<set $contractCost = 1000>>
+<<set $activeSlaveOneTimeMinAge = 32>>
+<<set $activeSlaveOneTimeMaxAge = 42>>
+<<set $one_time_age_overrides_pedo_mode = 1>>
<<include "Generate XY Slave">>
-<<set $activeSlave.origin = "She offered herself for voluntary enslavement to escape life in an area that disapproved of her sexual tendencies.">>
+<<set $activeSlave.origin = "She offered herself for voluntary enslavement after a lifetime as an outcast due to her sexual tendencies.">>
<<set $activeSlave.health = random(-20,20)>>
<<set $activeSlave.devotion = random(15,20)>>
<<set $activeSlave.trust = random(0,10)>>
@@ -170,7 +152,7 @@
<<set $contractCost = 1000>>
<<set $activeSlaveOneTimeMinAge = Math.min(16,$fertilityAge)>>
<<set $activeSlaveOneTimeMaxAge = 19>>
-<<set $one_time_age_overrides_pedo_mode to 1>> /% Old enough = be pregnant. %/
+<<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough = be pregnant. %/
<<include "Generate XX Slave">>
<<set $activeSlave.origin = "She was sold to you as a way of disposing of an inconveniently pregnant young woman.">>
<<set $activeSlave.career = setup.youngCareers.random()>>
@@ -182,9 +164,27 @@
<<slaveCost $activeSlave>>
<<set $slaveCost -= 1000>>
+<<case "Gender Fundamentalist Two">>
+
+<<set $contractCost = 1000>>
+<<set $activeSlaveOneTimeMinAge = 32>>
+<<set $activeSlaveOneTimeMaxAge = 43>>
+<<set $one_time_age_overrides_pedo_mode = 1>>
+<<include "Generate XX Slave">>
+<<set $activeSlave.origin = "She was raped and impregnated, then sold to you as a way of disposing of an inconveniently pregnant mother.">>
+<<set $activeSlave.health = random(-20,20)>>
+<<set $activeSlave.devotion = random(-45,-25)>>
+<<set $activeSlave.trust = random(-45,-25)>>
+<<set $activeSlave.preg = random(20,30)>>
+<<set $activeSlave.vagina = 1>>
+<<set $activeSlave.pregTotal = random(1,3)>>
+<<slaveCost $activeSlave>>
+<<set $slaveCost -= 1000>>
+
<<case "Paternalist">>
<<set $contractCost = 1000>>
+<<set $activeSlaveOneTimeMaxAge = 42>>
<<include "Generate New Slave">>
<<set $activeSlave.origin = "She was voluntarily enslaved after she decided that your paternalistic arcology was a better place for advancement than the old world.">>
<<set $activeSlave.career = setup.educatedCareers.random()>>
@@ -197,10 +197,23 @@
<<slaveCost $activeSlave>>
<<set $slaveCost -= 1000>>
+<<case "Paternalist Two">>
+
+<<set $contractCost = 1000>>
+<<set $activeSlaveOneTimeMaxAge = 42>>
+<<include "Generate New Slave">>
+<<set $activeSlave.origin = "She was voluntarily enslaved after she decided that your paternalistic arcology was a better place to live than the old world.">>
+<<set $activeSlave.health = random(40,60)>>
+<<set $activeSlave.devotion = random(25,45)>>
+<<set $activeSlave.trust = random(25,45)>>
+<<slaveCost $activeSlave>>
+<<set $slaveCost -= 1000>>
+
<<case "Degradationist">>
<<set $contractCost = 2000>>
<<set $activeSlaveOneTimeMinAge = 11>>
+<<set $activeSlaveOneTimeMaxAge = 42>>
<<include "Generate XX Slave">>
<<set $activeSlave.origin = "She was sold to you by an anonymous person who wanted her to suffer.">>
<<set $activeSlave.boobsImplant += random(4,6)*200>>
@@ -235,9 +248,43 @@
<<slaveCost $activeSlave>>
<<set $slaveCost -= 2000>>
+<<case "Degradationist Two">>
+
+<<set $contractCost = 2000>>
+<<set $activeSlaveOneTimeMinAge = 32>>
+<<set $activeSlaveOneTimeMaxAge = 42>>
+<<set $one_time_age_overrides_pedo_mode = 1>>
+<<include "Generate XX Slave">>
+<<set $activeSlave.origin = "She was sold to you by an anonymous slave breaking group.">>
+<<set $activeSlave.age to random(32,$retirementAge-2)>>
+<<set $activeSlave.boobsImplant += random(3,6)*200>>
+<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+<<set $activeSlave.areolae = 1>>
+<<set $activeSlave.butt += 1>>
+<<set $activeSlave.buttImplant += 1>>
+<<set $activeSlave.lips += 10>>
+<<set $activeSlave.lipsImplant += 10>>
+<<set $activeSlave.face = Math.clamp($activeSlave.face+20,-100,100)>>
+<<set $activeSlave.devotion = random(-75,-55)>>
+<<set $activeSlave.trust = random(-65,-45)>>
+<<set $activeSlave.health = random(-40,20)>>
+<<set $activeSlave.anus = 2>>
+<<set $activeSlave.vagina = 2>>
+<<set $activeSlave.weight = 0>>
+<<set $activeSlave.clitPiercing = 1>>
+<<set $activeSlave.tonguePiercing = 1>>
+<<set $activeSlave.nipplesPiercing = 1>>
+<<set $activeSlave.nosePiercing = 1>>
+<<set $activeSlave.earPiercing = 1>>
+<<set $activeSlave.pubicHStyle = "waxed">>
+<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
+<<slaveCost $activeSlave>>
+<<set $slaveCost -= 2000>>
+
<<case "Body Purist">>
<<set $contractCost = 1000>>
+<<set $activeSlaveOneTimeMaxAge = 42>>
<<include "Generate New Slave">>
<<set $activeSlave.origin = "She offered herself for voluntary enslavement to get to an arcology in which implants are uncommon, since she has a fear of surgery.">>
<<set $activeSlave.health = random(-20,20)>>
@@ -246,6 +293,22 @@
<<slaveCost $activeSlave>>
<<set $slaveCost -= 1000>>
+<<case "Body Purist Two">>
+
+<<set $contractCost = 1000>>
+<<set $activeSlaveOneTimeMinAge = 18>>
+<<set $activeSlaveOneTimeMaxAge = 24>>
+<<set $one_time_age_overrides_pedo_mode = 1>>
+<<include "Generate New Slave">>
+<<set $activeSlave.origin = "She offered herself for voluntary enslavement after graduating from a slave school and passing her majority, because she heard you treat slaves without implants well.">>
+<<set $activeSlave.age = random(18,24)>>
+<<set $activeSlave.career = "a student">>
+<<set $activeSlave.health = random(-20,20)>>
+<<set $activeSlave.devotion = random(-15,15)>>
+<<set $activeSlave.trust = random(-15,15)>>
+<<slaveCost $activeSlave>>
+<<set $slaveCost -= 1000>>
+
<<case "Youth Preferentialist">>
<<set $contractCost = 1000>>
@@ -267,6 +330,27 @@
<<slaveCost $activeSlave>>
<<set $slaveCost -= 1000>>
+<<case "Youth Preferentialist Two">>
+
+<<set $contractCost = 1000>>
+<<set $activeSlaveOneTimeMinAge = 18>>
+<<set $activeSlaveOneTimeMaxAge = 18>>
+<<set $one_time_age_overrides_pedo_mode = 1>>
+<<include "Generate New Slave">>
+<<set $activeSlave.origin = "She came to you for enslavement out of desperation, terrified that she was about to be asked to do something with her life by her family.">>
+<<set $activeSlave.health = random(-40,30)>>
+<<set $activeSlave.devotion = random(10,15)>>
+<<set $activeSlave.trust = random(-55,-75)>>
+<<set $activeSlave.intelligence = -2>>
+<<set $activeSlave.anus = random(2,3)>>
+<<set $activeSlave.weight = random(-80,-20)>>
+<<set $activeSlave.boobs -= 50*random(1,2)>>
+<<set $activeSlave.butt -= random(0,1)>>
+<<set $activeSlave.behavioralFlaw = either("odd", "anorexic", "gluttonous")>>
+<<set $activeSlave.sexualFlaw = either("repressed", "apathetic")>>
+<<slaveCost $activeSlave>>
+<<set $slaveCost -= 1000>>
+
<<case "Maturity Preferentialist">>
<<set $contractCost = 1000>>
@@ -295,9 +379,37 @@
<<slaveCost $activeSlave>>
<<set $slaveCost -= 1000>>
+<<case "Maturity Preferentialist Two">>
+
+<<set $contractCost = 3000>>
+<<include "Generate New Slave">>
+<<set $activeSlaveOneTimeMinAge = 25>>
+<<set $activeSlaveOneTimeMaxAge = 42>>
+<<set $one_time_age_overrides_pedo_mode = 1>>
+<<set $activeSlave.origin = "She was sold to you by her son, in order to raise funds for his business.">>
+<<set $activeSlave.boobs = random(4,6)*200>>
+<<set $activeSlave.weight = 20>>
+<<set $activeSlave.height to random(130,150)>>
+<<set $activeSlave.face = random(15,100)>>
+<<set $activeSlave.butt to random(3,4)>>
+<<set $activeSlave.lips to 1>>
+<<set $activeSlave.devotion = random(25,45)>>
+<<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.teeth = "normal">>
+<<set $activeSlave.pubicHStyle = "waxed">>
+<<set $activeSlave.behavioralFlaw = "arrogant">>
+<<set $activeSlave.pregTotal = 1>>
+<<slaveCost $activeSlave>>
+<<set $slaveCost -= 3000>>
+
<<case "Transformation Fetishist">>
<<set $contractCost = 1000>>
+<<set $activeSlaveOneTimeMaxAge = 42>>
<<include "Generate New Slave">>
<<set $activeSlave.origin = "You received her from a surgeon who botched an implant operation on her and needed to get her out of sight.">>
<<set $activeSlave.boobsImplant += random(10,20)*200>>
@@ -319,6 +431,33 @@
<<slaveCost $activeSlave>>
<<set $slaveCost -= 1000>>
+<<case "Transformation Fetishist Two">>
+
+<<set $contractCost = 1000>>
+<<set $activeSlaveOneTimeMinAge = 32>>
+<<set $activeSlaveOneTimeMaxAge = 42>>
+<<set $one_time_age_overrides_pedo_mode = 1>>
+<<include "Generate New Slave">>
+<<set $activeSlave.origin = "Her husband sold her into slavery to escape his debts.">>
+<<set $activeSlave.career = "a trophy wife">>
+<<set $activeSlave.boobsImplant += random(5,10)*200>>
+<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
+<<set $activeSlave.nipples = "tiny">>
+<<set $activeSlave.areolae = 2>>
+<<set $activeSlave.buttImplant += random(2,4)>>
+<<set $activeSlave.butt += $activeSlave.buttImplant>>
+<<set $activeSlave.lipsImplant += random(15,25)>>
+<<set $activeSlave.lips += $activeSlave.lipsImplant>>
+<<set $activeSlave.face = Math.clamp($activeSlave.face+20,-100,100)>>
+<<set $activeSlave.faceImplant += 40>>
+<<set $activeSlave.devotion = random(-100,-75)>>
+<<set $activeSlave.trust = random(-45,-25)>>
+<<set $activeSlave.health = random(-80,-70)>>
+<<set $activeSlave.pubicHStyle = "waxed">>
+<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy", "anorexic", "odd")>>
+<<slaveCost $activeSlave>>
+<<set $slaveCost -= 1000>>
+
<<case "Slimness Enthusiast">>
<<set $contractCost = 3000>>
@@ -346,6 +485,26 @@
<<slaveCost $activeSlave>>
<<set $slaveCost -= 3000>>
+<<case "Slimness Enthusiast Two">>
+
+<<set $contractCost = 3000>>
+<<set $activeSlaveOneTimeMaxAge = 24>>
+<<include "Generate New Slave">>
+<<set $activeSlave.origin = "She offered herself to you for enslavement to escape having plastic surgery foisted on her.">>
+<<set $activeSlave.boobs = random(4,6)*50>>
+<<set $activeSlave.weight = -20>>
+<<set $activeSlave.height to random(160,200)>>
+<<set $activeSlave.face = random(15,100)>>
+<<set $activeSlave.butt to random(1,2)>>
+<<set $activeSlave.lips to 0>>
+<<set $activeSlave.devotion = random(25,45)>>
+<<set $activeSlave.trust = random(25,45)>>
+<<set $activeSlave.health = random(-60,-50)>>
+<<set $activeSlave.teeth = "normal">>
+<<set $activeSlave.pubicHStyle = "waxed">>
+<<slaveCost $activeSlave>>
+<<set $slaveCost -= 3000>>
+
<<case "Asset Expansionist">>
<<set $contractCost = 1000>>
@@ -368,9 +527,33 @@
<<slaveCost $activeSlave>>
<<set $slaveCost -= 1000>>
+<<case "Asset Expansionist Two">>
+
+<<set $contractCost = 1000>>
+<<set $activeSlaveOneTimeMinAge = 28>>
+<<set $activeSlaveOneTimeMaxAge = 44>>
+<<set $one_time_age_overrides_pedo_mode = 1>>
+<<include "Generate New Slave">>
+<<set $activeSlave.origin = "She offered herself to you to escape enslavement in her homeland for being older and unmarried.">>
+<<set $activeSlave.age = random(28,$retirementAge)>>
+<<set $activeSlave.boobs += random(6,15)*200>>
+<<set $activeSlave.nipples = "inverted">>
+<<set $activeSlave.areolae = 3>>
+<<set $activeSlave.weight = random(50,150)>>
+<<set $activeSlave.butt += random(2,4)>>
+<<set $activeSlave.lips = 35>>
+<<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.pubicHStyle = "waxed">>
+<<slaveCost $activeSlave>>
+<<set $slaveCost -= 1000>>
+
<<case "Physical Idealist">>
<<set $contractCost = 1000>>
+<<set $activeSlaveOneTimeMaxAge = 42>>
<<include "Generate New Slave">>
<<set $activeSlave.origin = "She was voluntarily enslaved after she decided that your arcology was the best place for her to get the steroids that she'd allowed to define her life.">>
<<set $activeSlave.career = setup.uneducatedCareers.random()>>
@@ -384,9 +567,24 @@
<<slaveCost $activeSlave>>
<<set $slaveCost -= 1000>>
+<<case "Physical Idealist Two">>
+
+<<set $contractCost = 1000>>
+<<set $activeSlaveOneTimeMaxAge = 42>>
+<<include "Generate New Slave">>
+<<set $activeSlave.origin = "She was voluntarily enslaved after she decided that your arcology was the best place for her to get the steroids that she'd allowed to define her life.">>
+<<set $activeSlave.health = random(20,60)>>
+<<set $activeSlave.muscles = 100>>
+<<set $activeSlave.addict = 1>>
+<<set $activeSlave.devotion = random(0,15)>>
+<<set $activeSlave.trust = random(0,15)>>
+<<slaveCost $activeSlave>>
+<<set $slaveCost -= 1000>>
+
<<case "Chattel Religionist">>
<<set $contractCost = 1000>>
+<<set $activeSlaveOneTimeMaxAge = 42>>
<<include "Generate New Slave">>
<<set $activeSlave.origin = "She offered herself for enslavement out of religious conviction.">>
<<set $activeSlave.health = random(-10,10)>>
@@ -395,6 +593,150 @@
<<slaveCost $activeSlave>>
<<set $slaveCost -= 1000>>
+<<case "Hedonistic Decadence">>
+
+<<set $contractCost = 1000>>
+<<set $activeSlaveOneTimeMaxAge = 24>>
+<<include "Generate New Slave">>
+<<set $activeSlave.origin = "She sold herself to you to escape those who condemned her lifetyle.">>
+<<set $activeSlave.career = "a shut-in">>
+<<set $activeSlave.health = random(-40,20)>>
+<<set $activeSlave.devotion = random(35,45)>>
+<<set $activeSlave.trust = random(20,25)>>
+<<if $activeSlave.vagina > -1>>
+ <<set $activeSlave.vagina = 4>>
+<</if>>
+<<set $activeSlave.anus = 4>>
+<<if $activeSlave.ovaries == 1>>
+ <<set $activeSlave.preg = -1>>
+<</if>>
+<<set $activeSlave.weight = -15>>
+<<set $activeSlave.underArmHStyle = "bushy">>
+<<set $activeSlave.pubicHStyle = "bushy">>
+<<set $activeSlave.behavioralFlaw = "gluttonous">>
+<<set $activeSlave.sexualQuirk = "size queen">>
+<<set $activeSlave.tonguePiercing = 2>>
+<<set $activeSlave.nipplesPiercing = 2>>
+<<set $activeSlave.nosePiercing = 2>>
+<<set $activeSlave.earPiercing = 2>>
+<<set $activeSlave.lipsPiercing = 2>>
+<<set $activeSlave.vaginaPiercing = 2>>
+<<set $activeSlave.anusPiercing = 2>>
+<<set $activeSlave.eyebrowPiercing = 2>>
+<<set $activeSlave.navelPiercing = 2>>
+<<set $activeSlave.corsetPiercing = 1>>
+<<set $activeSlave.areolaePiercing = 1>>
+<<set $activeSlave.clothes = "a slutty outfit">>
+<<set $activeSlave.shoes = "heels">>
+<<set $slaves[$i].inflation = 3, $slaves[$i].inflationType = "food", $slaves[$i].inflationMethod = 1>>
+<<slaveCost $activeSlave>>
+<<set $slaveCost -= 1000>>
+
+<<case "Hedonistic Decadence Two">>
+
+<<set $contractCost = 1000>>
+<<set $activeSlaveOneTimeMaxAge = 24>>
+<<include "Generate New Slave">>
+<<set $activeSlave.origin = "She offered herself for enslavement in hope of being less dull.">>
+<<set $activeSlave.health = random(0,10)>>
+<<set $activeSlave.devotion = random(0,15)>>
+<<set $activeSlave.trust = random(10,25)>>
+<<set $activeSlave.behavioralFlaw = "none">>
+<<set $activeSlave.behavioralQuirk = "none">>
+<<set $activeSlave.sexualFlaw = "none">>
+<<set $activeSlave.sexualQuirk = "none">>
+<<set $activeSlave.fetish = "none">>
+<<set $activeSlave.fetishStrength = 0>>
+<<set $activeSlave.attrXX = 30>>
+<<set $activeSlave.attrXY = 30>>
+<<set $activeSlave.vagina = 0>>
+<<set $activeSlave.anus = 0>>
+<<slaveCost $activeSlave>>
+<<set $slaveCost -= 1000>>
+
+<<case "Repopulation Efforts">>
+
+<<set $contractCost = 1000>>
+<<if $pedo_mode == 1>>
+ <<set $activeSlaveOneTimeMinAge = $fertilityAge>>
+ <<set $activeSlaveOneTimeMaxAge = 18>>
+ <<set $one_time_age_overrides_pedo_mode = 1>> /% Can lactate. %/
+<<else>>
+ <<set $activeSlaveOneTimeMinAge = 14>>
+ <<set $activeSlaveOneTimeMaxAge = 30>>
+<</if>>
+<<include "Generate XX Slave">>
+<<set $activeSlave.origin = "She sold herself to you in the hopes that her body would help keep humanity alive.">>
+<<set $activeSlave.career = setup.youngCareers.random()>>
+<<set $activeSlave.health = random(40,60)>>
+<<set $activeSlave.devotion = random(25,35)>>
+<<set $activeSlave.trust = random(20,25)>>
+<<set $activeSlave.vagina = 0>>
+<<set $activeSlave.preg = 0>>
+<<set $activeSlave.pregType = 0>>
+<<set $activeSlave.fetish = "pregnancy">>
+<<slaveCost $activeSlave>>
+<<set $slaveCost -= 1000>>
+
+<<case "Repopulation Efforts Two">>
+
+<<set $contractCost = 1000>>
+<<if $pedo_mode == 1>>
+ <<set $activeSlaveOneTimeMinAge = $fertilityAge>>
+ <<set $activeSlaveOneTimeMaxAge = 18>>
+ <<set $one_time_age_overrides_pedo_mode = 1>> /% Can lactate. %/
+<<else>>
+ <<set $activeSlaveOneTimeMinAge = 18>>
+ <<set $activeSlaveOneTimeMaxAge = 30>>
+<</if>>
+<<include "Generate XX Slave">>
+<<set $activeSlave.origin = "She sold herself to you in the hope of someday bearing children.">>
+<<set $activeSlave.health = random(40,60)>>
+<<set $activeSlave.devotion = random(25,35)>>
+<<set $activeSlave.trust = random(20,25)>>
+<<set $activeSlave.vagina = 2>>
+<<set $activeSlave.preg = -2>>
+<<slaveCost $activeSlave>>
+<<set $slaveCost -= 1000>>
+
+<<case "Eugenics">>
+
+<<set $contractCost = 1000>>
+<<set $activeSlaveOneTimeMinAge = 10>>
+<<set $activeSlaveOneTimeMaxAge = 18>>
+<<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.health = random(20,40)>>
+<<set $activeSlave.devotion = random(-100,-90)>>
+<<set $activeSlave.trust = random(-100,-90)>>
+<<set $activeSlave.vagina = 0>>
+<<set $activeSlave.preg = 0>>
+<<set $activeSlave.behavioralFlaw = "arrogant">>
+<<slaveCost $activeSlave>>
+<<set $slaveCost -= 1000>>
+
+<<case "Eugenics Two">>
+
+<<set $contractCost = 1000>>
+<<set $activeSlaveOneTimeMaxAge = 42>>
+<<include "Generate New Slave">>
+<<set $activeSlave.origin = "She considered herself ugly and wished to stay out of your gene pool.">>
+<<set $activeSlave.health = random(0,60)>>
+<<set $activeSlave.trust = random(25,45)>>
+<<set $activeSlave.devotion = random(25,45)>>
+<<set $activeSlave.anus = random(1,2)>>
+<<set $activeSlave.face = random(-40,0)>>
+<<set $activeSlave.boobShape = "perky">>
+<<set $activeSlave.boobs = random(2,5)*100>>
+<<set $activeSlave.weight = 5>>
+<<set $activeSlave.waist = random(-60,0)>>
+<<set $activeSlave.teeth = "normal">>
+<<slaveCost $activeSlave>>
+<<set $slaveCost -= 1000>>
+
<<case "Roman Revivalist">>
<<set $contractCost = 1000>>
@@ -531,32 +873,35 @@ You receive so many messages, as a noted titan of the new Free Cities world, tha
This call is coming from a public kiosk, which is usually an indication that the person on the other end is a transient individual who has decided to take slavery over homelessness. This proves to be right on the money in this case, though the woman isn't too terribly bedraggled; her situation must be recent. She asks to be enslaved with the crushing sadness most such people experience during their last free hours. "I'm pregnant," she says through tears. "I know I'm not that pretty, <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>. But," and she brings her sizeable chest into view, "I've got pretty big boobs, and I started giving milk yesterday. I was searching the net, and I saw that you milk women, <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>. It seems like a better life than getting fucked all the time."
\
+<<case "Pastoralist Two">>\
+\
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+
+This call is coming from a public kiosk, which is usually an indication that the person on the other end is a transient individual who has decided to take slavery over homelessness. You are understandably surprised when this turns out to not be the case, the woman in the video call is modestly dressed; so her newfound situation must be exceedingly recent. Nonetheless, she asks to be enslaved with the same poignant sadness most people experience during their last free hours. "All my children are gone and my husband left me," she says through tears. "I know I'm older than most, <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>. But," and she brings her motherly chest into view, "I've still got pretty big breasts, and they still give milk. One of my friends told me that you milk women, <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>. I can't do anything else to make a living."
+\
<<case "Supremacist">>\
\
Ever since you have been steering $arcologies[0].name towards a belief in $arcologies[0].FSSupremacistRace supremacy, you've been receiving increasingly useful communications from groups that share your ideals. Many rebel, mercenary, and paramilitary groups active in conflict zones have racial beliefs of one stripe or other, and by taking the $arcologies[0].FSSupremacistRace side, you've automatically inserted yourself into a worldwide network of like-minded organizations. You receive an urgent communication from one such private military company.
It seems that they've run into a serious cash flow problem. They may not have liquid assets, but they do have human assets. What they lack is the slaveholding and selling infrastructure to translate the latter into the former. They're interested in fencing some merchandise to you, no questions asked, on a flat fee basis. Included in the message is a slave dossier detailing the piece of human chattel they're offering.
\
+<<case "Supremacist Two">>\
+\
+Ever since you have been steering $arcologies[0].name towards a belief in $arcologies[0].FSSupremacistRace supremacy, you've been receiving increasingly useful communications from groups that share your ideals. With much of the Old World in freefall many groups with particularly vehement racial beliefs are expanding unchecked by the mores of big government, and by taking the $arcologies[0].FSSupremacistRace side, you've automatically inserted yourself into a worldwide network of like-minded organizations. You receive a communication from one such group.
+
+It seems that in a man in their town made the mistake of marrying a woman of an undesirable racial background, and this group has stepped in to put an end to such a distasteful union. However, though they may be ruthless vigilantes, they don't consider themselves murderers. They're interested in fencing this former wife to you, no questions asked, on a flat fee basis. Included in the message is a slave dossier detailing the piece of human chattel they're offering.
+\
<<case "Subjugationist">>\
\
Your security drones break up a minor disturbance on the lowest, poorest levels of the arcology without needing your direction, or indeed without even informing you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> is good enough at filtering incidents down to what you need to know that you typically leave minor things to her discretion. This time $assistantName only informs you once it's apparent that that brawl left someone injured and unconscious.
It seems the violence was racially motivated. The $arcologies[0].FSSubjugationistRace victim was publicly sodomized and left bruised and bleeding, her clothes torn off, beaten into insensibility, with anti-$arcologies[0].FSSubjugationistRace slogans written crudely across her $activeSlave.skin skin. It seems she came into the arcology despite the strong penalties for free $arcologies[0].FSSubjugationistRace subhumans found here. You can easily enslave her in return for her medical costs, though no one is likely to object to your enslaving one of her kind, whatever the situation.
\
-<<case "Hedonistic Decadence">>\
+<<case "Subjugationist Two">>\
\
-<<Enunciate $activeSlave>>
You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
-This one is coming from inside your own arcology, from a tourist interested in permanent residence even if it means enslavement. You have them bought to your office to hear them out. A heavily pregnant girl waddles into your office, her distended belly a stark contrast to her relative thinness. She smiles, her many piercings clicking against each other in the process, and pats her middle. "It'<<s>> food, not a baby. I really enjoyed <<s>>taying in your arcology, I mean, I live like thi<<s>> back home, but everyone alway<<s>> pick<<s>> on me for eating <<s>>o much and never getting off my a<<ss>> to work. I can't find a lover either, no one can <<s>>ati<<s>>fy me anymore..." She exposes her gaping asshole to you. "I overdid it with the toy<<s>>. It felt <<s>>o good, I couldn't <<s>>top going bigger. Once I realized that, I <<s>>tarted getting piercing<<s>> and eating, anything to make me feel better. But on<<c>>e I arrived here, I never felt <<s>>o a<<c>>epted before, everyone wa<<s>> enjoying them<<s>>elve<<s>> however they wanted. <<S>>o plea<<s>>e, let me <<s>>tay, I'll do everything you can think of."
-\
-<<case "Repopulation Efforts">>\
-\
-You receive so many messages, as a noted titan of the new Free Cities world, that your personal assistant has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, are requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were. This one is interesting, even by the standards of messages from people who want to become slaves. The individual is neither sick nor abused, and speaks with directness. "I've heard a lot about how your arcology wishes to preserve humanity's place in the future," she says. "And, well, I don't know how closely you watch the old world from where you are, but things are falling apart. Humanity's future surely rests in the arcologies, and you seem to be the only one who's focusing on that future... As such, I want to become a mother to the future of humanity! Please, take me in and knock me up! I'll carry as many children as my body can take!"
-\
-<<case "Eugenics">>\
-\
-You receive so many messages, as a noted titan of the new Free Cities world, that your personal assistant has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through are potential applicants for the Societal Elite. As the new world takes shape, they've become more rare than they once were. This one is most mundane, a student with top grades wanting to be part of the top of society. Upon arriving for her evaluation, she begins droning on about her unimpressive achievements and pointless accomplishments. You review information on her lineage and connections, while feigning interest in her prattling. It would seem she is worth far less than she think she is.
+The caller is $arcologies[0].FSSubjugationistRace, and a particularly self-hating one at that. It seems she came into the arcology despite the strong penalties for free $arcologies[0].FSSubjugationistRace subhumans found here in order to seek enslavement, a curious turn of events. You can easily enslave her, no one is likely to object to your enslaving one of her kind, especially when she came so willingly.
\
<<case "Gender Radicalist">>\
\
@@ -564,66 +909,166 @@ You receive so many messages, as a noted titan of the new Free Cities world, tha
This one is from a rather abused individual from one of the more traditionalist areas of the old world. It seems she's heard of the new and interesting way gender is thought of in the Free Cities, and in $arcologies[0].name in particular. "Being your slave has to be better than being a subhuman here," she says. "Being your sex slave is more accepted in your city than being me is, here."
\
+<<case "Gender Radicalist Two">>\
+\
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+
+This one is from a rather mature but otherwise visibly well-to-do individual from one of the more traditionalist areas of the old world. It seems she's heard of the new and interesting way gender is thought of in the Free Cities, and in $arcologies[0].name in particular. "I've lived my whole life as a subhuman here," she says. "Being your sex slave is more accepted in your city than being me is, here."
+\
<<case "Gender Fundamentalist">>\
\
The sexual and moral revolution taking place in the Free Cites has spread back into the old world, producing an inevitable reaction. Thus there are still many places in the world where it is socially embarrassing for one's young female relatives to appear pregnant and unmarried, and where direct solutions to this unfortunate situation are frowned upon. You receive a communication from one such place, from a traditionalist family whose daughter has dishonored them in this way.
Having her disappear discreetly into $arcologies[0].name would be a convenient and face-saving way of resolving the situation. Your society's respect for slave pregnancy gives them a plausible way to salve their own consciences where the baby is concerned. As for the girl, having her out of the way is what matters to them.
\
+<<case "Gender Fundamentalist Two">>\
+\
+The sexual and moral revolution taking place in the Free Cites has spread back into the old world, producing an inevitable reaction. Thus there are still many places in the world where it is socially embarrassing for one's female relatives to be pregnant as a result of rape, and where direct solutions to this unfortunate situation are frowned upon. You receive a communication from one such place, from a traditionalist family whose mother was dishonored in this way.
+
+Having her disappear discreetly into $arcologies[0].name would be a convenient and face-saving way of resolving the situation. Your society's respect for slave pregnancy gives them a plausible way to salve their own consciences where the baby is concerned. As for the mother, having her out of the way is what matters to them.
+\
<<case "Paternalist">>\
\
You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
This one is interesting, even by the standards of messages from people who want to become slaves. The individual is neither sick nor abused, and speaks with intelligence and directness. "I've heard a lot about how $arcologies[0].name treats slaves," she says. "And, well, I don't know how closely you watch the old world from where you are, but it's pretty bad. Being smart and driven out here doesn't always keep you fed and clothed, or even alive. I'm smart and driven, and I understand that might make me a madam or a DJ or even a head girl in $arcologies[0].name. I'm not dumb enough to rely on that, but I'll take that chance."
\
+<<case "Paternalist Two">>\
+\
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+
+This one is interesting, even by the standards of messages from people who want to become slaves. The individual is a normal looking woman, neither sick nor visibly abused. "I've heard a lot about how $arcologies[0].name treats slaves," she says. "And, well, I don't know how closely you watch the old world from where you are, but it's pretty bad. Saving your whole life doesn't always keep you fed and clothed, or even alive. I never had much and now I have even less, and I'd rather live as your slave in $arcologies[0].name than on the streets back home."
+\
<<case "Degradationist">>\
\
<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> does not typically permit anonymous messages through to you. If someone wishes to speak to you, they can do so under their own name and with their own face. She makes an exception, however, for a message offering you a slave so long as you pay the costs of enslavement, nothing else.
The face and voice are obscured by a petty anonymization program, the sort that can be obtained with five minutes' work in the shadier parts of the net. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> could crack it nearly instantaneously, but you hold her back a moment to avoid spooking your correspondent. You are rewarded with video of the subject of the proposed enslavement, and the simple statement "I hate this fucking bitch, and I want her to suffer. Can't do it myself. You seem like the right <<if $PC.title == 1>>guy<<else>>woman<</if>> to break the cunt."
\
+<<case "Degradationist Two">>\
+\
+<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> does not typically permit anonymous messages through to you. If someone wishes to speak to you, they can do so under their own name and with their own face. She makes an exception, however, for a message offering you a slave so long as you pay the costs of enslavement, nothing else.
+
+In lieu of a face, a plain page of mostly text and a scant few pictures fills the screen and details a number of potential slaves for sale, though most of the merchandise seems visibly too damaged to be worthy of purchase. Yet, one of the slaves catches your eye - an older woman covered in lashes, bruises and marks yet absent the dead-eyed expression of her peers. The document claims she has been in their possession longer than any of the other slaves, but has proven resistant to their breaking methods.
+\
<<case "Body Purist">>\
\
You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
This one is from another arcology, which is rather unusual. You are presented with a rather normal-looking, if obviously poor, free citizen. She says dejectedly, "I'm on my last few ¤ here, <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>. The owner here, he's planning to enslave me later today. I just know it. He fills his slaves up with silicone until they look like fucking barbie dolls." She shivers fearfully. "You don't do that, right? If I have to be a fucktoy, I don't want to be cut up first."
\
+<<case "Body Purist Two">>\
+\
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+
+This one is from one of the less prestigious slave schools, which is not in itself unusual, save that it comes directly from one of the graduating students. You are presented with a rather normal-looking slavegirl. "I'm past my majority," she says happily. "I know I'm not that pretty, <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>. But," and she pulls the camera back to reveal her fully nude body, "I've never had any plastic in me, the school couldn't afford it anyways. I was searching the net, and I saw that like women without surgery, <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>. If I'm to be owned, I'd like it to be by someone like you who won't cut me open."
+\
<<case "Transformation Fetishist">>\
\
You receive a message coded urgent from a surgeon who you've hired in the past. You are on the point of opening the a call with a friendly businesslike salutation when you see his haggard, worried face, and change your greeting to one of commiseration and understanding. He pours out his troubles to you in a rush.
It seems he botched an implant operation on a free woman. She's still out, and the implants are in successfully, but she's not too far from dead and will remain so for some time. He needs her out of sight, now. With your pull, you could easily manipulate the financial situation to enslave her and get her out of the doctor's area at the same time. It would be a favor to him, and by the medical records, a favor to you too, once you nurse her back to health. She's quite the implant queen.
\
+<<case "Transformation Fetishist Two">>\
+\
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+
+The call comes in from an unusually well-to-do area. It appears that an aristocratic-looking man placing the call has fallen on hard times, and is doing the intelligent thing and staying ahead of his creditors by offering his trophy wife into slavery. Enslaving her will be costlier than usual, but it seems likely to be worth it. She's finely aged and completed worked over under a surgeon's knife. She's quite the implant queen, in fact.
+\
<<case "Slimness Enthusiast">>\
\
You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
The call comes in from an unusually well-to-do area. It appears that the aristocratic-looking woman placing the call has fallen on hard times, and is doing the intelligent thing and staying ahead of her creditors by offering herself into slavery. Enslaving her will be costlier than usual, but it seems likely to be worth it. She's well-spoken and seems both educated and intelligent. Even better, despite being middle-aged, she's extremely well-preserved, a tall, slim and graceful beauty with a face that must be the envy of girls half her age. She knows all this herself, and says, "I hear you appreciate a slender woman; if I'm going down into slavery, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I'd be happy to avoid too many implants. I understand $arcologies[0].name is a fine place for someone in my situation."
\
+<<case "Slimness Enthusiast Two">>\
+\
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+
+This call is coming from a public kiosk, which is usually an indication that the person on the other end is a transient individual who has decided to take slavery over homelessness. You are understandably surprised when this turns out to not be the case, the young woman in the video call is reasonably well dressed; so her newfound situation must be exceedingly recent. Without hesitation she immediately asks to be enslaved. "My boyfriend wants to turn me into some sort of bimbo," she says through tears. "I found all the surgery brochures that he hid, <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>. But," and she brings her slender chest, though covered by her top, into view, "I don't want to be cut up and filled with plastic. One of my friends told me that you care about woman with a good figure, <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>. I should have never sold myself to that bastard."
+\
<<case "Asset Expansionist">>\
\
You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
The person placing the call is physically quite unusual, to the point of looking distinctly unnatural. She has absolutely enormous tits, an ass to match, and is generally plush all over; yet despite being able to compete with the lushest mother in the curves department, she appears to be very young. She explains herself quickly. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I just turned 19. Where I'm from, that means I'm very likely to be enslaved one way or another. So, I've been taking off-market hormones for a couple of years to raise myself out of the gutter as far as who might take me. I hear life is better if you're a valuable slave." She leans into the camera, displaying a solid acre of cleavage. "Can I be your valuable slave?"
\
+<<case "Asset Expansionist Two">>\
+\
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+
+The person placing the call is physically quite unusual, to the point of looking distinctly unnatural. She has absolutely enormous tits, an ass to match, and is generally plush all over; perhaps one of the lushest mothers in the curves department you've ever seen. She explains herself quickly. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I'm not a young woman. Where I'm from, being this old and unmarried means I'm very likely to be enslaved one way or another. But I've always had big breasts. Well, big everything really. I hear life is better if you're a plush slave." She leans into the camera, displaying a solid acre of cleavage. "Can I be your plush slave?"
+\
<<case "Youth Preferentialist">>\
\
You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
This one, unusually, is voice-only. The caller explains why in a painfully quiet voice: she's turning $activeSlave.actualAge in the next few days, and she's fairly certain her family is about to sell her into slavery. The mixed notes of despair, apathy, and fear in her voice are heartrending, even to you. She begs you to make the necessary arrangements to enslave her. She's heard about you and how you like young girls, and she's also heard about brothels and arcades. There is very little hope discernible in her tone or the pictures she sends you,
\
+<<case "Youth Preferentialist Two">>\
+\
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+
+This one, unusually, is voice-only. The caller explains why in a unusually upbeat voice: she turned 18 a few days ago, and she's fairly certain her family is expecting her to make something of her life to help support them. The apathy to her family's wishes is readily evident in her tone of voice. She begs you to make the necessary arrangements to enslave her. She's heard about you and how you like younger girls, and that you take care of all the decision-making for your slaves. There's a lot of hope in her tone, she clearly wants an escape from responsibility - even if that means becoming a slave.
+\
<<case "Maturity Preferentialist">>\
\
You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
And this one is a rare one indeed. It's a personal file, and you suppress the urge to see whether $assistantName is bugged and has misfiled an application for employment. The beautiful older woman depicted has included a resume listing her skills, and a clever selection of photographs: tasteful shots of her in nice makeup and a fashionable business skirt, and fully nude mirror shots, flaws and all. Curious, you place a video call and get an immediate answer. It seems that 'personal circumstances' that she saw coming are forcing her to accept enslavement. She had some weeks of warning, however, and seems to have made use of the time to find an arcology owner that treats women of her age well, and then to make herself as appealing as possible in the hope you'll keep her.
\
+<<case "Maturity Preferentialist Two">>\
+\
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+
+The call comes in from a middle-class area. It appears that the youthful man placing the call has a failing business, and is leveraging his last remaining asset by selling his stately-looking mother into slavery. Enslaving her will be costlier than usual, but it seems likely to be worth it. From the dossier her son forwarded to you, she's both educated and intelligent, both relics of her impressive pedigree. Even better, she's aged like a fine wine, a short, stacked and attractive beauty with a face and rack that must be the envy of girls half her age. She's aware of the situation at hand, and peeks in from the corner of the screen to say, "I hear you appreciate a mature woman; if I'm going down into slavery, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I hope for your sake that you know how to treat a woman of my caliber."
+\
<<case "Physical Idealist">>\
\
You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
The subject line of the latest is badly misspelled, but the accompanying profile image is impressive, if trite, depicting the sender's massive bicep flexing, veins playing across the striated muscle. Getting her situation out of her proves to be something of a chore, since she scarcely has two functional neurons to rub together. It seems that she's on a fair number of drugs, not limited to aphrodisiacs and steroids, that she can't afford them, and that she has a distorted image of $arcologies[0].name as a sort of muscle-worshipping Valhalla of sex and gains. Hearing her describe her idea of life as one of your slaves, you understand why this idiot wants to be enslaved. If her idea of slave life were accurate, //you'd// want to be enslaved.
\
+<<case "Physical Idealist Two">>\
+\
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+
+And this one is a rare one indeed. It's a personal file, and you suppress the urge to see whether $assistantName is bugged and has misfiled an application for employment. The muscular woman depicted has included a resume listing her various physical achievements, and a clever selection of photographs: tantalizing shots of her in skimpy workout clothes, and fully nude mirror shots of her flexing and posing. Curious, you place a video call and get an immediate answer. It seems that she's determined that life as a slave is the easiest means to access the drugs and steroids she needs to continue making massive gains. She had some weeks of planning, however, and seems to have made use of the time to find an arcology owner that values the pursuit of the physical ideal, and then to make herself as appealing as possible in the hope you'll take her.
+\
+<<case "Hedonistic Decadence">>\
+\
+<<Enunciate $activeSlave>>
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+
+This one is coming from inside your own arcology, from a tourist interested in permanent residence even if it means enslavement. You have them bought to your office to hear them out. A heavily pregnant girl waddles into your office, her distended belly a stark contrast to her relative thinness. She smiles, her many piercings clicking against each other in the process, and pats her middle. "It'<<s>> food, not a baby. I really enjoyed <<s>>taying in your arcology, I mean, I live like thi<<s>> back home, but everyone alway<<s>> pick<<s>> on me for eating <<s>>o much and never getting off my a<<ss>> to work. I can't find a lover either, no one can <<s>>ati<<s>>fy me anymore..." She exposes her gaping asshole to you. "I overdid it with the toy<<s>>. It felt <<s>>o good, I couldn't <<s>>top going bigger. Once I realized that, I <<s>>tarted getting piercing<<s>> and eating, anything to make me feel better. But on<<c>>e I arrived here, I never felt <<s>>o a<<c>>epted before, everyone wa<<s>> enjoying them<<s>>elve<<s>> however they wanted. <<S>>o plea<<s>>e, let me <<s>>tay, I'll do everything you can think of."
+\
+<<case "Hedonistic Decadence Two">>\
+\
+<<Enunciate $activeSlave>>
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+
+This one is interesting, even by the standards of messages from people who want to become slaves. The individual is neither sick nor abused, and speaks with directness. "I'm what you'd call 'vanilla'," she sighs. "And, well, I want to expand my horizens and I heard how much fun people have in your arcology. I'm yours to experiment with.
+\
+<<case "Repopulation Efforts">>\
+\
+You receive so many messages, as a noted titan of the new Free Cities world, that your personal assistant has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, are requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were. This one is interesting, even by the standards of messages from people who want to become slaves. The individual is neither sick nor abused, and speaks with directness. "I've heard a lot about how your arcology wishes to preserve humanity's place in the future," she says. "And, well, I don't know how closely you watch the old world from where you are, but things are falling apart. Humanity's future surely rests in the arcologies, and you seem to be the only one who's focusing on that future... As such, I want to become a mother to the future of humanity! Please, take me in and knock me up! I'll carry as many children as my body can take!"
+\
+<<case "Repopulation Efforts Two">>\
+\
+You receive so many messages, as a noted titan of the new Free Cities world, that your personal assistant has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, are requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+
+This call is coming from a public kiosk, which is usually an indication that the person on the other end is a transient individual who has decided to take slavery over homelessness. You are understandably surprised when this turns out to not be the case, the young woman in the video call is reasonably well dressed, if rather upset over something. "I.. can't have children," she says through building tears. "I've always dreamed of being a mother, but I was born sterile... I heard rumors that $arcologies[0].name had cures for infertility, and if you'd help me, I would love to <<if $PC.title == 1>>have your children<<else>>get pregnant for you<</if>>. Even if the rest of my life was devoted to motherhood... I'd like that..."
+\
+<<case "Eugenics">>\
+\
+You receive so many messages, as a noted titan of the new Free Cities world, that your personal assistant has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through are potential applicants for the Societal Elite. As the new world takes shape, they've become more rare than they once were. This one is most mundane, a student with top grades wanting to be part of the top of society. Upon arriving for her evaluation, she begins droning on about her unimpressive achievements and pointless accomplishments. You review information on her lineage and connections, while feigning interest in her prattling. It would seem she is worth far less than she think she is.
+\
+<<case "Eugenics Two">>\
+\
+You receive so many messages, as a noted titan of the new Free Cities world, that your personal assistant has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, are requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+
+This call is coming from a public kiosk, which is usually an indication that the person on the other end is a transient individual who has decided to take slavery over homelessness. A rather homely face greets you, much to your displeasure. "I know I'm not much to look at, so I don't even want you to consider me more than just a slave. With the way things are going, I figured just getting it over with is the way to go."
+\
<<case "Chattel Religionist">>\
\
You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
@@ -659,6 +1104,7 @@ The call comes in from an old world university. The caller, surprisingly, is a b
You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
The call comes in from an office, and you suppress the urge to check whether $assistantName has misidentified a business communication. The caller is a middle-aged woman, not unattractive, whose face is lined with stress and worry. She draws herself up and says, "I would like to apply to be your slave." There is a flash of bitter amusement at the absurd statement, but she continues, "Business circumstances make it inevitable. I have considerable skills and experience, and it is my understanding that you value such things." She forwards her qualifications: they are comprehensive and open, including her sexual skills as if they were merely another business asset. Which, in a way, they are.
+\
<</switch>>\
<<include "Long Slave Description">>\
@@ -671,41 +1117,75 @@ The call comes in from an office, and you suppress the urge to check whether $as
<<switch $FSAcquisitionEvents>>\
<<case "Pastoralist">>\
She drags herself in, but as the enslavement process winds grindingly on, she shakes off her depression. The vast weight of her situation lifts from her. You've seen this before, the perverse internal freedom that comes with the knowledge that her life is in the hands of another now, and that all she has to do or can do is obey. Her last words to you as a free woman are an ironic statement that, when she was teased back in school for the size of her boobs, she never thought they'd save her one day.
+ <<case "Pastoralist Two">>\
+ She speaks to you as a free woman while working through the enslavement process, perhaps she hasn't quite grasped her new role. Nonetheless, it seems as if a vast weight has been lifted from her shoulders. You've seen this before, the perverse internal freedom that comes with the knowledge that her life is in the hands of another now, and that all she has to do or can do is obey. Her last words to you as a free woman are an ironic statement that, people always praised her milk filled udders as givers of life, yet she never thought they'd save hers one day.
<<case "Supremacist">>\
A battered VTOL craft arrives at $arcologies[0].name, broadcasting obviously bogus IFF codes. It seems this mercenary group is playing fast and loose in an attempt to get back on their feet. The aircraft doesn't even touch down on the pad they're directed to: it simply hovers six feet off the pad for the five seconds it takes to shove a canvas bag that obviously contains a struggling human form out of the side door.
+ <<case "Supremacist Two">>\
+ A clearly improvised VTOL craft arrives at $arcologies[0].name, broadcasting an erratic array of IFF codes. It seems this group hasn't quite mastered the intricacies of air travel. The aircraft doesn't seem capable of the delicate feat of landing on the pad it had been directed to: it simply hovers six feet off the pad for the five seconds it takes to shove a canvas bag that obviously contains a struggling human form out of the side door.
<<case "Subjugationist">>\
The enslavement process is disappointingly quiet, since she's still unconscious. As of this morning she was one of the last free $arcologies[0].FSSubjugationistRace people in the arcology. Now she's simply the newest sex slave of the inferior race to take her proper place.
+ <<case "Subjugationist Two">>\
+ The enslavement process is disappointingly quiet, since she does little more than stare blankly ahead and respond to any orders. As of this morning she was one of the last free $arcologies[0].FSSubjugationistRace people in the arcology. Now she's simply the newest, and perhaps most willing, sex slave of the inferior race to take her proper place.
<<case "Repopulation Efforts">>\
- When she arrives, she comes directly to your to your penthouse for enslavement. She wears an excited expression, having seen so many pregnant women on the way there, she can barely contain her enthusiasm. She eagerly strips for inspection revealing her moist pussy, it seems she may be more into pregnancy then she let on.
+ When she arrives, she comes directly to your to your penthouse for enslavement. She wears an excited expression, having seen so many pregnant women on the way there, she can barely contain her enthusiasm. She eagerly strips for inspection revealing her moist pussy, it seems she may be more into pregnancy then she let on.
+ <<case "Repopulation Efforts Two">>\
+ When she arrives, she is the very picture of a someone who has seen the light at the end of a very dark tunnel. She can't wait to get started making babies for you.
<<case "Eugenics">>\
You interrupt her rambling and bluntly inform her that she is useless to society. She steps back, insulted, and attempts a rebuttal. You cut her off again and tell her shes much more useful as your personal toy. She takes another step back and is promptly restrained before being dragged off to the autosurgeon.
<<set $activeSlave.preg = -2>>
<<set $activeSlave.ovaries = 0>>
<<set $activeSlave.balls = 0>>
+ <<case "Eugenics Two">>\
+ When she arrives, she comes directly to your to your penthouse for enslavement. Her face may painful to look at, but her body is not all bad; with a little work, she can be quite the catch. When she hears the news, her spirits are visibly lifted; she never thought she'd be so lucky.
<<case "Hedonistic Decadence">>\
She becomes elated when she hears she'll be allowed to stay. Even if she doesn't get to fulfill all her desires, her new life is more welcome than her rapidly ending prior one. She revealed as she is escorted to the slave quarters that she blew the last of her money on her visit here.
+ <<case "Hedonistic Decadence Two">>\
+ When she arrives, she comes directly to your penthouse for enslavement. She wears an expression of doubt, fear, and wonder as she takes in the sights and sounds of the magnificent beast that is the new society taking shape in $arcologies[0].name. The enslavement process requires her to be nude, of course, and it reveals she has no idea how to be sexy. She really is as boring as she said she was.
<<case "Gender Radicalist">>\
When she arrives, she comes directly to your penthouse for enslavement. She wears an expression of doubt, fear, and wonder as she takes in the sights and sounds of the magnificent beast that is the new society taking shape in $arcologies[0].name. The enslavement process requires her to be nude, of course, so she doesn't need to strip to offer herself to you when it's over. She doesn't even have to be prompted: she just gets down on the floor in front of your desk and offers you her fuckhole.
+ <<case "Gender Radicalist Two">>\
+ When she arrives, she comes directly to your penthouse for enslavement. She wears an expression of doubt, fear, and wonder as she takes in the sights and sounds of the magnificent beast that is the new society taking shape in $arcologies[0].name. The enslavement process requires her to be nude, of course, so she doesn't need to strip to offer herself to you when it's over. She doesn't even have to be prompted: she just gets down on the floor in front of your desk and offers you her fuckhole.
<<case "Gender Fundamentalist">>\
When she arrives, she is the very picture of a lost and very pregnant young waif. She clearly feels some hope at leaving her traditionalist home for a more modern society, but she has just as clearly heard enough about the Free Cities to know that she's likely to buy her presence here through long years of sexual labor. She sighs with relief at getting off her feet when the enslavement process finally allows her to sit.
+ <<case "Gender Fundamentalist Two">>\
+ When she arrives, she is the very picture of a distraught and very pregnant mature woman. She clearly feels some resentment at her traditionalist home and family for selling her into slavery, but she has just as clearly heard enough about the Free Cities to know that she's likely traded one form of marginalization for another.
<<case "Paternalist">>\
She speaks to you as a free woman throughout the enslavement process, but as soon as it is completed, she stops and waits for instruction before talking. She does not look directly at your face, but keeps her gaze lower than that, and stands expectant and ready for commands. You are reminded of her intelligence by her precisely correct behavior for a new slave, even before you give any kind of direction.
+ <<case "Paternalist Two">>\
+ She speaks to you as a free woman throughout the enslavement process, but as soon as it is completed, she stops and waits for instruction before talking. She may not have had many prospects in her life back home, but if she remains this obedient she'll fit right in here in the Free Cities.
<<case "Degradationist">>\
When she arrives as part of the anonymous slave transfers that make up a good part of the inter-arcology commerce, she has clearly had some time to mull over her situation. As soon as she sees you, she blurts out, "Whatever that fucker told you, it isn't true. I'll be your little bitch bimbo, whatever you want. Just don't - just don't fucking hurt me." She sticks out her chest in a clear attempt to entice you with her fake tits.
+ <<case "Degradationist Two">>\
+ When she arrives as part of the anonymous slave transfers that make up a good part of the inter-arcology commerce, she has clearly had some time to mull over her situation. As soon as she sees you, she glares deep into your eyes and addresses you directly, "Those fuckers threw everything they could at me, you can't break me. No one can."
<<case "Body Purist">>\
When she arrives, it's obvious that she isn't particularly happy with the situation, but there is some evident relief to her. When asked about it, she says, "I really hate the idea of surgery, especially implant surgery, M-<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>. Just - the idea of having fake shit in here -" she rubs her chest a little "- ugh." She laughs bitterly at herself, and then rubs her chest again, looking at you with mixed fear and invitation.
+ <<case "Body Purist Two">>\
+ When she arrives, it's obvious that she's fairly happy. After all, the slave school trained her for this. When asked about it, she says, "Some of the girls who graduated before me were given implants, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>. Just - the idea of having fake shit in here -" she rubs her chest a little "- ugh. I'm glad you're not into that" She laughs bitterly at herself, and then rubs her chest again, looking at you with mixed fear and invitation.
<<case "Transformation Fetishist">>\
She arrives with various medical devices still attached to her, wrapped up in supportive hospital clothing. Despite this, it's obvious that you've made a good decision. The new tits that got her into this situation are so cartoonish that some of the medical tubing has been hastily routed between them. After a few weeks on curatives and a few more in training, she'll be ready to bounce those fake boobs up and down as she takes dick.
+ <<case "Transformation Fetishist Two">>\
+ She arrives unapologetically in her fine clothing. "I'm not sorry," she says harshly, "but I'm wearing my best one last time whether you like it or not." Eventually she sighs, squares her shoulders, and visibly steels herself. "I'll say as a free woman, since it's my last chance to say anything as a free woman, you're good-looking, for an evil slaveholding oligarch." She delivers this last with a little smile on her plush lips and a sense of bitter irony in her voice. "If we'd met at a nice party last week I might have made a pass at you. You'd be a better choice than my ex-husband at least."
<<case "Slimness Enthusiast">>\
She arrives apologizing for her fine clothing. "I'm sorry," she apologizes sadly, "but I wanted to wear my best one last time." She sighs, squares her shoulders, and visibly steels herself. "I'll say as a free woman, since it's my last chance to say anything as a free woman, you're good-looking, for an evil slaveholding oligarch." She delivers this last with a little smile on her lips and rich turn of humor in her voice. "If we'd met at a nice party last week I might have made a pass at you. I suppose that's beside the point now."
+ <<case "Slimness Enthusiast Two">>\
+ When she arrives, she is the very picture of a young waif out of her depth. It's clear she feels relief and escaping going under the knife, but she knows enough about the Free Cities to know that she's likely to buy her presence here through long years of sexual labor.
<<case "Asset Expansionist">>\
When she arrives, it's clear she's nobody's fool. She comes without personal effects of any kind, and is wearing cheap, sturdy clothes to travel in, since she knows she'll be taking them off immediately. She does, without being told, just as soon as the enslavement formalities are out of the way. Her breasts are capped by titanic, puffy nipples; she notices you appreciating them and gives you a hesitant little smile, swaying her shoulders back and forth a little to set her flesh deliciously into motion.
+ <<case "Asset Expansionist Two">>\
+ When she arrives, it's clear she's nobody's fool. She comes without personal effects of any kind, and is wearing cheap, sturdy clothes to travel in, since she knows she'll be taking them off immediately. She does, without being told, just as soon as the enslavement formalities are out of the way. Her breasts are capped by titanic, puffy nipples; she notices you appreciating them and gives you a hesitant little smile, swaying her shoulders back and forth a little to set her flesh deliciously into motion.
<<case "Physical Idealist">>\
She gets through the enslavement process without breaking anything, mostly due to your increasingly exasperated supervision. You wondered whether the destruction of her moronic ideas about life as one of your slaves was going to cause an explosion, but it seems that she's under fewer illusions than you thought. She's obviously familiar with getting fucked as a way of earning her keep, and hangs around, flexing idly and clearly wondering when you'll get on with it.
+ <<case "Physical Idealist Two">>\
+ When she arrives, you're impressed again. She's even more muscular in person than in her pictures. "<<Master>>," she growls, "I've done my very best to be the biggest, strongest slave before coming here. May I show you?" More than a little curious, you nod. She reaches down to place a palm on the ground. "Well, <<Master>>, I had a month. So I did my best to get in shape." She suddenly flips as if starting a cartwheel, but stops suspended in midair, holding her entire muscular frame off the ground with just one hand planted on the floor. She turns slowly, revealing the base of an impressively large buttplug nestling between her cheeks. She knows her audience.
<<case "Youth Preferentialist">>\
Your slaving network gets her out of her difficult situation without trouble, forwarding her the necessary travel documents. When she arrives, she displays the clear signs of someone who has learned to avoid abuse: she takes no initiative and does nothing without instructions, just standing dumbly until ordered; when told what to do, she does it quickly and carefully. Though her mind is not broken, there is something dead lurking in her eyes. When she looks at you, it is with the watchful caution of an abused animal.
+ <<case "Youth Preferentialist Two">>\
+ Your slaving network extracts her from her family's grasp easily, forwarding her the necessary travel documents. When she arrives, she displays the clear signs of someone who's never had to think for themselves: she takes no initiative and does nothing without instructions, just standing dumbly until ordered; when told what to do, she does it quickly and carefully. Though her mind is not broken, there's clearly not a lot in there. Being a slave may actually be her most fitting vocation.
<<case "Maturity Preferentialist">>\
When she arrives, you're impressed again. She elected to appear in black lace lingerie, and stalks into your office on high heels with a calculated sensuality. "<<Master>>," she purrs, "I've done my very best to get ready to be a good slave. May I show you?" More than a little curious, you nod. She starts to strip slowly and skillfully. "Well, <<Master>>, I had a month. So I did my best to get in shape." She rubs her hands down her toned belly, hooking fingers under her thong. "I practiced stripping. I practiced blowjobs." She turns slowly, revealing the base of an impressively large buttplug nestling between her cheeks. "I even practiced buttsex."
+ <<case "Maturity Preferentialist Two">>\
+ She arrives apologizing for her fine clothing. "I'm sorry," she apologizes sadly, "but I wanted to wear my best one last time." She sighs, squares her shoulders, and visibly steels herself. "My son's a bastard for selling me to you, and all to save that useless store of his." She delivers this last with a bitter smile on her lips. "At least he had the sense to sell me to someone with exquisite taste, like you. After all, you did buy me."
<<case "Chattel Religionist">>\
She lets out a convulsive sob when you accept her servitude, and is painfully obsequious as you complete the formalities of enslavement. Your exam reveals several minor indications of self-harm - chewed nails, bitten lips, and such. But for all that, a remarkable look of peace has settled on the poor woman's face. She waits patiently for a hint of your will, <<if $activeSlave.dick > 0>>her cock painfully erect<<else>>her pussy visibly moist<</if>> at the prospect of the servile sex she is convinced is her duty.
<<case "Roman Revivalist">>\
@@ -728,36 +1208,72 @@ The call comes in from an office, and you suppress the urge to check whether $as
<<switch $FSAcquisitionEvents>>\
<<case "Pastoralist">>\
She drags herself in, but as the enslavement process winds grindingly on, she shakes off her depression. It threatens to descend again when a purchaser's agent comes in to take her away. She begs to know where she's going, so you tell her she's to be a cow in a slave dairy. She quails at the term, but you observe that she'll be well treated and lightly used, if at all, and she seems to take heart at this.
+ <<case "Pastoralist Two">>\
+ She speaks to you as a free woman while working through the enslavement process, perhaps she hasn't quite grasped her new role. Nonetheless, it seems as if a vast weight has been lifted from her shoulders. It threatens to descend again when a purchaser's agent comes in to take her away. She begs to know where she's going, so you tell her she's to be a cow in a slave dairy. She quails at the term, but you observe that she'll be well treated and lightly used, if at all, and she seems to take heart at this.
<<case "Supremacist">>\
A battered VTOL craft arrives at $arcologies[0].name, broadcasting obviously bogus IFF codes. It seems this mercenary group is playing fast and loose in an attempt to get back on their feet. The aircraft doesn't even touch down on the pad they're directed to: it simply hovers six feet off the pad for the five seconds it takes to shove a canvas bag that obviously contains a struggling human form out of the side door. You decide to do the simple thing, and leave the bag where it is. The purchaser's agent can deal with it.
+ <<case "Supremacist Two">>\
+ A clearly improvised VTOL craft arrives at $arcologies[0].name, broadcasting an erratic array of IFF codes. It seems this group hasn't quite mastered the intricacies of air travel. The aircraft doesn't seem capable of the delicate feat of landing on the pad it had been directed to: it simply hovers six feet off the pad for the five seconds it takes to shove a canvas bag that obviously contains a struggling human form out of the side door. You decide to do the simple thing, and leave the bag where it is. The purchaser's agent can deal with it.
<<case "Subjugationist">>\
The purchasing agent is businesslike, even hurried. The inert slave receives a simple check, with some industrious fingering of orifices, and is bundled off. As is appropriate.
+ <<case "Subjugationist Two">>\
+ The enslavement process is disappointingly quiet, since she does little more than stare blankly ahead and respond to any orders. As of this morning she was one of the last free $arcologies[0].FSSubjugationistRace people in the arcology. Now she's simply the newest, and perhaps most willing, sex slave of the inferior race to take her proper place. She's taken away by a purchasing agent soon after.
<<case "Repopulation Efforts">>\
When she arrives, she comes directly to your to your penthouse for enslavement. She wears an excited expression, having seen so many pregnant women on the way there, she can barely contain her enthusiasm. She eagerly strips for inspection revealing her moist pussy, it seems she may be more into pregnancy then she let on. You shake your head to her as a purchaser's agent appears to take her away. She asks if she'll still be impregnated and the agent nods approvingly. She seems slightly downtrodden that she won't be yours but she accepts the fact that she'll still be useful to your future.
+ <<case "Repopulation Efforts Two">>\
+ When she arrives, she is the very picture of a someone who has seen the light at the end of a very dark tunnel. She can't wait to get started making babies for you. A purchaser's agent arrives to take charge of her and she pleads not to leave her infertile. You abate her fears, her fertility will be restored. Her new owner likes to experiment with fertility agents; she'll quickly be pregnant with <<if $seeHyperPreg == 1>>dozens of children<<else>>multiples<</if>>. Her face alights at the thought. She'll finally have all the children she'd dreamed of.
<<case "Eugenics">>\
You interrupt her rambling and bluntly inform her that she is useless to society. She steps back, insulted, and attempts a rebuttal. You cut her off again and tell her another of the Societal Elite has taken interest in making her his pet. She takes another step back and is promptly restrained before being dragged off to her new owner.
+ <<case "Eugenics Two">>\
+ When she arrives, she comes directly to your to your penthouse for enslavement. Her face may painful to look at, but her body is not all bad; with a little work, she can be quite the catch. A purchaser's agent appears to take her away, and she quietly asks who's bought her. A plastic surgeon, you tell her, who sees a diamond in the rough. She's speechless.
<<case "Hedonistic Decadence">>\
- You inform her that she will be staying in your arcology, but not under you. She has been purchased by a feeding trainer interested in slim girls with massive stomach capacities for entry into the eating competitions that have become so popular lately. She seems elated at the news, "<<S>>tuffing i<<s>> one of my favorite perver<<s>>ion<<s>>..." You cut her off and inform her that her current belly pales in comparison to her new owner's previous champion. She should expect to be tied up and filled until her entire body is filled to capacity with slave food. She gulps nervously as she escorted out by the portly purchasing agent to her new home.
+ You inform her that she will be staying in your arcology, but not under you. She has been purchased by a feeding trainer interested in slim girls with massive stomach capacities for entry into the eating competitions that have become so popular lately. She seems elated at the news, "<<S>>tuffing i<<s>> one of my favorite perver<<s>>ion<<s>>..." You cut her off and inform her that her current belly pales in comparison to her new owner's previous champion. She should expect to be tied up and force fed until her entire body is filled to capacity with slave food. She gulps nervously as she escorted out by the portly purchasing agent to her new home.
+ <<case "Hedonistic Decadence Two">>\
+ When she arrives, she comes directly to your penthouse for enslavement. She wears an expression of doubt, fear, and wonder as she takes in the sights and sounds of the magnificent beast that is the new society taking shape in $arcologies[0].name. A purchaser's agent arrives to take charge of her, and she asks politely who bought her. A man with an oviposition fetish, you tell her. She fails to grasp the meaning. You explain to her that eggs will be stuck into all her holes until she can't stomach any more. She turns beat red at the description, so you carry on. Her new owner will likely remodel her cervix to allow eggs to be pumped directly into her womb; she'll be lucky if she can stand once he's done with her, then she'll have to look forward to laying them all for his amusement. Her hands have since moved to her crotch, it seems she's getting into the fantasy.
<<case "Gender Radicalist">>\
When she arrives, she comes directly to your penthouse for enslavement. She wears an expression of doubt, fear, and wonder as she takes in the sights and sounds of the magnificent beast that is the new society taking shape in $arcologies[0].name. A purchaser's agent arrives to take charge of her, and she asks politely who bought her. A salon, you tell her; she'll be trained to wait tables, serve drinks, and entertain customers with her mouth and anus.
+ <<case "Gender Radicalist Two">>\
+ When she arrives, she comes directly to your penthouse for enslavement. She wears an expression of doubt, fear, and wonder as she takes in the sights and sounds of the magnificent beast that is the new society taking shape in $arcologies[0].name. A purchaser's agent arrives to take charge of her, and she asks politely who bought her. A salon, you tell her; she'll be trained to wait tables, serve drinks, and entertain customers with her mouth and anus.
<<case "Gender Fundamentalist">>\
When she arrives, she is the very picture of a lost and very pregnant young waif. She clearly feels some hope at leaving her traditionalist home for a more modern society, but she has just as clearly heard enough about the Free Cities to know that she's likely to buy her presence here through long years of sexual labor. A purchaser's agent appears to take her away, and she quietly asks who's bought her. A breeder, you tell her, who prefers stock proven to be fertile. She'll probably manage 20 pregnancies or so, before she's retired.
+ <<case "Gender Fundamentalist Two">>\
+ When she arrives, she is the very picture of a distraught and very pregnant mature woman. She clearly feels some resentment at her traditionalist home and family for selling her into slavery, but she has just as clearly heard enough about the Free Cities to know that she's likely traded one form of marginalization for another. A purchaser's agent appears to take her away, and she quietly asks who's bought her. A breeder, you tell her, who prefers to squeeze a few pregnancies out of mature women. She'll probably manage a few pregnancies before she's retired.
<<case "Paternalist">>\
She speaks to you as a free woman throughout the enslavement process, but as soon as it is completed, she stops and waits for instruction before talking. She does not look directly at your face, but keeps her gaze lower than that, and stands expectant and ready for commands. You are reminded of her intelligence by her presence of mind when a purchaser's agent arrives to take charge of her; she clearly calculates that making a scene will gain her nothing, and cooperates. You reward this by telling her the truth: she's been sold to a citizen of $arcologies[0].name who shares paternalistic beliefs; she'll be fine.
+ <<case "Paternalist Two">>\
+ She speaks to you as a free woman throughout the enslavement process, but as soon as it is completed, she stops and waits for instruction before talking. She may not have had many prospects in her life back home, but if she remains this obedient she'll fit right in here in the Free Cities. When the purchasing agent arrives she is momentarily surprised but not alarmed, she figures she'll been sold to a citizen of $arcologies[0].name who shares paternalistic beliefs.
<<case "Degradationist">>\
When she arrives as part of the anonymous slave transfers that make up a good part of the inter-arcology commerce, she has clearly had some time to mull over her situation. As soon as she sees you, she blurts out, "Whatever that fucker told you, it isn't true. I'll be your little bitch bimbo, whatever you want. Just don't - just don't fucking hurt me." She sticks out her chest in a clear attempt to entice you with her fake tits, and is rewarded with a bag over her head, courtesy of the purchaser's agent who arrived in the meantime. The agent clearly felt that she would be a handful worth corralling quickly, and this proves correct. She goes limp after being tazed, though.
+ <<case "Degradationist Two">>\
+ When she arrives as part of the anonymous slave transfers that make up a good part of the inter-arcology commerce, she has clearly had some time to mull over her situation. As soon as she sees you, she glares deep into your eyes and addresses you directly, "Those fuckers threw everything they could at me, you can't break me. No one can." She is rewarded with a bag over her head, courtesy of the purchaser's agent who arrived in the meantime. The agent clearly felt that she would be a handful worth corralling quickly, and this proves correct. She goes limp after being tazed, though.
<<case "Body Purist">>\
When she arrives, it's obvious that she isn't particularly happy with the situation, but there is some evident relief to her. It vanishes when a purchaser's agent arrives to take her away. She looks at you desperately, begging to know who's purchased her. You tell her truthfully that a wealthy citizen one arcology over bought her as a house slave; you neglect to mention that he likes big tits, and he isn't particular about whether they're natural.
+ <<case "Body Purist Two">>\
+ When she arrives, it's obvious that she's fairly happy. After all, the slave school trained her for this. When asked about it, she says, "Some of the girls who graduated before me were given implants, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>. Just - the idea of having fake shit in here -" she rubs her chest a little "- ugh. I'm glad you're not into that" She laughs bitterly at herself, and then rubs her chest again, looking at you with mixed fear and invitation. Her playfulness vanishes when a purchaser's agent arrives to take her away. She looks at you desperately, begging to know who's purchased her. You tell her truthfully that a wealthy citizen one arcology over bought her as a house slave; you neglect to mention that he likes big tits, and he isn't particular about whether they're natural.
<<case "Transformation Fetishist">>\
The only downside to her condition is that reselling her is utterly anticlimactic. A purchaser's agent arrives and takes charge of her, transferring her to a medical transport bed. He takes her away, and it's done.
+ <<case "Transformation Fetishist Two">>\
+ She arrives unapologetically in her fine clothing. "I'm not sorry," she says harshly, "but I'm wearing my best one last time whether you like it or not." Eventually she sighs, squares her shoulders, and visibly steels herself. She's about to declaim something when a purchaser's agent arrives to bundle her off. Her face darkens and she mulls something over, probably preparing a really cutting remark, but before she can deliver it the agent fastens a bag over her head and she is heard no more.
<<case "Slimness Enthusiast">>\
She arrives apologizing for her fine clothing. "I'm sorry," she apologizes sadly, "but I wanted to wear my best one last time." She sighs, squares her shoulders, and visibly steels herself. She's about to declaim something when a purchaser's agent arrives to bundle her off. Her face darkens and she mulls something over, probably preparing a really cutting remark, but before she can deliver it the agent fastens a bag over her head and she is heard no more.
+ <<case "Slimness Enthusiast Two">>\
+ When she arrives, she is the very picture of a young waif out of her depth. It's clear she feels relief and escaping going under the knife, but she knows enough about the Free Cities to know that she's likely to buy her presence here through long years of sexual labor. A purchaser's agent appears to take her away, and she quietly asks who's bought her. A citizen, you tell her, who prefers his women slender and unimplanted. She seems relieved by this.
+ <<case "Asset Expansionist">>\
+ When she arrives, it's clear she's nobody's fool. She comes without personal effects of any kind, and is wearing cheap, sturdy clothes to travel in, since she knows she'll be taking them off immediately. She does, without being told, just as soon as the enslavement formalities are out of the way. Her breasts are capped by titanic, puffy nipples; she notices you appreciating them and gives you a hesitant little smile, swaying her shoulders back and forth a little to set her flesh deliciously into motion. Her playfulness vanishes when a purchaser's agent arrives to take her away. She looks at you desperately, begging to know who's purchased her. You tell her truthfully that a wealthy citizen one arcology over bought her as a house slave; you neglect to mention that he likes big tits.
+ <<case "Asset Expansionist Two">>\
+ When she arrives, it's clear she's nobody's fool. She comes without personal effects of any kind, and is wearing cheap, sturdy clothes to travel in, since she knows she'll be taking them off immediately. She does, without being told, just as soon as the enslavement formalities are out of the way. Her breasts are capped by titanic, puffy nipples; she notices you appreciating them and gives you a hesitant little smile, swaying her shoulders back and forth a little to set her flesh deliciously into motion. Her playfulness vanishes when a purchaser's agent arrives to take her away. She looks at you desperately, begging to know who's purchased her. You tell her truthfully that a wealthy citizen one arcology over bought her as a house slave; you neglect to mention that he likes big tits.
<<case "Physical Idealist">>\
She gets through the enslavement process without breaking anything, mostly due to your increasingly exasperated supervision. Her buyer's agent arrives to take her away, and it takes the poor man ten minutes to get the situation through her thick skull. He sees the beginnings of rage building in her as she realizes how she's been tricked, but he's a quick draw, and before she can do anything he's got his tazer unholstered and deployed. The bitch gives off an antediluvian roar as she goes stiff as a board and crashes to the floor.
+ <<case "Physical Idealist Two">>\
+ When she arrives, you're impressed again. She's even more muscular in person than in her pictures. "<<Master>>," she growls, "I've done my very best to be the biggest, strongest slave before coming here. May I show you?" Though more than a little curious, the arrival of the purchasing agent cuts short any theatrics. Though initially confused, the promise of steroids and other drugs by her new owner has her follow the agent out of your penthouse without fuss.
<<case "Youth Preferentialist">>\
Your slaving network gets her out of her difficult situation without trouble, forwarding her the necessary travel documents. When she arrives, she displays the clear signs of someone who has learned to avoid abuse: she takes no initiative and does nothing without instructions, just standing dumbly until ordered; when told what to do, she does it quickly and carefully. When a buyer's agent arrives to take her away, she follows him without a backward glance.
+ <<case "Youth Preferentialist Two">>\
+ Your slaving network extracts her from her family's grasp easily, forwarding her the necessary travel documents. When she arrives, she displays the clear signs of someone who's never had to think for themselves: she takes no initiative and does nothing without instructions, just standing dumbly until ordered; when told what to do, she does it quickly and carefully. Though her mind is not broken, there's clearly not a lot in there. Being a slave may actually be her most fitting vocation. When a buyer's agent arrives to take her away, she follows him without a backward glance, clearly unaware of who he is.
<<case "Maturity Preferentialist">>\
She and the buyer's agent arrive at the same time. She accepts this defeat with good grace, and cooperates with him as best she can. She gives you a single questioning glance, with just a glint of hope; you take pity, and tell her she won't be going far. She's to be employed in one of the arcology's better MILF brothels. She'll be fucked ten times tomorrow, it's true, but she'll be well treated when she doesn't have dicks in her.
+ <<case "Maturity Preferentialist Two">>\
+ She arrives apologizing for her fine clothing. "I'm sorry," she apologizes sadly, "but I wanted to wear my best one last time." She sighs, squares her shoulders, and visibly steels herself. "My son's a bastard for selling me to you, and all to save that useless store of his." She delivers this last with a bitter smile on her lips. "At least he had the sense to sell me to someone with exquisite taste, like you. After all, you did buy me." She's about to declaim something else when a purchaser's agent arrives to bundle her off. Her face darkens and she mulls something over, probably preparing a really cutting remark, but before she can deliver it the agent fastens a bag over her head and she is heard no more.
<<case "Chattel Religionist">>\
She lets out a convulsive sob when you accept her servitude, and is painfully obsequious as you complete the formalities of enslavement. When her buyer arrives to take her away, the realization agonizes her, but she snuffs out her saddened reaction almost as soon as it dawns on her face. She visibly draws herself up, obviously telling herself that service under one master is as righteous as service under another.
<<case "Roman Revivalist">>\
diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index fcc87ea16f7a0ef4b9dab652cc4dc3d087be5ba7..c2b050fdfede198a08e524c4dd6a97b66a41aa5e 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -234,6 +234,8 @@
<<if ($nickname is "nationality")>>
<<if ($activeSlave.nationality is "Afghan")>>
<<set $nickname to either("'Bactrian'", "'Chai Girl'", "'Kabul'", "'Pashtun'", "'Poppy'", "'Taliban'")>>
+ <<elseif ($activeSlave.nationality is "Albanian")>>
+ <<set $nickname to either("'Hoxha'", "'Tirana'")>>
<<elseif ($activeSlave.nationality is "Algerian")>>
<<set $nickname to either("'Casbah'", "'Corsair'", "'Djamila'", "'Hassiba'", "'Pied-Noir'", "'Zhora'", "Harki")>>
<<elseif ($activeSlave.nationality is "American")>>
@@ -250,14 +252,22 @@
<<set $nickname to either("'Bengali'", "'Bhibhi'", "'Dhaka'", "'Sweatshop'", "'Tiger'")>>
<<elseif ($activeSlave.nationality is "Belgian")>>
<<set $nickname to either("'Antwerp'", "'Brussels'", "'Sprout'", "'Straatmeid'", "'Truttemie'")>>
+ <<elseif ($activeSlave.nationality is "Bermudian")>>
+ <<set $nickname to either("'Bermuda Triangle'", "'Hamilton'")>>
<<elseif ($activeSlave.nationality is "Bolivian")>>
<<set $nickname to either("'La Paz'", "'Titicaca'")>>
<<elseif ($activeSlave.nationality is "Brazilian")>>
<<set $nickname to either("'7-1'", "'Bunda'", "'Dago'", "'Favelada'", "'Hue'", "'Ipanema'", "'Monkey'", "'São Paulo'", "'Zika'", "'Bauru'","'Carmen Miranda'")>>
<<elseif ($activeSlave.nationality is "British")>>
<<set $nickname to either("'Britbong'", "'Chav'", "'Fish'n'Chips'", "'Limey'", "'London'", "'Pikey'", "'Pommie'", "'Rosbif'", "'Scrubber'", "'Slag'", "'Slapper'", "'Brexit'")>>
+ <<elseif ($activeSlave.nationality is "Bruneian")>>
+ <<set $nickname to either("'Abode of Peace'", "'Bandar Seri Begawan'")>>
<<elseif ($activeSlave.nationality is "Burmese")>>
<<set $nickname to either("'Burma Shave'", "'Burmese Python'", "'Golden Triangle'", "'Rangoon'")>>
+ <<elseif ($activeSlave.nationality is "Cambodian")>>
+ <<set $nickname to either("'Angkor Wat'", "'Holiday in Cambodia'", "'Phnom Penh'")>>
+ <<elseif ($activeSlave.nationality is "Cameroonian")>>
+ <<set $nickname to either("'Douala'", "'Yaoundé'")>>
<<elseif ($activeSlave.nationality is "Canadian")>>
<<set $nickname to either("'Canuck'", "'Loonie'", "'Maple Syrup'", "'Mountie'", "'Poutine'", "'Toronto'", "'Yukon'")>>
<<elseif ($activeSlave.nationality is "Chilean")>>
@@ -274,6 +284,8 @@
<<set $nickname to either("'Bohemian'", "'Czechnya'", "'Kunda'")>>
<<elseif ($activeSlave.nationality is "Danish")>>
<<set $nickname to either("'Copenhagen'", "'Ludertæve'", "'Tøs'", "'Viking'")>>
+ <<elseif ($activeSlave.nationality is "Djiboutian")>>
+ <<set $nickname to either("'Ifat'", "'Tadjoura'")>>
<<elseif ($activeSlave.nationality is "Dutch")>>
<<set $nickname to either("'Amsterdam'", "'Cheesehead'", "'Slaaf'", "'Slet'")>>
<<elseif ($activeSlave.nationality is "Egyptian")>>
@@ -290,12 +302,16 @@
<<set $nickname to either("'Helinski'", "'Mämmi'", "'Perkele'", "'Saunagirl'", "'Winter War'")>>
<<elseif ($activeSlave.nationality is "French")>>
<<set $nickname to either("'Belle'", "'Fille de Joie'", "'Mademoiselle'", "'Marseille'", "'Paris'", "'Surrender Monkey'", "'Charlie Hebdo'")>>
+ <<elseif ($activeSlave.nationality is "Gabonese")>>
+ <<set $nickname to either("'Bongo'", "'Libreville'")>>
<<elseif ($activeSlave.nationality is "German")>>
<<set $nickname to either("'Berlin'", "'Bratwurst'", "'Fraulein'", "'Kraut'", "'Oktoberfest'", "'Piefke'", "'Valkyrie'", "'Dresden'", "'Prussian'", "'Bavarian'", "'Nazi'", "'Saupreiß'")>>
<<elseif ($activeSlave.nationality is "Ghanan")>>
<<set $nickname to either("'Akan'", "'Gold Coast'", "'Warrior Queen'", "'Shaman Queen'")>>
<<elseif ($activeSlave.nationality is "Greek")>>
<<set $nickname to either("'Debts'", "'Ionian'", "'Spartan'")>>
+ <<elseif ($activeSlave.nationality is "Greenlandic")>>
+ <<set $nickname to either("'Eskimo'", "'Nuuk'")>>
<<elseif ($activeSlave.nationality is "Guatemalan")>>
<<set $nickname to either("'Guatemalan'", "'Mayan'")>>
<<elseif ($activeSlave.nationality is "Haitian")>>
@@ -340,10 +356,16 @@
<<set $nickname to either("'Kuala Lumpur'", "'Malay Girl'", "'Pirate'")>>
<<elseif ($activeSlave.nationality is "Malian")>>
<<set $nickname to either("'Mandinka'", "'Mansa Musa'", "'Sahel'", "'Timbuktu'", "'Trans-Sahara'")>>
+ <<elseif ($activeSlave.nationality is "Marshallese")>>
+ <<set $nickname to either("'Bikini Atoll'", "'Majuro'")>>
<<elseif ($activeSlave.nationality is "Mexican")>>
<<set $nickname to either("'Beaner'", "'Burrito'", "'Cartel'", "'Chiquita'", "'Fence Hopper'", "'Headless'", "'Juarez'", "'Malinche'", "'Mamacita'", "'Senorita'", "'Sinaloa'", "'Taco'", "'Tijuana'", "'Wetback'")>>
+ <<elseif ($activeSlave.nationality is "Monégasque")>>
+ <<set $nickname to either("'Grace Kelly'", "'Monte Carlo'")>>
+ <<elseif ($activeSlave.nationality is "Montenegrin")>>
+ <<set $nickname to either("'Black Mountain'", "'Podgorica'")>>
<<elseif ($activeSlave.nationality is "Moroccan")>>
- <<set $nickname to either("'Casablanca'")>>
+ <<set $nickname to either("'Casablanca'", "'Rabat'")>>
<<elseif ($activeSlave.nationality is "Nepalese")>>
<<set $nickname to either("'Katmandu'", "'Nepali'", "'Sherpa'")>>
<<elseif ($activeSlave.nationality is "a New Zealander")>>
@@ -368,10 +390,14 @@
<<set $nickname to either("'Bucharest'", "'Ceausescu'", "'Dracula'", "'Gypsy'", "'Impaler'", "'Orphan'", "'Roma'")>>
<<elseif ($activeSlave.nationality is "Russian")>>
<<set $nickname to either("'Commie'", "'Cyka'", "'Mail Order'", "'Moscow'", "'Moskal'", "'Red Banner'", "'Russkie'", "'Siberian Kitten'", "'Slav'", "'Suka'", "'Tovarishina'", "'Tsaritsa'", "'Vodka'", "'Hammer & Sickle'", "'Bolshevik'", "'Kacap'")>>
+ <<elseif ($activeSlave.nationality is "Sammarinese")>>
+ <<set $nickname to either("'Saint Marinus'", "'Three Towers'")>>
<<elseif ($activeSlave.nationality is "Saudi")>>
<<set $nickname to either("'Burqua'", "'Mecca'", "'Riyadh'", "'Sandy'", "'Al Qaeda'")>>
<<elseif ($activeSlave.nationality is "Serbian")>>
<<set $nickname to either("'Belgrade'", "'Picka'", "'Remove Kebab'")>>
+ <<elseif ($activeSlave.nationality is "Singaporean")>>
+ <<set $nickname to either("'Bedok'", "'Merlion'")>>
<<elseif ($activeSlave.nationality is "Slovak")>>
<<set $nickname to either("'Bratislava'", "'Bzdocha'", "'Shlapka'")>>
<<elseif ($activeSlave.nationality is "South African")>>
@@ -384,6 +410,8 @@
<<set $nickname to either("'Ikea'", "'Norse'", "'Stockholm'", "'Sweden Yes'")>>
<<elseif ($activeSlave.nationality is "Swiss")>>
<<set $nickname to either("'Alpine'", "'Geneva'", "'Numbered Account'", "'Schlampe'", "'Zurich'", "'Neutral'", "'Banker'")>>
+ <<elseif ($activeSlave.nationality is "Syrian")>>
+ <<set $nickname to either("'Aleppo'", "'Damascus'")>>
<<elseif ($activeSlave.nationality is "Tanzanian")>>
<<set $nickname to either("'Wilderness'", "'Zanzibar'")>>
<<elseif ($activeSlave.nationality is "Thai")>>
@@ -392,10 +420,14 @@
<<set $nickname to either("'Barbary'", "'Carthaginian'", "'Ifriqiya'", "'Punic'")>>
<<elseif ($activeSlave.nationality is "Turkish")>>
<<set $nickname to either("'Ankara'", "'Harem'", "'Istanbul'", "'Kebab'", "'Ottoman'", "'Turkette'", "'Turkish'", "'Turksmell'", "'ErdoÄŸan'")>>
+ <<elseif ($activeSlave.nationality is "Tuvaluan")>>
+ <<set $nickname to either("'Ellice'", "'Funafuti'")>>
<<elseif ($activeSlave.nationality is "Ugandan")>>
<<set $nickname to either("'Bushbaby'", "'Cannibal'", "'Kampala'")>>
<<elseif ($activeSlave.nationality is "Ukrainian")>>
<<set $nickname to either("'Chernobyl'", "'Chiki Briki'", "'Cossack'", "'Crimea'", "'Donbass'", "'Euromaidan'", "'Holhina'", "'Holhushka'", "'Kiev'", "'Mail Order'", "'Radioactive'", "'Salo'", "'Stalker'", "'Suki'", "'Svoboda'", "'Bandera'")>>
+ <<elseif ($activeSlave.nationality is "Uruguayan")>>
+ <<set $nickname to either("'Garra Charrúa'", "'Montevideo'")>>
<<elseif ($activeSlave.nationality is "Uzbek")>>
<<set $nickname to either("'Samarkand'", "'Silk Road'", "'Steppe Princess'", "'Steppe Queen'", "'Tashkent'")>>
<<elseif ($activeSlave.nationality is "Venezuelan")>>
@@ -404,6 +436,8 @@
<<set $nickname to either("'Charlie'", "'VC'", "'Saigon'", "'Hanoi'", "'Me Love You Long Time'", "'Me So Horny'", "'Victor Charlie'", "'Viet'")>>
<<elseif ($activeSlave.nationality is "Yemeni")>>
<<set $nickname to either("'Khat'", "'Red Sea Pirate'", "'Queen of the Desert'")>>
+ <<elseif ($activeSlave.nationality is "Zambian")>>
+ <<set $nickname to either("'Livingstone'", "'Lusaka'")>>
<<elseif ($activeSlave.nationality is "Zimbabwean")>>
<<set $nickname to either("'Bobojan'", "'Grimmy'", "'Harare'", "'Kaffir'", "'Mugabe'", "'Mujiba'", "'Nyombie'", "'Rhodie'", "'Zimbo'")>>
<<elseif ($activeSlave.nationality is "Dominican")>>
diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw
index 690b3e67afb32c69ad1fc1e80193b5de0a07a092..b1daa78f1db05b8fbd86a5d9e0b51f4e5f03b5ef 100644
--- a/src/uncategorized/saRelationships.tw
+++ b/src/uncategorized/saRelationships.tw
@@ -173,7 +173,7 @@
<<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID>>
<<break>>
<<else>>
- _SlaveI.slaveName tries to renew her relationship relationship with _SlaveJ.slaveName and is @@.gold;punished@@ for breaking the rules against such things; she @@.mediumorchid;resents@@ being prevented from reuniting with her.
+ _SlaveI.slaveName tries to renew her relationship with _SlaveJ.slaveName and is @@.gold;punished@@ for breaking the rules against such things; she @@.mediumorchid;resents@@ being prevented from reuniting with her.
<<set _SlaveI.devotion -= 2, _SlaveI.trust -= 2>>
<</if>>
<</if>>
diff --git a/src/uncategorized/slaveGenerationWidgets.tw b/src/uncategorized/slaveGenerationWidgets.tw
index 7d2866d435743ecc481fb00bae087aa880bedcf9..212b96d6a6a138d868dbe649cd065095bd9836eb 100644
--- a/src/uncategorized/slaveGenerationWidgets.tw
+++ b/src/uncategorized/slaveGenerationWidgets.tw
@@ -447,6 +447,80 @@
<<else>>
<<set $args[0].accent = _naturalAccent>>
<</if>>
+<<case "Sammarinese">>
+ <<if $language == "Italian">>
+ <<set $args[0].accent = 1>>
+ <<else>>
+ <<set $args[0].accent = _naturalAccent>>
+ <</if>>
+<<case "Marshallese">>
+ <<set $args[0].accent = _naturalAccent>>
+<<case "Syrian">>
+ <<if $language == "Arabic">>
+ <<set $args[0].accent = 1>>
+ <<else>>
+ <<set $args[0].accent = _naturalAccent>>
+ <</if>>
+<<case "Bermudian">>
+ <<if $language == "English">>
+ <<set $args[0].accent = 1>>
+ <<else>>
+ <<set $args[0].accent = _naturalAccent>>
+ <</if>>
+<<case "Uruguayan">>
+ <<if $language == "Spanish">>
+ <<set $args[0].accent = 1>>
+ <<else>>
+ <<set $args[0].accent = _naturalAccent>>
+ <</if>>
+<<case "Monégasque">>
+ <<if $language == "French">>
+ <<set $args[0].accent = 1>>
+ <<else>>
+ <<set $args[0].accent = _naturalAccent>>
+ <</if>>
+<<case "Montenegrin")>>
+ <<set $args[0].accent = $seed>>
+<<case "Cambodian")>>
+ <<set $args[0].accent = $seed>>
+<<case "Cameroonian">>
+ <<if $language == "French">>
+ <<set $args[0].accent = 1>>
+ <<else>>
+ <<set $args[0].accent = _naturalAccent>>
+ <</if>>
+<<case "Gabonese">>
+ <<if $language == "French">>
+ <<set $args[0].accent = 1>>
+ <<else>>
+ <<set $args[0].accent = _naturalAccent>>
+ <</if>>
+<<case "Djiboutian">>
+ <<if $language == "French">>
+ <<set $args[0].accent = 1>>
+ <<else>>
+ <<set $args[0].accent = _naturalAccent>>
+ <</if>>
+<<case "Greenlandic")>>
+ <<set $args[0].accent = $seed>>
+<<case "Tuvaluan")>>
+ <<set $args[0].accent = $seed>>
+<<case "Zambian">>
+ <<if $language == "English">>
+ <<set $args[0].accent = 1>>
+ <<else>>
+ <<set $args[0].accent = _naturalAccent>>
+ <</if>>
+<<case "Albanian")>>
+ <<set $args[0].accent = $seed>>
+<<case "Bruneian")>>
+ <<set $args[0].accent = $seed>>
+<<case "Singaporean")>>
+ <<if $language == "English">>
+ <<set $args[0].accent = 1>>
+ <<else>>
+ <<set $args[0].accent = _naturalAccent>>
+ <</if>>
<<case "Roman Revivalist">>
<<if $language == "Latin">>
<<set $args[0].accent = 0>>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index dea075bad1290a83eeeb32da4cb2babd23ea1ea4..d2561dad525d558c961d6cb2b037f9e25f3891a1 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -82,6 +82,42 @@
<</if>>
<<switch _Pass>>
<<case "Main">>
+ /*
+ <<if $slaveAssignmentTab == "overview">>
+ <<if $showOneSlave == "Head Girl">>
+ <<if (_Slave.assignment != "be your Head Girl")>><<continue>><</if>>
+ <<elseif $showOneSlave == "recruit girls">>
+ <<if (_Slave.assignment != "recruit girls")>><<continue>><</if>>
+ <<elseif $showOneSlave == "guard you">>
+ <<if (_Slave.assignment != "guard you")>><<continue>><</if>>
+ <</if>>
+
+ <<elseif $slaveAssignmentTab == "resting">>
+ <<if _Slave.assignment != "rest">><<continue>><</if>>
+ <<elseif $slaveAssignmentTab == "stay confined">>
+ <<if (_Slave.assignment != "stay confined")>><<continue>><</if>>
+ <<elseif $slaveAssignmentTab == "take classes">>
+ <<if (_Slave.assignment != "take classes")>><<continue>><</if>>
+ <<elseif $slaveAssignmentTab == "please you">>
+ <<if (_Slave.assignment != "please you")>><<continue>><</if>>
+ <<elseif $slaveAssignmentTab == "whore">>
+ <<if (_Slave.assignment != "whore")>><<continue>><</if>>
+ <<elseif $slaveAssignmentTab == "serve the public">>
+ <<if (_Slave.assignment != "serve the public")>><<continue>><</if>>
+ <<elseif $slaveAssignmentTab == "be a servant">>
+ <<if (_Slave.assignment != "be a servant")>><<continue>><</if>>
+ <<elseif $slaveAssignmentTab == "get milked">>
+ <<if (_Slave.assignment != "get milked")>><<continue>><</if>>
+ <<elseif $slaveAssignmentTab == "work a glory hole">>
+ <<if (_Slave.assignment != "work a glory hole")>><<continue>><</if>>
+ <<elseif $slaveAssignmentTab == "be a subordinate slave">>
+ <<if (_Slave.assignment != "be a subordinate slave")>><<continue>><</if>>
+ <<elseif $slaveAssignmentTab == "all">>
+ <<if (_Slave.assignment == "be your Head Girl")
+ || (_Slave.assignment == "recruit girls")
+ || (_Slave.assignment == "guard you")>><<continue>><</if>>
+ <</if>>
+ */
<<if (_Slave.choosesOwnClothes == 1) && (_Slave.clothes == "choosing her own clothes")>>
<<set $i = _ssi, _oldDevotion = _Slave.devotion>>
<<silently>><<include "SA chooses own clothes">><</silently>>
@@ -93,7 +129,8 @@
<<elseif "guard you" == _Slave.assignment>>''@@.lightcoral;BG@@''
<</if>>
<<if $personalAttention == _Slave.ID>>''@@.lightcoral;PA@@''<</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
+ <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">> /* lists their names */
+
<<case "Personal Attention Select">>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
<<print "[[_slaveName|Personal Attention Select][$personalAttention = $slaves["+_ssi+"].ID, $activeSlave = $slaves["+_ssi+"], $personalAttentionChanged = 1]]">>
@@ -527,165 +564,165 @@ will
<<case "Main">>
<<continue>>
<<case "HG Select">>
-<<if setup.HGCareers.includes(_Slave.career)>>
- <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@
-<</if>>
+ <<if setup.HGCareers.includes(_Slave.career)>>
+ <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@
+ <</if>>
<<case "Head Girl Suite">>
-<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
-<<if $Flag == 0>>
- <<print "[[Send her to live with your Head Girl|Assign][$i = "+_ssi+"]]">>
-<<else>>
- <<print "[[Bring her out of the Head Girl's suite|Retrieve][$i = "+_ssi+"]]">>
- <<break>>
-<</if>>
+ <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
+ <<if $Flag == 0>>
+ <<print "[[Send her to live with your Head Girl|Assign][$i = "+_ssi+"]]">>
+ <<else>>
+ <<print "[[Bring her out of the Head Girl's suite|Retrieve][$i = "+_ssi+"]]">>
+ <<break>>
+ <</if>>
<<case "Recruiter Select">>
-<<if setup.recruiterCareers.includes(_Slave.career)>>
- <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@
-<</if>>
+ <<if setup.recruiterCareers.includes(_Slave.career)>>
+ <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@
+ <</if>>
<<case "BG Select">>
-<<if setup.bodyguardCareers.includes(_Slave.career)>>
- <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@
-<</if>>
+ <<if setup.bodyguardCareers.includes(_Slave.career)>>
+ <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@
+ <</if>>
<<case "Spa">>
-<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
-<<if $Flag == 0>>
- <<print "[[Send her to the Spa|Assign][$i = "+_ssi+"]]">>
-<<elseif $Flag == 1>>
- <<print "[[Remove her from the Spa|Retrieve][$i = "+_ssi+"]]">>
-<<else>>
- [[Change or remove Attendant|Attendant Select]]
- <<break>>
-<</if>>
+ <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
+ <<if $Flag == 0>>
+ <<print "[[Send her to the Spa|Assign][$i = "+_ssi+"]]">>
+ <<elseif $Flag == 1>>
+ <<print "[[Remove her from the Spa|Retrieve][$i = "+_ssi+"]]">>
+ <<else>>
+ [[Change or remove Attendant|Attendant Select]]
+ <<break>>
+ <</if>>
<<case "Attendant Select">>
-<<if setup.attendantCareers.includes(_Slave.career)>>
- <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@
-<</if>>
+ <<if setup.attendantCareers.includes(_Slave.career)>>
+ <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@
+ <</if>>
<<case "Brothel">>
-<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
-<<if $Flag == 0>>
- <<print "[[Send her to the Brothel|Assign][$i = "+_ssi+"]]">>
-<<elseif $Flag == 1>>
- <<print "[[Release her from the Brothel|Retrieve][$i = "+_ssi+"]]">>
-<<else>>
- [[Change or remove Madam|Madam Select]]
- <<break>>
-<</if>>
+ <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
+ <<if $Flag == 0>>
+ <<print "[[Send her to the Brothel|Assign][$i = "+_ssi+"]]">>
+ <<elseif $Flag == 1>>
+ <<print "[[Release her from the Brothel|Retrieve][$i = "+_ssi+"]]">>
+ <<else>>
+ [[Change or remove Madam|Madam Select]]
+ <<break>>
+ <</if>>
<<case "Madam Select">>
-<<if setup.madamCareers.includes(_Slave.career)>>
- <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@
-<</if>>
+ <<if setup.madamCareers.includes(_Slave.career)>>
+ <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@
+ <</if>>
<<case "Club">>
-<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
-<<if $Flag == 0>>
- <<print "[[Send her to the Club|Assign][$i = "+_ssi+"]]">>
-<<elseif $Flag == 1>>
- <<print "[[Remove her from the Club|Retrieve][$i = "+_ssi+"]]">>
-<<else>>
- [[Change or remove DJ|DJ Select]]
- <<break>>
-<</if>>
+ <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
+ <<if $Flag == 0>>
+ <<print "[[Send her to the Club|Assign][$i = "+_ssi+"]]">>
+ <<elseif $Flag == 1>>
+ <<print "[[Remove her from the Club|Retrieve][$i = "+_ssi+"]]">>
+ <<else>>
+ [[Change or remove DJ|DJ Select]]
+ <<break>>
+ <</if>>
<<case "Arcade">>
-<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
-<<if $Flag == 0>>
- <<print "[[Confine her in the Arcade|Assign][$i = "+_ssi+"]]">>
-<<else>>
- <<print "[[Release her from the Arcade|Retrieve][$i = "+_ssi+"]]">>
-<</if>>
+ <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
+ <<if $Flag == 0>>
+ <<print "[[Confine her in the Arcade|Assign][$i = "+_ssi+"]]">>
+ <<else>>
+ <<print "[[Release her from the Arcade|Retrieve][$i = "+_ssi+"]]">>
+ <</if>>
<<case "DJ Select">>
-<<if setup.DJCareers.includes(_Slave.career)>>
- <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@
-<</if>>
+ <<if setup.DJCareers.includes(_Slave.career)>>
+ <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@
+ <</if>>
<<case "Clinic">>
-<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
- <<if $clinicUpgradeScanner == 1>>
- @@.cyan;Estimated DNA error value: <<print Math.ceil(_Slave.chem/10)>>@@
+ <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
+ <<if $clinicUpgradeScanner == 1>>
+ @@.cyan;Estimated DNA error value: <<print Math.ceil(_Slave.chem/10)>>@@
+ <</if>>
+ <<if $Flag == 0>>
+ <<print "[[Send her to the Clinic|Assign][$i = "+_ssi+"]]">>
+ <<elseif $Flag == 1>>
+ <<print "[[Take her out of the Clinic|Retrieve][$i = "+_ssi+"]]">>
+ <<else>>
+ [[Change or remove Nurse|Nurse Select]]
+ <<break>>
<</if>>
-<<if $Flag == 0>>
- <<print "[[Send her to the Clinic|Assign][$i = "+_ssi+"]]">>
-<<elseif $Flag == 1>>
- <<print "[[Take her out of the Clinic|Retrieve][$i = "+_ssi+"]]">>
-<<else>>
- [[Change or remove Nurse|Nurse Select]]
- <<break>>
-<</if>>
<<case "Nurse Select">>
-<<if setup.nurseCareers.includes(_Slave.career)>>
- <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@
-<</if>>
+ <<if setup.nurseCareers.includes(_Slave.career)>>
+ <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@
+ <</if>>
<<case "Schoolroom">>
-<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
-<<if $Flag == 0>>
- <<print "[[Assign her to the Schoolroom|Assign][$i = "+_ssi+"]]">>
-<<elseif $Flag == 1>>
- <<print "[[Release her from the Schoolroom|Retrieve][$i = "+_ssi+"]]">>
-<<else>>
- [[Change or remove Schoolteacher|Schoolteacher Select]]
- <<break>>
-<</if>>
+ <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
+ <<if $Flag == 0>>
+ <<print "[[Assign her to the Schoolroom|Assign][$i = "+_ssi+"]]">>
+ <<elseif $Flag == 1>>
+ <<print "[[Release her from the Schoolroom|Retrieve][$i = "+_ssi+"]]">>
+ <<else>>
+ [[Change or remove Schoolteacher|Schoolteacher Select]]
+ <<break>>
+ <</if>>
<<case "Schoolteacher Select">>
-<<if setup.schoolteacherCareers.includes(_Slave.career)>>
- <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@
-<</if>>
+ <<if setup.schoolteacherCareers.includes(_Slave.career)>>
+ <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@
+ <</if>>
<<case "Dairy">>
-<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
-<<if $Flag == 0>>
- <<print "[[Send her to the Dairy|Assign][$i = "+_ssi+"]]">>
-<<elseif $Flag == 1>>
- <<print "[[Release her from the Dairy|Retrieve][$i = "+_ssi+"]]">>
-<<else>>
- [[Change or remove Milkmaid|Milkmaid Select]]
- <<break>>
-<</if>>
+ <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
+ <<if $Flag == 0>>
+ <<print "[[Send her to the Dairy|Assign][$i = "+_ssi+"]]">>
+ <<elseif $Flag == 1>>
+ <<print "[[Release her from the Dairy|Retrieve][$i = "+_ssi+"]]">>
+ <<else>>
+ [[Change or remove Milkmaid|Milkmaid Select]]
+ <<break>>
+ <</if>>
<<case "Milkmaid Select">>
-<<if setup.milkmaidCareers.includes(_Slave.career)>>
- <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@
-<</if>>
+ <<if setup.milkmaidCareers.includes(_Slave.career)>>
+ <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@
+ <</if>>
<<case "Servants' Quarters">>
-<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
-<<if $Flag == 0>>
- <<print "[[Assign her to the Servants' Quarters|Assign][$i = "+_ssi+"]]">>
-<<elseif $Flag == 1>>
- <<print "[[Release her from the Servants' Quarters|Retrieve][$i = "+_ssi+"]]">>
-<<else>>
- [[Change or remove Stewardess|Stewardess Select]]
- <<break>>
-<</if>>
+ <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
+ <<if $Flag == 0>>
+ <<print "[[Assign her to the Servants' Quarters|Assign][$i = "+_ssi+"]]">>
+ <<elseif $Flag == 1>>
+ <<print "[[Release her from the Servants' Quarters|Retrieve][$i = "+_ssi+"]]">>
+ <<else>>
+ [[Change or remove Stewardess|Stewardess Select]]
+ <<break>>
+ <</if>>
<<case "Stewardess Select">>
-<<if setup.stewardessCareers.includes(_Slave.career)>>
- <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@
-<</if>>
+ <<if setup.stewardessCareers.includes(_Slave.career)>>
+ <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@
+ <</if>>
<<case "Master Suite">>
<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
-<<if $Flag == 0>>
- <<print "[[Add her to the Suite|Assign][$i = "+_ssi+"]]">>
-<<elseif $Flag == 1>>
- <<print "[[Send her out of the Suite|Retrieve][$i = "+_ssi+"]]">>
-<<else>>
- [[Change or remove Concubine|Concubine Select]]
- <<break>>
-<</if>>
+ <<if $Flag == 0>>
+ <<print "[[Add her to the Suite|Assign][$i = "+_ssi+"]]">>
+ <<elseif $Flag == 1>>
+ <<print "[[Send her out of the Suite|Retrieve][$i = "+_ssi+"]]">>
+ <<else>>
+ [[Change or remove Concubine|Concubine Select]]
+ <<break>>
+ <</if>>
<<case "Cellblock">>
-<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
-<<if $Flag == 0>>
- <<print "[[Confine her in the cellblock|Assign][$i = "+_ssi+"]]">>
-<<elseif $Flag == 1>>
- <<print "[[Release her from the cellblock|Retrieve][$i = "+_ssi+"]]">>
-<<else>>
- [[Change or remove Wardeness|Wardeness Select]]
- <<break>>
-<</if>>
+ <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
+ <<if $Flag == 0>>
+ <<print "[[Confine her in the cellblock|Assign][$i = "+_ssi+"]]">>
+ <<elseif $Flag == 1>>
+ <<print "[[Release her from the cellblock|Retrieve][$i = "+_ssi+"]]">>
+ <<else>>
+ [[Change or remove Wardeness|Wardeness Select]]
+ <<break>>
+ <</if>>
<<case "Wardeness Select">>
-<<if setup.wardenessCareers.includes(_Slave.career)>>
- <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@
-<</if>>
+ <<if setup.wardenessCareers.includes(_Slave.career)>>
+ <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@
+ <</if>>
<<case "New Game Plus">>
<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
-<<if $Flag == 0>>
- <<print "[[Add to import list|NGP Workaround][$slavesToImport = 1, $i = "+_ssi+"]]">>
-<<else>>
- <<print "[[Remove from import list|NGP Workaround][$slavesToImport = 0, $i = "+_ssi+"]]">>
- <<set $slavesToImport += 1>>
-<</if>>
+ <<if $Flag == 0>>
+ <<print "[[Add to import list|NGP Workaround][$slavesToImport = 1, $i = "+_ssi+"]]">>
+ <<else>>
+ <<print "[[Remove from import list|NGP Workaround][$slavesToImport = 0, $i = "+_ssi+"]]">>
+ <<set $slavesToImport += 1>>
+ <</if>>
<<case "Matchmaking">>
<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
<<print "[[Match them|Matchmaking][$subSlave = $slaves[" + _ssi + "]]]">>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index f4237bc5dcb5f531c2b231cdbe81ff22a1c53423..d5a14782131665fcb1dc66140c4f9976bb873074 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -386,6 +386,7 @@
<</if>>
<br><span id="optionsButton"><<link "Game Options">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Options">><</link>></span> @@.cyan;[O]@@
<br>
+
<<elseif _Pass == "Manage Arcology">>
<br><br>
<br><span id="managePenthouse"><<link "Manage Penthouse">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Penthouse">><</link>></span> @@.cyan;[P]@@
diff --git a/src/uncategorized/wardrobeUse.tw b/src/uncategorized/wardrobeUse.tw
index 730d2ceb4888121d560b1740378c2ed0f72aca92..94a8f999b3044d39b1b532567a76cd14c489aefb 100644
--- a/src/uncategorized/wardrobeUse.tw
+++ b/src/uncategorized/wardrobeUse.tw
@@ -291,6 +291,34 @@ Clothes: ''<span id="clothes">$activeSlave.clothes</span>.''
<<replace "#clothingDescription">><br>//<<ClothingDescription>>//<</replace>>
<</link>>
+<br> //Color://
+
+<<if ($seeImages == 1) && ($imageChoice == 1)>>
+ /* prepare display of currently selected color. */
+ /* TODO: update currently selected color upon outfit select */
+ /* _clothingBaseColor is set by display (Art_Vector_Set_Colour_Shoe_), but not all outfits define a color. */
+ /* _skinColour is used as fallback default (set by Art_Vector_Set_Colour_Skin_). */
+ <<set _clothingBaseColor = _skinColour >>
+ <<if def _outfitBaseColour>>
+ /* set default color predefined by choice of outfit */
+ <<set _clothingBaseColor = _outfitBaseColour>>
+ <</if>>
+ <<if def $activeSlave.clothingBaseColor>>
+ /* regard current user selection */
+ <<set _clothingBaseColor = $activeSlave.clothingBaseColor>>
+ <</if>>
+ /* Display an HTML5 color picker */
+ /* This is hackish due to direct accessment of SugarCube internal data structure. Improvements are welcome. */
+ <<print '<input type="color" value="'+_clothingBaseColor+'" onInput="SugarCube.State.variables.activeSlave.clothingBaseColor = event.target.value;">'>>
+ <<link "use default color">>
+ <<run delete $activeSlave.clothingBaseColor >>
+ /* reload passage to display everything correctly */
+ <<goto "Wardrobe Use">>
+ <</link>>
+ <br>
+ //Note: Only latex outfits support a custom color.//
+ <<unset _clothingBaseColor>> /* clean up temporary variable */
+<</if>>
<br>
@@ -451,6 +479,27 @@ Clothes: ''<span id="clothes">$activeSlave.clothes</span>.''
<</link>>
<</if>>
+<br> //Color://
+
+<<if ($seeImages == 1) && ($imageChoice == 1)>>
+ /* prepare display of currently selected color. */
+ /* _shoeColour is always set by display (Art_Vector_Set_Colour_Shoe_) */
+ /* TODO: update currently selected color upon shoe select */
+ <<if def $activeSlave.clothingBaseColor>>
+ /* regard current user selection */
+ <<set _shoeColour = $activeSlave.clothingBaseColor>>
+ <</if>>
+ /* Display an HTML5 color picker */
+ /* This is hackish due to direct accessment of SugarCube internal data structure. Improvements are welcome. */
+ <<print '<input type="color" value="'+_shoeColour+'" onInput="SugarCube.State.variables.activeSlave.shoeColor = event.target.value;">'>>
+ <<link "use default color">>
+ <<run delete $activeSlave.shoeColor >>
+ /* reload passage to display everything correctly */
+ <<goto "Wardrobe Use">>
+ <</link>>
+ <br>
+<</if>>
+
<br>
<br>Torso accessory: ''<span id="bellyAccessory">$activeSlave.bellyAccessory</span>.''
@@ -682,5 +731,4 @@ all descriptions to show what she is currently wearing?
<br><br> There are no changes you can make to her at this time.
<</if>> /* CLOSES FUCKDOLL CHECK */
-
<br><br>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 1f7d2ce4ed55283843dad620d94bf83e7f5df1f2..0f96f8b01217f32dca80ccf3d2a2eeb69f374c99 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -3090,3 +3090,54 @@ Call as <<SlaveSort [$slaves]>>
<</if>>
<</widget>>
+
+<<widget "CreateSimpleTabs">>
+
+ <head>
+ <style>
+
+ div.tab {
+ overflow: hidden;
+ border: 1px solid #ccc;
+ background-color: transparent;
+ }
+
+ div.tab button {
+ background-color: inherit;
+ float: left;
+ border: none;
+ outline: none;
+ cursor: pointer;
+ padding: 14px 16px;
+ transition: 0.3s;
+ font-size: 19px;
+ }
+
+ div.tab button:hover {
+ background-color: #444;
+ }
+
+ div.tab button.active {
+ background-color: #777;
+ }
+
+ .tabcontent {
+ display: none;
+ padding: 6px 12px;
+ -webkit-animation: fadeEffect 1s;
+ animation: fadeEffect 1s;
+ }
+
+ @-webkit-keyframes fadeEffect {
+ from {opacity: 0;}
+ to {opacity: 1;}
+ }
+
+ @keyframes fadeEffect {
+ from {opacity: 0;}
+ to {opacity: 1;}
+ }
+ </style>
+ </head>
+
+<</widget>>
diff --git a/src/utility/optionsWidgets.tw b/src/utility/optionsWidgets.tw
index bcce4d87a495f0aa05ab740a3a7e9112431b915e..1286b36e399f5a349de8b1add7dfd67fb7015912 100644
--- a/src/utility/optionsWidgets.tw
+++ b/src/utility/optionsWidgets.tw
@@ -146,6 +146,24 @@ Line separations are
<</if>>
<</widget>>
+<<widget "OptionsSortAsAppearsOnMain">>
+<<if $sortSlavesMain != 0>>
+ <br>
+ Sort by:
+ <<if $sortSlavesBy != "devotion">>[[Devotion|Main][$sortSlavesBy = "devotion"]]<<else>>Devotion<</if>> |
+ <<if $sortSlavesBy != "name">>[[Name|Main][$sortSlavesBy = "name"]]<<else>>Name<</if>> |
+ <<if $sortSlavesBy != "assignment">>[[Assignment|Main][$sortSlavesBy = "assignment"]]<<else>>Assignment<</if>> |
+ <<if $sortSlavesBy != "seniority">>[[Seniority purchased|Main][$sortSlavesBy = "seniority"]]<<else>>Seniority<</if>> |
+ <<if $sortSlavesBy != "actualAge">>[[Age|Main][$sortSlavesBy = "actualAge"]]<<else>>Age<</if>> |
+ <<if $sortSlavesBy != "visualAge">>[[Apparent Age|Main][$sortSlavesBy = "visualAge"]]<<else>>Apparent Age<</if>> |
+ <<if $sortSlavesBy != "physicalAge">>[[Bodily Age|Main][$sortSlavesBy = "physicalAge"]]<<else>>Bodily Age<</if>>
+
+ Sort: <<if $sortSlavesOrder != "descending">>[[Descending|Main][$sortSlavesOrder = "descending"]]<<else>>Descending<</if>> |
+ <<if $sortSlavesOrder != "ascending">>[[Ascending|Main][$sortSlavesOrder = "ascending"]]<<else>>Ascending<</if>>
+<</if>>
+<</widget>>
+
+
/%
Call as <<OptionRulesAssistantMain>>
Should be placed in a <span> with id = "OptionRulesAssistantMain"