diff --git a/Changelog.txt b/Changelog.txt
index 4aab10f0d724d8dc2825311a94650cbbcb0006f8..13506888fef4d7b80dafeb01bf6bc8f926bb3736 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -4,8 +4,10 @@ Pregmod
0
-RA refactoring
+ -multibranding
-superfetation tweaks
-preg analysis can now identify genetic quirks in fetuses
+ -enabled weight gain/loss genetic quirks
-fixes
0.10.7.1-2.4.x
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..28a8f3496dde4c399d6e19ae54fd44697c90482d
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,51 @@
+MAKEFLAGS += -r
+export TWEEGO_PATH=devTools/tweeGo/storyFormats
+HASH := $(shell git rev-list -n 1 --abbrev-commit HEAD)
+COMMIT := $(shell git rev-parse --short HEAD)
+uname := $(shell uname -s)
+arch := $(shell uname -m)
+arch := $(shell if test $(arch) = x86_64 -o $(arch) = amd64; then echo 64; else echo 32; fi)
+TWEEGO := $(shell command -v tweego || echo "$$?")
+ifeq ($(TWEEGO),1)
+ ifeq ($(uname),Linux)
+ ifeq ($(arch),64)
+ TWEEGO := devTools/tweeGo/tweego_nix64
+ else
+ TWEEGO := devTools/tweeGo/tweego_nix86
+ endif
+ else ifeq ($(uname),Darwin)
+ ifeq ($(arch),64)
+ TWEEGO := devTools/tweeGo/tweego_osx64
+ else
+ TWEEGO := devTools/tweeGo/tweego_osx86
+ endif
+ endif
+endif
+
+all: bin/FC_pregmod.html bin/resources
+
+git: bin/FC_pregmod_$(HASH).html bin/resources
+
+bin/resources: resources
+ test -L "$@" || ln -s "../$<" bin/
+
+bin/%.html: bin/tmp
+ git checkout -- src/gui/mainMenu/AlphaDisclaimer.tw
+ mv $< $@
+
+bin/tmp: bin/ src/gui/mainMenu/AlphaDisclaimer.tw
+ $(TWEEGO) src/ --head devTools/head.html > $@
+
+src/gui/mainMenu/AlphaDisclaimer.tw:
+ sed -Ei "s/build .releaseID/\0 commit $(COMMIT)/" $@
+
+bin/:
+ mkdir -p $@
+
+sanity:
+ ./sanityCheck.sh
+
+jsanity:
+ ./sanityCheck.sh java
+
+.PHONY: all sanity jsanity git
diff --git a/README.md b/README.md
index 3440d8c0eaa3915c788fcd6eda18a4bbf704497d..ffa0d61f432af99c0d139da3d75c551da241aff6 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,7 @@ How to mod (basic doc):
Ensure executable permission on file "devTools/tweeGo/tweego" (not tweego.exe!)
Ensure executable permission on file "compile.sh"
In the root dir of sources (where you see src, devTools, bin...) run command "./compile.sh" from console
+ Alternatively, if you have make installed, run "make all" in the root directory
Mac:
Not supported directly (I don't have access to Mac for testing).
diff --git a/devTools/javaSanityCheck/excluded b/devTools/javaSanityCheck/excluded
index 53fd6b74eacad1588376bb0894ca956fb78e7d8d..bb71504fbe1cf3161608ba9515703eb87cdc1cc1 100644
--- a/devTools/javaSanityCheck/excluded
+++ b/devTools/javaSanityCheck/excluded
@@ -8,4 +8,3 @@ src/pregmod/editGenetics.tw
src/001-lib/Jquery/Jquery.js
src/001-lib/mousetrap/mousetrap.js
src/002-config/sugarCubeConfig.js
-#src/debugging/debugJS.js
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 0ef827374e4b6fd155dc035e64b9f84024b937d2..fe9c4d0b47f0e508801392be5745e8a7c6af94eb 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -3661,6 +3661,13 @@ geneMods:
0 - no
1 - yes
+weightDirection:
+
+erratic weight gain, used by (.geneticQuirks.wGain == 2 && .geneticQuirks.wLoss == 2)
+ 0 - stable
+ 1 - gaining weight
+-1 - losing weight
+
slaveCost:
Amount of cash paid to acquire the slave
diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index 17929ae46e417a6a77e5c0b7bf9519f1fb0b8c5f..24ba16abc64652a80baa6ae4493c04da93cd487e 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -86,6 +86,15 @@
<</link>>
<</widget>>
+<<widget E3Options>>
+ <<link "[$args[0]]">>
+ <<replace #ecol3>>
+ <<set $tempSlave.geneticQuirks.heterochromia = $args[0]>>
+ <<set _ecol3R = 0>>
+ <</replace>>
+ <</link>>
+<</widget>>
+
<<widget POptions>>
<<link "[$args[0]]">>
<<replace #ppil>>
@@ -3262,6 +3271,304 @@
<br>
<</widget>>
+<<widget GenQuiTab>>
+ <br>
+ ''Macromastia: ''
+ <<switch $tempSlave.geneticQuirks.macromastia >>
+ <<case 0 >>
+ @@.yellow;none@@ |
+ <<case 1 >>
+ @@.yellow;carrier@@ |
+ <<case 2 >>
+ @@.yellow;active@@ |
+ <<case 3 >>
+ @@.yellow;inactive@@ |
+ <</switch>>
+ <<radiobutton "$tempSlave.geneticQuirks.macromastia" 0>> None
+ <<radiobutton "$tempSlave.geneticQuirks.macromastia" 1>> Carrier
+ <<radiobutton "$tempSlave.geneticQuirks.macromastia" 2>> Active
+ <<radiobutton "$tempSlave.geneticQuirks.macromastia" 3>> Inactive
+ <br>
+ ''Gigantomastia: ''
+ <<switch $tempSlave.geneticQuirks.gigantomastia >>
+ <<case 0 >>
+ @@.yellow;none@@ |
+ <<case 1 >>
+ @@.yellow;carrier@@ |
+ <<case 2 >>
+ @@.yellow;active@@ |
+ <<case 3 >>
+ @@.yellow;inactive@@ |
+ <</switch>>
+ <<radiobutton "$tempSlave.geneticQuirks.gigantomastia" 0>> None
+ <<radiobutton "$tempSlave.geneticQuirks.gigantomastia" 1>> Carrier
+ <<radiobutton "$tempSlave.geneticQuirks.gigantomastia" 2>> Active
+ <<radiobutton "$tempSlave.geneticQuirks.gigantomastia" 3>> Inactive
+ <br>
+ ''Fertility: ''
+ <<switch $tempSlave.geneticQuirks.fertility >>
+ <<case 0 >>
+ @@.yellow;none@@ |
+ <<case 1 >>
+ @@.yellow;carrier@@ |
+ <<case 2 >>
+ @@.yellow;active@@ |
+ <<case 3 >>
+ @@.yellow;inactive@@ |
+ <</switch>>
+ <<radiobutton "$tempSlave.geneticQuirks.fertility" 0>> None
+ <<radiobutton "$tempSlave.geneticQuirks.fertility" 1>> Carrier
+ <<radiobutton "$tempSlave.geneticQuirks.fertility" 2>> Active
+ <br>
+ ''hyperFertility: ''
+ <<switch $tempSlave.geneticQuirks.hyperFertility >>
+ <<case 0 >>
+ @@.yellow;none@@ |
+ <<case 1 >>
+ @@.yellow;carrier@@ |
+ <<case 2 >>
+ @@.yellow;active@@ |
+ <<case 3 >>
+ @@.yellow;inactive@@ |
+ <</switch>>
+ <<radiobutton "$tempSlave.geneticQuirks.hyperFertility" 0>> None
+ <<radiobutton "$tempSlave.geneticQuirks.hyperFertility" 1>> Carrier
+ <<radiobutton "$tempSlave.geneticQuirks.hyperFertility" 2>> Active
+ <br>
+ ''Superfetation: ''
+ <<switch $tempSlave.geneticQuirks.superfetation >>
+ <<case 0 >>
+ @@.yellow;none@@ |
+ <<case 1 >>
+ @@.yellow;carrier@@ |
+ <<case 2 >>
+ @@.yellow;active@@ |
+ <<case 3 >>
+ @@.yellow;inactive@@ |
+ <</switch>>
+ <<radiobutton "$tempSlave.geneticQuirks.superfetation" 0>> None
+ <<radiobutton "$tempSlave.geneticQuirks.superfetation" 1>> Carrier
+ <<radiobutton "$tempSlave.geneticQuirks.superfetation" 2>> Active
+ <br>
+ ''Gigantism: ''
+ <<switch $tempSlave.geneticQuirks.gigantism >>
+ <<case 0 >>
+ @@.yellow;none@@ |
+ <<case 1 >>
+ @@.yellow;carrier@@ |
+ <<case 2 >>
+ @@.yellow;active@@ |
+ <<case 3 >>
+ @@.yellow;inactive@@ |
+ <</switch>>
+ <<radiobutton "$tempSlave.geneticQuirks.gigantism" 0>> None
+ <<radiobutton "$tempSlave.geneticQuirks.gigantism" 1>> Carrier
+ <<radiobutton "$tempSlave.geneticQuirks.gigantism" 2>> Active
+ <br>
+ ''Dwarfism: ''
+ <<switch $tempSlave.geneticQuirks.dwarfism >>
+ <<case 0 >>
+ @@.yellow;none@@ |
+ <<case 1 >>
+ @@.yellow;carrier@@ |
+ <<case 2 >>
+ @@.yellow;active@@ |
+ <<case 3 >>
+ @@.yellow;inactive@@ |
+ <</switch>>
+ <<radiobutton "$tempSlave.geneticQuirks.dwarfism" 0>> None
+ <<radiobutton "$tempSlave.geneticQuirks.dwarfism" 1>> Carrier
+ <<radiobutton "$tempSlave.geneticQuirks.dwarfism" 2>> Active
+ <br>
+ ''Pretty Face: ''
+ <<switch $tempSlave.geneticQuirks.pFace >>
+ <<case 0 >>
+ @@.yellow;none@@ |
+ <<case 1 >>
+ @@.yellow;carrier@@ |
+ <<case 2 >>
+ @@.yellow;active@@ |
+ <<case 3 >>
+ @@.yellow;inactive@@ |
+ <</switch>>
+ <<radiobutton "$tempSlave.geneticQuirks.pFace" 0>> None
+ <<radiobutton "$tempSlave.geneticQuirks.pFace" 1>> Carrier
+ <<radiobutton "$tempSlave.geneticQuirks.pFace" 2>> Active
+ <br>
+ ''Ugly Face: ''
+ <<switch $tempSlave.geneticQuirks.uFace >>
+ <<case 0 >>
+ @@.yellow;none@@ |
+ <<case 1 >>
+ @@.yellow;carrier@@ |
+ <<case 2 >>
+ @@.yellow;active@@ |
+ <<case 3 >>
+ @@.yellow;inactive@@ |
+ <</switch>>
+ <<radiobutton "$tempSlave.geneticQuirks.uFace" 0>> None
+ <<radiobutton "$tempSlave.geneticQuirks.uFace" 1>> Carrier
+ <<radiobutton "$tempSlave.geneticQuirks.uFace" 2>> Active
+ <br>
+ ''Albinism: ''
+ <<switch $tempSlave.geneticQuirks.albinism >>
+ <<case 0 >>
+ @@.yellow;none@@ |
+ <<case 1 >>
+ @@.yellow;carrier@@ |
+ <<case 2 >>
+ @@.yellow;active@@ |
+ <<case 3 >>
+ @@.yellow;inactive@@ |
+ <</switch>>
+ <<radiobutton "$tempSlave.geneticQuirks.albinism" 0>> None
+ <<radiobutton "$tempSlave.geneticQuirks.albinism" 1>> Carrier
+ <<radiobutton "$tempSlave.geneticQuirks.albinism" 2>> Active
+ <br>
+ ''Heterochromia: ''
+ <<if $tempSlave.geneticQuirks.heterochromia == 0>>
+ @@.yellow;none@@ |
+ <<elseif $tempSlave.geneticQuirks.heterochromia == 1>>
+ @@.yellow;carrier@@ |
+ <<else>>
+ @@.yellow;$tempSlave.geneticQuirks.heterochromia@@ |
+ <</if>>
+ <<radiobutton "$tempSlave.geneticQuirks.heterochromia" 0>> None |
+ <<radiobutton "$tempSlave.geneticQuirks.heterochromia" 1>> Carrier |
+ <<link "Eye Colors">>
+ <<if (ndef _ecol3R) || (_ecol3R == 0) >>
+ <<replace "#ecol3">>
+ <<set _ecol3R = 1>>
+ <br>
+ <<E3Options "blue" >>
+ <<E3Options "black" >>
+ <<E3Options "brown" >>
+ <<E3Options "green" >>
+ <<E3Options "turquoise" >>
+ <<E3Options "sky-blue" >>
+ <<E3Options "pale-grey" >>
+ <<E3Options "white" >>
+ <<E3Options "pink" >>
+ <<E3Options "amber" >>
+ <<E3Options "red" >>
+ <br>
+ <</replace>>
+ <<else>>
+ <<replace "#ecol3">>
+ <<set _ecol3R = 0>>
+ <</replace>>
+ <</if>>
+ <</link>>
+ /* <<textbox "$tempSlave.geneticQuirks.heterochromia" $tempSlave.geneticQuirks.heterochromia>> */
+ <span id=ecol3></span>
+ <br>
+ ''rear Lipedema: ''
+ <<switch $tempSlave.geneticQuirks.rearLipedema>>
+ <<case 0 >>
+ @@.yellow;none@@ |
+ <<case 1 >>
+ @@.yellow;carrier@@ |
+ <<case 2 >>
+ @@.yellow;active@@ |
+ <<case 3 >>
+ @@.yellow;inactive@@ |
+ <</switch>>
+ <<radiobutton "$tempSlave.geneticQuirks.rearLipedema" 0>> None
+ <<radiobutton "$tempSlave.geneticQuirks.rearLipedema" 1>> Carrier
+ <<radiobutton "$tempSlave.geneticQuirks.rearLipedema" 2>> Active
+ <br>
+ ''Well Hung: ''
+ <<switch $tempSlave.geneticQuirks.wellHung>>
+ <<case 0 >>
+ @@.yellow;none@@ |
+ <<case 1 >>
+ @@.yellow;carrier@@ |
+ <<case 2 >>
+ @@.yellow;active@@ |
+ <<case 3 >>
+ @@.yellow;inactive@@ |
+ <</switch>>
+ <<radiobutton "$tempSlave.geneticQuirks.wellHung" 0>> None
+ <<radiobutton "$tempSlave.geneticQuirks.wellHung" 1>> Carrier
+ <<radiobutton "$tempSlave.geneticQuirks.wellHung" 2>> Active
+ <br>
+ ''Weight Gain: ''
+ <<switch $tempSlave.geneticQuirks.wGain>>
+ <<case 0 >>
+ @@.yellow;none@@ |
+ <<case 1 >>
+ @@.yellow;carrier@@ |
+ <<case 2 >>
+ @@.yellow;active@@ |
+ <<case 3 >>
+ @@.yellow;inactive@@ |
+ <</switch>>
+ <<radiobutton "$tempSlave.geneticQuirks.wGain" 0>> None
+ <<radiobutton "$tempSlave.geneticQuirks.wGain" 1>> Carrier
+ <<radiobutton "$tempSlave.geneticQuirks.wGain" 2>> Active
+ <br>
+ ''Weight Loss: ''
+ <<switch $tempSlave.geneticQuirks.wLoss>>
+ <<case 0 >>
+ @@.yellow;none@@ |
+ <<case 1 >>
+ @@.yellow;carrier@@ |
+ <<case 2 >>
+ @@.yellow;active@@ |
+ <<case 3 >>
+ @@.yellow;inactive@@ |
+ <</switch>>
+ <<radiobutton "$tempSlave.geneticQuirks.wLoss" 0>> None
+ <<radiobutton "$tempSlave.geneticQuirks.wLoss" 1>> Carrier
+ <<radiobutton "$tempSlave.geneticQuirks.wLoss" 2>> Active
+ <br>
+ ''Muscle Gain: ''
+ <<switch $tempSlave.geneticQuirks.mGain>>
+ <<case 0 >>
+ @@.yellow;none@@ |
+ <<case 1 >>
+ @@.yellow;carrier@@ |
+ <<case 2 >>
+ @@.yellow;active@@ |
+ <<case 3 >>
+ @@.yellow;inactive@@ |
+ <</switch>>
+ <<radiobutton "$tempSlave.geneticQuirks.mGain" 0>> None
+ <<radiobutton "$tempSlave.geneticQuirks.mGain" 1>> Carrier
+ <<radiobutton "$tempSlave.geneticQuirks.mGain" 2>> Active
+ <br>
+ ''Muscle Loss: ''
+ <<switch $tempSlave.geneticQuirks.mLoss>>
+ <<case 0 >>
+ @@.yellow;none@@ |
+ <<case 1 >>
+ @@.yellow;carrier@@ |
+ <<case 2 >>
+ @@.yellow;active@@ |
+ <<case 3 >>
+ @@.yellow;inactive@@ |
+ <</switch>>
+ <<radiobutton "$tempSlave.geneticQuirks.mLoss" 0>> None
+ <<radiobutton "$tempSlave.geneticQuirks.mLoss" 1>> Carrier
+ <<radiobutton "$tempSlave.geneticQuirks.mLoss" 2>> Active
+ <br>
+ ''Androgyny: ''
+ <<switch $tempSlave.geneticQuirks.androgyny>>
+ <<case 0 >>
+ @@.yellow;none@@ |
+ <<case 1 >>
+ @@.yellow;carrier@@ |
+ <<case 2 >>
+ @@.yellow;active@@ |
+ <<case 3 >>
+ @@.yellow;inactive@@ |
+ <</switch>>
+ <<radiobutton "$tempSlave.geneticQuirks.androgyny" 0>> None
+ <<radiobutton "$tempSlave.geneticQuirks.androgyny" 1>> Carrier
+ <<radiobutton "$tempSlave.geneticQuirks.androgyny" 2>> Active
+ <br>
+<</widget>>
+
<<widget PrestTab>>
''Change $his custom tattoo:'' <<textbox "$tempSlave.custom.tattoo" $tempSlave.custom.tattoo>>
<br>
@@ -3785,8 +4092,8 @@
<<if (ndef _sAllR) || (_sAllR == 0) >>
<<replace "#spot">>
<<set _faceR = 0>><<set _nameR = 0>><<set _famR = 0>><<set _identR = 0>><<set _ageR = 0>><<set _devR = 0>><<set _hairR = 0>>
- <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
- <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
+ <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>><<set _genqR = 0>>
+ <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>><<set _ecol3R = 0>>
<<set _sAllR = 1>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol5R = 0>><<set _hcol4R = 0>>
<<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<NameTab>>
@@ -3808,6 +4115,7 @@
<<InteliTab>>
<<FetSexTab>>
<<FlaQuiTab>>
+ <<GenQuiTab>>
<<StatisticTab>>
<<PrestTab>>
<<TattoTab>>
@@ -3826,8 +4134,8 @@
<<if (ndef _nameR) || (_nameR == 0) >>
<<replace "#spot">>
<<set _faceR = 0>><<set _nameR = 1>><<set _famR = 0>><<set _identR = 0>><<set _ageR = 0>><<set _devR = 0>><<set _hairR = 0>>
- <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
- <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
+ <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>><<set _genqR = 0>>
+ <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>><<set _ecol3R = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol5R = 0>><<set _hcol4R = 0>>
<<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<NameTab>>
@@ -3844,8 +4152,8 @@
<<if (ndef _famR) || (_famR == 0) >>
<<replace "#spot">>
<<set _faceR = 0>><<set _nameR = 0>><<set _famR = 1>><<set _identR = 0>><<set _ageR = 0>><<set _devR = 0>><<set _hairR = 0>>
- <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
- <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
+ <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>><<set _genqR = 0>>
+ <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>><<set _ecol3R = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol5R = 0>><<set _hcol4R = 0>>
<<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<FamilyTab>>
@@ -3862,8 +4170,8 @@
<<if (ndef _identR) || (_identR == 0) >>
<<replace "#spot">>
<<set _faceR = 0>><<set _nameR = 0>><<set _famR = 0>><<set _identR = 1>><<set _ageR = 0>><<set _devR = 0>><<set _hairR = 0>>
- <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
- <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
+ <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>><<set _genqR = 0>>
+ <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>><<set _ecol3R = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol5R = 0>><<set _hcol4R = 0>>
<<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<NationalTab>>
@@ -3880,8 +4188,8 @@
<<if (ndef _nameR) || (_ageR == 0) >>
<<replace "#spot">>
<<set _faceR = 0>><<set _nameR = 0>><<set _famR = 0>><<set _identR = 0>><<set _ageR = 1>><<set _devR = 0>><<set _hairR = 0>>
- <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
- <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
+ <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>><<set _genqR = 0>>
+ <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>><<set _ecol3R = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol5R = 0>><<set _hcol4R = 0>>
<<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<AgeTab>>
@@ -3898,8 +4206,8 @@
<<if (ndef _devR) || (_devR == 0) >>
<<replace "#spot">>
<<set _faceR = 0>><<set _nameR = 0>><<set _famR = 0>><<set _identR = 0>><<set _ageR = 0>><<set _devR = 1>><<set _hairR = 0>>
- <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
- <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
+ <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>><<set _genqR = 0>>
+ <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>><<set _ecol3R = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol5R = 0>><<set _hcol4R = 0>>
<<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<DevoTab>>
@@ -3916,8 +4224,8 @@
<<if (ndef _faceR) || (_faceR == 0) >>
<<replace "#spot">>
<<set _faceR = 1>><<set _nameR = 0>><<set _famR = 0>><<set _identR = 0>><<set _ageR = 0>><<set _devR = 0>><<set _hairR = 0>>
- <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
- <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
+ <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>><<set _genqR = 0>>
+ <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>><<set _ecol3R = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol5R = 0>><<set _hcol4R = 0>>
<<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<FaceTab>>
@@ -3934,8 +4242,8 @@
<<if (ndef _hairR) || (_hairR == 0) >>
<<replace "#spot">>
<<set _faceR = 0>><<set _nameR = 0>><<set _famR = 0>><<set _identR = 0>><<set _ageR = 0>><<set _devR = 0>><<set _hairR = 1>>
- <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
- <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
+ <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>><<set _genqR = 0>>
+ <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>><<set _ecol3R = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol5R = 0>><<set _hcol4R = 0>>
<<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<HairTab>>
@@ -3952,8 +4260,8 @@
<<if (ndef _eyesR) || (_eyesR == 0) >>
<<replace "#spot">>
<<set _faceR = 0>><<set _nameR = 0>><<set _famR = 0>><<set _identR = 0>><<set _ageR = 0>><<set _devR = 0>><<set _hairR = 0>>
- <<set _descR = 0>><<set _eyesR = 1>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
- <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
+ <<set _descR = 0>><<set _eyesR = 1>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>><<set _genqR = 0>>
+ <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>><<set _ecol3R = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol5R = 0>><<set _hcol4R = 0>>
<<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<EyesTab>>
@@ -3970,8 +4278,8 @@
<<if (ndef _mouthR) || (_mouthR == 0) >>
<<replace "#spot">>
<<set _faceR = 0>><<set _nameR = 0>><<set _famR = 0>><<set _identR = 0>><<set _ageR = 0>><<set _devR = 0>><<set _hairR = 0>>
- <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 1>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
- <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
+ <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 1>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>><<set _genqR = 0>>
+ <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>><<set _ecol3R = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol5R = 0>><<set _hcol4R = 0>>
<<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<MouthTab>>
@@ -3988,8 +4296,8 @@
<<if (ndef _bodyR) || (_bodyR == 0) >>
<<replace "#spot">>
<<set _faceR = 0>><<set _nameR = 0>><<set _famR = 0>><<set _identR = 0>><<set _ageR = 0>><<set _devR = 0>><<set _hairR = 0>>
- <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 1>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
- <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
+ <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 1>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>><<set _genqR = 0>>
+ <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>><<set _ecol3R = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol5R = 0>><<set _hcol4R = 0>>
<<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<BodyTab>>
@@ -4006,8 +4314,8 @@
<<if (ndef _bellyR) || (_bellyR == 0) >>
<<replace "#spot">>
<<set _faceR = 0>><<set _nameR = 0>><<set _famR = 0>><<set _identR = 0>><<set _ageR = 0>><<set _devR = 0>><<set _hairR = 0>>
- <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
- <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
+ <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>><<set _genqR = 0>>
+ <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>><<set _ecol3R = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 1>><<set _useR = 0>><<set _brandR = 0>><<set _hcol5R = 0>><<set _hcol4R = 0>>
<<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<BellyTab>>
@@ -4024,8 +4332,8 @@
<<if (ndef _titsR) || (_titsR == 0) >>
<<replace "#spot">>
<<set _faceR = 0>><<set _nameR = 0>><<set _famR = 0>><<set _identR = 0>><<set _ageR = 0>><<set _devR = 0>><<set _hairR = 0>>
- <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 1>><<set _buttR = 0>><<set _vagR = 0>>
- <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
+ <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 1>><<set _buttR = 0>><<set _vagR = 0>><<set _genqR = 0>>
+ <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>><<set _ecol3R = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol5R = 0>><<set _hcol4R = 0>>
<<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<BreastsTab>>
@@ -4042,8 +4350,8 @@
<<if (ndef _buttR) || (_buttR == 0) >>
<<replace "#spot">>
<<set _faceR = 0>><<set _nameR = 0>><<set _famR = 0>><<set _identR = 0>><<set _ageR = 0>><<set _devR = 0>><<set _hairR = 0>>
- <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 1>><<set _vagR = 0>>
- <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
+ <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 1>><<set _vagR = 0>><<set _genqR = 0>>
+ <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>><<set _ecol3R = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol5R = 0>><<set _hcol4R = 0>>
<<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<ButtTab>>
@@ -4060,8 +4368,8 @@
<<if (ndef _vagR) || (_vagR == 0) >>
<<replace "#spot">><br>
<<set _faceR = 0>><<set _nameR = 0>><<set _famR = 0>><<set _identR = 0>><<set _ageR = 0>><<set _devR = 0>><<set _hairR = 0>>
- <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 1>>
- <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
+ <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 1>><<set _genqR = 0>>
+ <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>><<set _ecol3R = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol5R = 0>><<set _hcol4R = 0>>
<<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<VagTab>>
@@ -4078,8 +4386,8 @@
<<if (ndef _dickR) || (_dickR == 0) >>
<<replace "#spot">>
<<set _faceR = 0>><<set _nameR = 0>><<set _famR = 0>><<set _identR = 0>><<set _ageR = 0>><<set _devR = 0>><<set _hairR = 0>>
- <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
- <<set _dickR = 1>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
+ <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>><<set _genqR = 0>>
+ <<set _dickR = 1>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>><<set _ecol3R = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol5R = 0>><<set _hcol4R = 0>>
<<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<PenisTab>>
@@ -4096,8 +4404,8 @@
<<if (ndef _skillsR) || (_skillsR == 0) >>
<<replace "#spot">>
<<set _faceR = 0>><<set _nameR = 0>><<set _famR = 0>><<set _identR = 0>><<set _ageR = 0>><<set _devR = 0>><<set _hairR = 0>>
- <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
- <<set _dickR = 0>><<set _skillsR = 1>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
+ <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>><<set _genqR = 0>>
+ <<set _dickR = 0>><<set _skillsR = 1>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>><<set _ecol3R = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol5R = 0>><<set _hcol4R = 0>>
<<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<SkillsTab>>
@@ -4114,8 +4422,8 @@
<<if (ndef _intR) || (_intR == 0) >>
<<replace "#spot">>
<<set _faceR = 0>><<set _nameR = 0>><<set _famR = 0>><<set _identR = 0>><<set _ageR = 0>><<set _devR = 0>><<set _hairR = 0>>
- <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
- <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 1>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
+ <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>><<set _genqR = 0>>
+ <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 1>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>><<set _ecol3R = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol5R = 0>><<set _hcol4R = 0>>
<<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<InteliTab>>
@@ -4132,8 +4440,8 @@
<<if (ndef _sexR) || (_sexR == 0) >>
<<replace "#spot">>
<<set _faceR = 0>><<set _nameR = 0>><<set _famR = 0>><<set _identR = 0>><<set _ageR = 0>><<set _devR = 0>><<set _hairR = 0>>
- <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
- <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 1>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
+ <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>><<set _genqR = 0>>
+ <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 1>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>><<set _ecol3R = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol5R = 0>><<set _hcol4R = 0>>
<<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<FetSexTab>>
@@ -4150,8 +4458,8 @@
<<if (ndef _flawR) || (_flawR == 0) >>
<<replace "#spot">>
<<set _faceR = 0>><<set _nameR = 0>><<set _famR = 0>><<set _identR = 0>><<set _ageR = 0>><<set _devR = 0>><<set _hairR = 0>>
- <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
- <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 1>><<set _tatsR = 0>><<set _piercR = 0>>
+ <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>><<set _genqR = 0>>
+ <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 1>><<set _tatsR = 0>><<set _piercR = 0>><<set _ecol3R = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol5R = 0>><<set _hcol4R = 0>>
<<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<FlaQuiTab>>
@@ -4164,12 +4472,30 @@
<</link>>
/*-------------------------------------------------------------------------------------------------------------------------------*/
<<print " | " >>
+<<link "Genetic Quirks">>
+<<if (ndef _genqR) || (_genqR == 0) >>
+ <<replace "#spot">>
+ <<set _faceR = 0>><<set _nameR = 0>><<set _famR = 0>><<set _identR = 0>><<set _ageR = 0>><<set _devR = 0>><<set _hairR = 0>>
+ <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>><<set _genqR = 1>>
+ <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>><<set _ecol3R = 0>>
+ <<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol5R = 0>><<set _hcol4R = 0>>
+ <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
+ <<GenQuiTab>>
+ <</replace>>
+<<else>>
+ <<replace "#spot">>
+ <<set _genqR = 0>>
+ <</replace>>
+<</if>>
+<</link>>
+/*-------------------------------------------------------------------------------------------------------------------------------*/
+<<print " | " >>
<<link "Statistics">>
<<if (ndef _useR) || (_useR == 0) >>
<<replace "#spot">>
<<set _faceR = 0>><<set _nameR = 0>><<set _famR = 0>><<set _identR = 0>><<set _ageR = 0>><<set _devR = 0>><<set _hairR = 0>>
- <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
- <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
+ <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>><<set _genqR = 0>>
+ <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>><<set _ecol3R = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 1>><<set _brandR = 0>><<set _hcol5R = 0>><<set _hcol4R = 0>>
<<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<StatisticTab>>
@@ -4186,8 +4512,8 @@
<<if (ndef _descR) || (_descR == 0) >>
<<replace "#spot">>
<<set _faceR = 0>><<set _nameR = 0>><<set _famR = 0>><<set _identR = 0>><<set _ageR = 0>><<set _devR = 0>><<set _hairR = 0>>
- <<set _descR = 1>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
- <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
+ <<set _descR = 1>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>><<set _genqR = 0>>
+ <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>><<set _ecol3R = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol5R = 0>><<set _hcol4R = 0>>
<<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<br>
@@ -4205,8 +4531,8 @@
<<if (ndef _tatsR) || (_tatsR == 0) >>
<<replace "#spot">>
<<set _faceR = 0>><<set _nameR = 0>><<set _famR = 0>><<set _identR = 0>><<set _ageR = 0>><<set _devR = 0>><<set _hairR = 0>>
- <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
- <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 1>><<set _piercR = 0>>
+ <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>><<set _genqR = 0>>
+ <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 1>><<set _piercR = 0>><<set _ecol3R = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol5R = 0>><<set _hcol4R = 0>>
<<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<TattoTab>>
@@ -4223,8 +4549,8 @@
<<if (ndef _brandR) || (_brandR == 0) >>
<<replace "#spot">>
<<set _faceR = 0>><<set _nameR = 0>><<set _famR = 0>><<set _identR = 0>><<set _ageR = 0>><<set _devR = 0>><<set _hairR = 0>>
- <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
- <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
+ <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>><<set _genqR = 0>>
+ <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>><<set _ecol3R = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 1>><<set _hcol5R = 0>><<set _hcol4R = 0>>
<<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<BrandTab>>
@@ -4241,8 +4567,8 @@
<<if (ndef _piercR) || (_piercR == 0) >>
<<replace "#spot">>
<<set _faceR = 0>><<set _nameR = 0>><<set _famR = 0>><<set _identR = 0>><<set _ageR = 0>><<set _devR = 0>><<set _hairR = 0>>
- <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
- <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 1>>
+ <<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>><<set _genqR = 0>>
+ <<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 1>><<set _ecol3R = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol5R = 0>><<set _hcol4R = 0>>
<<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<PiercTab>>
diff --git a/src/init/dummy.tw b/src/init/dummy.tw
index 5e12dfa938f8b325599ce1f9fd5279a6eef2b357..27a2874651327b2afea997305f25d8eeaf1fb8b2 100644
--- a/src/init/dummy.tw
+++ b/src/init/dummy.tw
@@ -136,5 +136,17 @@ $defaultColorMap /* delete when light/normal colormodes are finished */
$maleSurnamePoolSelector
$mixedraceNationalities
$nationalityPoolSelector
+$version, $release
+$Him
+$anCup
+$linkHandlers
+$caption
+$op
+$unborn
+
+/* ...foo variables - maybe fixed later */
+$otherChoices
+$State
+$pair
%/
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index 68e55f794a2444840e5c335bf507d152824a81d1..c7ad2ac3dedc7edd0eea9fe9d56e62418d89a701 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -1356,15 +1356,15 @@ window.DefaultRules = (function() {
};
if (V.arcologies[0].FSSlimnessEnthusiastResearch === 1) {
- shrinkDrugs.lip = "lip atrophiers";
+ shrinkDrugs.lips = "lip atrophiers";
if (slave.dick > 0) {
shrinkDrugs.penis = "penis atrophiers";
}
if (slave.balls > 0) {
- shrinkDrugs.testicle = "testicle atrophiers";
+ shrinkDrugs.balls = "testicle atrophiers";
}
if (slave.weight < 100) {
- shrinkDrugs.breast = "breast redistributors";
+ shrinkDrugs.boobs = "breast redistributors";
shrinkDrugs.butt = "butt redistributors";
}
}
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index b920ae803e62e057b227247edc2d4eaa60fa8ecb..7c8436416186b68c19944b84a76e1807547e6b48 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -2341,6 +2341,10 @@ App.Entity.SlaveState = class SlaveState {
this.override_Pubic_H_Color = 0;
this.override_Arm_H_Color = 0;
this.override_Brow_H_Color = 0;
+ /** erratic weight gain
+ *
+ * 0: stable; 1: gaining; -1: losing */
+ this.weightDirection = 0;
/** @type {{skin:string, eyeColor:string, hColor:string}} */
this.albinismOverride = null;
/* eslint-enable */
diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js
index 5d1032ecc8d2dacdd0299a9c860b78cf1bab8fe6..eddab7de4fa316637178a194d09a95da8a87dd00 100644
--- a/src/js/generateGenetics.js
+++ b/src/js/generateGenetics.js
@@ -92,7 +92,7 @@ window.generateGenetics = (function() {
genes.race = setRace(father, mother, actor2);
genes.intelligence = setIntelligence(father, mother, activeMother, actor2);
genes.face = setFace(father, mother, activeMother, actor2, genes.geneticQuirks);
- genes.faceShape = setFaceShape(father, mother);
+ genes.faceShape = setFaceShape(father, mother, genes.geneticQuirks);
genes.eyeColor = setEyeColor(father, mother, actor2);
if (genes.geneticQuirks.heterochromia === 2) {
genes.geneticQuirks.heterochromia = setHeterochromaticEyeColor(father, mother, actor2);
@@ -114,7 +114,7 @@ window.generateGenetics = (function() {
if (mother.geneticQuirks.girlsOnly === 2) {
gender = "XX";
} else if (V.seeDicksAffectsPregnancy === 1) {
- gender = Math.floor(Math.random() * 100) < V.seeDicks ? "XY" : "XX";
+ gender = jsRandom(0, 99) < V.seeDicks ? "XY" : "XX";
} else if (V.adamPrinciple === 1) {
if (father !== 0) {
if (father.genes === "XX" && mother.genes === "XX") {
@@ -664,9 +664,11 @@ window.generateGenetics = (function() {
}
// face shape
- function setFaceShape(father, mother) {
+ function setFaceShape(father, mother, genes) {
let shape;
- if (father !== 0) {
+ if (genes.androgyny === 2) {
+ shape = "androgynous";
+ } else if (father !== 0) {
if (mother.faceShape === father.faceShape) {
shape = mother.faceShape;
} else {
@@ -988,7 +990,7 @@ window.generateGenetics = (function() {
} else {
quirks.rearLipedema = 1;
}
- } else if (mother.geneticQuirks.rearLipedema === 1 + father.geneticQuirks.rearLipedema >= 3) {
+ } else if (mother.geneticQuirks.rearLipedema + father.geneticQuirks.rearLipedema >= 3) {
chance = jsRandom(1, 4);
if (chance <= 2) {
quirks.rearLipedema = 2;
@@ -1083,7 +1085,7 @@ window.generateGenetics = (function() {
} else {
quirks.mGain = 1;
}
- } else if (mother.geneticQuirks.mGain === 1 + father.geneticQuirks.mGain >= 3) {
+ } else if (mother.geneticQuirks.mGain + father.geneticQuirks.mGain >= 3) {
chance = jsRandom(1, 4);
if (chance <= 2) {
quirks.mGain = 2;
@@ -1116,7 +1118,7 @@ window.generateGenetics = (function() {
} else {
quirks.mLoss = 1;
}
- } else if (mother.geneticQuirks.mLoss === 1 + father.geneticQuirks.mLoss >= 3) {
+ } else if (mother.geneticQuirks.mLoss + father.geneticQuirks.mLoss >= 3) {
chance = jsRandom(1, 4);
if (chance <= 2) {
quirks.mLoss = 2;
@@ -1141,6 +1143,101 @@ window.generateGenetics = (function() {
}
}
+ // hyperleptinemia
+ if (father !== 0) {
+ if (mother.geneticQuirks.wGain === 2 && father.geneticQuirks.wGain === 2) {
+ if (jsRandom(1, 4) >= 3) {
+ quirks.wGain = 2;
+ } else {
+ quirks.wGain = 1;
+ }
+ } else if (mother.geneticQuirks.wGain + father.geneticQuirks.wGain >= 3) {
+ chance = jsRandom(1, 4);
+ if (chance <= 2) {
+ quirks.wGain = 2;
+ } else if (chance === 4) {
+ quirks.wGain = 1;
+ }
+ } else if (mother.geneticQuirks.wGain === 1 && father.geneticQuirks.wGain === 1) {
+ if (jsRandom(1, 4) === 1) {
+ quirks.wGain = 2;
+ } else if (chance === 4) {
+ quirks.wGain = 1;
+ }
+ }
+ } else if (mother.geneticQuirks.wGain >= 1) {
+ if (jsRandom(0, 40000) >= 37500) {
+ chance = jsRandom(1, 4);
+ if (chance <= 2) {
+ quirks.wGain = 1;
+ } else if (chance === 4) {
+ quirks.wGain = 2;
+ }
+ }
+ }
+
+ // hypoleptinemia
+ if (father !== 0) {
+ if (mother.geneticQuirks.wLoss === 2 && father.geneticQuirks.wLoss === 2) {
+ if (jsRandom(1, 4) >= 3) {
+ quirks.wLoss = 2;
+ } else {
+ quirks.wLoss = 1;
+ }
+ } else if (mother.geneticQuirks.wLoss + father.geneticQuirks.wLoss >= 3) {
+ chance = jsRandom(1, 4);
+ if (chance <= 2) {
+ quirks.wLoss = 2;
+ } else if (chance === 4) {
+ quirks.wLoss = 1;
+ }
+ } else if (mother.geneticQuirks.wLoss === 1 && father.geneticQuirks.wLoss === 1) {
+ if (jsRandom(1, 4) === 1) {
+ quirks.wLoss = 2;
+ } else if (chance === 4) {
+ quirks.wLoss = 1;
+ }
+ }
+ } else if (mother.geneticQuirks.wLoss >= 1) {
+ if (jsRandom(0, 40000) >= 39000) {
+ chance = jsRandom(1, 4);
+ if (chance <= 2) {
+ quirks.wLoss = 1;
+ } else if (chance === 4) {
+ quirks.wLoss = 2;
+ }
+ }
+ }
+
+ // androgyny
+ if (father !== 0) {
+ if (mother.geneticQuirks.androgyny === 2 && father.geneticQuirks.androgyny === 2) {
+ quirks.androgyny = 2;
+ } else if (mother.geneticQuirks.androgyny + father.geneticQuirks.androgyny >= 3) {
+ chance = jsRandom(1, 4);
+ if (chance <= 2) {
+ quirks.androgyny = 2;
+ } else if (chance === 4) {
+ quirks.androgyny = 1;
+ }
+ } else if (mother.geneticQuirks.androgyny + father.geneticQuirks.androgyny >= 1) {
+ if (jsRandom(1, 4) === 1) {
+ quirks.androgyny = 2;
+ } else if (chance === 4) {
+ quirks.androgyny = 1;
+ }
+ }
+ } else if (mother.geneticQuirks.androgyny >= 1) {
+ if (jsRandom(0, 40000) >= 35000) {
+ chance = jsRandom(1, 4);
+ if (chance <= 2) {
+ quirks.androgyny = 1;
+ } else if (chance === 4) {
+ quirks.androgyny = 2;
+ }
+ }
+ }
+
return clone(quirks);
}
diff --git a/src/js/generateNewSlaveJS.js b/src/js/generateNewSlaveJS.js
index d03cd7790e2d6376277499913028f77de55f81f4..c781796185f1950722cdd2a2e4dba4c6dca0511f 100644
--- a/src/js/generateNewSlaveJS.js
+++ b/src/js/generateNewSlaveJS.js
@@ -1174,6 +1174,24 @@ window.GenerateNewSlave = (function() {
} else if (chance >= 18500) {
slave.geneticQuirks.mLoss = 1;
}
+ chance = jsRandom(1, 20000);
+ if (chance >= 19800) {
+ slave.geneticQuirks.wGain = 2;
+ } else if (chance >= 18500) {
+ slave.geneticQuirks.wGain = 1;
+ }
+ chance = jsRandom(1, 20000);
+ if (chance >= 19850) {
+ slave.geneticQuirks.wLoss = 2;
+ } else if (chance >= 18500) {
+ slave.geneticQuirks.wLoss = 1;
+ }
+ chance = jsRandom(1, 20000);
+ if (chance >= 19500) {
+ slave.geneticQuirks.androgyny = 2;
+ } else if (chance >= 19000) {
+ slave.geneticQuirks.androgyny = 1;
+ }
}
function generateXYGeneticQuirks() {
@@ -1240,6 +1258,24 @@ window.GenerateNewSlave = (function() {
} else if (chance >= 18500) {
slave.geneticQuirks.mLoss = 1;
}
+ chance = jsRandom(1, 20000);
+ if (chance >= 19900) {
+ slave.geneticQuirks.wGain = 2;
+ } else if (chance >= 18500) {
+ slave.geneticQuirks.wGain = 1;
+ }
+ chance = jsRandom(1, 20000);
+ if (chance >= 19950) {
+ slave.geneticQuirks.wLoss = 2;
+ } else if (chance >= 18500) {
+ slave.geneticQuirks.wLoss = 1;
+ }
+ chance = jsRandom(1, 20000);
+ if (chance >= 19200) {
+ slave.geneticQuirks.androgyny = 2;
+ } else if (chance >= 18500) {
+ slave.geneticQuirks.androgyny = 1;
+ }
}
function generateAge() {
@@ -1655,6 +1691,22 @@ window.GenerateNewSlave = (function() {
slave.muscles -= jsRandom(10, 50);
slave.muscles = Math.clamp(slave.muscles, -100, 100);
}
+ if (slave.geneticQuirks.wGain === 2) {
+ slave.weight += jsRandom(10, 50);
+ slave.weight = Math.clamp(slave.weight, -100, 200);
+ slave.weightDirection = 1;
+ }
+ if (slave.geneticQuirks.wLoss === 2) {
+ slave.weight -= jsRandom(10, 50);
+ slave.weight = Math.clamp(slave.weight, -100, 200);
+ slave.weightDirection = -1;
+ }
+ if (slave.geneticQuirks.androgyny === 2) {
+ slave.faceShape = "androgynous";
+ if (slave.face < 60) {
+ slave.face += 15;
+ }
+ }
}
return GenerateNewSlave;
diff --git a/src/js/physicalDevelopment.js b/src/js/physicalDevelopment.js
index bda4e15f788572986f865b1a805ed76594218ce3..92fcf5e2aede9b0a439aed090307cce0691586fc 100644
--- a/src/js/physicalDevelopment.js
+++ b/src/js/physicalDevelopment.js
@@ -15,10 +15,37 @@ window.physicalDevelopment = (function physicalDevelopment() {
if (slave.geneMods.NCS !== 1) {
/* NCS completely blocks all natural physical growth: no height increases. It also blocks all hormonal secondary sexual * characteristics. So, on the female side: no boobs, no butt, no hips, and no labia. And on the male side: no dick, no clit, no balls, no scrotum, no shoulders. */
/* so this is a big old NO-OP to skip the physical development. */
- if (slave.genes === "XX") { /* loli becoming a woman */
- if (slave.geneticFlaws.dwarfism === 2 && slave.geneticFlaws.gigantism !== 2) {
+ if (slave.geneticQuirks.androgyny === 2) { /* takes a mix of both to create a very androgynous slave */
+ if (slave.geneticQuirks.dwarfism === 2 && slave.geneticQuirks.gigantism !== 2) {
increaseHeightDwarf(slave);
- } else if (slave.geneticFlaws.gigantism === 2) {
+ } else if (slave.geneticQuirks.gigantism === 2) {
+ increaseHeightGiant(slave);
+ } else {
+ increaseHeightXX(slave);
+ }
+ if (slave.boobs - slave.boobsImplant <= 300) {
+ increaseBoobsXX(slave);
+ }
+ if (slave.dick > 0 && (slave.dick < 3 || slave.geneticQuirks.wellHung === 2)) {
+ increaseDick(slave);
+ }
+ if (slave.balls > 0 && slave.balls < 3) {
+ increaseBalls(slave);
+ }
+ if (slave.waist < 10) {
+ increaseWaistXY(slave);
+ }
+ if (slave.hips - slave.hipsImplant < 0) {
+ increaseHipsXX(slave);
+ }
+ if (slave.butt - slave.buttImplant < 3) {
+ increaseButtXX(slave);
+ }
+ increasePregAdpatationXX(slave);
+ } else if (slave.genes === "XX") { /* loli becoming a woman */
+ if (slave.geneticQuirks.dwarfism === 2 && slave.geneticQuirks.gigantism !== 2) {
+ increaseHeightDwarf(slave);
+ } else if (slave.geneticQuirks.gigantism === 2) {
increaseHeightGiant(slave);
} else {
increaseHeightXX(slave);
@@ -39,9 +66,9 @@ window.physicalDevelopment = (function physicalDevelopment() {
increasePregAdpatationXX(slave);
} else {
/* shota becoming a man */
- if (slave.geneticFlaws.dwarfism === 2 && slave.geneticFlaws.gigantism !== 2) {
+ if (slave.geneticQuirks.dwarfism === 2 && slave.geneticQuirks.gigantism !== 2) {
increaseHeightDwarf(slave);
- } else if (slave.geneticFlaws.gigantism === 2) {
+ } else if (slave.geneticQuirks.gigantism === 2) {
increaseHeightGiant(slave);
} else {
increaseHeightXY(slave);
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index ab37f95abb38107d51c2d86151dbf0b0d2b894d0..5f66ee8b4a470c3bb8dbb79061fbdc777904dfa8 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -2319,7 +2319,8 @@ App.Utils.escapeHtml = function(text) {
* @see https://www.motoslave.net/sugarcube/2/docs/#markup-html-attribute
* @param {string} linkText link text
* @param {string} passage the passage name to link to
- * @param {string} [setter=''] setter tet (optional)
+ * @param {string} [setter=''] setter text (optional)
+ * @param {string} [tooltip=''] tooltip text (optional)
* @param {string} [elementType='a'] element type (optional) default is 'a'.
* Could be any of 'a', 'audio', img', 'source', 'video'
* @returns {string} element text
@@ -2328,11 +2329,14 @@ App.Utils.escapeHtml = function(text) {
* // equal to [[Go to town|Town]]
* App.UI.passageLink("Go to town", "Town")
*/
-App.UI.passageLink = function(linkText, passage, setter, elementType = 'a') {
+App.UI.passageLink = function(linkText, passage, setter, tooltip = '', elementType = 'a') {
let res = `<${elementType} data-passage="${passage}"`;
if (setter) {
res += ` data-setter="${App.Utils.escapeHtml(setter)}"`;
}
+ if (tooltip) {
+ res += ` title="${tooltip}"`;
+ }
res += `>${linkText}</${elementType}>`;
return res;
};
@@ -2356,21 +2360,24 @@ App.UI.link = function() {
* @param {string} [passage] the passage name to link to
* @returns {string} link in SC markup
*/
- function makeLink(linkText, handler, args = [], passage = '') {
+ function makeLink(linkText, handler, args = [], passage = '', tooltip = '') {
// pack handler and data
State.temporary.linkHandlers[counter] = {
f: handler,
args: Array.isArray(args) ? args : [args]
};
- // can't say _linkHandlers here becasue SC does not recognize its own notation in "..._varName"
+ // can't say _linkHandlers here because SC does not recognize its own notation in "..._varName"
let SCHandlerText =
`State.temporary.linkHandlers[${counter}].f(...State.temporary.linkHandlers[${counter}].args);`;
++counter;
if (passage) {
- return App.UI.passageLink(linkText, passage, SCHandlerText);
+ return App.UI.passageLink(linkText, passage, SCHandlerText, tooltip);
} else {
+ if (tooltip) {
+ throw "Tooltips are not supported by the <<link>> markup.";
+ }
// data-passage scheme does not work with empty passage name
return `<<link "${linkText}">><<run ${SCHandlerText}>><</link>>`;
}
diff --git a/src/pregmod/saInflation.tw b/src/pregmod/saInflation.tw
index 5458ec1d1eb45767ddb6901da4f0248ecfcdba59..0f14c7ba9aefba99fdba7cb6ab879553e66c6642 100644
--- a/src/pregmod/saInflation.tw
+++ b/src/pregmod/saInflation.tw
@@ -534,6 +534,9 @@
<<if $slaves[$i].weight < 200>>
$His body @@.lime;grows a little more padded@@ as it absorbs the milk contained in $his digestive track.
<<set $slaves[$i].weight += 2>>
+ <<if $slaves[$i].weightDirection == 1>>
+ <<set $slaves[$i].weight += 2>>
+ <</if>>
<</if>>
<<if random(1,100) > 50/_gigantomastiaMod && $slaves[$i].boobs < 3000*_gigantomastiaMod>>
$His breasts @@.lime;swell@@ with added fat as $he digests the milk contained in $his digestive track.
@@ -550,6 +553,9 @@
<<if $slaves[$i].weight < 200>>
$His body @@.lime;rapidly gains weight@@ as it digests the food contained in $his digestive track.
<<set $slaves[$i].weight += 4>>
+ <<if $slaves[$i].weightDirection == 1>>
+ <<set $slaves[$i].weight += 2>>
+ <</if>>
<</if>>
<<if random(1,100) > 50/_gigantomastiaMod && $slaves[$i].boobs < 3000*_gigantomastiaMod>>
$His breasts @@.lime;swell@@ with added fat as $he digests the food contained in $his digestive track.
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 0fdf823f8bee203ae98077912661ae981eeb77ad..d8b4299533839adc82e161b9378a12065613b3e1 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -149,6 +149,9 @@
<<if ndef $args[0].lactationRules>>
<<set $args[0].lactationRules = "none">>
<</if>>
+<<if ndef $args[0].weightDirection>>
+ <<set $args[0].weightDirection = 0>>
+<</if>>
<<if $releaseID < 1036>>
<<for _pmw = 0; _pmw < $args[0].womb.length; _pmw++>>
<<if $args[0].womb[_pmw].genetics.mother !== $args[0].womb[_pmw].motherID || $args[0].womb[_pmw].genetics.father !== $args[0].womb[_pmw].fatherID>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index b0020297f04fa3abe73915dd9deb2bd521331cb2..07fe94cf29e86cb9e17200152ca6c3026ed8300e 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -4399,7 +4399,7 @@ Then $he reaches $his arms back, and leans back, as far as $he can go. $He arche
<<elseif $activeSlave.boobShape == "wide-set">>
making $his wide-set breasts spread even farther, to hang almost to $his armpits on either side. It's not conventionally attractive, but $he's certainly very well endowed.
<<elseif $activeSlave.boobShape == "saggy">>
- emphasizing how saggy $his tits are. They <<if $activeSlave.belly >= 10000>>rest heavily atop $his tautly <<if $activeSlave.bellyPreg >= 3000>>gravid<<else>>distended<</if>> _belly belly<<else>>hang down far enough to obscure the top of $his _belly belly<</if>>. It's not conventionally attractive, but $he's certainly very well endowed.
+ emphasizing how saggy $his tits are. They <<if $activeSlave.belly >= 10000>>rest heavily atop $his tautly <<if $activeSlave.bellyPreg >= 3000>>gravid<<else>>distended<</if>> <<if $activeSlave.belly >= 1500>>_belly <</if>>belly<<else>>hang down far enough to obscure the top of $his _belly belly<</if>>. It's not conventionally attractive, but $he's certainly very well endowed.
<<else>>
making $his beautiful breasts stick out nicely. They maintain their perfect shape surprisingly well for being so enormous, and $his $activeSlave.nipples nipples <<if $activeSlave.nipples != "fuckable">>stick out at you prominently<<else>>just beg to be penetrated<</if>>.
<</if>>
diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw
index 7b2d59fa0ac8e0e6d071d2c055de68751836c5e4..314e720f293c14c699db74618757005f0ed55df3 100644
--- a/src/uncategorized/cellblockReport.tw
+++ b/src/uncategorized/cellblockReport.tw
@@ -194,7 +194,13 @@
<<case "Hedonistic">>
<<set $slaves[$i].livingRules = "spare">>
<<if $slaves[$i].weight < 200>>
- <<set $slaves[$i].weight += 3>>
+ <<if $slaves[$i].weightDirection == 1>>
+ <<set $slaves[$i].weight += 5>>
+ <<elseif $slaves[$i].weightDirection == -1>>
+ <<set $slaves[$i].weight += 1>>
+ <<else>>
+ <<set $slaves[$i].weight += 3>>
+ <</if>>
<</if>>
<<if $slaves[$i].muscles > -100>>
<<set $slaves[$i].muscles -= 2>>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index 4220a4377bcaa695fae1760f1432a2cbd1f88086..913ebef4125afb98c149cb5d7ca3f245f3ee4d20 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -481,6 +481,9 @@
<</if>>
<<elseif $slaves[$i].diet == "fattening">>
<<set $slaves[$i].weight += 2>>
+ <<if $slaves[$i].weightDirection == 1>>
+ <<set $slaves[$i].weight += 2>>
+ <</if>>
<</if>>
<<if ($slaves[$i].health < 75)>>
<<set $slaves[$i].health += 25>>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index bda2940c2aa37bfa5fe0823f05a61073fc3ed916..440f80c79f882801491126fc8788d1929e66f340 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -194,6 +194,16 @@
<<if $slaves[_i].missingLegs == 3 && $slaves[_i].amp == 1>>
<<set $slaves[_i].heels = 0, $slaves[_i].shoes = "none", $slaves[_i].legAccessory = "none", $slaves[_i].legsTat = 0, $slaves[_i].heightImplant = 0>>
<</if>>
+ /* irregular leptin production weight gain/loss setter */
+ <<if $slaves[_i].geneticQuirks.wGain == 2 && $slaves[_i].geneticQuirks.wLoss == 2>>
+ <<set $slaves[_i].weightDirection = either(-1, 1)>>
+ <<elseif $slaves[_i].geneticQuirks.wGain == 2>>
+ <<set $slaves[_i].weightDirection = 1>>
+ <<elseif $slaves[_i].geneticQuirks.wLoss == 2>>
+ <<set $slaves[_i].weightDirection = -1>>
+ <<else>>
+ <<set $slaves[_i].weightDirection = 0>>
+ <</if>>
/% Fix some possible floating point rounding errors, and bring precision to one decimal place. %/
<<run SlaveStatClamp($slaves[_i])>>
<<set $slaves[_i].energy = Math.clamp($slaves[_i].energy.toFixed(1), 0, 100)>>
diff --git a/src/uncategorized/reFSNonconformist.tw b/src/uncategorized/reFSNonconformist.tw
index 187e10ffb6304f72dab63e3a3e54c58415c36f26..12edfc102ae63de73c9521dfba6dacf671f9f3bf 100644
--- a/src/uncategorized/reFSNonconformist.tw
+++ b/src/uncategorized/reFSNonconformist.tw
@@ -270,7 +270,7 @@ The nonconformist is far too prominent and prosperous to make this an easy dilem
offers their Ancient Greek Revivalism alternative with fanfare, but fanfare is something that the Egyptians could certainly manage. The nasty little attempt is barely noticed over the perfume and noise of a long and beautiful festival.
<</if>>
The oligarchy is pleased by how you managed to defuse the situation without causing a spectacle. They're disappointed that you permitted their nonconforming peer to remain in the arcology's upper echelons for the time being, but they accept your solution to the problem.
- <</replace>>
+ <</nobr>><</replace>>
<</link>> //This will cost <<print cashFormat(10000)>>//
<<else>>
//You lack the necessary ready cash to manage a nuanced solution//
diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index 71fc552cd4fa899b75ad3a7e81033c470f849d1a..792167594d5c17c82bd473e1ba2a3c7c370b9370 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -257,6 +257,9 @@
<<if ($activeSlave.anus == 1) && ($activeSlave.skill.anal <= 10)>>
<<set $qualifiedNicknames.push("analWhiner")>>
<</if>>
+<<if ($activeSlave.vagina == -1) && ($activeSlave.dick == 0) && ($activeSlave.balls == 0)>>
+ <<set $qualifiedNicknames.push("null")>>
+<</if>>
<<if ($qualifiedNicknames.length == 0)>>
<<goto "RIE Eligibility Check">>
@@ -1229,6 +1232,11 @@
<<set $applyDesc = "understands that it's $his fate to remain unspoiled a while longer, and redoubles $his efforts to do better with $his other parts.">>
<<set $notApplyDesc = "dreads and anticipates the day when $he'll lose $his pearl of great price and gain another way to please a man.">>
+<<case "null">>
+ <<set $nickname = either("'Agender'", "'Androgynous'", "'Angelic'", "'Asexual'", "'Barbie Doll'", "'Censored'", "'Cherub'", "'Devoid'", "'Featureless'", "'Genderless'", "'Groinless'", "'Hole-Less'", "'Mannequin'", "'Mutilated'", "'Netherless'", "'Nondescript'", "'Null'", "'Sewn'", "'Sexless'", "'Smooth'", "'Soft Groin'", "'Two-Hole'", "'Uniform'", "'Unproductive'")>>
+ <<set $situationDesc = "has neither a penis nor a vagina; $he is a null, with nothing but soft skin on $his groin. Since $he is a Free Cities sex slave, that makes $him female, despite the androgyny of $his genitals. This sometimes makes $his life more difficult, as it only draws more attention to the availability of $his mouth or ass.">>
+ <<set $applyDesc = "finds some perverse pride in $his genital makeup, which defies traditional notions of gender.">>
+ <<set $notApplyDesc = "will try $his best to keep up with what's demanded of a sex slave, despite the annoyance of lacking genitals.">>
<</switch>>
<span id="artFrame">
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 2911fa14e790f9c57bbfd4ccf96790eb1a7733bb..2a0d5d99598bcfbb2af36145a19f0b466752d175 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -1419,7 +1419,6 @@ $He has
<br>
[[Induced albinism treatment|Surgery Degradation][$activeSlave.geneticQuirks.albinism = 2,cashX(forceNeg($surgeryCost*10), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 40,$surgeryType = "gene treatment"]] //This will induce @@.orange;albinism@@ in $his genetic code//
<</if>>
- /*
<<if $activeSlave.geneticQuirks.androgyny == 2>>
<br>
[[Androgyny correction treatment|Surgery Degradation][$activeSlave.geneticQuirks.androgyny = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]]
@@ -1430,7 +1429,6 @@ $He has
<br>
[[Induced androgyny treatment|Surgery Degradation][$activeSlave.geneticQuirks.androgyny = 2,cashX(forceNeg($surgeryCost*10), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 40,$surgeryType = "gene treatment"]] //This will induce @@.orange;natural androgyny@@ in $his genetic code//
<</if>>
- */
<<if $activeSlave.geneticQuirks.dwarfism == 2>>
<br>
[[Dwarfism correction treatment|Surgery Degradation][$activeSlave.geneticQuirks.dwarfism = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]]
@@ -1531,23 +1529,23 @@ $He has
<</if>>
<<if $activeSlave.geneticQuirks.wGain == 2>>
<br>
- [[Correct hyperleptinemia|Surgery Degradation][$activeSlave.geneticQuirks.wGain = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]]
+ [[Correct hyperleptinemia|Surgery Degradation][$activeSlave.geneticQuirks.wGain = 0, $activeSlave.weightDirection = 0, cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]]
<<elseif $activeSlave.geneticQuirks.wGain == 1 && $geneticMappingUpgrade >= 2>>
<br>
- [[Hyperleptinemia activation treatment|Surgery Degradation][$activeSlave.geneticQuirks.wGain = 2,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]]
+ [[Hyperleptinemia activation treatment|Surgery Degradation][$activeSlave.geneticQuirks.wGain = 2, $activeSlave.weightDirection = 1, cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]]
<<elseif $geneticFlawLibrary == 1>>
<br>
- [[Induced hyperleptinemia treatment|Surgery Degradation][$activeSlave.geneticQuirks.wGain = 2,cashX(forceNeg($surgeryCost*10), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 40,$surgeryType = "gene treatment"]] //This will induce @@.orange;hyperleptinemia@@ in $his genetic code//
+ [[Induced hyperleptinemia treatment|Surgery Degradation][$activeSlave.geneticQuirks.wGain = 2, $activeSlave.weightDirection = 1, cashX(forceNeg($surgeryCost*10), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 40,$surgeryType = "gene treatment"]] //This will induce @@.orange;hyperleptinemia@@ in $his genetic code//
<</if>>
<<if $activeSlave.geneticQuirks.wLoss == 2>>
<br>
- [[Correct hypoleptinemia|Surgery Degradation][$activeSlave.geneticQuirks.wLoss = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]]
+ [[Correct hypoleptinemia|Surgery Degradation][$activeSlave.geneticQuirks.wLoss = 0, $activeSlave.weightDirection = 0, cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]]
<<elseif $activeSlave.geneticQuirks.wLoss == 1 && $geneticMappingUpgrade >= 2>>
<br>
- [[Hypoleptinemia activation treatment|Surgery Degradation][$activeSlave.geneticQuirks.wLoss = 2,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]]
+ [[Hypoleptinemia activation treatment|Surgery Degradation][$activeSlave.geneticQuirks.wLoss = 2, $activeSlave.weightDirection = -1, cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]]
<<elseif $geneticFlawLibrary == 1>>
<br>
- [[Induced hypoleptinemia treatment|Surgery Degradation][$activeSlave.geneticQuirks.wLoss = 2,cashX(forceNeg($surgeryCost*10), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 40,$surgeryType = "gene treatment"]] //This will induce @@.orange;hypoleptinemia@@ in $his genetic code//
+ [[Induced hypoleptinemia treatment|Surgery Degradation][$activeSlave.geneticQuirks.wLoss = 2, $activeSlave.weightDirection = -1, cashX(forceNeg($surgeryCost*10), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 40,$surgeryType = "gene treatment"]] //This will induce @@.orange;hypoleptinemia@@ in $his genetic code//
<</if>>
<<if $activeSlave.geneticQuirks.mGain == 2>>
<br>
@@ -1559,7 +1557,6 @@ $He has
<br>
[[Induced myotonic hypertrophy treatment|Surgery Degradation][$activeSlave.geneticQuirks.mGain = 2,cashX(forceNeg($surgeryCost*10), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 40,$surgeryType = "gene treatment"]] //This will induce @@.orange;myotonic hypertrophy@@ in $his genetic code//
<</if>>
- /*
<<if $activeSlave.geneticQuirks.mLoss == 2>>
<br>
[[Correct myotonic dystrophy|Surgery Degradation][$activeSlave.geneticQuirks.mLoss = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]]
@@ -1570,7 +1567,6 @@ $He has
<br>
[[Induced myotonic dystrophy treatment|Surgery Degradation][$activeSlave.geneticQuirks.mLoss = 2,cashX(forceNeg($surgeryCost*10), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 40,$surgeryType = "gene treatment"]] //This will induce @@.orange;myotonic dystrophy@@ in $his genetic code//
<</if>>
- */
<</if>>
<br><br>
<</if>>
diff --git a/src/uncategorized/saDiet.tw b/src/uncategorized/saDiet.tw
index a9d011c1021e2e56dc784e4338831af685fdc9fb..8b2803275b60dc11f18d29cd01665dbba4b165f1 100644
--- a/src/uncategorized/saDiet.tw
+++ b/src/uncategorized/saDiet.tw
@@ -117,7 +117,13 @@
<<elseif _weightLoss == 5>>
$He @@.lime;loses weight.@@
<</if>>
- <<set $slaves[$i].weight -= _weightLoss+($feeder*2)>>
+ <<if $slaves[$i].weightDirection == -1>>
+ <<set $slaves[$i].weight -= (_weightLoss+3)+($feeder*2)>>
+ <<elseif $slaves[$i].weightDirection == 1>>
+ <<set $slaves[$i].weight -= (_weightLoss-3)+($feeder)>>
+ <<else>>
+ <<set $slaves[$i].weight -= _weightLoss+($feeder*2)>>
+ <</if>>
<<if $slaves[$i].boobs-$slaves[$i].boobsImplant-$slaves[$i].boobsMilk >= 200 && _gigantomastiaMod != 3>>
<<if (($slaves[$i].geneMods.NCS == 0) && (random(1,_assetLoss*_gigantomastiaMod) <= 1+$feeder))>>
@@.orange;$His breasts get a little smaller.@@
@@ -302,7 +308,13 @@
<<if ($slaves[$i].geneMods.NCS == 1)>>
<<set _assetGain = Math.trunc(_assetGain * 2)>>
<</if>>
- <<set $slaves[$i].weight += _weightGain+($feeder*2)>>
+ <<if $slaves[$i].weightDirection == -1>>
+ <<set $slaves[$i].weight += Math.max((_weightGain-3)+($feeder), 1)>>
+ <<elseif $slaves[$i].weightDirection == 1>>
+ <<set $slaves[$i].weight += (_weightGain+3)+($feeder*2)>>
+ <<else>>
+ <<set $slaves[$i].weight += _weightGain+($feeder*2)>>
+ <</if>>
<<if random(1,_assetGain) <= 1+$feeder>>
@@.lime;$His breasts get a little bigger.@@
<<if ($slaves[$i].geneMods.NCS == 0)>>
@@ -319,6 +331,9 @@
$He is now quite fat, so $his diet @@.yellow;has defaulted to maintenance of this weight.@@
<<set $slaves[$i].diet = "healthy">>
<</if>>
+ <<elseif $slaves[$i].weightDirection == 1>>
+ $He gains a little weight this week despite $his dietary troubles.
+ <<set $slaves[$i].weight += 1>>
<<else>>
$He doesn't gain any weight this week.
<</if>>
@@ -401,9 +416,12 @@
$His workout successes have @@.green;improved $his health.@@
<<set $slaves[$i].health += 10>>
<</if>>
- <<if $slaves[$i].weight > 10>>
+ <<if $slaves[$i].weight > 10 && $slaves[$i].weightDirection != 1>>
$His workouts have also @@.orange;burned off some excess fat.@@
<<set $slaves[$i].weight -= 2>>
+ <<if $slaves[$i].weightDirection == -1>>
+ <<set $slaves[$i].weight -= 2>>
+ <</if>>
<</if>>
<</if>>
<<case "slimming">> /* Muscle Loss */
@@ -485,9 +503,12 @@
$His workout successes have @@.green;improved $his health.@@
<<set $slaves[$i].health += 10>>
<</if>>
- <<if $slaves[$i].weight > 10>>
+ <<if $slaves[$i].weight > 10 && $slaves[$i].weightDirection != 1>>
$His workouts have also @@.orange;burned off some excess fat.@@
<<set $slaves[$i].weight -= 2>>
+ <<if $slaves[$i].weightDirection == -1>>
+ <<set $slaves[$i].weight -= 2>>
+ <</if>>
<</if>>
<<else>>
$His long workouts focus on cardio to keep $his body lithe.
@@ -518,9 +539,12 @@
$His workout successes have @@.green;improved $his health.@@
<<set $slaves[$i].health += 5>>
<</if>>
- <<if $slaves[$i].weight > 10>>
+ <<if $slaves[$i].weight > 10 && $slaves[$i].weightDirection != 1>>
$His workouts have also @@.orange;burned off some excess fat.@@
<<set $slaves[$i].weight -= 2>>
+ <<if $slaves[$i].weightDirection == -1>>
+ <<set $slaves[$i].weight -= 2>>
+ <</if>>
<</if>>
<</if>>
<<case "cum production">>
@@ -560,9 +584,12 @@
Despite some doubts lurking at the back of $his mind, your insistence that $he will be prettier if $he was more feminine @@.hotpink;lets $him enjoy@@ the estrogen rich food given to $him.
<<set $slaves[$i].devotion += 1>>
<</if>>
- <<if $slaves[$i].weight < 30>>
+ <<if $slaves[$i].weight < 30 && $slaves[$i].weightDirection != -1>>
Hormonal changes encourage $his body to @@.lime;grow softer.@@
<<set $slaves[$i].weight += 1>>
+ <<if $slaves[$i].weightDirection == 1>>
+ <<set $slaves[$i].weight += 2>>
+ <</if>>
<</if>>
<<if (($slaves[$i].geneMods.NCS == 0) && ($slaves[$i].boobs < 500*_gigantomastiaMod))>>
$His breasts @@.lime;grow slightly@@ from the estrogen.
@@ -599,9 +626,12 @@
Despite some doubts lurking at the back of $his mind, your insistence that $he will be prettier if $he was more fertile @@.hotpink;lets $him enjoy@@ the estrogen rich food given to $him.
<<set $slaves[$i].devotion += 1>>
<</if>>
- <<if $slaves[$i].weight < 40>>
+ <<if $slaves[$i].weight < 40 && $slaves[$i].weightDirection != 1>>
Hormonal changes encourage $his body to @@.lime;grow softer.@@
<<set $slaves[$i].weight += 1>>
+ <<if $slaves[$i].weightDirection == 1>>
+ <<set $slaves[$i].weight += 2>>
+ <</if>>
<</if>>
<<if (($slaves[$i].geneMods.NCS == 0) && ($slaves[$i].boobs < 600*_gigantomastiaMod))>>
$His breasts @@.lime;grow slightly@@ from the estrogen.
@@ -620,9 +650,12 @@
Despite some doubts lurking at the back of $his mind, your insistence that $he will be prettier if $he was more feminine @@.hotpink;lets $him enjoy@@ the estrogen rich food given to $him.
<<set $slaves[$i].devotion += 1>>
<</if>>
- <<if $slaves[$i].weight < 20>>
+ <<if $slaves[$i].weight < 20 && $slaves[$i].weightDirection != 1>>
Hormonal changes encourage $his body to @@.lime;grow softer.@@
<<set $slaves[$i].weight += 1>>
+ <<if $slaves[$i].weightDirection == 1>>
+ <<set $slaves[$i].weight += 2>>
+ <</if>>
<</if>>
<<if (($slaves[$i].geneMods.NCS == 0) && ($slaves[$i].boobs < 400*_gigantomastiaMod))>>
$His breasts @@.lime;grow slightly@@ from the estrogen.
@@ -758,9 +791,12 @@
Hormonal changes encourage $his body to @@.lime;gain muscle.@@
<<set $slaves[$i].muscles += 1>>
<</if>>
- <<if $slaves[$i].weight < 50>>
+ <<if $slaves[$i].weight < 50 && $slaves[$i].weightDirection != -1>>
Hormonal changes encourage $his body to @@.lime;grow softer.@@
<<set $slaves[$i].weight += 1>>
+ <<if $slaves[$i].weightDirection == 1>>
+ <<set $slaves[$i].weight += 2>>
+ <</if>>
<</if>>
<<if (($slaves[$i].geneMods.NCS == 0) && ($slaves[$i].boobs < 800*_gigantomastiaMod))>>
$His breasts @@.lime;grow slightly@@ to fit $his developing femininity.
@@ -852,7 +888,6 @@
<</if>>
<<else>>
$He doesn't really notice that @@.lime;$his body is being prepared to carry multiples,@@ other than the slight tingle in $his lower belly.
- <<set $slaves[$i].devotion -= 2, $slaves[$i].trust++, $slaves[$i].health += 2>>
<<if $slaves[$i].attrXY < 70>>
$He certainly notices @@.green;how much more attractive men are,@@ however.
<<set $slaves[$i].attrXY += 2>>
@@ -884,6 +919,19 @@
<</if>>
<</if>>
<</if>>
+<<if !["fattening", "restricted", "slimming"].includes($slaves[$i].diet)>>
+ <<if $slaves[$i].weightDirection == -1 && $slaves[$i].weight >= -95>>
+ <<if $geneticMappingUpgrade >= 1>>
+ $His body @@.lime;aggressively burns fat@@ due to $his <<if $slaves[$i].geneticQuirks.wGain == 2 && $slaves[$i].geneticQuirks.wLoss == 2>>irregular leptin production<<else>>hypoleptinemia<</if>>.
+ <</if>>
+ <<set $slaves[$i].weight -= 3>>
+ <<elseif $slaves[$i].weightDirection == 1 && $slaves[$i].weight < 195>>
+ <<if $geneticMappingUpgrade >= 1>>
+ $His body @@.lime;aggressively stores fat@@ due to $his <<if $slaves[$i].geneticQuirks.wGain == 2 && $slaves[$i].geneticQuirks.wLoss == 2>>irregular leptin production<<else>>hyperleptinemia<</if>>.
+ <</if>>
+ <<set $slaves[$i].weight += 3>>
+ <</if>>
+<</if>>
<<if ($slaves[$i].dietCum > 0)>>
<<if $slaves[$i].fetish != "mindbroken">>
@@ -1029,7 +1077,13 @@
<<switch $slaves[$i].diet>>
<<case "restricted">> /* Weight Loss */
The ports in Fuckdoll suits allow total dietary control, and $he's barely aware $he's being @@.lime;slimmed down.@@
- <<set $slaves[$i].weight -= 9>>
+ <<if $slaves[$i].weightDirection == -1>>
+ <<set $slaves[$i].weight -= 12>>
+ <<elseif $slaves[$i].weightDirection == 1>>
+ <<set $slaves[$i].weight -= 6>>
+ <<else>>
+ <<set $slaves[$i].weight -= 9>>
+ <</if>>
<<if random(1,2) <= 1>>
<<if random(1,2) <= 1 && _gigantomastiaMod != 3>>
@@.orange;$His breasts get a little smaller.@@
@@ -1054,7 +1108,13 @@
<</if>>
<<case "fattening">> /* Weight Gain */
The ports in Fuckdoll suits allow total dietary control, and $he's barely aware $he's being @@.lime;fattened up.@@
- <<set $slaves[$i].weight += 9>>
+ <<if $slaves[$i].weightDirection == 1>>
+ <<set $slaves[$i].weight += 12>>
+ <<elseif $slaves[$i].weightDirection == -1>>
+ <<set $slaves[$i].weight += 6>>
+ <<else>>
+ <<set $slaves[$i].weight += 9>>
+ <</if>>
<<if random(1,2) <= 1>>
@@.lime;$His breasts get a little bigger.@@
<<set $slaves[$i].boobs += 50>>
@@ -1092,9 +1152,12 @@
<<set $slaves[$i].butt -= 1>>
<</if>>
<</if>>
- <<if $slaves[$i].weight > 10>>
+ <<if $slaves[$i].weight > 10 && $slaves[$i].weightDirection != 1>>
$His workouts have also @@.orange;burned off some excess fat.@@
<<set $slaves[$i].weight -= 2>>
+ <<if $slaves[$i].weightDirection == -1>>
+ <<set $slaves[$i].weight -= 2>>
+ <</if>>
<</if>>
The stress of forced exercise is trivial compared to everything else $he experiences, and $he's unaffected mentally.
<<case "slimming">> /* Muscle Loss */
@@ -1122,9 +1185,12 @@
<<set $slaves[$i].butt -= 1>>
<</if>>
<</if>>
- <<if $slaves[$i].weight > 10>>
+ <<if $slaves[$i].weight > 10 && $slaves[$i].weightDirection != 1>>
$His workouts have also @@.orange;burned off some excess fat.@@
<<set $slaves[$i].weight -= 2>>
+ <<if $slaves[$i].weightDirection == -1>>
+ <<set $slaves[$i].weight -= 2>>
+ <</if>>
<</if>>
The stress of forced exercise is trivial compared to everything else $he experiences, and $he's unaffected mentally.
@@ -1141,9 +1207,12 @@
<<case "XX">> /* Female Hormones */
The ports in Fuckdoll suits allow total dietary control, and $he's barely aware $he's being @@.lime;feminized.@@
<<if ($slaves[$i].ovaries == 1 || $slaves[$i].mpreg == 1) && ($slaves[$i].balls > 0)>> /* herm */
- <<if $slaves[$i].weight < 30>>
+ <<if $slaves[$i].weight < 30 && $slaves[$i].weightDirection != -1>>
Hormonal changes encourage $his body to @@.lime;grow softer.@@
<<set $slaves[$i].weight += 1>>
+ <<if $slaves[$i].weightDirection == 1>>
+ <<set $slaves[$i].weight += 2>>
+ <</if>>
<</if>>
<<if (($slaves[$i].geneMods.NCS == 0) && (($slaves[$i].boobs-$slaves[$i].boobsImplant) < 500*_gigantomastiaMod))>>
$His breasts @@.lime;grow slightly@@ from the estrogen.
@@ -1166,9 +1235,12 @@
<<set $slaves[$i].balls -= 1>>
<</if>>
<<elseif $slaves[$i].ovaries == 1 || $slaves[$i].mpreg == 1>> /* female */
- <<if $slaves[$i].weight < 40>>
+ <<if $slaves[$i].weight < 40 && $slaves[$i].weightDirection != -1>>
Hormonal changes encourage $his body to @@.lime;grow softer.@@
<<set $slaves[$i].weight += 1>>
+ <<if $slaves[$i].weightDirection == 1>>
+ <<set $slaves[$i].weight += 2>>
+ <</if>>
<</if>>
<<if (($slaves[$i].geneMods.NCS == 0) && (($slaves[$i].boobs-$slaves[$i].boobsImplant) < 600*_gigantomastiaMod))>>
$His breasts @@.lime;grow slightly@@ from the estrogen.
@@ -1183,9 +1255,12 @@
<<set $slaves[$i].butt += 1>>
<</if>>
<<elseif $slaves[$i].balls > 0>> /* male */
- <<if $slaves[$i].weight < 20>>
+ <<if $slaves[$i].weight < 20 && $slaves[$i].weightDirection != -1>>
Hormonal changes encourage $his body to @@.lime;grow softer.@@
<<set $slaves[$i].weight += 1>>
+ <<if $slaves[$i].weightDirection == 1>>
+ <<set $slaves[$i].weight += 2>>
+ <</if>>
<</if>>
<<if (($slaves[$i].geneMods.NCS == 0) && (($slaves[$i].boobs-$slaves[$i].boobsImplant) < 600*_gigantomastiaMod))>>
$His breasts @@.lime;grow slightly@@ from the estrogen.
@@ -1272,9 +1347,12 @@
Hormonal changes encourage $his body to @@.lime;gain muscle.@@
<<set $slaves[$i].muscles += 1+$slaves[$i].geneticQuirks.mGain>>
<</if>>
- <<if $slaves[$i].weight < 50>>
+ <<if $slaves[$i].weight < 50 && $slaves[$i].weightDirection != -1>>
Hormonal changes encourage $his body to @@.lime;grow softer.@@
- <<set $slaves[$i].weight += 1>>
+ <<set $slaves[$i].weight += 1>>
+ <<if $slaves[$i].weightDirection == 1>>
+ <<set $slaves[$i].weight += 2>>
+ <</if>>
<</if>>
<<if $slaves[$i].waist < 0>>
Hormonal changes @@.orange;thicken $his waist.@@
@@ -1340,5 +1418,18 @@
<</if>>
<</if>>
<</if>>
+<<if !["fattening", "restricted", "slimming"].includes($slaves[$i].diet)>>
+ <<if $slaves[$i].weightDirection == -1 && $slaves[$i].weight >= -95>>
+ <<if $geneticMappingUpgrade >= 1>>
+ $His body @@.lime;aggressively burns fat@@ due to $his <<if $slaves[$i].geneticQuirks.wGain == 2 && $slaves[$i].geneticQuirks.wLoss == 2>>irregular leptin production<<else>>hypoleptinemia<</if>>.
+ <</if>>
+ <<set $slaves[$i].weight -= 3>>
+ <<elseif $slaves[$i].weightDirection == 1 && $slaves[$i].weight < 195>>
+ <<if $geneticMappingUpgrade >= 1>>
+ $His body @@.lime;aggressively stores fat@@ due to $his <<if $slaves[$i].geneticQuirks.wGain == 2 && $slaves[$i].geneticQuirks.wLoss == 2>>irregular leptin production<<else>>hyperleptinemia<</if>>.
+ <</if>>
+ <<set $slaves[$i].weight += 3>>
+ <</if>>
+<</if>>
<</if>> /* CLOSES FUCKDOLL CHECK */
diff --git a/src/uncategorized/saHormoneEffects.tw b/src/uncategorized/saHormoneEffects.tw
index 3d5e992144f6d556d62030635f395dc74e2aa7e2..95c5a7ec0dd268eaf7ad13241185d12e5a21afea 100644
--- a/src/uncategorized/saHormoneEffects.tw
+++ b/src/uncategorized/saHormoneEffects.tw
@@ -100,7 +100,7 @@
<<if ($slaves[$i].faceShape == "masculine")>>
Hormonal effects cause @@.orange;$his face to soften into <<if $slaves[$i].geneMods.NCS == 1>>childlike <</if>>androgyny.@@
<<set $slaves[$i].faceShape = "androgynous">>
- <<elseif ($slaves[$i].faceShape == "androgynous")>>
+ <<elseif ($slaves[$i].faceShape == "androgynous" && $slaves[$i].geneticQuirks.androgyny != 2)>>
Hormonal effects cause @@.lime;$his face to soften into <<if $slaves[$i].geneMods.NCS == 1>>childlike normalcy<<else>>femininity<</if>>.@@
<<set $slaves[$i].faceShape = "normal">>
<<elseif (($slaves[$i].geneMods.NCS == 1) && (random(1,100) > 50) && ($slaves[$i].faceShape == "normal"))>>
@@ -203,7 +203,7 @@
<<if ($slaves[$i].faceShape == "masculine")>>
Hormonal effects cause @@.orange;$his face to soften into <<if $slaves[$i].geneMods.NCS == 1>>childlike <</if>>androgyny.@@
<<set $slaves[$i].faceShape = "androgynous">>
- <<elseif ($slaves[$i].faceShape == "androgynous")>>
+ <<elseif ($slaves[$i].faceShape == "androgynous" && $slaves[$i].geneticQuirks.androgyny != 2)>>
Hormonal effects cause @@.lime;$his face to soften into <<if $slaves[$i].geneMods.NCS == 1>>childlike normalcy<<else>>femininity<</if>>.@@
<<set $slaves[$i].faceShape = "normal">>
<<elseif (($slaves[$i].geneMods.NCS == 1) && (random(1,100) > 50) && ($slaves[$i].faceShape == "normal"))>>
@@ -305,7 +305,7 @@
<<if ($slaves[$i].faceShape == "masculine")>>
Hormonal effects cause @@.orange;$his face to soften into <<if $slaves[$i].geneMods.NCS == 1>>childlike <</if>>androgyny.@@
<<set $slaves[$i].faceShape = "androgynous">>
- <<elseif ($slaves[$i].faceShape == "androgynous")>>
+ <<elseif ($slaves[$i].faceShape == "androgynous" && $slaves[$i].geneticQuirks.androgyny != 2)>>
Hormonal effects cause @@.lime;$his face to soften into <<if $slaves[$i].geneMods.NCS == 1>>childlike normalcy<<else>>femininity<</if>>.@@
<<set $slaves[$i].faceShape = "normal">>
<<elseif ($slaves[$i].geneMods.NCS == 1) && (random(1,100) > 50) && ($slaves[$i].faceShape == "normal")>>
@@ -407,7 +407,7 @@
<<if ($slaves[$i].faceShape == "masculine")>>
Hormonal effects cause @@.orange;$his face to soften into <<if $slaves[$i].geneMods.NCS == 1>>childlike <</if>>androgyny.@@
<<set $slaves[$i].faceShape = "androgynous">>
- <<elseif ($slaves[$i].geneMods.NCS == 1) && (random(1,100) > 50) && ($slaves[$i].faceShape == "androgynous")>>
+ <<elseif ($slaves[$i].geneMods.NCS == 1) && (random(1,100) > 50) && ($slaves[$i].faceShape == "androgynous" && $slaves[$i].geneticQuirks.androgyny != 2)>>
Hormonal effects cause @@.lime;$his face to soften into <<if $slaves[$i].geneMods.NCS == 1>>childlike normalcy<<else>>femininity<</if>>.@@
<<set $slaves[$i].faceShape = "normal">>
<</if>>
@@ -554,12 +554,14 @@
<<if ($slaves[$i].geneMods.NCS == 0)>>
<<if $slaves[$i].faceImplant < 5>>
- <<if ($slaves[$i].faceShape == "androgynous")>>
- Hormonal effects cause @@.orange;$his face to harden into masculinity.@@
- <<set $slaves[$i].faceShape = "masculine">>
- <<elseif ($slaves[$i].faceShape != "masculine")>>
- Hormonal effects cause @@.orange;$his face to harden into androgyny.@@
- <<set $slaves[$i].faceShape = "androgynous">>
+ <<if $slaves[$i].geneticQuirks.androgyny != 2>>
+ <<if ($slaves[$i].faceShape == "androgynous")>>
+ Hormonal effects cause @@.orange;$his face to harden into masculinity.@@
+ <<set $slaves[$i].faceShape = "masculine">>
+ <<elseif ($slaves[$i].faceShape != "masculine")>>
+ Hormonal effects cause @@.orange;$his face to harden into androgyny.@@
+ <<set $slaves[$i].faceShape = "androgynous">>
+ <</if>>
<</if>>
<</if>>
<<if ($slaves[$i].face-$slaves[$i].faceImplant > 0)>>
@@ -642,12 +644,14 @@
<<elseif $slaves[$i].hormoneBalance <= -300>>
<<if ($slaves[$i].geneMods.NCS == 0)>>
<<if $slaves[$i].faceImplant < 5>>
- <<if ($slaves[$i].faceShape == "androgynous")>>
- Hormonal effects cause @@.orange;$his face to harden into masculinity.@@
- <<set $slaves[$i].faceShape = "masculine">>
- <<elseif ($slaves[$i].faceShape != "masculine")>>
- Hormonal effects cause @@.orange;$his face to harden into androgyny.@@
- <<set $slaves[$i].faceShape = "androgynous">>
+ <<if $slaves[$i].geneticQuirks.androgyny != 2>>
+ <<if ($slaves[$i].faceShape == "androgynous")>>
+ Hormonal effects cause @@.orange;$his face to harden into masculinity.@@
+ <<set $slaves[$i].faceShape = "masculine">>
+ <<elseif ($slaves[$i].faceShape != "masculine")>>
+ Hormonal effects cause @@.orange;$his face to harden into androgyny.@@
+ <<set $slaves[$i].faceShape = "androgynous">>
+ <</if>>
<</if>>
<</if>>
<<if ($slaves[$i].face-$slaves[$i].faceImplant > 0)>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 0b2d34ac880e4e3dd485e52fb4fa4ebb345ca413..bcfb8b61c0af5e9ffb2535011f11ef7101bee2ee 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -3324,7 +3324,7 @@
<</if>>
<<if ($slaves[$i].faceShape == "masculine")>>
<<set _Effects.push("FaceSofterAndrogynous")>>
- <<elseif ($slaves[$i].faceShape == "androgynous")>>
+ <<elseif ($slaves[$i].faceShape == "androgynous" && $slaves[$i].geneticQuirks.androgyny != 2)>>
<<set _Effects.push("FaceNormal")>>
<</if>>
<</if>>
@@ -3482,6 +3482,14 @@
<<else>>
<<set $slaves[$i].hormoneBalance = Math.clamp($slaves[$i].hormoneBalance * 1.5, -400, 400)>>
<</if>>
+/* androgny really wants to sit around 0 and will fight changes to do so */
+<<if $slaves[$i].geneticQuirks.androgyny == 2>>
+ <<if $slaves[$i].hormoneBalance > 6>>
+ <<set $slaves[$i].hormoneBalance -= 10>>
+ <<elseif $slaves[$i].hormoneBalance < -6>>
+ <<set $slaves[$i].hormoneBalance += 10>>
+ <</if>>
+<</if>>
<<if $slaves[$i].drugs != "hormone blockers">>
<<include "SA hormone effects">>
<<elseif $slaves[$i].drugs == "hormone blockers">>
@@ -4114,6 +4122,8 @@
<<if $slaves[$i].geneMods.NCS == 1>>
/* NCS: always working against secondary sexual characteristics even in pregnancies. */
<<set _boobTarget = 0>>
+ <<elseif $slaves[$i].geneticQuirks.androgyny == 2>>
+ <<set _boobTarget = 400>>
<<elseif $slaves[$i].physicalAge >= 18>>
<<if $slaves[$i].pregType >= 50>>
<<set _boobTarget = 10000>>
@@ -4177,13 +4187,15 @@
<<set $slaves[$i].boobShape = "saggy">>
<</if>>
<</if>>
- <<if ($slaves[$i].hips < 2)>>
- $His hips @@.lime;widen@@ for $his upcoming birth.
- <<set $slaves[$i].hips += 1>>
- <</if>>
- <<if ($slaves[$i].butt < 14)>>
- $His butt @@.lime;swells with added fat@@ from $his changing body.
- <<set $slaves[$i].butt += 1>>
+ <<if $slaves[$i].geneticQuirks.androgyny != 2>>
+ <<if ($slaves[$i].hips < 2)>>
+ $His hips @@.lime;widen@@ for $his upcoming birth.
+ <<set $slaves[$i].hips += 1>>
+ <</if>>
+ <<if ($slaves[$i].butt < 14)>>
+ $His butt @@.lime;swells with added fat@@ from $his changing body.
+ <<set $slaves[$i].butt += 1>>
+ <</if>>
<</if>>
<</if>>
<<elseif ($slaves[$i].pregType >= 10)>>
diff --git a/src/uncategorized/saRecruitGirls.tw b/src/uncategorized/saRecruitGirls.tw
index 18ca6fd48ccc8e11edd9252d66bc2a685d7cecbc..3a4b6b95581b5a40551ccdf70b6a746a0fd85042 100644
--- a/src/uncategorized/saRecruitGirls.tw
+++ b/src/uncategorized/saRecruitGirls.tw
@@ -166,10 +166,28 @@
<</if>>
<<if $arcologies[0].FSPhysicalIdealist != "unset">>
<<if $arcologies[_j].FSPhysicalIdealist != "unset">>
- $He advances Physical Idealism there by working out in public<<if $slaves[$i].muscles > 30>>, having physically challenging sex in public, and improving $his already impressive musculature in a publicly documented journey of self-improvement<<set $arcologies[_j].FSPhysicalIdealist++>><<else>>and having physically challenging sex in public<</if>>.
+ $He advances Physical Idealism there by working out in
+ <<if $slaves[$i].muscles >= 50 && $arcology[0].FSPhysicalIdealistLaw == 0>>
+ public, having physically challenging sex in public, and improving $his already impressive musculature in a publicly documented journey of self-improvement.
+ <<set $arcologies[_j].FSPhysicalIdealist++>>
+ <<elseif $slaves[$i].muscles >= 20 && $slaves[$i].muscles < 50 && $arcology[0].FSPhysicalIdealistLaw == 1>>
+ public, having physically exhausting sex marathons in public, and improving $his already impressive stamina in a publicly documented journey of self-improvement.
+ <<set $arcologies[_j].FSPhysicalIdealist++>>
+ <<else>>
+ public and having physically <<if $arcology[0].FSPhysicalIdealistLaw == 1>>exhausting<<else>>challenging<</if>> sex in public.
+ <</if>>
<<set $arcologies[_j].FSPhysicalIdealist += _influence>>
<<elseif $arcologies[_j].FSHedonisticDecadence != "unset">>
- $He challenges Hedonistic Decadence there by working out in public<<if $slaves[$i].muscles > 30>>, having physically challenging sex in public, and improving $his already impressive musculature in a publicly documented journey of self-improvement<<set $arcologies[_j].FSHedonisticDecadence-->><<else>>and having physically challenging sex in public<</if>>.
+ $He challenges Hedonistic Decadence there by working out in
+ <<if $slaves[$i].muscles >= 50 && $arcology[0].FSPhysicalIdealistLaw == 0>>
+ public, having physically challenging sex in public, and improving $his already impressive musculature in a publicly documented journey of self-improvement.
+ <<set $arcologies[_j].FSHedonisticDecadence-->>
+ <<elseif $slaves[$i].muscles >= 20 && $slaves[$i].muscles < 50 && $arcology[0].FSPhysicalIdealistLaw == 1>>
+ public, having physically exhausting sex marathons in public, and improving $his already impressive stamina in a publicly documented journey of self-improvement.
+ <<set $arcologies[_j].FSHedonisticDecadence-->>
+ <<else>>
+ public and having physically <<if $arcology[0].FSPhysicalIdealistLaw == 1>>exhausting<<else>>challenging<</if>> sex in public.
+ <</if>>
<<set $arcologies[_j].FSHedonisticDecadence -= _influence>>
<</if>>
<<elseif $arcologies[0].FSHedonisticDecadence != "unset">>
@@ -591,7 +609,7 @@
<</if>>
<</if>>
<<if $arcologies[0].FSPhysicalIdealist != "unset">>
- <<if $slaves[$i].muscles > 95 || ($slaves[$i].muscles > 45 && $slaves[$i].health > 80)>>
+ <<if ($slaves[$i].muscles >= 50 && $arcology[0].FSPhysicalIdealistLaw == 0) || ($slaves[$i].muscles >= 20 && $slaves[$i].muscles < 50 && $arcology[0].FSPhysicalIdealistLaw == 1) || ($slaves[$i].muscles > 40 && $slaves[$i].health > 80)>>
<<set _seed += 4, _FSmatch++, $arcologies[0].FSPhysicalIdealist += 0.01*$FSSingleSlaveRep>>
<</if>>
<<elseif $arcologies[0].FSHedonisticDecadence != "unset">>
@@ -898,8 +916,12 @@
<</if>>
<</if>>
<<if $arcologies[0].FSPhysicalIdealist != "unset">>
- <<if $slaves[$i].muscles > 95 || ($slaves[$i].muscles > 45 && $slaves[$i].health > 80)>>
+ <<if ($slaves[$i].muscles >= 50 && $arcology[0].FSPhysicalIdealistLaw == 0)>>
$He asks another slave to photo-document $his time in the gym this week: naked, of course, to show off $his impressive muscle definition, and in certain poses $he nearly seems to be making love to the equipment.
+ <<elseif ($slaves[$i].muscles >= 20 && $slaves[$i].muscles < 50 && $arcology[0].FSPhysicalIdealistLaw == 1)>>
+ $He asks another slave to photo-document $his time on the track this week: naked, of course, to show off how perfectly toned body in motion.
+ <<elseif ($slaves[$i].muscles > 40 && $slaves[$i].health > 80)>>
+ $He asks another slave to photo-document $his time in the gym this week: naked, of course, to show off how $he keeps in such fine shape, and in certain poses $he nearly seems to be making love to the equipment.
<<else>>
$He tries documenting $his exercise routine, but it's a snooze fest because $he doesn't have the guns to show for it.
<</if>>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index 6130b384b41e94faf2c1f58e7fd2c17f770db689..ff2b1165d129f7c51cd415b07e006641f022987d 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -77,9 +77,9 @@
$He is a carrier of the heterochromia gene.
<</if>>
<<if $activeSlave.geneticQuirks.androgyny == 2>>
- $His is naturally androgynous.
+ $His has a hormonal condition resulting in androgyny.
<<elseif $activeSlave.geneticQuirks.androgyny == 1 && $geneticMappingUpgrade >= 2>>
- $He is a carrier of a series of genes that result in androgyny.
+ $He is a carrier of a gene that result in androgyny.
<</if>>
<<if $activeSlave.geneticQuirks.pFace == 2>>
$He has an exceedingly rare trait associated with perfect facial beauty.