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/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/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>>