diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index 9593b3d13c4e190d4ce6bb48fb5baf0b0c1805a5..849c76ddab3efe026ce1ff9b6d6f10da073bda41 100644 --- a/devNotes/twine JS.txt +++ b/devNotes/twine JS.txt @@ -3656,24 +3656,6 @@ window.capFirstChar = function capFirstChar(string) { return string.charAt(0).toUpperCase() + string.substr(1); }; -window.getSlaveDisplayName = function (slave) { - if ((!slave) || (!State)) - return undefined; - var surnamesFirstCountries = [ - "Cambodian", - "Chinese", - "Hungarian", - "Japanese", - "Korean", - "Mongolian", - "Taiwanese", - "Vietnamese"]; - var names = [slave.slaveName, slave.slaveSurname || ""]; - if ((1 !== State.variables.surnameOrder) && (surnamesFirstCountries.includes(slave.nationality))) - names.reverse(); - return names.join(" ").trim(); -}; - window.getSlaveDevotionClass = function (slave) { if ((!slave) || (!State)) return undefined; @@ -7689,11 +7671,10 @@ window.PlayerName = function PlayerName() { "Mongolian", "Taiwanese", "Vietnamese"]; - let names = [V.PC.name, V.PC.surname || ""]; - + let names = V.PC.surname ? [V.PC.name, V.PC.surname] : [V.PC.name]; if ((V.surnameOrder !== 1) && (surnamesFirstCountries.includes(V.PC.nationality))) names.reverse(); - return names.join(" ").trim(); + return names.join(" "); }; window.PCTitle = function PCTitle() { diff --git a/devTools/AutoGitVersionUploadBackground.sh b/devTools/AutoGitVersionUploadBackground.sh index cfb17ea2a37ac38910474cd686ca6bd5fa4f1e64..7bfa4379632db65cdd4023042452ebe04238bf4d 100755 --- a/devTools/AutoGitVersionUploadBackground.sh +++ b/devTools/AutoGitVersionUploadBackground.sh @@ -1,12 +1,8 @@ #!/bin/sh Additional packages required: megatools, MEGAcmd and git -V=-1 RD=FC/ LD=/tmp/FC U=anon@anon.anon P=13245 Branch=git@ssh.gitgud.io:pregmodfan/fc-pregmod.git ; echo "Fresh clone?" && read VN && clear && mega-login $U $P > /dev/null +U=anon@anon.anon P=13245 rdir=FC ldir='FC' outpt='bin/*.h*' login='-u $U -p $P' rpo=git@ssh.gitgud.io:pregmodfan/fc-pregmod.git build=0; echo "Fresh git clone? 0:y 1:n 2:na" && read Opt && clear && mega-login $U $P > /dev/null while true; do - if [[ $VN == y||$VN == yes ]]; then V=2 && mkdir $LD ; git clone -q $Branch $LD - elif [[ $VN == n||$VN == no||$V = 0 ]]; then cd $LD/ && git fetch -q - if [ `git rev-list HEAD...origin/pregmod-master --count` != 0 ]; then git pull -q && V=1 - fi #Check is a slight tweak of https://stackoverflow.com/a/17192101 + if [[ $Opt == 0 ]]; then build=1 && mkdir $ldir && git clone -q $rpo $ldir && cd $ldir + elif [[ $Opt > 0||$build < 1 ]]; then cd $ldir && git fetch -q origin && if [ `git rev-list HEAD...origin/pregmod-master --count` -gt 0 ]; then build=1 && git pull -q; fi #Check is a slight tweak of https://stackoverflow.com/a/17192101 and conversion into a single line check. fi - if [[ $VN == na||$V == 2||$V == 1 ]]; then V=0 && cd $LD/ && rm bin/*.html ; ./compile > /dev/null && minify -o bin/FC_pregmod.html bin/FC_pregmod.html && mv bin/FC_pregmod.html "bin/FC-pregmod-$(git log -1 --format='%cd' --date='format:%d-%m-%Y-%H-%M')-$(git log -n1 --abbrev-commit|grep -m1 commit|sed 's/commit //')".html && mega-put bin/*.html FC/ && megals -u $U -p $P /Root/FC|sed -n '1!p'|sort -r|tail -n +11|paste -sd " " -|xargs megarm -u $U -p $P > /dev/null - fi - clear && sleep 15m -done \ No newline at end of file + if [[ $Opt > 1||$build > 0 ]]; then cd $ldir && rm $outpt; ./compile --insane > /dev/null && minify -o $outpt $outpt && mv $outpt "bin/FC-pregmod-$(git log -1 --format='%cd' --date='format:%d-%m-%Y-%H-%M')-$(git log -n1 --abbrev-commit|grep -m1 commit|sed 's/commit //')".html && mega-put $outpt $rdir && megals $login /Root/$rdir|sed -n '1!p'|sort -r|tail -n +11|paste -sd " " -|xargs megarm $login > /dev/null; fi +if [[ $build > 0 ]];then build=0;fi && if [[ $Opt != -1 ]];then Opt=-1;fi && clear && sleep 15m; done \ No newline at end of file diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw index 9d9d3e027c04e482fefad9c20bed0c047d6887ee..339ced17038527204813591c4a40122e272b8275 100644 --- a/src/facilities/nursery/nursery.tw +++ b/src/facilities/nursery/nursery.tw @@ -203,7 +203,7 @@ Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of $ <<set _pregCount = $slaves[_u].pregType>> <<set _reservedSpots = $slaves[_u].reservedChildrenNursery>> <<set _pregWeek = $slaves[_u].pregWeek>> - <<set _slaveName = getSlaveDisplayName($slaves[_u])>> + <<set _slaveName = SlaveFullName($slaves[_u])>> <div class="possible" @id="_slaveId" @data-preg-count="_pregCount" @data-reserved-spots="_reservedSpots" @data-preg-week="_pregWeek" @data-name="_slaveName"> <<print "[[_slaveName|Long Slave Description][$activeSlave = $slaves[" + _u + "], $nextLink = passage()]]">> is $slaves[_u].pregWeek weeks pregnant with <<if $slaves[_u].pregSource == 0 || $slaves[_u].preg <= 5>>someone's<<if $slaves[_u].preg <= 5>>, though it is too early to tell whose,<</if>> diff --git a/src/js/assayJS.tw b/src/js/assayJS.tw index 3b55388da760bfa9d80af4e2f7f3f46c9b72e09e..011db808b35f82f666e6aa1dc98d76ec3c57704f 100644 --- a/src/js/assayJS.tw +++ b/src/js/assayJS.tw @@ -585,11 +585,10 @@ window.PlayerName = function PlayerName() { "Mongolian", "Taiwanese", "Vietnamese"]; - let names = [V.PC.name, V.PC.surname || ""]; - + let names = V.PC.surname ? [V.PC.name, V.PC.surname] : [V.PC.name]; if ((V.surnameOrder !== 1) && (surnamesFirstCountries.includes(V.PC.nationality))) names.reverse(); - return names.join(" ").trim(); + return names.join(" "); }; window.PCTitle = function PCTitle() { diff --git a/src/js/utilJS.tw b/src/js/utilJS.tw index 59530845c7604474bba3a94f0d8c508dd1c6250f..b2c3ac6e22c662a65dcfacaf7e0a5db81d7258cf 100644 --- a/src/js/utilJS.tw +++ b/src/js/utilJS.tw @@ -631,24 +631,6 @@ window.capFirstChar = function capFirstChar(string) { return string.charAt(0).toUpperCase() + string.substr(1); }; -window.getSlaveDisplayName = function (slave) { - if ((!slave) || (!State)) - return undefined; - var surnamesFirstCountries = [ - "Cambodian", - "Chinese", - "Hungarian", - "Japanese", - "Korean", - "Mongolian", - "Taiwanese", - "Vietnamese"]; - var names = [slave.slaveName, slave.slaveSurname || ""]; - if ((1 !== State.variables.surnameOrder) && (surnamesFirstCountries.includes(slave.nationality))) - names.reverse(); - return names.join(" ").trim(); -}; - window.getSlaveDevotionClass = function (slave) { if ((!slave) || (!State)) return undefined; diff --git a/src/npc/fSlaveImpreg.tw b/src/npc/fSlaveImpreg.tw index 239e437efa9a93bb20eb94bf230c8a2a12f9ffcb..d8aaf62c89f34e4b2d3ef36b50254610c4a55a8d 100644 --- a/src/npc/fSlaveImpreg.tw +++ b/src/npc/fSlaveImpreg.tw @@ -13,7 +13,7 @@ __Select an eligible slave to serve as the semen donatrix:__ <<for _i = 0; _i < $slaves.length; _i++>> <<if ($slaves[_i].ID != $activeSlave.ID) && canImpreg($activeSlave, $slaves[_i])>> <<set _name = SlaveFullName($slaves[_i])>> - <br><<print "[[_name|FSlaveImpreg Consummate][$impregnatrix = $slaves[" + _i + "], _i = " + _i + "]]">> + <br><<print "[[_name|FSlaveImpreg Consummate][$impregnatrix = $slaves[" + _i + "]]]">> <<set $eligibility = 1>> <</if>> <</for>> diff --git a/src/npc/fSlaveImpregConsummate.tw b/src/npc/fSlaveImpregConsummate.tw index 5489a951ea7c21f310d17f815e440ace5a8235e2..a6e8b489dfc0d77cd563456f714d329ac298cd04 100644 --- a/src/npc/fSlaveImpregConsummate.tw +++ b/src/npc/fSlaveImpregConsummate.tw @@ -378,5 +378,5 @@ $activeSlave.slaveName and $impregnatrix.slaveName are likely to produce slave with a decent ass. <</if>> -<<set $slaves[$i] = $impregnatrix>> /* save changes -- $i is already set to the index of the impregnatrix by fSlaveImpreg */ +<<set $slaves[$slaveIndices[$impregnatrix.ID]] = $impregnatrix>> /* save changes */ diff --git a/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw b/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw index ae0532b47490471fc5b3b621481f527730a0829b..4377b98d7e6e5fd18e87302802dc45c1004f253e 100644 --- a/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw +++ b/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw @@ -4,7 +4,7 @@ <<JFCSlave>> <<slaveCost $activeSlave>> -<<set $slaveCost = $slaveCost*2>> +<<set $slaveCost = $slaveCost*6>> A slave dealer has submitted a slave to satisfy your ''$Role'' order. diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw index 3e33f6b013b34d072611685ee7aff52cb977180f..73c7f2fb8c2c3b76f71b831fd6c2fce28833c5ca 100644 --- a/src/pregmod/incubator.tw +++ b/src/pregmod/incubator.tw @@ -77,7 +77,7 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $ <<set _pregCount = $slaves[_u].pregType>> <<set _reservedSpots = $slaves[_u].reservedChildren>> <<set _pregWeek = $slaves[_u].pregWeek>> - <<set _slaveName = getSlaveDisplayName($slaves[_u])>> + <<set _slaveName = SlaveFullName($slaves[_u])>> <div class="possible" @id="_slaveId" @data-preg-count="_pregCount" @data-reserved-spots="_reservedSpots" @data-preg-week="_pregWeek" @data-name="_slaveName"> <<print "[[_slaveName|Long Slave Description][$activeSlave = $slaves[" + _u + "], $nextLink = passage()]]">> is $slaves[_u].pregWeek weeks pregnant with <<if $slaves[_u].pregSource == 0 || $slaves[_u].preg <= 5>>someone's<<if $slaves[_u].preg <= 5>>, though it is too early to tell whose,<</if>> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index ae8a39ebeb2b615ff2bc93aaf8c546852421515b..a4685e2b5376e4c34f752e6c111835a39cf931d9 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -3512,6 +3512,8 @@ Setting missing slave variables: <</if>> <</for>> +<<set _Slave.chem = Number(_Slave.chem) || 0>> + <<set $slaves[_bci] = _Slave>> <</for>> diff --git a/src/uncategorized/recETSWorkaround.tw b/src/uncategorized/recETSWorkaround.tw index 17f73bd7e7d9412541aa7a609191b41883f0f535..a252105b857ddfcb6f41693476553a625b69c45a 100644 --- a/src/uncategorized/recETSWorkaround.tw +++ b/src/uncategorized/recETSWorkaround.tw @@ -30,6 +30,7 @@ Unsurprisingly the daughter is an addict too, and before long she's given her si <<set $activeSlave.relation = "daughter">> <<set $activeSlave.relationTarget = $activeSlave.ID - 1000>> <</if>> +<<set $activeSlave.birthsTotal = 0>> <<set $activeSlave.visualAge = $activeSlave.actualAge>> <<set $activeSlave.physicalAge = $activeSlave.actualAge>> <<set $activeSlave.ovaryAge = $activeSlave.actualAge>> @@ -69,6 +70,7 @@ Her daughter walks in angrily demanding to know why you called her here. She see <<set $activeSlave.relation = "daughter">> <<set $activeSlave.relationTarget = $activeSlave.ID - 1000>> <</if>> +<<set $activeSlave.birthsTotal = 0>> <<set $activeSlave.visualAge = $activeSlave.actualAge>> <<set $activeSlave.physicalAge = $activeSlave.actualAge>> <<set $activeSlave.ovaryAge = $activeSlave.actualAge>> diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw index c6bf3e0a7f681483b6a10546070490cad2eeb2b7..0685dd1662f846550574d0bbdcb119e1b9f559a0 100644 --- a/src/uncategorized/slaveSummary.tw +++ b/src/uncategorized/slaveSummary.tw @@ -82,7 +82,7 @@ _indexSlavesIdxs = $slaves.map(function(slave, idx) { return _passagePreFilter(slave) ? idx : null; }).filter(function(idx) { return idx !== null; })>> <<for !_.isUndefined(_ssi = _filteredSlaveIdxs.shift())>> <<set _Slave = $slaves[_ssi]>> -<<set _slaveName = getSlaveDisplayName(_Slave);>> +<<set _slaveName = SlaveFullName(_Slave);>> <<capture _ssi>> @@ -111,7 +111,7 @@ <<htag _divAttributes>> <<for !_.isUndefined(_ssii = _indexSlavesIdxs.shift())>> <<set _IndexSlave = $slaves[_ssii]>> - <<set _indexSlaveName = getSlaveDisplayName(_IndexSlave);>> + <<set _indexSlaveName = SlaveFullName(_IndexSlave);>> <<set _devotionClass = getSlaveDevotionClass(_IndexSlave);>> <<set _trustClass = getSlaveTrustClass(_IndexSlave);>> <<set _buttons.push({'data-name': _indexSlaveName, 'data-scroll-to': '#slave-' + _IndexSlave.ID, 'data-scroll-offset': _offset, 'data-devotion': _IndexSlave.devotion, 'data-trust': _IndexSlave.trust, class: _devotionClass + ' ' + _trustClass });>> diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw index 1e297ed20d6519ad39818dbb0beebe7dce28395f..dd1204cb46b8633118fee57bea8f0f2a7096bd78 100644 --- a/src/utility/descriptionWidgetsStyle.tw +++ b/src/utility/descriptionWidgetsStyle.tw @@ -4764,7 +4764,7 @@ $His <<elseif $activeSlave.bellyAccessory == "an extreme corset">> $His extreme corsetage is hidden by the toga. <<elseif $activeSlave.bellyAccessory == "a support band">> - $His support band is hidden by by the toga. + $His support band is hidden by the toga. <</if>> <<case "a huipil">> diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw index 2efb15c8c95055745af4794d79f7105cad626f79..00bd6de3546fd65f536e47198d906ea832e96412 100644 --- a/src/utility/slaveCreationWidgets.tw +++ b/src/utility/slaveCreationWidgets.tw @@ -4656,16 +4656,19 @@ <<set $activeSlave.boobShape = "perky">> <</if>> <<set $activeSlave.eyes = 1, $activeSlave.hears = 0, $activeSlave.voice = 2>> + <<set $activeSlave.intelligenceImplant = 30, $activeSlave.intelligence = random(20,100)>> + <<set $activeSlave.trust = 80, $activeSlave.devotion = 80>> + <<set $activeSlave.health = random(80,95)>> <<switch $Role>> /* Opens security */ <<case "Lieutenant Colonel">> - <<set $activeSlave.devotion = random(96,100), $activeSlave.trust = random(96, 100), $activeSlave.energy = random(96,100), $activeSlave.health = random(51,60), $activeSlave.intelligenceImplant = 30, $activeSlave.intelligence = 70, $activeSlave.combatSkill = 1>> + <<set $activeSlave.devotion = random(96,100), $activeSlave.trust = random(96, 100), $activeSlave.energy = random(96,100), $activeSlave.intelligence = 70, $activeSlave.combatSkill = 1>> <<set $activeSlave.career = either("a bodyguard", "a law enforcement officer", "a revolutionary", "a soldier", "a transporter", "an assassin", "in a militia", "a bouncer", "a bounty hunter", "a gang member", "a mercenary", "a prison guard", "a private detective", "a security guard", "a street thug", "an enforcer")>> <<case "Bodyguard">> - <<set $activeSlave.devotion = 90, $activeSlave.trust = 80, $activeSlave.health = random(80,95), $activeSlave.muscles = random(30,70), $activeSlave.height = Math.round(Height.random($activeSlave, {skew: 3, spread: .2, limitMult: [1, 4]})), $activeSlave.health = 100, $activeSlave.weight = random(-10,10), $activeSlave.teeth = either("pointy", "normal"), $activeSlave.amp = either(-4, -4, 0, 0, 0, 0), $activeSlave.combatSkill = 1>> + <<set $activeSlave.devotion = 90, $activeSlave.muscles = random(30,70), $activeSlave.height = Math.round(Height.random($activeSlave, {skew: 3, spread: .2, limitMult: [1, 4]})), $activeSlave.weight = random(-10,10), $activeSlave.teeth = either("pointy", "normal"), $activeSlave.amp = either(-4, -4, 0, 0, 0, 0), $activeSlave.combatSkill = 1>> <<set $activeSlave.career = either("a bodyguard", "a kunoichi", "a law enforcement officer", "a military brat", "a revolutionary", "a soldier", "a transporter", "an assassin", "in a militia")>> <<case "Wardeness">> - <<set $activeSlave.devotion = 80, $activeSlave.trust = 80, $activeSlave.health = random(80,95), $activeSlave.energy = random(80,100), $activeSlave.sexualFlaw = either("malicious", "none", "none", "none", "none"), $activeSlave.fetish = "sadist", $activeSlave.fetishStrength = 100, $activeSlave.muscles = random(50,80), $activeSlave.combatSkill = 1>> + <<set $activeSlave.energy = random(80,100), $activeSlave.sexualFlaw = either("malicious", "none", "none", "none", "none"), $activeSlave.fetish = "sadist", $activeSlave.fetishStrength = 100, $activeSlave.muscles = random(50,80), $activeSlave.combatSkill = 1>> <<set $activeSlave.career = either("a security guard", "a mercenary", "an enforcer", "a private detective", "a bouncer", "a prison guard", "a street thug", "a gang member", "a bounty hunter")>> <<if $seeDicks > 0>> <<set $activeSlave.dick = random(3,6), $activeSlave.balls = random(3,6), $activeSlave.scrotum = $activeSlave.balls, $activeSlave.prostate = either(1,1,1,2,2,3)>> @@ -4673,19 +4676,19 @@ /* Closes Security */ /* Opens management */ <<case "Headgirl">> - <<set $activeSlave.devotion = 90, $activeSlave.trust = 100, $activeSlave.health = random(80,95), $activeSlave.fetish = "dom", $activeSlave.fetishStrength = 100, $activeSlave.intelligenceImplant = 30, $activeSlave.energy = random(70,90), $activeSlave.intelligence = random(60,100), $activeSlave.entertainSkill = 100, $activeSlave.whoreSkill = 100, $activeSlave.analSkill = 100, $activeSlave.oralSkill = 100, $activeSlave.vaginalSkill = 100, $activeSlave.career = either("a lawyer", "a military officer", "a politician")>> + <<set $activeSlave.devotion = 90, $activeSlave.trust = 100, $activeSlave.fetish = "dom", $activeSlave.fetishStrength = 100, $activeSlave.energy = random(70,90), $activeSlave.intelligence = random(60,100), $activeSlave.entertainSkill = 100, $activeSlave.whoreSkill = 100, $activeSlave.analSkill = 100, $activeSlave.oralSkill = 100, $activeSlave.vaginalSkill = 100, $activeSlave.career = either("a lawyer", "a military officer", "a politician")>> <<if $seeDicks > 0>> <<set $activeSlave.dick = random(3,5), $activeSlave.balls = random(3,6), $activeSlave.scrotum = $activeSlave.balls, $activeSlave.prostate = either(1,1,2)>> <</if>> <<set $activeSlave.vagina = random(3,4)>> - <<if $AgePenalty == 0>> + <<if $AgePenalty == 1>> <<set $activeSlave.actualAge = random(36,$retirementAge-5)>> <<else>> <<set $activeSlave.actualAge = random(20,$retirementAge-5)>> <</if>> <<set $activeSlave.physicalAge = $activeSlave.actualAge, $activeSlave.visualAge = $activeSlave.actualAge, $activeSlave.ovaryAge = $activeSlave.actualAge>> <<case "Teacher">> - <<set $activeSlave.devotion = 80, $activeSlave.trust = 80, $activeSlave.health = random(80,95), $activeSlave.fetish = "dom", $activeSlave.fetishStrength = 100, $activeSlave.energy = random(70,90), $activeSlave.intelligenceImplant = 30, $activeSlave.intelligence = 100, $activeSlave.entertainSkill = 100, $activeSlave.whoreSkill = 100, $activeSlave.analSkill = 100, $activeSlave.oralSkill = 100, $activeSlave.vaginalSkill = 100, $activeSlave.face = random(41,90), $activeSlave.career = either("a librarian", "a principal", "a private instructor", "a professor", "a scholar", "a scientist", "a teacher", "a teaching assistant")>> + <<set $activeSlave.fetish = "dom", $activeSlave.fetishStrength = 100, $activeSlave.energy = random(70,90), $activeSlave.intelligence = 100, $activeSlave.entertainSkill = 100, $activeSlave.whoreSkill = 100, $activeSlave.analSkill = 100, $activeSlave.oralSkill = 100, $activeSlave.vaginalSkill = 100, $activeSlave.face = random(41,90), $activeSlave.career = either("a librarian", "a principal", "a private instructor", "a professor", "a scholar", "a scientist", "a teacher", "a teaching assistant")>> <<if $seeDicks > 0>> <<set $activeSlave.dick = random(3,5), $activeSlave.balls = random(3,6), $activeSlave.scrotum = $activeSlave.balls, $activeSlave.prostate = either(1,1,1,2,2,3)>> <</if>> @@ -4693,32 +4696,32 @@ <<set $activeSlave.vagina = random(3,4)>> <<set $activeSlave.physicalAge = $activeSlave.actualAge, $activeSlave.visualAge = $activeSlave.actualAge, $activeSlave.ovaryAge = $activeSlave.actualAge>> <<case "Nurse">> - <<set $activeSlave.devotion = 80, $activeSlave.trust = 80, $activeSlave.health = random(80,95), $activeSlave.fetish = "dom", $activeSlave.fetishStrength = 100, $activeSlave.muscles = random(6,50), $activeSlave.face = random(41,90), $activeSlave.sexualQuirk = "caring", $activeSlave.career = either("a doctor", "a medic", "a medical student", "a nurse", "a paramedic"), $activeSlave.intelligenceImplant = 30, $activeSlave.intelligence = random(40,90)>> + <<set $activeSlave.fetish = "dom", $activeSlave.fetishStrength = 100, $activeSlave.muscles = random(6,50), $activeSlave.face = random(41,90), $activeSlave.sexualQuirk = "caring", $activeSlave.career = either("a doctor", "a medic", "a medical student", "a nurse", "a paramedic"), $activeSlave.intelligence = random(40,90)>> <<set $activeSlave.actualAge = random(36,$retirementAge-3)>> <<set $activeSlave.physicalAge = $activeSlave.actualAge, $activeSlave.visualAge = $activeSlave.actualAge, $activeSlave.ovaryAge = $activeSlave.actualAge>> <<case "Motherly Attendant">> - <<set $activeSlave.devotion = 90, $activeSlave.trust = 90, $activeSlave.health = random(80,95), $activeSlave.fetish = "submissive", $activeSlave.fetishStrength = 100, $activeSlave.face = random(60,90)>> + <<set $activeSlave.devotion = 90, $activeSlave.trust = 90, $activeSlave.fetish = "submissive", $activeSlave.fetishStrength = 100, $activeSlave.face = random(60,90)>> <<set $activeSlave.career = either("a counselor", "a dispatch officer", "a lifeguard", "a masseuse", "a psychologist", "a therapist"), $activeSlave.birthsTotal = random(1,3), $activeSlave.pregKnown = 1, $activeSlave.preg = random(20,35), $activeSlave.pregWeek = $activeSlave.preg, $activeSlave.pregType = 1>> <<run SetBellySize($activeSlave)>> <<set $activeSlave.actualAge = random(36,$retirementAge-3)>> <<set $activeSlave.vagina = random(3,4)>> <<set $activeSlave.physicalAge = $activeSlave.actualAge, $activeSlave.visualAge = $activeSlave.actualAge, $activeSlave.ovaryAge = $activeSlave.actualAge>> <<case "Attendant">> - <<set $activeSlave.devotion = 90, $activeSlave.trust = 90, $activeSlave.health = random(80,95), $activeSlave.intelligenceImplant = 30, $activeSlave.intelligence = random(20,100), $activeSlave.fetish = "submissive", $activeSlave.fetishStrength = 100, $activeSlave.eyes = either(-2, 1, 1), $activeSlave.preg = 0, $activeSlave.face = random(60,90), $activeSlave.career = either("a counselor", "a masseuse", "a therapist")>> + <<set $activeSlave.devotion = 90, $activeSlave.trust = 90, $activeSlave.fetish = "submissive", $activeSlave.fetishStrength = 100, $activeSlave.eyes = either(-2, 1, 1), $activeSlave.preg = 0, $activeSlave.face = random(60,90), $activeSlave.career = either("a counselor", "a masseuse", "a therapist")>> <<set $activeSlave.actualAge = random(26,$retirementAge-3)>> <<set $activeSlave.physicalAge = $activeSlave.actualAge, $activeSlave.visualAge = $activeSlave.actualAge, $activeSlave.ovaryAge = $activeSlave.actualAge>> <<case "Matron">> - <<set $activeSlave.devotion = 90, $activeSlave.trust = 90, $activeSlave.health = random(80,95), $activeSlave.intelligenceImplant = 30, $activeSlave.intelligence = random(20,100), $activeSlave.sexualQuirk = "caring", $activeSlave.eyes = 1, $activeSlave.birthsTotal = random(2,4), $activeSlave.vagina = 3, $activeSlave.face = random(60,90), $activeSlave.career = either( "a nanny", "a practitioner")>> + <<set $activeSlave.devotion = 90, $activeSlave.trust = 90, $activeSlave.sexualQuirk = "caring", $activeSlave.eyes = 1, $activeSlave.birthsTotal = random(2,4), $activeSlave.vagina = 3, $activeSlave.face = random(60,90), $activeSlave.career = either( "a nanny", "a practitioner")>> <<set $activeSlave.actualAge = random(24,$retirementAge-3)>> <<set $activeSlave.physicalAge = $activeSlave.actualAge, $activeSlave.visualAge = $activeSlave.actualAge, $activeSlave.ovaryAge = $activeSlave.actualAge>> <<case "Stewardess">> - <<set $activeSlave.devotion = 80, $activeSlave.trust = 80, $activeSlave.health = random(80,95), $activeSlave.energy = random(70,90), $activeSlave.intelligenceImplant = 30, $activeSlave.intelligence = random(20,100), $activeSlave.fetish = "dom", $activeSlave.fetishStrength = 100, $activeSlave.career = either("a barista", "a bartender", "a caregiver", "a charity worker", "a professional bartender", "a secretary", "a wedding planner", "an air hostess", "an estate agent", "an investor", "an office worker")>> + <<set $activeSlave.energy = random(70,90), $activeSlave.fetish = "dom", $activeSlave.fetishStrength = 100, $activeSlave.career = either("a barista", "a bartender", "a caregiver", "a charity worker", "a professional bartender", "a secretary", "a wedding planner", "an air hostess", "an estate agent", "an investor", "an office worker")>> <<case "Milkmaid">> - <<set $activeSlave.devotion = 80, $activeSlave.trust = 80, $activeSlave.health = random(80,95), $activeSlave.muscles = random(31,60), $activeSlave.oralSkill = random(31,60), $activeSlave.sexualQuirk = "caring", $activeSlave.behavioralQuirk = "funny", $activeSlave.career = either("a dairy worker", "a farmer's daughter", "a rancher", "a veterinarian"), $activeSlave.intelligenceImplant = 30, $activeSlave.intelligence = random(20,70)>> + <<set $activeSlave.muscles = random(31,60), $activeSlave.oralSkill = random(31,60), $activeSlave.sexualQuirk = "caring", $activeSlave.behavioralQuirk = "funny", $activeSlave.career = either("a dairy worker", "a farmer's daughter", "a rancher", "a veterinarian"), $activeSlave.intelligence = random(20,70)>> <<if $seeDicks > 0>> <<set $activeSlave.dick = random(3,5), $activeSlave.balls = random(4,9), $activeSlave.scrotum = $activeSlave.balls, $activeSlave.prostate = either(1,1,1,2)>> <</if>> - <<if $AgePenalty == 0>> + <<if $AgePenalty == 1>> <<set $activeSlave.actualAge = random(36,$retirementAge-5)>> <<else>> <<set $activeSlave.actualAge = random(20,$retirementAge-5)>> @@ -4727,20 +4730,20 @@ /* Closes management */ /* Opens entertain */ <<case "DJ">> - <<set $activeSlave.devotion = 80, $activeSlave.trust = 80, $activeSlave.health = random(80,95), $activeSlave.entertainSkill = 100, $activeSlave.muscles = random(6,30), $activeSlave.face = random(80,100), $activeSlave.career = either("a classical dancer", "a classical musician", "a dancer", "a house DJ", "a musician", "an aspiring pop star")>> + <<set $activeSlave.entertainSkill = 100, $activeSlave.muscles = random(6,30), $activeSlave.face = random(80,100), $activeSlave.career = either("a classical dancer", "a classical musician", "a dancer", "a house DJ", "a musician", "an aspiring pop star")>> <<case "Madam">> - <<set $activeSlave.devotion = 80, $activeSlave.trust = 80, $activeSlave.health = random(80,95), $activeSlave.whoreSkill = 100, $activeSlave.career = either("a business owner", "a manager", "a pimp", "a procuress", "an innkeeper")>> + <<set $activeSlave.whoreSkill = 100, $activeSlave.career = either("a business owner", "a manager", "a pimp", "a procuress", "an innkeeper")>> <<if $seeDicks > 0>> <<set $activeSlave.dick = random(3,5), $activeSlave.balls = random(3,5), $activeSlave.scrotum = $activeSlave.balls, $activeSlave.prostate = either(1,1,1,2)>> <</if>> - <<if $AgePenalty == 0>> + <<if $AgePenalty == 1>> <<set $activeSlave.actualAge = random(36,$retirementAge-5)>> <<else>> <<set $activeSlave.actualAge = random(20,$retirementAge-5)>> <</if>> <<set $activeSlave.physicalAge = $activeSlave.actualAge, $activeSlave.visualAge = $activeSlave.actualAge, $activeSlave.ovaryAge = $activeSlave.actualAge>> <<case "Concubine">> - <<set $activeSlave.prestige = 3, $activeSlave.intelligenceImplant = 30, $activeSlave.energy = random(80,100), $activeSlave.intelligence = random(20,100), $activeSlave.entertainSkill = 100, $activeSlave.whoreSkill = 100, $activeSlave.analSkill = 100, $activeSlave.oralSkill = 100, $activeSlave.vaginalSkill = 100, $activeSlave.face = 100, $activeSlave.devotion = random(90,95), $activeSlave.trust = random(90,100), $activeSlave.health = random(60,80)>> + <<set $activeSlave.prestige = 3, $activeSlave.energy = random(80,100), $activeSlave.entertainSkill = 100, $activeSlave.whoreSkill = 100, $activeSlave.analSkill = 100, $activeSlave.oralSkill = 100, $activeSlave.vaginalSkill = 100, $activeSlave.face = 100, $activeSlave.devotion = random(90,95), $activeSlave.trust = random(90,100)>> /* Closes Entertain */ <</switch>> <</widget>>